Updated to 2022-10-30-1606

Revert Ammo-rebalance-project-part-6.

1 files changed, 13 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2357b70..9c86be9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,15 @@
 # Arch version lacks the MSX++UnDeadPeopleEdition tileset
 # Arch version lacks the @ soundpack
 # Arch version lacks the CO.AG musicpack
+# Arch version lacks numerous bugfixes I created
+# Arch version has some vanilla balancing changes I disagree with
 
 pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202210231747
-_pkgver=2022-10-23-1747
+pkgver=202210301606
+_pkgver=2022-10-30-1606
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -38,6 +40,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         #"revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch"
         "revert-06_Obsolete-useless-hub01-basement-1457.patch"
         "revert-07_Remove-handload-quality-distinction-1481.patch"
+        "revert-08_undo-rifle-balance-pass.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
@@ -129,7 +132,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('c7ec9b3fdd4c9879659cba8ab192bb1fe4d87ee6231814211bb42e2fa1a817cf48463ae91163807242943ab8cf859c96edc2494306b26e9b9d717d938f318215'
+b2sums=('e25f3c198bcb82df43aeb9bb91f87b6af662f016ab0437a6a1be2495f92027a9a78dc360beb4fb727b39d071625427dabcaaa89edac28249761a354146a5405e'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -139,6 +142,7 @@ b2sums=('c7ec9b3fdd4c9879659cba8ab192bb1fe4d87ee6231814211bb42e2fa1a817cf48463ae
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
         'b31b1899cb4d42e1c748be93ac164f8492339683695a34df30c15b734e3fa800b3cfcd1e95bd381501b427e20e45bdca9e9501fa81377d505f22d5549be947e4'
+        '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
@@ -237,7 +241,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-10-23-1747"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-10-30-1606"|' Makefile
 
 
   # # # Hotfixes
@@ -246,10 +250,13 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
+  # Revert balance pass of rifle ammunition.
+  patch -NREp1 -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch
+
   # Revert removal of reloaded ammunition.
   patch -NREp1 -i "$srcdir"/revert-07_Remove-handload-quality-distinction-1481.patch
 
-  # Revert Hub 01 removal.
+  # Revert Hub 01 basement removal.
   patch -NREp1 -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch
 
   # Revert removal of filthy/faulty bionics patch.
@@ -271,7 +278,7 @@ prepare() {
   # # # Various fixes for bugs I came across
   # # Ammo fixes
   echo "Applying ammo fixes"
-  # Fix mulitple inconsistent ammuntion names and handloaded status.
+  # Fix mulitple inconsistent ammunition names and handloaded status.
   patch -Np1 -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch
 
   # Set a fixed loudness for 20x66mm shotgun shells like that of other shotguns: