Allows NPC morale to decay (cataclysmbnteam#2983)

mythosmod · Jun 22, 2023 · d4f6513 · d4f6513
1 parent 94df22d
commit d4f6513
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/character_turn.cpp b/src/character_turn.cpp
@@ -189,6 +189,17 @@ void Character::process_turn()
     } );
 
     suffer();
+
+    // Handle player and NPC morale ticks
+
+    if( calendar::once_every( 1_minutes ) ) {
+        update_morale();
+    }
+
+    if( calendar::once_every( 9_turns ) ) {
+        check_and_recover_morale();
+    }
+
     // NPCs currently don't make any use of their scent, pointless to calculate it
     // TODO: make use of NPC scent.
     if( !is_npc() ) {

diff --git a/src/game.cpp b/src/game.cpp
@@ -1583,14 +1583,6 @@ bool game::do_turn()
     character_funcs::update_body_wetness( u, get_weather().get_precise() );
     u.apply_wetness_morale( weather.temperature );
 
-    if( calendar::once_every( 1_minutes ) ) {
-        u.update_morale();
-    }
-
-    if( calendar::once_every( 9_turns ) ) {
-        u.check_and_recover_morale();
-    }
-
     if( !u.is_deaf() ) {
         sfx::remove_hearing_loss();
     }