From 0197c84a0ed69b53a747cff02d3f3f647c7c6be9 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 8 Nov 2023 19:38:08 -0800
Subject: Offload everything in revert 08 and 10 to ammo rebalance mod.

---
 PKGBUILD | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'PKGBUILD')

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
-- 
cgit v1.2.1