Merge remote-tracking branch 'Kevin-upstream/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.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
 	minut -= 1
 	InSleep = 0
-	slept_in = 0
+	sleepVars['slept_in'] = 0
 	strip_here = 0
 	SleepHorny = 0
 	!! to fudge the first hour wake up sleep loss.

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/city_library.qsrc

@@ -45,7 +45,7 @@ $downlibrary['BookStudy'] = {
 '<center><b><font color="maroon">National Library of Russia</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/citycenter/library/downlibint.jpg"></center>'
 'A huge library with thousands upon thousands of books. You could spend years in here and probably still wouldn''t be able to read it all.'
-'There is a large IT section with gt ''Komp'',''start''">computers</a> available for public use.'
+'There is a large IT section with <a href="exec:gt ''Komp'',''start''">computers</a> available for public use.'
 
 act 'Leave': minut += 5 & gt 'city_center'
 

locations/din_van.qsrc

@@ -310,10 +310,11 @@ $SkinCare = {
 }
 
 $brit = {
-	if lashair ! 1:
-		if shave_menu = 1 and (mc_inventory['razor'] > 1 or pcs_shave['free_razor'] = 1):
-			if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
-				if pcs_leghair > 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
+	if lashair ! 1 and (pcs_shave['free_razor'] = 1 or mc_inventory['razor'] > 0):
+		!! if shave_menu = 1: legs and pussy
+		if shave_menu = 1 and mc_inventory['razor'] > 2:
+			if pcs_leghair >= 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
+				if pcs_leghair >= 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
 					if daystart < 10 and $start_type[1] = 'tg':
 						$shave_act = 'Shave your legs and pussy'
 						$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
@@ -368,17 +369,15 @@ $brit = {
 						act '<<$shave_act>> (0:15)':
 							menu_off = 1
 							*clr & cla
-	!!						if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
-							if $loc ='gadbana':
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-							elseif pcs_pubes <= 10 and shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-							elseif shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-							elseif shave_length > 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
+							!! if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
+							if shave_length < 2:
+								if pcs_pubes <= 10:
+									'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
+								else
+									'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
+								end
 							else
-								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
 							end
 							*nl
 							'<<$shave_txt1>>'
@@ -393,11 +392,11 @@ $brit = {
 							if pcs_shave['free_razor'] = 1:
 								pcs_shave['free_razor'] = 0
 							else
-								mc_inventory['razor'] -=  2
+								mc_inventory['razor'] -= 3
 							end
 							dynamic $dryOff
-							gs'selfplay','bathtub_dildo_check'
-							gs'selfplay','shower_dildo_check'
+							gs 'selfplay', 'bathtub_dildo_check'
+							gs 'selfplay', 'shower_dildo_check'
 						end
 					end
 				end
@@ -405,16 +404,15 @@ $brit = {
 				'<br>You don''t need to shave.'
 			end
 		end
-		
 
-		if (shave_menu = 2 or shave_menu = 1) and (mc_inventory['razor'] > 0 or pcs_shave['free_razor'] = 1):
+		!! if shave_menu = 2: pussy only
+		if (shave_menu = 2 or shave_menu = 1):
 			if pubestyle > 0 and pcs_pubes >= shave_trigger:
 				if pubestyle = 1:
 					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
 						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.' 
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
-						
 					else
 						$shave_txt1 = 'You lather up your crotch and take a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
 					end
@@ -456,14 +454,14 @@ $brit = {
 					act '<<$shave_act>> (0:10)':
 						menu_off = 1
 						*clr & cla
-						if pcs_pubes <= 10 and shave_length = 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-						elseif shave_length = 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-						elseif shave_length > 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
+						if shave_length < 2:
+							if pcs_pubes <= 10:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
+							else
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
+							end
 						else
-							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+							'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
 						end
 						*nl
 						minut += 10
@@ -479,15 +477,16 @@ $brit = {
 						*nl
 						'<<$shave_txt2>>'
 						dynamic $dryOff
-						gs'selfplay','bathtub_dildo_check'
-						gs'selfplay','shower_dildo_check'
+						gs 'selfplay', 'bathtub_dildo_check'
+						gs 'selfplay', 'shower_dildo_check'
 					end
 				end
 			end
 		end
-		
-		if (shave_menu = 3 or shave_menu = 1) and (mc_inventory['razor'] > 0 or pcs['free_razor'] = 1):
-			if pcs_leghair > 3:
+
+		!! if shave_menu = 3: legs only
+		if (shave_menu = 3 or shave_menu = 1) and mc_inventory['razor'] > 1:
+			if pcs_leghair >= 3:
 				act 'Shave your legs (0:05)':
 					menu_off = 1
 					*clr & cla
@@ -501,8 +500,8 @@ $brit = {
 					else
 						mc_inventory['razor'] -= 2
 					end
-					!!				if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
+					!! if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
+					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
 					*nl
 					if daystart < 10 and $start_type[1] = 'tg':
 						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
@@ -514,162 +513,8 @@ $brit = {
 						'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
 					end
 					dynamic $dryOff
-					gs'selfplay','bathtub_dildo_check'
-					gs'selfplay','shower_dildo_check'
-				end
-			end
-		end
-		
-		if shave_menu > 0 and (mc_inventory['razor'] > 0 or pcs['free_razor'] = 1) and (pcs_leghair > 0 or (pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3)):
-			act'Shave early':
-				cla
-				if shave_menu = 1 and pcs_leghair > 0 and pcs_leghair < 4 and pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3:
-					if pubestyle = 1:
-						$shave_both_act = 'Shave early - legs and pussy'
-						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance now. You lather up your legs and crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your legs and pussy.'
-					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-						$shave_both_act = 'Trim early - legs and bush'
-						$shave_txt1 = 'Inspecting your pubes, it''s not quite time for you to shave the stubble at the edges, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your trim has well maintained edges. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 9:
-						$shave_both_act = 'Trim early - legs and bush'
-						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pubes are a nice even lawn between your smooth legs. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 10:
-						$shave_both_act = 'Trim early - legs and bush'
-						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your bush is a well shaped hedge. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 11:
-						$shave_both_act = 'Shave early - legs and pussy'
-						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet and you''re usually too lazy to get to it before it starts growing into actual hair, but you''re feeling motivated so you might as well do it right now. You lather up your legs and crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your legs and pussy.'
-					else
-						$shave_both_act = ''
-					end
-					
-					if $shave_both_act ! '':
-						act '<<$shave_both_act>> (0:10)':
-							menu_off = 1
-							*clr & cla
-							if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
-							if $loc ='gadbana':
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-							elseif pcs_pubes <= 10 and shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-							elseif shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-							elseif shave_length > 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-							else
-								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-							end
-							*nl
-							'<<$shave_txt1>>'
-							*nl
-							'<<$shave_txt2>>'
-							minut += 10
-							pcs_leghair = 0
-							stat['leg_hair_growth_timer'] = totminut
-							pcs_pubes = shave_length
-							stat['pube_growth_timer'] = totminut
-							pcs_horny += 5
-							if pcs_shave['free_razor'] = 1:
-								pcs_shave['free_razor'] = 0
-							else
-								mc_inventory['razor'] -=  2
-							end
-							dynamic $dryOff
-							gs'selfplay','bathtub_dildo_check'
-							gs'selfplay','shower_dildo_check'
-						end
-					end
-				end
-				
-				if (shave_menu = 2 or shave_menu = 1) and pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3:
-					if pubestyle = 1:
-						$shave_act = 'Shave early - pussy only'
-						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance now. You lather up your crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your pussy.'
-					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-						$shave_act = 'Trim early - pubes only'
-						$shave_txt1 = 'Inspecting your pubes, it''s not quite time for you to shave the stubble at the edges, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your razor, carefully scraping the blade around the edges of your pubes.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your trim has well maintained edges. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 9:
-						$shave_act = 'Trim early - bush only'
-						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your shaving implements and start carefully clipping and trimming around the edges of your bush.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pubes are a nice even lawn between your legs. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 10:
-						$shave_act = 'Trim early - bush only'
-						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your shaving implements and start carefully clipping and trimming around the edges of your bush.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your bush is a well shaped hedge. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 11:
-						$shave_act = 'Shave early - pussy only'
-						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet and you''re usually too lazy to get to it before it starts growing into actual hair, but you''re feeling motivated so you might as well do it right now. You lather up your crotch, grab your razor, and carefully scrape the blade across your still-smooth skin.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pussy is perfectly cleanshaven. Satisfied, you rinse off, pleased with the extra smooth feeling between your legs.'
-					else
-						$shave_act = ''
-					end
-						
-					if $shave_act ! '':
-						act '<<$shave_act>> (0:05)':
-							menu_off = 1
-							*clr & cla
-							if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
-							if $loc ='gadbana':
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-							elseif pcs_pubes <= 10 and shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-							elseif shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-							elseif shave_length > 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-							else
-								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-							end
-							*nl
-							'<<$shave_txt1>>'
-							*nl
-							'<<$shave_txt2>>'
-							minut += 5
-							pcs_leghair = 0
-							stat['leg_hair_growth_timer'] = totminut
-							pcs_pubes = shave_length
-							stat['pube_growth_timer'] = totminut
-							pcs_horny += 5
-							if pcs_shave['free_razor'] = 1:
-								pcs_shave['free_razor'] = 0
-							else
-								mc_inventory['razor'] -=  2
-							end
-							dynamic $dryOff
-							gs'selfplay','bathtub_dildo_check'
-							gs'selfplay','shower_dildo_check'
-						end
-					end
-				end
-				
-				if (shave_menu = 3 or shave_menu = 1) and pcs_leghair > 0:
-					act'Shave early - Legs only (0:03)':
-						menu_off = 1
-						*clr & cla
-						minut += 3
-						pcs_leghair = 0
-						stat['leg_hair_growth_timer'] = totminut
-						pcs_horny += 5
-						if pcs_shave['free_razor'] = 1:
-							pcs_shave['free_razor'] = 0
-						else
-							mc_inventory['razor'] -= 1
-						end
-						if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
-						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
-						*nl
-						'Inspecting your legs, it''s not really time to shave them yet, but there''s no reason you can''t just do a quick pass right now and save effort later. You lather your legs up and grab your razor. After spending a few minutes methodically shaving away every last hair, your legs are smooth and clean. The feeling of your silky skin turns you on a little.'
-						dynamic $dryOff
-						gs'selfplay','bathtub_dildo_check'
-						gs'selfplay','shower_dildo_check'
-					end
+					gs 'selfplay', 'bathtub_dildo_check'
+					gs 'selfplay', 'shower_dildo_check'
 				end
 			end
 		end
@@ -1832,118 +1677,138 @@ if $ARGS[0] = 'shave_options':
 	*clr & cla
 	if shave_img_hgt = 0:shave_img_hgt = 100
 	!! images handled using FUNC(''$pube_image'')
-	'<h3><center><b>Shaving optons</b></h3><br><center>Here you can choose your style for pubic hair and which body parts you wish to shave.</center>'
-	'<br><center><table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>"></a></center></TD>'
-	'<TR><TD><center>'
-	if pubestyle ! 1:
-		'<a href="exec:pubestyle = 1 & shave_length = 1 & shave_trigger = 4 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
-	else
-		'Clean Shave'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 2 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 2 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">V-shaped</a>'
-	else
-		'V-shaped'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 3 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 3 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
-	else
-		'Triangle-shaped'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 4 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 4 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Landing-strip</a>'
-	else
-		'Landing-strip'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 5 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 5 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
-	else
-		'Heart-shaped'
-	end
-	'</center></TD>'
-	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>"></a></center></TD>'
-	'<TR><TD><center>'
-	if pubestyle ! 6 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 6 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
-	else
-		'Flame-shaped'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 7 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 7 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
-	else
-		'Cross-Shaped'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 8 and pcs_pubes > 16:
-		'<a href="exec:pubestyle = 8 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Trimmed</a>'
-	else
-		'Trimmed'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 9 and pcs_pubes > 20:
-		'<a href="exec:pubestyle = 9 & shave_length = 20 & shave_trigger = 26 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Small Bush</a>'
-	else
-		'Small Bush'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 10:
-		'<a href="exec:pubestyle = 10 & shave_length = 26 & shave_trigger = 31 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
-	else
-		'Full Bush'
-	end
-	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD>'
+	*p '<center><h3><b>Shaving optons</b></h3>'
+	'Here you can choose your style for pubic hair and which body parts you wish to shave.'
 	*nl
-	'<TR><TD><center>'
-	if pubestyle ! 11 and pcs_pubes > 10:
-		'<a href="exec:pubestyle = 11 & shave_length = 2 & shave_trigger = 8 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Lazy</a>'
-		'(don''t immediately shave stubble)'
-	else
-		'Lazy'
-		'(don''t immediately shave stubble)'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 12 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 12 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Mini Bush</a>'
-	else
-		'Mini Bush'
-	end
-	
-	'</center></TD><TR><center>'
-	'Your razor will last for <b><<mc_inventory[''razor'']>></b> more shaves.'
+	'Your razor will last for&nbsp;<b><<mc_inventory[''razor'']>></b>&nbsp;more shaves.'
+	*nl
+	'<b>Change your shaving routine:'
 	*nl
-	'<center><b>Change your shaving routine:</b></center>'
-	'<center><b>Note: Choosing to never shave, or to shave legs only, will remove your chosen shave style.<br> You can only choose a style if you currently have enough hair to support it.</b></center>'
+	'Note: Choosing to never shave, or to shave legs only, will remove your chosen shave style.'
+	'You can only choose a style if you currently have enough hair to support it.</b>'
 	*nl
 	!if shave_menu = 0:nothing
 	!if shave_menu = 1:legs and pussy
 	!if shave_menu = 2:pussy only
 	!if shave_menu = 3:legs only
+	if pubestyle = 0:
+		*p iif(shave_menu = 1, 'Everything&nbsp;|&nbsp;', '<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 2, 'Pussy only&nbsp;|&nbsp;', '<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 3, 'Legs only&nbsp;|&nbsp;', '<a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 0, 'Never shave', '<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a>')
+	else
+		*p iif(shave_menu = 1, 'Everything&nbsp;|&nbsp;', '<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 2, 'Pussy only&nbsp;|&nbsp;', '<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 3, 'Legs only&nbsp;|&nbsp;', '<a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 0, 'Never shave', '<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a>')
+	end
+	*nl
+	*nl
 	if shave_menu = 0:
-		$shave_chosen = 'doesn''t include any shaving options.'
-		$shave_time = ''
-		'Never shave | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+		'Your current routine doesn''t include any shaving options.'
 	elseif shave_menu = 1:
-		$shave_chosen = 'involves shaving your legs and maintaining your current pubic style.'
-		$shave_time = 'It takes 15 minutes to complete this routine.'
-		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | Everything | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+		'Your current routine involves shaving your legs and maintaining your current pubic style.'
+		'It takes 15 minutes to complete this routine.'
 	elseif shave_menu = 2:
-		$shave_chosen = 'involves not shaving your legs and maintaining your current pubic style.'
-		$shave_time = 'It takes 10 minutes to complete this routine.'
-		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | Pussy only | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+		'Your current routine involves not shaving your legs and maintaining your current pubic style.'
+		'It takes 10 minutes to complete this routine.'
 	elseif shave_menu = 3:
-		$shave_chosen = 'involves shaving your legs and not maintaining any chosen pubic style.'
-		$shave_time = 'It takes 5 minutes to complete this routine.'
-		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | Legs only'
+		'Your current routine involves shaving your legs and not maintaining any chosen pubic style.'
+		'It takes 5 minutes to complete this routine.'
 	end
 	*nl
-	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
-	'</table></center>'
+	*p '<table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
+
+	!! ROW 1: IMAGES
+		*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>"></a></center></TD></TR>'
+
+	!! ROW 1: TEXT
+		*p'<TR><TD><center>'
+		if pubestyle ! 1:
+			*p '<a href="exec:pubestyle = 1 & shave_length = 0 & shave_trigger = 3 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
+		else
+			*p 'Clean Shave'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 2 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 2 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">V-shaped</a>'
+		else
+			*p 'V-shaped'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 3 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 3 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
+		else
+			*p 'Triangle-shaped'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 4 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 4 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Landing-strip</a>'
+		else
+			*p 'Landing-strip'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 5 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 5 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
+		else
+			*p 'Heart-shaped'
+		end
+		*p '</center></TD></TR>'
+
+	!! ROW 2: IMAGES
+		*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>"></a></center></TD></TR>'
+	
+	!! ROW 2: TEXT
+		*p '<TR><TD><center>'
+		if pubestyle ! 6 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 6 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
+		else
+			*p 'Flame-shaped'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 7 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 7 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
+		else
+			*p 'Cross-Shaped'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 8 and pcs_pubes > 16:
+			*p '<a href="exec:pubestyle = 8 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Trimmed</a>'
+		else
+			*p 'Trimmed'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 9 and pcs_pubes > 20:
+			*p '<a href="exec:pubestyle = 9 & shave_length = 20 & shave_trigger = 26 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Small Bush</a>'
+		else
+			*p 'Small Bush'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 10:
+			*p '<a href="exec:pubestyle = 10 & shave_length = 26 & shave_trigger = 31 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
+		else
+			*p 'Full Bush'
+		end
+
+	!! ROW 3: IMAGES
+		*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD></TR>'
+
+	!! ROW 3: TEXT
+		*p '<TR><TD><center>'
+		if pubestyle ! 11 and pcs_pubes > 10:
+			*p '<a href="exec:pubestyle = 11 & shave_length = 0 & shave_trigger = 8 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Lazy</a>'
+		else
+			*p 'Lazy'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 12 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 12 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Mini Bush</a>'
+		else
+			*p 'Mini Bush'
+		end
+
+	*p '</center></TD></TR></table>'
+	*p '<sub><small>Lazy - (don''t immediately shave stubble)</small></sub></center>'
 
 	act 'Return':menu_off = 0 & gt $loc, $loc_arg
 	act 'Set image height for this view':

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.qsrc

@@ -9,6 +9,7 @@ $sleep_loc = 'pre_sleep'
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
+	sleepVars['slept_in'] = 0
 	gt 'pre_sleep_events', 'start'
 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
@@ -225,7 +236,7 @@ if $ARGS[0] = 'succubinit':
 	$sucself1 = 'that feeling'
 	pcs_horny = 100
 	InSleep = 0
-	slept_in = 0
+	sleepVars['slept_in'] = 0
 	strip_here = 0
 	'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
 	*nl
@@ -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/saveg.qsrc

@@ -15,7 +15,7 @@
 
 version_major = 0
 version_minor = 9
-version_revision = 0
-version_patch = 2
+version_revision = 1
+version_patch = 0
 --- saveg ---------------------------------
 

locations/saveupdater.qsrc

@@ -2318,6 +2318,8 @@ if temp_current_save_version < 00090003:
 	end
 end
 
+!!------------------------------------!!Version 0.9.1.0!!-----------------------------------------------!!
+
 
 killvar 'temp_current_save_version'
 gs 'saveg'

locations/sex_ev_after.qsrc

@@ -1251,6 +1251,7 @@ if $ARGS[0] = 'after_sex1':
 		act'Pull apart':
 			cla & *clr
 			gs'sex_ev_after', 'pull_apart'
+			sex_ev['cock_inserted'] = 0
 			if (npc_humor[$boy] = 1 or npc_humor[$boy] = 2) and (sex_ev['fuck_count'] >= npc_sexdrive[$boy] - 1) and rand(0,1) = 1:
 				gs'sex_ev_pillow_talk', 'high_five1'
 			else
@@ -1833,14 +1834,10 @@ if $ARGS[0] = 'plan_b2':
 	act'Take it sexily':
 		cla & *nl
 		'As <<$npc_firstname[$boy]>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.'
-		if sex_ev['accidental_creampie_convo'] = 1:
-			'"There," you smirk. "Problem solved."'
-		elseif $sex_ev['last_cum'] = 'swallow':
+		if $sex_ev['last_cum'] = 'swallow':
 			'"Chaser," you wink.'
-		elseif age < 20:
-			'"Not really looking to become a teen mom," you smirk.'
 		else
-			'"I''m not ready to be a mom," you smirk.'
+			'"There," you smirk. "Problem solved."'
 		end
 		gs 'medical_din', 'morning_after_pill_function'
 		gs'sex_ev_after', 'after_sex2'

locations/sex_ev_condoms.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'setup':
 		else
 			sex_ev['condom_count'] = rand(1,10)
 		end
-	elseif npc_no_condoms[$boy] = 1:
+	elseif npc_no_condoms[$boy] > 0:
 		sex_ev['condom_count'] = 0
 	end
 	sex_ev['condom_setup'] = 1
@@ -93,7 +93,7 @@ if $ARGS[0] = 'condom_wait':
 			act'Ask him to use one':
 				cla & *nl
 				'"Wait!" you yelp. "You need to use a condom!"'
-				if npc_no_condoms[$boy] = 1:
+				if npc_no_condoms[$boy] > 0:
 					gs 'sex_ev_condoms', 'npc_doesnt_use_condoms'
 				else
 					gs 'sex_ev_condoms', 'pc_condom_ask3'
@@ -172,7 +172,7 @@ if $ARGS[0] = 'npc_latex_allergy':
 end
 
 if $ARGS[0] = 'pc_condoms2':
-	if npc_no_condoms[$boy] = 1:
+	if npc_no_condoms[$boy] > 0:
 		if npc_latex_allrg[$boy] = 1:
 			gs 'sex_ev_condoms', 'npc_latex_allergy'
 		else

locations/sex_ev_cum.qsrc

@@ -221,7 +221,8 @@ if $ARGS[0] = 'doggy_cum':
 			end
 		end
 	end
-		if sex_ev['boy_cum'] > 0:
+	
+	if sex_ev['boy_cum'] > 0:
 		act'Continue':
 			if $sex_ev['cum_choice'] = 'creampie_surprise':
 				gs 'sex_ev_cum', 'surprise_cum_together'
@@ -264,7 +265,8 @@ if $ARGS[0] = 'cowgirl_cum':
 			'The buildup of pressure inside you crashes over the edge. Your body goes taut, your pussy clenches tight, and you quiver on top of <<$npc_firstname[$boy]>>''s cock as waves of orgasm wash over you.'
 		end
 	end
-		if sex_ev['boy_cum'] > 0:
+	
+	if sex_ev['boy_cum'] > 0:
 		act'Continue':
 			if $sex_ev['cum_choice'] = 'creampie_surprise':
 				gs 'sex_ev_cum', 'surprise_cum_together'
@@ -308,6 +310,7 @@ if $ARGS[0] = 'cum_decider':
 !!	if the boy is selfish but also doesn''t want kids, he will be more careful
 !!	boys who are both diligent and prefer to pull out have "pullout game"
 	sex_ev['cum_choice'] = rand(1,10)
+	if sex_ev['cycle_limit'] < npc_sex_stamina[$boy]: sex_ev['cum_choice'] = 10
 	if sex_ev['danger_day'] = 1 and npc_selfish[$boy] = 1 and npc_childfree[$boy] ! 1:
 		sex_ev['extra_caution'] = 0
 	elseif (sex_ev['danger_day'] = 1 or (npc_diligent[$boy] > 0 and $npc_cum_pref[$boy] = 'pullout')) and sex_ev['no_condom'] = 1:
@@ -321,7 +324,7 @@ if $ARGS[0] = 'cum_decider':
 	
 !!	if sex_ev['cum_choice'] = 10 and sex_ev['fuck'] = 1:
 	
-!! if the boy has the two-pump chump trait or loses concentration, he will unexpectedly finish inside without warning
+!! if the boy has the two-pump chump trait or loses concentration, he will unexpectedly finish inside without warning or barely manage to pull out in time
 	if sex_ev['cum_choice'] = 10 or sex_ev['two_pump'] = 1 or sex_ev['cant_hold_cum'] = 1:
 		sex_ev['cum_warn'] = 0
 		if sex_ev['two_pump'] = 1: sex_ev['two_pump'] = 2
@@ -674,9 +677,9 @@ if $ARGS[0] = 'fuck_cum2':
 			act'Continue':gt 'sex_ev_cum', 'creampie_surprise'
 !!		end
 	elseif $sex_ev['cum_choice'] = 'pullout':
-		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
+		act'Continue':gs 'sex_ev_cum', 'cum_pullout'
 	elseif sex_ev['his_choice'] = 2:
-		act'Continue':gt 'sex_ev_cum', 'cum_his_choice'
+		act'Continue':gs 'sex_ev_cum', 'cum_his_choice'
 !!	elseif sex_ev['boy_cum'] > 0:
 !!		*nl
 !!		'Tell hornguy6 that the fuck_cum failsafe activated.'
@@ -689,7 +692,7 @@ if $ARGS[0] = 'fuck_cum2':
 end
 
 if $ARGS[0] = 'cum_his_choice':
-	if rand(1,5) = 5 or sex_ev['his_choice'] = 2:gt'sex_ev_cum', 'cum_his_choice2'
+	if rand(1,5) = 5 or sex_ev['his_choice'] = 2:gs'sex_ev_cum', 'cum_his_choice2'
 	if sex_ev['kiss'] = 1:
 		if $npc_cum_pref[$boy] = 'creampie':
 			gt'sex_ev_cum', 'creampie_surprise'
@@ -706,7 +709,7 @@ if $ARGS[0] = 'cum_his_choice':
 				gt'sex_ev_cum', 'cum_pullout'
 			end
 		else
-			gt'sex_ev_cum', 'cum_his_choice2'
+			gs'sex_ev_cum', 'cum_his_choice2'
 		end
 	else
 		if $npc_cum_pref[$boy] = 'creampie':
@@ -724,7 +727,7 @@ if $ARGS[0] = 'cum_his_choice':
 				gt'sex_ev_cum', 'cum_pullout'
 			end
 		else
-			gt'sex_ev_cum', 'cum_his_choice2'
+			gs'sex_ev_cum', 'cum_his_choice2'
 		end
 	end
 end
@@ -857,7 +860,7 @@ if $ARGS[0] = 'cum_facial':
 		if sex_ev['where'] = 1 and sex_ev['cum_wherever'] ! 1:
 			'"Come on my face!"'
 		elseif sex_ev['he_ask_facial'] = 1:
-			'"Okay," you say. "Go ahead.'
+			'"Okay," you say. "Go ahead."'
 		elseif sex_ev['not_inside'] = 1:
 			'"Not inside me!" you yelp frantically.'
 		elseif sex_ev['he_ask'] = 1 and sex_ev['he_ask_facial'] ! 1:
@@ -997,7 +1000,7 @@ if $ARGS[0] = 'facial_tongue_cum':
 				'"In my mouth!"'
 			elseif sex_ev['he_ask_mouth'] = 1:
 				'"Okay," you say.'
-			elseif sex_ev['he_ask'] = 1:
+			elseif sex_ev['he_ask'] = 1 and sex_ev['he_ask_facial'] ! 1:
 				'"Cum in my mouth instead!"'
 			elseif sex_ev['not_inside'] = 1:
 				'"Not inside me!" you yelp frantically.'
@@ -1770,7 +1773,7 @@ if $ARGS[0] = 'creampie_menu':
 				end
 			end
 		end
-		if pcs_horny > 90 or sex_ev['orgasm'] < orgasm:
+		if (pcs_horny > 90 or sex_ev['orgasm'] < orgasm) and sex_ev['he_ask_creampie'] = 0:
 			act'"Let''s come together"':sex_ev['creampie_ask'] = 1 & gs 'sex_ev_cum', 'cum_together'
 		end
 		if $sex_ev['position'] = 'miss' or $sex_ev['position'] = 'cowgirl':
@@ -1804,8 +1807,8 @@ if $ARGS[0] = 'cum_inside':
 				gs 'stat'
 				sex_ev['came_together'] = 2
 				sex_ev['orgasm_count'] += 1
-				sex_ev['creampie_orgasm'] += 1
-				'<<$npc_firstname[$boy]>> drives himself inside you with a grunt and you feel cum spurting out inside you. The sensation pushes you over the edge, gasping as waves of orgasm wash through you. The two of come together, each of your orgasms fuelling the other''s until eventually they''ve run their course, and both of you are breathing hard.'
+				sex_ev['creampie_orgasm_count'] += 1
+				'<<$npc_firstname[$boy]>> drives himself inside you with a grunt and you feel cum spurting out inside you. The sensation pushes you over the edge, gasping as waves of orgasm wash through you. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course, and both of you are breathing hard.'
 				gs 'sex_ev_cum', 'cum_inside_pull_away'
 				gs'sex_ev_reactions', 'react_menu'
 			else
@@ -1829,8 +1832,8 @@ if $ARGS[0] = 'cum_inside':
 					gs'stat'
 					sex_ev['came_together'] = 2
 					sex_ev['orgasm_count'] += 1
-					sex_ev['creampie_orgasm'] += 1
-					'<<$npc_firstname[$boy]>>''s cum pours into you and you gasp as you get sent over the edge and trigger your own climax. The two of come together, each of your orgasms fuelling the other''s until eventually they''ve run their course and both of you lay there panting.'
+					sex_ev['creampie_orgasm_count'] += 1
+					'<<$npc_firstname[$boy]>>''s cum pours into you and you gasp as you get sent over the edge and trigger your own climax. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you lay there panting.'
 					gs 'sex_ev_cum', 'cum_inside_pull_away'
 					gs 'sex_ev_reactions', 'react_menu'
 				else
@@ -2647,7 +2650,7 @@ if $ARGS[0] = 'what_now':
 					else
 						'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
 					end
-					'"<<$sex_ev[''more_creampies_dialogue'']>>"  you grin back at <<$npc_firstname[$boy]>>. "Might as well make the most of the situation."'
+					'"<<$sex_ev[''more_creampies_dialogue'']>>" you grin back at <<$npc_firstname[$boy]>>. "Might as well make the most of the situation."'
 					sex_ev['creampie_allowance'] = 1
 					sex_ev['no_condom'] = 1
 					gs'sex_ev_sex', 'reset'
@@ -2729,7 +2732,7 @@ if $ARGS[0] = 'cum_condom':
 			gs'stat'
 			sex_ev['came_together'] = 1
 			sex_ev['orgasm_count'] += 1
-			'<<$npc_firstname[$boy]>>''s pulsing cock is the final straw and a dam breaks inside you as your climax erupts. The two of come together, each of your orgasms fuelling the other''s until eventually they''ve run their course and both of you lay there panting.'
+			'<<$npc_firstname[$boy]>>''s pulsing cock is the final straw and a dam breaks inside you as your climax erupts. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you lay there panting.'
 			if condom_break > 0:
 				gs'sex_ev_cum', 'broken_condom0'
 			else

locations/sex_ev_favorite_part.qsrc

@@ -1043,22 +1043,22 @@ if $ARGS[0] = 'pc_fuck_fav1':
 						act'It''s intimate':
 							cla & *nl
 							if sex_ev['creampie_count'] > 0 and (sex_ev['creampie_allowance'] > 0 or npc_free_creampies[$boy] > 0):
-								'"I like the intimacy of it," you say. "I like how I can see your face when you come inside me."'
+								'"I liked the intimacy of it," you say. "And how I can see your face when you come inside me."'
 							else
-								'"I like the intimacy of it," you say. "I like how I can see your face while you fuck me."'
+								'"I liked the intimacy of it," you say. "And how I can see your face while you fuck me."'
 							end
 							gs'sex_ev_pillow_talk', 'topic_route'
 						end
 						
 						act'Like feeling his weight':
 							cla & *nl
-							'"I can feel the <i>weight</i> of you when you''re on top," you say. "Your entire body pressing down through your cock into my pussy. I really like that."'
+							'"I could feel the <i>weight</i> of you when you''re on top," you say. "Your entire body pressing down through your cock into my pussy. You have no idea how amazing it was."'
 							gs'sex_ev_pillow_talk', 'topic_route'
 						end
 						
 						act'Like being on bottom':
 							cla & *nl
-							'"I just like being on bottom. It''s more fun," you smile.'
+							'"I just a bottom kind of girl," you smile.'
 							gs'sex_ev_pillow_talk', 'topic_route'
 						end
 					end

locations/sex_ev_pillow_talk.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'stop_talk':
 	act'Stop talking':
 		cla 
 		if sex_ev['sex_over'] = 1:
-			gs'sex_ev_after', 'after_sex2'
+			gs'sex_ev_after', 'relax_together'
 		else
 			gs'sex_ev_sex', 'break_time'
 		end

locations/sex_ev_shower.qsrc

@@ -187,7 +187,7 @@ if $ARGS[0] = 'before_together2':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/shower/fun3.mp4"></video></center>'
 				'"We don''t have a condom," you gasp, turning to face him as he continues fingering your clit anyways. You grab his cock in return.'
-				if npc_selfish[$boy] = 1 or npc_no_condoms[$boy] = 1:
+				if npc_selfish[$boy] = 1 or npc_no_condoms[$boy] > 0:
 					'"We don''t need one," he whispers.'
 					act'We really do':
 						cla & *nl
@@ -296,7 +296,7 @@ if $ARGS[0] = 'before_shower_fuck1':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/shower/leg_up1.mp4"></video></center>'
 	'You put your foot against the wall to stabilize as <<$npc_firstname[$boy]>> fucks you, hot water still streaming down your bodies. It interferes with the lubrication of your pussy if you''re being honest, but it''s so hot right now that you can''t bring yourself to care.'
-	if rand(1,10) > 1:
+	if rand(1,20) > 1:
 		*nl
 		'After what seems like an eternity of pleasure, <<$npc_firstname[$boy]>> moans into your ear.'
 		gs'sex_ev_shower', 'before_shower_cum_ask'
@@ -398,7 +398,7 @@ if $ARGS[0] = 'before_shower_creampie_surprise':
 			$orgasm_or = 'yes'
 			gs'arousal', 'vaginal',1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 		end
-		sex_ev['creampie_orgasm'] += 1
+		sex_ev['creampie_orgasm_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/creampie1.mp4"></video></center>'
 		'You gasp in surprise, feeling <<$npc_firstname[$boy]>> pulse inside you. You were already close yourself and his orgasm sends you over the edge. He holds you tight and you clench on to him with all your might, both of you riding out your orgasms completely intertwined.'
@@ -640,6 +640,7 @@ if $ARGS[0] = 'after_towel_skip2':
 end
 
 if $ARGS[0] = 'after_shower_join':
+	cla & *clr
 	sex_ev['join_shower'] = 1
 	sex_ev['boy_shower'] = 1
 	'<center><video autoplay loop src="images/shared/sex/shower/join2.mp4"></video></center>'
@@ -877,7 +878,7 @@ if $ARGS[0] = 'after_shower_sex1':
 	'<center><video autoplay loop src="images/shared/sex/shower/leg_up2.mp4"></video></center>'
 	'Water streams down your bodies as <<$npc_firstname[$boy]>> presses you up against the wall right underneath the showerhead, fucking you vigorously. Your erotic moans echo off the tile, someone reinforcing the idea that there''s nothing else in the world besides you, this shower, and <<$npc_firstname[$boy]>>''s cock inside you.'
 !	if sex_ev['condom'] > 0:
-		if rand(1,10) > 1:
+		if rand(1,20) > 1:
 			*nl
 			'After what seems like an eternity of pleasure, <<$npc_firstname[$boy]>> grunts into your ear.'
 			gs'sex_ev_shower', 'after_shower_cum_ask'
@@ -898,10 +899,15 @@ if $ARGS[0] = 'after_shower_cum_ask':
 	'"<<$pcs_nickname>>-! I''m almost there!"'
 	if sex_ev['orgasm'] < orgasm:
 		'"Me too-!" you gasp.'
-		act'Come together':gt'sex_ev_shower', 'after_shower_creampie'
+		act'Come together':
+			if sex_ev['creampie_allowance'] < 1 or sex_ev['no_condom'] < 1 or npc_condom_conscious[$boy] > 0:
+				gt'sex_ev_shower', 'after_shower_fun4'
+			else
+				gt'sex_ev_shower', 'after_shower_creampie'
+			end
+		end
 	else
 		'"Mmmm-!" you hum back.'
-		act'Let him come inside you':gt'sex_ev_shower', 'after_shower_creampie'
 	end
 	act'Jerk him off':gt'sex_ev_shower', 'after_shower_fuck_jerkoff'
 		
@@ -909,10 +915,16 @@ if $ARGS[0] = 'after_shower_cum_ask':
 
 		act'Not inside!':sex_ev['not_inside'] = 1 & gt'sex_ev_shower', 'after_shower_fuck_jerkoff'
 !!	end
+	if sex_ev['creampie_allowance'] < 1 or sex_ev['no_condom'] < 1 or npc_condom_conscious[$boy] > 0:
+		cla
+		act'Continue':gt'sex_ev_shower', 'after_shower_fuck_jerkoff'
+	else
+		act'Let him come inside you':gt'sex_ev_shower', 'after_shower_creampie'
+	end
 end
 
 if $ARGS[0] = 'after_shower_creampie_surprise':
-	if sex_ev['condom'] > 0:
+	if sex_ev['condom'] > 0 or sex_ev['creampie_allowance'] = 0 or sex_ev['promise_no_creampie'] = 0:
 		act'Asshole!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/shower/creampie1.mp4"></video></center>'
@@ -983,7 +995,7 @@ if $ARGS[0] = 'after_shower_creampie_surprise':
 			$orgasm_or = 'yes'
 			gs'arousal', 'vaginal',1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 		end
-		sex_ev['creampie_orgasm'] += 1
+		sex_ev['creampie_orgasm_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/creampie1.mp4"></video></center>'
 		'You gasp in surprise, feeling <<$npc_firstname[$boy]>> pulse inside you. You were already close yourself and his orgasm sends you over the edge. He holds you tight and you clench on to him with all your might, both of you riding out your orgasms completely intertwined.'
@@ -1097,10 +1109,18 @@ if $ARGS[0] = 'after_shower_fuck_jerkoff':
 		*nl
 		'"Not inside!" you yelp.'
 	end
-	if sex_ev['orgasm'] < orgasm:
-		'You barely manage to slip <<$npc_firstname[$boy]>> from your pussy and grab his cock with your hand before he explodes, managing to get you off at the same time. You both come together and euphoria washes over you as his cum -somehow still warm to your skin despite the heat of the shower- spatters across your stomach.'
+	if sex_ev['creampie_allowance'] < 1 or sex_ev['no_condom'] < 1 or npc_condom_conscious[$boy] > 0:
+		if sex_ev['orgasm'] < orgasm:
+			'<<$npc_firstname[$boy]>> slips from your pussy and you barely manage to grab hold of his cock before he explodes. At the same time, he jams his fingers into your pussy and fingerblasts you, sending orgasmic convulsions rocking through your body. Euphoria washes over you as you and he come together and his fat load -somehow still warm to your skin despite the heat of the shower- spatters across your belly.'
+		else
+			'<<$npc_firstname[$boy]>> slips from your pussy and you barely manage to grab hold of his cock before he explodes, spraying a fat load of cum all over your belly.'
+		end
 	else
-		'You barely manage to slip <<$npc_firstname[$boy]>> from your pussy and grab his cock with your hand before he explodes. A sense of euphoria washes over you as his cum -somehow still warm to your skin despite the heat of the shower- spatters across your stomach.'
+		if sex_ev['orgasm'] < orgasm:
+			'You barely manage to slip <<$npc_firstname[$boy]>> from your pussy and grab his cock with your hand before he explodes, managing to get you off at the same time. You both come together and euphoria washes over you as his cum -somehow still warm to your skin despite the heat of the shower- spatters across your stomach.'
+		else
+			'You barely manage to slip <<$npc_firstname[$boy]>> from your pussy and grab his cock with your hand before he explodes. A sense of euphoria washes over you as his cum -somehow still warm to your skin despite the heat of the shower- spatters across your stomach.'
+		end
 	end
 	act'Recover':gt'sex_ev_shower', 'after_shower_fuck_jerkoff_end'
 end
@@ -1337,6 +1357,7 @@ end
 
 if $ARGS[0] = 'morning_together1':
 	sex_ev['npc_morning_shower'] = 0
+	sex_ev['morning_shower'] = 1
 	sex_ev['boy_in_shower'] = 0
 	sex_ev['morning_shower_together'] = 1
 	gs'arousal', 'massage',5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
@@ -1561,7 +1582,7 @@ if $ARGS[0] = 'morning_shower_fuck2':
 	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></video></center>'
 	'<<$npc_firstname[$boy]>> slams his cock into you from behind, sending shock waves of pleasure rippling through your body. Your erotic moans echo off the tile in time with the wet slap of skin on skin.'
 !	if sex_ev['condom'] > 0:
-		if rand(1,10) > 1:
+		if rand(1,20) > 1:
 			*nl
 			'After what seems like an eternity of pleasure, <<$npc_firstname[$boy]>> grunts.'
 			gs'sex_ev_shower', 'morning_shower_cum_ask'
@@ -1672,7 +1693,7 @@ if $ARGS[0] = 'morning_shower_creampie_surprise':
 			$orgasm_or = 'yes'
 			gs'arousal', 'vaginal',1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 		end
-		sex_ev['creampie_orgasm'] += 1
+		sex_ev['creampie_orgasm_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/creampie1.mp4"></video></center>'
 		'You gasp in surprise, feeling <<$npc_firstname[$boy]>> pulse inside you. You were already close yourself and his orgasm sends you over the edge. He holds you tight and you clench on to him with all your might, both of you riding out your orgasms completely intertwined.'
@@ -1816,6 +1837,7 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 end
 
 if $ARGS[0] = 'morning_shower_together_end':
+	sex_ev['boy_in_shower'] = 0
 	noshampoo = 1
 	dynamic $showerdin
 	act'Finish up':
@@ -1829,6 +1851,7 @@ end
 if $ARGS[0] = 'morning_sex_end':
 	sex_ev['npc_morning_shower'] = 2
 	sex_ev['boy_shower'] = 1
+	sex_ev['boy_in_shower'] = 0
 	gs 'sex_ev_shower', 'morning_shower_together_end'
 	if sex_ev['morning_fuck'] = 0:
 		if sex_ev['morning_shower_cum'] = 1:

locations/sex_ev_start.qsrc

@@ -659,7 +659,7 @@ if $ARGS[0] = 'undress_function':
 		lastwornpantynumber['sex_ev'] = pantywornnumber
 		
 		$lastwornbratype['sex_ev'] = $braworntype
-		lastwornbranumber['sex_ev'] = pantywornnumber
+		lastwornbranumber['sex_ev'] = brawornnumber
 
 		if CloDress = 1:
 			sex_ev['CloDress'] = 1

locations/sex_ev_talk.qsrc

@@ -19,6 +19,7 @@ if $ARGS[0] = 'boy_accidental_creampie':
 		end
 		gs'sex_ev_talk', 'childfree_accidental_creampie1'
 	elseif sex_ev['ma_pill'] = 1:
+		cla & *nl
 		if cum_loc['vagina'] > 0:
 			'"Speaking of which..." <<$npc_firstname[$boy]>> says, looking intently at the cum slowly draining from your pussy. "You''re gonna take that pill right?"'
 		else
@@ -31,6 +32,7 @@ if $ARGS[0] = 'boy_accidental_creampie':
 			gs'sex_ev_pillow_talk', 'topic_route'
 		end
 	else
+		cla & *nl
 		if cum_loc['vagina'] > 0:
 			'"Speaking of which..." <<$npc_firstname[$boy]>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"'
 		else
@@ -58,16 +60,18 @@ if $ARGS[0] = 'boy_accidental_creampie2':
 		if stat['safe_day'] = 1:
 			act'I should be':
 				cla & *nl
+				sex_ev['safe_day'] = 1
 				if $sex_ev['convo'] = 'used_all_condoms':
 					'"It''s a safe day," you nod. "I should be okay. This time anyways," you smile teasingly.'
 				else
-					'"It''s a safe day, so I should be okay," you smile teasingly.'
+					'"It''s a safe day. I should be okay," you smile teasingly.'
 				end
 				gs'sex_ev_pillow_talk', 'topic_route'
 			end
 		elseif stat['probably_safe_day'] = 1:
 			act'I think so':
 				cla & *nl
+				sex_ev['probably_safe_day'] = 1
 				if mesec > 0:
 					'"I think so," you say. "I''m pretty sure I can''t get pregnant on my period..."'
 				elseif $sex_ev['convo'] = 'used_all_condoms':
@@ -661,7 +665,7 @@ if $ARGS[0] = 'bareback_too_risky':
 	act'Way too risky':
 		cla & *nl
 		'"No way!" you exclaim' + iif(sex_ev['bareback_thinking'] = 1, ', dismissing the thought with a shake of your head. ', '. ') + '"That''s way too risky! Just because nothing went wrong this time doesn''t mean something can''t go wrong in the future! We skipped it this time, but it''s not becoming a regular thing."'
-		if npc_no_condoms[$boy] = 1:
+		if npc_no_condoms[$boy] > 0:
 			if npc_bareback_risk[$boy] = 1:
 				'"You said that last time too," <<$npc_firstname[$boy]>> snickers.'
 			else
@@ -712,7 +716,7 @@ if $ARGS[0] = 'bareback_agree':
 		act'Tease him':
 			cla & *nl
 			'"Yeah? Why? Are you saying you want to keep using them?" you reply teasingly.'
-			if npc_no_condoms[$boy] = 1:
+			if npc_no_condoms[$boy] > 0:
 				'"Fuck no! I''ve been waiting forever for this!"'
 			else
 				'"No! No! I mean, if you''re good to stop, then I''m good with it too."'
@@ -729,7 +733,7 @@ if $ARGS[0] = 'bareback_agree':
 			'"I think it would be too risky to go bareback all the time," you say slowly. "But if it''s at the right time, maybe it will be okay?"'
 			'"What are you saying?" <<$npc_firstname[$boy]>> asks. He seems to be trying not to get his hopes up before you say it out loud.'
 			'"As long as I''m not in danger of getting pregnant, then it should be okay to skip the condom. So if I time it with my cycle, it should be fine. Right?"'
-			if npc_no_condoms[$boy] = 1:
+			if npc_no_condoms[$boy] > 0:
 				'"Well... I''d prefer if we skipped the condoms altogether," he says wistfully. "But that''s better than nothing."'
 			else
 				'"That sounds really good," he smiles eagerly.'
@@ -756,7 +760,7 @@ if $ARGS[0] = 'bareback_pill_expense':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk3.jpg"></center>'
 		'"That pill costs money you know," you say irritatedly. "I''m not willing to pay for that every time you forget to pull out."'
-		if npc_finance[$boy] >= 1 and ((npc_selfish[$boy] < 1 and rand(1,3) = 3) or (npc_finance[$boy] = 2 and npc_no_condoms[$boy] = 1 and npc_selfish[$boy] = 1)):
+		if npc_finance[$boy] >= 1 and ((npc_selfish[$boy] < 1 and rand(1,3) = 3) or (npc_finance[$boy] = 2 and npc_no_condoms[$boy] > 0 and npc_selfish[$boy] = 1)):
 			'"How about I pay for it then?" <<$npc_firstname[$boy]>> asks. "Any time you need a morning after pill because of me, I''ll give you money to pay for it."'
 			'He grabs his wallet and pulls out a wad of notes.'
 			'"1000<b>₽</b> should be enough, right?" he grins. "You can buy one to be ready for next time."'
@@ -909,7 +913,7 @@ if $ARGS[0] = 'bareback_bc_suggest':
 			else
 				gs 'sex_ev_stats', 'birth_control_know'
 				'"I <i>am</i> on birth control," you sigh. "But hormonal birth control isn''t 100% effective. I really don''t want to get pregnant so gotta use condoms, even if I hate them."'
-				if npc_no_condoms[$boy] = 1:
+				if npc_no_condoms[$boy] > 0:
 					'"Seriously?" <<$npc_firstname[$boy]>> says, giving you an exasperated look. "You''ve been on birth control this whole time and we''re still using condoms? What the hell!"'
 					'"I just told you, I don''t want to get pregnant!"'
 					'"You''re not going to get pregnant while you''re on birth control! Stop being so paranoid and let''s just go bareback already!"'

locations/sleep.qsrc

@@ -75,7 +75,7 @@ end
 if $ARGS[0] = 'calc_minutes_to_wakeup':
 	sleepVars['time_now'] = daystart * 1440 + hour * 60 + minut
 
-	if alarmVars['alarmOn'] = 1:
+	if alarmVars['alarmOn'] = 1 and sleepVars['slept_in'] = 0:
 		if alarmVars['alarm_holiday'] = 1 and kanikuli ! 0 or ((hour < alarmVars['timerEndH'] and (week = 6 or week = 7)) or (hour => alarmVars['timerEndH'] and (week = 5 or week = 6))):
 		!! use weekend time alarm
 			sleepVars['alarm_time'] = daystart * 1440 + alarmVars['timerEndH'] * 60 + alarmVars['timerEndM']
@@ -169,17 +169,6 @@ if $ARGS[0] = 'post_sleep':
 end
 
 
-if $ARGS[0] = 'extra':
-	act '"Snooze" a few minutes more...':
-		menu_off = 1
-		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_orgasm2'
+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
@@ -169,13 +177,11 @@ if $ARGS[0] = 'vibr_orgasm':
 		'Maybe trying to sleep with a vibrator in your pussy wasn''t such a good idea.'
 		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':
+if $ARGS[0] = 'wake_horny2':
 	menu_off = 1
 	InSleep = 1
 	SleepHorny += 1

locations/stripclub.qsrc

@@ -203,7 +203,9 @@ if $ARGS[0] = 'manager_stripper':
 			'"Come back when you can dance on stage without me worrying you''ll fall off, and I''ll give you another chance."'
 			act 'Leave':gt 'stripclub', 'work_leave'
 		end
-	!!elseif stripbarwork = 1 or stripbarwork1 = 1:
+!! For when bar work as a job is available will need to be moved so it is checked for first
+!!{
+	elseif stripbarwork = 1 or stripbarwork1 = 1:
 		'You enter the manager''s office and he greets you with a smile. "Hey there <<$pcs_nickname>>, how can I help you?"'
 		'You return the smile. "Hi, I was wondering if I could get a job as a stripper?"'
 		'The manager chuckles. "Bored of watching the action and wanting to get in on it?"'
@@ -272,7 +274,7 @@ if $ARGS[0] = 'manager_stripper':
 			'"Come back when you can dance on stage without me worrying you''ll fall off, and I''ll give you another chance."'
 			act 'Leave':gt 'stripclub', 'work_leave'
 		end
-
+}
 	else
 		'"Nearly..." you say dejectedly.'
 		'"Right. You need to leave, but be sure to come back when you''re old enough," he replies.'

locations/themes.qsrc

@@ -8,44 +8,34 @@
 
 !outdoor theme 0 is dynamic, and changes colour with time of day.
 if $ARGS[0] = 'outdoors':
-	if night_mode = 0:
-		if (DayStage = 1) or (DayStage = 6) :
-			!! hornguy6''s new colors ----------------
-			bcolor = rgb(210, 210, 255)
-			lcolor = rgb(40, 40, 255)
-			!! hornguy6''s new colors ----------------
-			
-			!! {original ----------------
-				bcolor = rgb(BColorBase-BColorBase/4, BColorBase-BColorBase/4, BColorBase)
-				lcolor = rgb(206, 90, 205)
-			!! original ----------------}
-			!!$bcolor = '"#D2D2FF"'
-		elseif (DayStage = 3):
-			!!bcolor = rgb(BColorBase, BColorBase-BColorBase/4, BColorBase-BColorBase/4)
-			!!lcolor = rgb(56, 90, 205)
-			!!lcolor = rgb(56, 90, 205)
-			!! hornguy6''s new colors ----------------
-			bcolor = rgb(226, 169, 169)
-			lcolor = rgb(56, 90, 205)
-		elseif (DayStage = 4) :
-			bcolor = rgb(BColorBase, BColorBase-BColorBase/4, BColorBase-BColorBase/4)
-			!!lcolor = rgb(56, 90, 205)
-			!! hornguy6''s new colors ----------------
-			lcolor = rgb(110, 200, 200)
-			!! hornguy6''s new colors ----------------
-		elseif (DayStage = 3) or (DayStage = 4) :
-			bcolor = rgb(BColorBase, BColorBase-BColorBase/4, BColorBase-BColorBase/4)
-			lcolor = rgb(56, 90, 205)
-
-			$bcolor = func('shortgs', 'int_to_hex_str', BColorBase-BColorBase/4)
-			$bcolor = '"#' + func('shortgs', 'int_to_hex_str', BColorBase) + $bcolor + $bcolor + '"'
-		else
-			bcolor = rgb(BColorBase, BColorBase, BColorBase)
-			lcolor = rgb(106, 90, 205)
-
-			$bcolor = func('shortgs', 'int_to_hex_str', BColorBase)
-			$bcolor = '"#' + $bcolor + $bcolor + $bcolor + '"'
-		end
+    if night_mode = 0:
+        if (DayStage = 1) or (DayStage = 6) :
+            bcolor = rgb(210, 210, 255)
+            ! fcolor
+            lcolor = rgb(40, 40, 255)
+
+            $bcolor = '"#D2D2FF"'
+        elseif (DayStage = 3):
+            bcolor = rgb(226, 169, 169)
+            ! fcolor
+            lcolor = rgb(56, 90, 205)
+
+            $bcolor = '"#E2A9A9"'
+        elseif (DayStage = 4) :
+            bcolor = rgb(BColorBase, BColorBase-BColorBase/4, BColorBase-BColorBase/4)
+            ! fcolor
+            lcolor = rgb(110, 200, 200)
+
+            $bcolor = func('shortgs', 'int_to_hex_str', BColorBase-BColorBase/4)
+            $bcolor = '"#' + func('shortgs', 'int_to_hex_str', BColorBase) + $bcolor + $bcolor + '"'
+        else
+            bcolor = rgb(BColorBase, BColorBase, BColorBase)
+            ! fcolor
+            lcolor = rgb(106, 90, 205)
+
+            $bcolor = func('shortgs', 'int_to_hex_str', BColorBase)
+            $bcolor = '"#' + $bcolor + $bcolor + $bcolor + '"'
+        end
 
 		if BColorBase <= 160:
 			fcolor = rgb(255, 255, 255)

locations/version.qsrc

@@ -1,6 +1,58 @@
 # version
 
 act 'Return': gt 'start'
+'0.9.1'
+'- Sugarcube conversion continuation by steuchs, has its own IGDB entry for current demo build'
+'- Re-work of the strip poker with the guys from Anjuna'
+'- Optimisations, tweaks and new content for the musician content from netuttki'
+'- Couple of new events and tweaks to the street worker content from netuttki'
+'- New fairy image from Myles'
+'- New sex events with Katja, journal updates, Kat as dom scene and some bc consistency from bgkjdgbizgblzdgbr'
+'- New Kendra stuff from Nutluck'
+'- more variations in Starlets sex scenes from Vengeance_11'
+'- Variable migration project converting old items to new array and creating shopping cart system for stores by Myles, Awesome and Kevin Smarts'
+'- random locker room scene from Anya'
+'- New Misha events done by Nutluck with code from Awesome'
+'- Feofan corrections and added to contact list by Anjuna'
+'- Anushka band tour SMS''s from nutrluck with code by Anjuna'
+'- Journal refactoring/overhaul by Anjuna'
+'- Can now borrow a book from library thanks to Anjuna'
+'- Uni fuckornot and hotornot system built by Anjuna'
+'- massive mirror refactors by Felix'
+'- Fixes, corrections and optimizations for fuckbubby/hookups from hornguy6'
+'- code optimizing and text changes to photo studio from hornguy6'
+'- line of code i don''t remember why but it''s probably important from hornguy6'
+'- Pavlovsk Pool & Events. Original Mod by Darcanlos, rewritten by Vengeance_11, code updated by Anjuna'
+'- New uni cafe content from Nutluck, coded by Anjuna'
+'- New rape and pregnancy talk with Mom from BBZ01, coded by Kevin Smarts'
+'- Setting stats in cheat menu now works! Thanks to Felix'
+'- new variation descriptions for undressing - courtesy of Dead44'
+'- new period warning messages, giving one final warning a couple hours just before it starts from horngy6'
+'- "Everything is new again" should now work correctly thanks to Felix'
+'- New elective psychology class by nutluck with code from bgkjdgbizgblzdgbr'
+'- ability to start Vicky''s quest during the summer, before schoool starts from Derryth_love'
+'- Initial version of the songs manager menu from Dank'
+'- Albina added to art elective and new wine scene for her from Vengeance_11'
+'- police, fines, and court(letters) overhaul by Anjuna'
+'- G&M now open Saturdays thanks to Kevin Smarts'
+'- Mom chats post her dragging Sveta to the gyno and failing the test. Includes leaving home and possible return from BBZ01'
+'- New Katja sex scene, going home with two guys from the nightclub from bgkjdgbizgblzdgbr'
+'- Full rework of the sleep cycle and how events and mods can interact with it by Anjuna'
+'- New events for therapist from Hidden Flame with code from Anjuna'
+'- Entry to BDSM mansion and the staff working as manager updated to new times, shared job and costing from Kevin Smarts'
+'- New Parser for diagnoses from Chimrod'
+'- Scenes and the code to unlock the road as a workplace from netuttki'
+'- New skill: songwriting. For the songwriting activities from netuttki'
+'- tidying up Natasha''s love path to make it playable again, re-coded by Kevin Smarts and tested by BBZ01.'
+'- Continuation of Nat''s love path in Pav, coded by Kevin Smarts, written and tested by BBZ01'
+'- Camgirl rebalance from Awesome'
+'- new code functions from Felix'
+'- Text edits from Vengeance_11, Lydia, Anjuna, Mizu, Awesome, Yesman, Earnest and Lurk Morrison'
+'- code re-factoring and sorting from Anjuna and Felix'
+'- Bug fixes from Rachels, Felix, Awesome, Anjuna, Kevin Smarts, hornguy6, Anya, bgkjdgbizgblzdgbr, Ethan99, Skylah, Regularity, Chimrod and netuttki'
+'- Some minor tweaks that aren''t worth mentioning from Derryth_Love'
+'- Image pack from Anya'
+
 '0.9.0.2'
 '- Text edits from Vengeance_11'
 '- Bug fixes from Kevin Smarts, hornguy6, rachels, bgkjdgbizgblzdgbr, HotMike, Derryth_Love, and netuttki'

locations/wakeup.qsrc

@@ -30,7 +30,7 @@ end
 if $ARGS[0] = 'get_out':
 	menu_off = 1
 	sleepVars['time_now'] = daystart * 1440 + hour * 60 + minut
-	if slept_in = 1:
+	if sleepVars['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.'
 	elseif pcs_sleep >= 100 and alarmVars['alarmOn'] = 1 and sleepVars['time_now'] >= sleepVars['alarm_time']:
 		'You wake up at <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, just before your alarm goes off. You''ve had plenty of sleep.'
@@ -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
 		''
@@ -90,10 +90,19 @@ if $ARGS[0] = 'get_out':
 
 	act 'Get out of bed (0:10)':
 		minut += 10
-		slept_in = 0
+		sleepVars['slept_in'] = 0
 		xgt 'bed_get_out', 'start'
 	end
 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

@@ -38,7 +38,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 
 
-		if mid($start_type, 1, 2) = 'sg' and slept_in = 1 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and suspended['on'] ! 1:
+		if mid($start_type, 1, 2) = 'sg' and sleepVars['slept_in'] = 1 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and suspended['on'] ! 1:
 			if (hour = 7 or hour = 8):
 				$sleep_events_priority[] = 'gs ''wakeup_events'', ''sg_go_school'' '
 			elseif hour >= 9 and hour < 14:
@@ -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 ---------------------------------