More obvious hint before going to sleep (UPDATED) #38722

Pupsi-Mupsi · 2020-03-12T14:22:53Z

Summary

SUMMARY: Interface "Small sleep menu improvement"

Purpose of change

In a nutshell: Help players with a more obvious hint before they try to sleep.
And as @Leland suggested the default sleep-option is now NO.
This PR has improved significantly thanks to: @Shibimon and @umamaistempo

Thank you all!!!

Hope you like it.

Screenshot(s)

Final version:

Leland · 2020-03-12T16:16:01Z

Perhaps change the default selection to No as well?

Pupsi-Mupsi · 2020-03-12T16:35:42Z

I like the idea. Makes it even safer. Any idea where or how to implement your idea?

Shibimon · 2020-03-13T06:45:51Z

Add this to trying to sleep with mp3 on, i always forget to turn it off before.

Pupsi-Mupsi · 2020-03-13T09:51:07Z

Add this to trying to sleep with mp3 on, i always forget to turn it off before.

Same here. Thank you.
Your wish is granted!

umamaistempo · 2020-03-13T18:22:47Z

src/handle_action.cpp


    // List all active items, bionics or mutations so player can deactivate them
    std::vector<std::string> active;
    for( auto &it : u.inv_dump() ) {
        if( it->active && ( it->charges > 0 || it->units_remaining( u ) > 0 ) &&
-            it->is_transformable() ) {
+            it->is_tool() ) {


Fun thing: a lit cigar is not a tool and would also not pass this test because it does not have charges, I think (just tested, got everything on fire).

Since the other day I read on reddit that someone started bionic operation (ie: anesthesia) while smoking a lit cigar and that caused them to start a fire, for this reason I think that we should also consider lit items as things to notify:

So I think we should do something like

it->has_flag( flag_LITCIG ) || ( it->active && ( it->charges > 0 || it->units_remaining( u ) > 0 ) && it->is_tool() )

The only items that have destructive effect that are not tools that I found were, besides cigarettes, non-lethal grenades (insecticide, fungicide, smoke).

Good thinking!!! Added your idea.
I'm not at home right now, so a new screenshot will have to wait til tomorrow.

The only bad thing is:
Now I have to think of a new sentence that fits the lit cigar ;-)
--> You may want to turn off:
Any suggestions?

Can't think of anything good.
-> You may want to take care of:

I think that "You may want to take care of:" is great. Alternativaly, something like "You may want to put out the following:" or "It might be safer to shut off the following before sleeping:"

I think I'll go with "The following may have slipped your mind:". What do you think?
BTW - Tests fail. I'll take a closer look tomorrow.

src/handle_action.cpp

akirashirosawa · 2020-03-14T13:36:37Z

Why is the answer “no” by default even without active bionics? Is this a bug or what?

akirashirosawa · 2020-03-14T14:02:35Z

Maybe it's better?

diff --git a/src/handle_action.cpp b/src/handle_action.cpp
--- a/src/handle_action.cpp
+++ b/src/handle_action.cpp
@@ -900,19 +900,6 @@ static void sleep()
         u.add_msg_if_player( m_info, _( "You cannot sleep while mounted." ) );
         return;
     }
-    uilist as_m;
-    as_m.text = _( "<color_white>Are you sure you want to sleep?</color>" );
-    // (Y)es/(S)ave before sleeping/(N)o
-    as_m.entries.emplace_back( 2, true,
-                               get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'N' : 'n',
-                               _( "No." ) );
-    as_m.entries.emplace_back( 1, g->get_moves_since_last_save(),
-                               get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'S' : 's',
-                               _( "Yes, and save game before sleeping." ) );
-    as_m.entries.emplace_back( 0, true,
-                               get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'Y' : 'y',
-                               _( "Yes." ) );
-
     // List all active items, bionics or mutations so player can deactivate them
     std::vector<std::string> active;
     for( auto &it : u.inv_dump() ) {
@@ -955,9 +942,21 @@ static void sleep()
         }
     }
 
-    // ask for deactivation
+    uilist as_m;
+    as_m.text = _( "<color_white>Are you sure you want to sleep?</color>" );
     std::stringstream data;
     if( !active.empty() ) {
+        // (N)o/(S)ave before sleeping/(Y)es
+        as_m.entries.emplace_back( 2, true,
+                                   get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'N' : 'n',
+                                   _( "No." ) );
+        as_m.entries.emplace_back( 1, g->get_moves_since_last_save(),
+                                   get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'S' : 's',
+                                   _( "Yes, and save game before sleeping." ) );
+        as_m.entries.emplace_back( 0, true,
+                                   get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'Y' : 'y',
+                                   _( "Yes." ) );
+        // ask for deactivation
         data << as_m.text << std::endl;
         data << _( "You may want to turn off:" ) << std::endl;
         data << " " << std::endl;
@@ -965,6 +964,17 @@ static void sleep()
             data << "<color_red>" << a << "</color>" << std::endl;
         }
         as_m.text = data.str();
+    } else {
+         // (Y)es/(S)ave before sleeping/(N)o
+        as_m.entries.emplace_back( 0, true,
+                                   get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'Y' : 'y',
+                                   _( "Yes." ) );
+        as_m.entries.emplace_back( 1, g->get_moves_since_last_save(),
+                                   get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'S' : 's',
+                                   _( "Yes, and save game before sleeping." ) );
+        as_m.entries.emplace_back( 2, true,
+                                   get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'N' : 'n',
+                                   _( "No." ) );
     }
 
     /* Calculate key and window variables, generate window,

Pupsi-Mupsi · 2020-03-14T14:04:22Z

You are right. thank you. You wanne PR it yourself?

Pupsi-Mupsi · 2020-03-14T14:05:34Z

if( !active.empty() ) { // (Y)es/(S)ave before sleeping/(N)o as_m.entries.emplace_back( 2, true, get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'N' : 'n', _( "No." ) ); as_m.entries.emplace_back( 1, g->get_moves_since_last_save(), get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'S' : 's', _( "Yes, and save game before sleeping." ) ); as_m.entries.emplace_back( 0, true, get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'Y' : 'y', _( "Yes." ) ); } else if( active.empty() ) { as_m.entries.emplace_back( 0, true, get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'Y' : 'y', _( "Yes." ) ); as_m.entries.emplace_back( 1, g->get_moves_since_last_save(), get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'S' : 's', _( "Yes, and save game before sleeping." ) ); as_m.entries.emplace_back( 2, true, get_option<bool>( "FORCE_CAPITAL_YN" ) ? 'N' : 'n', _( "No." ) ); }

I was thinking of...

akirashirosawa · 2020-03-14T14:13:02Z

You wanne PR it yourself?

I have not created and configured fork. It would be nice if you made changes 🙂

Pupsi-Mupsi · 2020-03-14T14:16:39Z

You wanne PR it yourself?
I have not created and configured fork. It would be nice if you made changes 🙂

Of course!
BTW: I was thinking about changing the sentence.
"You may want to turn off:" does not fit as good after cigars and such could now also be part of the list.

An idea?

Maybe:
"The following may have slipped your mind:"
or
"You may want to take care of:"

akirashirosawa · 2020-03-14T14:28:21Z

if( !active.empty() )
else if( active.empty() )

unnecessary second check

"You may want to take care of:"

That sounds good. But English is not my native)

Pupsi-Mupsi · 2020-03-14T14:40:36Z

Thank you!
Take a look #38768.

colorize ask for deactivation

0c64d5c

Pupsi-Mupsi changed the title ~~colorize ask for deactivation~~ More obvious hint before going to sleep Mar 12, 2020

Pupsi-Mupsi added 2 commits March 12, 2020 20:32

change default selection sleep menu to NO

f1eb7a0

undo astyle

c4ed4c0

show player all active inv-ob that use up charges

bc7ca24

Pupsi-Mupsi changed the title ~~More obvious hint before going to sleep~~ More obvious hint before going to sleep (UPDATED) Mar 13, 2020

color and text

8a09875

umamaistempo reviewed Mar 13, 2020

View reviewed changes

Pupsi-Mupsi added 3 commits March 13, 2020 20:23

Add test to check for lit items (cigar ...)

87db42b

Add missing parentheses

2f04724

typo

ef8ca08

kevingranade reviewed Mar 14, 2020

View reviewed changes

src/handle_action.cpp Outdated Show resolved Hide resolved

Update src/handle_action.cpp

8c86ce2

kevingranade reviewed Mar 14, 2020

View reviewed changes

src/handle_action.cpp Outdated Show resolved Hide resolved

Update src/handle_action.cpp

1339576

kevingranade merged commit 8ffbe67 into CleverRaven:master Mar 14, 2020

Pupsi-Mupsi deleted the PM-AFDM branch March 14, 2020 09:55

Pupsi-Mupsi mentioned this pull request Mar 14, 2020

Update to sleep menu 2 #38768

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More obvious hint before going to sleep (UPDATED) #38722

More obvious hint before going to sleep (UPDATED) #38722

Pupsi-Mupsi commented Mar 12, 2020 •

edited

Loading

Leland commented Mar 12, 2020

Pupsi-Mupsi commented Mar 12, 2020

Shibimon commented Mar 13, 2020

Pupsi-Mupsi commented Mar 13, 2020

umamaistempo Mar 13, 2020

umamaistempo Mar 13, 2020

Pupsi-Mupsi Mar 13, 2020

umamaistempo Mar 13, 2020

Pupsi-Mupsi Mar 13, 2020

akirashirosawa commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020 •

edited

Loading

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

More obvious hint before going to sleep (UPDATED) #38722

More obvious hint before going to sleep (UPDATED) #38722

Conversation

Pupsi-Mupsi commented Mar 12, 2020 • edited Loading

Summary

Purpose of change

Screenshot(s)

Leland commented Mar 12, 2020

Pupsi-Mupsi commented Mar 12, 2020

Shibimon commented Mar 13, 2020

Pupsi-Mupsi commented Mar 13, 2020

umamaistempo Mar 13, 2020

Choose a reason for hiding this comment

umamaistempo Mar 13, 2020

Choose a reason for hiding this comment

Pupsi-Mupsi Mar 13, 2020

Choose a reason for hiding this comment

umamaistempo Mar 13, 2020

Choose a reason for hiding this comment

Pupsi-Mupsi Mar 13, 2020

Choose a reason for hiding this comment

akirashirosawa commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020 • edited Loading

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

Pupsi-Mupsi commented Mar 12, 2020 •

edited

Loading

akirashirosawa commented Mar 14, 2020 •

edited

Loading