Updated to 2023-02-26-0055

2 files changed, 12 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b4c95f2..b8ec18d 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=202302222301
-_pkgver=2023-02-22-2301
+pkgver=202302260055
+_pkgver=2023-02-26-0055
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -137,7 +137,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=('97e1b6f56ccb27bcbb4c3c4751395a25b0ad3eca2bde123902fd2a19aef6c9b28b261f2f7ed2a3f9a70d7c08db0fafa6a83846b8e821a2be8fd447f38216de54'
+b2sums=('6bb584f8e848d7d06d85a51ce4af2c85149f4bd2e79c6887a9ee0cc53bddee39ea6859ef3777723d1361d19d4db219b9c57ea15156de65af2251208a573ad5d9'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -185,7 +185,7 @@ b2sums=('97e1b6f56ccb27bcbb4c3c4751395a25b0ad3eca2bde123902fd2a19aef6c9b28b261f2
         '93be2ff64a3217f92b369c067121683083859c7e939535e55f11818dc346d4862a50faa371315ad28ab54c9778c749d7684e8a7d68a18f774be3c2fe7891bd62'
         '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a'
         'ac1a522d84fcfdea371027d05d486b752f921d03280d3db38766945ddb22c8ece946a2a67cbba656c31486c68a49a557d692e971fd7fd8b220865a3178628674'
-        '3bf7da4e2efabe6b050aa357ec74c120e184a0a1bc6d4342fbb03a3c0cd0bae58c9fc1cda5f69ffdcc7e48a34f51f4a18107163f99348d2504096bccfd1766a9'
+        '57df0c21e59fe69da396267881d5a16bf791187fc6c7ca7a8746daad00b8a81d389c84ba24efb4ba603f20cd03f03964e017fa836439b04e5ab7a14497f15468'
         '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b'
         '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d'
         'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a'
@@ -256,7 +256,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-02-22-2301"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-02-26-0055"|' Makefile
 
 
   # # # Hotfixes
@@ -619,9 +619,6 @@ build() {
   export CXXFLAGS="$(echo $CXXFLAGS | sed 's/-Wp,-D_GLIBCXX_ASSERTIONS//')"
   #echo $CXXFLAGS
 
-  # tests "ifdef TILES" so "TILES=0" will enable tiles!
-  # DYNAMIC_LINKING appears to be a windows flag?
-  # TESTS disabled due to gcc 11.2 bug
   make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH_HEADER=0
   make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH_HEADER=0 TILES=1 SOUND=1
   ./lang/compile_mo.sh
diff --git a/npc-09_broker-takes-more-foods.patch b/npc-09_broker-takes-more-foods.patch
index b6fe170..d12240b 100644
--- a/npc-09_broker-takes-more-foods.patch
+++ b/npc-09_broker-takes-more-foods.patch
@@ -1,6 +1,6 @@
 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json	
 +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
-@@ -88,20 +88,129 @@
+@@ -88,20 +88,135 @@
      "dynamic_line": "Excellent.  What've you brought us?",
      "repeat_responses": {
        "for_item": [
@@ -16,6 +16,8 @@
 +        "bacon",
 +        "beer",
 +        "belgian_ale",
++        "bum_wine",
++        "burdock_wine",
 +        "can_beans",
 +        "can_chicken",
 +        "can_chowder",
@@ -35,7 +37,9 @@
          "cooking_oil",
          "cooking_oil2",
          "cornmeal",
++        "dandelion_wine",
 +        "dried_salad",
++        "drink_kalimotxo",
 +        "dry_beans",
 +        "dry_fish",
 +        "dry_fruit",
@@ -60,6 +64,7 @@
 +        "hazelnut_roasted",
 +        "hb_beer",
 +        "hickory_nut_roasted",
++        "imperial_stout",
 +        "india_pale_ale",
 +        "irradiated_rose_hips",
 +        "irradiated_elderberries",
@@ -115,6 +120,7 @@
 +        "pale_ale",
 +        "pecan_roasted",
 +        "pemmican",
++        "pine_wine",
 +        "pistachio_roasted",
 +        "pork_beans",
 +        "powder_eggs",