summaryrefslogtreecommitdiff
path: root/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch')
-rw-r--r--revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch b/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch
new file mode 100644
index 0000000..d123347
--- /dev/null
+++ b/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch
@@ -0,0 +1,32 @@
+From 321411e0dca04ec7d218acc2351053ba0f63edab Mon Sep 17 00:00:00 2001
+From: Chaosvolt <chaosvolt@users.noreply.github.com>
+Date: Fri, 23 Jun 2023 01:31:18 -0500
+Subject: [PATCH] Use bismuth in recipes, related ammo fixes (#2952)
+
+---
+ data/json/items/ammo/4570.json | 10 ++++++++++
+ 5 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json
+index 048d32d35c7..fb2961ab382 100644
+--- a/data/json/items/ammo/4570.json
++++ b/data/json/items/ammo/4570.json
+@@ -46,5 +46,15 @@
+ "price_postapoc": "4 USD",
+ "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" ] }
+ }
+ ]
+--
+2.40.1
+