diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-11-08 18:23:04 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-11-08 18:23:04 -0800 |
| commit | 34326bc85de77c66c764e6a3f808e7e16a58d140 (patch) | |
| tree | 0d8b4170fe9b572583396ab90e1eda12eb05c35c | |
| parent | Port out 300 changes to ammo rebalance mod. (diff) | |
| download | cataclysm-bn-34326bc85de77c66c764e6a3f808e7e16a58d140.tar.xz | |
Port out 30-06 changes to ammo rebalance mod.
| -rw-r--r-- | revert-08_undo-rifle-balance-pass.patch | 23 | ||||
| -rw-r--r-- | revert-10_still-another-ammo-patch-to-undo.patch | 14 |
2 files changed, 0 insertions, 37 deletions
diff --git a/revert-08_undo-rifle-balance-pass.patch b/revert-08_undo-rifle-balance-pass.patch index 2c63290..ea0b3aa 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/3006.json | 4 ++-- data/json/items/ammo/300blk.json | 2 +- data/json/items/ammo/36paper.json | 4 ++-- data/json/items/ammo/44paper.json | 4 ++-- @@ -15,28 +14,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/3006.json b/data/json/items/ammo/3006.json -index 222ccaad66c..b2c82f419bf 100644 ---- a/data/json/items/ammo/3006.json -+++ b/data/json/items/ammo/3006.json -@@ -17,7 +17,7 @@ - "ammo_type": "3006", - "casing": "3006_casing", - "range": 61, -- "damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 10 }, -+ "damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 35 }, - "dispersion": 20, - "recoil": 3800, - "effects": [ "COOKOFF" ] -@@ -36,7 +36,7 @@ - "type": "AMMO", - "name": { "str": ".30-06 M2 AP" }, - "description": "Armor piercing .30-06 M2 ammunition with 168gr FMJ bullets. It is an extremely powerful and accurate cartridge but pays for its armor penetration abilities with lowered damage.", -- "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } } -+ "relative": { "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 19 } } - }, - { - "id": "bp_3006", diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json index bdff5be36f5..815d1a1702d 100644 --- a/data/json/items/ammo/300blk.json diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch index 607e4bb..777a4d0 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/3006.json | 2 +- data/json/items/ammo/300blk.json | 2 +- data/json/items/ammo/4570.json | 10 +++++----- data/json/items/ammo/545x39.json | 4 ++-- @@ -16,19 +15,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/3006.json b/data/json/items/ammo/3006.json -index b2c82f419bf..ee10a10f0ad 100644 ---- a/data/json/items/ammo/3006.json -+++ b/data/json/items/ammo/3006.json -@@ -17,7 +17,7 @@ - "ammo_type": "3006", - "casing": "3006_casing", - "range": 61, -- "damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 35 }, -+ "damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 27 }, - "dispersion": 20, - "recoil": 3800, - "effects": [ "COOKOFF" ] 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 |