diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-05-28 22:00:05 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-05-28 22:00:05 -0700 |
| commit | 19706f99eb954ea5fcc0019594b71e54e8ed8103 (patch) | |
| tree | 772526f28a14e37e233ebb471df5402688ab5f46 /ammo-10_ammo-order-fix.patch | |
| parent | Updated to 2022-04-21-1455 (diff) | |
| download | cataclysm-bn-19706f99eb954ea5fcc0019594b71e54e8ed8103.tar.xz | |
Updated to 2022-05-28-1540
Fix ammo order patch
Fix revert-no-filth patch
Add revert-remove-hub01-basement patch
Add revert-remove-handload-quality patch
Diffstat (limited to 'ammo-10_ammo-order-fix.patch')
| -rw-r--r-- | ammo-10_ammo-order-fix.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch index fbefbbb..9fd6e55 100644 --- a/ammo-10_ammo-order-fix.patch +++ b/ammo-10_ammo-order-fix.patch @@ -224,6 +224,60 @@ "copy-from": "40fmj", "type": "AMMO", +--- a/data/json/items/ammo/44.json ++++ b/data/json/items/ammo/44.json +@@ -1,14 +1,5 @@ + [ + { +- "id": "44fmj", +- "copy-from": "44magnum", +- "type": "AMMO", +- "name": { "str": ".44 Magnum FMJ" }, +- "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration at the cost of reduced damage from expansion.", +- "//": "Base damage of 36, balance increase of one-nineth.", +- "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 23 } } +- }, +- { + "id": "44magnum", + "type": "AMMO", + "name": { "str": ".44 Magnum" }, +@@ -33,13 +24,13 @@ + "effects": [ "COOKOFF" ] + }, + { +- "id": "reloaded_44fmj", +- "copy-from": "44fmj", ++ "id": "44fmj", ++ "copy-from": "44magnum", + "type": "AMMO", +- "name": { "str": ".44 Magnum FMJ, reloaded" }, +- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, +- "extend": { "effects": [ "RECYCLED" ] }, +- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ "name": { "str": ".44 Magnum FMJ" }, ++ "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration at the cost of reduced damage from expansion.", ++ "//": "Base damage of 36, balance increase of one-nineth.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 23 } } + }, + { + "id": "reloaded_44magnum", +@@ -49,6 +40,15 @@ + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ }, ++ { ++ "id": "reloaded_44fmj", ++ "copy-from": "44fmj", ++ "type": "AMMO", ++ "name": { "str": ".44 Magnum FMJ, reloaded" }, ++ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, ++ "extend": { "effects": [ "RECYCLED" ] }, ++ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "bp_44magnum", + --- a/data/json/items/ammo/45.json +++ b/data/json/items/ammo/45.json @@ -1,14 +1,5 @@ |