瀏覽代碼

Merge remote-tracking branch 'hornguy6/master'

Kevin_Smarts 1 年之前
父節點
當前提交
983051d8ab

+ 1 - 0
glife.qproj

@@ -688,6 +688,7 @@
 		<Location name="booty_call_talk"/>
 		<Location name="booty_call_reactions"/>
 		<Location name="booty_call_virgin"/>
+		<Location name="booty_call_leave"/>
 	</Folder>
 	<Folder name="Station Campus">
 		<Location name="pav_market"/>

+ 2 - 0
locations/Cum_Manage.qsrc

@@ -234,6 +234,7 @@ if $ARGS[0] = '':
 						cumsumvag += sexvolume
 						condom_break = 1
 						stat['broken_condoms'] += 1
+						stat['last_broken_condom'] = daystart
 
 						sparridt[sparrtemp] = cumarrkno[cumarrtemp]
 						sparrslc[sparrtemp] = 0
@@ -329,6 +330,7 @@ if $ARGS[0] = '':
 
 	!! creampie vaginal statistics:
 			if spafinloc = 0:
+				stat['last_creampie'] = daystart
 				!!STD checks
 				if cumnostd = 0: gs 'dinSex', 'std_trigger'
 				!! safe creampie (if cycle > 3 or on pill or succubus):

+ 4 - 4
locations/booty_call.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'scheduler2':
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and (npc_big_fight[$FuckBuddy[i]] < daystart - 7 and daystart > 7):
-		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
+		if npc_booty_call_date[$boy] ! daystart and (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
 			gs 'booty_call', 'scheduler3'
 		else
 			npc_no_booty_call[$FuckBuddy[i]] = daystart
@@ -54,9 +54,9 @@ end
 
 if $ARGS[0] = 'set_booty_call_date':
 	if booty_call['invite_today'] = 1:
-		npc_booty_call[$boy] = daystart
+		npc_booty_call_date[$boy] = daystart
 	elseif booty_call['invite_tomorrow'] = 1:
-		npc_booty_call[$boy] = daystart + 1
+		npc_booty_call_date[$boy] = daystart + 1
 	end
 	if npc_booty_call_time[$boy] = 0:
 		npc_booty_call_time[$boy] = npc_start_free_time[$boy]
@@ -65,7 +65,7 @@ end
 
 if $ARGS[0] = 'block_booty_calls':
 	if booty_call['invite_today'] = 1:
-		npc_booty_call[$boy] = 0
+		npc_booty_call_date[$boy] = 0
 		npc_no_booty_call[$boy] = daystart
 		npc_booty_call_time[$boy] = 0
 	elseif booty_call['invite_tomorrow'] = 1:

File diff suppressed because it is too large
+ 36 - 1103
locations/booty_call_after.qsrc


+ 12 - 15
locations/booty_call_condoms.qsrc

@@ -51,17 +51,14 @@ if $ARGS[0] = 'condoms':
 				act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 			else
 				'<<$npc_firstname[$boy]>> makes no indication that he''s going to put on a condom.'
-				gs 'booty_call_sex', 'position_choose'
-				if booty_call['virgin'] = 1 and booty_call['fuck_count'] = 0:
-					gs 'booty_call_condoms', 'virgin_condom_ask1'
-				else
-					gs 'booty_call_condoms', 'pc_condom_ask'
-					gs 'booty_call_condoms', 'pc_condoms'
-					gs 'booty_call_condoms', 'dont_cum_in_me'
-					gs 'booty_call_condoms', 'pc_safe_day'
-					gs 'booty_call_condoms', 'pc_dangerous_day'
-					gs 'booty_call_condoms', 'already_creampie1'
-				end
+				
+				gs 'booty_call_condoms', 'pc_condom_ask'
+				gs 'booty_call_condoms', 'pc_condoms'
+				gs 'booty_call_condoms', 'dont_cum_in_me'
+				gs 'booty_call_condoms', 'pc_safe_day'
+				gs 'booty_call_condoms', 'pc_dangerous_day'
+				gs 'booty_call_condoms', 'already_creampie1'
+				if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0: gs 'booty_call_condoms', 'virgin_condom_ask1'
 			end
 		elseif booty_call['using_pc_condoms'] = 1:
 			gs 'booty_call_condoms', 'pc_condoms'
@@ -541,7 +538,7 @@ if $ARGS[0] = 'no_condom1':
 				'<<$npc_firstname[$boy]>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.'
 				*nl
 				'Just because he''s your fuckbuddy doesn''t mean he can take advantage of you!'
-				act'Leave':gt 'booty_call_after', 'exit'
+				act'Leave':gt 'booty_call_leave', 'exit'
 			end
 
 			gs'booty_call_condoms', 'pc_skip_the_condom'
@@ -592,7 +589,7 @@ if $ARGS[0] = 'no_condom2':
 				'<<$npc_firstname[$boy]>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.'
 				*nl
 				'The nerve of some people.'
-				act'Leave':gt 'booty_call_after', 'exit'
+				act'Leave':gt 'booty_call_leave', 'exit'
 			end
 		end
 		
@@ -1957,7 +1954,7 @@ if $ARGS[0] = 'virgin_no_condom_shock1':
 		$npc_apt_bedroom[$boy]
 		'"What the fuck?!" you exclaim, snapping your legs closed and pulling back from him. "You don''t use condoms?"'
 		'"No! Of course I don''t!" he says. "Condoms fucking suck. Can''t feel anything with one of those on. You want to use something that gets in the way of pleasure?"'
-		gs 'booty_call_after', 'no_condom_breakoff'
+		gs 'booty_call_leave', 'no_condom_breakoff'
 	end
 	
 	gs 'booty_call_condoms', 'virgin_condom_ask3'
@@ -1977,7 +1974,7 @@ if $ARGS[0] = 'virgin_npc_doesnt_condom':
 			gs'booty_call_virgin', 'miss_virg_start'
 		end
 		
-		gs 'booty_call_after', 'no_condom_breakoff'
+		gs 'booty_call_leave', 'no_condom_breakoff'
 	else
 		'"Well I don''t have any either," you growl back.'
 		'"Look who wants to fuck with a condom but doesn''t have any now," <<$npc_firstname[$boy]>> rolls his eyes.'

+ 6 - 3
locations/booty_call_cowgirl.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'cowgirl_start':
 
 			act'Ride him hard':gt 'booty_call_cowgirl', 'cowgirl3'
 		end
-	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
+	elseif booty_call['initiative'] ! 1 or booty_call['force_initiative'] = 2:
 		act'Continue':
 			cla & *clr
 			booty_call['cock_inserted'] = 1
@@ -73,10 +73,13 @@ if $ARGS[0] = 'cowgirl_start':
 				'"I want to be on top."'
 			elseif $booty_call['position'] = 'cowgirl':
 				'You crawl forward back into position, throwing your legs over his.'
-				'"Time to go for another ride."'
+				'"I''m not done riding you."'
 			else
 				'You push him back onto the bed and throw your legs over his.'
-				'"I want to be on top this time."'
+			elseif $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
+				'"I want to be on top this time," you say, giving <<$npc_firstname[$boy]>> a smouldering look as you mount his cock.'
+			else
+				'"I''m not done with you yet," you say, giving <<$npc_firstname[$boy]>> a smouldering look as you mount his cock.'
 			end
 
 			act'Ride him gently':gt 'booty_call_cowgirl', 'cowgirl1'

+ 7 - 7
locations/booty_call_cum.qsrc

@@ -302,7 +302,7 @@ if $ARGS[0] = 'fuck_cum':
 	booty_call['cycle_limit'] += 1
 	if booty_call['cycle_limit'] >= 4:booty_call['boy_cum'] = 1
 	if booty_call['boy_cum'] < 1:booty_call['boy_cum'] = rand(-1,1)
-	if booty_call['boy_cum'] >= 1:
+	if booty_call['boy_cum'] >= 1 and booty_call['cycle_limit'] > 0:
 		cla
 		gs 'booty_call_cum', 'fuck_cum_random'
 	else
@@ -341,7 +341,7 @@ if $ARGS[0] = 'fuck_cum':
 		elseif $booty_call['cum_choice'] = 'creampie':
 			booty_call['he_ask'] = 1
 			booty_call['he_ask_creampie'] = 1
-			if npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and booty_call['condom'] ! 1:
+			if npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and booty_call['danger_day'] = 0 and mesec <= 0 and booty_call['condom'] ! 1:
 				'"Can I come inside you? Is it safe today?" <<$npc_firstname[$boy]>> whimpers almost pleadingly.'
 			elseif booty_call['orgasm'] < orgasm:
 				'"Let''s come together," <<$npc_firstname[$boy]>> says, smiling at you.'
@@ -430,9 +430,7 @@ if $ARGS[0] = 'fuck_cum':
 		else
 			!!if booty_call['orgasm'] < orgasm or pcs_horny >= 85:
 			if booty_call['he_ask_creampie'] = 1:
-				if booty_call['orgasm'] < orgasm:
-					act'Come together':booty_call['he_ask_creampie_yes'] = 1 & gs 'booty_call_cum', 'cum_together'
-				elseif npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and booty_call['condom'] ! 1 and (npc_know_not_bc[$boy] = 1 or npc_know_bc[$boy] = 0):
+				if npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and booty_call['condom'] ! 1 and (npc_know_not_bc[$boy] = 1 or npc_know_bc[$boy] = 0) and booty_call['creampie_allowance'] = 0:
 					if birth_control['think_safe'] = 1:
 						act'I''m on birth control':
 							cla & *nl
@@ -458,7 +456,7 @@ if $ARGS[0] = 'fuck_cum':
 							'"It should be," you smile at him. "Go ahead."'
 							act'Continue':gt 'booty_call_cum', 'cum_inside'
 						end
-					else
+					elseif booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and booty_call['danger_day'] = 0:
 						act'It''s a safe day (lie)':
 							cla & *nl
 							booty_call['safe_day'] = 1
@@ -466,6 +464,8 @@ if $ARGS[0] = 'fuck_cum':
 							act'Continue':gt 'booty_call_cum', 'cum_inside'
 						end
 					end
+				elseif booty_call['orgasm'] < orgasm:
+					act'Come together':booty_call['he_ask_creampie_yes'] = 1 & gs 'booty_call_cum', 'cum_together'
 				else
 					act'Let him come inside you':
 						cla & *nl
@@ -486,7 +486,7 @@ if $ARGS[0] = 'fuck_cum':
 				act'Come inside me!':
 					cla & *nl
 					booty_call['creampie_ask'] = 1
-					if booty_call['speed'] = 1:
+					if booty_call['speed'] ! 3:
 						'"Come inside me," you smile. "Fill me up."'
 					else
 						'"Come inside me!" you cry. "Fill me up!"'

+ 15 - 5
locations/booty_call_doggy.qsrc

@@ -1,6 +1,13 @@
 # booty_call_doggy
 
 if $ARGS[0] = 'doggy_start':
+!!	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
+!!		cla & *clr
+!!		'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+!!		'<<$npc_firstname[$boy]>> flips you over.'
+!!		act'Stop him (virgin)':gt'booty_call_virgin', 'wait'
+!!		act'Let him take your virginity':gs'booty_call_virgin', 'start3'
+!!	elseif booty_call['change_pos'] = 1:
 	if booty_call['change_pos'] = 1:
 		act'Switch to doggy':
 			booty_call['cock_inserted'] = 1
@@ -35,7 +42,7 @@ if $ARGS[0] = 'doggy_start':
 			end
 			act'Get fucked':gs'booty_call_doggy', 'doggy_goto'
 		end
-	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
+	elseif booty_call['initiative'] ! 1 or booty_call['force_initiative'] = 2:
 		gs 'booty_call_sex', 'speed_select'
 		act'Continue':
 			booty_call['cock_inserted'] = 1
@@ -107,7 +114,10 @@ if $ARGS[0] = 'doggy_start':
 				'You get back on your knees, waggling your ass enticingly at him.'
 			else
 				'You turn around and get on your knees, presenting your ass towards him.'
-				'"I want you to fuck me from behind this time."'
+			elseif $booty_call['position'] = 'miss' or $booty_call['position'] = 'cowgirl':
+				'"I want you to fuck me from behind this time," you say, giving him a sultry look over your shoulder.'
+			else
+				'"I need you inside me again," you say, giving him a sultry look over your shoulder.'
 			end
 			act'Get fucked':gs'booty_call_doggy', 'doggy_goto'
 		end
@@ -127,7 +137,7 @@ if $ARGS[0] = 'doggy1':
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy1'
 	!! booty_call['doggy_fuck'] tracks if you fuck in this position
-!!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
+	if pcs_vag = 0 and booty_call['fuck_count'] = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
 
@@ -270,7 +280,7 @@ if $ARGS[0] = 'doggy2':
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy2'
 	!! booty_call['doggy_fuck'] tracks if you fuck in this position
-!!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
+	if pcs_vag = 0 and booty_call['fuck_count'] = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
 
@@ -418,7 +428,7 @@ if $ARGS[0] = 'doggy3':
 	$booty_call['pos_speed'] = 'doggy3'
 	!! booty_call['doggy_fuck'] tracks if you fuck in this position
 	booty_call['doggy_fuck'] = 1
-!!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
+	if pcs_vag = 0 and booty_call['fuck_count'] = 0:gt 'booty_call_virgin', 'doggy_virg_hard1'
 	gs 'arousal', 'vaginal',1,'no_orgasm_msg', 'rough'
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/rough1.mp4"></video></center>'

+ 16 - 10
locations/booty_call_miss.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'missionary_start':
 			end
 			act'Get fucked':gs'booty_call_miss', 'miss_goto'
 		end
-	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
+	elseif booty_call['initiative'] ! 1 or booty_call['force_initiative'] = 2:
 		gs 'booty_call_sex', 'speed_select'
 		act'Continue':
 			booty_call['cock_inserted'] = 1
@@ -65,8 +65,10 @@ if $ARGS[0] = 'missionary_start':
 				'You lean back, spreading your legs and pussy wide for <<$npc_firstname[$boy]>>.'
 			elseif $booty_call['position'] = 'miss':
 				'You lean back and spread your legs, beckoning him back between them.'
+			elseif $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
+				'"I want you on top this time," you whisper huskily.'
 			else
-				'"I want you on top this time."'
+				'"I need you inside me again," you whisper, spreading your legs and pussy wide for <<$npc_firstname[$boy]>>.'
 			end
 			act'Get fucked':gs'booty_call_miss', 'miss_goto'
 		end
@@ -88,7 +90,7 @@ if $ARGS[0] = 'miss1':
 	!! booty_call['missionary_fuck'] tracks if you fuck in this position
 	booty_call['missionary_fuck'] = 1
 	booty_call['kiss'] = 0
-!!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
+	if pcs_vag = 0 and booty_call['fuck_count'] = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
 	if mesec > 0:
@@ -268,7 +270,7 @@ if $ARGS[0] = 'miss2':
 	$booty_call['pos_speed'] = 'miss2'
 	!! booty_call['missionary_fuck'] tracks if you fuck in this position
 	booty_call['missionary_fuck'] = 1
-!!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
+	if pcs_vag = 0 and booty_call['fuck_count'] = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
 	if mesec > 0:
@@ -441,7 +443,7 @@ if $ARGS[0] = 'miss3':
 	!! booty_call['missionary_fuck'] tracks if you fuck in this position
 	booty_call['missionary_fuck'] = 1
 	booty_call['kiss'] = 0
-!!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
+	if pcs_vag = 0 and booty_call['fuck_count'] = 0:gt 'booty_call_virgin', 'miss_virg_hard1'
 	gs 'arousal', 'vaginal',1,'no_orgasm_msg', 'rough'
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/rough1.mp4"></video></center>'
@@ -710,22 +712,26 @@ if $ARGS[0] = 'miss_kiss':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/vag/miss/kiss1.mp4"></video></center>'
 		if booty_call['bored'] = 1:
-			if npc_smoker[$boy] > 0:
+			if booty_call['cuni_count'] > 0:
+				'You let <<$npc_firstname[$boy]>>''s lips touch yours and feel his tongue snake through your mouth, accompanied by an additional salty flavour that takes you a moment to realize is the taste of your own pussy. His tongue swirls against yours, sending waves of heat through your hips.'
+			elseif npc_smoker[$boy] > 0:
 				'You let <<$npc_firstname[$boy]>>''s lips touch yours and feel his tongue snake through your mouth. It swirls against yours, sending waves of heat through your hips.'
 			else
-				'You let his <<$npc_firstname[$boy]>>''s touch yours and feel his tongue snake through your mouth. It swirls against yours, tasting vaguely of smoke and tabacco, and sends waves of heat through your hips.'
+				'You let his <<$npc_firstname[$boy]>>''s touch yours and feel his tongue snake through your mouth. It swirls against yours, tasting vaguely of smoke and tobacco, and sends waves of heat through your hips.'
 			end
 			*nl
 			'<i>At least this part feels good,</i> you think to yourself, allowing a small smile to break through.'
 		elseif booty_call['orgasm'] < orgasm:
-			if npc_smoker[$boy] > 0:
-				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. His tongue, tasting vaguely of smoke and tabacco, pushes up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
+			if booty_call['cuni_count'] > 0:
+				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. They taste slightly... salty... and you realize with a start that it''s the flavour of your own pussy, being passed back into your mouth. His tongue pushes up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
+			elseif npc_smoker[$boy] > 0:
+				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. His tongue, tasting vaguely of smoke and tobacco, pushes up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
 			else
 				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. They press softly together and his tongue spreads them apart to push up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
 			end
 		else
 			if npc_smoker[$boy] > 0:
-				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. His tongue, tasting vaguely of smoke and tabacco, spreads them apart to push up against yours, gently complimenting the pleasure of his cock inside you.'
+				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. His tongue, tasting vaguely of smoke and tobacco, spreads them apart to push up against yours, gently complimenting the pleasure of his cock inside you.'
 			else
 				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. They press softly together and his tongue spreads them apart to push up against yours, compounding the pleasure of his cock inside you. You kiss him back with everything you have, moaning into his mouth as he continues to thrust into you.'
 			end

+ 57 - 188
locations/booty_call_morning.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = 'late_for_school':
 			cla & *nl
 			'"I''m gonna be late for something!" you say hurriedly. "Gotta go!"'
 			'With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
-			act'Leave':gs'booty_call_after', 'exit'
+			act'Leave':gs'booty_call_leave', 'exit'
 		end
 
 		act'I''m gonna be late for school!':
@@ -267,7 +267,7 @@ if $ARGS[0] = 'late_for_school':
 					'"No, I''ll be okay. Thanks for the offer though." '
 					*nl
 					'With one last quick check, you make sure all your clothes are in place and call, "See you later!" over your shoulder as you rush out the door.'
-					act'Leave':gs'booty_call_after', 'exit'
+					act'Leave':gs'booty_call_leave', 'exit'
 				end
 
 				act'That''d be great':
@@ -288,7 +288,7 @@ if $ARGS[0] = 'late_for_school':
 						'"That''s okay," you shake your head. "It''s right here in the residential area. I can just walk.Thanks for the offer though."'
 						*nl
 						'With one last quick check, you make sure all your clothes are in place and call, "See you later!" over your shoulder as you rush out the door.'
-						act'Leave':gs'booty_call_after', 'exit'
+						act'Leave':gs'booty_call_leave', 'exit'
 					end
 				end
 
@@ -298,11 +298,11 @@ if $ARGS[0] = 'late_for_school':
 					'You hesitate for a moment, considering it.'
 					*nl
 					'"No," you shake your head. "I don''t want someone seeing me get out of your car. Rumors spread like fire at my school. I can''t risk it." With one last quick check, you make sure all your clothes are in place, you shout, "See you later!" over your shoulder and rush out the door.'
-					act'Leave':gs'booty_call_after', 'exit'
+					act'Leave':gs'booty_call_leave', 'exit'
 				end
 			else
 				'With one last quick check, you make sure all your clothes are in place and grab the rest of your things. "See you later!" you call over your shoulder as you rush out the door.'
-				act'Leave':gs'booty_call_after', 'exit'
+				act'Leave':gs'booty_call_leave', 'exit'
 			end
 		end
 	end
@@ -354,22 +354,54 @@ end
 if $ARGS[0] = 'kiss_wake':
 	cla & *clr
 	gs'arousal', 'kiss', 1, 'no_orgasm_msg'
+	booty_call['boy_asleep'] = 0
 	npc_rel[$boy] += 1
 	'<center><img <<$set_imgh>> src="images/shared/sex/kiss/bed1.jpg"></center>'
-	'You roll over onto <<$npc_firstname[$boy]>>, letting your breasts rest on his chest as you straddle him and plant a kiss on his lips.'
-	'"Good <i>-mmmph-</i> morning," you murmur between kisses.'
-	'"Morning," he smiles back.'
-	gs'booty_call_morning', 'wakeup1'
-	act'Give <<$npc_firstname[$boy]>> a blowjob':
-		gs'arousal', 'bj', 1, 'no_orgasm_msg'
-		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
-		'You break the kiss from <<$npc_firstname[$boy]>>''s lips and start trailing them down his neck and then his chest and then his stomach and soon you have your lips wrapped around his already stiff member.'
-		*nl
-		gs'booty_call_morning', 'bj_wake'
+	'You roll over onto <<$npc_firstname[$boy]>>, letting your breasts rest on his chest as you straddle him.'
+	'"Good <i>-mmmph-</i> morning," you murmur, planting a kiss on his lips.'
+	if cum_loc['face'] > 0:
+		'"Ugch~! What the fuck is that?" he sputters, shaking his head in disgust.'
+		act'Didn''t wash my face':
+			cla & *nl
+			'"It''s your cum," you smirk wryly. "Didn''t get to wash it off after you cumshot me last night."'
+			'"Couldn''t you have washed it off before you kissed me?"'
+			gs'booty_call_morning', 'wakeup1'
+			act'Give <<$npc_firstname[$boy]>> a blowjob':
+				gs'arousal', 'bj', 1, 'no_orgasm_msg'
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
+				'"Let me make it up to you," you smile, throwing back the covers and wrapping your lips around his already stiff cock.'
+				gs'booty_call_morning', 'bj_wake'
+			end
+		end
+		
+		act'His fault':
+			cla & *nl
+			'"It''s your fault," you smirk wryly. "You''re the one who plastered my face last night."'
+			'"Couldn''t you have washed it off before you kissed me?"'
+			gs'booty_call_morning', 'wakeup1'
+			act'Give <<$npc_firstname[$boy]>> a blowjob':
+				gs'arousal', 'bj', 1, 'no_orgasm_msg'
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
+				'"Let me make it up to you," you smile, throwing back the covers and wrapping your lips around his already stiff cock.'
+				gs'booty_call_morning', 'bj_wake'
+			end
+		end
+	else
+		'"Morning," he smiles back.'
+		gs'booty_call_morning', 'wakeup1'
+		act'Give <<$npc_firstname[$boy]>> a blowjob':
+			gs'arousal', 'bj', 1, 'no_orgasm_msg'
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
+			'You break the kiss from <<$npc_firstname[$boy]>>''s lips and start trailing them down his neck and then his chest and then his stomach and soon you have your lips wrapped around his already stiff member.'
+			gs'booty_call_morning', 'bj_wake'
+		end
 	end
 end
 
+
 if $ARGS[0] = 'bj_wake':
 	booty_call['boy_asleep'] = 0
 	gs'arousal', 'bj', 1, 'no_orgasm_msg'
@@ -516,7 +548,7 @@ if $ARGS[0] = 'wakeup1':
 !!				gs 'shortgs', 'dress'
 !!				'You get dressed.'
 				!!gs'booty_call_morning', 'dressing1'
-				gs'booty_call_after', 'dressing1'
+				gs'booty_call_leave', 'dressing1'
 			end
 		end
 
@@ -645,7 +677,7 @@ if $ARGS[0] = 'shower2':
 	minut += 10
 	shampoo += 1
 	dynamic $showerdin
-	gs 'stat'
+	gs'stat'
 	'You twist the faucet and hot water comes rushing out, pouring over you, soaking into your skin. Slowly over time, your sleepiness washes away and clarity comes back.'
 	*nl
 	'Feeling sufficiently awake, you turn off the tap and step out of the shower.'
@@ -662,6 +694,7 @@ if $ARGS[0] = '2nd_shower':
 		minut += 5
 		shampoo += 1
 		dynamic $showerdin
+		gs'stat'
 		'You get into <<$npc_firstname[$boy]>>''s shower for the <i>second</i> time this morning, washing the sex sweat from your body.'
 		*nl
 		'You take a shorter one this time, mostly just rinsing off, before shutting the water off and getting out.'
@@ -691,13 +724,13 @@ end
 if $ARGS[0] = 'head_out':
 	if $clothingworntype = 'nude':
 		!! gt'booty_call_morning', 'dressing1'
-		gt'booty_call_after', 'dressing1'
+		gt'booty_call_leave', 'dressing1'
 	else
 		if npc_latesleeper[$boy] = 1 and booty_call['boy_wakeup'] = 0:
 			'Not wanting to wake <<$npc_firstname[$boy]>>, you sneak over to the door and let yourself out, closing it as gently as you can behind you.'
-			act'Leave':gt'booty_call_after', 'exit'
+			act'Leave':gt'booty_call_leave', 'exit'
 		else
-			gs'booty_call_after', 'leaving_dialogue'
+			gs'booty_call_leave', 'leaving_dialogue'
 		end
 	end
 end
@@ -762,7 +795,7 @@ if $ARGS[0] = 'dressing1':
 		'You reach down for your discarded clothes and tug them on quietly, not wanting to wake <<$npc_firstname[$boy]>>.'
 		*nl
 		'Once everything is in place, you sneak over to the door and let yourself out, closing it as gently as you can behind you.'
-		act'Leave':gt'booty_call_after', 'exit'
+		act'Leave':gt'booty_call_leave', 'exit'
 	else
 		'You reach down for where you left your clothes and start to pick them up.'
 		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
@@ -873,177 +906,14 @@ if $ARGS[0] = 'end_morning':
 		$npc_apt_bedroom[$boy]
 		'You finish <<$booty_call[''dress_describe'']>>.'
 		if booty_call['sleepover'] = 1 and npc_latesleeper[$boy] = 1 and booty_call['boy_asleep'] ! 0:
-			gs'booty_call_morning', 'sneak_out1'
+			gs'booty_call_leave', 'sneak_out1'
 		else
-			gs'booty_call_after', 'leaving_dialogue'
+			gs'booty_call_leave', 'dressing1'
 		end
 	end
 end
 
 
-if $ARGS[0] = 'sneak_out1':
-	act'Sneak out': gt'booty_call_morning', 'sneak_out2'
-	act'Leave a note':
-		cla & *clr
-		$npc_apt_hall[$boy]
-		'Not wanting to leave without saying goodbye but not wanting to wake <<$npc_firstname[$boy]>> either, you find a piece of paper and a pen and scribble out a quick message.'
-		gs'booty_call_morning', 'sneak_out_note1'
-	end
-	if $pantyworntype ! 'none':
-		act'Leave your panties':
-			npc_panty_give[$boy] += 1
-			gs 'panties', 'dispose'
-			cla & *clr
-			$npc_apt_hall[$boy]
-			if CloSkirtShortness > 0:
-				'Suddenly feeling naughty, you quickly slip your panties down your legs, leaving your pussy bare underneath your skirt. You loop your warm underwear around the handle of <<$npc_firstname[$boy]>>''s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.'
-			else
-				'Suddenly feeling naughty, you pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up back up, sans panties. You loop your warm underwear around the handle of <<$npc_firstname[$boy]>>''s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.'
-			end
-			act'Leave':gt'booty_call_after', 'exit'
-		end
-		
-		act'Leave your a note on your panties':
-			booty_call['panty_note'] = 1
-			npc_panty_give[$boy] += 1
-			gs 'panties', 'dispose'
-			cla & *clr
-			$npc_apt_hall[$boy]
-			if CloSkirtShortness > 0:
-				'Not wanting to leave without saying goodbye but not wanting to wake <<$npc_firstname[$boy]>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly slip your panties down from underneath your skirt and then rummage for a big marker.'
-			else
-				'Not wanting to leave without saying goodbye but not wanting to wake <<$npc_firstname[$boy]>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up, sans panties. Then you rummage for a big marker.'
-			end
-			*nl
-			'You pop the cap with a grin and start scribbling.'
-			gs'booty_call_morning', 'sneak_out_note1'
-		end
-
-	end
-end
-
-if $ARGS[0] = 'sneak_out_note1':
-	act'Thanks for letting me stay over':
-		cla & *clr
-		$npc_apt_hall[$boy]
-		$booty_call['note_desc1'] = '<i>Thanks for letting me spend the night.</i>'
-		$booty_call['note_desc1']
-		gs'booty_call_morning', 'sneak_out_note2'
-	end
-	
-	act'I had a good time':
-		cla & *clr
-		$npc_apt_hall[$boy]
-		$booty_call['note_desc1'] = '<i>I had a good time last night.</i>'
-		$booty_call['note_desc1']
-		gs'booty_call_morning', 'sneak_out_note2'
-	end
-	
-	if booty_call['fuck_count'] > 0:
-		act'Thanks for the fuck':
-			cla & *clr
-			$npc_apt_hall[$boy]
-			$booty_call['note_desc1'] = '<i>Thanks for the fuck.</i>'
-			$booty_call['note_desc1']
-			gs'booty_call_morning', 'sneak_out_note2'
-		end
-	end
-	
-end
-
-if $ARGS[0] = 'sneak_out_note2':
-	act'It was fun':
-		$booty_call['note_desc2'] = '<i>It was fun.</i>'
-		gs'booty_call_morning', 'sneak_out_note3'
-	end
-
-	act'See ya':
-		$booty_call['note_desc2'] = '<i>See ya later.</i>'
-		gs'booty_call_morning', 'sneak_out_note3'
-	end
-	
-	act'Text me':
-		$booty_call['note_desc2'] = '<i>Don''t forget to text me.</i>'
-		gs'booty_call_morning', 'sneak_out_note3'
-	end
-	
-	act'Till next time':
-		$booty_call['note_desc2'] = '<i>Until next time.</i>'
-		gs'booty_call_morning', 'sneak_out_note3'
-	end
-end
-
-if $ARGS[0] = 'sneak_out_note3':
-	cla & *clr
-	$npc_apt_hall[$boy]
-	'<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>>'
-	'You sign it with...'
-	act'Just your name':
-		cla & *clr
-		$npc_apt_hall[$boy]
-		'<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> - <<$pcs_nickname>>'
-		gs'booty_call_morning', 'sneak_out_note_end'
-	end
-	
-	act'A smiley face':
-		cla & *clr
-		$npc_apt_hall[$boy]
-		'<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> <b><i>:)</i></b>'
-		*nl
-		'You leave a little face, unable to keep yourself from smiling as you dot two little eyes over the mouth.'
-		gs'booty_call_morning', 'sneak_out_note_end'
-	end
-	
-	act'A winky face':
-		cla & *clr
-		$npc_apt_hall[$boy]
-		'<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> <b><i>;)</i></b>'
-		*nl
-		'You leave a little face, unable to keep yourself from smiling as you dot little winky eyes over the mouth.'
-		gs'booty_call_morning', 'sneak_out_note_end'
-	end
-	
-	act'A heart':
-		cla & *clr
-		$npc_apt_hall[$boy]
-		'<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> <b><i><3</i></b>'
-		*nl
-		'You punctuate the note with a tiny little heart, feeling warmth in your chest as you do.'
-		gs'booty_call_morning', 'sneak_out_note_end'
-	end
-	
-	if pcs_makeup > 2:
-		act'A kiss':
-			cla & *clr
-			$npc_apt_hall[$boy]
-			'<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>>'
-			*nl
-			if booty_call['panty_note'] = 1:
-				'You run your tongue over your lips and press them together a moment before planting a big sloppy wet smooch on your own underwear. As you pull back, your lipstick leaves a large kiss on the soft fabric. Good thing you did your makeup before you left.'
-			else
-				'You run your tongue over your lips and press them together a moment before planting a big sloppy wet smooch on the page. As you pull back, your lipstick leaves large kiss on the soft fabric. Good thing you did your makeup before you left.'
-			end
-			gs'booty_call_morning', 'sneak_out_note_end'
-		end
-	end
-end
-
-if $ARGS[0] = 'sneak_out_note_end':
-	*nl
-	if booty_call['panty_note'] = 1:
-		'Satisfied, you leave your panties on the counter and quietly slip out the door, wondering what <<$npc_firstname[$boy]>> will think when he discovers them.'
-	else
-		'Satisfied, you leave your note on the counter and quietly slip out the door, letting it click shut behind you.'
-	end
-	act'Leave':gt'booty_call_after', 'exit'
-end
-
-if $ARGS[0] = 'sneak_out2':
-	$npc_apt_hall[$boy]
-	'You tip toe your way to the door, turning the handle as gently as you can so you don''t disturb <<$npc_firstname[$boy]>>, closing it with a soft click behind you.'
-	act'Leave':gt'booty_call_after', 'exit'
-end
-
 
 !! ------------------------------------ Morning Sex Stuff -------------------------------------------------------
 
@@ -2177,7 +2047,6 @@ if $ARGS[0] = 'give_lift':
 
 		act'Kiss him goodbye (tongue)':
 			cla & *clr
-			gs 'booty_call_after', 'ending'
 			$booty_call['drop_off_image']
 			gs'arousal', 'kiss', -5
 			gs 'booty_call_after', 'ending'

+ 192 - 138
locations/booty_call_pillow_talk.qsrc

@@ -17,6 +17,8 @@ if $ARGS[0] = 'topics':
 !!	if booty_call['angry_after'] = 0:
 		act'Small talk':cla & gs'booty_call_pillow_talk2', 'small_talk'
 		act'Talk about the sex':cla & gs'booty_call_pillow_talk', 'sex_talk'
+		act'Talk about condoms':cla & gs'booty_call_pillow_talk', 'condom_talk'
+		act'Talk about cum':cla & gs'booty_call_pillow_talk', 'cum_talk'
 		act'Play with his cock':cla & gs'booty_call_pillow_talk2', 'dick_talk'
 		if booty_call['creampie_count'] > 0 and npc_free_creampies[$boy] < 1: gs'booty_call_pillow_talk', 'free_creampies'
 		if booty_call['wake_fuck'] = 1 or booty_call['sleep_fuck'] = 1 or booty_call['morning_fuck'] = 1:
@@ -38,15 +40,27 @@ if $ARGS[0] = 'sex_talk':
 	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
 	act'Change the subject':cla & gs'booty_call_pillow_talk', 'topics'
 	gs'booty_call_favorite_part', 'good_for_you'
-	gs'booty_call_pillow_talk', 'better_without'
 	gs'booty_call_pillow_talk', 'kuni_wear_out'
 	gs'booty_call_pillow_talk', 'long_time'
+	gs'booty_call_pillow_talk', 'better_than_boyfriend'
+	
+	if booty_call['sleepover'] = 1:gs'booty_call_talk', 'morning_talk'
+end
+
+if $ARGS[0] = 'condom_talk':
+	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
+	act'Change the subject':cla & gs'booty_call_pillow_talk', 'topics'
 	gs'booty_call_pillow_talk', 'ran_out_of_condoms'
-	gs'booty_call_pillow_talk', 'keep_it_up'
+	gs'booty_call_pillow_talk', 'better_without'
+end
+
+if $ARGS[0] = 'cum_talk':
+	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
+	act'Change the subject':cla & gs'booty_call_pillow_talk', 'topics'
 	gs'booty_call_pillow_talk', 'so_many_creampies'
 	gs'booty_call_pillow_talk', 'broken_creampie_rule'
 	gs'booty_call_pillow_talk', 'plastered'
-	if booty_call['sleepover'] = 1:gs'booty_call_talk', 'morning_talk'
+	gs'booty_call_pillow_talk', 'thank_no_creampie'
 end
 
 if $ARGS[0] = 'good_for_you':
@@ -79,21 +93,6 @@ if $ARGS[0] = 'good_for_you':
 	end
 end
 
-if $ARGS[0] = 'keep_it_up':
-	if booty_call['cum_count'] >= 5 and booty_call['keep_it_up'] = 0:
-		act'You can really keep it up':
-			gs'booty_call_pillow_talk', 'talk_time_add'
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-			booty_call['keep_it_up'] = 1
-			minut += 1
-			'"You can really keep it up, huh?" you say, trying to count how many times he came.'
-			'"Yeah, I guess I have a pretty high sex drive," he smiles back.'
-			gs'booty_call_pillow_talk', 'topics'
-		end
-	end
-end
-
 if $ARGS[0] = 'kuni_wear_out':
 	if booty_call['cuni_orgasm'] >= 5 and booty_call['pussy_psycho_talk'] ! 1:
 		act'You''re a pussyeating psycho':
@@ -117,33 +116,64 @@ end
 
 if $ARGS[0] = 'long_time':
 	if booty_call['long_time_talk'] = 0:
-		if $daystage['desc'] = 'pre_dawn' or $daystage['desc'] = 'dawn' and booty_call['sleepover'] = 0:
-			act'We fucked all night':
-				gs'booty_call_pillow_talk', 'talk_time_add'
-				booty_call['long_time_talk'] = 1
-				booty_call['keep_it_up'] = 1
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				'"Wow," you pant, looking through the window. "We fucked all night long."'
-				'Sure enough, cracks of purple-orange light glow at the edge of night, the sun is rising.'
-				'"I just can''t stop fucking you," he grins back. "It''s too much fun."'
-				gs'booty_call_pillow_talk', 'sex_talk'
+		act'We were at it a long time':
+			cla
+			if $daystage['desc'] = 'pre_dawn' or $daystage['desc'] = 'dawn' and booty_call['sleepover'] = 0:
+				act'We fucked all night':
+					gs'booty_call_pillow_talk', 'talk_time_add'
+					booty_call['long_time_talk'] = 1
+					booty_call['keep_it_up'] = 1
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+					'"Wow," you pant, looking through the window. "We fucked all night long."'
+					'Sure enough, cracks of purple-orange light glow at the edge of night, the sun is rising.'
+					'"I just can''t stop fucking you," he grins back. "It''s too much fun."'
+					gs'booty_call_pillow_talk', 'sex_talk'
+				end
+			elseif totminut > booty_call['start_time'] + 120:
+				act'It''s been hours':
+					gs'booty_call_pillow_talk', 'talk_time_add'
+					booty_call['long_time_talk'] = 1
+					booty_call['keep_it_up'] = 1
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+					'"Wow," you say, looking over at the clock. "We were at it for a long time. We''ve been going for <<(totminut - booty_call[''start_time'']) / 60>> hours straight!"'
+					'"I just can''t stop fucking you," he grins back. "It''s too much fun."'
+					gs'booty_call_pillow_talk', 'sex_talk'
+				end
 			end
-		elseif totminut > booty_call['start_time'] + 120:
-			act'We were at it a long time':
-				gs'booty_call_pillow_talk', 'talk_time_add'
-				booty_call['long_time_talk'] = 1
-				booty_call['keep_it_up'] = 1
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				'"Wow," you say, looking over at the clock. "We were at it for a long time."'
-				'"I just can''t stop fucking you," he grins back. "It''s too much fun."'
-				gs'booty_call_pillow_talk', 'sex_talk'
+			if booty_call['cum_count'] >= 5 and booty_call['keep_it_up'] = 0:
+				act'You can really keep it up':
+					gs'booty_call_pillow_talk', 'talk_time_add'
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+					booty_call['keep_it_up'] = 1
+					minut += 1
+					'"You can really keep it up, huh?" you say, trying to count how many times he came.'
+					'"Yeah, I guess I have a pretty high sex drive," he smiles back.'
+					gs'booty_call_pillow_talk', 'topics'
+				end
 			end
 		end
 	end
 end
 
+if $ARGS[0] = 'better_than_boyfriend':
+	if pcs_lovers - pcs_girlfriends > 0 and booty_call['better_than_lover_talk'] = 0 and booty_call['virgin'] = 0:
+		act'You''re better than my boyfriend':
+			booty_call['better_than_lover_talk'] = 1
+			npc_know_have_boyfriend[$boy] = 1
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+			'"You''re even better than my boyfriend," you tell <<$npc_firstname[$boy]>> with a satisfied smile.'
+			gs'booty_call_pillow_talk', 'sex_talk'
+		end
+	end
+end
+
+
+!! ----------------------- CONDOM TALK ---------------------------------------
+
 if $ARGS[0] = 'ran_out_of_condoms':
 	if booty_call['out_of_condoms'] >= 1 and booty_call['used_condoms_talk'] = 0 and (booty_call['condoms_used'] + booty_call['pc_condoms_used'] >= 5):
 		act'Can''t believe we ran out of condoms':
@@ -305,14 +335,14 @@ if $ARGS[0] = 'condom_buy_fight2':
 					cla & *clr
 					$npc_apt_bedroom
 					'Throwing your clothes on as fast as you can, you stomp to the door, shouting, "ASSHOLE!" as you slam it behind you.'
-					act'Leave':gt'booty_call_after', 'exit'
+					act'Leave':gt'booty_call_leave', 'exit'
 				end
 				
 				act'Bastard!':
 					cla & *clr
 					$npc_apt_bedroom
 					'Throwing your clothes on as fast as you can, you stomp to the door, shouting, "BASTARD!" as you slam it behind you.'
-					act'Leave':gt'booty_call_after', 'exit'
+					act'Leave':gt'booty_call_leave', 'exit'
 				end
 				
 				act'You''re such a-!':
@@ -321,7 +351,7 @@ if $ARGS[0] = 'condom_buy_fight2':
 					'You sputter in anger, unable to form coherrent sentences as you throw your clothes on as fast as you can.'
 					*nl
 					'"You''re such a-! I can''t believ-! You know wh-! UGH! FUCK YOU!" you shout, slamming the door behind you.'
-					act'Leave':gt'booty_call_after', 'exit'
+					act'Leave':gt'booty_call_leave', 'exit'
 				end
 			end
 		else
@@ -444,102 +474,106 @@ if $ARGS[0] = 'better_without':
 						gs'booty_call_pillow_talk', 'topics'
 					end
 
-					if booty_call['condom'] >= 2:
-						act'Thanks for coming outside':
-							cla
-							if npc_dont_like_creampie[$boy] = 1:
-								'"Thanks for coming outside," you smile.'
-							else
-								'"Thanks for not coming inside me," you murmur.'
-								if booty_call['promise_no_creampie'] = 1:
-									'"Hey, I promised didn''t I?"'
-									'"I know. But some guys don''t listen. I appreciate that you actually followed through."'
-									gs'booty_call_pillow_talk', 'topics'
-								else
-									'"No problem. Though you didn''t ask me to. Would it have been a problem if I had?"'
-									act'No but thanks anyways':
+					gs'booty_call_pillow_talk', 'thank_no_creampie'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'thank_no_creampie':
+	if booty_call['no_condom'] = 1 and booty_call['creampie_count'] = 0:
+		act'Thanks for coming outside':
+			cla
+			if npc_dont_like_creampie[$boy] = 1:
+				'"Thanks for coming outside," you smile.'
+			else
+				'"Thanks for not coming inside me," you murmur.'
+				if booty_call['promise_no_creampie'] = 1:
+					'"Hey, I promised didn''t I?"'
+					'"I know. But some guys don''t listen. I appreciate that you actually followed through."'
+					gs'booty_call_pillow_talk', 'topics'
+				else
+					'"No problem. Though you didn''t ask me to. Would it have been a problem if I had?"'
+					act'No but thanks anyways':
+						cla & *nl
+						'"No," you shake your head. "But thanks anyways. I thought it was considerate."'
+						'You lean over, giving him a peck on the cheek.'
+						gs'booty_call_pillow_talk', 'topics'
+					end
+
+					act'Too intimate':
+						cla & *nl
+						know_intimate_creampies[$boy] = 1
+						'"Too intimate for me," you grimace. "I have to really trust a guy before I let them do something like that, you know?"'
+						'"You should say something next time then."'
+						'"Probably," you say with an embarrassed smile. "I didn''t want to ruin the mood..."'
+						gs'booty_call_pillow_talk', 'topics'
+					end
+					if tabletkishot > 0 or birth_control['think_safe'] = 1:
+						act'I just like being extra safe':
+							cla & *nl
+							'"No," you shake your head. "I''m on birth control so it probably would''ve been fine. I just like being extra safe."'
+							gs'booty_call_pillow_talk', 'topics'
+						end
+
+						act'I don''t like creampies':
+							npc_dont_like_creampie[$boy] = 1
+							cla & *nl
+							'"It wouldn''t have been a ''problem''. I''m on birth control. I just don''t like getting creampied," you grimace. "It feels weird."'
+							gs'booty_call_pillow_talk', 'topics'
+						end
+					else
+						act'I don''t like creampies':
+							cla & *nl
+							'"I don''t like getting creampied," you grimace. "It feels weird."'
+							gs'booty_call_pillow_talk', 'topics'
+						end
+						if pillcon2 > 0 and birth_control['think_safe'] ! 1:
+							act'Birth control hasn''t kicked in':
+								npc_know_start_bc[$boy] = 1
+								cla & *nl
+								'"I just started the pill," you say. "But it hasn''t kicked in yet."'
+								if $npc_cum_pref[$boy] = 'creampie':
+									'"Tell me when it does," he says. "I can''t wait to pump you full of cum."'
+									
+									act'We''ll see':
 										cla & *nl
-										'"No," you shake your head. "But thanks anyways. I thought it was considerate."'
-										'You lean over, giving him a peck on the cheek.'
+										'"We''ll see," you smirk.'
 										gs'booty_call_pillow_talk', 'topics'
 									end
-
-									act'Too intimate':
+									
+									act'Me too':
 										cla & *nl
-										know_intimate_creampies[$boy] = 1
-										'"Too intimate for me," you grimace. "I have to really trust a guy before I let them do something like that, you know?"'
-										'"You should say something next time then."'
-										'"Probably," you say with an embarrassed smile. "I didn''t want to ruin the mood..."'
+										'"Me too," you grin back. "I want to feel my pussy overflowing with you."'
 										gs'booty_call_pillow_talk', 'topics'
 									end
-									if tabletkishot > 0 or birth_control['think_safe'] = 1:
-										act'I just like being extra safe':
-											cla & *nl
-											'"No," you shake your head. "I''m on birth control so it probably would''ve been fine. I just like being extra safe."'
-											gs'booty_call_pillow_talk', 'topics'
-										end
-
-										act'I don''t like creampies':
-											npc_dont_like_creampie[$boy] = 1
-											cla & *nl
-											'"It wouldn''t have been a ''problem''. I''m on birth control. I just don''t like getting creampied," you grimace. "It feels weird."'
-											gs'booty_call_pillow_talk', 'topics'
-										end
-									else
-										act'I don''t like creampies':
-											cla & *nl
-											'"I don''t like getting creampied," you grimace. "It feels weird."'
-											gs'booty_call_pillow_talk', 'topics'
-										end
-										if pillcon2 > 0 and birth_control['think_safe'] ! 1:
-											act'Birth control hasn''t kicked in':
-												npc_know_start_bc[$boy] = 1
-												cla & *nl
-												'"I just started the pill," you say. "But it hasn''t kicked in yet."'
-												if $npc_cum_pref[$boy] = 'creampie':
-													'"Tell me when it does," he says. "I can''t wait to pump you full of cum."'
-													
-													act'We''ll see':
-														cla & *nl
-														'"We''ll see," you smirk.'
-														gs'booty_call_pillow_talk', 'topics'
-													end
-													
-													act'Me too':
-														cla & *nl
-														'"Me too," you grin back. "I want to feel my pussy overflowing with you."'
-														gs'booty_call_pillow_talk', 'topics'
-													end
-													
-													act'Patience':
-														cla & *nl
-														'"You''ll just have to be patient," you smirk.'
-														gs'booty_call_pillow_talk', 'topics'
-													end
-													
-													act'Gulp':
-														cla & *nl
-														'Suddenly, your throat goes dry and wetness spreads between your thighs simultaneously. The thought of his sperm filling you to the brim and overflowing from your snatch suddenly has you feeling...'
-														*nl
-														'You gulp hard, shivering as you try to suppress the arousal washing over your body.'
-														gs'booty_call_pillow_talk', 'topics'
-													end
-												else
-													gs'booty_call_pillow_talk', 'topics'
-												end
-											end
-										else
-											act'I''m not on birth control':
-												gs'booty_call_stats', 'no_birth_control_know'
-												cla & *nl
-												'"I''m not on birth control," you grimace. "Really, I shouldn''t have even taken the chance. Or I should have said something. But it turned out okay. So thanks."'
-												'You smile warmly at him.'
-												gs'booty_call_pillow_talk', 'topics'
-											end
-										end
+									
+									act'Patience':
+										cla & *nl
+										'"You''ll just have to be patient," you smirk.'
+										gs'booty_call_pillow_talk', 'topics'
+									end
+									
+									act'Gulp':
+										cla & *nl
+										'Suddenly, your throat goes dry and wetness spreads between your thighs simultaneously. The thought of his sperm filling you to the brim and overflowing from your snatch suddenly has you feeling...'
+										*nl
+										'You gulp hard, shivering as you try to suppress the arousal washing over your body.'
+										gs'booty_call_pillow_talk', 'topics'
 									end
+								else
+									gs'booty_call_pillow_talk', 'topics'
 								end
 							end
+						else
+							act'I''m not on birth control':
+								gs'booty_call_stats', 'no_birth_control_know'
+								cla & *nl
+								'"I''m not on birth control," you grimace. "Really, I shouldn''t have even taken the chance. Or I should have said something. But it turned out okay. So thanks."'
+								'You smile warmly at him.'
+								gs'booty_call_pillow_talk', 'topics'
+							end
 						end
 					end
 				end
@@ -548,6 +582,24 @@ if $ARGS[0] = 'better_without':
 	end
 end
 
+if $ARGS[0] = 'wish_no_condoms':
+	if booty_call['no_condom'] ! 1 and booty_call['wish_no_condoms_talk'] = 0 and booty_call['fuck_count'] > 0:
+		act'Wish we didn''t need condoms':
+			booty_call['wish_no_condoms_talk'] = 1
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+			'"I wish we didn''t need to use condoms," you sigh disappointedly.'
+			if npc_condom_conscious[$boy] > 0:
+				'"Safety is important," <<$npc_firstname[$boy]>> says sternly. "We don''t want to be taking chances do we?"'
+			elseif booty_call['pc_wants_condoms'] = 1:
+			
+			else
+			
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'creampie_okay':
 	booty_call['creampie_okay'] = 1
 	act'I''ll be fine':
@@ -647,9 +699,9 @@ if $ARGS[0] = 'plastered':
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				if cum_loc['vagina'] > 0:
 					if cum_loc['hair'] > 0:
-						'"Fucking shit!" you scowl, taking note of all the different places cum is coating or leaking from your body. "Did you have to get it everywhere? You completely plastered me! It''s even in my fucking hair! Do you have any idea how much of a pain this is going to be to clean off?"'
+						'"Ugh, fuck!" you scowl, taking note of all the different places cum is coating or leaking from your body. "Did you have to get it everywhere? You completely plastered me! It''s even in my fucking hair! Do you have any idea how much of a pain this is going to be to clean off?"'
 					else
-						'"Fucking shit!" you scowl, taking note of all the different places cum is coating or leaking from your body. "Did you have to get it everywhere? You completely plastered me! Do you have any idea how much of a pain this is going to be to clean off?"'
+						'"Ugh, fuck!" you scowl, taking note of all the different places cum is coating or leaking from your body. "Did you have to get it everywhere? You completely plastered me! Do you have any idea how much of a pain this is going to be to clean off?"'
 					end
 				else
 					if cum_loc['hair'] > 0:
@@ -677,15 +729,15 @@ if $ARGS[0] = 'plastered':
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				if cum_loc['vagina'] > 0:
 					if cum_loc['hair'] > 0:
-						'"Holy cow!" you giggle, taking note of all the different places you can feel cum coating or leaking from your body. "You totally plastered me. You even managed to get it in my hair!"'
+						'"You really plastered me," you giggle, taking note of all the different places you can feel cum coating or leaking from your body. "How did you even manage to get it in my hair?"'
 					else
-						'"Holy cow!" you giggle, taking note of all the different places you can feel cum coating or leaking from your body. "You totally plastered me! How is there even this much in your balls to spray me with?"'
+						'"You really plastered me," you giggle, taking note of all the different places you can feel cum coating or leaking from your body. "How is there even this much in your balls to spray me with?"'
 					end
 				else
 					if cum_loc['hair'] > 0:
-						'"Holy cow!" you giggle, taking note of all the different places you can feel cum on your body. "You totally plastered me. You even managed to get it in my hair!"'
+						'"You really plastered me," you giggle, taking note of all the different places you can feel cum on your body. "How did you even manage to get it in my hair?"'
 					else
-						'"Holy cow!" you giggle, taking note of all the different places you can feel cum on your body. "You totally plastered me! How is there even this much in your balls to spray me with?"'
+						'"You really plastered me," you giggle, taking note of all the different places you can feel cum on your body. "How is there even this much in your balls to spray me with?"'
 					end
 				end
 				if npc_bukakke_fetish[$boy] = 1:
@@ -698,14 +750,14 @@ if $ARGS[0] = 'plastered':
 					
 					act'Joke':
 						cla & *nl
-						'"I like my new makeup," you smile teasingly. "Maybe I <i>will</i> go out like this,"'
+						'"I like my new makeup," you smile teasingly. "Maybe I <i>will</i> go out like this."'
 						gs'booty_call_pillow_talk', 'topics'
 					end
 				elseif npc_argumentative[$boy] = 1:
 					'"It''s not my fault," he grumbles. "You''re the one who made me come so many times."'
 					'"I suppose that''s true," you smile back.'
 					gs'booty_call_pillow_talk', 'topics'
-				elseif $npc_cum_pref[$boy] = 'creampie':
+				elseif $npc_cum_pref[$boy] = 'creampie' and booty_call['creampie_count'] = 0:
 					'"It''s not my fault," he grumbles. "You''re the one who made me come outside."'
 					act'It''s hot':
 						cla & *nl
@@ -758,6 +810,8 @@ if $ARGS[0] = 'ruined_makeup':
 	end
 end
 
+!! ----------------------- CUM TALK --------------------------------------------
+
 if $ARGS[0] = 'so_many_creampies':
 	if booty_call['creampie_count'] >= 4 and booty_call['creampie_pillow_talk'] = 0:
 		act'So many creampies':
@@ -1272,7 +1326,7 @@ if $ARGS[0] = 'boy_broken_condom':
 			
 			act'Take your morning after pill (sexy)':
 				cla & *nl
-				'"It''s fine," you say, smiling mischeviously. "In fact..."'
+				'"It''s fine," you say, smiling mischievously. "In fact..."'
 				'As <<$npc_firstname[$boy]>> watches you pull your morning after pill from your purse, you give him a smouldering look. Sticking out your tongue at him, you pop the pill onto your mouth, swallowing with a wide grin.'
 				if $booty_call['last_cum'] = 'swallow':
 					'"If only I thought to do this earlier," you grin. "Could''ve washed it down with your load."'

+ 99 - 3
locations/booty_call_pillow_talk2.qsrc

@@ -304,8 +304,56 @@ if $ARGS[0] = 'fav_body_part':
 	end
 end
 
+if $ARGS[0] = 'made_me_late1':
+	if schoolprogul > 0 and npc_school_absences[$boy] < schoolprogul and npc_school_absences[$boy] > 0:
+		act'Made me late for school again':
+			cla
+			act'Annoyed'
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				if npc_last_sex[$boy] = daystart:
+					'"You made me late for school this morning," you grumble, eyeballing <<$npc_firstname[$boy]>>. "Again."'
+				else
+					'"You made me late for school the last time I came over," you grumble, eyeballing  <<$npc_firstname[$boy]>>.'
+				end
+				gs'booty_call_pillow_talk2', 'made_me_late2'
+			end
+			
+			act'Not mad':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				
+			end
+		end
+	elseif schoolprogul > 0:
+		act'Made me late for school':
+			cla
+			act'Annoyed'
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				if npc_last_sex[$boy] = daystart:
+					'"You made me late for school this morning," you grumble, eyeballing <<$npc_firstname[$boy]>>.'
+				else
+					'"You made me late for school the last time I came over," you grumble, eyeballing  <<$npc_firstname[$boy]>>.'
+				end
+				gs'booty_call_pillow_talk2', 'made_me_late2'
+			end
+			
+			act'Not mad':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'made_me_late2':
+	
+end
+
 if $ARGS[0] = 'plans_later':
-	if booty_call['plans_later_talk'] = 0:
+	if booty_call['plans_later_talk'] = 0 and booty_call['what_do_today'] = 0:
 		if hour < 14 and hour >= 5:
 			act'What''re you up to later?':
 				booty_call['plans_later_talk'] = 1
@@ -329,7 +377,7 @@ if $ARGS[0] = 'plans_later':
 			end
 		elseif hour >= 20:
 			act'What''d you do today?':
-				booty_call['plans_later_talk'] = 1
+				booty_call['what_do_today'] = 1
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				'"So, what''d you get up to today?" you ask.'
@@ -337,7 +385,7 @@ if $ARGS[0] = 'plans_later':
 			end
 		else
 			act'Doing anything else today?':
-				booty_call['plans_later_talk'] = 1
+				booty_call['what_do_today'] = 1
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				'"So, what else have you done today? Besides me I mean," you smirk at <<$npc_firstname[$boy]>>.'
@@ -1295,4 +1343,52 @@ if $ARGS[0] = 'morning_sleep_fuck_okay':
 	end
 end
 
+!! ------------------------------ BOY INITIATED CONVERSATIONS -------------------------------------------------
+
+if $ARGS[0] = 'new_with_you_boy':
+	booty_call['new_with_you'] = 1
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+	'"So, anything new going on with you?" <<$npc_firstname[$boy]>> asks.'
+	
+	act'Nothing new':
+		cla & *nl
+		'"Not really," you shrug. "Same old same old."'
+		gs'booty_call_pillow_talk', 'topics'
+	end
+	
+	if npc_know_have_girlfriend[$boy] = 1 or npc_know_have_boyfriend[$boy] = 1:
+		if pcs_lovers + pcs_girlfriends = 0:
+			act'Single now':
+				gs 'booty_call_stats', 'single_know'
+				cla
+				act'Broke up with...':
+					cla
+					act'My boyfriend':
+						cla & *nl
+						'"I broke up with my boyfriend," you tell <<$npc_firstname[$boy]>>. "So I guess I''m single now."'
+						
+					end
+					
+					act'My girlfriend':
+						cla & *nl
+						'"I broke up with my boyfriend," you tell <<$npc_firstname[$boy]>>. "So I guess I''m single now."'
+						
+					end
+				end
+				
+			!!{	act'Got broken up with...':
+					cla
+					act'By my boyfriend':
+					
+					end
+					
+					act'By my girlfriend':
+					
+					end
+				end}
+			end
+		end
+	end
+end
 --- booty_call_pillow_talk2 ---------------------------------

+ 51 - 22
locations/booty_call_reactions.qsrc

@@ -86,20 +86,24 @@ if $ARGS[0] = 'creampie_safe_day':
 					cla & *clr
 					if booty_call['cock_inserted'] = 0:
 						gs 'booty_call_reactions', 'creampie_pull_out_image'
-						'"Don''t worry," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "It''s a safe day."'
+						'"It''s a safe day," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "I''m not worried."'
 					else
 						if $booty_call['position'] = 'miss':
 							'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
-							'"Don''t worry," you smile at <<$npc_firstname[$boy]>>, cupping his face. "It''s a safe day."'
+							'"It''s a safe day," you smile at <<$npc_firstname[$boy]>>, cupping his face. "I''m not worried."'
 						elseif $booty_call['position'] = 'doggy':
 							'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
-							'"Don''t worry," you smile at <<$npc_firstname[$boy]>> over your shoulder. "It''s a safe day."'
+							'"It''s a safe day," you smile at <<$npc_firstname[$boy]>> over your shoulder. "I''m not worried."'
 						elseif $booty_call['position'] = 'cowgirl':
 							'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/smile1.jpg"></center>'
-							'"Don''t worry," you smile down at <<$npc_firstname[$boy]>>. "It''s a safe day."'
+							'"It''s a safe day," you smile down at <<$npc_firstname[$boy]>>. "I''m not worried."'
 						end
 					end
-					gs 'booty_call_sex', 'sex_end'
+					if $booty_call['last_cum'] = 'broken_condom':
+						gs'booty_call_cum', 'what_now'
+					else
+						gs 'booty_call_sex', 'sex_end'
+					end
 				end
 				
 				act'Lucky':
@@ -107,7 +111,11 @@ if $ARGS[0] = 'creampie_safe_day':
 					if booty_call['creampie_surprise'] = 1:
 						if booty_call['cock_inserted'] = 0:
 							gs 'booty_call_reactions', 'creampie_pull_out_image'
-							'"That was lucky," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "If you''re gonna come inside me by mistake, it might as well be on a safe day."'
+							if $booty_call['last_cum'] = 'broken_condom':
+								'"That was lucky," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "If a condom is going to break, it might as well be on a safe day."'
+							else
+								'"That was lucky," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "If you''re gonna come inside me by mistake, it might as well be on a safe day."'
+							end
 						else
 							if $booty_call['position'] = 'miss':
 								'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
@@ -124,7 +132,11 @@ if $ARGS[0] = 'creampie_safe_day':
 						booty_call['creampie_allowance'] = 1
 						if booty_call['cock_inserted'] = 0:
 							gs 'booty_call_reactions', 'creampie_pull_out_image'
-							'"We''re in luck today," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "It''s a safe day, so you can come inside me as much as you want."'
+							if $booty_call['last_cum'] = 'broken_condom':
+								'"That was lucky," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "If a condom is going to break, it might as well be on a safe day."'
+							else
+								'"We''re in luck today," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "It''s a safe day, so you can come inside me as much as you want."'
+							end
 						else
 							if $booty_call['position'] = 'miss':
 								'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
@@ -138,7 +150,11 @@ if $ARGS[0] = 'creampie_safe_day':
 							end
 						end
 					end
-					gs 'booty_call_sex', 'sex_end'
+					if $booty_call['last_cum'] = 'broken_condom' or booty_call['promise_no_creampie'] = 1:
+						gs'booty_call_cum', 'what_now'
+					else
+						gs 'booty_call_sex', 'sex_end'
+					end
 				end
 			end
 		elseif stat['probably_safe_day'] = 1:
@@ -149,20 +165,24 @@ if $ARGS[0] = 'creampie_safe_day':
 					cla & *clr
 					if booty_call['cock_inserted'] = 0:
 						gs 'booty_call_reactions', 'creampie_pull_out_image'
-						'"Don''t worry," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "It should be safe today."'
+						'"It should be safe today," you smile as <<$npc_firstname[$boy]>>''s cum continues to trickle from your pussy. "So I''m not too worried."'
 					else
 						if $booty_call['position'] = 'miss':
 							'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
-							'"Don''t worry," you smile at <<$npc_firstname[$boy]>>, cupping his face. "It should be safe today."'
+							'"It should be safe today," you smile at <<$npc_firstname[$boy]>>, cupping his face. "So I''m not too worried."'
 						elseif $booty_call['position'] = 'doggy':
 							'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
-							'"Don''t worry," you smile at <<$npc_firstname[$boy]>> over your shoulder. "It should be safe today."'
+							'"It should be safe today," you smile at <<$npc_firstname[$boy]>> over your shoulder. "So I''m not too worried."'
 						elseif $booty_call['position'] = 'cowgirl':
 							'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/smile1.jpg"></center>'
-							'"Don''t worry," you smile down at <<$npc_firstname[$boy]>>. "It should be safe today."'
+							'"It should be safe today," you smile down at <<$npc_firstname[$boy]>>. "So I''m not too worried."'
 						end
 					end
-					gs 'booty_call_sex', 'sex_end'
+					if $booty_call['last_cum'] = 'broken_condom' or booty_call['promise_no_creampie'] = 1:
+						gs'booty_call_cum', 'what_now'
+					else
+						gs 'booty_call_sex', 'sex_end'
+					end
 				end
 			end
 		end
@@ -1055,13 +1075,13 @@ if $ARGS[0] = 'bask_creampie1':
 				'You just lay there, shivering as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
 			end
 		elseif $booty_call['position'] = 'cowgirl':
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
 			if booty_call['came_together'] > 0:
-				'You collapse onto <<$npc_firstname[$boy]>>, breathing hard from your simultaneous orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+				'Still panting from your simultaneous orgasm, you sit back on your haunches, taking a moment to catch your breath, pleasantly still filled with <<$npc_firstname[$boy]>>''s cock and cum.'
 			elseif orgasm - booty_call['orgasm'] > 1:
-				'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your string of multiple orgasms, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+				'Still panting from your string of multiple orgasms, you sit back on your haunches, taking a moment to catch your breath, pleasantly still filled with <<$npc_firstname[$boy]>>''s cock and cum.'
 			else
-				'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your recent orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+				'You sit back on your haunches, taking a moment to catch your breath, pleasantly still filled with <<$npc_firstname[$boy]>>''s cock and cum.'
 			end
 		end
 		*nl
@@ -1482,10 +1502,10 @@ end
 
 if $ARGS[0] = 'already_creampied_me':
 	if booty_call['creampie_count'] > 1 and booty_call['danger_day'] = 1 and booty_call['creampie_allowance'] = 0:
-		act'Since you already came inside...':
+		act'Since you already came inside... (creampies okay)':
 			booty_call['creampie_allowance'] = 1
 			cla & *nl
-			'"Might as well make the most of it," you smile at <<$npc_firstname[$boy]>>. "Since you already came inside me..."'
+			'"You can keep coming inside me if you want," you smile at <<$npc_firstname[$boy]>>. "Since you already did it once, we might as well make the most of it..."'
 			gs 'booty_call_sex', 'sex_end'
 		end
 	end
@@ -1535,7 +1555,8 @@ if $ARGS[0] = 'no_cum_inside_pic':
 		elseif $booty_call['position'] = 'doggy':
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 		elseif $booty_call['position'] = 'cowgirl':
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
+			!!'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 		end
 	else
 		$npc_apt_bedroom[$boy]
@@ -1950,6 +1971,7 @@ if $ARGS[0] = 'delayed_creampie_orgasm1':
 					'"So you''re not mad?"'
 					gs'booty_call_reactions', 'accidents_happen1'
 					gs'booty_call_reactions', 'creampie_felt_too_good'
+					gs'booty_call_reactions', 'creampie_safe_day'
 				else
 					gs 'booty_call_sex', 'sex_end'
 				end
@@ -1963,6 +1985,7 @@ if $ARGS[0] = 'did_you_come_inside_boy_react1':
 		'"I- wait, you''re not mad?" <<$npc_firstname[$boy]>> asks in surprise.'
 		gs'booty_call_reactions', 'accidents_happen1'
 		gs'booty_call_reactions', 'creampie_felt_too_good'
+		gs'booty_call_reactions', 'creampie_safe_day'
 	else
 		gs 'booty_call_sex', 'sex_end'
 	end
@@ -2250,6 +2273,12 @@ if $ARGS[0] = 'oh_shit_options':
 			end
 		end
 	end
+	
+	if stat['safe_day'] = 1 and booty_call['safe_day'] = 0:
+		
+	elseif stat['probably_safe_day'] = 1 and booty_call['probably_safe_day'] = 0:
+	
+	end
 end
 
 if $ARGS[0] = 'creampie_accident_birth_control':
@@ -2368,7 +2397,7 @@ if $ARGS[0] = 'creampie_panic':
 				'You don''t wait to hear what he was trying to say and dash out the door.'
 			end
 		end
-		act'Leave':gt'booty_call_after', 'exit'
+		act'Leave':gt'booty_call_leave', 'exit'
 	end
 
 	act'That''s not what I''m concerned about! (STDs)':
@@ -2411,7 +2440,7 @@ if $ARGS[0] = 'creampie_panic':
 			'You don''t wait to hear what he was trying to say, you don''t even really know what you''re saying, and you dash out the door.'
 			*nl
 			'<i>Fuck! What am I going to do if I get an STD?!</i>'
-			act'Leave':gt'booty_call_after', 'exit'
+			act'Leave':gt'booty_call_leave', 'exit'
 		end
 	end
 end

+ 3 - 3
locations/booty_call_sex.qsrc

@@ -857,7 +857,7 @@ if $ARGS[0] = 'harden_hand':
 		act'Try to get him hard again (hand)':
 			booty_call['cock_inserted'] = 0
 			cla & *clr
-			if booty_call['cum_count'] >= npc_sexdrive[$boy] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum'] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
 				!! IMAGE HERE
 				$npc_apt_bedroom[$boy]
 				if booty_call['force_harden'] > 0:
@@ -906,7 +906,7 @@ if $ARGS[0] = 'harden_mouth':
 		act'Try to get him hard again (mouth)':
 			booty_call['cock_inserted'] = 0
 			cla & *clr
-			if booty_call['cum_count'] >= npc_sexdrive[$boy] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum'] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
 				!! IMAGE HERE
 				$npc_apt_bedroom[$boy]
 				if booty_call['force_harden'] > 0:
@@ -1350,7 +1350,7 @@ if $ARGS[0] = 'sleep_wtf_forgive2':
 			'"Ugh." You sneer at him as you get up. "I see how it''s gonna be. Not gonna get a wink of sleep with you around. I''m leaving."'
 			*nl
 			'Quick as you can, you gather your things and get dressed and head out the door.'
-			act'Leave':gt'booty_call_after', 'exit'
+			act'Leave':gt'booty_call_leave', 'exit'
 		end
 		
 		act'Back to sleep':

+ 28 - 4
locations/booty_call_shower.qsrc

@@ -330,7 +330,7 @@ if $ARGS[0] = 'before_shower_creampie_surprise':
 				'"Imbecile!" you shout again, storming out of the shower, not caring that you''re dripping wet. You make your way over to his bedroom and pick up your clothes, throwing them on.'
 				'"Wait!" <<$npc_firstname[$boy]>> protests, clumsily wrapping a towel around his waist and following you.'
 				'"I''m not waiting for shit!" you sneer. The moment the last item of clothing is over your wet skin, you stomp out the door, slamming it behind you.'
-				act'Leave':gt 'booty_call_after', 'exit'
+				act'Leave':gt 'booty_call_leave', 'exit'
 			end
 			
 			act'Forgive him (my fault)':
@@ -578,6 +578,7 @@ if $ARGS[0] = 'after_alone':
 	gs 'stat'
 	'You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off and step out.'
 	act'Put on a towel':gt'booty_call_shower', 'after_towel_on'
+	act'Wrap it around your head':gt'booty_call_shower', 'after_towel_head'
 	act'Skip the towel':gt'booty_call_shower', 'after_towel_skip'
 end
 
@@ -591,6 +592,17 @@ if $ARGS[0] = 'after_towel_on':
 	gs'booty_call_after', 'after_sex2'
 end
 
+if $ARGS[0] = 'after_towel_head':
+	cla & *clr
+	booty_call['towel'] = 1
+	booty_call['towel_head'] = 1
+	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/towel_head1.jpg"></center>'
+	'You pull a towel from the cupboard and dry your body with it, only pausing to wrapping it around your hair before opening the door. Upon stepping out of the bathroom, <<$npc_firstname[$boy]>> eyes light up at the sight of your body, completely naked except for the towel turban atop your head.'
+	*nl
+	'"Thanks," you smile at him.'
+	gs'booty_call_after', 'after_sex2'
+end
+
 if $ARGS[0] = 'after_towel_borrow':
 	act'Borrow a towel':
 		cla & *nl
@@ -885,7 +897,7 @@ if $ARGS[0] = 'after_shower_creampie_surprise':
 				'"Imbecile!" you shout again, storming out of the shower, not caring that you''re dripping wet. You make your way over to his bedroom and pick up your clothes, throwing them on.'
 				'"Wait!" <<$npc_firstname[$boy]>> protests, clumsily wrapping a towel around his waist and following you.'
 				'"I''m not waiting for shit!" you sneer. The moment the last item of clothing is over your wet skin, you stomp out the door, slamming it behind you.'
-				act'Leave':gt 'booty_call_after', 'exit'
+				act'Leave':gt 'booty_call_leave', 'exit'
 			end
 			
 			act'Forgive him (my fault)':
@@ -1555,7 +1567,7 @@ if $ARGS[0] = 'morning_shower_creampie_surprise':
 				'"Imbecile!" you shout again, storming out of the shower, not caring that you''re dripping wet. You make your way over to his bedroom and pick up your clothes, throwing them on.'
 				'"Wait!" <<$npc_firstname[$boy]>> protests, clumsily wrapping a towel around his waist and following you.'
 				'"I''m not waiting for shit!" you sneer. The moment the last item of clothing is over your wet skin, you stomp out the door, slamming it behind you.'
-				act'Leave':gt 'booty_call_after', 'exit'
+				act'Leave':gt 'booty_call_leave', 'exit'
 			end
 			
 			act'Forgive him (my fault)':
@@ -1765,6 +1777,7 @@ if $ARGS[0] = 'morning_shower_together_end':
 	act'Finish up':
 		cla
 		act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
+		act'Wrap it around your head':gt'booty_call_shower', 'morning_towel_head'
 		act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
 	end
 end
@@ -1795,7 +1808,18 @@ if $ARGS[0] = 'morning_towel_on':
 	cla & *clr
 	booty_call['towel'] = 1
 	'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/towel.jpg"></center>'
-	'You borrow a towel from <<$npc_firstname[$boy]>>''s cupboard and dry off with it before wrapping it around your chest and exit into the bedroom with him.'
+	'You pull a towel from the cupboard and dry off with it before wrapping it around your chest before exiting the bathroom and back into the bedroom.'
+	act'Continue':gs'booty_call_morning', 'wakeup2'
+end
+
+if $ARGS[0] = 'morning_towel_head':
+	cla & *clr
+	booty_call['towel'] = 1
+	booty_call['towel_head'] = 1
+	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/towel_head1.jpg"></center>'
+	'You pull a towel from the cupboard and dry your body with it, only pausing to wrapping it around your hair before opening the door. Upon stepping out of the bathroom, <<$npc_firstname[$boy]>> eyes light up at the sight of your body, completely naked except for the towel turban atop your head.'
+	*nl
+	'"Thanks," you smile at him.'
 	act'Continue':gs'booty_call_morning', 'wakeup2'
 end
 

+ 4 - 5
locations/booty_call_start.qsrc

@@ -63,7 +63,7 @@ end
 if $ARGS[0] = 'initiate':
 	gs 'boystat', $ARGS[1]
 	
-	if booty_call_invite[$boy] = daystart and npc_last_booty_call[$boy] ! daystart:
+	if (booty_call_invite[$boy] = daystart or npc_booty_call[$boy] = daystart or npc_booty_call_date[$boy] = daystart) and npc_last_booty_call[$boy] ! daystart:
 		gt 'booty_call_start', 'invited_start'
 	elseif npc_start_free_time[$boy] >= hour and hour <= npc_end_free_time[$boy] and npc_last_booty_call[$boy] ! daystart and npc_no_booty_call[$boy] ! daystart:
 		gt 'booty_call_start', 'uninvited_start'
@@ -72,10 +72,9 @@ if $ARGS[0] = 'initiate':
 		'You knock on <<$npc_firstname[$boy]>>''s door but there is no answer.'
 		act'Leave':gt $loc
 	end
-	npc_last_booty_call[$boy] = daystart
+	
 end
 
-
 if $ARGS[0] = 'begin':
 	$location_type = 'event'
 	gs 'themes', 'indoors'
@@ -86,6 +85,7 @@ if $ARGS[0] = 'begin':
 	end
 	gs 'booty_call_stats', 'starting_stats'
 	gs 'booty_call_stats', 'npc_update'
+	npc_last_booty_call[$boy] = daystart
 end
 	
 if $ARGS[0] = 'uninvited_start':
@@ -1048,8 +1048,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 					'"So that means you''ll swallow it all next time, right?"'
 					act'I''ll try':
 						cla & *nl
-						'"I''ll do my best," you say, eyes still watering.'
-						gs 'booty_call_sex', 'sex_end'
+						'"I''ll do my best," you say.'
 					end
 					act'Nod':
 						cla & *nl

+ 9 - 1
locations/booty_call_stats.qsrc

@@ -97,6 +97,11 @@ if $ARGS[0] = 'save':
 	npc_virgin_rapist[$boy] += booty_call['virgin_rape']
 	
 	if booty_call['sleep_fuck'] > 0: npc_sleep_fuck += 1
+	
+	if hour >= 8 and hour < 14 and week < 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
+		!!absence from school
+		npc_school_absences[$boy] = schoolprogul
+	end
 end
 
 
@@ -111,7 +116,10 @@ if $ARGS[0] = 'no_birth_control_know':
 	npc_know_bc[$boy] = 0
 end
 
-
+if $ARGS[0] = 'single_know':
+	npc_know_have_boyfriend[$boy] = 0
+	npc_know_have_girlfriend[$boy] = 0
+end
 
 if $ARGS[0] = 'sleep_check':
 	booty_call['sleep_cum_vagina'] = cum_loc['vagina']

+ 7 - 3
locations/booty_call_talk.qsrc

@@ -245,7 +245,11 @@ if $ARGS[0] = 'pc_have_morning_after':
 	if morning_after_pill = 0:
 		act'I''ll buy a morning after pill':
 			cla & *nl
-			'"It''s okay," you murmur reassuringly. "I''ll get a morning after pill tomorrow. No big deal."'
+			if booty_call['sleepover'] = 0:
+				'"It''s okay," you murmur reassuringly. "I''ll get a morning after pill tomorrow. No big deal."'
+			else
+				'"It''s okay," you murmur reassuringly. "I''ll get a morning after pill later today. No big deal."'
+			end
 			'He nods, seeming to relax a bit.'
 			gs'booty_call_pillow_talk', 'topics'
 		end
@@ -762,7 +766,7 @@ if $ARGS[0] = 'cheating_end':
 		else
 			'You return his smile, the prospect of future encounters already seeping into your pants as you head out the door.'
 		end
-		act'Leave':gt'booty_call_after', 'exit'
+		act'Leave':gt'booty_call_leave', 'exit'
 	end
 	
 	act'Guilt':
@@ -772,7 +776,7 @@ if $ARGS[0] = 'cheating_end':
 		'<i>Are you just rationalizing? Making excuses? Why aren''t you just ending things?</i>'
 		*nl
 		'But you just keep smiling all the way until you close the door behind you.'
-		act'Leave':gt'booty_call_after', 'exit'
+		act'Leave':gt'booty_call_leave', 'exit'
 	end
 end
 

+ 2 - 2
locations/dateM.qsrc

@@ -18,9 +18,9 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	!! generate a boy
 	if $region = 'pav':
-		gs 'npcgeneratec', 0, 'Stranger', rand(18,45), 1
+		gs 'npcgeneratec', 0, '', rand(18,45), 1
 	elseif $region = 'city':
-		gs 'npcgeneratec', 0, 'Stranger', rand(18,45), rand(3,4)
+		gs 'npcgeneratec', 0, '', rand(18,45), rand(3,4)
 	end
 	gs 'boyStat', $npclastgenerated
 	act 'Ignore him and hurry away':gt $loc, $loc_arg

+ 11 - 2
locations/hookup_after.qsrc

@@ -1912,7 +1912,7 @@ if $ARGS[0] = 'have_a_boyfriend':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'"I have a boyfriend," you say, giving him a look.'
-			if npc_fidelity[$boy] < 5:
+			if npc_fidelity[$boy] = 6:
 				if npc_girlfriend[$boy] = 1 and npc_goal[$boy] = 1:
 					'"So? I have a girlfriend," he grins shamelessly. "Doesn''t mean we can''t keep fucking."'
 					act'No way':
@@ -1921,6 +1921,15 @@ if $ARGS[0] = 'have_a_boyfriend':
 						'"Yeah, no," you grimace, and pick up the rest of your things and head out the door.'
 						act'Leave':gt 'hookup_after', 'exit'
 					end
+					act'So long as you know':
+						cla & *clr
+						$npc_apt_bedroom[$boy]
+						hookup['fuckbuddy'] = 1
+						'"So long as you know," you smirk back. You exchange numbers with him and a moment later a notification pings in your messages.'
+						*nl
+						gs 'hookup_after', 'fuckbuddy_text'
+						act'Leave':gt 'hookup_after', 'exit'
+					end
 				else
 					'"Whatever, your loss," he shrugs. "Looks like I''m a better lay than him anyways."'
 					'"Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
@@ -1942,7 +1951,7 @@ if $ARGS[0] = 'have_a_girlfriend':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'"I have a girlfriend," you say, giving him a look.'
-			if npc_fidelity[$boy] < 7:
+			if npc_fidelity[$boy] = 6:
 				if npc_girlfriend[$boy] = 1 and npc_goal[$boy] = 1:
 					'"Hey, me too!" he grins shamelessly.'
 					act'No way':

Some files were not shown because too many files changed in this diff