diff options
Diffstat (limited to 'revert-09_undo-yet-more-ammo-balancing.patch')
| -rw-r--r-- | revert-09_undo-yet-more-ammo-balancing.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch index 11d3a7e..8660096 100644 --- a/revert-09_undo-yet-more-ammo-balancing.patch +++ b/revert-09_undo-yet-more-ammo-balancing.patch @@ -25,7 +25,6 @@ Doi data/json/items/ammo/40x53mm.json | 29 +++------- data/json/items/ammo/8x40mm.json | 23 ++++---- data/json/items/generic/casing.json | 8 +-- - data/json/items/handloaded_bullets.json | 8 ++- data/json/items/migration.json | 15 +++++ data/json/obsoletion/recipes.json | 10 ++++ data/json/professions.json | 4 +- @@ -338,39 +337,6 @@ index 510b4ba9c1f..f486ad3126a 100644 "weight": "50 g", "volume": "45ml", "material": "steel", -diff --git a/data/json/items/handloaded_bullets.json b/data/json/items/handloaded_bullets.json -index 1d6da22013b..937239328dd 100644 ---- a/data/json/items/handloaded_bullets.json -+++ b/data/json/items/handloaded_bullets.json -@@ -13,7 +13,8 @@ - "weight": "3 g", - "bashing": 1, - "ammo_type": "blunderbuss", -- "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 8 }, -+ "//": "Half the expected armor pernetration, additionally all blinderbuss rounds have an armor multiplier.", -+ "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 12, "armor_multiplier": 1.5 }, - "range": 12, - "dispersion": 60, - "recoil": 840, -@@ -33,7 +34,7 @@ - "weight": "2 g", - "bashing": 1, - "ammo_type": "blunderbuss", -- "damage": { "damage_type": "bullet", "amount": 60 }, -+ "damage": { "damage_type": "bullet", "amount": 55, "armor_multiplier": 1.5 }, - "range": 6, - "recoil": 780, - "effects": [ "COOKOFF", "SHOT", "RECYCLED" ] -@@ -52,7 +53,8 @@ - "weight": "3 g", - "bashing": 1, - "ammo_type": "blunderbuss", -- "damage": { "damage_type": "bullet", "amount": 53, "armor_penetration": 12 }, -+ "//": "Balanced as standard FMJ to allow lower damage but more penetration over shot.", -+ "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 24, "armor_multiplier": 1.5 }, - "range": 10, - "recoil": 840, - "effects": [ "COOKOFF", "SHOT", "RECYCLED" ] diff --git a/data/json/items/migration.json b/data/json/items/migration.json index ed67da394f0..31158a8187c 100644 --- a/data/json/obsoletion/migration.json |