summaryrefslogtreecommitdiff
path: root/revert-10_still-another-ammo-patch-to-undo.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-10_still-another-ammo-patch-to-undo.patch')
-rw-r--r--revert-10_still-another-ammo-patch-to-undo.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch
index 59177b6..d880c5f 100644
--- a/revert-10_still-another-ammo-patch-to-undo.patch
+++ b/revert-10_still-another-ammo-patch-to-undo.patch
@@ -7,12 +7,10 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258)
* Doi I forgot .50 at first
---
- 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 | 2 +-
data/json/items/ammo/300blk.json | 2 +-
- data/json/items/ammo/308.json | 2 +-
data/json/items/ammo/4570.json | 10 +++++-----
data/json/items/ammo/50.json | 4 ++--
data/json/items/ammo/545x39.json | 4 ++--
@@ -21,30 +19,6 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258)
data/json/items/ammo/762R.json | 2 +-
12 files changed, 21 insertions(+), 21 deletions(-)
-diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json
-index 5b747112341..beaea0d4e9f 100644
---- a/data/json/items/ammo/223.json
-+++ b/data/json/items/ammo/223.json
-@@ -18,7 +18,7 @@
- "casing": "223_casing",
- "range": 36,
- "//": "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 },
-+ "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 18 },
- "dispersion": 30,
- "recoil": 1500,
- "effects": [ "COOKOFF" ]
-@@ -32,8 +32,8 @@
- "price": 290,
- "price_postapoc": 900,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-- "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
-- "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 13 }, "dispersion": -10 },
-+ "//": "Balanced as AP, 7/8 damage, arpen 6/7 of that value.",
-+ "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 14 }, "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 6ca0814d2e2..8a9139df52c 100644
--- a/data/json/items/ammo/270win.json
@@ -97,19 +71,6 @@ index 815d1a1702d..4e9b193b5e7 100644
"dispersion": 30,
"recoil": 2000,
"effects": [ "COOKOFF" ]
-diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json
-index bbf6d3701ec..52e9c588eda 100644
---- a/data/json/items/ammo/308.json
-+++ b/data/json/items/ammo/308.json
-@@ -18,7 +18,7 @@
- "casing": "308_casing",
- "range": 65,
- "//": "Balanced as FMJ rather than JHP.",
-- "damage": { "damage_type": "bullet", "amount": 55, "armor_penetration": 31 },
-+ "damage": { "damage_type": "bullet", "amount": 55, "armor_penetration": 24 },
- "dispersion": 15,
- "recoil": 3000,
- "effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json
index bc4f6de6ecb..048d32d35c7 100644
--- a/data/json/items/ammo/4570.json