Rivtech mainline (#3092)

* Update rifle.json * Update 20x66mm.json * Update 8x40mm.json * Update 20x66mm.json * Update rifle.json * Update cgp_recipes.json * Create obsoletion.json * Update rifle.json * Update shot.json * Update rifle.json * Update shot.json * Update rifle.json * Update data/json/recipes/ammo/rifle.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/rifle.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/rifle.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/rifle.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update migration.json * Delete obsoletion.json * Update shot.json * Update rifle.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
cataclysmbnteam · Aug 27, 2023 · 1e22505 · 1e22505
1 parent b8f8cee
commit 1e22505
Show file tree

Hide file tree

Showing 6 changed files with 274 additions and 124 deletions.
diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
@@ -14,31 +14,31 @@
     "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
   },
   {
-    "id": "20x66_bootleg_flechette",
+    "id": "20x66_flechette_reloaded",
     "copy-from": "20x66_flechette",
     "type": "AMMO",
     "name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "Handmade duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
-    "id": "20x66_bootleg_shot",
+    "id": "20x66_shot_reloaded",
     "copy-from": "20x66_shot",
     "type": "AMMO",
     "name": { "str": "20x66mm buckshot, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "Handmade duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
-    "id": "20x66_bootleg_slug",
+    "id": "20x66_slug_reloaded",
     "copy-from": "20x66_slug",
     "type": "AMMO",
     "name": { "str": "20x66mm slug, handmade", "str_pl": "20x66mm slugs, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "Handmade duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }

diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
@@ -1,10 +1,40 @@
 [
   {
-    "id": "8mm_bootleg",
+    "id": "8mm_jhp_reloaded",
     "copy-from": "8mm_jhp",
     "type": "AMMO",
-    "name": { "str": "bootleg 8x40mm JHP" },
-    "description": "Bootleg duplicates of Rivtech 8x40mm caseless rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "name": { "str": "8x40mm JHP, handmade" },
+    "description": "Handmade duplicates of Rivtech 8x40mm JHP rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "8mm_caseless_reloaded",
+    "copy-from": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str": "8x40mm caseless, handmade" },
+    "description": "Handmade duplicates of Rivtech 8x40mm caseless rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "8mm_hvp_reloaded",
+    "copy-from": "8mm_hvp",
+    "type": "AMMO",
+    "name": { "str": "8x40mm HVP, handmade" },
+    "description": "Handmade duplicates of Rivtech 8x40mm HVP rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "8mm_inc_reloaded",
+    "copy-from": "8mm_inc",
+    "type": "AMMO",
+    "name": { "str": "8x40mm tracer, handmade" },
+    "description": "Handmade duplicates of Rivtech 8x40mm tracer rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }

diff --git a/data/json/obsoletion/migration.json b/data/json/obsoletion/migration.json
@@ -69,10 +69,30 @@
     "type": "MIGRATION",
     "replace": "40x46mm_m651"
   },
+  {
+    "id": "8mm_bootleg",
+    "type": "MIGRATION",
+    "replace": "8mm_jhp_reloaded"
+  },
   {
     "id": "8mm_bootleg_jsp",
     "type": "MIGRATION",
-    "replace": "8mm_bootleg"
+    "replace": "8mm_jhp_reloaded"
+  },
+  {
+    "id": "20x66_bootleg_shot",
+    "type": "MIGRATION",
+    "replace": "20x66_shot_reloaded"
+  },
+  {
+    "id": "20x66_bootleg_flechette",
+    "type": "MIGRATION",
+    "replace": "20x66_flechette_reloaded"
+  },
+  {
+    "id": "20x66_bootleg_slug",
+    "type": "MIGRATION",
+    "replace": "20x66_slug_reloaded"
   },
   {
     "id": "adv_UPS_on",

diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
@@ -395,6 +395,135 @@
     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
     "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "8mm_jhp_reloaded",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "skills_required": [ "cooking", 2 ],
+    "difficulty": 8,
+    "time": 35000,
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 40,
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
+    "components": [
+      [ [ "adhesive", 1, "LIST" ] ],
+      [ [ "plastic_chunk", 5 ] ],
+      [ [ "gunpowder", 280 ] ],
+      [ [ "oxy_powder", 80 ] ],
+      [ [ "lead", 80 ] ],
+      [
+        [ "gold_small", 4 ],
+        [ "silver_small", 4 ],
+        [ "tin", 4 ],
+        [ "bismuth", 4 ],
+        [ "solder_wire", 4 ],
+        [ "platinum_small", 4 ]
+      ],
+      [ [ "copper", 40 ] ],
+      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "8mm_caseless_reloaded",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "skills_required": [ "cooking", 2 ],
+    "difficulty": 9,
+    "time": 45000,
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 40,
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
+    "components": [
+      [ [ "adhesive", 1, "LIST" ] ],
+      [ [ "plastic_chunk", 5 ] ],
+      [ [ "gunpowder", 320 ] ],
+      [ [ "oxy_powder", 80 ] ],
+      [ [ "lead", 120 ] ],
+      [
+        [ "gold_small", 4 ],
+        [ "silver_small", 4 ],
+        [ "tin", 4 ],
+        [ "bismuth", 4 ],
+        [ "solder_wire", 4 ],
+        [ "platinum_small", 4 ]
+      ],
+      [ [ "copper", 80 ] ],
+      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "8mm_hvp_reloaded",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "skills_required": [ "cooking", 2 ],
+    "difficulty": 9,
+    "time": 55000,
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 40,
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
+    "components": [
+      [ [ "adhesive", 1, "LIST" ] ],
+      [ [ "plastic_chunk", 5 ] ],
+      [ [ "gunpowder", 400 ] ],
+      [ [ "oxy_powder", 120 ] ],
+      [ [ "lead", 80 ] ],
+      [
+        [ "gold_small", 40 ],
+        [ "silver_small", 40 ],
+        [ "tin", 40 ],
+        [ "bismuth", 40 ],
+        [ "solder_wire", 40 ],
+        [ "platinum_small", 40 ]
+      ],
+      [ [ "copper", 80 ] ],
+      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "8mm_inc_reloaded",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "skills_required": [ "cooking", 2 ],
+    "difficulty": 9,
+    "time": 55000,
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "charges": 40,
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
+    "components": [
+      [ [ "adhesive", 1, "LIST" ] ],
+      [ [ "plastic_chunk", 5 ] ],
+      [ [ "gunpowder", 320 ] ],
+      [ [ "oxy_powder", 160 ] ],
+      [ [ "incendiary", 80 ] ],
+      [ [ "lead", 80 ] ],
+      [
+        [ "gold_small", 4 ],
+        [ "silver_small", 4 ],
+        [ "tin", 4 ],
+        [ "bismuth", 4 ],
+        [ "solder_wire", 4 ],
+        [ "platinum_small", 4 ]
+      ],
+      [ [ "copper", 40 ] ],
+      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
+    ]
+  },
   {
     "result": "5x50dart",
     "type": "recipe",
@@ -406,15 +535,15 @@
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_caseless", 4 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "charges": 8,
+    "using": [ [ "bullet_forming", 16 ], [ "ammo_bullet", 16 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
     "components": [
-      [ [ "5x50_hull", 1 ] ],
+      [ [ "5x50_hull", 8 ] ],
       [ [ "plastic_chunk", 1 ] ],
-      [ [ "smrifle_primer", 1 ] ],
-      [ [ "gunpowder", 3 ] ],
-      [ [ "combatnail", 1 ] ]
+      [ [ "smrifle_primer", 8 ] ],
+      [ [ "gunpowder", 24 ] ],
+      [ [ "combatnail", 8 ] ]
     ]
   },
   {
@@ -428,15 +557,15 @@
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "recipe_caseless", 4 ] ],
-    "charges": 1,
-    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ] ],
+    "charges": 8,
+    "using": [ [ "bullet_forming", 16 ], [ "ammo_bullet", 24 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
     "components": [
-      [ [ "5x50_hull", 1 ] ],
+      [ [ "5x50_hull", 8 ] ],
       [ [ "plastic_chunk", 1 ] ],
-      [ [ "smrifle_primer", 1 ] ],
-      [ [ "gunpowder", 4 ] ],
-      [ [ "scrap", 1 ] ]
+      [ [ "smrifle_primer", 8 ] ],
+      [ [ "gunpowder", 32 ] ],
+      [ [ "scrap", 8 ] ]
     ]
   },
   {

diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json
@@ -642,5 +642,78 @@
     "using": [ [ "ammo_bullet", 8 ] ],
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "20x66_shot_reloaded",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "skills_required": [ "cooking", 2 ],
+    "difficulty": 8,
+    "time": 45000,
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
+    "components": [
+      [ [ "adhesive", 1, "LIST" ] ],
+      [ [ "plastic_chunk", 4 ] ],
+      [ [ "oxy_powder", 60 ] ],
+      [ [ "gunpowder", 120 ] ],
+      [ [ "lead", 160 ] ],
+      [ [ "gold_small", 5 ], [ "silver_small", 5 ], [ "tin", 5 ], [ "bismuth", 5 ], [ "solder_wire", 5 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "20x66_flechette_reloaded",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "skills_required": [ "cooking", 2 ],
+    "difficulty": 8,
+    "time": 45000,
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "press", -1 ] ] ],
+    "components": [
+      [ [ "adhesive", 1, "LIST" ] ],
+      [ [ "plastic_chunk", 4 ] ],
+      [ [ "oxy_powder", 60 ] ],
+      [ [ "gunpowder", 120 ] ],
+      [
+        [ "lead", 10 ],
+        [ "gold_small", 10 ],
+        [ "silver_small", 10 ],
+        [ "tin", 10 ],
+        [ "bismuth", 10 ],
+        [ "solder_wire", 10 ]
+      ],
+      [ [ "nail", 240 ], [ "combatnail", 240 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "20x66_slug_reloaded",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "skills_required": [ "cooking", 2 ],
+    "difficulty": 8,
+    "time": 45000,
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
+    "components": [
+      [ [ "adhesive", 1, "LIST" ] ],
+      [ [ "plastic_chunk", 4 ] ],
+      [ [ "oxy_powder", 80 ] ],
+      [ [ "gunpowder", 160 ] ],
+      [ [ "lead", 240 ] ],
+      [ [ "gold_small", 8 ], [ "silver_small", 8 ], [ "tin", 8 ], [ "bismuth", 8 ], [ "solder_wire", 8 ] ]
+    ]
   }
 ]