Merge pull request #42610 from LcsTen/npc-languorous-speed-bonus

Fix Languorous mutation giving movespeed bonus
CleverRaven · Aug 2, 2020 · 0bc165c · 0bc165c
2 parents 39d822f + 6ec3611
commit 0bc165c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/mutation.cpp b/src/mutation.cpp
@@ -152,6 +152,11 @@ void Character::set_mutation( const trait_id &trait )
     mutation_effect( trait );
     recalc_sight_limits();
     calc_encumbrance();
+
+    // If the stamina is higher than the max (Languorous), set it back to max
+    if( get_stamina() > get_stamina_max() ) {
+        set_stamina( get_stamina_max() );
+    }
 }
 
 void Character::unset_mutation( const trait_id &trait_ )

diff --git a/src/npc.cpp b/src/npc.cpp
@@ -2837,7 +2837,8 @@ void npc::process_turn()
     player::process_turn();
 
     // NPCs shouldn't be using stamina, but if they have, set it back to max
-    if( calendar::once_every( 1_minutes ) && get_stamina() < get_stamina_max() ) {
+    // If the stamina is higher than the max (Languorous), set it back to max
+    if( calendar::once_every( 1_minutes ) && get_stamina() != get_stamina_max() ) {
         set_stamina( get_stamina_max() );
     }