summaryrefslogtreecommitdiff
path: root/revert-08_undo-rifle-balance-pass.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-08_undo-rifle-balance-pass.patch')
-rw-r--r--revert-08_undo-rifle-balance-pass.patch64
1 files changed, 0 insertions, 64 deletions
diff --git a/revert-08_undo-rifle-balance-pass.patch b/revert-08_undo-rifle-balance-pass.patch
index c93e339..2d7295e 100644
--- a/revert-08_undo-rifle-balance-pass.patch
+++ b/revert-08_undo-rifle-balance-pass.patch
@@ -3,28 +3,11 @@ From: Chaosvolt <chaosvolt@users.noreply.github.com>
Date: Sun, 30 Oct 2022 11:00:10 -0500
Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851)
-* [WIP] Ammo rebalance project, part 6
-
-* Continue work on the thing
-
-* Fix an oops
-
-* I knew I forgot one
-
-* Revert shotshell changes for now
-
-* Slight nudge to .233 and .308 per feedback
-
-* Update 308.json
-
-* Update 270win.json
---
- data/json/items/ammo/223.json | 6 ++++--
data/json/items/ammo/270win.json | 2 +-
data/json/items/ammo/300.json | 2 +-
data/json/items/ammo/3006.json | 4 ++--
data/json/items/ammo/300blk.json | 2 +-
- data/json/items/ammo/308.json | 5 +++--
data/json/items/ammo/36paper.json | 4 ++--
data/json/items/ammo/44paper.json | 4 ++--
data/json/items/ammo/4570.json | 8 +++++---
@@ -35,30 +18,6 @@ Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851)
data/json/items/ammo/762R.json | 2 +-
14 files changed, 32 insertions(+), 23 deletions(-)
-diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json
-index 22c55429c5a..5b747112341 100644
---- a/data/json/items/ammo/223.json
-+++ b/data/json/items/ammo/223.json
-@@ -17,7 +17,8 @@
- "ammo_type": "223",
- "casing": "223_casing",
- "range": 36,
-- "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 2 },
-+ "//": "Balanced as FMJ rather than JHP, as M855A1 is steel core and would fit better as AP.",
-+ "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 24 },
- "dispersion": 30,
- "recoil": 1500,
- "effects": [ "COOKOFF" ]
-@@ -31,7 +32,8 @@
- "price": 290,
- "price_postapoc": 900,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-- "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
-+ "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
-+ "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 13 }, "dispersion": -10 },
- "proportional": { "recoil": 1.1 },
- "extend": { "effects": [ "NEVER_MISFIRES" ] }
- },
diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json
index bc2f5e826e9..6ca0814d2e2 100644
--- a/data/json/items/ammo/270win.json
@@ -120,29 +79,6 @@ index bdff5be36f5..815d1a1702d 100644
"dispersion": 30,
"recoil": 2000,
"effects": [ "COOKOFF" ]
-diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json
-index 8d25222a916..bbf6d3701ec 100644
---- a/data/json/items/ammo/308.json
-+++ b/data/json/items/ammo/308.json
-@@ -17,7 +17,8 @@
- "ammo_type": "308",
- "casing": "308_casing",
- "range": 65,
-- "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 2 },
-+ "//": "Balanced as FMJ rather than JHP.",
-+ "damage": { "damage_type": "bullet", "amount": 55, "armor_penetration": 31 },
- "dispersion": 15,
- "recoil": 3000,
- "effects": [ "COOKOFF" ]
-@@ -29,7 +30,7 @@
- "name": { "str": "7.62x51mm M80" },
- "casing": "762_51_casing",
- "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet. It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
-- "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
-+ "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 17 }, "dispersion": -10 },
- "proportional": { "recoil": 1.1 },
- "extend": { "effects": [ "NEVER_MISFIRES" ] }
- },
diff --git a/data/json/items/ammo/36paper.json b/data/json/items/ammo/36paper.json
index 40556f4e1c8..4b170321d4f 100644
--- a/data/json/items/ammo/36paper.json