From d3a8099ef44a99721bfeabb689995ff51d74af1f Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 26 Apr 2022 14:54:50 -0700
Subject: Fix several FMJ ammo recipes to require copper.

---
 Readme.txt                     |  4 ++++
 json/recipes/ammo/10mm.json    | 40 ++++++++++++++++++++++++++++++++++++++
 json/recipes/ammo/357.json     | 40 ++++++++++++++++++++++++++++++++++++++
 json/recipes/ammo/38super.json | 21 ++++++++++++++++++++
 json/recipes/ammo/45.json      | 44 ++++++++++++++++++++++++++++++++++++++++++
 json/recipes/ammo/46.json      | 44 ++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 193 insertions(+)
 create mode 100644 json/recipes/ammo/10mm.json
 create mode 100644 json/recipes/ammo/357.json
 create mode 100644 json/recipes/ammo/38super.json
 create mode 100644 json/recipes/ammo/45.json
 create mode 100644 json/recipes/ammo/46.json

diff --git a/Readme.txt b/Readme.txt
index 6481956..9352519 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -108,6 +108,10 @@ Use small pistol primer instead of large pistol primer.
 40x53mm reloaded:
 Use shot_forming instead of bulltet_forming.
 
+---
+Add copper to reloaded and black powder recipes for various ammunitions:
+10mm Auto FMJ, .357 Magnum FMJ, .38 Super FMJ, .45 ACP FMJ, 4.6x30mm
+
 ---
 Scrambled Eggs and Deluxe Scrambled Eggs:
 From powdered eggs variants now no longer allows the use of non-powdered eggs.
diff --git a/json/recipes/ammo/10mm.json b/json/recipes/ammo/10mm.json
new file mode 100644
index 0000000..f243e6b
--- /dev/null
+++ b/json/recipes/ammo/10mm.json
@@ -0,0 +1,40 @@
+[
+  {
+    "result": "reloaded_10mm_fmj",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_10mm", 1 ] ],
+    "components": [
+      [ [ "gunpowder", 5 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  },
+  {
+    "result": "bp_10mm_fmj",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_10mm", 1 ] ],
+    "components": [
+      [ [ "chem_black_powder", 8 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  }
+]
diff --git a/json/recipes/ammo/357.json b/json/recipes/ammo/357.json
new file mode 100644
index 0000000..94e8483
--- /dev/null
+++ b/json/recipes/ammo/357.json
@@ -0,0 +1,40 @@
+[
+  {
+    "result": "reloaded_357mag_fmj",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ],
+    "components": [
+      [ [ "gunpowder", 5 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  },
+  { 
+    "result": "bp_357mag_fmj",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ],
+    "components": [
+      [ [ "chem_black_powder", 8 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  }
+]
diff --git a/json/recipes/ammo/38super.json b/json/recipes/ammo/38super.json
new file mode 100644
index 0000000..85c1c88
--- /dev/null
+++ b/json/recipes/ammo/38super.json
@@ -0,0 +1,21 @@
+[
+  {
+    "result": "reloaded_38super_fmj",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 1 ], [ "recipe_bullets", 2 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38super", 1 ] ],
+    "components": [
+      [ [ "gunpowder", 3 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  }
+]
diff --git a/json/recipes/ammo/45.json b/json/recipes/ammo/45.json
new file mode 100644
index 0000000..4a9e700
--- /dev/null
+++ b/json/recipes/ammo/45.json
@@ -0,0 +1,44 @@
+[
+  {
+    "result": "reloaded_45_acp",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "skills_required": [ "gun", 5 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ],
+    "components": [
+      [ [ "45_casing", 1 ] ],
+      [ [ "lgpistol_primer", 1 ] ],
+      [ [ "gunpowder", 4 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  },
+  {
+    "result": "bp_45_acp",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "skills_required": [ "gun", 5 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ],
+    "components": [
+      [ [ "45_casing", 1 ] ],
+      [ [ "lgpistol_primer", 1 ] ],
+      [ [ "chem_black_powder", 6 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  }
+]
diff --git a/json/recipes/ammo/46.json b/json/recipes/ammo/46.json
new file mode 100644
index 0000000..c15f50e
--- /dev/null
+++ b/json/recipes/ammo/46.json
@@ -0,0 +1,44 @@
+[
+  { 
+    "result": "reloaded_46mm",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "gun", 3 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "components": [
+      [ [ "46mm_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "gunpowder", 4 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  },
+  { 
+    "result": "bp_46mm",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "gun", 3 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "components": [
+      [ [ "46mm_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "chem_black_powder", 6 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  }
+]
-- 
cgit v1.2.1