From 5df800d05b7ca9e8d7d79ef33fcdcead0785b75a Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 31 Jan 2022 20:26:08 -0800 Subject: Update to 0.F.3 Port various patches from BN --- jc_npcs-eat-when-hungry.patch | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 jc_npcs-eat-when-hungry.patch (limited to 'jc_npcs-eat-when-hungry.patch') diff --git a/jc_npcs-eat-when-hungry.patch b/jc_npcs-eat-when-hungry.patch deleted file mode 100644 index 2074bef..0000000 --- a/jc_npcs-eat-when-hungry.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/npcmove.cpp -+++ b/src/npcmove.cpp -@@ -1829,7 +1829,9 @@ - } - - if( one_in( 3 ) && ( get_thirst() > 40 || -- get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() * 0.95 ) ) { -+ get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() * 0.95 || -+ ( get_hunger() > 160 && -+ ( get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() ) ) ) ) { - if( consume_food_from_camp() ) { - return npc_noop; - } -@@ -3697,12 +3699,15 @@ - return true; - } - faction *yours = g->u.get_faction(); -- int camp_kcals = std::min( std::max( 0, 19 * get_healthy_kcal() / 20 - get_stored_kcal() - -+ int camp_kcals = std::min( std::max( 0, get_healthy_kcal() - get_stored_kcal() - - stomach.get_calories() ), yours->food_supply ); - if( camp_kcals > 0 ) { - mod_hunger( -camp_kcals ); - mod_stored_kcal( camp_kcals ); - yours->food_supply -= camp_kcals; -+ stomach.mod_calories( camp_kcals ); -+ stomach.mod_contents( -2400_ml ); -+ stomach.mod_contents( 1200_ml ); - return true; - } - return false; -- cgit v1.2.1