From 6b8d5abd7fc1d2f1d6f794640117c649eae3e01a Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 3 May 2023 15:58:03 -0700 Subject: Updated to 2023-04-30-2223 Revert more ammo patches. Revert more books patches. Clean up old book patch. Fix removed traits patch. Fix bathroom fluff patch. Remove obsolete vacutainer patch. Rename source patches. --- jc_stop-non-faction-npc-malnourishment.patch | 31 ---------------------------- 1 file changed, 31 deletions(-) delete mode 100644 jc_stop-non-faction-npc-malnourishment.patch (limited to 'jc_stop-non-faction-npc-malnourishment.patch') diff --git a/jc_stop-non-faction-npc-malnourishment.patch b/jc_stop-non-faction-npc-malnourishment.patch deleted file mode 100644 index 096a5a8..0000000 --- a/jc_stop-non-faction-npc-malnourishment.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/npcmove.cpp -+++ b/src/npcmove.cpp -@@ -116,6 +116,14 @@ - static const itype_id itype_oxygen_tank( "oxygen_tank" ); - static const itype_id itype_UPS( "UPS" ); - -+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,13 @@ - // TODO: Remove this and let player "exploit" hungry NPCs - set_hunger( 0 ); - set_thirst( 0 ); -+ 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 ); - } - } else { - for( const auto &food_item : inv_food ) { -- cgit v1.2.1