summaryrefslogtreecommitdiff
path: root/0003-inconsistent-ammo-names.patch
diff options
context:
space:
mode:
Diffstat (limited to '0003-inconsistent-ammo-names.patch')
-rw-r--r--0003-inconsistent-ammo-names.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
index a98c955..ed5528b 100644
--- a/0003-inconsistent-ammo-names.patch
+++ b/0003-inconsistent-ammo-names.patch
@@ -87,3 +87,45 @@
"description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator. This one has been hand-reloaded.",
"effects": [ "COOKOFF", "RECYCLED" ],
"relative": { "range": -15, "dispersion": 40 },
+--- a/data/json/items/ammo/357mag.json
++++ b/data/json/items/ammo/357mag.json
+@@ -53,13 +53,15 @@
+ "copy-from": "357mag_fmj",
+ "type": "AMMO",
+ "name": { "str": ".357 Magnum FMJ, reloaded", "str_pl": ".357 Magnum FMJ, reloaded" },
+- "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
++ "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 },
++ "extend": { "effects": [ "RECYCLED" ] }
+ },
+ {
+ "id": "reloaded_357mag_jhp",
+ "copy-from": "357mag_jhp",
+ "type": "AMMO",
+ "name": { "str": ".357 Magnum JHP, reloaded", "str_pl": ".357 Magnum JHP, reloaded" },
+- "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
++ "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 },
++ "extend": { "effects": [ "RECYCLED" ] }
+ }
+ ]
+--- a/data/json/items/ammo/762x25.json
++++ b/data/json/items/ammo/762x25.json
+@@ -26,7 +26,7 @@
+ "id": "762_25hot",
+ "copy-from": "762_25",
+ "type": "AMMO",
+- "name": { "str": "7.62x25mm FMJ hot load" },
++ "name": { "str": "7.62x25mm FMJ" },
+ "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet. It is more powerful than the original.",
+ "relative": { "price": 500, "range": 2, "damage": 4, "pierce": 3 },
+ "proportional": { "recoil": 1.4 }
+@@ -55,7 +55,8 @@
+ "id": "reloaded_762_25",
+ "copy-from": "762_25hot",
+ "type": "AMMO",
+- "name": { "str": "7.62x25mm, reloaded" },
+- "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 }
++ "name": { "str": "7.62x25mm FMJ, reloaded" },
++ "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 },
++ "extend": { "effects": [ "RECYCLED" ] }
+ }
+ ]