summaryrefslogtreecommitdiff
path: root/jc_npcs-eat-when-hungry.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-08-22 10:16:03 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-08-22 10:16:03 -0700
commit5bef40b21d3533cf0d851b35dab9d77e422944c2 (patch)
tree093dde4bd05dfcc20278a7c5abac183df3a0ae64 /jc_npcs-eat-when-hungry.patch
parentFix custom patch (diff)
downloadcataclysm-bn-5bef40b21d3533cf0d851b35dab9d77e422944c2.tar.xz
Updated to 2021-08-22-0722
Remove no longer neccessary metal doors patch Remove now obsolete hunger patch Update restore infection immune patch to account for the removal of tetanus
Diffstat (limited to 'jc_npcs-eat-when-hungry.patch')
-rw-r--r--jc_npcs-eat-when-hungry.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/jc_npcs-eat-when-hungry.patch b/jc_npcs-eat-when-hungry.patch
deleted file mode 100644
index 1c7bf0c..0000000
--- a/jc_npcs-eat-when-hungry.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/npcmove.cpp
-+++ b/src/npcmove.cpp
-@@ -1858,7 +1858,9 @@
- }
-
- if( one_in( 3 ) && ( get_thirst() > thirst_levels::thirsty ||
-- 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;
- }
-@@ -3820,13 +3822,14 @@
- 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 ) {
- complain_about( "camp_food_thanks", 1_hours, "<camp_food_thanks>", false );
- mod_hunger( -camp_kcals );
- mod_stored_kcal( camp_kcals );
- yours->food_supply -= camp_kcals;
-+ stomach.mod_calories( camp_kcals );
- return true;
- }
- complain_about( "camp_larder_empty", 1_hours, "<camp_larder_empty>", false );