Procházet zdrojové kódy

Merge remote-tracking branch 'hornguy6/master'

Kevin_Smarts před 1 rokem
rodič
revize
45de72681c

+ 1 - 0
locations/booty_call_condoms.qsrc

@@ -257,6 +257,7 @@ if $ARGS[0] = 'npc_condom_use':
 	cla & *clr
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
 	'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
 	booty_call['must_fuck'] = 1
 	booty_call['must_fuck'] = 1
+	booty_call['cock_inserted'] = 0
 	if booty_call['fuck_count'] > 1 and $booty_call['last_cum'] = 'condom':
 	if booty_call['fuck_count'] > 1 and $booty_call['last_cum'] = 'condom':
 		'<<$npc_firstname[$boy]>> swaps out his used condom for a new one.'
 		'<<$npc_firstname[$boy]>> swaps out his used condom for a new one.'
 	elseif booty_call['fuck_count'] > 1:
 	elseif booty_call['fuck_count'] > 1:

+ 6 - 1
locations/booty_call_cowgirl.qsrc

@@ -4,6 +4,7 @@ if $ARGS[0] = 'cowgirl_start':
 	if booty_call['change_pos'] = 1:
 	if booty_call['change_pos'] = 1:
 		act'Switch to cowgirl':
 		act'Switch to cowgirl':
 			cla & *clr
 			cla & *clr
+			booty_call['cock_inserted'] = 1
 			booty_call['change_pos'] = 0
 			booty_call['change_pos'] = 0
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/cowgirl1.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/cowgirl1.jpg"></center>'
 			if $booty_call['position'] = 'miss':
 			if $booty_call['position'] = 'miss':
@@ -22,6 +23,7 @@ if $ARGS[0] = 'cowgirl_start':
 		cla
 		cla
 		act'Continue':
 		act'Continue':
 			cla & *clr
 			cla & *clr
+			booty_call['cock_inserted'] = 1
 			gs'booty_call_sex', 'speed_select'
 			gs'booty_call_sex', 'speed_select'
 			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/slow1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/slow1.mp4"></video></center>'
 			if $booty_call['position'] = 'miss':
 			if $booty_call['position'] = 'miss':
@@ -40,9 +42,10 @@ if $ARGS[0] = 'cowgirl_start':
 
 
 			act'Ride him hard':gt 'booty_call_cowgirl', 'cowgirl3'
 			act'Ride him hard':gt 'booty_call_cowgirl', 'cowgirl3'
 		end
 		end
-	elseif booty_call['initiative'] ! 1:
+	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
 		act'Continue':
 		act'Continue':
 			cla & *clr
 			cla & *clr
+			booty_call['cock_inserted'] = 1
 			if booty_call['fuck_count'] = 0:
 			if booty_call['fuck_count'] = 0:
 				'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter1.mp4"></video></center>'
 				'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter1.mp4"></video></center>'
 				'He lays back on the bed, pulling you on top of him as he does. You get the message and line yourself up with his cock.'
 				'He lays back on the bed, pulling you on top of him as he does. You get the message and line yourself up with his cock.'
@@ -63,6 +66,7 @@ if $ARGS[0] = 'cowgirl_start':
 	else
 	else
 		act'Climb on top of him':
 		act'Climb on top of him':
 			cla & *clr
 			cla & *clr
+			booty_call['cock_inserted'] = 1
 			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter1.mp4"></video></center>'
 			if booty_call['fuck_count'] = 0:
 			if booty_call['fuck_count'] = 0:
 				'You push him back onto the bed and throw your legs over his.'
 				'You push him back onto the bed and throw your legs over his.'
@@ -85,6 +89,7 @@ if $ARGS[0] = 'cowgirl_start':
 end
 end
 
 
 if $ARGS[0] = 'cowgirl_goto':
 if $ARGS[0] = 'cowgirl_goto':
+	booty_call['cock_inserted'] = 1
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	gt 'booty_call_cowgirl', 'cowgirl<<booty_call[''speed'']>>'
 	gt 'booty_call_cowgirl', 'cowgirl<<booty_call[''speed'']>>'
 end
 end

+ 5 - 1
locations/booty_call_cum.qsrc

@@ -286,9 +286,11 @@ if $ARGS[0] = 'random_cum_choice':
 end
 end
 
 
 if $ARGS[0] = 'fuck_cum':
 if $ARGS[0] = 'fuck_cum':
+	cla
 	!! flags to remember what kind of fucking happened during sex
 	!! flags to remember what kind of fucking happened during sex
 	if booty_call['morning_after'] = 1:booty_call['morning_fuck'] = 1
 	if booty_call['morning_after'] = 1:booty_call['morning_fuck'] = 1
 	booty_call['fuck'] = 1
 	booty_call['fuck'] = 1
+	booty_call['cock_inserted'] = 1
 	booty_call['no_sex'] = 0
 	booty_call['no_sex'] = 0
 	booty_call['fuck_again'] = 0
 	booty_call['fuck_again'] = 0
 	booty_call['must_fuck'] = 0
 	booty_call['must_fuck'] = 0
@@ -1679,9 +1681,10 @@ end
 
 
 if $ARGS[0] = 'cum_force':
 if $ARGS[0] = 'cum_force':
 	booty_call['creampie_force'] = 1
 	booty_call['creampie_force'] = 1
-	gs 'booty_call_cum', 'creampie_code'
+	
 	!! differing descriptions based on position
 	!! differing descriptions based on position
 	if booty_call['condom'] = 1:
 	if booty_call['condom'] = 1:
+		gs'cum_call', '',$boy,1,3
 		if pcs_horny > 90:
 		if pcs_horny > 90:
 			$orgasm_or = 'yes'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
@@ -1704,6 +1707,7 @@ if $ARGS[0] = 'cum_force':
 			gs'booty_call_sex', 'sex_end'
 			gs'booty_call_sex', 'sex_end'
 		end
 		end
 	else
 	else
+		gs 'booty_call_cum', 'creampie_code'
 		if pcs_horny > 90:
 		if pcs_horny > 90:
 			$orgasm_or = 'yes'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'

+ 6 - 1
locations/booty_call_doggy.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'doggy_start':
 if $ARGS[0] = 'doggy_start':
 	if booty_call['change_pos'] = 1:
 	if booty_call['change_pos'] = 1:
 		act'Switch to doggy':
 		act'Switch to doggy':
+			booty_call['cock_inserted'] = 1
 			cla & *clr
 			cla & *clr
 			booty_call['change_pos'] = 0
 			booty_call['change_pos'] = 0
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy2.jpg"></center>'
@@ -19,6 +20,7 @@ if $ARGS[0] = 'doggy_start':
 	elseif booty_call['force_initiative'] = 2 and booty_call['cock_inserted'] = 1:
 	elseif booty_call['force_initiative'] = 2 and booty_call['cock_inserted'] = 1:
 		cla
 		cla
 		act'Continue':
 		act'Continue':
+			booty_call['cock_inserted'] = 1
 			cla & *clr
 			cla & *clr
 			gs 'booty_call_sex', 'speed_select'
 			gs 'booty_call_sex', 'speed_select'
 			if $booty_call['position'] = 'miss':
 			if $booty_call['position'] = 'miss':
@@ -33,9 +35,10 @@ if $ARGS[0] = 'doggy_start':
 			end
 			end
 			act'Get fucked':gs'booty_call_doggy', 'doggy_goto'
 			act'Get fucked':gs'booty_call_doggy', 'doggy_goto'
 		end
 		end
-	elseif booty_call['initiative'] ! 1:
+	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
 		gs 'booty_call_sex', 'speed_select'
 		gs 'booty_call_sex', 'speed_select'
 		act'Continue':
 		act'Continue':
+			booty_call['cock_inserted'] = 1
 			cla
 			cla
 			if booty_call['fuck_count'] = 0:
 			if booty_call['fuck_count'] = 0:
 				if npc_rough_lover[$boy] = 1:
 				if npc_rough_lover[$boy] = 1:
@@ -94,6 +97,7 @@ if $ARGS[0] = 'doggy_start':
 	else
 	else
 		gs 'booty_call_sex', 'speed_select'
 		gs 'booty_call_sex', 'speed_select'
 		act'Bend over':
 		act'Bend over':
+			booty_call['cock_inserted'] = 1
 			cla & *clr
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy2.jpg"></center>'
 			if booty_call['fuck_count'] = 0:
 			if booty_call['fuck_count'] = 0:
@@ -111,6 +115,7 @@ if $ARGS[0] = 'doggy_start':
 end
 end
 
 
 if $ARGS[0] = 'doggy_goto':
 if $ARGS[0] = 'doggy_goto':
+	booty_call['cock_inserted'] = 1
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
 	gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
 end
 end

+ 12 - 2
locations/booty_call_miss.qsrc

@@ -1,10 +1,17 @@
 # booty_call_miss
 # booty_call_miss
 
 
 if $ARGS[0] = 'missionary_start':
 if $ARGS[0] = 'missionary_start':
-	if booty_call['change_pos'] = 1:
+	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]>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.'
+		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:
 		act'Switch to missionary':
 		act'Switch to missionary':
 			cla & *clr
 			cla & *clr
 			booty_call['change_pos'] = 0
 			booty_call['change_pos'] = 0
+			booty_call['cock_inserted'] = 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss2.jpg"></center>'
 			if $booty_call['position'] = 'doggy':
 			if $booty_call['position'] = 'doggy':
 				'You lean forward, letting <<$npc_firstname[$boy]>>''s cock slip from your pussy. You flip over onto your back, spreading your legs, giving him a sultry look.'
 				'You lean forward, letting <<$npc_firstname[$boy]>>''s cock slip from your pussy. You flip over onto your back, spreading your legs, giving him a sultry look.'
@@ -30,9 +37,10 @@ if $ARGS[0] = 'missionary_start':
 			end
 			end
 			act'Get fucked':gs'booty_call_miss', 'miss_goto'
 			act'Get fucked':gs'booty_call_miss', 'miss_goto'
 		end
 		end
-	elseif booty_call['initiative'] ! 1:
+	elseif booty_call['initiative'] ! 1 and booty_call['force_initiative'] ! 1:
 		gs 'booty_call_sex', 'speed_select'
 		gs 'booty_call_sex', 'speed_select'
 		act'Continue':
 		act'Continue':
+			booty_call['cock_inserted'] = 1
 			if booty_call['condom'] = 0: booty_call['no_condom'] = 1
 			if booty_call['condom'] = 0: booty_call['no_condom'] = 1
 			cla & *clr
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
@@ -49,6 +57,7 @@ if $ARGS[0] = 'missionary_start':
 	else
 	else
 		gs 'booty_call_sex', 'speed_select'
 		gs 'booty_call_sex', 'speed_select'
 		act'Spread your legs':
 		act'Spread your legs':
+			booty_call['cock_inserted'] = 1
 			if booty_call['condom'] = 0: booty_call['no_condom'] = 1
 			if booty_call['condom'] = 0: booty_call['no_condom'] = 1
 			cla & *clr
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss2.jpg"></center>'
@@ -65,6 +74,7 @@ if $ARGS[0] = 'missionary_start':
 end
 end
 
 
 if $ARGS[0] = 'miss_goto':
 if $ARGS[0] = 'miss_goto':
+	booty_call['cock_inserted'] = 1
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	if booty_call['speed'] = 0: booty_call['speed'] = rand(1,3)
 	gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
 	gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
 end
 end

+ 2 - 2
locations/booty_call_morning.qsrc

@@ -545,8 +545,8 @@ if $ARGS[0] = 'wakeup1':
 			act'Get dressed':
 			act'Get dressed':
 				cla & *clr
 				cla & *clr
 				$npc_apt_bedroom[$boy]
 				$npc_apt_bedroom[$boy]
-				gs 'shortgs', 'dress'
-				'You get dressed.'
+!!				gs 'shortgs', 'dress'
+!!				'You get dressed.'
 				!!gs'booty_call_morning', 'dressing1'
 				!!gs'booty_call_morning', 'dressing1'
 				gs'booty_call_after', 'dressing1'
 				gs'booty_call_after', 'dressing1'
 			end
 			end

+ 30 - 19
locations/booty_call_sex.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'sex_start':
 	elseif booty_call['cock_inserted'] = 1 and $booty_call['last_cum'] = 'creampie' and ($booty_call['position'] = 'miss' or  $booty_call['position'] = 'doggy' or  $booty_call['position'] = 'cowgirl'):
 	elseif booty_call['cock_inserted'] = 1 and $booty_call['last_cum'] = 'creampie' and ($booty_call['position'] = 'miss' or  $booty_call['position'] = 'doggy' or  $booty_call['position'] = 'cowgirl'):
 		act'Fuck again':
 		act'Fuck again':
 			booty_call['must_fuck'] = 1
 			booty_call['must_fuck'] = 1
-			if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
 				gs 'booty_call_after', 'fucked_out'
 				gs 'booty_call_after', 'fucked_out'
 			else
 			else
 !!					cla & *nl
 !!					cla & *nl
@@ -27,7 +27,7 @@ if $ARGS[0] = 'sex_start':
 				end
 				end
 				
 				
 				act'Change positions':
 				act'Change positions':
-					booty_call['force_initiative'] = 2
+					booty_call['force_initiative'] = 1
 					cla
 					cla
 					if booty_call['no_condom'] ! 1:
 					if booty_call['no_condom'] ! 1:
 						gs 'booty_call_condoms', 'condoms'
 						gs 'booty_call_condoms', 'condoms'
@@ -103,20 +103,25 @@ if $ARGS[0] = 'sex_pre':
 end
 end
 
 
 
 
-
 if $ARGS[0] = 'position_choose':
 if $ARGS[0] = 'position_choose':
 	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0: 
 	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0: 
 		gs 'booty_call_virgin', 'start_options'
 		gs 'booty_call_virgin', 'start_options'
 	!! initiative roll
 	!! initiative roll
 !!	elseif booty_call['no_sex'] = 0:
 !!	elseif booty_call['no_sex'] = 0:
+	else
 		booty_call['initiative'] = rand(0,1)
 		booty_call['initiative'] = rand(0,1)
 		if (booty_call['initiative'] = 1 and booty_call['force_initiative'] ! 2) or booty_call['force_initiative'] = 1:
 		if (booty_call['initiative'] = 1 and booty_call['force_initiative'] ! 2) or booty_call['force_initiative'] = 1:
 			!! player wins initiative
 			!! player wins initiative
-			if $booty_call['pos_speed'] = '':
-				act'Let him choose':
-					cla & *nl
-					'"Take me however you want," you smile.'
+			
+			act'Let him choose':
+				cla & *nl
+					if $booty_call['pos_speed'] = '':
+						'"Take me however you want," you smile.'
+					else
+						'"Fuck me again," you smile. "You pick how."'
+					end
 					booty_call['must_fuck'] = 1
 					booty_call['must_fuck'] = 1
+					booty_call['force_initiative'] = 2
 					if $npc_fav_pos[$boy] = 'missionary':
 					if $npc_fav_pos[$boy] = 'missionary':
 						gs 'booty_call_miss', 'missionary_start'
 						gs 'booty_call_miss', 'missionary_start'
 					elseif $npc_fav_pos[$boy] = 'doggy':
 					elseif $npc_fav_pos[$boy] = 'doggy':
@@ -148,7 +153,7 @@ if $ARGS[0] = 'position_choose':
 				gs 'booty_call_sex', 'rand_position'
 				gs 'booty_call_sex', 'rand_position'
 			end
 			end
 		end
 		end
-!!	end
+	end
 end
 end
 
 
 if $ARGS[0] = 'he_choose_position':
 if $ARGS[0] = 'he_choose_position':
@@ -217,6 +222,9 @@ if $ARGS[0] = 'rand_position':
 			!! failsafe: default to missionary
 			!! failsafe: default to missionary
 			gs 'booty_call_miss', 'missionary_start'
 			gs 'booty_call_miss', 'missionary_start'
 		end
 		end
+	else
+		!! failsafe: default to missionary
+		gs 'booty_call_miss', 'missionary_start'
 	end
 	end
 end
 end
 
 
@@ -709,7 +717,7 @@ end
 
 
 if $ARGS[0] = 'keep_going':
 if $ARGS[0] = 'keep_going':
 	act'Keep going?':
 	act'Keep going?':
-		if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+		if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
 			gs 'booty_call_after', 'fucked_out'
 			gs 'booty_call_after', 'fucked_out'
 		elseif $booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
 		elseif $booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
 			
 			
@@ -939,8 +947,10 @@ if $ARGS[0] = 'harden_mouth':
 					'"Yeah, that''s right...  Just like that little guy..." you whisper, pulling your mouth off with a pop and smiling wickedly as you continue slowly pumping him with your hand.'
 					'"Yeah, that''s right...  Just like that little guy..." you whisper, pulling your mouth off with a pop and smiling wickedly as you continue slowly pumping him with your hand.'
 				end
 				end
 				booty_call['not_done'] = 0
 				booty_call['not_done'] = 0
-				if booty_call['force_harden'] > 0:booty_call['force_harden'] = 2
-				booty_call['extra_cum'] += 1
+				if booty_call['force_harden'] > 0:
+					booty_call['force_harden'] = 2
+					booty_call['extra_cum'] += 1
+				end
 				$booty_call['foreplay'] = ''
 				$booty_call['foreplay'] = ''
 				gs'booty_call_sex', 'reset'
 				gs'booty_call_sex', 'reset'
 				act'Keep blowing him':cla & *clr & gs 'booty_call_start', 'bj_dom2'
 				act'Keep blowing him':cla & *clr & gs 'booty_call_start', 'bj_dom2'
@@ -1001,7 +1011,7 @@ if $ARGS[0] = 'reset':
 	booty_call['spit'] = 0
 	booty_call['spit'] = 0
 	booty_call['gag'] = 0
 	booty_call['gag'] = 0
 	booty_call['react'] = 0
 	booty_call['react'] = 0
-	
+	booty_call['force_initiative'] = 0
 	booty_call['smoke_break'] = 0
 	booty_call['smoke_break'] = 0
 	booty_call['first_break'] = 0
 	booty_call['first_break'] = 0
 	booty_call['cycle_limit'] = 0
 	booty_call['cycle_limit'] = 0
@@ -1011,6 +1021,7 @@ if $ARGS[0] = 'reset':
 	booty_call['take_in_stride'] = 0
 	booty_call['take_in_stride'] = 0
 	booty_call['sex_over'] = 0
 	booty_call['sex_over'] = 0
 	if booty_call['no_condom'] = 1: booty_call['condom'] = 0
 	if booty_call['no_condom'] = 1: booty_call['condom'] = 0
+	booty_call['good_for_you'] = 0
 end
 end
 
 
 if $ARGS[0] = 'pain':
 if $ARGS[0] = 'pain':
@@ -1400,6 +1411,7 @@ end
 if $ARGS[0] = 'wakeup_sex':
 if $ARGS[0] = 'wakeup_sex':
 	booty_call['sleep_fuck'] = 1
 	booty_call['sleep_fuck'] = 1
 	booty_call['wake_fuck'] = 1
 	booty_call['wake_fuck'] = 1
+	booty_call['morning_after'] = 1
 	gs'arousal', 'vaginal', rand(5,10), 'no_orgasm_msg'
 	gs'arousal', 'vaginal', rand(5,10), 'no_orgasm_msg'
 	if npc_sex_speed <= 2:
 	if npc_sex_speed <= 2:
 		$booty_call['sleep_video1'] = '<center><video autoplay loop src="images/shared/sex/sleep/slow<<rand(1,2)>>.mp4"></video></center>'
 		$booty_call['sleep_video1'] = '<center><video autoplay loop src="images/shared/sex/sleep/slow<<rand(1,2)>>.mp4"></video></center>'
@@ -1424,11 +1436,7 @@ end
 
 
 if $ARGS[0] = 'wakeup_sex2':
 if $ARGS[0] = 'wakeup_sex2':
 	cla & *clr
 	cla & *clr
-	if daystage = 2:
-		'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsex0.mp4"></video></center>'
-	else
-		'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
-	end
+	'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 	'Your eyes flutter open and find <<$npc_firstname[$boy]>> balls deep inside you, happily fucking you first thing in the morning.'
 	'Your eyes flutter open and find <<$npc_firstname[$boy]>> balls deep inside you, happily fucking you first thing in the morning.'
 	gs'booty_call_sex', 'wakeup_sex_options'
 	gs'booty_call_sex', 'wakeup_sex_options'
 end
 end
@@ -1447,8 +1455,7 @@ if $ARGS[0] = 'wakeup_sex_options':
 	
 	
 	act'Moan':
 	act'Moan':
 		cla & *clr
 		cla & *clr
-		booty_call['wakeup_fuck'] = 1
-		$booty_call['position'] = 'miss'
+		gs'booty_call_sex', 'morning_wake_fuck_code'
 		if daystage = 2:
 		if daystage = 2:
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/med1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/med1.mp4"></video></center>'
 		else
 		else
@@ -1503,6 +1510,7 @@ if $ARGS[0] = 'wakeup_sex_options':
 end
 end
 
 
 if $ARGS[0] = 'morning_wake_fuck_code':
 if $ARGS[0] = 'morning_wake_fuck_code':
+	booty_call['start_time'] = totminut
 	booty_call['wakeup_fuck'] = 1
 	booty_call['wakeup_fuck'] = 1
 	$booty_call['position'] = 'miss'
 	$booty_call['position'] = 'miss'
 	if daystage = 2:
 	if daystage = 2:
@@ -1621,6 +1629,7 @@ if $ARGS[0] = 'morning_wtf_forgive2':
 	
 	
 	act'Oh alright':
 	act'Oh alright':
 		booty_call['morning_fuck'] = 2
 		booty_call['morning_fuck'] = 2
+		booty_call['start_time'] = totminut
 		cla & *clr
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		$npc_apt_bedroom[$boy]
 		'You give him a look and after a brief pause, you sigh dramatically, rolling your eyes.'
 		'You give him a look and after a brief pause, you sigh dramatically, rolling your eyes.'
@@ -1632,6 +1641,7 @@ if $ARGS[0] = 'morning_wtf_forgive2':
 	
 	
 	act'Sure':
 	act'Sure':
 		booty_call['morning_fuck'] = 2
 		booty_call['morning_fuck'] = 2
+		booty_call['start_time'] = totminut
 		cla & *clr
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		$npc_apt_bedroom[$boy]
 		'"Sure," you grin, beckoning him closer so you can put his raging erection to use.'
 		'"Sure," you grin, beckoning him closer so you can put his raging erection to use.'
@@ -1641,6 +1651,7 @@ if $ARGS[0] = 'morning_wtf_forgive2':
 end
 end
 
 
 if $ARGS[0] = 'wakeup_sex_continue':
 if $ARGS[0] = 'wakeup_sex_continue':
+	booty_call['start_time'] = totminut
 	if npc_sex_speed <= 2:
 	if npc_sex_speed <= 2:
 		booty_call['speed'] = 1
 		booty_call['speed'] = 1
 		act'Fuck <<$npc_firstname[$boy]>>':gs'booty_call_miss', 'miss1.2'
 		act'Fuck <<$npc_firstname[$boy]>>':gs'booty_call_miss', 'miss1.2'

+ 25 - 9
locations/booty_call_shower.qsrc

@@ -140,11 +140,15 @@ if $ARGS[0] = 'before_together2':
 				gs'arousal', 'massage',5,'no_orgasm_msg'
 				gs'arousal', 'massage',5,'no_orgasm_msg'
 				gs'stat'
 				gs'stat'
 				'You turn to face <<$npc_firstname[$boy]>>.'
 				'You turn to face <<$npc_firstname[$boy]>>.'
-				if (booty_call['condom'] > 0 and booty_call['no_condom'] ! 1 and npc_free_creampies[$boy] < 1) or booty_call['danger_day'] = 1:
+				if (booty_call['condom'] > 0 and booty_call['npc_condom_insist'] ! 1 and booty_call['creampie_allowance'] = 0 and npc_free_creampies[$boy] ! 2) or booty_call['danger_day'] = 1:
 					'"You won''t come inside me, will you?" you ask.'
 					'"You won''t come inside me, will you?" you ask.'
 					'"Don''t worry, I won''t."'
 					'"Don''t worry, I won''t."'
 					*nl
 					*nl
 					'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 					'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
+				elseif booty_call['condom'] > 0 and booty_call['npc_condom_insist'] = 1:
+					'"Don''t worry," <<$npc_firstname[$boy]>> whispers. "I won''t come inside you."'
+					*nl
+					'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 				else
 				else
 					'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 					'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 				end
 				end
@@ -429,7 +433,7 @@ if $ARGS[0] = 'before_shower_creampie':
 		*nl
 		*nl
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		*nl
 		*nl
-		if (booty_call['shower_no_condom'] > 0 or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2) or npc_know_not_bc[$boy] = 1) and npc_free_creampies[$boy] < 1:
+		if (booty_call['shower_no_condom'] > 0 or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2)) and npc_free_creampies[$boy] < 1:
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			act'Changed my mind':
 			act'Changed my mind':
 				cla & *clr
 				cla & *clr
@@ -716,11 +720,15 @@ if $ARGS[0] = 'after_shower_together':
 						'"Well..." Your breath hitches as he gives your nipples a light squeeze. You feel warm and wet and it''s <i>not</i> just the shower.'
 						'"Well..." Your breath hitches as he gives your nipples a light squeeze. You feel warm and wet and it''s <i>not</i> just the shower.'
 !!						if stat['think_virgin'] = 0 and booty_call['virgin'] ! 1:
 !!						if stat['think_virgin'] = 0 and booty_call['virgin'] ! 1:
 						
 						
-						if booty_call['condom'] > 0:
-							'"You won''t cum inside me, will you?" you ask.'
+						if (booty_call['condom'] > 0 and booty_call['npc_condom_insist'] ! 1 and booty_call['creampie_allowance'] = 0 and npc_free_creampies[$boy] ! 2) or booty_call['danger_day'] = 1:
+							'"You won''t come inside me, will you?" you ask.'
 							'"Don''t worry, I won''t."'
 							'"Don''t worry, I won''t."'
 							*nl
 							*nl
 							'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 							'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
+						elseif booty_call['condom'] > 0 and booty_call['npc_condom_insist'] = 1:
+							'"Don''t worry," <<$npc_firstname[$boy]>> whispers. "I won''t come inside you."'
+							*nl
+							'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 						else
 						else
 							'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 							'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 						end
 						end
@@ -746,11 +754,15 @@ if $ARGS[0] = 'after_shower_together':
 					gs'arousal', 'massage',5,'no_orgasm_msg'
 					gs'arousal', 'massage',5,'no_orgasm_msg'
 					gs'stat'
 					gs'stat'
 					'You turn to face <<$npc_firstname[$boy]>>.'
 					'You turn to face <<$npc_firstname[$boy]>>.'
-					if booty_call['condom'] > 0:
-						'"You won''t cum inside me, will you?" you ask.'
+					if (booty_call['condom'] > 0 and booty_call['npc_condom_insist'] ! 1 and booty_call['creampie_allowance'] = 0 and npc_free_creampies[$boy] ! 2) or booty_call['danger_day'] = 1:
+						'"You won''t come inside me, will you?" you ask.'
 						'"Don''t worry, I won''t."'
 						'"Don''t worry, I won''t."'
 						*nl
 						*nl
 						'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 						'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
+					elseif booty_call['condom'] > 0 and booty_call['npc_condom_insist'] = 1:
+						'"Don''t worry," <<$npc_firstname[$boy]>> whispers. "I won''t come inside you."'
+						*nl
+						'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
 					else
 					else
 						'You look at him and your expression says everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 						'You look at him and your expression says everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
 					end
 					end
@@ -973,7 +985,7 @@ if $ARGS[0] = 'after_shower_creampie':
 		*nl
 		*nl
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		*nl
 		*nl
-		if booty_call['condom'] > 0 or npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2 or npc_know_not_bc[$boy] = 1:
+		if ((booty_call['condom'] > 0 and booty_call['npc_condom_insist'] ! 1) or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2)) and booty_call['creampie_allowance'] = 0:
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			act'Changed my mind':
 			act'Changed my mind':
 				if npc_boyfriend_creampie_rule[$boy] > 0: npc_boyfriend_creampie_rule[$boy] = 0
 				if npc_boyfriend_creampie_rule[$boy] > 0: npc_boyfriend_creampie_rule[$boy] = 0
@@ -1586,11 +1598,15 @@ if $ARGS[0] = 'morning_shower_creampie_surprise':
 			gs'booty_call_shower', 'morning_sex_end'
 			gs'booty_call_shower', 'morning_sex_end'
 		end
 		end
 		
 		
-		if booty_call['condom'] > 0:
+		if booty_call['condom'] > 0 or booty_call['npc_condom_insist'] = 1:
 			act'Tease him':
 			act'Tease him':
 				cla & *clr
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/shower/after1.mp4"></video></center>'
 				'<center><video autoplay loop src="images/shared/sex/shower/after1.mp4"></video></center>'
-				'"What happened to ''Don''t worry, I won''t''?" you ask, a smirk twitching at your lips as he pulls away, feeling something hot dribble down your leg.'
+				if booty_call['npc_condom_insist'] = 1:
+					'"What happened to ''Don''t worry, I won''t come inside you''?" you ask, a smirk twitching at your lips as he pulls away, feeling something hot dribble down your leg.'
+				else
+					'"What happened to ''Don''t worry, I won''t''?" you ask, a smirk twitching at your lips as he pulls away, feeling something hot dribble down your leg.'
+				end
 				'"Sorry," he blushes. "I, uhh... I overestimated myself... I guess you need another shower, huh?"'
 				'"Sorry," he blushes. "I, uhh... I overestimated myself... I guess you need another shower, huh?"'
 				gs'booty_call_shower', 'morning_sex_end'
 				gs'booty_call_shower', 'morning_sex_end'
 			end
 			end

+ 1 - 1
locations/rape_events.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = 'park_rape_fight_start':
 end
 end
 	
 	
 if $ARGS[0] = 'park_rape_struggle_start':
 if $ARGS[0] = 'park_rape_struggle_start':
-	temp['rape_type'] = 'gang'
+	$temp['rape_type'] = 'gang'
 	gs'rape_events','rapist_generate'
 	gs'rape_events','rapist_generate'
 	gs'rape_events','park_image'
 	gs'rape_events','park_image'
 	'You try to scream but the hand clamped over your mouth reduces it to nothing more than a muffled groan as you are dragged into the bushes.'
 	'You try to scream but the hand clamped over your mouth reduces it to nothing more than a muffled groan as you are dragged into the bushes.'