summaryrefslogtreecommitdiff
path: root/0005-npcs-eat-when-hungry.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-09-11 13:29:33 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-09-11 13:29:33 -0700
commitceb9f49045e4bed1a074752ca68d48a59a9d0a01 (patch)
treea6d95e711254ada6c4c8b6f711cd447f36276f44 /0005-npcs-eat-when-hungry.patch
parentRebuild for several mod updates (diff)
downloadcataclysm-dda-ceb9f49045e4bed1a074752ca68d48a59a9d0a01.tar.xz
Many rebuilds from mod updates
New hotfixes
Diffstat (limited to '0005-npcs-eat-when-hungry.patch')
-rw-r--r--0005-npcs-eat-when-hungry.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/0005-npcs-eat-when-hungry.patch b/0005-npcs-eat-when-hungry.patch
deleted file mode 100644
index 2074bef..0000000
--- a/0005-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;