Updated to 2023-10-02-1921

Revert two more easy mode limb commits.
Start to clean up the jumble of ammo reverts.

1 files changed, 17 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e49575c..2e02c58 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=202309282259
-_pkgver=2023-09-28-2259
+pkgver=202310021921
+_pkgver=2023-10-02-1921
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -52,6 +52,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch"
         "revert-17_Rivtech-mainline-3092.patch"
         "revert-18-Simplify-broken-limb-mending-3054.patch"
+        "revert-19_Fix-Repair-Nanobots-3308.patch"
+        "revert-20_Fix-tidy-warnings-3310.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
@@ -156,12 +158,12 @@ 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=('9a398dc1b1f29cc59211d3127d5d01f02460392681393a1274a063fb7581eb998ff999df6d8d8244e20f58dd62e75081ce427254ba83f711e40b17a3ffcdab62'
+b2sums=('c90aa403145975d6a8f35d97cc7070c06ece198008cde917ddf13a9cefaa6c3ecd654b734e216e4df10fc32b5b26ce0545e025be451d5152086b37baae6878ff'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
         'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c'
-        '32b815e0bec49cd7f3a84fc25bd6926c752af923a1cf7ecc1fbb07d4cc5b484ec2854c3f05e3ffa45fd69ee37679c145c4486d2210ce7ba5de2025fadbf8a86c'
+        'f8411d9b23803b9d12c1c5c437906f8c6dab7c0a0770bccc608bc8fdb1a776c4b5db8fd6e73d6b739bd18c531e8711cd909eed4bfa98397ef3fca0212f5836cf'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
@@ -177,10 +179,12 @@ b2sums=('9a398dc1b1f29cc59211d3127d5d01f02460392681393a1274a063fb7581eb998ff999d
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
         '664d6d2d4427040b25d9971fa07b32d3c1343dd60a9702835568ba1e287422ab2659a4a4e324e422755b6c655e324ca203933b6815c7b2e512beb4f15c4a27d8'
         'ee3722ba1367d993605c0cee12e67b8e10dcda0401c4480d8915bd3ac587c8a3b84379ef6f98d6e93cf433b1dae7a0db35937271787bc6b893b373dc1d44ae7d'
+        'dcb8a004230da09e73a340c1acaf3c0071a8c26e3bce9a707b8e1624854aadc9e45f6f3f0d99549ccef5c11a6396dc082691895c437d50188e1b292cb8c10751'
+        '19a91d07aff74b5718c239c50a559e17295cbca4b472bb75fd37b3569930c0454928e7f14f7e387eddf9d29a4e50d1fbed319e9e00338c50d40849ea0e2ee545'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
-        'ef1de0a729dd64c753c4b7bc097297f4304bb0d714ba3ccc6697fc2d7a775b433eb7bdfc14208059b749276ac9eb33be28d6336849acc5851b22ed1b3b457e02'
+        'f0643d3588527dbbdb11ead32b64e0d7a3aaafd0d7ba594bf79fae2ce15de758178d0419b2cfd98e642c55579a50a128527c68ba8e1d216ba6dc2c4e5b8129fd'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
         '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
@@ -194,7 +198,7 @@ b2sums=('9a398dc1b1f29cc59211d3127d5d01f02460392681393a1274a063fb7581eb998ff999d
         '7da2d555f4b21da6704675400dc97367ff3e6bb60213d86c972b6740f074bcef98482ad7f759ddbee09f67d0ee8687c26c425d697ab586a784385971aec72bb0'
         'c3b8dcce2fe41c8d9dab2d35d56304f426e06f9a6a220fcb2f413ac4aa32c7f466e2001cc7bf0bbf6127aeef55c837bb344f08afbb392f202c4ad8ce83a592a9'
         'd0a2fcd9b3e88d15f817204c7799b0a2b7cd7f9bb830efc97970e9da466a2f458a414be8de93049078c1e5568238e6ee9c8ec22a296401f6dc569dfcc299b289'
-        '3767da67d8a772e89637b04788c191b68663ecb3caf57f322854a22860395509b68626480c089de472eb96f07d90794c4a711f350bbf054007ba34d82459e11c'
+        '7b4369a2535029e214af7f51f7d6292d91989249374c9969a140f8954dedca2a2c04f626ac0bcf33f9ea8ab1710fadcc79034156405249b885b01e5c53be2188'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
         'dae75d9cd00f1f3ceabf257f1d82d245ace6582cf7ea98a40c1d1eb9b7e1832cb2a0c13f25c814a05a70931c42a06694a67829ea55554cc680eaa8ddf16c84a8'
@@ -286,7 +290,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-09-28-2259"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-10-02-1921"|' Makefile
 
 
   # # # Hotfixes
@@ -295,7 +299,9 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
-  # # Revert easy-mode limb mending
+  # # 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
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-18-Simplify-broken-limb-mending-3054.patch
 
   # # Revert mainline craftable rivtech ammo
@@ -308,12 +314,10 @@ prepare() {
   # Upstream seems to have as serious dislike of in game books.
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-14_Removed-unrelated-references-2738.patch
 
-  # # Yet more bad ammo ideas pt2
-  # Same as below just 308 and 762.
-  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch
-
-  # # Yet more bad ammo ideas pt1
+  # # Yet more bad ammo ideas
   # This prevents sorting 223 and 556 ammo into different piles as sorting is assumed wildcard.
+  # And a second for 308 and 762.
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch
 
   # Needless item removal
@@ -329,15 +333,12 @@ prepare() {
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch
 
   # Fix the duplication of 4570_bp
-  echo "Applying revert 7.5"
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch
 
   # Revert removal of reloaded ammunition.
-  echo "Applying revert 7"
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-07_Remove-handload-quality-distinction-1481.patch
 
   # Revert Hub 01 basement removal.
-  echo "Applying revert 6"
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch
   
   # Revert the book changes for now.