Merge remote-tracking branch 'Anjuna/master'

locations/bed_events.qsrc

@@ -127,8 +127,15 @@ end
 	!!                                     !!
 	!!=====================================!!
 
-
 if $ARGS[0] = 'rab':
+	gt 'bed_events', 'rab2'
+end
+
+if $ARGS[0] = 'vor':
+	gt 'bed_events', 'vor2'
+end
+
+if $ARGS[0] = 'rab2':
 	menu_off = 1
 	minut += 120
 	houserabday = daystart
@@ -219,12 +226,11 @@ if $ARGS[0] = 'rab':
 	end
 end
 
-
-if $ARGS[0] = 'vor':
+if $ARGS[0] = 'vor2':
 	menu_off = 1
 	if rex['owned'] = 0:
 		'You''re lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door, you see two masked men.'
-		act 'Scream': gt 'bed_events', 'vor2'
+		act 'Scream': gt 'bed_events', 'vor3'
 
 	else
 		if dog_bravery = 0: 
@@ -233,7 +239,7 @@ if $ARGS[0] = 'vor':
 
 		if dog_bravery < 50:
 			'You''re lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door you see two masked men. <<$rex[''name'']>> is shivering in the corner.'
-			act 'Scream': gt 'bed_events', 'vor2'
+			act 'Scream': gt 'bed_events', 'vor3'
 		else
 			minut += 10
 			'You''re lying in bed when you suddenly hear a commotion out in the hallway. You get up to check it out and as you arrive, you see <<$rex[''name'']>> chase two masked men outside. You can hear loud swearing as they run down the stairs.'
@@ -257,7 +263,7 @@ if $ARGS[0] = 'vor':
 end
 
 
-if $ARGS[0] = 'vor2':
+if $ARGS[0] = 'vor3':
 	menu_off = 1
 	minut += 60
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g0.jpg"></center>'
@@ -356,12 +362,14 @@ if $ARGS[0] = 'mast':
 	pcs_vag += 1
 
 	if husband = 0 or strpos('bedr,bedr2x,korr,korr2x',$loc) <= 0 or husbandrink = 10:
+		gs 'bed_events', 'exit'
 		gt 'selfplay', 'start'
 	else
 		if mc_inventory['dildo_small'] = 0:
 			if week > 5 or week < 6 and hour > 16:
 				'You feel the need for something inside you and think that your husband would be a better option.'
 			else
+				gs 'bed_events', 'exit'
 				gt 'selfplay', 'start'
 			end
 		else

locations/bed_get_out_events.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		sleepVars['events_done'] = 0
 		
 		if vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:
-			$sleep_events[] = 'gt ''bed_get_out_events'', ''vomit'' '
+			$sleep_events[] = 'gs ''bed_get_out_events'', ''vomit'' '
 		end
 
 		xgt 'bed_get_out_events', 'mod_sleepevents'
@@ -127,7 +127,6 @@ end
 
 if $ARGS[0] = 'vomit':
 	gs 'bed_get_out_events', 'exit'
-
 	gt 'home_activity', 'vomiting_exit'
 end
 

locations/pav_pool.qsrc

@@ -166,12 +166,15 @@ if $ARGS[0] = 'lockerfemale':
 			!!Ignore Inhibition through willpower
 			gt 'changingroom', 'view_swim_list', 1
 		end
-
 	else
 		*nl
 		'You should buy some swimwear if you intend on spending time at the pool.'
 		*nl
 	end
+	
+!!	act 'Go to the mirrors':
+!!		gt 'pav_pool', 'mirror'
+!!	end
 
 	if PCloswimwear = 1:
 		gs 'shoes', 'strip'
@@ -419,38 +422,40 @@ if $ARGS[0] = 'pool':
 			if pcs_agil < 45:
 				'You climb up to the top of the diving board and try to jump elegantly into the water, but the landing is anything but that...'
 
-				temp_rand = rand(1,100)
-				if temp_rand < 20:
-					act 'Continue':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/bareass.jpg"></center>'
-						'As you enter the water, your bikini bottom slides down your legs and leaves your ass exposed. Thankfully, nobody seems to notice and you quickly pull it up before anyone sees you.'
-						act 'Continue': gt 'pav_pool', 'poolwater'
-					end
-				elseif temp_rand => 20 and temp_rand < 40:
-					act 'Continue':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/toploosen.jpg"></center>'
-						'As you enter the water, the knot of your bikini top loosens and your breasts pop out. Thankfully, nobody seems to notice and you quickly tie it back on before anyone sees you.'
-						act 'Continue': gt 'pav_pool', 'poolwater'
-					end
-				elseif temp_rand => 40 and temp_rand < 50:
-					act 'Continue':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/losttop.jpg"></center>'
-						'You dive into the pool and pop your head out of the water thinking that you still need to improve on your diving when you hear some boys giggling and looking at you. It''s then that you realize your bikini top is gone!'
-						'You cover your breasts and frantically look for your bikini top. Thankfully, you spot it floating nearby, grab it and quickly put it back on. The boys smile at you and leave.'
-						pcs_mood -= 3
-						act 'Continue': gt 'pav_pool', 'poolwater'
-					end
-				elseif temp_rand => 50 and temp_rand < 60:
-					act 'Continue':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/bottomlost2.jpg"></center>'
-						'You dive into the pool and pop your head out of the water thinking that you still need to improve your diving when you feel the water tickling your bare pussy and realize that your bikini bottom is gone!'
-						'You cover your groin and frantically look for your bikini bottom. Thankfully, you spot it floating nearby, grab it and quickly slide it back on before anyone notices.'
-						pcs_mood -= 3
-						act 'Continue': gt 'pav_pool', 'poolwater'
+				if PCloOnePiece = 0:
+					temp_rand = rand(1,100)
+					if temp_rand < 20:
+						act 'Continue':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/bareass.jpg"></center>'
+							'As you enter the water, your bikini bottom slides down your legs and leaves your ass exposed. Thankfully, nobody seems to notice and you quickly pull it up before anyone sees you.'
+							act 'Continue': gt 'pav_pool', 'poolwater'
+						end
+					elseif temp_rand => 20 and temp_rand < 40:
+						act 'Continue':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/toploosen.jpg"></center>'
+							'As you enter the water, the knot of your bikini top loosens and your breasts pop out. Thankfully, nobody seems to notice and you quickly tie it back on before anyone sees you.'
+							act 'Continue': gt 'pav_pool', 'poolwater'
+						end
+					elseif temp_rand => 40 and temp_rand < 50:
+						act 'Continue':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/losttop.jpg"></center>'
+							'You dive into the pool and pop your head out of the water thinking that you still need to improve on your diving when you hear some boys giggling and looking at you. It''s then that you realize your bikini top is gone!'
+							'You cover your breasts and frantically look for your bikini top. Thankfully, you spot it floating nearby, grab it and quickly put it back on. The boys smile at you and leave.'
+							pcs_mood -= 3
+							act 'Continue': gt 'pav_pool', 'poolwater'
+						end
+					elseif temp_rand => 50 and temp_rand < 60:
+						act 'Continue':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/bottomlost2.jpg"></center>'
+							'You dive into the pool and pop your head out of the water thinking that you still need to improve your diving when you feel the water tickling your bare pussy and realize that your bikini bottom is gone!'
+							'You cover your groin and frantically look for your bikini bottom. Thankfully, you spot it floating nearby, grab it and quickly slide it back on before anyone notices.'
+							pcs_mood -= 3
+							act 'Continue': gt 'pav_pool', 'poolwater'
+						end
 					end
 				end
 			elseif pcs_agil >= 45 and pcs_agil <= 70:

locations/pav_pool_events.qsrc

@@ -304,7 +304,7 @@ if $ARGS[0]= 'relaxedswim':
 		elseif temp_rand = 2:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'kidsplashgroup'
-		elseif temp_rand = 3:
+		elseif temp_rand = 3 and PCloOnePiece = 0:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'pullstringbottom'
 		elseif temp_rand = 4:
@@ -354,7 +354,7 @@ if $ARGS[0]= 'exerciseswim':
 		elseif temp_rand = 3:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'kidsplashgroup'
-		elseif temp_rand = 4:
+		elseif temp_rand = 4 and PCloOnePiece = 0:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'pullstringbottom'
 		elseif temp_rand = 5:
@@ -484,7 +484,7 @@ if $ARGS[0]= 'relaxedwater':
 			cla
 			act 'Continue': gt 'pav_pool_events', 'relaxgropebelow'
 		}
-		elseif temp_rand = 4:
+		elseif temp_rand = 4 and PCloOnePiece = 0:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'pullstringbottom'
 		end

locations/pre_sleep_events.qsrc

@@ -32,10 +32,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		if nichGalaOpponent = 30 and hour <= 23 and hour >= 19 and nichDebug = 1:
 			!! Start abduction
 			!! TODO
-			$sleep_events_priority[] = 'gt ''pre_sleep_events'', ''nichServentSleepEvents2'' '
+			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''nichServentSleepEvents_handler'', 2 '
 		elseif nichGalaContractTaras = 1 and daystart >= nichGalaContractTarasLast + rand(3, 10):
 			!! Taras visits
-			$sleep_events_priority[] = 'gt ''pre_sleep_events'', ''nichServentSleepEvents1'' '
+			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''nichServentSleepEvents_handler'', 1 '
 		end
 
 		gt 'pre_sleep_events', 'mod_sleepevents'
@@ -141,6 +141,17 @@ if $ARGS[0] = 'suc_event':
 	gt 'pre_sleep_events', 'succhoice'
 end
 
+if $ARGS[0] = 'magb_event':
+	gt 'pre_sleep_events', 'magbstchoice'
+end
+
+if $ARGS[0] = 'nichServentSleepEvents_handler':
+	if ARGS[1] = 1:
+		gt 'pre_sleep_events', 'nichServentSleepEvents1'
+	elseif ARGS[1] = 2:
+		gt 'pre_sleep_events', 'nichServentSleepEvents2'
+	end
+end
 
 if $ARGS[0] = 'succhoice':
 	menu_off = 1
@@ -240,11 +251,6 @@ if $ARGS[0] = 'succubinit':
 end
 
 
-if $ARGS[0] = 'magb_event':
-	gt 'pre_sleep_events', 'magbstchoice'
-end
-
-
 if $ARGS[0] = 'magbstchoice':
 	*clr & cla
 	menu_off = 1

locations/sleep.qsrc

@@ -169,17 +169,6 @@ if $ARGS[0] = 'post_sleep':
 end
 
 
-if $ARGS[0] = 'extra':
-	act '"Snooze" a few minutes more...':
-		menu_off = 1
-		sleepVars['slept_in'] = 1
-		gs 'stat'
-		gt 'sleep', 'start'
-	end
-end
-
-
-
 
 
 --- sleep ---------------------------------

locations/sleep_events.qsrc

@@ -24,10 +24,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		if vibratorIN = 1:
 			if pcs_horny >= 100:
-				$sleep_events[] = 'gt ''sleep_events'', ''vibr_orgasm'' '
+				$sleep_events[] = 'gs ''sleep_events'', ''vibr_orgasm'' '
 			end
 		elseif pcs_horny > 80 and pcs_sleep >= 30 and rand(0, 59) = 0 and succubusQW ! 1 and succubusQW ! 2:
-			$sleep_events[] = 'gt ''sleep_events'', ''wake_horny'' '
+			$sleep_events[] = 'gs ''sleep_events'', ''wake_horny'' '
 		end
 
 		gs 'sleep_events', 'mod_sleepevents'
@@ -147,8 +147,16 @@ end
 	!!                                     !!
 	!!=====================================!!
 
-
 if $ARGS[0] = 'vibr_orgasm':
+	gt 'sleep_events', 'vibr_orgams2'
+end
+
+if $ARGS[0] = 'wake_horny':
+	gt 'sleep_events', 'wake_horny2'
+end
+
+
+if $ARGS[0] = 'vibr_orgasm2':
 	menu_off = 1
 	pcs_horny = 0
 	orgasm += 1
@@ -175,7 +183,7 @@ end
 
 
 !! Exclusions for succubus dreams as they set horny to 100 and will always get overridden otherwise
-if $ARGS[0] = 'wake_horny':
+if $ARGS[0] = 'wake_horny2':
 	menu_off = 1
 	InSleep = 1
 	SleepHorny += 1

locations/wakeup.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'get_out':
 	elseif alarmVars['alarmOn'] = 1 and sleepVars['time_now'] = sleepVars['alarm_time']:
 		pcs_mood -= 10
 		'Your alarm goes off at <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, '+iif(pcs_sleep < 90, 'but you could do with some extra sleep.', 'and you''ve had plenty of sleep.')+''
-		gs 'sleep', 'extra'
+		gs 'wakeup', 'snooze_alarm'
 	else
 		!! I do not think that it could go here
 		''
@@ -96,4 +96,13 @@ if $ARGS[0] = 'get_out':
 end
 
 
+if $ARGS[0] = 'snooze_alarm':
+	act '"Snooze" a few minutes more...':
+		menu_off = 1
+		sleepVars['slept_in'] = 1
+		gs 'stat'
+		gt 'sleep', 'start'
+	end
+end
+
 --- wakeup ---------------------------------

locations/wakeup_events.qsrc

@@ -184,6 +184,14 @@ if $ARGS[0] = 'trans_little_shocked':
 	gs 'wakeup_events', 'event_end'
 end
 
+if $ARGS[0] = 'sg_go_school':
+	pcs_mood -= 10
+	gs 'stat'
+	msg '<center>Damn it''s <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, you''ve slept too long! You need to hurry or you''re going to be late for school!</center>'
+	
+	gs 'wakeup_events', 'event_end'
+end
+
 if $ARGS[0] = 'sg_slept_in':
 	if schoolprogul > 2 and schoolPredupr = 2:
 		pcs_mood -= 35
@@ -205,12 +213,4 @@ if $ARGS[0] = 'sg_slept_in':
 	gs 'wakeup_events', 'event_end'
 end
 
-if $ARGS[0] = 'sg_go_school':
-	pcs_mood -= 10
-	gs 'stat'
-	msg '<center>Damn it''s <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, you''ve slept too long! You need to hurry or you''re going to be late for school!</center>'
-	
-	gs 'wakeup_events', 'event_end'
-end
-
 --- wakeup_events ---------------------------------