make melatonin make sense

Author: Manushenkov

data/json/effects.json

@@ -1353,11 +1353,12 @@
     "type": "effect_type",
     "id": "melatonin",
     "name": [ "Melatonin Supplements" ],
-    "desc": [ "You took some melatonin supplements.  These will help with sleep deprivation." ],
-    "max_duration": 100800,
-    "dur_add_perc": 60,
-    "rating": "good",
-    "blood_analysis_description": "Melatonin"
+    "desc": [ "You took some melatonin supplements.  It makes you sleep more." ],
+    "max_duration": "1 d",
+    "dur_add_perc": 30,
+    "rating": "neutral",
+    "base_mods": { "sleepiness_min": [ 2 ], "sleepiness_chance": [ 500 ], "sleepiness_max_val": [ 150 ] },
+    "blood_analysis_description": "Elevated sleep hormone levels (Melatonin)"
   },
   {
     "type": "effect_type",

data/json/items/comestibles/med.json

@@ -5,7 +5,7 @@
     "subtypes": [ "COMESTIBLE" ],
     "comestible_type": "MED",
     "name": { "str": "melatonin tablet" },
-    "description": "An over-the-counter melatonin supplement, commonly prescribed to treat sleep deprivation and to mitigate its effects.  One tablet a day combined with a good night's sleep will help you recover faster.",
+    "description": "An over-the-counter sleep hormone.  Melatonin can help you fall asleep faster and stay asleep longer.  Using it may help restore your sleep schedule, but you might wake up feeling groggy.",
     "material": [ "drug_filler" ],
     "weight": "1 g",
     "volume": "8 ml",
@@ -17,9 +17,11 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE", "NO_TEMP" ],
     "use_action": {
       "type": "consume_drug",
-      "activation_message": "You pop a melatonin tablet.",
-      "effects": [ { "id": "melatonin", "duration": "16 h" } ]
-    }
+      "activation_message": "You take a melatonin tablet.",
+      "effects": [ { "id": "melatonin", "duration": "14 h" } ]
+    },
+    "sleepiness_mod": -20,
+    "healthy": -1
   },
   {
     "id": "adderall",

src/character.cpp

@@ -198,6 +198,7 @@ static const efftype_id effect_incorporeal( "incorporeal" );
 static const efftype_id effect_infected( "infected" );
 static const efftype_id effect_masked_scent( "masked_scent" );
 static const efftype_id effect_mech_recon_vision( "mech_recon_vision" );
+static const efftype_id effect_melatonin( "melatonin" );
 static const efftype_id effect_meth( "meth" );
 static const efftype_id effect_monster_saddled( "monster_saddled" );
 static const efftype_id effect_narcosis( "narcosis" );
@@ -5317,7 +5318,11 @@ void Character::fall_asleep()
         // In practice, the sleepiness from filling the tank from (no msg) to Time For Bed
         // will last about 8 days.
     } else {
-        fall_asleep( 10_hours );    // default max sleep time.
+        time_duration sleep_duration = 10_hours;  // default max sleep time
+        if( has_effect( effect_melatonin ) ) {
+            sleep_duration = 12_hours;  // Artificial sleep hormone boost allows you to sleep longer
+        }
+        fall_asleep( sleep_duration );
     }
 }
 

src/character_health.cpp

@@ -1467,6 +1467,9 @@ void Character::update_needs( int rate_multiplier )
                 if( has_effect( effect_disrupted_sleep ) || has_effect( effect_recently_coughed ) ) {
                     recovered *= .5;
                 }
+                if( has_effect( effect_melatonin ) ) {
+                    recovered *= .9;
+                }
                 mod_sleepiness( -recovered );
 
                 // Sleeping on the ground, no bionic = 1x rest_modifier
@@ -1477,10 +1480,6 @@ void Character::update_needs( int rate_multiplier )
                 // Sleeping on a bed, bionic         = 6x rest_modifier
                 // Sleeping on a comfy bed, bionic   = 9x rest_modifier
                 float rest_modifier = ( has_flag( json_flag_STOP_SLEEP_DEPRIVATION ) ? 3 : 1 );
-                // Melatonin supplements also add a flat bonus to recovery speed
-                if( has_effect( effect_melatonin ) ) {
-                    rest_modifier += 1;
-                }
 
                 const int comfort = get_comfort_at( pos_bub() ).comfort;
                 if( comfort >= comfort_data::COMFORT_VERY_COMFORTABLE ) {
@@ -1509,6 +1508,7 @@ void Character::update_needs( int rate_multiplier )
             mod_sleepiness( -3 ); // Fish sleep less in water
         }
     }
+
     if( is_avatar() && wasnt_sleepinessd && get_sleepiness() > sleepiness_levels::DEAD_TIRED &&
         !lying ) {
         if( !activity ) {
@@ -1518,7 +1518,6 @@ void Character::update_needs( int rate_multiplier )
             g->cancel_activity_query( _( "You're feeling tired." ) );
         }
     }
-
     if( current_stim < 0 ) {
         set_stim( std::min( current_stim + rate_multiplier, 0 ) );
     } else if( current_stim > 0 ) {

src/iuse.cpp

@@ -8839,17 +8839,6 @@ std::optional<int> iuse::post_up( Character *p, item *it, const tripoint_bub_ms
     return 0;
 }
 
-std::optional<int> iuse::melatonin_tablet( Character *p, item *it, const tripoint_bub_ms & )
-{
-    p->add_msg_if_player( _( "You pop a %s." ), it->tname() );
-    if( p->has_effect( effect_melatonin ) ) {
-        p->add_msg_if_player( m_warning,
-                              _( "Simply taking more melatonin won't help.  You have to go to sleep for it to work." ) );
-    }
-    p->add_effect( effect_melatonin, 16_hours );
-    return 1;
-}
-
 std::optional<int> iuse::coin_flip( Character *p, item *it, const tripoint_bub_ms & )
 {
     p->add_msg_if_player( m_info, _( "You flip a %s." ), it->tname() );

src/iuse.h

@@ -139,7 +139,6 @@ std::optional<int> ebooksave( Character *, item *, const tripoint_bub_ms & );
 std::optional<int> makemound( Character *, item *, const tripoint_bub_ms & );
 std::optional<int> mace( Character *, item *, const tripoint_bub_ms & );
 std::optional<int> manage_exosuit( Character *, item *, const tripoint_bub_ms & );
-std::optional<int> melatonin_tablet( Character *, item *, const tripoint_bub_ms & );
 std::optional<int> mininuke( Character *, item *, const tripoint_bub_ms & );
 std::optional<int> mop( Character *, item *it, const tripoint_bub_ms & );
 std::optional<int> mp3( Character *, item *, const tripoint_bub_ms & );