Use bismuth in recipes, related ammo fixes (#2952)

cataclysmbnteam · Jun 23, 2023 · 321411e · 321411e
1 parent a84bac1
commit 321411e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json
@@ -46,5 +46,15 @@
     "price_postapoc": 400,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 }
+  },
+  {
+    "id": "reloaded_4570_bp",
+    "copy-from": "4570_low",
+    "type": "AMMO",
+    "name": { "str": ".45-70, black powder" },
+    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications.  Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch.  This one has been hand-loaded.",
+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/data/json/recipes/ammo/other.json b/data/json/recipes/ammo/other.json
@@ -300,7 +300,7 @@
       [ [ "brick_kiln", 10 ], [ "kiln", 10 ], [ "surface_heat", 10, "LIST" ] ],
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ]
     ],
-    "components": [ [ [ "lead", 50 ] ] ]
+    "components": [ [ [ "lead", 50 ], [ "bismuth", 125 ] ] ]
   },
   {
     "result": "sling_bullet_small",
@@ -317,6 +317,6 @@
       [ [ "brick_kiln", 10 ], [ "kiln", 10 ], [ "surface_heat", 10, "LIST" ] ],
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ]
     ],
-    "components": [ [ [ "lead", 50 ] ] ]
+    "components": [ [ [ "lead", 50 ], [ "bismuth", 125 ] ] ]
   }
 ]
diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
@@ -393,7 +393,7 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
-    "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ], [ [ "lead", 9 ] ] ]
+    "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ] ]
   },
   {
     "result": "5x50dart",

diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json
@@ -9,7 +9,7 @@
     "id": "ammo_bullet",
     "type": "requirement",
     "//": "Materials used when forming bullets",
-    "components": [ [ [ "lead", 1 ] ] ]
+    "components": [ [ [ "lead", 1 ], [ "bismuth", 3 ] ] ]
   },
   {
     "id": "chem_lye",
@@ -196,7 +196,7 @@
     "id": "weights",
     "type": "requirement",
     "//": "Materials used for adding weight to weapons and to other items. The materials should be malleable, ductile and dense.",
-    "components": [ [ [ "lead", 5 ], [ "silver_small", 5 ], [ "gold_small", 3 ], [ "platinum_small", 3 ] ] ]
+    "components": [ [ [ "lead", 5 ], [ "bismuth", 8 ], [ "silver_small", 5 ], [ "gold_small", 3 ], [ "platinum_small", 3 ] ] ]
   },
   {
     "id": "plastics",

diff --git a/data/json/uncraft/ammo/4570.json b/data/json/uncraft/ammo/4570.json
@@ -34,15 +34,5 @@
     "qualities": [ { "id": "PULL", "level": 2 } ],
     "components": [ [ [ "lead", 8 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ],
     "charges": 1
-  },
-  {
-    "id": "reloaded_4570_bp",
-    "copy-from": "4570_low",
-    "type": "AMMO",
-    "name": { "str": ".45-70, black powder" },
-    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications.  Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch.  This one has been hand-loaded.",
-    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
-    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]