Merge remote-tracking branch 'upstream/master'

locations/city_residential.qsrc

@@ -11,7 +11,7 @@ menu_off = 0
 killvar '$locclass'
 
 if sound = 0:
-	if month >= 11 and month <= 12 or month > =1 and month <= 3:
+	if month >= 11 and month <= 12 or month >= 1 and month <= 3:
 		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
 		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3', 30
 	else

locations/gschool_grounds.qsrc

@@ -265,7 +265,7 @@ if $ARGS[0] = 'main':
 				'You can see <a href="exec: gt ''FedorEv'', ''Start''">Fedor</a> standing by himself, his backpack around his arm.'
 			end
 			if NikoVolkovQW >= 5 and NikoDate = 1 and NikoNextDate_day <= daystart or NikoEv = 11:
-				'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
+				'You can see <a href="exec:gt ''NikoEv'', ''niko_dates''">Nikolai Volkov</a> smoking outside of the school.'
 			elseif NikoVolkovQW >= 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
 				'<a href="exec:gt ''NikoEv2'', ''Events''">Nikolai</a> is smoking outside of the school.'
 			end
@@ -294,7 +294,7 @@ if $ARGS[0] = 'main':
 				gs 'show_table', '<a href="exec: gt ''FedorEv'', ''Start''">Fedor</a>', '5'
 			end
 			if NikoVolkovQW = 5 and NikoDate = 1 and NikoNextDate_day <= daystart or NikoEv = 11:
-				gs 'show_table', '<a href="exec: gt ''NikoEv'', ''Niko Dates''">Nikolai</a>', '5'
+				gs 'show_table', '<a href="exec: gt ''NikoEv'', ''niko_dates''">Nikolai</a>', '5'
 			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
 				gs 'show_table', '<a href="exec: gt ''NikoEv2'', ''Events''">Nikolai</a>', '5'
 			end

locations/igorev.qsrc

@@ -271,7 +271,7 @@ if $ARGS[0] = 'din_sex':
 			act 'Lick my pussy':
 				cls
 				igorkuni += 1
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/kuni_'+ rand(1,8) +'.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/kuni.mp4"></video></center>'
 				'Both of you get undressed and start caressing each other. You tell him that you want him to please you instead.'
 				'He nods and without a word drops down on his knees. He starts licking you, expertly working his tongue.'
 				'You feel your pussy pulsating thanks to Igor''s smooth tongue. You notice that he''s as excited as you, jerking his cock.'
@@ -289,7 +289,7 @@ if $ARGS[0] = 'din_sex':
 		act 'Lick my pussy':
 			cls
 			igorkuni += 1
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/kuni_'+ rand(1,8) +'.mp4"></video></center>'
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/kuni.mp4"></video></center>'
 			'Both of you get undressed and start caressing each other. You tell him that you want him to please you instead.'
 			'You have had sex today already'
 			gs 'arousal', 'cuni', 15
@@ -328,7 +328,7 @@ if $ARGS[0] = 'din_krossdresssex':
 		'You quickly put the makeup on him and pick out some good clothes. He puts on the clothes and seems to quickly get into dressing up.'
 		act 'Further':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/rkd_'+ rand(1,9) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/rkd.jpg"></center>'
 			'"Well, there we have her, my beautiful girl!" you say with lust in your voice as you look at him. He blushes a bit and checks out his own reflection in the mirror.'
 			act 'Kiss him':
 				*clr & cla
@@ -345,7 +345,7 @@ if $ARGS[0] = 'din_krossdresssex':
 					igor_kdsexday = day
 					igor_krossdresssex += 1
 					gs 'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/crossdress/kdsex_'+ rand(1,4) +'.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/crossdress/kdsex.mp4"></video></center>'
 					'You ask him if he can lick your pussy. He nods and without a word drops down on his knees. He starts licking you, expertly working his tongue.'
 					'You feel your pussy pulsating thanks to Igor''s smooth tongue. You notice that he''s as exicted as you, jerking his cock.'
 					'After a while your breaths are heavy, you grab him by the hair and cum in his mouth...'
@@ -486,7 +486,7 @@ if $ARGS[0] = 'strap on':
 												end
 												act 'Slow down':
 													*clr & cla
-													'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon'+rand(1,3)+'.mp4" ></video></center>'
+													'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon1.mp4" ></video></center>'
 													'"Stop being a pussy! I know you love this! But since it is your first time so I will slow down. Just take a deep breath and relax." You wait for him to take a deep breath and relax, feeling him relax you start fucking him again but slower.'
 													'"Ok <<$pcs_nickname>>, that''s not to bad." Igor says.'
 													'"Good, now just keep relaxed." As you keep fucking him, he starts moaning more and more. He is obviously starting to get into it, enjoying it.'
@@ -512,7 +512,7 @@ if $ARGS[0] = 'strap on':
 														*clr & cla
 														gs 'willpower', 'pay', 'force'
 														gs 'stat'
-														'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/rough'+ rand(1,3) +'.mp4" ></video></center>'
+														'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/rough1.mp4" ></video></center>'
 														'"Shut up, don''t be a pussy! I know you love this!". You keep on pounding him without stopping while laying on top on him.'
 														'"<<$pcs_nickname>>, please stop!" Igor begs.'
 														'"I said shut up bitch!" you grab him by his hips and pull him up until he is on all fours. Then you get a firm grip on his hips and really start pounding his ass. He starts crying out at once. "Relax your ass, Igor or it''ll continue to hurt!"'
@@ -568,7 +568,7 @@ if $ARGS[0] = 'strap on':
 				'He gets up and eagerly starts taking off his pants.'
 				act 'Suck my cock':
 					*clr & cla
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/suck'+ rand(1,5) +'.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/suck1.mp4"></video></center>'
 					'You pull him over to you and push him down. "Suck my cock bitch!" He eagerly takes your strap-on into his mouth and starts sucking it for all he is worth.'
 					'After you fuck his mouth for a bit, you pull him over to the bed and lay him down.'
 					gs 'arousal', 'bj', 5, 'dom'
@@ -582,7 +582,7 @@ if $ARGS[0] = 'strap on':
 						gs 'stat'
 						act 'Insert the tip':
 							*clr & cla
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/vstavlaet_'+ rand(1,4) +'.mp4"></video></center>'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/vstavlaet1.mp4"></video></center>'
 							'You lube up the strap-on real good and for good measure you spit on his asshole for a little extra lube. You move up behind him and slowly begin to push the tip of the strap-on against his asshole. Igor starts moaning immediately.'
 							gs 'arousal', 'anal_strap_give', 10, 'dom'
 							gs 'stat'
@@ -595,7 +595,7 @@ if $ARGS[0] = 'strap on':
 								gs 'stat'
 								act 'Fuck him more':
 									*clr & cla
-									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon'+ rand(1,3) +'.mp4" ></video></center>'
+									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon1.mp4" ></video></center>'
 									'You can tell by his moans he is really enjoying this and so are you. You ride him for a long time loving every moment of it, as his moans get louder and louder you know he is getting close to finishing.'
 									gs 'arousal', 'anal_strap_give', 10, 'dom'
 									gs 'stat'
@@ -619,13 +619,13 @@ if $ARGS[0] = 'strap on':
 										*clr & cla
 										gs 'willpower', 'pay', 'force'
 										gs 'stat'
-										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/trahaet_'+ rand(1,3) +'.mp4" ></video></center>'
+										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/trahaet1.mp4" ></video></center>'
 										'You grab ahold of his hips and pull him up until he is in a doggystyle position with you kneeling behind him. Once he is in place your start really hammering his ass and occasionally smacking his ass with one of your hands.'
 										gs 'arousal', 'anal_strap_give', 10, 'dom', 'rough'
 										gs 'stat'
 										act 'Slow down':
 											*clr & cla
-											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon'+ rand(1,3) +'.mp4" ></video></center>'
+											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/strapon1.mp4" ></video></center>'
 											'You decide to slowdown as you feeling sorry for him and his ass. You keep fucking him but now much slower and more sensually. Maybe after he gets a little more use to it he will let you really hammer his ass.'
 											gs 'arousal', 'anal_strap_give', 10, 'dom'
 											gs 'stat'
@@ -645,7 +645,7 @@ if $ARGS[0] = 'strap on':
 										end
 										act 'Show him no mercy':
 											*clr & cla
-											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/trahaet_'+rand(1,3)+'.mp4" ></video></center>'
+											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/trahaet1.mp4" ></video></center>'
 											'"Shut up, don''t be a pussy! I know you love this!". You keep on pounding him without stopping while holding tightly to his hips, so he can''t pull away.'
 											'"<<$pcs_nickname>>, please stop!" Igor begs, as he tries to pull away. But you just grab tighter to his hips and yank him back burying your strap-on balls deep in his ass. He gasps in pain when you do.'
 											'"I said shut up bitch!" Then with a firm grip on his hips, you really start pounding his ass. He starts crying out at once. "Relax your ass, Igor or it''ll continue to hurt!"'
@@ -1081,7 +1081,7 @@ end
 if $ARGS[0] = 'crossdress_walk1':
 	*clr & cla
 	minut += 45
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd_'+ rand(3,6) +'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd.jpg"></center>'
 	'"You know, hiding such a beauty at home is a crime!"'
 	'"What did you say?" Igor responded.'
 	'"What do you say about we go for a walk outside?!" you enthusiastically suggest.'
@@ -1432,7 +1432,7 @@ if $ARGS[0] = 'walk':
 			'He comes back wearing the outfit he picked out, he quickly sits down so you can get started. You start applying the makeup to him and at the same time explaining all the tricks you have learned to applying makeup.'
 			act 'Done':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd_3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd.jpg"></center>'
 				'"Wow, you''re as beautiful as ever!" you say and he smiles while checking the mirror.'
 				'"Thank you." he said blushing.'
 				'Without hesitating you lean forward and kiss Igor and playfully bite her lip. "You know, hiding such a beauty at home is a crime!"'
@@ -1486,7 +1486,7 @@ if $ARGS[0] = 'walk':
 		'"Come on, let''s get you dressed and go for a walk." you say as you''re pulling out the makeup kit. Igor gladly changes into one of his sisters outfits.'
 		act 'Further':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd_4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd.jpg"></center>'
 			'He comes back all dressed up and applies his own makeup, you note he is starting to get really good at it. He must be practicing a lot. "All right. Are you done, beautiful?"'
 			'"I really am stunning." Igor said smiling, looking at himself in the mirror.'
 			'"Yes you are sweety, now ready to go show the world?"'
@@ -1529,7 +1529,7 @@ if $ARGS[0] = 'walk':
 		'Igor sits down in front of the mirror. He puts on the makeup and does a pretty amazing job at it, far better than you could do at first. He seems to have a natural knack for it. As soon as he finishes he quickly runs over to his sister''s room and gets dressed quickly.'
 		act 'Further':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd_'+ rand(1,6) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/kd.jpg"></center>'
 			'"You look sexy as hell, you are going to drive the boys crazy." you boldly tell him.'
 			'"I hope so, lets go." Igor smiles and eagerly heads for the door.'
 			act 'Go out for a walk':
@@ -1800,7 +1800,7 @@ if $ARGS[0] = 'Ask about Dianas date':
 						'"Well, while we were walking past the lake, he suddenly grabbed me in his arms and acted like he wanted to throw me in the water. I''m ashamed to admit it, but I screamed like a girl. I grabbed onto his neck with my hands."'
 						act 'Continue to listen':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/dimanos/ozero2.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/dimanos/ozero.jpg"></center>'
 							'"I clung to him and begged him not to do it."'
 							'"And...?" you spur him on. "Did he listen to you?" Igor raised an eyebrow, somewhat irritated.'
 							'"Well, not really..." Igor continued.'

locations/lover.qsrc

@@ -140,9 +140,12 @@ if $ARGS[0] = 'add fuckbuddy':
 	else
 		gs 'boyStat',$ARGS[1]
 	end
-	$fuckbuddy[] = $boy
-	$npc_rel_type[$boy] = 'fuckbuddy'
-	gs 'telefon', 'AddContact', $boy, $npc_pic[$boy],'',"hour >= 8 and hour <= 22",'', "hour >= 8 and hour <= 22", 0
+	! Do not add when he has already been added.
+	if arrpos('$fuckbuddy',$boy) = -1:
+		$fuckbuddy[] = $boy
+		$npc_rel_type[$boy] = 'fuckbuddy'
+		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy],'',"hour >= 8 and hour <= 22",'', "hour >= 8 and hour <= 22", 0
+	end
 end
 
 if $ARGS[0] = 'remove fuckbuddy':

locations/mother.qsrc

@@ -316,7 +316,7 @@ if $ARGS[0] = '':
 				'You tell her that you were rapped.'
 				'<<$npc_nickname[''A29'']>> freezes in shock. Few second later, after understanding what you just said, she hugs you.'
 				'"Do not worry, <<$pcs_nickname>>. You are safe now, everyting will be ok."'
-				'She keeps hugging you firmly for few minutes, talking to you, tryiong to make you feel better. <<$npc_nickname[''A29'']>> asks you to try to be more cerefull so this situation would not repeat for you.'
+				'She keeps hugging you firmly for few minutes, talking to you, trying to make you feel better. <<$npc_nickname[''A29'']>> asks you to try to be more cerefull so this situation would not repeat for you.'
 				'"Please, take this pill, we do not want that you become pregnant because of a raper."'
 				minut+=rand(8,12)
 				gs 'npc_relationship', 'modify', 'A29', 4

locations/sex_ev_cum.qsrc

@@ -580,10 +580,10 @@ if $ARGS[0] = 'fuck_cum':
 		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
 	elseif sex_ev['his_choice'] = 2:
 		act'Continue':gt 'sex_ev_cum', 'cum_his_choice'
-	elseif sex_ev['boy_cum'] > 0:
-		*nl
-		'Tell hornguy6 that the fuck_cum failsafe activated.'
-		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
+!!	elseif sex_ev['boy_cum'] > 0:
+!!		*nl
+!!		'Tell hornguy6 that the fuck_cum failsafe activated.'
+!!		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
 	end
 	
 	gs'sex_ev_cum', 'girl_cum'
@@ -595,16 +595,12 @@ if $ARGS[0] = 'cum_his_choice':
 		if $npc_cum_pref[$boy] = 'creampie':
 			gt'sex_ev_cum', 'creampie_surprise'
 		elseif $npc_cum_pref[$boy] = 'mouth':
-			sex_ev['mouth_cum_count'] += 1
 			gs'sex_ev_cum', 'cum_mouth'
 		elseif $npc_cum_pref[$boy] = 'face':
-			sex_ev['facial_count'] += 1
 			gs'sex_ev_cum', 'cum_facial'
 		elseif $npc_cum_pref[$boy] = 'tits':
-			sex_ev['tit_cum'] += 1
 			gs 'sex_ev_cum', 'cum_tits1'
 		elseif $npc_cum_pref[$boy] = 'pullout':
-			sex_ev['pullout'] += 1
 			gt'sex_ev_cum', 'cum_pullout'
 		else
 			gt'sex_ev_cum', 'cum_his_choice2'
@@ -613,16 +609,12 @@ if $ARGS[0] = 'cum_his_choice':
 		if $npc_cum_pref[$boy] = 'creampie':
 			gt'sex_ev_cum', 'creampie_surprise'
 		elseif $npc_cum_pref[$boy] = 'mouth':
-			sex_ev['mouth_cum_count'] += 1
 			gs'sex_ev_cum', 'cum_mouth'
 		elseif $npc_cum_pref[$boy] = 'face':
-			sex_ev['facial_count'] += 1
 			gs'sex_ev_cum', 'cum_facial'
 		elseif $npc_cum_pref[$boy] = 'tits':
-			sex_ev['tit_cum'] += 1
 			gs 'sex_ev_cum', 'cum_tits3'
 		elseif $npc_cum_pref[$boy] = 'pullout':
-			sex_ev['pullout'] += 1
 			gt'sex_ev_cum', 'cum_pullout'
 		else
 			gt'sex_ev_cum', 'cum_his_choice2'
@@ -637,16 +629,12 @@ if $ARGS[0] = 'cum_his_choice2':
 		if $npc_cum_pref[$boy] = 'creampie' and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
 			gt'sex_ev_cum', 'creampie_surprise'
 		elseif $npc_cum_pref[$boy] = 'mouth':
-			sex_ev['mouth_cum_count'] += 1
 			gs'sex_ev_cum', 'cum_mouth'
 		elseif $npc_cum_pref[$boy] = 'face':
-			sex_ev['facial_count'] += 1
 			gs'sex_ev_cum', 'facial_he_jerks'
 		elseif $npc_cum_pref[$boy] = 'tits':
-			sex_ev['tit_cum'] += 1
 			gs 'sex_ev_cum', 'cum_tits1'
 		elseif $npc_cum_pref[$boy] = 'pullout':
-			sex_ev['pullout'] += 1
 			gt'sex_ev_cum', 'cum_pullout'
 		end
 	else
@@ -689,7 +677,7 @@ if $ARGS[0] = 'cum_wherever':
 			sex_ev['facial_count'] += 1
 			gs'sex_ev_cum', 'facial_he_jerks'
 		elseif $npc_cum_pref[$boy] = 'tits':
-			sex_ev['tit_cum'] += 1
+			sex_ev['cum_tits'] += 1
 			gs 'sex_ev_cum', 'cum_tits3'
 		elseif $npc_cum_pref[$boy] = 'pullout':
 			sex_ev['pullout'] += 1
@@ -845,6 +833,7 @@ end
 if $ARGS[0] = 'facial_close_eyes':
 	act'Close your eyes':
 		sex_ev['cum_face'] += 1
+		sex_ev['facial_count'] += 1
 		$sex_ev['last_cum'] = 'facial'
 		$sex_ev['cum_describe1'] = 'Thanks,'
 		$sex_ev['cum_describe2'] = 'wiping the cum from your eyes'
@@ -1041,6 +1030,7 @@ if $ARGS[0] = 'facial_brace':
 end
 if $ARGS[0] = 'cum_mouth':
 	cla
+	sex_ev['mouth_cum_count'] += 1
 	sex_ev['cock_inserted'] = 0
 	!! differing descriptions based on position
 	!!'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
@@ -1952,6 +1942,7 @@ if $ARGS[0] = 'cum_pullout':
 	if sex_ev['cum_choice'] > 9 and sex_ev['extra_caution'] = 0: gt'sex_ev_cum', 'creampie_surprise'
 	sex_ev['cock_inserted'] = 0
 	$sex_ev['last_cum'] = 'pullout'
+	sex_ev['pullout'] += 1
 	if sex_ev['pullout_ask'] = 1:
 		!! differing descriptions based on position
 		if $sex_ev['position'] = 'miss':

locations/sex_ev_favorite_part.qsrc

@@ -64,7 +64,7 @@ if $ARGS[0] = 'good_for_you2':
 		gs'sex_ev_favorite_part', 'cum_mouth_favorite'
 	elseif $npc_cum_pref[$boy] = 'facial' and sex_ev['facial_count'] > 0:
 		gs'sex_ev_favorite_part', 'facial_favorite'
-	elseif $npc_cum_pref[$boy] = 'tits' and sex_ev['tit_cum'] > 0:
+	elseif $npc_cum_pref[$boy] = 'tits' and sex_ev['cum_tits'] > 0:
 		gs'sex_ev_favorite_part', 'tit_cum_favorite'
 	elseif npc_pussyeater[$boy] = 1 and sex_ev['cuni_orgasm'] > 0:
 		gs'sex_ev_favorite_part', 'pussyeat_favorite'
@@ -1505,7 +1505,7 @@ if $ARGS[0] = 'pc_facial_fav1':
 end
 
 if $ARGS[0] = 'pc_titcum_fav1':
-	if sex_ev['tit_cum'] > 0:
+	if sex_ev['cum_tits'] > 0:
 		if sex_ev['tit_cum_gross'] = 0:
 			act'When you came on my tits':
 				cla & *clr

locations/sex_ev_leave.qsrc

@@ -906,7 +906,7 @@ if $ARGS[0] = 'dressing2':
 	if sex_ev['sleepover'] = 1:
 		gs'sex_ev_morning', 'end_morning'
 	
-		gs'sex_ev_hookup_leave', 'end_morning'
+!!		gs'sex_ev_hookup_leave', 'end_morning'
 	else
 		gs'sex_ev_leave', 'dressing_finish'
 	end
@@ -1563,6 +1563,9 @@ if $ARGS[0] = 'dress_talk':
 	gs'sex_ev_leave', 'dressing_finish'
 	
 	gs 'sex_ev_leave', 'dress_talk_pc'
+	
+	gs 'sex_ev_leave', 'panty_gift'
+	
 	if sex_ev['dress_end'] ! 1 and sex_ev['plans_later_talk'] = 0 and rand(0,1) = 1 and $sex_ev['type'] ! 'hookup':
 		gs 'sex_ev_leave', 'npc_sex_ev_invite'
 !!{
@@ -1575,7 +1578,6 @@ if $ARGS[0] = 'dress_talk':
 	else
 		gs 'sex_ev_after', 'after_sex_dressed'
 	end
-	gs 'sex_ev_leave', 'panty_gift'
 end
 
 if $ARGS[0] = 'dress_talk_boy':
@@ -2193,36 +2195,38 @@ if $ARGS[0] = 'npc_sex_ev_invite':
 end
 
 if $ARGS[0] = 'sex_ev_invite_later':
-	if npc_day_off[$boy] = week and sex_ev['sleepover'] = 1:
-		$sex_ev_plan_loc[$boy] = 'lover_home'
-		sex_ev['invite_today'] = 1
-		if npc_girlfriend[$boy] = 1:
-			pc_know_npc_has_girlfriend[$boy] = 1
-			'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''s my day off and my girlfriend won''t be around. Want to come over to my place and do this again?"'
-		else
-			'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''s my day off. Want to come by and do this again?"'
-		end
-	elseif (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1):
-		sex_ev['invite_tomorrow'] = 1
-		if npc_girlfriend[$boy] = 1:
-			pc_know_npc_has_girlfriend[$boy] = 1
-			'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "My girlfriend won''t be around. Want to come over and do this again?"'
-		else
-			'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''ll be my day off. Want to come by and do this again?"'
+	act'Continue':
+		sex_ev['plans_later_talk'] = 1
+		gs 'sex_ev_leave', 'dress_loop'
+		if npc_day_off[$boy] = week and sex_ev['sleepover'] = 1:
+			$sex_ev_plan_loc[$boy] = 'lover_home'
+			sex_ev['invite_today'] = 1
+			if npc_girlfriend[$boy] = 1:
+				pc_know_npc_has_girlfriend[$boy] = 1
+				'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''s my day off and my girlfriend won''t be around. Want to come over to my place and do this again?"'
+			else
+				'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''s my day off. Want to come by and do this again?"'
+			end
+		elseif (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1):
+			sex_ev['invite_tomorrow'] = 1
+			if npc_girlfriend[$boy] = 1:
+				pc_know_npc_has_girlfriend[$boy] = 1
+				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "My girlfriend won''t be around. Want to come over and do this again?"'
+			else
+				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''ll be my day off. Want to come by and do this again?"'
+			end
+		end	
+		
+		gs 'sex_ev_leave', 'busy_later'
+		
+		act'What time?':
+			cla & *nl
+			'"That depends," you say, <<$sex_ev[''dress_describe'']>>. "What time were you thinking?"'
+			'"<<npc_start_free_time[$boy]>>?" <<$npc_firstname[$boy]>> asks.'
+			gs 'sex_ev_leave', 'busy_time'
+			gs 'sex_ev_leave', 'sex_ev_plan'
 		end
 	end
-	
-	gs 'sex_ev_after', 'dress_loop'
-	
-	gs 'sex_ev_leave', 'busy_later'
-	
-	act'What time?':
-		cla & *nl
-		'"That depends," you say, <<$sex_ev[''dress_describe'']>>. "What time were you thinking?"'
-		'"<<npc_start_free_time[$boy]>>?" <<$npc_firstname[$boy]>> asks.'
-		gs 'sex_ev_leave', 'busy_time'
-		gs 'sex_ev_leave', 'sex_ev_plan'
-	end
 end
 
 if $ARGS[0] = 'busy_later':

locations/sex_ev_morning.qsrc

@@ -859,7 +859,7 @@ if $ARGS[0] = 'dressing1':
 	else
 		'You reach down for where you left your clothes and start to pick them up.'
 		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
-		gs'sex_ev_after', 'dress_loop'
+		gs'sex_ev_leave', 'dress_loop'
 
 		
 		
@@ -890,9 +890,9 @@ if $ARGS[0] = 'sex_ev_invite_later':
 		end
 	end
 	
-	gs 'sex_ev_after', 'dress_loop'
+	gs 'sex_ev_leave', 'dress_loop'
 	
-	gs 'sex_ev_morning', 'busy_today'
+	gs 'sex_ev_leave', 'busy_later'
 	
 	act'What time?':
 		cla & *nl
@@ -906,7 +906,7 @@ end
 
 if $ARGS[0] = 'busy_time':
 	act'I''m busy':
-		gs 'sex_ev', 'block_booty_calls'
+		gs 'booty_call', 'block_booty_calls'
 		cla & *nl
 		'"I can''t, sorry," you say, <<$sex_ev[''dress_describe'']>>. "I have something to do then."'
 		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'

locations/sex_ev_stats.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'save':
 	npc_facial_count[$boy] += sex_ev['facial_count']
 	
 	!! number of times your fuckbuddy has cum on your tits
-	npc_creampie_count[$boy] += sex_ev['tit_cum']
+	npc_creampie_count[$boy] += sex_ev['cum_tits']
 	
 	!! number of times your fuckbuddy has pulled out
 	npc_pullout_count[$boy] += sex_ev['pullout']