Offload everything in revert 08 and 10 to ammo rebalance mod.

3 files changed, 2 insertions, 292 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c2d23a6..533b59e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -42,9 +42,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-06_Obsolete-useless-hub01-basement-1457.patch"
         "revert-07_Remove-handload-quality-distinction-1481.patch"
         "revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch"
-        "revert-08_undo-rifle-balance-pass.patch"
         "revert-09_undo-yet-more-ammo-balancing.patch"
-        "revert-10_still-another-ammo-patch-to-undo.patch"
         "revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch"
         "revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch"
         "revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch"
@@ -166,9 +164,7 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
         '5fee4822e1b80fc831494f1fc94666ba3cb60d56273b1dbcdb169e22ae1a753d874736b4c26bd7ed8bf8fca1e5dac047fb965be29d71d171ca4695e6eef692c8'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
-        '09721232b65ca5fcc562bce0cf4529e878612cbe670f9a1b51cf092060a20e9a5b77edc0ab6aac477370d6c85264737175fd335092b245a0ec9e554c1e01d118'
         'e1eafcb481c11104e682e4cafd81f7d70261a7397c38bb4acf85f8999a16446c1fe508802d362b1a30e4c659966b635dc4cae75ef99416bacd866cb5aa9ed545'
-        'd8f985de0f80175c233787d04c055b31520adfa86a1f10ee9ee1067b4618d171ab89aa1430e0580d99e71b64865fa1038217e5eac2443bd43894cd16ec8594bd'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         'd78d2bb16e19d1bcd9b3a46182048f41705cf8ddba89e051aef7f0e28aea52536467fa4a1e39db9f64d7cb53d19882e7e12a77613369a51d8fd937192609d0ff'
         '63d334661bfe5270910de1c9689892aadfabbc5ee1a14508caccfd0639404f337900906fe91dab453ee5036290e485231d9072b977970d438c938ce55f8d2bf3'
@@ -322,9 +318,9 @@ prepare() {
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch
 
   # Revert ammo reblance 6,7,8
-  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-10_still-another-ammo-patch-to-undo.patch
+  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-10_still-another-ammo-patch-to-undo.patch
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-09_undo-yet-more-ammo-balancing.patch
-  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch
+  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch
 
   # Fix the duplication of 4570_bp
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch
diff --git a/revert-08_undo-rifle-balance-pass.patch b/revert-08_undo-rifle-balance-pass.patch
deleted file mode 100644
index ea0b3aa..0000000
--- a/revert-08_undo-rifle-balance-pass.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 3bffedfdaef7d35bd1f4dccc0d38281ce6f4f116 Mon Sep 17 00:00:00 2001
-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)
-
----
- data/json/items/ammo/300blk.json  | 2 +-
- data/json/items/ammo/36paper.json | 4 ++--
- data/json/items/ammo/44paper.json | 4 ++--
- data/json/items/ammo/4570.json    | 8 +++++---
- data/json/items/ammo/545x39.json  | 5 +++--
- data/json/items/ammo/700nx.json   | 3 ++-
- data/json/items/ammo/762.json     | 2 +-
- data/json/items/ammo/762R.json    | 2 +-
- 14 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json
-index bdff5be36f5..815d1a1702d 100644
---- a/data/json/items/ammo/300blk.json
-+++ b/data/json/items/ammo/300blk.json
-@@ -17,7 +17,7 @@
-     "ammo_type": "300blk",
-     "casing": "300blk_casing",
-     "range": 45,
--    "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 5 },
-+    "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 24 },
-     "dispersion": 30,
-     "recoil": 2000,
-     "effects": [ "COOKOFF" ]
-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
-+++ b/data/json/items/ammo/36paper.json
-@@ -14,8 +14,8 @@
-     "count": 25,
-     "ammo_type": "36paper",
-     "range": 15,
--    "//": "Base damage of 19, balance increase of one-third, plus 25% hollowpoint bonus.",
--    "damage": { "damage_type": "bullet", "amount": 32 },
-+    "//": "Base damage of 19, balance increase of one-third, half the expected armor penetration.",
-+    "damage": { "damage_type": "bullet", "amount": 25, "armor_penetration": 7 },
-     "dispersion": 80,
-     "recoil": 210,
-     "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
-diff --git a/data/json/items/ammo/44paper.json b/data/json/items/ammo/44paper.json
-index 4bdb267b5a8..a0123c41d52 100644
---- a/data/json/items/ammo/44paper.json
-+++ b/data/json/items/ammo/44paper.json
-@@ -14,8 +14,8 @@
-     "count": 25,
-     "ammo_type": "44paper",
-     "range": 18,
--    "//": "Base damage of 27, balance increase of two-nineths, plus 25% hollowpoint bonus.",
--    "damage": { "damage_type": "bullet", "amount": 41 },
-+    "//": "Base damage of 27, balance increase of two-nineths, half the expected armor penetration.",
-+    "damage": { "damage_type": "bullet", "amount": 33, "armor_penetration": 9 },
-     "dispersion": 70,
-     "recoil": 580,
-     "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
-diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json
-index 360afcdb1c5..bc4f6de6ecb 100644
---- a/data/json/items/ammo/4570.json
-+++ b/data/json/items/ammo/4570.json
-@@ -17,7 +17,8 @@
-     "ammo_type": "4570",
-     "casing": "4570_casing",
-     "range": 48,
--    "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 3 },
-+    "//": "Balanced as FMJ, half the expected armor penetration.",
-+    "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 16 },
-     "dispersion": 20,
-     "recoil": 4300,
-     "effects": [ "COOKOFF" ]
-@@ -32,7 +33,8 @@
-     "price_postapoc": 600,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-     "count": 10,
--    "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 7 }, "recoil": 300 }
-+    "//": "Balanced as +P, 75% of the expected armor penetration.",
-+    "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 14, "armor_penetration": 8 }, "recoil": 300 }
-   },
-   {
-     "id": "4570_low",
-@@ -43,6 +45,6 @@
-     "price": 250,
-     "price_postapoc": 400,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
--    "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -2 }, "recoil": -900 }
-+    "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -16 }, "recoil": -900 }
-   },
-   {
-diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json
-index 13b13adcf22..1ef50ff5e28 100644
---- a/data/json/items/ammo/545x39.json
-+++ b/data/json/items/ammo/545x39.json
-@@ -18,7 +18,7 @@
-     "ammo_type": "545x39",
-     "casing": "545_casing",
-     "range": 37,
--    "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 6 },
-+    "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 23 },
-     "dispersion": 30,
-     "recoil": 1400,
-     "effects": [ "COOKOFF" ]
-@@ -34,6 +34,7 @@
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-     "symbol": "=",
-     "color": "yellow",
--    "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 8 } }
-+    "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
-+    "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 12 } }
-   }
- ]
-diff --git a/data/json/items/ammo/700nx.json b/data/json/items/ammo/700nx.json
-index 0c1502f5921..94dd6064806 100644
---- a/data/json/items/ammo/700nx.json
-+++ b/data/json/items/ammo/700nx.json
-@@ -17,7 +17,8 @@
-     "ammo_type": "700nx",
-     "casing": "700nx_casing",
-     "range": 42,
--    "damage": { "damage_type": "bullet", "amount": 110, "armor_penetration": 30 },
-+    "//": "Base damage of 110, balance reduction to roughly 80%, armor penetration half expected value which is still quite a lot.",
-+    "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 25 },
-     "dispersion": 15,
-     "recoil": 12100,
-     "effects": [ "COOKOFF" ]
-diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json
-index 685111f200a..959458c8f4c 100644
---- a/data/json/items/ammo/762.json
-+++ b/data/json/items/ammo/762.json
-@@ -17,7 +17,7 @@
-     "ammo_type": "762",
-     "casing": "762_casing",
-     "range": 30,
--    "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 8 },
-+    "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 },
-     "dispersion": 35,
-     "recoil": 2036,
-     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
-diff --git a/data/json/items/ammo/762R.json b/data/json/items/ammo/762R.json
-index 1d595cc200e..1bbdeab478b 100644
---- a/data/json/items/ammo/762R.json
-+++ b/data/json/items/ammo/762R.json
-@@ -17,7 +17,7 @@
-     "ammo_type": "762R",
-     "casing": "762R_casing",
-     "range": 75,
--    "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 10 },
-+    "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 30 },
-     "dispersion": 15,
-     "recoil": 2650,
-     "effects": [ "COOKOFF" ]
--- 
-2.39.0
-
diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch
deleted file mode 100644
index 777a4d0..0000000
--- a/revert-10_still-another-ammo-patch-to-undo.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 1a5095256a34f230d604f879c704fb2be07aee82 Mon Sep 17 00:00:00 2001
-From: Chaosvolt <chaosvolt@users.noreply.github.com>
-Date: Wed, 22 Feb 2023 16:16:38 -0600
-Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258)
-
-* Ammo Rebalance, Part 8
-
-* Doi I forgot .50 at first
----
- data/json/items/ammo/300blk.json |  2 +-
- data/json/items/ammo/4570.json   | 10 +++++-----
- data/json/items/ammo/545x39.json |  4 ++--
- data/json/items/ammo/700nx.json  |  4 ++--
- data/json/items/ammo/762.json    |  2 +-
- data/json/items/ammo/762R.json   |  2 +-
- 12 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json
-index 815d1a1702d..4e9b193b5e7 100644
---- a/data/json/items/ammo/300blk.json
-+++ b/data/json/items/ammo/300blk.json
-@@ -17,7 +17,7 @@
-     "ammo_type": "300blk",
-     "casing": "300blk_casing",
-     "range": 45,
--    "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 24 },
-+    "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 19 },
-     "dispersion": 30,
-     "recoil": 2000,
-     "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
-+++ b/data/json/items/ammo/4570.json
-@@ -17,8 +17,8 @@
-     "ammo_type": "4570",
-     "casing": "4570_casing",
-     "range": 48,
--    "//": "Balanced as FMJ, half the expected armor penetration.",
--    "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 16 },
-+    "//": "Balanced as FMJ.",
-+    "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 25 },
-     "dispersion": 20,
-     "recoil": 4300,
-     "effects": [ "COOKOFF" ]
-@@ -33,8 +33,8 @@
-     "price_postapoc": 600,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-     "count": 10,
--    "//": "Balanced as +P, 75% of the expected armor penetration.",
--    "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 14, "armor_penetration": 8 }, "recoil": 300 }
-+    "//": "Balanced as +P.",
-+    "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 14 }, "recoil": 300 }
-   },
-   {
-     "id": "4570_low",
-@@ -45,6 +45,6 @@
-     "price": 250,
-     "price_postapoc": 400,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
--    "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -16 }, "recoil": -900 }
-+    "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 }
-   },
-   {
-diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json
-index 1ef50ff5e28..de5d665d24d 100644
---- a/data/json/items/ammo/545x39.json
-+++ b/data/json/items/ammo/545x39.json
-@@ -18,7 +18,7 @@
-     "ammo_type": "545x39",
-     "casing": "545_casing",
-     "range": 37,
--    "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 23 },
-+    "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 18 },
-     "dispersion": 30,
-     "recoil": 1400,
-     "effects": [ "COOKOFF" ]
-@@ -34,7 +34,7 @@
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-     "symbol": "=",
-     "color": "yellow",
--    "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
-+    "//": "Balanced as AP, 7/8 damage, arpen 6/7 that value.",
-     "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 12 } }
-   }
- ]
-diff --git a/data/json/items/ammo/700nx.json b/data/json/items/ammo/700nx.json
-index 94dd6064806..98df0003da4 100644
---- a/data/json/items/ammo/700nx.json
-+++ b/data/json/items/ammo/700nx.json
-@@ -17,8 +17,8 @@
-     "ammo_type": "700nx",
-     "casing": "700nx_casing",
-     "range": 42,
--    "//": "Base damage of 110, balance reduction to roughly 80%, armor penetration half expected value which is still quite a lot.",
--    "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 25 },
-+    "//": "Base damage of 110, balance reduction to roughly 80%.",
-+    "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 39 },
-     "dispersion": 15,
-     "recoil": 12100,
-     "effects": [ "COOKOFF" ]
-diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json
-index 959458c8f4c..fbff61d9966 100644
---- a/data/json/items/ammo/762.json
-+++ b/data/json/items/ammo/762.json
-@@ -17,7 +17,7 @@
-     "ammo_type": "762",
-     "casing": "762_casing",
-     "range": 30,
--    "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 },
-+    "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 20 },
-     "dispersion": 35,
-     "recoil": 2036,
-     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
-diff --git a/data/json/items/ammo/762R.json b/data/json/items/ammo/762R.json
-index 1bbdeab478b..288626ab191 100644
---- a/data/json/items/ammo/762R.json
-+++ b/data/json/items/ammo/762R.json
-@@ -17,7 +17,7 @@
-     "ammo_type": "762R",
-     "casing": "762R_casing",
-     "range": 75,
--    "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 30 },
-+    "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 24 },
-     "dispersion": 15,
-     "recoil": 2650,
-     "effects": [ "COOKOFF" ]
--- 
-2.39.1
-