diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-10-04 21:12:46 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-10-04 21:12:46 -0700 |
| commit | dd3db501548b1137d89a087c4784c022fa17a13c (patch) | |
| tree | d8e63c607233189c22f7c06804f4ab17dc4dcb08 /revert-10_still-another-ammo-patch-to-undo.patch | |
| parent | Move 50bmg copy-from fix to after the ammo order fix. (diff) | |
| download | cataclysm-bn-dd3db501548b1137d89a087c4784c022fa17a13c.tar.xz | |
Clean out 50 bmg from the reverts.
Remove some clutter from the handloaded revert.
Diffstat (limited to 'revert-10_still-another-ammo-patch-to-undo.patch')
| -rw-r--r-- | revert-10_still-another-ammo-patch-to-undo.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch index d880c5f..0cd3b51 100644 --- a/revert-10_still-another-ammo-patch-to-undo.patch +++ b/revert-10_still-another-ammo-patch-to-undo.patch @@ -12,7 +12,6 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258) data/json/items/ammo/3006.json | 2 +- data/json/items/ammo/300blk.json | 2 +- data/json/items/ammo/4570.json | 10 +++++----- - data/json/items/ammo/50.json | 4 ++-- data/json/items/ammo/545x39.json | 4 ++-- data/json/items/ammo/700nx.json | 4 ++-- data/json/items/ammo/762.json | 2 +- @@ -105,28 +104,6 @@ index bc4f6de6ecb..048d32d35c7 100644 + "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 } }, { -diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json -index 3edf19bbc59..3338049784d 100644 ---- a/data/json/items/ammo/50.json -+++ b/data/json/items/ammo/50.json -@@ -28,7 +28,7 @@ - "casing": "50_casing", - "range": 110, - "//": "Base damage of 131, balance reduction to roughly 75%.", -- "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 56 }, -+ "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 44 }, - "dispersion": 150, - "recoil": 5000, - "effects": [ "COOKOFF", "NEVER_MISFIRES" ] -@@ -51,7 +51,7 @@ - "description": "Variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel. Penetration is increased, but damage is reduced.", - "count": 10, - "//": "Balanced as AP, 7/8 damage, arpen matches damage.", -- "relative": { "damage": { "damage_type": "bullet", "amount": -12, "armor_penetration": 32 } }, -+ "relative": { "damage": { "damage_type": "bullet", "amount": -12, "armor_penetration": 31 } }, - "dispersion": 600 - }, - { diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json index 1ef50ff5e28..de5d665d24d 100644 --- a/data/json/items/ammo/545x39.json |