Updated to 2023-09-10-2111

Start work porting out as much ammo changes as possible to my ammo rebalance mod.

1 files changed, 3 insertions, 223 deletions

diff --git a/revert-17_Rivtech-mainline-3092.patch b/revert-17_Rivtech-mainline-3092.patch
index 29760e0..409665e 100644
--- a/revert-17_Rivtech-mainline-3092.patch
+++ b/revert-17_Rivtech-mainline-3092.patch
@@ -5,12 +5,8 @@ Subject: [PATCH] Rivtech mainline (#3092)
 
 * Update rifle.json
 
-* Update 20x66mm.json
-
 * Update 8x40mm.json
 
-* Update 20x66mm.json
-
 * Update rifle.json
 
 * Update cgp_recipes.json
@@ -71,56 +67,12 @@ Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.
 
 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 ---
- data/json/items/ammo/20x66mm.json          |  12 +-
  data/json/items/ammo/8x40mm.json           |  36 ++++-
  data/json/obsoletion/migration.json        |  22 ++-
  data/json/recipes/ammo/rifle.json          | 153 +++++++++++++++++++--
  data/json/recipes/ammo/shot.json           |  73 ++++++++++
  data/mods/Craft_Gunpowder/cgp_recipes.json | 102 --------------
  6 files changed, 274 insertions(+), 124 deletions(-)
-
-diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
-index 297ee063031..5ef3bee49f1 100644
---- 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
 index 8ca62a1bfb3..de9a47bac7a 100644
 --- a/data/json/items/ammo/8x40mm.json
@@ -173,7 +125,7 @@ diff --git a/data/json/obsoletion/migration.json b/data/json/obsoletion/migratio
 index aae147246c5..1d37113786d 100644
 --- a/data/json/obsoletion/migration.json
 +++ b/data/json/obsoletion/migration.json
-@@ -69,10 +69,30 @@
+@@ -69,10 +69,15 @@
      "type": "MIGRATION",
      "replace": "40x46mm_m651"
    },
@@ -187,24 +139,9 @@ index aae147246c5..1d37113786d 100644
      "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",
+     "id": "20x66_bootleg_shot",
 diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
 index dc0713e00bc..64b2d43cdf6 100644
 --- a/data/json/recipes/ammo/rifle.json
@@ -389,94 +326,11 @@ index dc0713e00bc..64b2d43cdf6 100644
      ]
    },
    {
-diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json
-index 27b7bb17832..6221603cd0d 100644
---- 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 ] ]
-+    ]
-   }
- ]
 diff --git a/data/mods/Craft_Gunpowder/cgp_recipes.json b/data/mods/Craft_Gunpowder/cgp_recipes.json
 index f73bcb1507c..4302b8f86dc 100644
 --- a/data/mods/Craft_Gunpowder/cgp_recipes.json
 +++ b/data/mods/Craft_Gunpowder/cgp_recipes.json
-@@ -48,108 +48,6 @@
+@@ -48,34 +48,6 @@
      "tools": [ [ [ "chemistry_set", 50 ], [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
      "components": [ [ [ "oxy_powder", 200 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ], [ [ "charcoal", 5 ] ] ]
    },
@@ -508,80 +362,6 @@ index f73bcb1507c..4302b8f86dc 100644
 -      [ [ "copper", 35 ] ]
 -    ]
 -  },
--  {
--    "type": "recipe",
--    "result": "20x66_bootleg_shot",
--    "category": "CC_AMMO",
--    "subcategory": "CSC_AMMO_SHOT",
--    "skill_used": "fabrication",
--    "skills_required": [ "cooking", 2 ],
--    "difficulty": 8,
--    "time": 45000,
--    "book_learn": [ [ "recipe_caseless", 5 ], [ "recipe_bullets", 9 ], [ "manual_shotgun", 10 ] ],
--    "qualities": [ { "id": "CHEM", "level": 2 } ],
--    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
--    "components": [
--      [ [ "acid", 1 ] ],
--      [ [ "plastic_chunk", 4 ] ],
--      [ [ "oxy_powder", 120 ] ],
--      [ [ "incendiary", 120 ] ],
--      [
--        [ "lead", 160 ],
--        [ "gold_small", 160 ],
--        [ "silver_small", 160 ],
--        [ "tin", 160 ],
--        [ "bismuth", 160 ],
--        [ "solder_wire", 160 ]
--      ]
--    ]
--  },
--  {
--    "type": "recipe",
--    "result": "20x66_bootleg_flechette",
--    "category": "CC_AMMO",
--    "subcategory": "CSC_AMMO_SHOT",
--    "skill_used": "fabrication",
--    "skills_required": [ "cooking", 2 ],
--    "difficulty": 8,
--    "time": 45000,
--    "book_learn": [ [ "recipe_caseless", 5 ], [ "recipe_bullets", 9 ], [ "manual_shotgun", 10 ] ],
--    "qualities": [ { "id": "CHEM", "level": 2 } ],
--    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "press", -1 ] ] ],
--    "components": [
--      [ [ "acid", 1 ] ],
--      [ [ "plastic_chunk", 4 ] ],
--      [ [ "oxy_powder", 120 ] ],
--      [ [ "incendiary", 120 ] ],
--      [ [ "nail", 240 ], [ "combatnail", 240 ] ]
--    ]
--  },
--  {
--    "type": "recipe",
--    "result": "20x66_bootleg_slug",
--    "category": "CC_AMMO",
--    "subcategory": "CSC_AMMO_SHOT",
--    "skill_used": "fabrication",
--    "skills_required": [ "cooking", 2 ],
--    "difficulty": 8,
--    "time": 45000,
--    "book_learn": [ [ "recipe_caseless", 5 ], [ "recipe_bullets", 9 ], [ "manual_shotgun", 10 ] ],
--    "qualities": [ { "id": "CHEM", "level": 2 } ],
--    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
--    "components": [
--      [ [ "acid", 1 ] ],
--      [ [ "plastic_chunk", 4 ] ],
--      [ [ "oxy_powder", 160 ] ],
--      [ [ "incendiary", 160 ] ],
--      [
--        [ "lead", 240 ],
--        [ "gold_small", 240 ],
--        [ "silver_small", 240 ],
--        [ "tin", 240 ],
--        [ "bismuth", 240 ],
--        [ "solder_wire", 240 ]
--      ]
--    ]
--  },
    {
      "type": "recipe",
      "result": "smg_9mm",