Updated to 2023-10-04-0030

Add gunslinger mission reorder patch.
Remove obsolete stacking .22 casing patch.
Remove unused patches.

1 files changed, 24 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2e02c58..fc16682 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202310021921
-_pkgver=2023-10-02-1921
+pkgver=202310040030
+_pkgver=2023-10-04-0030
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -55,10 +55,13 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-19_Fix-Repair-Nanobots-3308.patch"
         "revert-20_Fix-tidy-warnings-3310.patch"
 
+        #"revert-21-1_perf-cache-character-s-dead-state-3282.patch"
+        #"revert-21-2_Fix-eternal-drowning-when-NPC-is-thrown-into-deep-wa.patch"
+        #"revert-21-3_fix-only-set-cached_dead_state-if-npc-is-actually-de.patch"
+        #"revert-21-4_perf-correctly-cache-and-invalidate-dead-state-3304.patch"
+
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
-        #"ammo-04_4570-can-be-dismantled.patch"
-        "ammo-05_22-casings-can-stack.patch"
         #"ammo-06_fix-bp-scrap-not-being-bp.patch"
         "ammo-10_ammo-order-fix.patch"
         "ammo-11_fix-volume-40mm.patch"
@@ -91,6 +94,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         #"migration-02_remove-8mm-fmj.patch"
 
         "mission-01_typos.patch"
+        "mission-02_reorder-gunslinger-quest.patch"
 
         "monsters-01_medical-zombies-called-zombies.patch"
 
@@ -158,7 +162,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=('c90aa403145975d6a8f35d97cc7070c06ece198008cde917ddf13a9cefaa6c3ecd654b734e216e4df10fc32b5b26ce0545e025be451d5152086b37baae6878ff'
+b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc85b36bfc4618e6935ecc59e754a8bcec9e25f1666cfbb74bc59b6b828'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -183,7 +187,6 @@ b2sums=('c90aa403145975d6a8f35d97cc7070c06ece198008cde917ddf13a9cefaa6c3ecd654b7
         '19a91d07aff74b5718c239c50a559e17295cbca4b472bb75fd37b3569930c0454928e7f14f7e387eddf9d29a4e50d1fbed319e9e00338c50d40849ea0e2ee545'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
-        '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         'f0643d3588527dbbdb11ead32b64e0d7a3aaafd0d7ba594bf79fae2ce15de758178d0419b2cfd98e642c55579a50a128527c68ba8e1d216ba6dc2c4e5b8129fd'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
         '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
@@ -205,6 +208,7 @@ b2sums=('c90aa403145975d6a8f35d97cc7070c06ece198008cde917ddf13a9cefaa6c3ecd654b7
         '931ac85c657c1c504de1ea629205b19f79a11acdd7c62cf71b909323ec1588610b1f575bc58ab01c3fbcd334fca8fbc114316570732f55a3f7fb3dd2984cd442'
         'b9bf63ed06aee848fa70adceaf9674e842343e6f92e9a2e57be372814b481d54bdfee602eac9e3c05dc5c8e35ec36146f28491de39b7ea2c8c3a8b9ac80c0354'
         '536c59b274923d36fbfc6dc39ef373a0d1e497422dea6fcdc16cfacb6b9ba421f14c5d7c4db31bab083199d859ff57ae5b19842f95367cfa39059e7156e96093'
+        '69891c188f233e5174c2ddabce9371e84fdffdb105345686d71a9d823422969f77f9c44bc6571c6e5a72dbc9b9bdb6abf8c72cf9480bb87dca6f998f62f3de02'
         'e466392190e0aa58c02acda287bc8ac6fef30160207d08805ca9acd42b7f024d0680c0a76fcb4f29a7d7ca884920bba3a6714b5ad40f64dd1b40bcf0e2621d26'
         '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
@@ -290,7 +294,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-10-02-1921"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-10-04-0030"|' Makefile
 
 
   # # # Hotfixes
@@ -299,6 +303,13 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
+  # # Revert the bugtastic dead npc cache changes for now:
+  # This is causing a huge amount of serious bugs. Revert until things are fixed properly.
+  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21-4_perf-correctly-cache-and-invalidate-dead-state-3304.patch
+  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21-3_fix-only-set-cached_dead_state-if-npc-is-actually-de.patch
+  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21-2_Fix-eternal-drowning-when-NPC-is-thrown-into-deep-wa.patch
+  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21-1_perf-cache-character-s-dead-state-3282.patch
+
   # # Revert easy-mode limb mending and related commits
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-20_Fix-tidy-warnings-3310.patch
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-19_Fix-Repair-Nanobots-3308.patch
@@ -364,13 +375,6 @@ prepare() {
   # The id and description make it pretty clear that reloaded_50bmg is not supposed to be based on Match rounds.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-03_fix-reloaded-50bmg.patch
 
-  # Fix 4570_bp not being reverisble:
-  # Easier to fix here than futher the mess of revert patches.
-  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-04_4570-can-be-dismantled.patch
-
-  # Fix .22 casings not stacking when every other casing stacks.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-05_22-casings-can-stack.patch
-
   # Fix black powder scrap shot not being flagged as black powder.
   # Offloaded to ammo rebalance mod
   #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch
@@ -489,6 +493,12 @@ prepare() {
   # Foraging encounter has inconsistent monster references. Change all to cougar.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/mission-01_typos.patch
 
+  # Move the gunslinger quest in front of the zombie horde quest:
+  # The context of the horde mission suggests that the player should obtain another follower before attempting it,
+  # thus it makes more sense to have the obtain gunslinger mission occur before, not after. Simultaneously makes even more sense, but the game doesn't support it.
+  # Note: The gunslinger mission is prone to errors. Save before accepting it, make sure you are on ground level, and increase the search_range if it still fails.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/mission-02_reorder-gunslinger-quest.patch
+
 
   # # monster fixes
   echo "Applying monster fixes"