[fixed] issues surrounding sleep events (and waking up horny).

locations/sleep.qsrc

@@ -33,10 +33,16 @@ if $ARGS[0] = 'end':
 	gt 'bed_get_out', 'start'
 end
 
+if $ARGS[0] = '':
+	msg 'gt ''sleep'', is depricated! Please report this bug.'
+	gt 'pre_sleep', 'start'
+	
+end
+
 
 
 
-if $ARGS[0] = 'start' or $ARGS[0] = '':
+if $ARGS[0] = 'start':
 !! 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
 

locations/sleep_events.qsrc

@@ -24,10 +24,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		if vibratorIN = 1:
 			if pcs_horny >= 100:
-				$sleep_events[] = 'gs ''sleep_events'', ''vibr_orgasm'' '
+				$sleep_events[] = 'gt ''sleep_events'', ''vibr_orgasm'' '
 			end
 		elseif pcs_horny > 80 and pcs_sleep >= 30 and rand (0, 299) = 0 and succubusQW ! 1 and succubusQW ! 2:
-			$sleep_events[] = 'gs ''sleep_events'', ''wake_horny'' '
+			$sleep_events[] = 'gt ''sleep_events'', ''wake_horny'' '
 		end
 
 		gs 'sleep_events', 'mod_events'
@@ -63,7 +63,7 @@ if $ARGS[0] = 'event_handler':
 		end
 	end
 
-	gs 'sleep_events', 'continue', 'dream'
+	gs 'sleep_events', 'continue', 'no_interupt'
 end
 
 if $ARGS[0] = 'event_handler2':
@@ -91,12 +91,15 @@ if $ARGS[0] = 'event_end':
 !!		gt 'bed_events', 'event_handler2', 'priority'
 !!	end
 
-	if $ARGS[1] = '' or $ARGS[1] = 'sleep':
-		gs 'sleep_events', 'continue', 'sleep'
-	elseif $ARGS[1] = 'dream':
+	if $ARGS[1] = 'dream':
 		gs 'sleep_events', 'continue', 'dream'
+
+	elseif $ARGS[1] = 'wake':
+		gs 'wakeup', 'start'
+
+!!	elseif $ARGS[1] = 'sleep':
 	else
-		gt 'wakeup', 'start'
+		gs 'sleep_events', 'continue', 'sleep'
 	end
 end
 
@@ -118,12 +121,12 @@ if $ARGS[0] = 'continue':
 	killvar 'temp_slev_id'
 	killvar '$temp_sleep_event_chosen'
 
-	if $ARGS[1] = '' or $ARGS[1] = 'sleep':
+	if $ARGS[1] = 'sleep':
 		xgt 'sleep', 'sleep_handler'
 	elseif $ARGS[1] = 'dream':
-		!! empty on purpose
-	else
 		gt 'dream_events', 'start'
+	else
+		!! Empty on purpose
 	end
 end
 
@@ -138,17 +141,17 @@ end
 
 
 if $ARGS[0] = 'vibr_orgasm':
-	*clr & cla
+	menu_off = 1
 	pcs_horny = 0
 	orgasm += 1
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/oface/o_face.jpg"></center>'
 	*nl
-	'You abruptly wake up in the throes of an orgasm. As you recover, you check the time, <<func(''bed2'', ''alarm_display'', hour, minut)>>.'
+	'You abruptly wake up in the throes of an orgasm. As you recover, you check the time, <<func(''alarmclock'', ''alarm_display'', hour, minut)>>.'
 
 	act 'Go back to sleep':
-		gs 'dream_events', 'event_end'
+		gt 'sleep_events', 'event_end', 'dream'
 	end
 
 	act 'Give up trying to sleep':
@@ -156,12 +159,13 @@ if $ARGS[0] = 'vibr_orgasm':
 		'<center><img <<$set_imgh>> src="images/shared/sex/oface/kotovfirst1.jpg"></center>'
 		*nl
 		'Maybe trying to sleep with a vibrator in your pussy wasn''t such a good idea.'
-		gs 'dream_events', 'event_end', 'wake'
+		gt 'sleep_events', 'event_end', 'wake'
 	end
 
 	exit
 end
 
+
 !! Exclusions for succubus dreams as they set horny to 100 and will always get overridden otherwise
 if $ARGS[0] = 'wake_horny':
 	menu_off = 1
@@ -188,7 +192,7 @@ if $ARGS[0] = 'wake_horny':
 	end
 
 	*nl
-	'You glance at your alarm clock. It reads <<func(''bed2'', ''alarm_display'', hour, minut)>>.'
+	'You glance at your alarm clock. It reads <<func(''alarmclock'', ''alarm_display'', hour, minut)>>.'
 	*nl
 
 	if SleepHorny = 1:
@@ -230,8 +234,7 @@ if $ARGS[0] = 'wake_horny':
 	act 'Try and go back to sleep':
 		pcs_mood -= 10
 		pcs_sleep -= 5
-		gs 'sleep_events', 'exit'
-		gt 'dream_events', 'dream'
+		gt 'sleep_events', 'event_end', 'dream'
 	end
 
 	act 'Masturbate':
@@ -242,7 +245,7 @@ if $ARGS[0] = 'wake_horny':
 
 	act 'Get out of bed (0:10)':
 		minut += 10
-		gs 'sleep_events', 'event_end', 'wake'
+		gt 'sleep_events', 'event_end', 'wake'
 	end
 	if strip_here = 1:
 		act 'Get out of bed and get dressed (0:15)':
@@ -253,7 +256,7 @@ if $ARGS[0] = 'wake_horny':
 			if $bed['shoetype'] ! 'none':
 				gs 'shoes', 'wear', $bed['shoetype'], bed['shoenumber']
 			end
-			gs 'sleep_events', 'event_end', 'wake'
+			gt 'sleep_events', 'event_end', 'wake'
 		end
 	end