Merge remote-tracking branch 'hornguy6/master'

locations/booty_call_after.qsrc

@@ -1408,8 +1408,10 @@ if $ARGS[0] = 'plan_b2':
 	
 	act'Take it sexily':
 		cla & *nl
-		'As <<$npc_firstname[$boy]>> watches you pull the pill from its packaging, you 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':
+		'As <<$npc_firstname[$boy]>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.'
+		if booty_call['accidental_creampie_convo'] = 1:
+			'"There," you smirk. "Problem solved."'
+		elseif $booty_call['last_cum'] = 'swallow':
 			'"Chaser," you wink.'
 		elseif age < 20:
 			'"Not really looking to become a teen mom," you smirk.'
@@ -2135,11 +2137,11 @@ if $ARGS[0] = 'dress_loop':
 		gs'clothing', 'wear_last_worn'
 		jump 'dress_loop_start'
 	elseif $clothingworntype ! 'nude' and booty_call['dress_end'] ! 1:
-		if CloDress = 1 and $booty_call['dress_top_wear'] ! 1 and $booty_call['dress_skirt_wear'] ! 1:
-			if $booty_call['dress_top_wear'] ! 1:
+		if CloDress = 1 and (booty_call['dress_top_wear'] ! 1 or booty_call['dress_skirt_wear'] ! 1):
+			if booty_call['dress_top_wear'] ! 1:
 				booty_call['dress_top_wear'] = 1
 				$booty_call['dress_describe'] = 'pulling your dress over your shoulders'
-			elseif $booty_call['dress_skirt_wear'] ! 1:
+			elseif booty_call['dress_skirt_wear'] ! 1:
 				booty_call['dress_skirt_wear'] = 1
 				booty_call['dress_end'] = 1
 				$booty_call['dress_describe'] = 'smoothing your skirt out'

locations/booty_call_reactions.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'creampie_safe_day':
 				end
 			end
 		elseif stat['probably_safe_day'] = 1:
-			act'It''s should be a safe day':
+			act'It should be a safe day':
 				cla
 				act'Reassurance':
 					cla & *clr
@@ -429,7 +429,7 @@ if $ARGS[0] = 'creampie_ask_next_time_mad2':
 end
 
 if $ARGS[0] = 'cum_together_no_bc1':
-	if booty_call['creampie_ask'] = 0 and booty_call['he_ask_creampie_yes'] ! 1 and (npc_free_creampies[$boy] = 0 or (npc_free_creampies[$boy] = 1 and booty_call['danger_day'] = 1)):
+	if booty_call['creampie_ask'] = 0 and booty_call['he_ask_creampie_yes'] ! 1 and (npc_free_creampies[$boy] = 0 or (npc_free_creampies[$boy] = 1 and stat['dangerous_day'] = 1)):
 		act'Be careful (pregnancy)':
 			cla
 			if pillcon2 > 0:

locations/booty_call_sex.qsrc

@@ -732,7 +732,7 @@ if $ARGS[0] = 'ciga_break':
 						booty_call['cock_remove'] = 1
 						if $booty_call['last_cum'] = 'creampie':
 							'You finally pull apart, immediately feeling <<$npc_firstname[$boy]>>''s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
-						else
+						elseif $booty_call['last_cum'] = 'condom':
 							'You finally pull apart, letting <<$npc_firstname[$boy]>>''s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
 						end
 					end
@@ -742,7 +742,7 @@ if $ARGS[0] = 'ciga_break':
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 					if $booty_call['last_cum'] = 'creampie':
 						'You finally pull apart, immediately feeling <<$npc_firstname[$boy]>>''s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.'
-					else
+					elseif $booty_call['last_cum'] = 'condom':
 						'You finally pull apart, letting <<$npc_firstname[$boy]>>''s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.'
 					end
 					*nl
@@ -1036,7 +1036,7 @@ if $ARGS[0] = 'sleep_sex':
 		$booty_call['sleep_video1']
 		'<i>Mmmmmmm...</i>'
 		*nl
-		'"It''s a nice dream. You''re rocking back and forth on a hammock on the water. There''s a thick pillow between your legs and everything feels so comfy.'
+		'It''s a nice dream. You''re rocking back and forth on a hammock on the water. There''s a thick pillow between your legs and everything feels so comfy.'
 		act'Keep dreaming':
 			cla & *clr
 			$booty_call['sleep_video2']
@@ -1063,7 +1063,7 @@ if $ARGS[0] = 'sleep_sex':
 		$booty_call['sleep_video1']
 		'<i>Nnngh...</i>'
 		*nl
-		'"It''s a horrid dream. The town has declared you''re a witch and are to be impaled and then burned at the stake. You can already feel it stabbing between your legs.'
+		'It''s a horrid dream. The town has declared you''re a witch and are to be impaled and then burned at the stake. You can already feel it stabbing between your legs.'
 		act'Keep dreaming':
 			cla & *clr
 			$booty_call['sleep_video2']
@@ -1090,7 +1090,7 @@ if $ARGS[0] = 'sleep_sex':
 		$booty_call['sleep_video1']
 		'<i>Mmmmmmm...</i>'
 		*nl
-		'"It''s a <i>good</i> dream. You''re rocking back and forth on a your fuckbuddy''s cock, riding him like there''s no tomorrow as it fills your pussy in all the right ways.'
+		'It''s a <i>good</i> dream. You''re rocking back and forth on a your fuckbuddy''s cock, riding him like there''s no tomorrow as it fills your pussy in all the right ways.'
 		act'Keep dreaming':
 			cla & *clr
 			$booty_call['sleep_video2']
@@ -1121,7 +1121,7 @@ if $ARGS[0] = 'sleep_sex':
 		$booty_call['sleep_video1']
 		'<i>Mmmmmmm...</i>'
 		*nl
-		'"It''s a weird dream. You''re suspended in a giant block of Jello. You can''t move your arms or your legs, but you can breath, and the jelly is alive somehow. You can feel it pulsing between your thighs. In fact, it almost feels like its inside you.'
+		'It''s a weird dream. You''re suspended in a giant block of Jello. You can''t move your arms or your legs, but you can breath, and the jelly is alive somehow. You can feel it pulsing between your thighs. In fact, it almost feels like its inside you.'
 		act'Keep dreaming':
 			cla & *clr
 			$booty_call['sleep_video2']

locations/booty_call_shower.qsrc

@@ -1387,6 +1387,7 @@ end
 
 if $ARGS[0] = 'morning_together_sex1':
 	act'Leave it there':
+		booty_call['npc_morning_shower'] = 2
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
 		gs 'arousal', 'foreplay', 10
@@ -1743,6 +1744,7 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 end
 
 if $ARGS[0] = 'morning_sex_end':
+	booty_call['npc_morning_shower'] = 2
 	act'Finish up':
 		cla
 		act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'

locations/booty_call_talk.qsrc

@@ -26,18 +26,18 @@ if $ARGS[0] = 'boy_accidental_creampie2':
 			act'I should be':
 				cla & *nl
 				if $booty_call['convo'] = 'used_all_condoms':
-					'"It''s a safe day," you nod. "I''ll be okay. This time anyways," you smile teasingly.'
+					'"It''s a safe day," you nod. "I should be okay. This time anyways," you smile teasingly.'
 				else
-					'"I should be. It''s a safe day, so I''ll be okay. This time anyways," you smile teasingly.'
+					'"It''s a safe day, so I should be okay," you smile teasingly.'
 				end
 				gs'booty_call_pillow_talk', 'topics'
 			end
 		elseif stat['probably_safe_day'] = 1:
 			act'I think so':
 				if $booty_call['convo'] = 'used_all_condoms':
-					'"I think so," you say. "I should be a safe day for me as long as I''m keeping track of my cycle correctly..."'
+					'"I think so," you say. "It <i>should</i> be a safe day for me as long as I''m keeping track of my cycle correctly..."'
 				else
-					'"I think so," you say. "I should be a safe day for me as long as I''m keeping track of my cycle correctly..."'
+					'"I think so," you say. "It <i>should</i> be a safe day for me as long as I''m keeping track of my cycle correctly..."'
 				end
 				gs'booty_call_pillow_talk', 'topics'
 			end