Merge remote-tracking branch 'Anjuna/master'

locations/mother_chats.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'rape_talk':
 				'"Okay <<$npc_nickname[''A29'']>> I will but I think I''d rather just go by myself. The embarrassment of letting the doctor examine me down there after what happened... Urgh!"'
 				'Tears well up in your eyes again and she pulls you back into her arms and cuddles you, holding you tight as you both let out all your pain and anguish.'
 				'As you calm down your <<$npc_nickname[''A29'']>> looks at you strokes your face and smiles. "At least you talked to me about this <<$pcs_nickname>> rather than keeping all this bottled up inside."'
-				'Your <<$npc_nickname[''A29'']>> makes you both a cup of tea and shuts the kitchen door. As you drink it she spends some time focusing on and comforting you."'
+				'Your <<$npc_nickname[''A29'']>> makes you both a cup of tea and shuts the kitchen door. As you drink it she spends some time focusing on and comforting you.'
 				'She concludes by saying, "If you want to talk about this or anything else I''m here for you. I love and support you. <i>Always</i>."'
 				'You feel that your chat with her has helped you a bit. You continue to hug her crying on her shoulder for a while.'
 				act 'Continue':gt 'kuhrPar'
@@ -82,7 +82,7 @@ if $ARGS[0] = 'rape_talk':
 					'On the way you ask your <<$npc_nickname[''A29'']>> to remain in the waiting room as the whole thing is traumatic enough.'
 					'Your <<$npc_nickname[''A29'']>> looks at you and smiles. "Of course, if that''s what you want darling."'
 					'A little while later you return to your <<$npc_nickname[''A29'']>> and tell her that the doctor didn''t find anything but that you have to come back soon for a second check."'
-					'Your <<$npc_nickname[''A29'']>> looks at you. "If you want me to go with you please just let me know."'
+					'Your <<$npc_nickname[''A29'']>> looks at you. If you want me to go with you please just let me know."'
 					'"Thanks <<$npc_nickname[''A29'']>> I will but I think I''d rather just go by myself. The embarrassment of letting the doctor examine me down there after what happened... Urgh!"'
 					'Tears well up in your eyes again and she pulls you back into her arms and cuddles you, holding you tight as you both let out all your pain and anguish.'
 					'As you calm down your <<$npc_nickname[''A29'']>> looks at you strokes your face and smiles. "At least you talked to me about this <<$pcs_nickname>> rather than carrying the burden by yourself. Let''s go home."'
@@ -227,7 +227,7 @@ if $ARGS[0] = 'lost_virginity_talk':
 				gs 'stat'
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/walking.jpg"></center>'
-				'Right well I''m done with taking all this crap! Until you can treat me with respect you''ve just lost a daughter!"'
+				'"Right well I''m done with taking all this crap! Until you can treat me with respect you''ve just lost a daughter!"'
 				'With that you turn and leave slamming the door behind you. You collect your stuff as you''ll need to find somewhere to live at least until your <<$npc_nickname[''A29'']>> calms down. Also maybe Vlad or Anya will have a word with her when the see you aren''t home. You could try your uncle upstairs or the hotel for now.'
 				act 'Return to Five Eight': gt 'pav_complex', 'start'
 			end
@@ -290,18 +290,18 @@ if $ARGS[0] = 'reconciliation_talk':
 					gs 'homes_properties', 'give_access', 'parents_home'
 					cla & *clr
 					minut += 5
-					'<center><img <<$set_imgh>> src="images/characters/pavlocsk/resident/mom/mum_gyno1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mum_gyno1.jpg"></center>'
 					'"Yes, I would like that," you smile gently.'
 					'At this your <<$npc_nickname[''A29'']>> gets up and rushes around the table to give you a big hug, nearly knocking her tea over in the process.'
 					'"Thank you <<$pcs_nickname>>!"'
 					
-					gs'reconciliation_replies'
+					gs 'mother_chats', 'reconciliation_replies'
 				end
 					
 				act 'You need to think on it':
 					cla & *clr
 					minut += 5
-					'<center><img <<$set_imgh>> src="images/characters/pavlocsk/resident/mom/mum_gyno2.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mum_gyno2.jpg"></center>'
 					'You take a moment, slowly tracing your finger around the rim of your teacup, considering carefully what your <<$npc_nickname[''A29'']>> just said.'
 					*nl
 					'But eventually you shake your head.'

locations/sleep.qsrc

@@ -9,34 +9,40 @@ menu_off = 1
 !! When done: Move to wakeup
 
 if $ARGS[0] = 'full':
-	msg 'gt ''sleep'', ''full'' is depricated! Please report this bug.'
+	msg 'gt ''sleep'', ''full'' is depricated! If you did not load an old save, please report this bug.'
 	gt 'pre_sleep_events', 'start'
 end
 
 if $ARGS[0] = 'sleep':
-	msg 'gt ''sleep'', ''sleep'' is depricated! Please report this bug.'
+	msg 'gt ''sleep'', ''sleep'' is depricated! If you did not load an old save, please report this bug.'
 	gt 'pre_sleep', 'prepare_sleep'
 end
 
 if $ARGS[0] = 'dream':
-	msg 'gt ''sleep'', ''dream'' is depricated! Please report this bug.'
+	msg 'gt ''sleep'', ''dream'' is depricated! If you did not load an old save, please report this bug.'
 	gt 'dream_events', 'start'
 end
 
 if $ARGS[0] = 'wake':
-	msg 'gt ''sleep'', ''wake'' is depricated! Please report this bug.'
+	msg 'gt ''sleep'', ''wake'' is depricated! If you did not load an old save, please report this bug.'
 	gt 'wakeup', 'start'
 end
 
 if $ARGS[0] = 'end':
-	msg 'gt ''sleep'', ''end'' is depricated! Please report this bug.'
+	msg 'gt ''sleep'', ''end'' is depricated! If you did not load an old save, please report this bug.'
 	gt 'bed_get_out', 'start'
 end
 
+if $ARGS[0] = '':
+	msg 'gt ''sleep'', is depricated! If you did not load an old save, 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'
+		gs '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
 

locations/therapist_hotel.qsrc

@@ -475,7 +475,7 @@ if $ARGS[0] = 'event4_post_wait':
 	end
 end
 
-if $ARGS[0] = 'event5_submit_end':
+if $ARGS[0] = 'event5_submit':
 	menu_off = 1
 	minut += 2
 	gs 'stat'