Updated to 2023-09-10-2111

Start work porting out as much ammo changes as possible to my ammo rebalance mod.

1 files changed, 18 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ff26595..0fd5b92 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=202309090205
-_pkgver=2023-09-09-0205
+pkgver=202309102111
+_pkgver=2023-09-10-2111
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -53,13 +53,13 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-17_Rivtech-mainline-3092.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
-        "ammo-02_fix-20x66mm-loudness.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-06_fix-bp-scrap-not-being-bp.patch"
         "ammo-10_ammo-order-fix.patch"
         "ammo-11_fix-volume-40mm.patch"
+        "ammo-12_fix-20x66mm-loudness.patch"
 
         "armor-01_ankle-ammo-pouch-is-not-a-backpack.patch"
         "armor-02_fix-survivor-fingerless-gloves-warmth.patch"
@@ -154,7 +154,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=('4f0fffc78819a4fdeb8849687957debc474d6f8c8a404a0a1ed4bb0e69c15eb3b89467a865a6aa7c3bf92cc7c2dae534b8a9fc2a666565ff15e0c35be3eaba8c'
+b2sums=('dae58c5c46e8dbfd252185f20a064ff150057b6051aaf5d3b4efb83d1fb10332056f2fbecfcc747ac87b4633126328208db59cb796f87fcc789170ac6cdfcb2f'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -166,22 +166,21 @@ b2sums=('4f0fffc78819a4fdeb8849687957debc474d6f8c8a404a0a1ed4bb0e69c15eb3b89467a
         'ca7b1e96dbd399315b40ca789dad9b5c573a164231834a6a3b8448ab4d98787dc66264e9fc9cf230a06ab58ad4308520f8cadfd79ab8e8a6daf377d98a496490'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
         '43d89f815f7c7d7e57463174ad3bfa304a21c93dd34659dfa95824582f482fb97ef70f6d4c83be29b2b10b22c27ff1d19ce4ea1e2a0653fce35d53cdb30fb897'
-        'f5b86b4ec58cb1f5f7f8033656a8ee3db912738fbc68d059a260ee2d17256ab63651a488a0678a43a5757854fc489089cc69ea0ed23c9ef6113855d122e281d1'
+        'a2f5d904c4671b05bcbbf3ffffcc1b3bcbeaec13406151103121c66bc4fbce2476b2c607af81447c0409e0065722ec87b740aaa01dc65001a6fc4f8abb76ac62'
         '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
         '63718656a6b1cd6e0d9dbff81190ac1b6113b08afd919d0015c708406a7a549718af6c3f9f8239514aedfe1ccf5c8a69207c43a675644fc990c713e8e31d007c'
         '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
-        '02b3ff03cd2f6b74e65c31874a0ed91918cab1bb7272516c7565f7f68f0a96a9a3a837f19f2431470da455084dea6d481875258f01a45e9249aafac879007746'
+        '4553fedafaeee3081857d31eaad0de75c3bb2a08e6dfdf28641351c6dfac835a0a410149402db82330a76181d4b3a19759dfd96e5a52e770732de18b0c319969'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
-        '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '376d0750c18f4218f8df74c5c311b17d7ff6181829831ddc51edf5b318ac3fa149c3d6b9b6ed0b39d34904974e8ae2d3588258844b4831198d4116397c60b14d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
-        '2ebc9d61438ef1439a3dcfae7e56f2f4cb1d4410faadd2e018359b6c4711abdcd474f2eeb2d23e531a523caea19ec40d820b60c0b8cdaf04223ca9eed1119ec7'
-        '3ac6e8027230400c1e86466b2143ab1bde4455a8381862a6e6d35c5deefee3369021312a3e070bbc5978bdf78fee691096bad3084e4303d3ffa642d14fbdb2f6'
+        '5d5fb4cd0a686f1a67cc696d9a3c8f29f5555289b561a9379f67e927ac02e6d23ad0710f9a97bde84f8104be36d8d118a1c26471c994c639069720ec90c38047'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
+        '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3'
@@ -286,7 +285,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-09-0205"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-09-10-2111"|' Makefile
 
 
   # # # Hotfixes
@@ -296,6 +295,7 @@ prepare() {
   # # # Reverts
   echo "Applying revert patches"
   # # Revert mainline craftable rivtech ammo
+  #echo "Applying revert-17_Rivtech-mainline-3092.patch"
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-17_Rivtech-mainline-3092.patch
 
   # # More reverts for generic night vision
@@ -356,11 +356,6 @@ prepare() {
   # Fix mulitple inconsistent ammunition names and handloaded status.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch
 
-  # Set a fixed loudness for 20x66mm shotgun shells like that of other shotguns:
-  # Other shotguns have fixed loudness to work around how the short range causes the loudness value to be far lower than one would otherwise expect.
-  # Abstract change, so this cannot be fixed by a mod.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-02_fix-20x66mm-loudness.patch
-
   # Change reloaded_50bmg to be based on 50bmg:
   # 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
@@ -373,7 +368,8 @@ prepare() {
   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.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch
+  # Offloaded to ammo rebalance mod
+  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch
 
   # Fix ammo ordering so as to not prevent those items being modded:
   # Having copy-from items occuring earlier in a json than the item being copied from prevents items based on it being modified.
@@ -383,6 +379,11 @@ prepare() {
   # Changing abstracts with mods does not seem to work, so here this is.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-11_fix-volume-40mm.patch
 
+  # Set a fixed loudness for 20x66mm shotgun shells like that of other shotguns:
+  # Other shotguns have fixed loudness to work around how the short range causes the loudness value to be far lower than one would otherwise expect.
+  # Abstract change, so this cannot be fixed by a mod.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-12_fix-20x66mm-loudness.patch
+
 
   # # armor fixes
   echo "Applying armor fixes"