Updated to 2021-06-22-0805

Add patch to prevent non-faction npcs becoming malnourished

2 files changed, 49 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 819144a..867174e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,10 @@
 pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
-pkgver=2036
-pkgrel=1.2
+_pkgname=Cataclysm-BN-cbn-experimental
+pkgver=202106220805
+_pkgver=2021-06-22-0805
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -23,7 +25,7 @@ arch=('x86_64' 'aarch64')
 license=("CCPL:by-sa")
 depends=('ncurses' 'hicolor-icon-theme' 'gettext')
 makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/$pkgver.tar.gz"
+source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-experimental-$_pkgver.tar.gz"
         "cataclysm-bn.desktop"
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
@@ -58,6 +60,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "jc_allow-bio-firestarter-on-smoker.patch"
         "jc_npcs-eat-when-hungry.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"
         
@@ -68,7 +71,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "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=('7906295dde161d0a49a1f1a581dade6b73d589c1cbf1dcf0dedd646413c7915ccb7693bba0e117f26c1498cedb5d5f0e10aff366fc9517c880c4bf2ff844cae1'
+b2sums=('4d601dd3942c4964953cdb108291a5ef07b06290802fe63a45911073cb804d5ecd0766259c2c599c69b399d99abff621161f479bce0f1a6f304d9fbf0e3e7037'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -100,16 +103,17 @@ b2sums=('7906295dde161d0a49a1f1a581dade6b73d589c1cbf1dcf0dedd646413c7915ccb7693b
         'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
         '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
+        'e5d7b75d3bced70d5f77bd8860c53f888b1f2495b4a6bf0b1284e3fc1e831a58bc691b4a11419cd7d14427165158d7ebf3f5c690733e4f3ee5194b9bf9bd001a'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
         '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42'
-        '4eef289a9b629636d6ca672329671fba68581f4d75d060fd968c67852e34e7ddf842d49a11fe6e9d126b1206549a8495f6328a2758532418fa6ba2b333d192dd'
+        '0c45c56fd2d487e095136f3971e6ae3b8a6d1196d5d4076c6922bf1dfabfa9481838434027de9cbf64922d8574171902cc5a3dc90c84d75552bcfbaec24a17f9'
         '59d69127a79d1c9f09dd324903ed0b4793991ae1d3f45f01c4710e329cd222fafbf252a29275345072c370245931c3e897a586044a46a83c13225a288bc96993'
         '8fc23de05cc0d4ea63e921dd5c575ee83715753d2f2d0b9f0d503cb14a3263af4970fa5fb19a9b8387414b501f3dc4b8b6c91db4c929f9543556a7973a84a3b1'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
-  cd "Cataclysm-BN-$pkgver"
+  cd "${_pkgname}-${_pkgver}"
   sed -i 's/-Werror//' Makefile
   sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile
   sed -i 's/shell git/shell false/' Makefile
@@ -117,7 +121,6 @@ prepare() {
 
   # Fix filenames
   sed -i 's|cataclysm-dda|cataclysm-bn|' CMakeLists.txt
-  sed -i 's|cataclysm-dda|cataclysm-bn|' Makefile
   sed -i 's|TARGET_NAME = cataclysm|TARGET_NAME = cataclysm-bn|' Makefile
   sed -i 's|cataclysm.a|cataclysm-bn.a|' Makefile
   sed -i 's|cataclysm.a|cataclysm-bn.a|' tests/Makefile
@@ -125,12 +128,11 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = the-fork|VERSION = 2036|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-06-22-0805|' Makefile
 
 
   # gcc11 support
   patch -Np1 -i "$srcdir"/gcc11.patch
-  sed -i 's|-Wzero-as-null-pointer-constant \\|-Wzero-as-null-pointer-constant|' Makefile
   sed -i 's|-Wno-unknown-warning-option||' Makefile
   sed -i 's|-Wzero-as-null-pointer-constant \\|-Wzero-as-null-pointer-constant")|' CMakeLists.txt
   sed -i 's|-Wno-unknown-warning-option")||' CMakeLists.txt
@@ -223,6 +225,9 @@ prepare() {
   # Fix Non-Player facton NPCs from becoming sleep deprived
   patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch
 
+  # Fix Non-Player facton NPCs from becoming malnourished
+  patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-malnourishment.patch
+
   # Fix NPCs preferring tables to cots or woodstoves to the floor
   patch -Np1 -i "$srcdir"/jc_stop-sleeping-on-tables.patch
 
@@ -235,7 +240,7 @@ prepare() {
 }
 
 build() {
-  cd "Cataclysm-BN-$pkgver"
+  cd "${_pkgname}-${_pkgver}"
 
   #export CFLAGS="$CFLAGS -fPIE"
   export CXXFLAGS="$CXXFLAGS -fPIE"
@@ -249,7 +254,7 @@ build() {
 }
 
 package_cataclysm-bn() {
-  cd "Cataclysm-BN-$pkgver"
+  cd "${_pkgname}-${_pkgver}"
 
   make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LTO=1 LOCALIZE=1 LANGUAGES=all install
 
@@ -280,7 +285,7 @@ package_cataclysm-bn() {
 package_cataclysm-bn-tiles() {
   pkgdesc="A graphical post-apocalyptic roguelike."
   depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer')
-  cd "Cataclysm-BN-$pkgver"
+  cd "${_pkgname}-${_pkgver}"
 
   make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 install
 
diff --git a/jc_stop-non-faction-npc-malnourishment.patch b/jc_stop-non-faction-npc-malnourishment.patch
new file mode 100644
index 0000000..33781d7
--- /dev/null
+++ b/jc_stop-non-faction-npc-malnourishment.patch
@@ -0,0 +1,32 @@
+--- a/src/npcmove.cpp
++++ b/src/npcmove.cpp
+@@ -116,6 +116,14 @@
+ static const efftype_id effect_onfire( "onfire" );
+ static const efftype_id effect_stunned( "stunned" );
+ 
++const vitamin_id vitamin_calcium( "calcium" );
++const vitamin_id vitamin_iron( "iron" );
++const vitamin_id vitamin_vitA( "vitA" );
++const vitamin_id vitamin_vitB( "vitB" );
++const vitamin_id vitamin_vitC( "vitC" );
++const vitamin_id vitamin_mutant_toxin( "mutant_toxin" );
++const vitamin_id vitamin_bad_food( "bad_food" );
++
+ static constexpr float NPC_DANGER_VERY_LOW = 5.0f;
+ static constexpr float NPC_DANGER_MAX = 150.0f;
+ static constexpr float MAX_FLOAT = 5000000000.0f;
+@@ -3856,6 +3864,14 @@
+             // TODO: Remove this and let player "exploit" hungry NPCs
+             set_hunger( 0 );
+             set_thirst( 0 );
++            set_stored_kcal( get_healthy_kcal() );
++            vitamin_set( vitamin_calcium, 0 );
++            vitamin_set( vitamin_iron, 0 );
++            vitamin_set( vitamin_vitA, 0 );
++            vitamin_set( vitamin_vitB, 0 );
++            vitamin_set( vitamin_vitC, 0 );
++            vitamin_set( vitamin_mutant_toxin, 0 );
++            vitamin_set( vitamin_bad_food, 0 );
+         }
+         return false;
+     }