Updated to

Revert "Fix-mutant-scenarios-adding-an-obsoleted-trait" as it conflicts with revert of generic night vision.

1 files changed, 11 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 911081d..83751d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202305291207
-_pkgver=2023-05-29-1207
+pkgver=202306140316
+_pkgver=2023-06-14-0316
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -47,6 +47,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "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"
+        "revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
@@ -148,7 +149,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=('46b173c5a7a3f8394e671497fd69a303ae2f9808800603e9f2205645d02a332b280176d66baa1e3d9f37c9395ad63ea834ba1a3ef1dce2ec4096eddaf1445ebe'
+b2sums=('2caa1d9b2d9ec630d583393db1e9d19a5b4b3e970176e70b03d3057b4395e57c4eb2929282f4678db805c59ab3b821511429e8fb2e75e317e791452b43e60efb'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -165,6 +166,7 @@ b2sums=('46b173c5a7a3f8394e671497fd69a303ae2f9808800603e9f2205645d02a332b280176d
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
         'e79914e7c5388a9fba22b0853e16e1f625f908bcbb5094f3b59fd05ae0195429a4f596a44b782ac9966ebecab3f4135506c68176daca650ece170e350f7e5120'
         '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
+        '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
@@ -216,7 +218,7 @@ b2sums=('46b173c5a7a3f8394e671497fd69a303ae2f9808800603e9f2205645d02a332b280176d
         '651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd'
-        'eb1fb44a8d27b731a966fbc72c3692065102896bdb2d074c99b0f7327119fc88ff31848f42913a30631b65c4741dbd5f62aac88ada56ba4c36c24f34d7063072'
+        'f87e28d0b11fb19477a4d91d9d761e03293561a04543e405894cd6c1e63c0353626cb91a781410d299dc3ebcb290be6ceb822cb65c9530c356ac9d4787b322b7'
         '032c426a0e3a9d8282f5ce9ce4952bef051e2dedb0e56f90d9e18ccc32ea86acec84e42bcff695888f133a48b48418c59ea985dc9c5b179ca13cf9de44004618'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
@@ -238,7 +240,7 @@ b2sums=('46b173c5a7a3f8394e671497fd69a303ae2f9808800603e9f2205645d02a332b280176d
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
-        'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
+        'cd79b05165d9b7b1817f98431b13ddd380df28df5e1e14da9345d6c0c1f78cfe22c6e6b85ca370c7df73cbf852d51e4ebd3d3e0f6c82b8d5dd35ca5a16ad6bfe'
         '6d8fbbe178fcb84dbfcf301e0e8da47be322f0d35fe510bbd779b0072f077d1a09eded217748d7b1c50d35391d71dcf98aba4194697ac6f2b55acbb1810935d2'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'f032ed44a6bc7f5b8dd7a545706c7733c4043ded755c12c622314c3b1f206363d27358f2d765a774f6f32abbdd8c31994b1e075c5307dcf65fc4e7a77081a5c7'
@@ -275,7 +277,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-05-29-1207"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-06-14-0316"|' Makefile
 
 
   # # # Hotfixes
@@ -284,6 +286,9 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
+  # # More reverts for generic night vision
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch
+
   # # 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