Merge remote-tracking branch 'hornguy6/master'

locations/booty_call_cum.qsrc

@@ -292,11 +292,11 @@ if $ARGS[0] = 'fuck_cum':
 		end
 		
 		if booty_call['condom'] = 1 and booty_call['no_condom'] ! 1:
-			if booty_call['he_ask_creampie'] = 1:
-				act'Come together':gs 'booty_call_cum', 'cum_condom'
-			else
+		!!	if booty_call['he_ask_creampie'] = 1:
+		!!		act'Come together':gs 'booty_call_cum', 'cum_condom'
+		!!	else
 				act'Let him come in the condom':gt 'booty_call_cum', 'cum_condom'
-			end
+		!!	end
 		else
 			!!if booty_call['orgasm'] < orgasm or pcs_horny >= 85:
 			if booty_call['orgasm'] < orgasm:
@@ -860,7 +860,7 @@ if $ARGS[0] = 'cum_mouth':
 		'You keep your lips wrapped tight around the tip of <<$npc_firstname[$boy]>>''s cock while he comes, sucking every last drop of spunk from it until it stops twitching and you think his orgasm if finished. Looking up at him, you stick out your tongue, showing him the entire load you gathered in your mouth.'
 		act'Spit':
 			$booty_call['cum_describe1'] = 'Thanks,'
-			$booty_call['cum_describe2'] = 'wiping your mouth.'
+			$booty_call['cum_describe2'] = 'wiping your mouth'
 			booty_call['spit'] = 1
 			booty_call['spit_count'] += 1
 			$booty_call['last_cum'] = 'spit'
@@ -874,7 +874,7 @@ if $ARGS[0] = 'cum_mouth':
 		
 		act'Swallow':
 			$booty_call['cum_describe1'] = 'Thanks,'
-			$booty_call['cum_describe2'] = 'wiping your mouth.'
+			$booty_call['cum_describe2'] = 'wiping your mouth'
 			booty_call['swallow'] = 1
 			booty_call['swallow_count'] += 1
 			$booty_call['last_cum'] = 'swallow'
@@ -1460,8 +1460,8 @@ if $ARGS[0] = 'cum_pullout':
 	if booty_call['pullout_ask'] = 1:
 		!! differing descriptions based on position
 		if $booty_call['position'] = 'miss':
-			$booty_call['cum_choice'] = 'pullout'
 			booty_call['cum_stomach'] += 1
+			$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			gs'cum_call', 'stomach',$boy,1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			'"Pull out!"'
@@ -1471,22 +1471,24 @@ if $ARGS[0] = 'cum_pullout':
 			booty_call['cum_back'] += 1
 			gs'cum_call', 'butt',$boy,1
 			gs'cum_call', 'back',$boy,1
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 			'"Pull out!"'
 			*nl
 			'At your words, he yanks himself from your pussy and begins furiously jacking off over your ass. Moments later, you feel hot viscious liquid spatter all over it and across your back.'
 		elseif $booty_call['position'] = 'cowgirl':
-			$booty_call['cum_choice'] = 'ass'
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			gs'cum_call', 'butt',$boy,1
 			booty_call['cum_ass'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 			'"Pull out!"'
 			*nl
-			'At your words, you jump off his cock and reach behind you to grab it with your hand, furiously jerking it. Moments later, you feel hot viscious liquid spatter all over your ass.'
+			'You slip off his cock just in time, as not even a second later you feel hot liquid spatter all over your ass.'
 		end
 	else
 		if $booty_call['position'] = 'miss':
 			gs'cum_call', 'stomach',$boy,1
+			$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			booty_call['cum_stomach'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			if booty_call['not_inside'] = 1:
@@ -1509,6 +1511,7 @@ if $ARGS[0] = 'cum_pullout':
 			gs'cum_call', 'back',$boy,1
 			booty_call['cum_back'] += 1
 			booty_call['cum_ass'] += 1
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 			if booty_call['not_inside'] = 1:
 				'"Not inside me!" you yelp frantically.'
@@ -1525,6 +1528,7 @@ if $ARGS[0] = 'cum_pullout':
 			if booty_call['not_inside'] = 1:
 				gs'cum_call', 'stomach',$boy,1
 				booty_call['cum_stomach'] += 1
+				$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 				'"Not inside me!" you yelp frantically.'
 				*nl
@@ -1534,11 +1538,11 @@ if $ARGS[0] = 'cum_pullout':
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. Moments later, he ejaculates, sending cum spattering across your belly.'
 				end
 			else
-				$booty_call['cum_choice'] = 'pullout'
 				gs'cum_call', 'butt',$boy,1
 				gs'cum_call', 'back',$boy,1
 				booty_call['cum_back'] += 1
 				booty_call['cum_ass'] += 1
+				$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 				if booty_call['condom'] = 1:
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. He rips the condom off his cock and moments later, he ejaculates, sending cum spattering across your belly.'

locations/foto_models2.qsrc

@@ -824,7 +824,7 @@ if $ARGS[0] = 'jeff_modelling':
 	act'Continue':
 		if jeff['model'] = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy.jpg"></center>'
 			'"Whooo! Yipee!"'
 			'You find her in the middle of a photoshoot and she''s jumping up and down on the bed kicking her legs and striking poses mid air.'
 			'The photographer seems really excited saying, "Yes! I love that Jeff! Do you think you can do that again but get your leg higher so we can get a better look at your pussy?"'

locations/hookup_after.qsrc

@@ -1813,6 +1813,7 @@ if $ARGS[0] = 'npc_date_request':
 			'"I won''t," you promise.'
 		end
 		'Your little exchange done, you wave him goodbye and head out the door.'
+		act'Leave':gt 'hookup_after', 'exit'
 	end
 	act'I''m not up for anything serious':
 		cla & *clr

locations/hookup_morning.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'confused':
 	'What happened last night...? You blink blearily, looking around, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
 	*nl
 	'That''s right! You hooked up with a guy last night and accidentally fell asleep in his bed...'
-	if npc_earlyriser[$boy] = 1:
+!!	if npc_earlyriser[$boy] = 1:
 		act'... <i>his</i> bed...?':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'confused':
 			'"Yeah," you mumble back.'
 			gs'hookup_morning','wakeup'
 		end
-	elseif npc_latesleeper[$boy] = 1:
+!!{	elseif npc_latesleeper[$boy] = 1:
 		act'What was his name?':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -186,7 +186,7 @@ if $ARGS[0] = 'confused':
 		end
 	else
 		
-	end
+	end}
 	if mid($start_type,1,2) = 'sg':
 		act'Mom!':gt'hookup_morning','mom'
 	end
@@ -241,7 +241,7 @@ end
 
 if $ARGS[0] = 'guilt2':
 	'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-	if npc_earlyriser[$boy] = 1:
+!!{	if npc_earlyriser[$boy] = 1:
 		!! for later: create option for him to burst in with breakfast in bed
 		if npc_apt_type[$boy] = 2:
 			'The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'guilt2':
 		end
 	elseif npc_latesleeper[$boy] = 1:
 		'<<$npc_firstname[$boy]>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
-	else
+	else}
 		'<<$npc_firstname[$boy]>> stirs next to you.'
 		if npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1 and rand(1,3) = 3:
 			'"Hey," he mumbles, looking over. "What''s up? Something wrong?"'
@@ -271,7 +271,7 @@ if $ARGS[0] = 'guilt2':
 				gs'hookup_morning','wakeup'
 			end
 		end
-	end
+!!	end
 end
 
 if $ARGS[0] = 'mom':
@@ -660,7 +660,7 @@ end
 	if npc_apt_type[$boy] > 2:
 !!		act'Put your underwear on':
 
-		act'Go explore his place':gt'hookup_morning','explore'
+!!		act'Go explore his place':gt'hookup_morning','explore'
 
 		act'Find the kitchen':