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.patch207
1 files changed, 2 insertions, 205 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index 8660096..01dd4e1 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -24,7 +24,6 @@ Doi
data/json/items/ammo/40x46mm.json | 57 ++++++++-----------
data/json/items/ammo/40x53mm.json | 29 +++-------
data/json/items/ammo/8x40mm.json | 23 ++++----
- data/json/items/generic/casing.json | 8 +--
data/json/items/migration.json | 15 +++++
data/json/obsoletion/recipes.json | 10 ++++
data/json/professions.json | 4 +-
@@ -74,60 +73,7 @@ diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.js
index 530278fd5d8..352b67d154c 100644
--- a/data/json/items/ammo/40x46mm.json
+++ b/data/json/items/ammo/40x46mm.json
-@@ -22,7 +22,7 @@
- "id": "40x46mm_m1006",
- "copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm M1006" },
-+ "name": { "str": "40x46mm M1006 stun" },
- "description": "A low velocity less-lethal 40x46mm round with a foam and plastic projectile intended to cause pain and disorientation to the target. May still injure or kill.",
- "weight": "68 g",
- "damage": { "damage_type": "bash", "amount": 20 },
-@@ -33,7 +33,7 @@
- "id": "40x46mm_m433",
- "copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm M433" },
-+ "name": { "str": "40x46mm M433 HEDP" },
- "description": "A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
- "weight": "230 g",
- "damage": { "damage_type": "bullet", "amount": 200, "armor_penetration": 30 },
-@@ -44,11 +44,11 @@
- "id": "40x46mm_m576",
- "copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm M576" },
-+ "name": { "str": "40x46mm M576 buckshot" },
- "description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
- "weight": "120 g",
- "range": 12,
-- "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 4 },
-+ "damage": { "damage_type": "bullet", "amount": 120 },
- "recoil": 1000,
- "casing": "40x46mm_m199_casing",
- "extend": { "effects": [ "SHOT" ] }
-@@ -57,7 +57,7 @@
- "id": "40x46mm_m651",
- "copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm M651" },
-+ "name": { "str": "40x46mm M651 teargas" },
- "description": "A low velocity 40mm tear gas canister. It is effective for riot control and driving infantry from entrenched positions",
- "weight": "290 g",
- "damage": { "damage_type": "bullet", "amount": 15 },
-@@ -69,37 +69,25 @@
- "id": "40x46mm_buckshot_m118",
- "copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm buckshot" },
-- "description": "An improvised 40x46mm buckshot load somewhat resembling M576.",
-+ "name": { "str": "improvised 40x46mm buckshot" },
-+ "description": "An improvised 40x46mm buckshot load somewhat resembling M576. Aside from using the M118 casing normally used by HEDP shells, it performs as well as buckshot loads using the intended M199 casing.",
- "weight": "120 g",
- "range": 10,
-- "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 4 },
-+ "damage": { "damage_type": "bullet", "amount": 120 },
- "recoil": 1000,
+@@ -69,19 +69,6 @@
"casing": "40x46mm_m118_casing",
"extend": { "effects": [ "SHOT" ] }
},
@@ -147,120 +93,11 @@ index 530278fd5d8..352b67d154c 100644
{
"id": "40x46mm_slug_m118",
"copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm slug" },
-- "description": "An improvised 40x46mm load resembling an oversized shotgun slug.",
-+ "name": { "str": "improvised 40x46mm slug" },
-+ "description": "An improvised 40x46mm load resembling an oversized shotgun slug. Aside from using the M118 casing normally used by HEDP shells, it performs as well as slugs using the M199 casing.",
- "weight": "120 g",
- "range": 10,
-- "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 6 },
-+ "//": "Balanced as FMJ.",
-+ "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42 },
- "recoil": 1000,
- "casing": "40x46mm_m118_casing"
- },
-@@ -107,11 +95,12 @@
- "id": "40x46mm_slug_m199",
- "copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm slug" },
-- "description": "An improvised 40x46mm load resembling an oversized shotgun slug.",
-+ "name": { "str": "improvised 40x46mm slug" },
-+ "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into the M199 casing used by M576 buckshot shells.",
- "weight": "120 g",
- "range": 10,
-- "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 6 },
-+ "//": "Balanced as FMJ.",
-+ "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42 },
- "recoil": 1000,
- "casing": "40x46mm_m199_casing"
- },
-@@ -119,11 +108,12 @@
- "id": "40x46mm_flechette_m118",
- "copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm flechette" },
-- "description": "An improvised 40x46mm flechette load containing 70 steel darts.",
-+ "name": { "str": "improvised 40x46mm flechette" },
-+ "description": "An improvised 40x46mm flechette load containing 70 steel darts. Aside from using the M118 casing normally used by HEDP shells, it performs as well as flechette shells using the M199 casing.",
- "weight": "120 g",
- "range": 10,
-- "damage": { "damage_type": "bullet", "amount": 75, "armor_penetration": 6 },
-+ "//": "Balanced as AP.",
-+ "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
- "recoil": 1000,
- "casing": "40x46mm_m118_casing",
- "extend": { "effects": [ "SHOT" ] }
-@@ -132,11 +122,12 @@
- "id": "40x46mm_flechette_m199",
- "copy-from": "40x46mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x46mm flechette" },
-- "description": "An improvised 40x46mm flechette load containing 70 steel darts.",
-+ "name": { "str": "improvised 40x46mm flechette" },
-+ "description": "An improvised 40x46mm flechette load containing 70 steel darts, loaded into the M199 casing used by M576 buckshot shells.",
- "weight": "120 g",
- "range": 10,
-- "damage": { "damage_type": "bullet", "amount": 75, "armor_penetration": 6 },
-+ "//": "Balanced as AP.",
-+ "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
- "recoil": 1000,
- "casing": "40x46mm_m199_casing",
- "extend": { "effects": [ "SHOT" ] }
diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
index 4541de0dab2..aeb0d2e732e 100644
--- a/data/json/items/ammo/40x53mm.json
+++ b/data/json/items/ammo/40x53mm.json
-@@ -22,11 +22,12 @@
- "id": "40x53mm_m1001",
- "copy-from": "40x53mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x53mm M1001" },
-+ "name": { "str": "40x53mm M1001 flechette" },
- "description": "40x53mm canister shot loaded with 17 grain flechettes.",
- "weight": "340 g",
-+ "//": "Balanced as AP.",
- "range": 10,
-- "damage": { "damage_type": "bullet", "amount": 150, "armor_penetration": 10 },
-+ "damage": { "damage_type": "bullet", "amount": 91, "armor_penetration": 78 },
- "recoil": 1000,
- "casing": "40x53mm_m169_casing",
- "extend": { "effects": [ "SHOT" ] }
-@@ -35,6 +36,6 @@
- "id": "40x53mm_m430a1",
- "copy-from": "40x53mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x53mm M430A1" },
-+ "name": { "str": "40x53mm M430A1 HEDP" },
- "description": "A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
- "weight": "340 g",
-@@ -47,11 +48,11 @@
- "id": "40x53mm_buckshot_m169",
- "copy-from": "40x53mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x53mm buckshot" },
-+ "name": { "str": "improvised 40x53mm buckshot" },
- "description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
- "weight": "340 g",
- "range": 10,
-- "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 4 },
-+ "damage": { "damage_type": "bullet", "amount": 130 },
- "recoil": 1200,
- "casing": "40x53mm_m169_casing",
- "extend": { "effects": [ "SHOT" ] }
-@@ -60,25 +61,13 @@
- "id": "40x53mm_slug_m169",
- "copy-from": "40x53mm_grenade",
- "type": "AMMO",
-- "name": { "str": "40x53mm slug" },
-+ "name": { "str": "improvised 40x53mm slug" },
- "description": "An improvised 40x53mm load resembling an oversized shotgun slug.",
- "weight": "340 g",
- "range": 10,
-- "damage": { "damage_type": "bullet", "amount": 130, "armor_penetration": 6 },
-+ "//": "Balanced as FMJ.",
-+ "damage": { "damage_type": "bullet", "amount": 104, "armor_penetration": 46 },
+@@ -60,17 +61,4 @@
"recoil": 1200,
"casing": "40x53mm_m169_casing"
- },
@@ -297,46 +134,6 @@ index 25d9b16a37b..8ca62a1bfb3 100644
{
"id": "8mm_hvp",
"copy-from": "8mm_caseless",
-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
-+++ b/data/json/items/generic/casing.json
-@@ -148,7 +148,7 @@
- "type": "GENERIC",
- "category": "spare_parts",
- "name": { "str": "40x46mm M212 casing" },
-- "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",
- "material": "steel",
-@@ -160,7 +160,7 @@
- "type": "GENERIC",
- "category": "spare_parts",
- "name": { "str": "40x46mm M118 casing" },
-- "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",
- "material": "steel",
-@@ -172,7 +172,7 @@
- "type": "GENERIC",
- "category": "spare_parts",
- "name": { "str": "40x46mm M199 casing" },
-- "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",
- "material": "steel",
-@@ -184,7 +184,7 @@
- "type": "GENERIC",
- "category": "spare_parts",
- "name": { "str": "40x46mm M195 casing" },
-- "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",
- "material": "steel",
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
index ed67da394f0..31158a8187c 100644
--- a/data/json/obsoletion/migration.json
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-14 09:29:40 +0000