Merge remote-tracking branch 'hornguy6/master'

locations/booty_call_condoms.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'condoms':
 			if npc_condom_conscious[$boy] > 0:
 				gs 'booty_call_condoms', 'condom_conscious_npc'
 			elseif booty_call['condom_count'] > 0 and rand(0,1) = 1:
-				gs 'booty_call_condoms', 'npc_condom_use'
+				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'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'condoms':
 			if booty_call['condoms_used'] >= booty_call['condom_count']:
 				gs 'booty_call_condoms', 'npc_out_of_condoms'
 			else
-				gs 'booty_call_condoms', 'npc_condom_use'
+				act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 			end
 		end
 	end
@@ -139,33 +139,33 @@ if $ARGS[0] = 'pc_condoms':
 					act'If you''re offering':
 						cla & *nl
 						'"Well, if you''re offering..." you smirk.'
-						gs'booty_call_condoms', 'npc_condom_use'
+						act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 					end
 					
 					act'I might take you up on that':
 						cla & *nl
 						'"I just might take you up on that," you smile.'
-						gs'booty_call_condoms', 'npc_condom_use'
+						act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 					end
 					
 					act'I want to do my part':
 						cla & *nl
 						'"I want to do my part," you smile. "I''m enjoying the sex with you. Only fair that I pay for it too."'
-						gs'booty_call_condoms', 'npc_condom_use'
+						act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 					end
 					
 					if karta + money < 2000:
 						act'Good, money''s tight':
 							cla & *nl
 							'"Then I''ll stop buying right away," you grin. "I don''t have a lot of spare cash on hand, so saving on condoms would be great.'
-							gs'booty_call_condoms', 'npc_condom_use'
+							act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 						end
 					end
 					
 				elseif booty_call['condom_count'] > 0 and booty_call['condoms_used'] < booty_call['condom_count']:
 					'"Yeah, I have some," <<$npc_firstname[$boy]>> says.'
 					gs'booty_call_sex', 'reset'
-					gs'booty_call_condoms', 'npc_condom_use'
+					act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 				else
 					if npc_no_condoms_know[$boy] = 1:
 						'"Come on," <<$npc_firstname[$boy]>> says, rolling his eyes. "You know I hate using condoms. Lucky you can even talk me into using yours."'
@@ -325,7 +325,7 @@ if $ARGS[0] = 'condom_conscious_npc':
 	if booty_call['virgin'] = 1 and booty_call['fuck_count'] = 0:
 		gs 'booty_call_condoms', 'virgin_no_condom'
 	else
-		gs 'booty_call_condoms', 'npc_condom_use'
+		act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 	end
 end
 
@@ -454,7 +454,7 @@ if $ARGS[0] = 'condom_why2':
 					'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
 					'Your jaw drops.'
 					*nl
-					'<i>A free pass to skip a condom and he doesn''t take it? What''s with him??</i>'
+					'<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>'
 				else
 					booty_call['no_condom'] = 1
 					'<<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.'
@@ -473,7 +473,7 @@ if $ARGS[0] = 'condom_why2':
 					'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
 					'Your jaw drops.'
 					*nl
-					'<i>A free pass to skip a condom and he doesn''t take it? What''s with him??</i>'
+					'<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>'
 				else
 					booty_call['no_condom'] = 1
 					'<<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.'
@@ -518,12 +518,12 @@ if $ARGS[0] = 'no_condom1':
 		if stat['dangerous_day'] = 1 and birth_control['think_safe'] ! 1 and npc_childfree[$boy] > 0:
 			booty_call['condom'] = 1
 			'"What the fuck! Why didn''t you say so!" he says, immediately reaching for a condom.'
-			gs 'booty_call_condoms', 'npc_condom_use'
+			act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 		elseif rand(1,10) < 8:
 			booty_call['condom'] = 1
 			'"Ugh, fine."'
 			'He reaches for a condom.'
-			gs 'booty_call_condoms', 'npc_condom_use'
+			act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 		else
 			booty_call['dont_need_condom'] = 1
 			'"Come on," he complains. "It''ll be fine. Let''s skip it. Just this once."'
@@ -842,7 +842,7 @@ if $ARGS[0] = 'disable_condoms_options1':
 				'Your jaw drops.'
 				*nl
 				'<i>Son of a bitch! Why is this guy so fucking careful?!</i>'
-				gs 'booty_call_condoms', 'npc_condom_use'
+				act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 			else
 				booty_call['no_condom'] = 1
 				npc_bareback[$boy] = 1
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'reenable_condoms2':
 				'"Do you mind if we use yours today?"'
 				'"Not at all," he says, reaching for a condom from his nightstand and you feel happy that this didn''t turn into a big deal.'
 			end
-			gs'booty_call_condoms', 'npc_condom_use'
+			act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 		end
 		
 		if prezik > 0:
@@ -1192,8 +1192,8 @@ if $ARGS[0] = 'npc_no_condom_react':
 		'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaching back for the condom. "Better to be safe."'
 		'Your jaw drops.'
 		*nl
-		'<i>A free pass to go bareback forever and he doesn''t take it? What''s with him??</i>'
-		gs 'booty_call_sex', 'npc_condom_use'
+		'<i>A free pass to go bareback forever and he doesn''t take it? What''s with this guy?</i>'
+		act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 	else
 		booty_call['no_condom'] = 1
 		npc_bareback[$boy] = booty_call['temp_bareback']
@@ -1214,8 +1214,8 @@ if $ARGS[0] = 'npc_temp_no_condom_react':
 		'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaching back for the condom. "Better to be safe."'
 		'Your jaw drops.'
 		*nl
-		'<i>A free pass to go bareback and he doesn''t take it? What''s with him??</i>'
-		gs 'booty_call_sex', 'npc_condom_use'
+		'<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>'
+		act'Continue':gs 'booty_call_condoms', 'npc_condom_use'
 	else
 		booty_call['no_condom'] = 1
 		'"This is going to feel so good," <<$npc_firstname[$boy]>> says and your smile widens into a full blown grin.'

locations/booty_call_favorite_part.qsrc

@@ -620,6 +620,7 @@ if $ARGS[0] = 'pussyeat_favorite':
 		else
 			'"You didn''t have to," he smirks back. "I could tell by the way you were screaming my name."'
 		end
+		gs'booty_call_pillow_talk', 'topics'
 	end
 	
 	gs'booty_call_pillow_talk', 'kuni_wear_out'

locations/booty_call_morning.qsrc

@@ -517,8 +517,12 @@ if $ARGS[0] = 'wakeup1':
 		
 		act'Let me cook instead':
 			cla & *nl
-			'"Please, allow me," you smile, getting out of bed and making your way to his kitchen. "Least I can do for letting me sleep over is make you breakfast."'
-			
+			if booty_call['get_up'] = 0:
+				'"Please, allow me," you smile, moving to get out of bed. "It''s the least I can do for letting me sleep over."'
+			else
+				'"Please, allow me," you smile. "It''s the least I can do for letting me sleep over."'
+			end
+			act'Make breakfast':gt'booty_call_morning', 'pc_make_breakfast'
 		end
 		
 		if booty_call['morning_fuck'] = 0:

locations/booty_call_shower.qsrc

@@ -1206,7 +1206,7 @@ if $ARGS[0] = 'morning_look1':
 		'"Thanks," you smile, casually walking past him and closing the door behind you.'
 		act'Take a shower':gt'booty_call_morning', 'shower2'
 	end
-	act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_morning', 'shower'
+	act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_morning', 'morning_shower_join1'
 end
 
 if $ARGS[0] = 'morning_shower_join1':