Merge remote-tracking branch 'hornguy6/master'

locations/booty_call_after.qsrc

@@ -2261,7 +2261,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 			$npc_apt_bedroom[$boy]
 			'"The truth is, I''ve started seeing somebody. The sex has been good, but..." You shake your head, grabbing your purse. "I can''t keep doing this. I don''t want to fuck things up."'
 			if npc_fidelity[$boy] < 7:
-				'"Come on," he says. "We''re just having fun. It''s not cheating if it''s just physical. When you masturbate in the shower, it''s not cheating on him with your showerhead are you?"'
+				'"Come on," he says. "We''re just having fun. It''s not cheating if it''s just physical. When you masturbate in the shower, you''re not cheating on him with your showerhead are you?"'
 				act'No means no':
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
@@ -2275,7 +2275,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 				act'Well...':
 					cla & *nl
 					'You pause, biting your lip in consideration.'
-					act'As long as it''s just phsyical':
+					act'As long as it''s just physical':
 						cla & *clr
 						$npc_apt_bedroom[$boy]
 						'"Well..." you say slowly. "As long as it''s <i>just</i> physical..."'

locations/hookup_after.qsrc

@@ -11,7 +11,8 @@ if $ARGS[0] = 'exit':
 	gs 'npcpreservec', $boy
 	if hookup['fuckbuddy'] > 0:
 		know_virgin[$boy] = hookup['virgin']
-		gs 'lover', 'add fuckbuddy',$npclastsaved
+		gs 'lover', 'add fuckbuddy',$boy
+		npc_fuckbuddy[$boy] = 1
 	end
 	
 	killvar 'hookup'

locations/hookup_morning.qsrc

@@ -43,8 +43,8 @@ if $ARGS[0] = 'morning':
 	
 	act'Confusion':gs'hookup_morning','confused'
 	
-!!	if pcs_lovers - pcs_girlfriends > 0:act'Your boyfriend':gt'hookup_morning','guilt1'
-!!	if pcs_girlfriends > 0:act'Your girlfriend':gt'hookup_morning','guilt1'
+	if pcs_lovers - pcs_girlfriends > 0:act'Your boyfriend':$hookup['cheat'] = 'boyfriend' & gt'hookup_morning','guilt1'
+	if pcs_girlfriends > 0:act'Your girlfriend': $hookup['cheat'] = 'girlfriend' & gt'hookup_morning','guilt1'
 end
 
 if $ARGS[0] = 'yawn_wake':
@@ -194,15 +194,19 @@ end
 
 if $ARGS[0] = 'guilt1':
 	cla & *clr
-	if stat['bf_cheated_on'] <= 10:
+	if stat['infidelity'] <= 10:
 		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock1.mp4"></video></center>'
 		'You bolt upright as a lance of guilt pierces through you.'
-		'<i>My boyfriend...</i> you think.'
+		'<i>My <<$hookup[''cheat'']>>...</i> you think.'
 		act'Wallow':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
 			'Throwing your legs over the side of the bed, you sit up, hands on your knees, breathing hard in your guilt-driven panic.'
-			'<i>I just cheated on my boyfriend...</i>'
+			if stat['infidelity'] = 1:
+				'<i>I just cheated on my <<$hookup[''cheat'']>>...</i>'
+			else
+				'<i>I cheated on my <<$hookup[''cheat'']>> again...</i>'
+			end
 			'Your thoughts wander through the previous night''s events.'
 			*nl
 			'<i>Going home with a stranger...</i>'
@@ -219,23 +223,50 @@ if $ARGS[0] = 'guilt1':
 			end
 			*nl
 			'You feel sick to your stomach...'
-			act'Continue':gt'hookup_morning','guilt2'
+			gs'hookup_morning','guilt_excuses'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/wakeup1.jpg"></center>'
 		'Your eyes snap open as your thoughts settle on one thing.'
-		'<i>My boyfriend...</i> you think.'
+		'<i>My <<$hookup[''cheat'']>>...</i> you think.'
 		act'Wallow':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
 			'You sit up, throwing your legs over the side of the bed as the shame flows through you.'
-			'It''s nothing you haven''t felt before. This isn''t the first time you''ve cheated on someone with a stranger. It''s not the second time. It''s not even the tenth time. But somehow, the crippling guilt always feels the same.'
-			*nl
-			'<i>You''re just a dirty whore who can''t keep her legs closed...</i>'
-			*nl
+			'It''s nothing you haven''t felt before. This isn''t the first time you''ve cheated on someone with a stranger. It''s not the second time. It''s not even the tenth time. You''ve lost count by now. But somehow, the crippling guilt always feels the same.'
+			gs'hookup_morning','guilt_excuses'
+		end
+	end
+end
+
+if $ARGS[0] = 'guilt_excuses':
+	act'It''s not your fault':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+		'<i>It''s not my fault,</i> you try to rationalize. <i>I have needs. Sexual needs. He preyed on that. He seduced me. I''m a victim here...</i>'
+		*nl
+		'They ring hollow in your ears.'
+		gs'hookup_morning','guilt2'
+	end
+	
+	act'It''s just sex':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+		'<i>It''s just sex,</i> you try to rationalize. <i>It''s not like I''m falling in love with <<$npc_firstname[$boy]>> or anything. It''s not cheating. It''s just sex..</i>.'
+		gs'hookup_morning','guilt2'
+	end
+	
+	act'You''re a whore':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock3.mp4"></video></center>'
+		'You scold yourself internally, screaming insults that impale your own soul.'
+		*nl
+		'<i>You slut! Jumping any random cock that comes your way. You''re nothing but a filthy whore...</i>'
+		*nl
+		if stat['bf_cheated_on'] > 10:
 			'You breathe deeply, letting the pain take its course, waiting for it to subside. It''s nothing you haven''t felt before...'
-			act'Continue':gt'hookup_morning','guilt2'
 		end
+		act'Continue':gt'hookup_morning','guilt3'
 	end
 end
 
@@ -255,10 +286,10 @@ if $ARGS[0] = 'guilt2':
 	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?"'
+			'"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What''s up? Something wrong?"'
 			act'It''s nothing':
 				cla & *nl
-				'"It''s nothing," you shrug, pushing your shameful feelings down.'
+				'"It''s nothing," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
 				gs'hookup_morning','wakeup'
 			end
 			
@@ -267,7 +298,7 @@ if $ARGS[0] = 'guilt2':
 			'"Hey," he stretches, looking over at you. "You just wake up too?"'
 			act'Yeah':
 				cla & *nl
-				'"Yeah," you mumble back, pushing your shameful feelings down.'
+				'"Yeah," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
 				gs'hookup_morning','wakeup'
 			end
 		end

locations/stat.qsrc

@@ -1313,7 +1313,7 @@ end
 
 !!--------------------------Booty Call SMSs--------------------------------
 
-if (hour >= 15 and hour <= 20) and arrsize('$fuckbuddy') > 0 : gs 'booty_call', 'SMS raiser'
+if arrsize('$FuckBuddy') > 0  and hour > 1: gs 'booty_call', 'SMS raiser'
 
 --- stat ---------------------------------