summaryrefslogtreecommitdiff
path: root/revert-09_undo-yet-more-ammo-balancing.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-09_undo-yet-more-ammo-balancing.patch')
-rw-r--r--revert-09_undo-yet-more-ammo-balancing.patch34
1 files changed, 4 insertions, 30 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index 6d2f0c3..11d3a7e 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -23,7 +23,6 @@ Doi
data/json/itemgroups/military.json | 4 +-
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/generic/casing.json | 8 +--
data/json/items/handloaded_bullets.json | 8 ++-
@@ -280,31 +279,6 @@ index 4541de0dab2..aeb0d2e732e 100644
- "extend": { "effects": [ "SHOT" ] }
}
]
-diff --git a/data/json/items/ammo/5x50.json b/data/json/items/ammo/5x50.json
-index efd00754091..49ba3eb858e 100644
---- a/data/json/items/ammo/5x50.json
-+++ b/data/json/items/ammo/5x50.json
-@@ -15,7 +15,8 @@
- "ammo_type": "5x50",
- "casing": "5x50_hull",
- "range": 60,
-- "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 30 },
-+ "//": "Balanced as AP",
-+ "damage": { "damage_type": "bullet", "amount": 30, "armor_penetration": 26 },
- "dispersion": 60,
- "recoil": 400,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-@@ -31,7 +32,8 @@
- "weight": "9 g",
- "price": 1688,
- "price_postapoc": 2400,
-- "relative": { "range": -10, "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": 20 }, "dispersion": 20 },
-- "proportional": { "recoil": 1.1 }
-+ "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
-+ "relative": { "range": -10, "damage": { "damage_type": "bullet", "amount": 8, "armor_penetration": 13 } },
-+ "proportional": { "dispersion": 1.5, "recoil": 1.5 }
- }
- ]
diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
index 25d9b16a37b..8ca62a1bfb3 100644
--- a/data/json/items/ammo/8x40mm.json
@@ -332,7 +306,7 @@ index 510b4ba9c1f..f486ad3126a 100644
"type": "GENERIC",
"category": "spare_parts",
"name": { "str": "40x46mm M212 casing" },
-- "description": "A large canister from a spent 40mm cartridge.",
+- "description": "A large canister from a spent 40mm cartridge, used by M1006 stun rounds.",
+ "description": "A large canister from a spent 40mm cartridge, used by M1006 stun rounds. Not very useful now that the world has ended; less-lethal rounds aren't very useful against undead, and it likely won't tolerate higher pressures.",
"weight": "50 g",
"volume": "55ml",
@@ -341,7 +315,7 @@ index 510b4ba9c1f..f486ad3126a 100644
"type": "GENERIC",
"category": "spare_parts",
"name": { "str": "40x46mm M118 casing" },
-- "description": "A large canister from a spent 40mm cartridge.",
+- "description": "A large canister from a spent 40mm cartridge, used by M433 HEDP rounds.",
+ "description": "A large canister from a spent 40mm cartridge, used by M433 HEDP rounds. It could be repurposed for makeshift buckshot and other handloads.",
"weight": "50 g",
"volume": "58ml",
@@ -350,7 +324,7 @@ index 510b4ba9c1f..f486ad3126a 100644
"type": "GENERIC",
"category": "spare_parts",
"name": { "str": "40x46mm M199 casing" },
-- "description": "A large canister from a spent 40mm cartridge.",
+- "description": "A large canister from a spent 40mm cartridge, used by M576 buckshot rounds.",
+ "description": "A large canister from a spent 40mm cartridge, used by M576 buckshot rounds. It could be reused to make new buckshot or other makeshift handloads.",
"weight": "50 g",
"volume": "59ml",
@@ -359,7 +333,7 @@ index 510b4ba9c1f..f486ad3126a 100644
"type": "GENERIC",
"category": "spare_parts",
"name": { "str": "40x46mm M195 casing" },
-- "description": "A large canister from a spent 40mm cartridge.",
+- "description": "A large canister from a spent 40mm cartridge, used by M651 teargas rounds.",
+ "description": "A large canister from a spent 40mm cartridge, used by M651 teargas rounds. Not very useful now that the world has ended; less-lethal rounds aren't very useful against undead, and it likely won't tolerate higher pressures.",
"weight": "50 g",
"volume": "45ml",