diff options
Diffstat (limited to 'revert-09_undo-yet-more-ammo-balancing.patch')
| -rw-r--r-- | revert-09_undo-yet-more-ammo-balancing.patch | 72 |
1 files changed, 2 insertions, 70 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch index b8a7555..f22c895 100644 --- a/revert-09_undo-yet-more-ammo-balancing.patch +++ b/revert-09_undo-yet-more-ammo-balancing.patch @@ -21,13 +21,11 @@ Doi --- .../itemgroups/Weapons_Mods_Ammo/ammo.json | 1 - data/json/itemgroups/military.json | 4 +- - data/json/items/ammo/20x66mm.json | 6 +- data/json/items/ammo/40x46mm.json | 57 ++++++++----------- data/json/items/ammo/40x53mm.json | 29 +++------- 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/shot.json | 10 ++-- data/json/items/ammo/shotpaper.json | 2 +- data/json/items/generic/casing.json | 8 +-- data/json/items/handloaded_bullets.json | 8 ++- @@ -76,30 +74,6 @@ index 67766ba566a..8f564eb87aa 100644 { "item": "8mm_inc", "prob": 6 }, { "item": "8mm_caseless", "prob": 6 }, { "item": "m202_flash", "prob": 15 }, -diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json -index 8acdf92f7af..51999520c8b 100644 ---- a/data/json/items/ammo/20x66mm.json -+++ b/data/json/items/ammo/20x66mm.json -@@ -84,7 +84,8 @@ - "price_postapoc": 4000, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "count": 10, -- "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } } -+ "//": "Balanced as AP.", -+ "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } } - }, - { - "id": "20x66_frag", -@@ -142,7 +143,8 @@ - "price": 1500, - "price_postapoc": 4000, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -- "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 }, -+ "//": "Balanced as FMJ", -+ "damage": { "damage_type": "bullet", "amount": 48, "armor_penetration": 21 }, - "relative": { "range": 12 }, - "proportional": { "dispersion": 1.3 }, - "delete": { "effects": [ "SHOT" ] } diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json index 530278fd5d8..352b67d154c 100644 --- a/data/json/items/ammo/40x46mm.json @@ -394,7 +368,7 @@ index f7fc54e73da..c51ab370e4a 100644 @@ -15,7 +15,8 @@ "stack_size": 10, "ammo_type": "flintlock", - "range": 6, + "range": 12, - "damage": { "damage_type": "bullet", "amount": 50 }, + "//": "Balanced as FMJ", + "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 22 }, @@ -404,54 +378,12 @@ index f7fc54e73da..c51ab370e4a 100644 @@ -37,7 +38,7 @@ "stack_size": 10, "ammo_type": "flintlock", - "range": 4, + "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/shot.json b/data/json/items/ammo/shot.json -index 619ab4ab64c..351347b7fc6 100644 ---- a/data/json/items/ammo/shot.json -+++ b/data/json/items/ammo/shot.json -@@ -30,7 +30,7 @@ - "copy-from": "shot_flechette", - "type": "AMMO", - "name": { "str": "flechette shell, black powder" }, -- "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, -+ "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.8 }, "dispersion": 1.2 }, - "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, -@@ -39,7 +39,7 @@ - "copy-from": "shot_slug", - "type": "AMMO", - "name": { "str": "shotgun slug, black powder" }, -- "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, -+ "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.8 }, "dispersion": 1.2 }, - "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, -@@ -123,7 +123,8 @@ - "price_postapoc": 800, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "count": 10, -- "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 12 } } -+ "//": "Balanced as standard AP.", -+ "relative": { "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 30 } } - }, - { - "id": "shot_he", -@@ -168,7 +169,8 @@ - "price_postapoc": 400, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "dispersion": 100, -- "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } }, -+ "//": "Balanced as FMJ", -+ "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 18 } }, - "proportional": { "recoil": 1.4 }, - "delete": { "effects": [ "SHOT" ] } - } 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 |