diff options
Diffstat (limited to 'revert-09_undo-yet-more-ammo-balancing.patch')
| -rw-r--r-- | revert-09_undo-yet-more-ammo-balancing.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch index 596e33a..aa6efad 100644 --- a/revert-09_undo-yet-more-ammo-balancing.patch +++ b/revert-09_undo-yet-more-ammo-balancing.patch @@ -26,7 +26,6 @@ Doi data/json/items/ammo/5x50.json | 8 ++- data/json/items/ammo/8x40mm.json | 23 ++++---- data/json/items/ammo/flintlock.json | 5 +- - data/json/items/ammo/shotpaper.json | 2 +- data/json/items/generic/casing.json | 8 +-- data/json/items/handloaded_bullets.json | 8 ++- data/json/items/migration.json | 15 +++++ @@ -326,42 +325,6 @@ index 25d9b16a37b..8ca62a1bfb3 100644 { "id": "8mm_hvp", "copy-from": "8mm_caseless", -diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json -index f7fc54e73da..c51ab370e4a 100644 ---- a/data/json/items/ammo/flintlock.json -+++ b/data/json/items/ammo/flintlock.json -@@ -15,7 +15,8 @@ - "stack_size": 10, - "ammo_type": "flintlock", - "range": 12, -- "damage": { "damage_type": "bullet", "amount": 50 }, -+ "//": "Balanced as FMJ", -+ "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 22 }, - "dispersion": 90, - "recoil": 1500, - "loudness": 70, -@@ -37,7 +38,7 @@ - "stack_size": 10, - "ammo_type": "flintlock", - "range": 8, -- "damage": { "damage_type": "bullet", "amount": 45 }, -+ "damage": { "damage_type": "bullet", "amount": 63 }, - "dispersion": 20, - "recoil": 1500, - "loudness": 90, -diff --git a/data/json/items/ammo/shotpaper.json b/data/json/items/ammo/shotpaper.json -index f9915b9cf2e..40ec4081298 100644 ---- a/data/json/items/ammo/shotpaper.json -+++ b/data/json/items/ammo/shotpaper.json -@@ -44,7 +44,7 @@ - "type": "AMMO", - "name": { "str": ".62 paper cartridge" }, - "description": "A paper cartridge containing a premeasured amount of black powder and a .605 inch lead ball.", -- "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 4 } }, -+ "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 14 } }, - "delete": { "effects": [ "SHOT" ] }, - "dispersion": 100 - } diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json index 510b4ba9c1f..f486ad3126a 100644 --- a/data/json/items/generic/casing.json |