Merge remote-tracking branch 'hornguy6/master'

locations/booty_call_morning.qsrc

@@ -365,113 +365,81 @@ if $ARGS[0] = 'kiss_wake':
 		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.'
-		if npc_end_free_time <= hour + 2:
-			booty_call['npc_late_work'] = 1
-			'"Nngh," he grunts as you start sucking his cock. "I''m gonna be late for work..."'
-			act'Too bad (stop)':
-				cla & *clr
-				'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
-				'You give <<$npc_firstname[$boy]>> one more good suck before you withdraw your lips.'
-				'"Too bad then," you smirk, teasing his cock with your hand while you savour his taste. "Guess it''ll have to wait until later."'
-				gs'booty_call_morning', 'wakeup1'
-			end
-			
-			act'I''ll be fast':
-				booty_call['morning_fuck'] = 1
-				booty_call['extra_cum'] += npc_sexdrive[$boy]
-				cla & *clr
-				'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
-				'You give <<$npc_firstname[$boy]>> one more good suck before you withdraw your lips to speak.'
-				'"Don''t worry," you say, working his cock with your hand as a smirk spreads across your lips. "I''ll be fast."'
-				'And you wrap your lips back around his shaft.'
-				act'Continue':gt'booty_call_start', 'bj_dom2'
-			end
-		else
-			'"Nngh," he grunts as you give his tip a slurpy suck. "That feels great..."'
-			act'Keep blowing him':
-				cla & *clr
-				'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
-				booty_call['morning_fuck'] = 1
-				booty_call['extra_cum'] += npc_sexdrive[$boy]
-				'"Good," you say, letting his cock pop from your mouth as a smirk spreads across your face. And then you wrap your lips back around his shaft.'
-				act'Continue':gt'booty_call_start', 'bj_dom2'
-			end
-			
-			act'Fuck him':
-				cla & *clr
-				'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
-				booty_call['morning_fuck'] = 1
-				booty_call['extra_cum'] += npc_sexdrive[$boy]
-				'"Bet I can make you feel even better," you say, letting his cock pop from your mouth as a smirk spreads across your face and you climb on top to straddle him.'
-				act'Ride him gently':gt 'booty_call_cowgirl', 'cowgirl1'
-				act'Ride him steadily':gt 'booty_call_cowgirl', 'cowgirl2'
-				act'Ride him hard':gt 'booty_call_cowgirl', 'cowgirl3'
-			end
-		end
+		*nl
+		gs'booty_call_morning', 'bj_wake'
 	end
 end
 
 if $ARGS[0] = 'bj_wake':
 	booty_call['boy_asleep'] = 0
 	gs'arousal', 'bj', 1, 'no_orgasm_msg'
-	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
-	'You slither under the covers and wrap your lips around <<$npc_firstname[$boy]>>''s already hard cock.'
-	if $npc_fav_pos[$boy] = 'blowjob' or rand(1,10) < npc_sexdrive[$boy]:
-		'"Nngh... that feels great..." he moans sleepily.'
-		act'Stop':
-			npc_rel[$boy] -= 3
+	if npc_end_free_time <= hour + 2:
+		booty_call['npc_late_work'] = 1
+		'"Nngh," he grunts as you start sucking his cock. "I''m gonna be late for work..."'
+		act'Too bad (stop)':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
-			'You pull away, working his cock with your hand.'
-			'"Just getting you up on time," you grin, letting go with one more teasing jerk.'
-			'"Ungh, you bitch," he grumbles.'
-			gs 'booty_call_morning', 'wakeup1'
+			'You give <<$npc_firstname[$boy]>> one more good suck before you withdraw your lips.'
+			'"Too bad," you smirk, teasing his cock with your hand while you savour his taste. "Guess it''ll have to wait until later."'
+			gs'booty_call_morning', 'wakeup1'
 		end
 		
-		act'Want me to keep going?':
+		act'I''ll be fast':
+			booty_call['morning_fuck'] = 1
+			booty_call['extra_cum'] += npc_sexdrive[$boy]
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
-			'"Want me to keep going?" you ask pulling your lips away with a teasing pop.'
-			'"Fuck yes," he groans and you get back to work.'
-			act'Continue':gt'booty_call_start', 'bj_dom2'
-		end
-		
-		act'Keep sucking':
-			cla & *nl
-			'"Mmmm," you hum around the cock in your mouth, sending shivers through his body that you can feel between your lips. You never stop sucking.'
+			'You give <<$npc_firstname[$boy]>> one more good suck before you withdraw your lips to speak.'
+			'"Don''t worry," you say, working his cock with your hand as a smirk spreads across your lips. "I''ll be fast."'
+			'And you wrap your lips back around his shaft.'
 			act'Continue':gt'booty_call_start', 'bj_dom2'
 		end
 	else
-		'"Nngh... Hey... what are you doing...?" he groans sleepily.'
 		act'Stop':
 			npc_rel[$boy] -= 3
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
 			'You pull away, working his cock with your hand.'
-			'"Just getting you up on time," you grin, letting go with one more teasing jerk.'
-			'"Ungh, you bitch," he grumbles.'
+			'"Just making sure you''re fully awake," you grin, letting go with one more teasing jerk.'
+			'"Ungh, you teasing bitch," he grumbles.'
 			gs 'booty_call_morning', 'wakeup1'
 		end
-		
-		act'Best wakeup in the world':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
-			'"Just giving you the best wakeup call in the world," you grin pulling your lips away with a teasing pop. "Want me to stop?"'
-			'"Fuck no," he groans and you get back to work.'
-			act'Continue':gt'booty_call_start', 'bj_dom2'
-		end
-		
-		act'Guess':
-			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
+		if $npc_fav_pos[$boy] = 'blowjob' or rand(1,10) < npc_sexdrive[$boy] or booty_call['boy_asleep'] = 0:
+			'"Nngh... that feels great..." he moans sleepily.'
+			act'Want me to keep going?':
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
+				'"Want me to keep going?" you ask pulling your lips away with a teasing pop.'
+				'"Fuck yes," he groans and you get back to work.'
+				act'Continue':gt'booty_call_start', 'bj_dom2'
+			end
+			
+			act'Keep sucking':
+				cla & *nl
+				'"Mmmm," you hum around the cock in your mouth, sending shivers through his body that you can feel between your lips. You never stop sucking.'
+				act'Continue':gt'booty_call_start', 'bj_dom2'
+			end
+		else
 			'"Nngh... Hey... what are you doing...?" he groans sleepily.'
-			'You pull your lips away with a pop and stare <<$npc_firstname[$boy]>> straight in the eye.'
-			*nl
-			'"Guess."'
-			*nl
-			'Without waiting for a response you start running your tongue up and down his shaft and peppering it with kisses before swallowing it whole again.'
-			act'Continue':gt'booty_call_start', 'bj_dom2'
+			act'Best wakeup in the world':
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
+				'"Just giving you the best wakeup call in the world," you grin pulling your lips away with a teasing pop. "Want me to stop?"'
+				'"Fuck no," he groans and you get back to work.'
+				act'Continue':gt'booty_call_start', 'bj_dom2'
+			end
+			
+			act'Guess':
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
+				'"Nngh... Hey... what are you doing...?" he groans sleepily.'
+				'You pull your lips away with a pop and stare <<$npc_firstname[$boy]>> straight in the eye.'
+				*nl
+				'"Guess."'
+				*nl
+				'Without waiting for a response you start running your tongue up and down his shaft and peppering it with kisses before swallowing it whole again.'
+				act'Continue':gt'booty_call_start', 'bj_dom2'
+			end
 		end
 	end
 end
@@ -640,7 +608,12 @@ if $ARGS[0] = 'wakeup1':
 		end
 		
 		if booty_call['boy_asleep'] = 1 and booty_call['breakfast_eat'] = 0:
-			act'Wake <<$npc_firstname[$boy]>> with a blowjob':gt'booty_call_morning', 'bj_wake'
+			act'Wake <<$npc_firstname[$boy]>> with a blowjob':
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
+				'You slither under the covers and wrap your lips around <<$npc_firstname[$boy]>>''s already hard cock.'
+				gs'booty_call_morning', 'bj_wake'
+			end
 		end
 	!!	act'Snuggle back into bed':
 	end
@@ -1833,7 +1806,7 @@ if $ARGS[0] = 'pc_make_breakfast_done':
 			else
 				'"Coffee''s ready," you say, turning around to walk two steaming mugs back to <<$npc_firstname[$boy]>>.'
 			end
-			act'Drink your coffee':gt'booty_call_morning', 'eat_breakfast'
+			act'Drink your coffee':gt'booty_call_morning', 'eat_breakfast1'
 		else
 			if booty_call['boy_asleep'] = 1 and booty_call['wake_fuck'] = 0 and booty_call['morning_fuck'] = 0:
 				'<<$npc_firstname[$boy]>> begins to stir in bed, blearily blinking at you.'

locations/hookup.qsrc

@@ -1188,7 +1188,7 @@ if $ARGS[0] = 'lick_pussy':
 						'"I can certainly tell," you say, looking pointedly at his erection.'
 						gs'hookup_after','pre'
 					end
-					if pcs_vag > 0 and hookup['bj'] < 2:
+					if (pcs_vag > 0 and stat['think_virgin'] ! 0) and hookup['bj'] < 2:
 						act'Round 2?':
 							cla & *clr
 							'<center><video autoplay loop src="images/shared/sex/misc/round2.mp4"></video></center>'
@@ -1214,12 +1214,12 @@ if $ARGS[0] = 'lick_pussy':
 						'"Yeah, I think I''m done too. My tongue is tired."'
 						gs'hookup_after','pre'
 					end
-					if hookup['bj'] < 2 and hookup['virgin'] = 0:
+					if (pcs_vag > 0 and stat['think_virgin'] ! 0) and hookup['bj'] < 2:
 						act'Round 2?':
 							cla & *clr
 							'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
 							$npc_apt_bedroom[$boy]
-							'"Thanks for returning the favor," you smile at <<$npc_firstname[$boy]>> tiredly, eyeing his rejuvinated hardon. "But we still haven''t fucked yet. How ''bout it? Ready for round 2?"'
+							'"Thanks for returning the favor," you smile at <<$npc_firstname[$boy]>> tiredly, eyeing his rejuvenated hardon. "But we still haven''t fucked yet. How ''bout it? Ready for round 2?"'
 							'"I think I can manage that," he smiles back.'
 							gs'hookup','condoms'
 							gs'hookup','position_choose'

locations/hookup_after.qsrc

@@ -1751,7 +1751,7 @@ if $ARGS[0] = 'pc_date_request':
 				*nl
 				'"I won''t," you promise.'
 			end
-			'That bit of business done, you cheerfullly wave him goodbye and head out the door.'
+			'That bit of business done, you cheerfully wave him goodbye and head out the door.'
 			act'Leave':gt 'hookup_after', 'exit'
 		end
 	end
@@ -1875,7 +1875,7 @@ if $ARGS[0] = 'fuckbuddy_text':
 		*nl
 		'"We''ll see about that," you roll your eyes back. "Anyways, see you around."'
 	end
-	'That little exchange done, you cheerfullly wave him goodbye and head out the door.'
+	'That little exchange done, you cheerfully wave him goodbye and head out the door.'
 end
 
 
@@ -1908,6 +1908,7 @@ end
 if $ARGS[0] = 'have_a_boyfriend':
 	if pcs_lovers - pcs_girlfriends > 0:
 		act'I have a boyfriend':
+			npc_know_girlfriend[$boy] = 0
 			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.'
@@ -1937,6 +1938,7 @@ end
 if $ARGS[0] = 'have_a_girlfriend':
 	if pcs_girlfriends > 0:
 		act'I have a girlfriend':
+			npc_know_girlfriend[$boy] = 1
 			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.'
@@ -1952,7 +1954,10 @@ if $ARGS[0] = 'have_a_girlfriend':
 					act'So long as you know':
 						cla & *clr
 						$npc_apt_bedroom[$boy]
-						'"Nice try but no," you grimace, and pick up the rest of your things and head out the door.'
+						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