Updated to 2023-04-30-2223

Revert more ammo patches.
Revert more books patches.
Clean up old book patch.
Fix removed traits patch.
Fix bathroom fluff patch.
Remove obsolete vacutainer patch.
Rename source patches.

1 files changed, 46 insertions, 34 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e8a2d03..0246900 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202304151344
-_pkgver=2023-04-15-1344
+pkgver=202304302223
+_pkgver=2023-04-30-2223
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -43,6 +43,9 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "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"
+        "revert-14_Removed-unrelated-references-2738.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
@@ -112,7 +115,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "terrain-12_add_fmc_stairs.patch"
 
         "tools-01_foldable-bottle-is-container.patch"
-        "tools-02_vacutainer-is-not-a-weapon.patch"
         "tools-03_shears-use-light-battery.patch"
         "tools-04_normalize-drone-volume.patch"
 
@@ -127,16 +129,16 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "etc-02_add-missing-price-postapoc.patch"
         "etc-03_fix-abstracts.patch"
 
-        "jc_radio-can-use-ups.patch"
-        "jc_ammo-loudness-ap-times-2.patch"
-        "jc_allow-bio-firestarter-on-smoker.patch"
-        "jc_stop-non-faction-npc-sleep-depirvation.patch"
-        "jc_stop-non-faction-npc-malnourishment.patch"
-        "jc_stop-sleeping-on-tables.patch"
-        "jc_allow-hacker-laptop.patch"
-        "jc_more-military-base-overmap.patch"
-        "jc_npc-eat-from-further-camp.patch"
-        "jc_reduced-kcal-during-sleep.patch"
+        "src-01_radio-can-use-ups.patch"
+        "src-02_ammo-loudness-ap-times-2.patch"
+        "src-03_allow-bio-firestarter-on-smoker.patch"
+        "src-04_stop-non-faction-npc-sleep-depirvation.patch"
+        "src-05_stop-non-faction-npc-malnourishment.patch"
+        "src-06_stop-sleeping-on-tables.patch"
+        "src-07_allow-hacker-laptop.patch"
+        "src-08_more-military-base-overmap.patch"
+        "src-09_npc-eat-from-further-camp.patch"
+        "src-10_reduced-kcal-during-sleep.patch"
         
         "vampirism.patch"
 
@@ -145,12 +147,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=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf0fbf0651be9c1b67430f4875ab3a9c834b8d80997a94f77787a81f658'
+b2sums=('7471f22385c1e1056011f85b00c37d0bcad724d0336d09f80b26d2c31c077abbf97a05a247f5b5844f6cbf6e20ae7c5495cf8115e002a4f0ba0875cd111eca0c'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        'e319c834d76c0d530762842cec9ac54247bac768ba1c2d3ffe01c41de4f3bb3458696abf2791871bce2b113a712085876d8351aa826a461559a2eb2e98918c55'
-        'f3549372dec640f5fc51d2c7e2c439e34dc5e9b0cbabfc689d6d449814cfd997413360a363ace85835aec5a1fc2dd8e4bb2c54135fb63f617efdb00565d1616e'
+        'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c'
+        'b143b75105f875159b7766b316c6e36feeba21bc5151fc11bb85785949e905dd964ec14b818e9424cc94773a001eb406cd5ef50fe1f73aacc7f2f82a3545b7ee'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
@@ -158,7 +160,10 @@ b2sums=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
         'd62bcb01bcb2934bf405e205a511bd076bc793bb8699dd205a5441afddfe8bbb161f7925de8294c51a528318155af4d2261e2ca2a7a2614d22053d5bbe4359a1'
         '1950d2cacc8697b3f0602f3eb232744fd0f7de4489b7747089abfa8784ec9e4433db4dcdf925d0bc37686ee14d607dcd5345e3db5b5b155a6208bde8b1706e23'
-        '80e2ee7966c8e2218f8d2df0a1aa9a3c1512682aa437423892efa7d43a45e51fa71f678e993f6cb9d090470fac73b7e49326df548b638384b20d1224577775a4'
+        '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
+        '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
+        'e79914e7c5388a9fba22b0853e16e1f625f908bcbb5094f3b59fd05ae0195429a4f596a44b782ac9966ebecab3f4135506c68176daca650ece170e350f7e5120'
+        '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
@@ -212,7 +217,6 @@ b2sums=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf
         'eb1fb44a8d27b731a966fbc72c3692065102896bdb2d074c99b0f7327119fc88ff31848f42913a30631b65c4741dbd5f62aac88ada56ba4c36c24f34d7063072'
         '032c426a0e3a9d8282f5ce9ce4952bef051e2dedb0e56f90d9e18ccc32ea86acec84e42bcff695888f133a48b48418c59ea985dc9c5b179ca13cf9de44004618'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
-        '9b55cdad86ddd8c941c89802f13149e85d690a631ff3bf108bc7c06358f24598e66651170bcf675b80dbf680cfe6c15a14323eb3db14a7d4ee786051cc5c2a4c'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
         '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
@@ -234,7 +238,7 @@ b2sums=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        'd30bc1b6193e7ed024a34b9e0b6fee5995e6e05a070d42746f785c82d941fbf0a7925aad7ae27cb8a9c32c23640b85510b951b1b23cd20ac8f01f5fddb70edd8'
+        '6d8fbbe178fcb84dbfcf301e0e8da47be322f0d35fe510bbd779b0072f077d1a09eded217748d7b1c50d35391d71dcf98aba4194697ac6f2b55acbb1810935d2'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'f032ed44a6bc7f5b8dd7a545706c7733c4043ded755c12c622314c3b1f206363d27358f2d765a774f6f32abbdd8c31994b1e075c5307dcf65fc4e7a77081a5c7'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -270,7 +274,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-04-15-1344"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-04-30-2223"|' Makefile
 
 
   # # # Hotfixes
@@ -279,6 +283,18 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
+  # # More reverts fot changes to books
+  # 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
+  # This prevents sorting 223 and 556 ammo into different piles as sorting is assumed wildcard.
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch
+
   # Needless item removal
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch
 
@@ -557,10 +573,6 @@ prepare() {
   # Being counted as tools didn't seem to fit their role.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-01_foldable-bottle-is-container.patch
 
-  # Fix blood draw kit being categorized as a weapon:
-  # Upstream changed item templates, so this sets it back to be a tool.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-02_vacutainer-is-not-a-weapon.patch
-
   # Fix electric shears not using batteries nor charging via UPS:
   # Item was unusable without this patch.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-03_shears-use-light-battery.patch
@@ -614,36 +626,36 @@ prepare() {
   # # # Various other fixes for bugs I came across that modify src
   echo "Applying source code fixes"
   # Fix radio, e-ink reader music, tactical tonfa not working with UPS.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_radio-can-use-ups.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-01_radio-can-use-ups.patch
 
   # Fix ammo loudness mulitplying by six instead of two.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_ammo-loudness-ap-times-2.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-02_ammo-loudness-ap-times-2.patch
 
   # Fix smoker racks not accepting bionic firestarter.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_allow-bio-firestarter-on-smoker.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-03_allow-bio-firestarter-on-smoker.patch
 
   # Fix Non-Player facton NPCs from becoming sleep deprived.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-04_stop-non-faction-npc-sleep-depirvation.patch
 
   # Fix Non-Player facton NPCs from becoming malnourished.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-non-faction-npc-malnourishment.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-05_stop-non-faction-npc-malnourishment.patch
 
   # Fix NPCs preferring tables to cots or woodstoves to the floor.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-sleeping-on-tables.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-06_stop-sleeping-on-tables.patch
 
   # Allow the hacker_laptop to utilize the extra functions.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_allow-hacker-laptop.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-07_allow-hacker-laptop.patch
 
   # Expand the overmap tiles for the miltiary base to be less MMMM
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_more-military-base-overmap.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-08_more-military-base-overmap.patch
 
   # Allow npcs to pull food from the camp larder at the full range of tiles camp actions can be assigned from:
   # Should allow bases larger than 3x3 to have less food micromanagment for NPCs.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_npc-eat-from-further-camp.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-09_npc-eat-from-further-camp.patch
 
   # Revert removal of half calorie consumption while sleeping:
   # Managing the food supply of more than a few NPCs in BN is extremely difficult compared to DDA.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_reduced-kcal-during-sleep.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-10_reduced-kcal-during-sleep.patch
 
 
   # # # Additional changes