7.62x39 Import restrictions (CleverRaven#69505)

* m43->m67 m67->JHP * Update migration_items.json * Update data/json/items/ammo/762.json Co-authored-by: TheShadowFerret <[email protected]> --------- Co-authored-by: TheShadowFerret <[email protected]>
tenmillimaster · Nov 18, 2023 · 69c2db3 · 69c2db3
1 parent 430561e
commit 69c2db3
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 75 deletions.
diff --git a/data/json/ascii_art/ammo/762.json b/data/json/ascii_art/ammo/762.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "ascii_art",
-    "id": "762_m43",
+    "id": "762_jhp",
     "picture": [
       "<color_red>;",
       "<color_green>‼"

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -251,7 +251,8 @@
       { "item": "3006", "prob": 25, "charges": [ 1, 20 ] },
       { "item": "308", "prob": 25, "charges": [ 1, 20 ] },
       { "item": "762_54R", "prob": 10, "charges": [ 1, 20 ] },
-      { "item": "762_m43", "prob": 20, "charges": [ 1, 30 ] },
+      { "item": "762_m87", "prob": 15, "charges": [ 1, 30 ] },
+      { "item": "762_jhp", "prob": 5, "charges": [ 1, 30 ] },
       { "item": "30carbine", "prob": 20, "charges": [ 1, 50 ] }
     ]
   },
@@ -342,7 +343,7 @@
       { "item": "8mm_civilian", "prob": 15 },
       { "item": "300blk", "prob": 20 },
       { "item": "762_54R", "prob": 35 },
-      { "item": "762_m43", "prob": 20 },
+      { "item": "762_m87", "prob": 20 },
       { "item": "300blk_ss", "prob": 15 },
       { "item": "50beowulf_xtp", "prob": 15 },
       { "item": "50beowulf_penetrator", "prob": 10 },
@@ -447,7 +448,7 @@
       { "item": "reloaded_762_51", "prob": 10 },
       { "item": "reloaded_762_51_incendiary", "prob": 5 },
       { "item": "reloaded_762_54R", "prob": 40 },
-      { "item": "reloaded_762_m43", "prob": 20 },
+      { "item": "reloaded_762_m87", "prob": 2 },
       { "item": "reloaded_300blk", "prob": 10 },
       { "item": "reloaded_50beowulf_xtp", "prob": 10 },
       { "item": "reloaded_50beowulf_penetrator", "prob": 5 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
@@ -186,11 +186,11 @@
     "//": "a collection of ammo that would be found with a loaded gun.",
     "subtype": "distribution",
     "entries": [
-      { "item": "762_m43", "prob": 100, "charges": [ 1, 30 ] },
+      { "item": "762_jhp", "prob": 100, "charges": [ 1, 30 ] },
       { "item": "762_m87", "prob": 100, "charges": [ 1, 30 ] },
-      { "item": "762_m43", "prob": 75, "charges": [ 35, 60 ] },
+      { "item": "762_jhp", "prob": 75, "charges": [ 35, 60 ] },
       { "item": "762_m87", "prob": 75, "charges": [ 35, 60 ] },
-      { "item": "762_m43", "prob": 30, "charges": [ 70, 120 ] },
+      { "item": "762_jhp", "prob": 30, "charges": [ 70, 120 ] },
       { "item": "762_m87", "prob": 30, "charges": [ 70, 120 ] }
     ]
   },

diff --git a/data/json/itemgroups/roof.json b/data/json/itemgroups/roof.json
@@ -8,7 +8,7 @@
       { "group": "any_MRE", "count": [ 1, 5 ] },
       { "item": "ak47", "prob": 20, "charges": [ 0, 30 ] },
       { "item": "akmag30", "prob": 20, "charges": [ 0, 30 ] },
-      { "item": "762_m43", "prob": 20, "charges": [ 1, 30 ] },
+      { "item": "762_m87", "prob": 20, "charges": [ 1, 30 ] },
       { "prob": 10, "group": "cig_box_cigarette_1_20" },
       { "item": "joint_roach", "prob": 20 },
       { "item": "cig_butt", "prob": 20 },

diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json
@@ -1,17 +1,17 @@
 [
   {
-    "id": "762_m43",
+    "id": "762_m87",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x39mm 57-N-231" },
-    "description": "7.62x39mm 57-N-231 ammunition with a 121.9gr steel core FMJ bullet.  Developed in World War 2 by the Soviet Union, the 7.62x39mm round rapidly became extremely popular all over the world.  The bullet has poor wounding potential due to its stability, only beginning to yaw after 26cm.",
-    "ascii_picture": "762_m43",
+    "ascii_picture": "762_m87",
+    "description": "Imported 7.62x39mm M67-style ammunition with a 124gr jacketed, lead core bullet.  Thankfully this loading has non-corrosive primers, and also features a reloadable brass case.",
+    "name": { "str_sp": "7.62x39mm FMJ" },
     "weight": "16 g",
     "volume": "113 ml",
     "longest_side": "56 mm",
     "price": 120,
     "price_postapoc": 800,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "material": [ "steel", "brass", "lead", "powder" ],
+    "material": [ "brass", "lead", "powder" ],
     "symbol": "=",
     "color": "dark_gray",
     "count": 30,
@@ -56,43 +56,32 @@
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
   },
   {
-    "id": "762_m87",
-    "copy-from": "762_m43",
-    "type": "AMMO",
-    "name": { "str_sp": "7.62x39mm M67" },
-    "//": "Entirely provisional.  Could someone design a better wound ballistics system?",
-    "description": "7.62x39mm M67 ammunition with a 123gr bullet.  The inadequate terminal ballistics of the M43 round led to the development of the M67 round in Yugoslavia in the 1960s.  It destabilizes much faster than M43 after hitting a target, leading to greater damage.",
-    "ascii_picture": "762_m87",
-    "price": 150,
-    "price_postapoc": 800,
-    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 2 } }
-  },
-  {
-    "id": "reloaded_762_m43",
-    "copy-from": "762_m43",
+    "id": "762_jhp",
+    "copy-from": "762_m87",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x39mm M43, reloaded" },
-    "description": "7.62x39mm ammunition with a 121.9gr bullet.  Developed in World War 2 by the Soviet Union, the 7.62x39mm round rapidly became extremely popular all over the world.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "name": { "str_sp": "7.62x39mm JHP" },
+    "description": "7.62x39mm ammunition with a 123gr jacketed, hollowpoint bullet.  Made for hunting medium game, cartridges such as these were once popular for those using cheap military surplus rifles, as 7.62x39's ballistics are somewhat similar to that of 30-30 Winchester.  The combination of sanctions against exporting nations and drying up of formerly plentiful surplus has made these loadings of 7.62x39 less popular.",
+    "ascii_picture": "762_jhp",
+    "price": 100,
+    "price_postapoc": 750,
+    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": -8 } }
   },
   {
-    "id": "reloaded_762_m87",
-    "copy-from": "762_m87",
+    "id": "reloaded_762_jhp",
+    "copy-from": "762_jhp",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x39mm M67, reloaded" },
-    "description": "7.62x39mm M67 ammunition with a 123gr bullet.  It destabilizes much faster than M43 after hitting a target, leading to greater damage.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "name": { "str_sp": "7.62x39mm JHP, reloaded" },
+    "description": "7.62x39mm ammunition with a 123gr jacketed, hollowpoint bullet.  Made for hunting medium game, cartridges such as these were once popular for those using cheap military surplus rifles, as 7.62x39's ballistics are somewhat similar to that of 30-30 Winchester.  The combination of sanctions against exporting nations and drying up of formerly plentiful surplus has made these loadings of 7.62x39 less popular.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "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": "bp_762_m43",
-    "copy-from": "762_m43",
+    "id": "bp_762_jhp",
+    "copy-from": "762_jhp",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x39mm M43, black powder" },
-    "description": "7.62x39mm ammunition with a 121.9gr bullet.  Developed in World War 2 by the Soviet Union, the 7.62x39mm round rapidly became extremely popular all over the world.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "name": { "str_sp": "7.62x39mm JHP, black powder" },
+    "description": "7.62x39mm ammunition with a 123gr jacketed, hollowpoint bullet.  Made for hunting medium game, cartridges such as these were once popular for those using cheap military surplus rifles, as 7.62x39's ballistics are somewhat similar to that of 30-30 Winchester.  The combination of sanctions against exporting nations and drying up of formerly plentiful surplus has made these loadings of 7.62x39 less popular.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -102,12 +91,22 @@
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
+  {
+    "id": "reloaded_762_m87",
+    "copy-from": "762_m87",
+    "type": "AMMO",
+    "name": { "str_sp": "7.62x39mm FMJ, reloaded" },
+    "description": "Imported 7.62x39mm M67-style ammunition with a 124gr jacketed, lead core bullet.  Thankfully this loading has non-corrosive primers, and also features a reloadable brass case.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "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": "bp_762_m87",
     "copy-from": "762_m87",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x39mm M67, black powder" },
-    "description": "7.62x39mm M67 ammunition with a 123gr bullet.  It destabilizes much faster than M43 after hitting a target, leading to greater damage.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "name": { "str_sp": "7.62x39mm FMJ, black powder" },
+    "description": "Imported 7.62x39mm M67-style ammunition with a 124gr jacketed, lead core bullet.  Thankfully this loading has non-corrosive primers, and also features a reloadable brass case.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },

diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -237,7 +237,7 @@
     "type": "ammunition_type",
     "id": "762",
     "name": "7.62x39mm",
-    "default": "762_m43"
+    "default": "762_m87"
   },
   {
     "type": "ammunition_type",

diff --git a/data/json/obsoletion/migration_items.json b/data/json/obsoletion/migration_items.json
@@ -279,5 +279,20 @@
     "id": "20x66_inc",
     "type": "MIGRATION",
     "replace": "20x66_shot"
+  },
+  {
+    "id": "762_m43",
+    "type": "MIGRATION",
+    "replace": "762_m87"
+  },
+  {
+    "id": "reloaded_762_m43",
+    "type": "MIGRATION",
+    "replace": "reloaded_762_m87"
+  },
+  {
+    "id": "bp_762_m43",
+    "type": "MIGRATION",
+    "replace": "bp_762_m87"
   }
 ]
diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
@@ -1056,7 +1056,7 @@
     "components": [ [ [ "762R_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 29 ] ], [ [ "copper", 2 ] ] ]
   },
   {
-    "result": "reloaded_762_m43",
+    "result": "reloaded_762_m87",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
@@ -1076,12 +1076,11 @@
       [ [ "762_casing", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ],
       [ [ "gunpowder", 15 ], [ "gunpowder_magnum_pistol", 15 ], [ "gunpowder_rifle", 15 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "copper", 1 ] ]
+      [ [ "copper", 2 ] ]
     ]
   },
   {
-    "result": "bp_762_m43",
+    "result": "bp_762_m87",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
@@ -1096,26 +1095,20 @@
     "reversible": true,
     "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
-    "components": [
-      [ [ "762_casing", 1 ] ],
-      [ [ "lgrifle_primer", 1 ] ],
-      [ [ "chem_black_powder", 15 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "copper", 1 ] ]
-    ]
+    "components": [ [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 15 ] ], [ [ "copper", 2 ] ] ]
   },
   {
-    "result": "reloaded_762_m87",
+    "result": "reloaded_762_jhp",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "skill_used": "fabrication",
-    "difficulty": 5,
-    "skills_required": [ "gun", 5 ],
+    "difficulty": 4,
+    "skills_required": [ "gun", 1 ],
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ],
     "charges": 1,
     "reversible": true,
     "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 3 ] ],
@@ -1129,17 +1122,17 @@
     ]
   },
   {
-    "result": "bp_762_m87",
+    "result": "bp_762_jhp",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "skill_used": "fabrication",
-    "difficulty": 5,
-    "skills_required": [ "gun", 5 ],
+    "difficulty": 4,
+    "skills_required": [ "gun", 1 ],
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ],
     "charges": 1,
     "reversible": true,
     "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 3 ] ],

diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json
@@ -231,7 +231,7 @@
     "type": "requirement",
     "//": "References needed for boltfaces and magazines using 7.62x39 or derivatives",
     "tools": [
-      [ [ "762_casing", -1 ], [ "762_m43", -1 ], [ "762_m87", -1 ], [ "reloaded_762_m43", -1 ], [ "reloaded_762_m87", -1 ] ]
+      [ [ "762_casing", -1 ], [ "762_jhp", -1 ], [ "762_m87", -1 ], [ "reloaded_762_jhp", -1 ], [ "reloaded_762_m87", -1 ] ]
     ]
   },
   {

diff --git a/data/json/uncraft/ammo/762x39.json b/data/json/uncraft/ammo/762x39.json
@@ -1,6 +1,6 @@
 [
   {
-    "result": "762_m43",
+    "result": "762_jhp",
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "skill_used": "gun",
@@ -12,7 +12,6 @@
       [ [ "762_casing", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ],
       [ [ "gunpowder_rifle", 15 ] ],
-      [ [ "scrap", 1 ] ],
       [ [ "copper", 1 ] ]
     ]
   },

diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
@@ -236,6 +236,7 @@
       "545",
       "762_54R",
       "762_m87",
+      "762_jhp",
       "8mm_bootleg",
       "8mm_civilian",
       "8mm_jhp",
@@ -277,6 +278,7 @@
       "reloaded_303",
       "reloaded_303sp",
       "reloaded_762_54R",
+      "reloaded_762_jhp",
       "reloaded_762_m87",
       "reloaded_30carbine"
     ],
@@ -299,6 +301,7 @@
       "bp_303sp",
       "bp_762_54R",
       "bp_762_m87",
+      "bp_762_jhp",
       "bp_30carbine"
     ],
     "type": "MIGRATION",
@@ -323,7 +326,6 @@
       "556_m995",
       "762_51",
       "762_51_incendiary",
-      "762_m43",
       "762_51_m993",
       "8mm_caseless",
       "8mm_fmj",
@@ -347,8 +349,7 @@
       "reloaded_556",
       "reloaded_556_incendiary",
       "reloaded_762_51",
-      "reloaded_762_51_incendiary",
-      "reloaded_762_m43"
+      "reloaded_762_51_incendiary"
     ],
     "type": "MIGRATION",
     "replace": "reloaded_rifle_AP"
@@ -366,8 +367,7 @@
       "bp_556",
       "bp_556_incendiary",
       "bp_762_51",
-      "bp_762_51_incendiary",
-      "bp_762_m43"
+      "bp_762_51_incendiary"
     ],
     "type": "MIGRATION",
     "replace": "bp_rifle_AP"

diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json
@@ -916,7 +916,7 @@
   },
   {
     "type": "recipe",
-    "result": "reloaded_762_m43",
+    "result": "reloaded_762_jhp",
     "obsolete": true
   },
   {
@@ -1601,7 +1601,7 @@
   },
   {
     "type": "recipe",
-    "result": "reloaded_762_m43",
+    "result": "reloaded_762_jhp",
     "obsolete": true
   },
   {

diff --git a/data/mods/Magiclysm/Spells/attunements/Magnetism_Mage.json b/data/mods/Magiclysm/Spells/attunements/Magnetism_Mage.json
@@ -147,9 +147,9 @@
         [ "reloaded_545_ap", 1 ],
         [ "700nx", 1 ],
         [ "reloaded_700nx", 1 ],
-        [ "762_m43", 1 ],
+        [ "762_jhp", 1 ],
         [ "762_m87", 1 ],
-        [ "reloaded_762_m43", 1 ],
+        [ "reloaded_762_jhp", 1 ],
         [ "reloaded_762_m87", 1 ],
         [ "762_54R", 1 ],
         [ "762_25", 1 ],
@@ -170,7 +170,7 @@
         [ "reloaded_4570_pen", 1 ],
         [ "reloaded_4570_low", 1 ],
         [ "reloaded_4570_bp", 1 ],
-        [ "reloaded_762_m43", 1 ]
+        [ "reloaded_762_jhp", 1 ]
       ]
     ]
   },