diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-07-31 05:28:29 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-07-31 05:28:29 -0700 |
commit | bb9de31689b7fdbc9cc192267d9910e2f3275487 (patch) | |
tree | cff8e47bc04916cac2f023b55213e0c7bb0957c1 /0024-ammo-order-fix.patch | |
parent | Fix Evac3 Background trait being visisble (diff) | |
download | cataclysm-bn-bb9de31689b7fdbc9cc192267d9910e2f3275487.tar.xz |
Updated to 2021-07-31-0434
Add patch to fix ammunition ordering
Diffstat (limited to '0024-ammo-order-fix.patch')
-rw-r--r-- | 0024-ammo-order-fix.patch | 167 |
1 files changed, 167 insertions, 0 deletions
diff --git a/0024-ammo-order-fix.patch b/0024-ammo-order-fix.patch new file mode 100644 index 0000000..01c91fb --- /dev/null +++ b/0024-ammo-order-fix.patch @@ -0,0 +1,167 @@ +--- a/data/json/items/ammo/22.json ++++ b/data/json/items/ammo/22.json +@@ -1,16 +1,5 @@ + [ + { +- "id": "22_cphp", +- "copy-from": "22_lr", +- "type": "AMMO", +- "name": { "str": ".22 CPHP" }, +- "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets. Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.", +- "//": "Hollowpoint damage increase of 25%", +- "damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 0 }, +- "relative": { "range": 3 }, +- "proportional": { "recoil": 1.5 } +- }, +- { + "id": "22_lr", + "type": "AMMO", + "name": { "str": ".22 LR" }, +@@ -35,6 +24,17 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "22_cphp", ++ "copy-from": "22_lr", ++ "type": "AMMO", ++ "name": { "str": ".22 CPHP" }, ++ "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets. Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.", ++ "//": "Hollowpoint damage increase of 25%", ++ "damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 0 }, ++ "relative": { "range": 3 }, ++ "proportional": { "recoil": 1.5 } ++ }, ++ { + "id": "22_ratshot", + "copy-from": "22_cphp", + "type": "AMMO", +--- a/data/json/items/ammo/38.json ++++ b/data/json/items/ammo/38.json +@@ -1,14 +1,5 @@ + [ + { +- "id": "38_fmj", +- "copy-from": "38_special", +- "type": "AMMO", +- "name": { "str": ".38 FMJ" }, +- "description": ".38 Special ammunition with brass jacketed 130gr bullets. The .38 Special round has been known from its inception for its accuracy and low recoil.", +- "//": "Base damage of 20, balance increase of two-nineths.", +- "relative": { "damage": { "damage_type": "stab", "amount": -6, "armor_penetration": 14 } } +- }, +- { + "id": "38_special", + "type": "AMMO", + "name": { "str": ".38 Special" }, +@@ -33,6 +24,15 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "38_fmj", ++ "copy-from": "38_special", ++ "type": "AMMO", ++ "name": { "str": ".38 FMJ" }, ++ "description": ".38 Special ammunition with brass jacketed 130gr bullets. The .38 Special round has been known from its inception for its accuracy and low recoil.", ++ "//": "Base damage of 20, balance increase of two-nineths.", ++ "relative": { "damage": { "damage_type": "stab", "amount": -6, "armor_penetration": 14 } } ++ }, ++ { + "id": "reloaded_38_fmj", + "copy-from": "38_fmj", + "type": "AMMO", +--- a/data/json/items/ammo/40.json ++++ b/data/json/items/ammo/40.json +@@ -1,14 +1,5 @@ + [ + { +- "id": "40fmj", +- "copy-from": "40sw", +- "type": "AMMO", +- "name": { "str": ".40 S&W FMJ" }, +- "description": ".40 S&W ammunition with 180gr FMJ bullets. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.", +- "//": "Base damage of 23, balance increase of two-nineths.", +- "relative": { "damage": { "damage_type": "stab", "amount": -7, "armor_penetration": 16 } } +- }, +- { + "id": "40sw", + "type": "AMMO", + "name": { "str": ".40 S&W JHP" }, +@@ -33,6 +24,15 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "40fmj", ++ "copy-from": "40sw", ++ "type": "AMMO", ++ "name": { "str": ".40 S&W FMJ" }, ++ "description": ".40 S&W ammunition with 180gr FMJ bullets. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.", ++ "//": "Base damage of 23, balance increase of two-nineths.", ++ "relative": { "damage": { "damage_type": "stab", "amount": -7, "armor_penetration": 16 } } ++ }, ++ { + "id": "bp_40fmj", + "copy-from": "40fmj", + "type": "AMMO", +--- a/data/json/items/ammo/45.json ++++ b/data/json/items/ammo/45.json +@@ -1,14 +1,5 @@ + [ + { +- "id": "45_acp", +- "copy-from": "45_jhp", +- "type": "AMMO", +- "name": { "str": ".45 ACP FMJ" }, +- "description": ".45 ACP ammunition with 230gr FMJ bullets. Noted for its stopping power, the .45 ACP round has been common for almost 150 years.", +- "//": "Base damage of 27, balance increase of two-nineths.", +- "relative": { "damage": { "damage_type": "stab", "amount": -8, "armor_penetration": 18 } } +- }, +- { + "id": "45_jhp", + "type": "AMMO", + "name": { "str": ".45 ACP JHP" }, +@@ -32,6 +23,15 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "45_acp", ++ "copy-from": "45_jhp", ++ "type": "AMMO", ++ "name": { "str": ".45 ACP FMJ" }, ++ "description": ".45 ACP ammunition with 230gr FMJ bullets. Noted for its stopping power, the .45 ACP round has been common for almost 150 years.", ++ "//": "Base damage of 27, balance increase of two-nineths.", ++ "relative": { "damage": { "damage_type": "stab", "amount": -8, "armor_penetration": 18 } } ++ }, ++ { + "id": "45_super", + "copy-from": "45_jhp", + "type": "AMMO", +--- a/data/json/items/ammo/460.json ++++ b/data/json/items/ammo/460.json +@@ -1,13 +1,5 @@ + [ + { +- "id": "460_fmj", +- "copy-from": "460_rowland", +- "type": "AMMO", +- "name": { "str": ".460 Rowland HCFN" }, +- "description": "A plated, hard cast flat nosed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.", +- "relative": { "damage": { "damage_type": "stab", "amount": -4, "armor_penetration": 8 } } +- }, +- { + "id": "460_rowland", + "copy-from": "44magnum", + "type": "AMMO", +@@ -18,6 +10,14 @@ + "proportional": { "range": 0.95, "damage": { "damage_type": "stab", "amount": 0.95, "armor_penetration": 0.95 }, "recoil": 0.95 } + }, + { ++ "id": "460_fmj", ++ "copy-from": "460_rowland", ++ "type": "AMMO", ++ "name": { "str": ".460 Rowland HCFN" }, ++ "description": "A plated, hard cast flat nosed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.", ++ "relative": { "damage": { "damage_type": "stab", "amount": -4, "armor_penetration": 8 } } ++ }, ++ { + "id": "bp_460_fmj", + "copy-from": "460_fmj", + "type": "AMMO", |