From e2ad6b12ebb0d955413a9ea5b3479b31967e8f97 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 8 Jan 2024 18:49:42 -0800
Subject: Overwrite vanilla 8mm, 5x50mm, and 20x66mm recipes.

---
 json/recipes/weapons/ammo/20x66mm.json | 119 ++++++++++++++++++
 json/recipes/weapons/ammo/5x50mm.json  |  24 ++++
 json/recipes/weapons/ammo/8mm.json     | 102 +++++++++++++++
 json/recipes/weapons/ammo/rivtech.json | 219 ---------------------------------
 4 files changed, 245 insertions(+), 219 deletions(-)
 create mode 100644 json/recipes/weapons/ammo/20x66mm.json
 create mode 100644 json/recipes/weapons/ammo/5x50mm.json
 create mode 100644 json/recipes/weapons/ammo/8mm.json
 delete mode 100644 json/recipes/weapons/ammo/rivtech.json

diff --git a/json/recipes/weapons/ammo/20x66mm.json b/json/recipes/weapons/ammo/20x66mm.json
new file mode 100644
index 0000000..f883423
--- /dev/null
+++ b/json/recipes/weapons/ammo/20x66mm.json
@@ -0,0 +1,119 @@
+[
+  { 
+    "result": "20x66_shot_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 10 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "20x66_mold", 1 ] ],
+      [ [ "shotgun_primer", 1 ] ],
+      [ [ "gunpowder", 6 ] ]
+    ]
+  },
+  { 
+    "result": "20x66_slug_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 20 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "20x66_mold", 1 ] ],
+      [ [ "shotgun_primer", 1 ] ],
+      [ [ "gunpowder", 6 ] ]
+    ]
+  },
+  { 
+    "result": "20x66_flechette_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ]  ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "combatnail", 10 ] ],
+      [ [ "20x66_mold", 1 ] ],
+      [ [ "shotgun_primer", 1 ] ],
+      [ [ "gunpowder", 6 ] ]
+    ]
+  },
+  { 
+    "result": "20x66_inc_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 10 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "20x66_mold", 1 ] ],
+      [ [ "shotgun_primer", 1 ] ],
+      [ [ "gunpowder", 6 ] ],
+      [ [ "incendiary", 2 ] ]
+    ]
+  },
+  { 
+    "result": "20x66_flare_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+  "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "20x66_mold", 1 ] ],
+      [ [ "shotgun_primer", 1 ] ],
+      [ [ "incendiary", 25 ] ]
+    ]
+  },
+  {
+    "result": "20x66_mold",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_COMPONENTS",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "charges": 25,
+    "skills_required": [ "gun", 4 ],
+    "time": "10 m",
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "using": [ [ "surface_heat", 10 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [ [ [ "plastic_chunk", 4 ] ] ]
+  }
+]
diff --git a/json/recipes/weapons/ammo/5x50mm.json b/json/recipes/weapons/ammo/5x50mm.json
new file mode 100644
index 0000000..2282bc0
--- /dev/null
+++ b/json/recipes/weapons/ammo/5x50mm.json
@@ -0,0 +1,24 @@
+[
+  {
+    "result": "reloaded_5x50dart",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "skills_required": [ "gun", 5 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 4 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "5x50_hull", 1 ] ],
+      [ [ "plastic_chunk", 1 ] ],
+      [ [ "smrifle_primer", 1 ] ],
+      [ [ "gunpowder", 2 ] ],
+      [ [ "combatnail", 1 ] ]
+    ]
+  }
+]
diff --git a/json/recipes/weapons/ammo/8mm.json b/json/recipes/weapons/ammo/8mm.json
new file mode 100644
index 0000000..e6ed292
--- /dev/null
+++ b/json/recipes/weapons/ammo/8mm.json
@@ -0,0 +1,102 @@
+[
+ {
+    "result": "8mm_jhp_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "8mm_mold", 1 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "gunpowder", 7 ] ],
+      [ [ "copper", 3 ] ]
+    ]
+  },
+  {
+    "result": "8mm_caseless_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "8mm_mold", 1 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "gunpowder", 7 ] ],
+      [ [ "copper", 4 ] ]
+    ]
+  },
+  {
+    "result": "8mm_fmj_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "8mm_mold", 1 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "gunpowder", 7 ] ],
+      [ [ "copper", 5 ] ]
+    ]
+  },
+  {
+    "result": "8mm_inc_reloaded",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [
+      [ [ "8mm_mold", 1 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "gunpowder", 7 ] ],
+      [ [ "copper", 4 ] ],
+      [ [ "incendiary", 2 ] ]
+    ]
+  },
+  {
+    "result": "8mm_mold",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_COMPONENTS",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "charges": 25,
+    "skills_required": [ "gun", 4 ],
+    "time": "10 m",
+    "book_learn": [ [ "recipe_caseless", 5 ]  ],
+    "using": [ [ "surface_heat", 10 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ] ],
+    "components": [ [ [ "plastic_chunk", 4 ] ] ]
+  }
+]
diff --git a/json/recipes/weapons/ammo/rivtech.json b/json/recipes/weapons/ammo/rivtech.json
deleted file mode 100644
index e764bd8..0000000
--- a/json/recipes/weapons/ammo/rivtech.json
+++ /dev/null
@@ -1,219 +0,0 @@
-[
- { 
-    "result": "8mm_jhp_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-    "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "8mm_mold", 1 ] ],
-      [ [ "lgrifle_primer", 1 ] ],
-      [ [ "gunpowder", 7 ] ],
-      [ [ "copper", 3 ] ]
-    ]
-  },
- { 
-    "result": "8mm_caseless_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-    "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "8mm_mold", 1 ] ],
-      [ [ "lgrifle_primer", 1 ] ],
-      [ [ "gunpowder", 7 ] ],
-      [ [ "copper", 4 ] ]
-    ]
-  },
- { 
-    "result": "8mm_fmj_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-    "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "8mm_mold", 1 ] ],
-      [ [ "lgrifle_primer", 1 ] ],
-      [ [ "gunpowder", 7 ] ],
-      [ [ "copper", 5 ] ]
-    ]
-  },
- { 
-    "result": "8mm_inc_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-    "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "8mm_mold", 1 ] ],
-      [ [ "lgrifle_primer", 1 ] ],
-      [ [ "gunpowder", 7 ] ],
-      [ [ "copper", 4 ] ],
-      [ [ "incendiary", 2 ] ]
-    ]
-  },
-  { 
-    "result": "20x66_shot_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-    "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 10 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "20x66_mold", 1 ] ],
-      [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ]
-    ]
-  },
-  { 
-    "result": "20x66_slug_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-    "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 20 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "20x66_mold", 1 ] ],
-      [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ]
-    ]
-  },
-  { 
-    "result": "20x66_flechette_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-    "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ]  ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "combatnail", 10 ] ],
-      [ [ "20x66_mold", 1 ] ],
-      [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ]
-    ]
-  },
-  { 
-    "result": "20x66_inc_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-    "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 10 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "20x66_mold", 1 ] ],
-      [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ],
-      [ [ "incendiary", 2 ] ]
-    ]
-  },
-  { 
-    "result": "20x66_flare_reloaded",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "difficulty": 8,
-  "skills_required": [ "gun", 7 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 10 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "20x66_mold", 1 ] ],
-      [ [ "shotgun_primer", 1 ] ],
-      [ [ "incendiary", 25 ] ]
-    ]
-  },
-  {
-    "result": "8mm_mold",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_COMPONENTS",
-    "skill_used": "fabrication",
-    "difficulty": 2,
-    "charges": 25,
-    "skills_required": [ "gun", 4 ],
-    "time": "10 m",
-    "book_learn": [ [ "recipe_caseless", 5 ]  ],
-    "using": [ [ "surface_heat", 10 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [ [ [ "plastic_chunk", 4 ] ] ]
-  },
-  {
-    "result": "20x66_mold",
-    "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_COMPONENTS",
-    "skill_used": "fabrication",
-    "difficulty": 2,
-    "charges": 25,
-    "skills_required": [ "gun", 4 ],
-    "time": "10 m",
-    "book_learn": [ [ "recipe_caseless", 5 ] ],
-    "using": [ [ "surface_heat", 10 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [ [ [ "plastic_chunk", 4 ] ] ]
-  }
-]
-- 
cgit v1.2.1