summaryrefslogtreecommitdiff
path: root/0003-inconsistent-ammo-names.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-05-16 07:27:34 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-05-16 07:27:34 -0700
commit884fff51c328485e8ce68e5436dae385ee8ffbf1 (patch)
tree6d1fdbaae79d6fe601551aac51f7fa32b04f77da /0003-inconsistent-ammo-names.patch
parentUpdate tileset (diff)
downloadcataclysm-bn-884fff51c328485e8ce68e5436dae385ee8ffbf1.tar.xz
Update to Bright Nights 1820
Remove legacy tileset Remove old mod references
Diffstat (limited to '0003-inconsistent-ammo-names.patch')
-rw-r--r--0003-inconsistent-ammo-names.patch37
1 files changed, 34 insertions, 3 deletions
diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
index abfca23..a73c092 100644
--- a/0003-inconsistent-ammo-names.patch
+++ b/0003-inconsistent-ammo-names.patch
@@ -72,7 +72,7 @@
"copy-from": "762_51",
"type": "AMMO",
- "name": { "str": "7.62x51mm NATO tracer" },
-+ "name": { "str": "7.62x51mm NATO M82 tracer" },
++ "name": { "str": "7.62x51mm NATO M62 tracer" },
"description": "This ammunition is a one-in-five mix of M80 and M62 tracer rounds to help keep the weapon they are fired from on target.",
"extend": { "effects": [ "INCENDIARY" ] }
},
@@ -90,7 +90,7 @@
"copy-from": "762_51_incendiary",
"type": "AMMO",
- "name": { "str": "7.62x51mm tracer, black powder" },
-+ "name": { "str": "7.62x51mm NATO M82 tracer, black powder" },
++ "name": { "str": "7.62x51mm NATO M62 tracer, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
@@ -108,7 +108,7 @@
"copy-from": "762_51_incendiary",
"type": "AMMO",
- "name": { "str": "7.62x51mm incendiary, reloaded" },
-+ "name": { "str": "7.62x51mm NATO M82 incendiary, reloaded" },
++ "name": { "str": "7.62x51mm NATO M62 incendiary, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -136,6 +136,37 @@
"damage": { "damage_type": "stab", "amount": 42, "armor_penetration": 0 }
},
{
+--- a/data/json/items/ammo/45.json
++++ b/data/json/items/ammo/45.json
+@@ -76,7 +76,7 @@
+ "id": "reloaded_45_acp",
+ "copy-from": "45_acp",
+ "type": "AMMO",
+- "name": { "str": ".45 FMJ, reloaded" },
++ "name": { "str": ".45 ACP FMJ, reloaded" },
+ "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+ "extend": { "effects": [ "RECYCLED" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+--- a/data/json/items/ammo/50.json
++++ b/data/json/items/ammo/50.json
+@@ -70,7 +70,7 @@
+ "id": "reloaded_50_incendiary",
+ "copy-from": "50_incendiary",
+ "type": "AMMO",
+- "name": { "str": ".50 BMG tracer, reloaded" },
++ "name": { "str": ".50 BMG M17 tracer, reloaded" },
+ "description": "A tracer variant of the powerful .50 BMG round. Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances. This one has been hand-reloaded.",
+ "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+ "extend": { "effects": [ "RECYCLED" ] },
+@@ -90,7 +90,7 @@
+ "id": "reloaded_50ss",
+ "copy-from": "50ss",
+ "type": "AMMO",
+- "name": { "str": ".50 BMG AP, reloaded" },
++ "name": { "str": ".50 BMG M2 AP, reloaded" },
+ "description": "Variant of the .50 BMG round that uses a core hardened steel. Penetration is increased, but damage is reduced. This one has been hand-reloaded.",
+ "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+ "extend": { "effects": [ "RECYCLED" ] },
--- a/data/json/items/ammo/5x50.json
+++ b/data/json/items/ammo/5x50.json
@@ -38,7 +38,7 @@