Update to sleep menu 2 #38768

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

Summary

SUMMARY: None

Purpose of change

As @akirashirosawa suggested in More obvious hint before going to sleep (UPDATED) #38722, the default sleep option is now only NO if there is an active element in the player inventory.
And I've also changed the phrase to match cigars and the like because you can't turn off cigars.
Gas masks, musical instruments and glowsticks are ignored.
New FLAG SLEEP IGNORE added . Items can now be easily excluded.
New hint "You may want to extinguish or turn off:" (Not shown in screenshots.)

This fixes #38785.

Hope you like it.

Screenshot(s)

BevapDin · 2020-03-14T15:02:20Z

Instead of moving the code blocks around (that add the menu entries), you can set the initially selected item of the menu via uilist::selected. That way you don't have to duplicate all those entries and the menu has a consistent appearance (entries always in the same order).

akirashirosawa

Just fix/add comments

src/handle_action.cpp

Change comment Co-Authored-By: akirashirosawa <38557723+akirashirosawa@users.noreply.github.com>

Dacendeth · 2020-03-14T15:11:35Z

Can you fix it flaring up with gas masks? you cant actually turn those off either.

Pupsi-Mupsi · 2020-03-14T15:11:37Z

Instead of moving the code blocks around (that add the menu entries), you can set the initially selected item of the menu via uilist::selected. That way you don't have to duplicate all those entries and the menu has a consistent appearance (entries always in the same order).

Sounds good. Can you help me with that?

Dacendeth · 2020-03-14T15:24:10Z

This also just makes where yes is inconsistent, did we really need to babyproof falling asleep with a flashlight on in the first place?

Pupsi-Mupsi · 2020-03-14T15:29:16Z

This also just makes where yes is inconsistent, did we really need to babyproof falling asleep with a flashlight on in the first place?

I feel like it might help new players. Don't you?

akirashirosawa · 2020-03-14T15:34:26Z

Instead of moving the code blocks around (that add the menu entries), you can set the initially selected item of the menu via uilist::selected. That way you don't have to duplicate all those entries and the menu has a consistent appearance (entries always in the same order).

Sounds good. Can you help me with that?

diff --git a/src/handle_action.cpp b/src/handle_action.cpp
--- a/src/handle_action.cpp
+++ b/src/handle_action.cpp
@@ -903,15 +903,16 @@ static void sleep()
     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." ) );
+    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." ) );
+
 
     // List all active items, bionics or mutations so player can deactivate them
     std::vector<std::string> active;
@@ -958,8 +959,9 @@ static void sleep()
     // ask for deactivation
     std::stringstream data;
     if( !active.empty() ) {
+        as_m.selected = 2;
         data << as_m.text << std::endl;
-        data << _( "You may want to turn off:" ) << std::endl;
+        data << _( "You may want to take care of:" ) << std::endl;
         data << " " << std::endl;
         for( auto &a : active ) {
             data << "<color_red>" << a << "</color>" << std::endl;

Pupsi-Mupsi · 2020-03-14T15:44:27Z

Thank you akirashirosawa!

akirashirosawa · 2020-03-14T15:52:07Z

Can you fix it flaring up with gas masks? you cant actually turn those off either.

It would be nice to filter things like gas masks, glowstick, but I don't know what flag we can use to do it.

Pupsi-Mupsi · 2020-03-14T15:56:22Z

Can you fix it flaring up with gas masks? you cant actually turn those off either.

It would be nice to filter things like gas masks, glowstick, but I don't know what flag we can use to do it.

Maybe -> "use_action": "GASMASK".
As for the glow stick, I still don't have a good idea.

Dacendeth · 2020-03-14T15:57:21Z

I feel new players should learn from mistakes instead of having their hand held.

akirashirosawa · 2020-03-14T15:58:44Z

Thank you akirashirosawa!

You are welcome) I don’t know how to make such big suggestion in review, sorry, but, I just copied diff again.

Pupsi-Mupsi · 2020-03-14T16:00:31Z

I feel new players should learn from mistakes instead of having their hand held.

I understand your point.
You can still go to sleep and ignore the new hint.
Or would you prefer to remove the changes?

akirashirosawa · 2020-03-14T16:03:32Z

I feel new players should learn from mistakes instead of having their hand held.

I feel that I went to sleep with mp3 player on like 1000 times. And I am very happy about this change! It just makes the game more convenient, not more easy.

akirashirosawa · 2020-03-14T16:17:52Z

Can you fix it flaring up with gas masks? you cant actually turn those off either.

It would be nice to filter things like gas masks, glowstick, but I don't know what flag we can use to do it.

Maybe -> "use_action": "GASMASK".
As for the glow stick, I still don't have a good idea.

We cannot hardcode such things. A gas mask and a glowstick are what came to mind now. There may be more items, may appear more items. Need to find or add a flag. But I think ignoring the warning is also a good solution too. After all, it is written, that You may want to take care of, not You should.

Pupsi-Mupsi · 2020-03-14T16:21:52Z

Can you fix it flaring up with gas masks? you cant actually turn those off either.

@Dacendeth
@akirashirosawa

Just added this to ignore GASKMASK.

Pupsi-Mupsi · 2020-03-14T16:45:21Z

We cannot hardcode such things. A gas mask and a glowstick are what came to mind now. There may be more items, may appear more items. Need to find or add a flag. But I think ignoring the warning is also a good solution too. After all, it is written, that You may want to take care of, not You should.

You're right. We should consider adding a FLAG to filter those things.
I would prefer to move this to another PR and wait for more feedback on that matter.

akirashirosawa · 2020-03-14T17:26:40Z

For note: musical instruments not a problem to sleep too.

And don't forget run make astyle before commit. Last commit have astyle regressions found error.

Pupsi-Mupsi · 2020-03-14T17:40:23Z

For note: musical instruments not a problem to sleep too.

And don't forget run make astyle before commit. Last commit have astyle regressions found error.

You are right on both counts.
The game takes care of the instruments, but they shouldn't be part of the hint, so I'll exclude them too.

akirashirosawa · 2020-03-15T09:04:06Z

Just added this to ignore GASKMASK.

Already created issue with gas mask 🙂
I think you can add fix #38785 to PR description

Pupsi-Mupsi · 2020-03-18T19:15:11Z

So, should I change anything else?
Or are we good?

I will post three more comments. Please vote with 👍and 👎. So we could find a way to deal with it. By the way - I will vote well. OK?

And please let me know if I missed anything else.

Pupsi-Mupsi · 2020-03-18T19:15:36Z

I could offer to remove the whole sentence ("You may want to take care of:").
There is already a question of whether you are really sure you want to sleep, followed by a list of items.

_I would remove the sentence.

Pupsi-Mupsi · 2020-03-18T19:15:51Z

I could create a "WARN_ON_SLEEP" flag and mark all the items that should be on the waring list.

I don't mind. So I don't vote.

Pupsi-Mupsi · 2020-03-18T19:17:04Z

The third is what should happen with the option order. Leave it as is (this PR) or change it?

I would leave it as it would be after this PR gets merged. So I vote YES,

umamaistempo · 2020-03-19T17:22:13Z

About the flag, I would say that even if we consider doing it, it does not have to be shipped along with this PR, so don't worry.

About the message, having any message is better than none; so between removing it and keeping it, keeping seems to me like the safest choice.

I think that we could have a more explicit message on what are the problems and solutions (ie: "turn off electronics to avoid wasting power and extinguish fires to avoid ... fires ?").

Pupsi-Mupsi · 2020-03-19T19:11:35Z

Thanks.

Pupsi-Mupsi · 2020-04-04T14:18:02Z

Need help resolving conflicting files src/cata_string_consts.h.

Is it enough to move
static const std::string flag_SLEEP_IGNORE( "SLEEP_IGNORE" );

to

src\handle_action.cpp

cause there is no "src/cata_string_consts.h" anymore.

anothersimulacrum · 2020-04-04T17:46:30Z

Yes.

change sentence and inactive-item-default

bb8aa08

Pupsi-Mupsi mentioned this pull request Mar 14, 2020

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

Merged

akirashirosawa reviewed Mar 14, 2020

View reviewed changes

src/handle_action.cpp Outdated Show resolved Hide resolved

src/handle_action.cpp Outdated Show resolved Hide resolved

Update src/handle_action.cpp

7100263

Change comment Co-Authored-By: akirashirosawa <38557723+akirashirosawa@users.noreply.github.com>

Use selected instead

3d8eef2

Ignore GASMASK

cf10e91

Ignore musical_instrument

5c1707c

ZhilkinSerg added 0.E Content Freeze <Bugfix> This is a fix for a bug (or closes open issue) Info / User Interface Game - player communication, menus, etc. labels Mar 15, 2020

ZhilkinSerg changed the base branch from master to dev March 15, 2020 11:13

ZhilkinSerg force-pushed the dev branch 2 times, most recently from 924f105 to 39e00e3 Compare March 18, 2020 07:00

Change wording

cfe1b09

umamaistempo approved these changes Mar 26, 2020

View reviewed changes

ZhilkinSerg force-pushed the dev branch 3 times, most recently from ad63e77 to 8e68539 Compare April 1, 2020 12:18

kevingranade force-pushed the dev branch 4 times, most recently from 621a68e to b7106d0 Compare April 2, 2020 07:42

ZhilkinSerg force-pushed the dev branch 3 times, most recently from 0f30a43 to d432807 Compare April 2, 2020 12:55

ifreund removed the 0.E Content Freeze label Apr 4, 2020

Pupsi-Mupsi added 2 commits April 4, 2020 21:20

Resolve conflict with cata_string_consts.h

50abecd

Add static const to handle_action.cpp

f293c11

ZhilkinSerg changed the base branch from dev to master April 7, 2020 23:20

ZhilkinSerg added 2 commits April 8, 2020 02:31

Update handle_action.cpp

84a6609

Update handle_action.cpp

15061ae

ZhilkinSerg merged commit 3d01ae9 into CleverRaven:master Apr 7, 2020

Pupsi-Mupsi deleted the PM-sleep-update branch April 7, 2020 23:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to sleep menu 2 #38768

Update to sleep menu 2 #38768

Pupsi-Mupsi commented Mar 14, 2020 •

edited

Loading

BevapDin commented Mar 14, 2020

akirashirosawa left a comment

Dacendeth commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

Dacendeth commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

Dacendeth commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020 •

edited

Loading

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 15, 2020

Pupsi-Mupsi commented Mar 18, 2020

Pupsi-Mupsi commented Mar 18, 2020 •

edited

Loading

Pupsi-Mupsi commented Mar 18, 2020 •

edited

Loading

Pupsi-Mupsi commented Mar 18, 2020 •

edited

Loading

umamaistempo commented Mar 19, 2020

Pupsi-Mupsi commented Mar 19, 2020

Pupsi-Mupsi commented Apr 4, 2020

anothersimulacrum commented Apr 4, 2020

Update to sleep menu 2 #38768

Update to sleep menu 2 #38768

Conversation

Pupsi-Mupsi commented Mar 14, 2020 • edited Loading

Summary

Purpose of change

Screenshot(s)

BevapDin commented Mar 14, 2020

akirashirosawa left a comment

Choose a reason for hiding this comment

Dacendeth commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

Dacendeth commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

Dacendeth commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020 • edited Loading

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 14, 2020

Pupsi-Mupsi commented Mar 14, 2020

akirashirosawa commented Mar 15, 2020

Pupsi-Mupsi commented Mar 18, 2020

Pupsi-Mupsi commented Mar 18, 2020 • edited Loading

Pupsi-Mupsi commented Mar 18, 2020 • edited Loading

Pupsi-Mupsi commented Mar 18, 2020 • edited Loading

umamaistempo commented Mar 19, 2020

Pupsi-Mupsi commented Mar 19, 2020

Pupsi-Mupsi commented Apr 4, 2020

anothersimulacrum commented Apr 4, 2020

Pupsi-Mupsi commented Mar 14, 2020 •

edited

Loading

Pupsi-Mupsi commented Mar 14, 2020 •

edited

Loading

Pupsi-Mupsi commented Mar 18, 2020 •

edited

Loading

Pupsi-Mupsi commented Mar 18, 2020 •

edited

Loading

Pupsi-Mupsi commented Mar 18, 2020 •

edited

Loading