diff options
Diffstat (limited to 'revert-10_still-another-ammo-patch-to-undo.patch')
-rw-r--r-- | revert-10_still-another-ammo-patch-to-undo.patch | 130 |
1 files changed, 0 insertions, 130 deletions
diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch deleted file mode 100644 index 777a4d0..0000000 --- a/revert-10_still-another-ammo-patch-to-undo.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 1a5095256a34f230d604f879c704fb2be07aee82 Mon Sep 17 00:00:00 2001 -From: Chaosvolt <chaosvolt@users.noreply.github.com> -Date: Wed, 22 Feb 2023 16:16:38 -0600 -Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258) - -* Ammo Rebalance, Part 8 - -* Doi I forgot .50 at first ---- - data/json/items/ammo/300blk.json | 2 +- - data/json/items/ammo/4570.json | 10 +++++----- - data/json/items/ammo/545x39.json | 4 ++-- - data/json/items/ammo/700nx.json | 4 ++-- - data/json/items/ammo/762.json | 2 +- - data/json/items/ammo/762R.json | 2 +- - 12 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json -index 815d1a1702d..4e9b193b5e7 100644 ---- a/data/json/items/ammo/300blk.json -+++ b/data/json/items/ammo/300blk.json -@@ -17,7 +17,7 @@ - "ammo_type": "300blk", - "casing": "300blk_casing", - "range": 45, -- "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 24 }, -+ "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 19 }, - "dispersion": 30, - "recoil": 2000, - "effects": [ "COOKOFF" ] -diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json -index bc4f6de6ecb..048d32d35c7 100644 ---- a/data/json/items/ammo/4570.json -+++ b/data/json/items/ammo/4570.json -@@ -17,8 +17,8 @@ - "ammo_type": "4570", - "casing": "4570_casing", - "range": 48, -- "//": "Balanced as FMJ, half the expected armor penetration.", -- "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 16 }, -+ "//": "Balanced as FMJ.", -+ "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 25 }, - "dispersion": 20, - "recoil": 4300, - "effects": [ "COOKOFF" ] -@@ -33,8 +33,8 @@ - "price_postapoc": 600, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "count": 10, -- "//": "Balanced as +P, 75% of the expected armor penetration.", -- "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 14, "armor_penetration": 8 }, "recoil": 300 } -+ "//": "Balanced as +P.", -+ "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 14 }, "recoil": 300 } - }, - { - "id": "4570_low", -@@ -45,6 +45,6 @@ - "price": 250, - "price_postapoc": 400, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -- "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -16 }, "recoil": -900 } -+ "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 } - }, - { -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 -+++ b/data/json/items/ammo/545x39.json -@@ -18,7 +18,7 @@ - "ammo_type": "545x39", - "casing": "545_casing", - "range": 37, -- "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 23 }, -+ "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 18 }, - "dispersion": 30, - "recoil": 1400, - "effects": [ "COOKOFF" ] -@@ -34,7 +34,7 @@ - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "symbol": "=", - "color": "yellow", -- "//": "Balanced as AP, 7/8 damage, arpen matches damage.", -+ "//": "Balanced as AP, 7/8 damage, arpen 6/7 that value.", - "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 12 } } - } - ] -diff --git a/data/json/items/ammo/700nx.json b/data/json/items/ammo/700nx.json -index 94dd6064806..98df0003da4 100644 ---- a/data/json/items/ammo/700nx.json -+++ b/data/json/items/ammo/700nx.json -@@ -17,8 +17,8 @@ - "ammo_type": "700nx", - "casing": "700nx_casing", - "range": 42, -- "//": "Base damage of 110, balance reduction to roughly 80%, armor penetration half expected value which is still quite a lot.", -- "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 25 }, -+ "//": "Base damage of 110, balance reduction to roughly 80%.", -+ "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 39 }, - "dispersion": 15, - "recoil": 12100, - "effects": [ "COOKOFF" ] -diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json -index 959458c8f4c..fbff61d9966 100644 ---- a/data/json/items/ammo/762.json -+++ b/data/json/items/ammo/762.json -@@ -17,7 +17,7 @@ - "ammo_type": "762", - "casing": "762_casing", - "range": 30, -- "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 }, -+ "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 20 }, - "dispersion": 35, - "recoil": 2036, - "effects": [ "COOKOFF", "NEVER_MISFIRES" ] -diff --git a/data/json/items/ammo/762R.json b/data/json/items/ammo/762R.json -index 1bbdeab478b..288626ab191 100644 ---- a/data/json/items/ammo/762R.json -+++ b/data/json/items/ammo/762R.json -@@ -17,7 +17,7 @@ - "ammo_type": "762R", - "casing": "762R_casing", - "range": 75, -- "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 30 }, -+ "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 24 }, - "dispersion": 15, - "recoil": 2650, - "effects": [ "COOKOFF" ] --- -2.39.1 - |