diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-11-08 18:17:25 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-11-08 18:17:25 -0800 |
| commit | 24e76c96c608a75417e8843a194310dbe0cc59ed (patch) | |
| tree | dd02f7f1f4f7738146c06f30e9b2ad02eaed417e | |
| parent | Port 270win changes out to ammo rebalance mod. (diff) | |
| download | cataclysm-bn-24e76c96c608a75417e8843a194310dbe0cc59ed.tar.xz | |
Port out 300 changes to ammo rebalance mod.
| -rw-r--r-- | revert-08_undo-rifle-balance-pass.patch | 14 | ||||
| -rw-r--r-- | revert-10_still-another-ammo-patch-to-undo.patch | 14 |
2 files changed, 0 insertions, 28 deletions
diff --git a/revert-08_undo-rifle-balance-pass.patch b/revert-08_undo-rifle-balance-pass.patch index e37efb5..2c63290 100644 --- a/revert-08_undo-rifle-balance-pass.patch +++ b/revert-08_undo-rifle-balance-pass.patch @@ -4,7 +4,6 @@ Date: Sun, 30 Oct 2022 11:00:10 -0500 Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851) --- - data/json/items/ammo/300.json | 2 +- data/json/items/ammo/3006.json | 4 ++-- data/json/items/ammo/300blk.json | 2 +- data/json/items/ammo/36paper.json | 4 ++-- @@ -16,19 +15,6 @@ Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851) data/json/items/ammo/762R.json | 2 +- 14 files changed, 32 insertions(+), 23 deletions(-) -diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json -index 95fcb846f5e..2f4335daa40 100644 ---- a/data/json/items/ammo/300.json -+++ b/data/json/items/ammo/300.json -@@ -17,7 +17,7 @@ - "ammo_type": "300", - "casing": "300_casing", - "range": 65, -- "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 8 }, -+ "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 39 }, - "dispersion": 15, - "recoil": 4000, - "effects": [ "COOKOFF" ] diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json index 222ccaad66c..b2c82f419bf 100644 --- a/data/json/items/ammo/3006.json diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch index d95d998..607e4bb 100644 --- a/revert-10_still-another-ammo-patch-to-undo.patch +++ b/revert-10_still-another-ammo-patch-to-undo.patch @@ -7,7 +7,6 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258) * Doi I forgot .50 at first --- - data/json/items/ammo/300.json | 2 +- data/json/items/ammo/3006.json | 2 +- data/json/items/ammo/300blk.json | 2 +- data/json/items/ammo/4570.json | 10 +++++----- @@ -17,19 +16,6 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258) data/json/items/ammo/762R.json | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) -diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json -index 2f4335daa40..be8462b330c 100644 ---- a/data/json/items/ammo/300.json -+++ b/data/json/items/ammo/300.json -@@ -17,7 +17,7 @@ - "ammo_type": "300", - "casing": "300_casing", - "range": 65, -- "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 39 }, -+ "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 17 }, - "dispersion": 15, - "recoil": 4000, - "effects": [ "COOKOFF" ] diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json index b2c82f419bf..ee10a10f0ad 100644 --- a/data/json/items/ammo/3006.json |