[fixed] issues with succubus and magic breast sleep events.

locations/pre_sleep_events.qsrc

@@ -23,10 +23,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		sleepVars['events_done'] = 0
 
 		if succubusQW = 2:
-			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''succhoice'' '
+			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''suc_event'' '
 		end
 		if magf2bdo = 2:
-			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''magbstchoice'' '
+			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''magb_event'' '
 		end
 
 		if nichGalaOpponent = 30 and hour <= 23 and hour >= 19 and nichDebug = 1:
@@ -135,6 +135,10 @@ end
 	!!                                     !!
 	!!=====================================!!
 
+if $ARGS[0] = 'suc_event':
+	gt 'pre_sleep_events', 'succhoice'
+end
+
 
 if $ARGS[0] = 'succhoice':
 	menu_off = 1
@@ -152,18 +156,7 @@ if $ARGS[0] = 'succhoice':
 	'Thinking about it you realize that you could push the energy out or pull it in!'
 	''
 	'<font color="red"><b>You also feel that both are <i>permanent</i> choices.</b></font>'
-	act 'Try to ignore it and go to sleep':
-		if disable_autosave = 0:
-			if mid($start_type,1,4) = 'city':
-				savegame 'autosave_city.sav'
-			elseif mid($start_type,1,3) = 'uni':
-				savegame 'autosave_uni.sav'
-			else
-				savegame 'autosave_sg.sav'
-			end
-		end
-		gs 'pre_sleep_events', 'end'
-	end
+	act 'Try to ignore it and go to sleep': gs 'pre_sleep_events', 'event_end'
 	act 'Push the Energy out for all time': gt 'pre_sleep_events', 'succhoiceNO'
 	act 'Pull the Energy in and let it change you permanently': gt 'pre_sleep_events', 'succhoiceYES'
 end
@@ -183,7 +176,7 @@ if $ARGS[0] = 'succhoiceNO':
 	minut +=5
 	gs 'stat'
 	act 'Go to sleep':
-		gs 'pre_sleep_events', 'end'
+		gs 'pre_sleep_events', 'event_end'
 	end
 end
 
@@ -241,7 +234,12 @@ if $ARGS[0] = 'succubinit':
 		RecovH = 0
 	end
 
-	act 'Finish': gs 'pre_sleep_events', 'end'
+	act 'Finish': gs 'pre_sleep_events', 'event_end'
+end
+
+
+if $ARGS[0] = 'magb_event':
+	gt 'pre_sleep_events', 'magbstchoice'
 end
 
 
@@ -257,9 +255,13 @@ if $ARGS[0] = 'magbstchoice':
 		magf2bdo = 1
 		magtarcup += 1
 		killvar 'mgf2bnocnt'
-		gt 'pre_sleep_events', 'end'
+		gs 'pre_sleep_events', 'event_end'
+	end
+	act 'Eh, I don''t like them like that.': 
+		magf2bdo = 0
+		mgf2bnocnt += 1
+		gs 'pre_sleep_events', 'event_end'
 	end
-	act 'Eh, I don''t like them like that.': magf2bdo = 0 & mgf2bnocnt += 1 & gs 'pre_sleep_events', 'end'
 end