summaryrefslogtreecommitdiff
path: root/0024-ammo-order-fix.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-18 15:29:49 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-18 15:29:49 -0700
commitf73b4306f84130eb5bf81f4e64b3bc5871215de9 (patch)
tree02d39360a9e520b636d8795bd4d5a477ff5f3f9f /0024-ammo-order-fix.patch
parentUpdated to 2021-10-16-1440 (diff)
downloadcataclysm-bn-f73b4306f84130eb5bf81f4e64b3bc5871215de9.tar.xz
Fix .50bmg ammo ordering
Fix reloaded_50bmg being incorrectly based on .50 match Add missing military base overmap patch
Diffstat (limited to '0024-ammo-order-fix.patch')
-rw-r--r--0024-ammo-order-fix.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/0024-ammo-order-fix.patch b/0024-ammo-order-fix.patch
index 01c91fb..96032ec 100644
--- a/0024-ammo-order-fix.patch
+++ b/0024-ammo-order-fix.patch
@@ -165,3 +165,39 @@
"id": "bp_460_fmj",
"copy-from": "460_fmj",
"type": "AMMO",
+
+--- a/data/json/items/ammo/50.json
++++ b/data/json/items/ammo/50.json
+@@ -1,15 +1,5 @@
+ [
+ {
+- "id": "50_incendiary",
+- "copy-from": "50bmg",
+- "type": "AMMO",
+- "name": { "str": ".50 BMG M17 tracer" },
+- "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.",
+- "count": 10,
+- "effects": [ "INCENDIARY" ],
+- "dispersion": 310
+- },
+- {
+ "id": "50bmg",
+ "type": "AMMO",
+ "name": { "str": ".50 BMG M33 Ball" },
+@@ -33,6 +23,16 @@
+ "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
+ },
+ {
++ "id": "50_incendiary",
++ "copy-from": "50bmg",
++ "type": "AMMO",
++ "name": { "str": ".50 BMG M17 tracer" },
++ "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.",
++ "count": 10,
++ "effects": [ "INCENDIARY" ],
++ "dispersion": 310
++ },
++ {
+ "id": "50match",
+ "copy-from": "50bmg",
+ "type": "AMMO",