Merge remote-tracking branch 'Anjuna/master'

locations/bed2.qsrc

@@ -1,6 +1,5 @@
 # bed2
 $sleep_loc = 'bed2'
-menu_off = 0
 
 !! Lying in bed hub. From here PC can take various actions, including going to sleep.
 !!
@@ -12,6 +11,7 @@ if $ARGS[0] = 'bed2' or $ARGS[0] = 'start' or $ARGS[0] = '':
 	$alarmloc = 'bed2'
 	$menu_arg = 'start'
 	$alarmarg = 'start'
+	menu_off = 0
 
 	if clo_flag['bed'] = 1:
 		clo_flag['bed'] = 0

locations/bed_get_out.qsrc

@@ -1,9 +1,9 @@
 # bed_get_out
 $sleep_loc = 'bed_get_out'
-menu_off = 1
 
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
+	menu_off = 1
 	minut -= 1
 	InSleep = 0
 	slept_in = 0

locations/pre_sleep.qsrc

@@ -1,6 +1,5 @@
 # pre_sleep
 $sleep_loc = 'pre_sleep'
-menu_off = 1
 
 !! Deals with all the triggers that happen to prepare to for the sleep cycle, before the dream events start.
 !!
@@ -9,6 +8,7 @@ menu_off = 1
 
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
+	menu_off = 1
 	gt 'pre_sleep_events', 'start'
 end
 

locations/sleep.qsrc

@@ -1,6 +1,5 @@
 # sleep
 $sleep_loc = 'sleep'
-menu_off = 1
 
 !! Deals with the sleep cycle, advancing both time and stats during sleep.
 !!
@@ -43,6 +42,7 @@ end
 
 
 if $ARGS[0] = 'start':
+	menu_off = 1
 !! to avoid sleeping the whole day I decide to calcululate the duration of the sleep in advance
 !! the quality of the sleep depends on many factors, so the time of sleep can be modify later, especially the part when the time of sleep is shortened
 
@@ -73,6 +73,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'sleep_handler':
+	menu_off = 1
 	if sleepVars['minutes_to_wakeup'] > 0:
 		xgt 'sleep', 'sleep_loop'
 	else
@@ -82,6 +83,7 @@ end
 
 
 if $ARGS[0] = 'sleep_loop':
+	menu_off = 1
 	:sleep_loop_loop
 		minut += 1
 		sleepVars['stime'] += 1
@@ -134,6 +136,7 @@ end
 
 
 if $ARGS[0] = 'post_sleep':
+	menu_off = 1
 	if pcs_condition['lack_of_sleep'] >= 10:
 	!!Worsening of skin quality if you do not sleep enough.
 		skinDailyPenalty += 2

locations/sleep_simple.qsrc

@@ -1,7 +1,5 @@
 # sleep_simple
 $sleep_loc = 'sleep_simple'
-menu_off = 1
-
 
 if $ARGS[0] = 'simple':
 !! to avoid sleeping the whole day I decide to calculate the duration of the sleep in advance
@@ -65,9 +63,10 @@ end
 
 if $ARGS[0] = 'nap_bed':
 	act 'Take a nap (1:00)':
+		menu_off = 1
 		cla
 		if pcs_sleep < 10:
-			gt 'sleep', 'prepare_sleep'
+			gt 'pre_sleep', 'prepare_sleep'
 		elseif pcs_sleep <= 90:
 			InSleep = 1
 			pcs_sleep += 10
@@ -76,14 +75,13 @@ if $ARGS[0] = 'nap_bed':
 			gs 'stat'
 			*nl
 			'You sleep about an hour.'
-			act 'Get up': InSleep = 0 & gt 'bed_get_out', 'start'
 		else
 			minut += 5
 			gs 'stat'
 			*nl
 			'You are not tired enough to sleep, even for a short nap.'
-			act 'Get up': gt 'bed_get_out', 'start'
 		end
+		act 'Get up': InSleep = 0 & gt 'bed_get_out', 'start'
 	end
 end
 

locations/wakeup.qsrc

@@ -1,6 +1,5 @@
 # wakeup
 $sleep_loc = 'wakeup'
-menu_off = 1
 
 !! Deals with all the triggers that happen when waking up.
 !!
@@ -29,6 +28,7 @@ end
 
 
 if $ARGS[0] = 'get_out':
+	menu_off = 1
 	sleepVars['time_now'] = daystart * 1440 + hour * 60 + minut
 	if slept_in = 1:
 		'You wake up at <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, after sleeping-in a little longer than planned, but at least you''ve had plenty of sleep.'