Fixed Coughing during a cold prevents sleeping even when Dead Tired (C…

…leverRaven#35372)

* rebalance cough

* Fix cough suppresion and make effects smaller but more frequent

* Remove fatigue effect

* changed balance to reduce fatigue restore

* Changed name to be less confusing

data/json/effects.json

@@ -1825,6 +1825,10 @@
     "type": "effect_type",
     "id": "has_prospectus"
   },
+  {
+    "type": "effect_type",
+    "id": "recently_coughed"
+  },
   {
     "type": "effect_type",
     "id": "ignore_fall_damage",

src/character.cpp

@@ -95,6 +95,7 @@ const efftype_id effect_common_cold( "common_cold" );
 const efftype_id effect_contacts( "contacts" );
 const efftype_id effect_controlled( "controlled" );
 const efftype_id effect_cough_suppress( "cough_suppress" );
+const efftype_id effect_recently_coughed( "recently_coughed" );
 const efftype_id effect_crushed( "crushed" );
 const efftype_id effect_darkness( "darkness" );
 const efftype_id effect_disinfected( "disinfected" );
@@ -5123,6 +5124,10 @@ int Character::item_store_cost( const item &it, const item & /* container */, bo
 
 void Character::cough( bool harmful, int loudness )
 {
+    if( has_effect( effect_cough_suppress ) ) {
+        return;
+    }
+
     if( harmful ) {
         const int stam = get_stamina();
         const int malus = get_stamina_max() * 0.05; // 5% max stamina
@@ -5132,10 +5137,6 @@ void Character::cough( bool harmful, int loudness )
         }
     }
 
-    if( has_effect( effect_cough_suppress ) ) {
-        return;
-    }
-
     if( !is_npc() ) {
         add_msg( m_bad, _( "You cough heavily." ) );
     }
@@ -5144,10 +5145,7 @@ void Character::cough( bool harmful, int loudness )
 
     moves -= 80;
 
-    if( has_effect( effect_sleep ) && !has_effect( effect_narcosis ) &&
-        ( ( harmful && one_in( 3 ) ) || one_in( 10 ) ) ) {
-        wake_up();
-    }
+    add_effect( effect_recently_coughed, 5_minutes );
 }
 
 

src/player.cpp

@@ -127,6 +127,7 @@ const efftype_id effect_common_cold( "common_cold" );
 const efftype_id effect_contacts( "contacts" );
 const efftype_id effect_corroding( "corroding" );
 const efftype_id effect_cough_suppress( "cough_suppress" );
+const efftype_id effect_recently_coughed( "recently_coughed" );
 const efftype_id effect_darkness( "darkness" );
 const efftype_id effect_datura( "datura" );
 const efftype_id effect_deaf( "deaf" );
@@ -2885,6 +2886,9 @@ void player::update_needs( int rate_multiplier )
                 sleep.set_duration( 1_turns );
                 mod_fatigue( -25 );
             } else {
+                if( has_effect( effect_recently_coughed ) ) {
+                    recovered *= .5;
+                }
                 mod_fatigue( -recovered );
                 if( get_option< bool >( "SLEEP_DEPRIVATION" ) ) {
                     // Sleeping on the ground, no bionic = 1x rest_modifier