From 8dc77a9ce27209cf56da1d437b645f28e9760bbd Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 26 Aug 2021 12:05:41 -0700
Subject: Fix malnourishment patch Update tileset

---
 PKGBUILD                                     | 6 +++---
 jc_stop-non-faction-npc-malnourishment.patch | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 8ba2b2a..ed150ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202108220722
 _pkgver=2021-08-22-0722
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -109,13 +109,13 @@ b2sums=('ca059606bcb3e92ae9ad5ecd50bd2a6f0ef53f5ec9629db815b34df1cbad3797037a1bd
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
-        'e5d7b75d3bced70d5f77bd8860c53f888b1f2495b4a6bf0b1284e3fc1e831a58bc691b4a11419cd7d14427165158d7ebf3f5c690733e4f3ee5194b9bf9bd001a'
+        '3eed24ef313c30c6e8fa69d3f88b1cf827b22fc90c144fa994433cfc5f0a9476174b418be267e16f2c3425c7f6f3ca108151f180e7d9b040f6ff88a39a05ecad'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
         '749badf61daf2957ecc1ad880628e8ffa1fac70e08523151c86f17fec2e6a5e65240fa2545f54936163bdb1dc677a258d138ebccada1c54694d2a39d830d2755'
         '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42'
         'e923c7c29e9301a1afe9a4679a96a1a58f0b6541e86181980e8283160347dfe166f63c53edb9b2a6d62be3713f74e7bb34bddb1798cafb88388922e22170cc96'
-        '0cf2d5cbf60c4c4a52cb7f2ecd4dd1757a811e3b0b6b5606f4417ba95901479bfc3fc9270377d5c4d855a94cd841e07229415dacce3475dcb7f03b01ebc3b949'
+        '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104'
         'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206'
         '83ea75e6c14667c134bf683f330235c40c7bb94c65e19a6fc4a09ba38da254d09264a86cba4cafcbcf9b79916bd8e16976cb1b49be2475fe315616a3cc857820'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
diff --git a/jc_stop-non-faction-npc-malnourishment.patch b/jc_stop-non-faction-npc-malnourishment.patch
index 33781d7..f45402f 100644
--- a/jc_stop-non-faction-npc-malnourishment.patch
+++ b/jc_stop-non-faction-npc-malnourishment.patch
@@ -15,11 +15,10 @@
  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 @@
+@@ -3856,6 +3864,13 @@
              // TODO: Remove this and let player "exploit" hungry NPCs
-             set_hunger( 0 );
+             set_stored_kcal( max_stored_kcal() );
              set_thirst( 0 );
-+            set_stored_kcal( get_healthy_kcal() );
 +            vitamin_set( vitamin_calcium, 0 );
 +            vitamin_set( vitamin_iron, 0 );
 +            vitamin_set( vitamin_vitA, 0 );
-- 
cgit v1.2.1