Updated to 2023-05-02-0922

Remove obsolete v29 patch.
Fix ammo reverts due to shot cone effects.

1 files changed, 9 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0246900..df01d00 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=202304302223
-_pkgver=2023-04-30-2223
+pkgver=202305020922
+_pkgver=2023-05-02-0922
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -122,7 +122,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "vehicles-02_fix-fbi-car-name.patch"
         "vehicles-03_black-box-can-be-installed.patch"
 
-        "weapon-01_fix-v29-copy-from.patch"
         "weapon-02_Fix-usp45-load-order.patch"
 
         "etc-01_fix-rubbersplosion.patch"
@@ -147,7 +146,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=('7471f22385c1e1056011f85b00c37d0bcad724d0336d09f80b26d2c31c077abbf97a05a247f5b5844f6cbf6e20ae7c5495cf8115e002a4f0ba0875cd111eca0c'
+b2sums=('03aeb0e3e2cb3d9a245a406b07ecd035d6993abdc9826e3a94399de085908ea083fc4f8bb4092437ff5661658c7a0f693a1c126b74c4fa8fcf6b7032f0b177ff'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -158,7 +157,7 @@ b2sums=('7471f22385c1e1056011f85b00c37d0bcad724d0336d09f80b26d2c31c077abbf97a05a
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
         '8cb60c8d33e1dfdb0b5e4a6f8c5796b78ba3987ad879fd471953f36d7c1c49d10b9b30ab7361c4cb5489b43da9ae48cb5a85531c0f11ffe0ba663f33215a5e52'
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
-        'd62bcb01bcb2934bf405e205a511bd076bc793bb8699dd205a5441afddfe8bbb161f7925de8294c51a528318155af4d2261e2ca2a7a2614d22053d5bbe4359a1'
+        '2e4ddf74604a1c816284d2d7b9e6e4494f4989406370edd454b8e080bf9a4d80e9974a5554a2da826003076b78715b3ea58e429b17ca4d71fd56996bae5eef03'
         '1950d2cacc8697b3f0602f3eb232744fd0f7de4489b7747089abfa8784ec9e4433db4dcdf925d0bc37686ee14d607dcd5345e3db5b5b155a6208bde8b1706e23'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
@@ -169,7 +168,7 @@ b2sums=('7471f22385c1e1056011f85b00c37d0bcad724d0336d09f80b26d2c31c077abbf97a05a
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         '2ebc9d61438ef1439a3dcfae7e56f2f4cb1d4410faadd2e018359b6c4711abdcd474f2eeb2d23e531a523caea19ec40d820b60c0b8cdaf04223ca9eed1119ec7'
-        '6ed6469e0a7fa3a21731baa19040e109b1a0709a633c59ca5b43d71c1515fa326be84accbfd89f883bc03200daccd5d70e2aacff652e836b178beaf4ee66ce5c'
+        'bf027ddc3fda6067cdd770f330987def83957ffe975ab36ad046558bf46e32a645b04f85efc57e1d337158e0afa297fd0c493e091e8d2e5e31d2f31ed5237c9e'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
@@ -222,7 +221,6 @@ b2sums=('7471f22385c1e1056011f85b00c37d0bcad724d0336d09f80b26d2c31c077abbf97a05a
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41'
         '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0'
-        '0661d98d1a106c736f5e23da60e81354786569d5e2124d1247297eac8ae95ae7f9971b5c80063ef7569eb7288da1ed012e8f0301e82400dff2c3c93cdbd93999'
         'a357104e814cde6669ab0b76d8d869ddd7fb03cf38bf1b32993780a31ac07e50cfc5d1af3e87d969ca3f9650ea3aefba3c55bf626c4c40502205a130a86c25a5'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         'f428818d1d4df4e46ec844458cfd5f9eef5d19a89778837502eb74ed6d421113ae9a9bc2fd4fb2bcf41d433635c34912e90b90a8993e92164e6a1efe0ebae82f'
@@ -274,7 +272,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-30-2223"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-05-02-0922"|' Makefile
 
 
   # # # Hotfixes
@@ -283,7 +281,7 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
-  # # More reverts fot changes to books
+  # # More reverts for 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
 
@@ -333,7 +331,8 @@ prepare() {
   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 factors causes them to be far quieter than one would otherwise expect.
+  # 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:
@@ -600,10 +599,6 @@ prepare() {
 
   # # weapon fixes
   echo "Applying weapon fixes"
-  # Fix the V29 pistol to copy-from pistol_energy:
-  # This class seems entirely made for this weapon, but it was not flagged to use it.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/weapon-01_fix-v29-copy-from.patch
-
   # Fix the USP45 handgun not being modifiable:
   # It uses copy-from usp_9mm that loads later, which prevented modifying it.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/weapon-02_Fix-usp45-load-order.patch