Browse Source

[added] a few new WIP events
[fixed] formatting errors

hornguy6 3 days ago
parent
commit
d11d9735c1

+ 13 - 13
locations/sex_ev_after.qsrc

@@ -1269,7 +1269,7 @@ end
 if $ARGS[0] = 'facial_mouth_clean':
 	if ($sex_ev['last_cum'] = 'facial' or $sex_ev['last_cum'] = 'face_mouth') and sex_ev['boy_in_shower'] ! 1 and sex_ev['boy_asleep'] = 0:
 		act 'Clean him off with your mouth':
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			gs 'stat'
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial24.jpg"></center>'
@@ -1293,7 +1293,7 @@ if $ARGS[0] = 'after_sex1':
 			cla & *clr
 			gs 'sex_ev_after', 'pull_apart'
 			sex_ev['cock_inserted'] = 0
-			if (npc_humor[$npcID] = 1 or npc_humor[$npcID] = 2) and (sex_ev['fuck_count'] >= npc_sexdrive[$npcID] - 1) and rand(0,1) = 1:
+			if ($npc_humor[$npcID] = 'childish' or $npc_humor[$npcID] = 'perverted') and (sex_ev['fuck_count'] >= npc_sexdrive[$npcID] - 1) and rand(0,1) = 1:
 				gs 'sex_ev_pillow_talk', 'high_five1'
 			else
 				gs 'sex_ev_after', 'post_cigarette_boy'
@@ -1308,7 +1308,7 @@ if $ARGS[0] = 'after_sex1':
 			else
 				$sex_ev['bed_room']
 			end
-			if (npc_humor[$npcID] = 1 or npc_humor[$npcID] = 2) and (sex_ev['fuck_count'] >= npc_sexdrive[$npcID] - 1) and rand(0,1) = 1:
+			if ($npc_humor[$npcID] = 'childish' or $npc_humor[$npcID] = 'perverted') and (sex_ev['fuck_count'] >= npc_sexdrive[$npcID] - 1) and rand(0,1) = 1:
 				gs 'sex_ev_pillow_talk', 'high_five1'
 			else
 				gs 'sex_ev_after', 'post_cigarette_boy'
@@ -1782,7 +1782,7 @@ end
 if $ARGS[0] = 'kiss':
 	cla & *clr
 	if cum_loc['face'] <= 0:
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		$orgasm_or = 'no'
 		sex_ev['after_kiss'] = 1
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/kiss1.jpg"></center>'
@@ -1880,7 +1880,7 @@ if $ARGS[0] = 'drink_fluid':
 				else
 					'"Water," you smirk back. "I think I need to rehydrate."'
 				end
-				if $npc_gymrat[$npcID] > 0:
+				if npc_gymrat[$npcID] > 0:
 					iif(sex_ev['rough_fuck'] > 0, '"It was practically a workout," he agrees with no small amount of amusement.', '"Important to stay hydrated after cardio," he chuckles.')
 				else
 					iif(rand(1,2), '"That''s a good idea," he nods.', '"Me too," he huffs tiredly.')
@@ -1930,7 +1930,7 @@ if $ARGS[0] = 'drink_fluid':
 				if $sex_ev['last_cum'] = 'swallow':
 					act 'Vodka (cum chaser)':
 						gs 'drugs ', 'alcohol', 'vodka'
-						if $npc_cum_pref[$npcID] = 'mouth': gs 'npc_relationship', 'modify', $boy, 'love'
+						if $npc_cum_pref[$npcID] = 'mouth': gs 'npc_relationship', 'modify', $npcID, 'love'
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/drink1.jpg"></center>'
 						'"Vodka. I need a chaser after that last shot," you smirk back, licking your lips with a meaningful look.'
@@ -2204,11 +2204,11 @@ end
 
 if $ARGS[0] = 'smoke_link':
 	if sex_ev['smoke_time'] + 5 > totminut and sex_ev['boy_smoke_time'] + 5 > totminut:
-		'You and <<$npc_firstname[$npcID]>> lay together, ' + iif(sex_ev['smoke_react '] = 0, '<a href="exec:gt ''sex_ev_after'',''smoke_ciga_react ''">puffing away on your cigarettes.</a>', 'puffing away on your cigarettes.')
+		'You and <<$npc_firstname[$npcID]>> lay together, ' + iif(sex_ev['smoke_react'] = 0, '<a href="exec:gt ''sex_ev_after'',''smoke_ciga_react''">puffing away on your cigarettes.</a>', 'puffing away on your cigarettes.')
 	elseif sex_ev['smoke_time'] + 5 > totminut:
-		'<<$npc_firstname[$npcID]>> lays next to you while you ' + iif(sex_ev['smoke_react '] = 0, '<a href="exec:gt ''sex_ev_after'',''smoke_ciga_react ''">puff away on your cigarette.</a>', 'puff away on your cigarette.')
+		'<<$npc_firstname[$npcID]>> lays next to you while you ' + iif(sex_ev['smoke_react'] = 0, '<a href="exec:gt ''sex_ev_after'',''smoke_ciga_react''">puff away on your cigarette.</a>', 'puff away on your cigarette.')
 	elseif sex_ev['boy_smoke_time'] + 5 > totminut:
-		'You lay next to <<$npc_firstname[$npcID]>> while he ' + iif(sex_ev['smoke_react '] = 0, '<a href="exec:gt ''sex_ev_after'',''boy_smoking''">puffs away on his cigarette.</a>', 'puffs away on his cigarette.')
+		'You lay next to <<$npc_firstname[$npcID]>> while he ' + iif(sex_ev['smoke_react'] = 0, '<a href="exec:gt ''sex_ev_after'',''boy_smoking''">puffs away on his cigarette.</a>', 'puffs away on his cigarette.')
 	end
 end
 
@@ -2348,10 +2348,10 @@ if $ARGS[0] = 'smoke_phone':
 	gs 'sex_ev_after', 'relax_together'
 end
 
-if $ARGS[0] = 'smoke_ciga_react ':
+if $ARGS[0] = 'smoke_ciga_react':
 	gs 'sex_ev_pillow_talk', 'pillow_picture1'
 	gs 'sex_ev_pillow_talk', 'talk_time_add'
-	sex_ev['smoke_react '] = 1
+	sex_ev['smoke_react'] = 1
 	act 'Smoke in silence':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
@@ -2415,7 +2415,7 @@ if $ARGS[0] = 'boy_smoking':
 				'Taking the cigarette, you inhale deeply, letting the warmth and acridity fill your lungs. After a moment, you exhale slowly letting a plume of smoke out from between your lips.'
 				'"That''s great," you sigh with satisfaction as you take another drag. He looks expectantly at you for a few moments before you take yet a <i>third</i> drag and he realizes he''s not getting it back.'
 				if npc_selfish[$npcID] > 0:
-					gs 'npc_relationship', 'modify', $boy, 'dislike'
+					gs 'npc_relationship', 'modify', $npcID, 'dislike'
 					if npc_ciga_steal[$npcID] > 5:
 						'"Why do you always do this?" <<$npc_firstname[$npcID]>> mutters in irritation as he slaps out another cigarette to replace the one he lost. "Bitch, can''t you just get your own smokes? Why do you have to steal mine?"'
 					else
@@ -2583,7 +2583,7 @@ if $ARGS[0] = 'cuddle_up':
 end
 
 if $ARGS[0] = 'cuddle_up2':
-	if sex_ev['boy_asleep'] = 1 and sex_ev['action_restricted'] = 0:
+	if sex_ev['boy_asleep'] = 1 and sex_ev['action_restricted'] = 0 and sex_ev['morning_after'] = 0:
 		act 'Sleep with <<$npc_firstname[$npcID]>>':
 			cla
 			act 'Nevermind':gt 'sex_ev_after', 'after_sex2_w_picture'

+ 85 - 7
locations/sex_ev_boy_pillow_talk.qsrc

@@ -64,7 +64,8 @@ if $ARGS[0] = 'boy_topic_check':
 	if npc_thinkage[$npcID] = 0 and sex_ev['age_ask_talk'] = 0 and sex_ev['angry_after'] < 1 and sex_ev['mad'] < 1: sex_ev['boy_topics'] += 1
 
 	if sex_ev['cum_count'] > 0 and sex_ev['fuck_count'] > 0 and sex_ev['good_for_you'] ! 1: sex_ev['boy_topics'] += 1
-	if sex_ev['broken_condom'] >= 1 and sex_ev['broken_condom_talk'] ! 1 and (npc_selfish ! 1 and (npc_childfree = 1 or npc_caretaker = 1)): sex_ev['boy_topics'] += 1
+	if sex_ev['broken_condom'] >= 1 and sex_ev['broken_condom_talk'] ! 1 and (npc_selfish[$npcID] ! 1 and (npc_childfree[$npcID] = 1 or npc_caretaker[$npcID] = 1)): sex_ev['boy_topics'] += 1
+!!	if sex_ev['broken_condom'] >= 1 and sex_ev['broken_condom_talk'] ! 1: sex_ev['boy_topics'] += 1
 	if sex_ev['no_condom'] = 0 and sex_ev['fuck_count'] > 0 and npc_no_condoms[$npcID] > 0 and sex_ev['wish_no_condoms_talk'] = 0: sex_ev['boy_topics'] += 1
 !!	if sex_ev['surprise_creampie_count'] >= 1 and sex_ev['creampie_okay'] ! 1: sex_ev['boy_topics'] += 1
 
@@ -92,13 +93,91 @@ end
 
 if $ARGS[0] = 'dont_swallow_talk':
 	sex_ev['boy_topics'] -= 1
-	sex_ev['how_many_fb_talk'] = 1
+	sex_ev['dont_swallow_talk'] = 1
 	gs 'sex_ev_pillow_talk', 'talk_time_add'
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 	'"So you don''t swallow?" <<$npc_firstname[$npcID]>> asks.'
 end
 
+if $ARGS[0] = 'like_cum_talk':
+	sex_ev['boy_topics'] -= 1
+	sex_ev['like_cum_talk'] = 1
+	gs 'sex_ev_pillow_talk', 'talk_time_add'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+	if npc_know_like_cum[$npcID] = 0:
+		'"So... you know how you swallowed my cum earlier?" <<$npc_firstname[$npcID]>> asks.'
+		act'Yeah...?':
+			cla & *nl
+			'"Yeah?" you reply, eyebrow raised, wondering where he''s going with this.'
+			if sex_ev['tasty_cum'] = 1:
+				'"I was wondering... do you really like the taste of it? I mean, I know you said you thought it was tasty earlier, but... do you? Or is that just something you say?"'
+			else
+				'"I was wondering... do you really like the taste of it?"'
+			end
+			gs 'sex_ev_boy_pillow_talk', 'like_cum_talk2'
+		end
+		
+		act'You want to know if I like cum?':
+			cla & *nl
+			'"You want to know if I like the taste of cum, don''t you?"'
+			'<<$npc_usedname[$npcID]>> blinks and you give him a knowing look.'
+			'"Uhh, yeah. How did you know?"'
+			'"All guys want to know if girls like it," you smirk back haughtily.'
+			'"So... do you...?"'
+			gs 'sex_ev_boy_pillow_talk', 'like_cum_talk2'
+		end
+	elseif npc_know_like_cum[$npcID] = 1:
+		'"So you really like the taste of my cum?" <<$npc_firstname[$npcID]>> asks, an oddly eager smile on his face.'
+		
+	elseif npc_know_like_cum[$npcID] = -1:
+		
+	end
+end
+
+ 
+ if $ARGS[0] = 'like_cum_talk2':
+	act'Just say it is because it''s hot':
+		npc_know_like_cum[$npcID] = -1
+		if sex_ev['tasty_cum'] = 1:
+			'"It''s just something I say if I''m being honest," you admit. "I really don''t like the taste all that much. It''s salty and bitter and I kind of have to force it down a little. But guys think it''s sexy when you say it so..."'
+			'You shrug, a slightly guilty smile on your face.'
+		else
+			'"Not really," you admit. "It''s salty and bitter and I kind of have to force it down a little. But guys think it''s sexy when you say it so..."'
+			'You shrug, a slightly guilty smile on your face.'
+		end
+		'"Sorry?"'
+		if npc_caretaker[$npcID] > 0:
+			'"You know you don''t have to swallow if you don''t like it," he says, looking at you a little concerned.'
+			act'Really?':
+				gs 'sex_ev_pillow_talk', 'pillow_picture1', 2
+				gs 'npc_relationship', 'modify', $npcID, 'like'
+				'"Really?" you ask, somewhat surprised.'
+				'"Yeah, really. I don''t want you to feel like you have to do something you don''t like."'
+				'"That''s really sweet of you," you smile back warmly.'
+				'The two of you share an oddly intimate smile given the conversation topic.'
+				gs 'sex_ev_pillow_talk', 'topic_route'
+			end
+			
+			act'No, you want to':
+				gs 'sex_ev_pillow_talk', 'pillow_picture1', 2
+				gs 'npc_relationship', 'modify', $npcID, 'love'
+				'"No," you shake your head. "I want to. If you think it''s hot, I think it''s hot. Even if I don''t like the taste."'
+				'The two of you share an oddly intimate moment, despite the conversation topic.'
+				gs 'sex_ev_pillow_talk', 'topic_route'
+			end
+		else
+			if $npc_humor[$npcID] = 'perverted':
+				'"Well there goes that fantasy," he sighs dramatically, but chuckles afterwards to let you know he''s holding the whole situation in good humor.'			
+			else
+				'"I probably should have expected that," he says ruefully.'
+			end
+			gs 'sex_ev_pillow_talk', 'topic_route'
+		end
+	end
+ end
+ 
  if $ARGS[0] = 'boy_broken_condom':
 	if sex_ev['broken_condom_talk'] = 0 and sex_ev['broken_condom'] >= 1:
 		sex_ev['broken_condom_talk'] = 1
@@ -122,7 +201,7 @@ end
 				end
 
 				act 'Get irritated':
-					gs 'npc_relationship', 'modify', $boy, 'dislike'
+					gs 'npc_relationship', 'modify', $npcID, 'dislike'
 					cla & *nl
 					'"I know, I know," you scowl in irritation. "You don''t have to freaking remind me."'
 					gs 'sex_ev_pillow_talk', 'topic_route'
@@ -940,7 +1019,7 @@ if $ARGS[0] = 'boy_likes_pubes':
 			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk_eyeroll.mp4"></video></center>'
 			'"Well I''m glad I have your permission to shave the way I like it," you huff, acerbically rolling your eyes.'
 			if npc_argumentative[$npcID] = 1:
-				gs 'npc_relationship', 'modify', $boy, 'dislike'
+				gs 'npc_relationship', 'modify', $npcID, 'dislike'
 				'"What the fuck is your problem?" <<$npc_firstname[$npcID]>> growls. "I was trying to pay you a compliment!"'
 				act 'Apologize':
 					cla & *clr
@@ -1012,7 +1091,7 @@ if $ARGS[0] = 'boy_likes_pubes2':
 	end
 
 	act 'Compliment his cock':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *nl
 		if $npc_dick_desc[$npcID] = 'tiny':
 			'"You''ve got some pretty nice equipment yourself," you say, grinning lewdly at his flaccid manhood. "For a guy with a tiny dick, you sure know how to use it."'
@@ -1417,7 +1496,7 @@ if $ARGS[0] = 'age_ask_respond':
 		'"You know what the best thing about teenage girls is?" he grins. "I get older and they stay the same age."'
 		act 'Play into it':
 			cla & *nl
-			gs 'npc_relationship', 'modify', $boy, 'like'
+			gs 'npc_relationship', 'modify', $npcID, 'like'
 			'"That''s the thing about us teenage girls," you reply. "We''re all sex crazed dick addicts who love fucking."'
 			gs 'sex_ev_pillow_talk', 'topic_route'
 		end
@@ -1658,7 +1737,6 @@ if $ARGS[0] = 'boy_bunny_nickname_give':
 	else
 		'"Because you''re so cute," he smiles back. "Like a bunny."'
 	end
-[$npcID]
 end
 
 --- sex_ev_boy_pillow_talk ---------------------------------

+ 21 - 21
locations/sex_ev_condoms.qsrc

@@ -350,7 +350,7 @@ if $ARGS[0] = 'pc_condom_ask2':
 		else
 			'"Could you put on a condom?" you ask.'
 		end
-		if $boy = 'A34':
+		if $npcID = 'A34':
 			gs 'sex_ev_A34', 'kolka_condoms'
 		else
 			if ($npc_cum_pref[$npcID] = 'pullout' or npc_arrogant[$npcID] > 0 or npc_abusive[$npcID] > 0 or npc_risktaker[$npcID] > 0) and npc_condom_conscious[$npcID] < 1 and npc_know_bc[$npcID] = 0:
@@ -969,7 +969,7 @@ if $ARGS[0] = 'trust_no_creampie':
 		cla & *nl
 		sex_ev['no_condom'] = 1
 		sex_ev['promise_no_creampie'] = 1
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		$sex_ev['bed_room']
 		'You hesitate for a moment before relenting.'
 		'"I guess it''s okay... I trust you," you smile as <<$npc_firstname[$npcID]>> eagerly forgoes the condom.'
@@ -982,7 +982,7 @@ if $ARGS[0] = 'trust_no_creampie_nervous':
 		cla & *nl
 		sex_ev['no_condom'] = 1
 		sex_ev['promise_no_creampie'] = 1
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		$sex_ev['bed_room']
 		'You hesitate for a moment before relenting.'
 		'"If you promise..." you say reluctantly as <<$npc_firstname[$npcID]>> eagerly forgoes the condom.'
@@ -1435,14 +1435,14 @@ if $ARGS[0] = 'disable_condoms_options1':
 		cla & *clr
 		$sex_ev['bed_room']
 		'<<$sex_ev[''disable_condoms_desc'']>> I trust you."'
-		gs 'sex_ev_condoms', 'npc_no_condom_react '
+		gs 'sex_ev_condoms', 'npc_no_condom_react'
 	end
 
 	act 'It''ll feel better':
 		cla & *clr
 		$sex_ev['bed_room']
 		'<<$sex_ev[''disable_condoms_desc'']>> Bareback is so much better. I want the full feeling of your cock inside me."'
-		gs 'sex_ev_condoms', 'npc_no_condom_react '
+		gs 'sex_ev_condoms', 'npc_no_condom_react'
 	end
 
 	if knowpreg = 1:
@@ -1451,7 +1451,7 @@ if $ARGS[0] = 'disable_condoms_options1':
 			cla & *clr
 			$sex_ev['bed_room']
 			'"Hey," you smile. "We don''t need to use condoms. I found out I''m pregnant. Can''t get any more knocked up than I already am."'
-			gs 'sex_ev_condoms', 'npc_no_condom_react '
+			gs 'sex_ev_condoms', 'npc_no_condom_react'
 		end
 
 	elseif birth_control['think_safe'] = 1:
@@ -1463,7 +1463,7 @@ if $ARGS[0] = 'disable_condoms_options1':
 				cla & *clr
 				$sex_ev['bed_room']
 				'"Hey," you smile. "We don''t need to use condoms anymore. I''m on the shot."'
-				gs 'sex_ev_condoms', 'npc_no_condom_react '
+				gs 'sex_ev_condoms', 'npc_no_condom_react'
 			end
 		elseif pillcon2 > 0:
 			act 'On the pill':
@@ -1480,7 +1480,7 @@ if $ARGS[0] = 'disable_condoms_options1':
 				npc_know_not_bc[$npcID] = 0
 				gs 'sex_ev_stats', 'birth_control_know'
 				npc_know_bc_not_effective[$npcID] = 0
-				gs 'sex_ev_condoms', 'npc_no_condom_react '
+				gs 'sex_ev_condoms', 'npc_no_condom_react'
 			end
 		end
 	elseif npc_know_bc[$npcID] = 0:
@@ -1513,14 +1513,14 @@ if $ARGS[0] = 'disable_condoms_options2':
 		cla & *clr
 		$sex_ev['bed_room']
 		'<<$sex_ev[''disable_condoms_desc'']>> I trust you. So we only need to use condoms on dangerous days."'
-		gs 'sex_ev_condoms', 'npc_no_condom_react '
+		gs 'sex_ev_condoms', 'npc_no_condom_react'
 	end
 
 	act 'It''ll feel better':
 		cla & *clr
 		$sex_ev['bed_room']
 		'<<$sex_ev[''disable_condoms_desc'']>> Bareback is so much better. I want the full feeling of your cock inside me. So we only need to use condoms on dangerous days."'
-		gs 'sex_ev_condoms', 'npc_no_condom_react '
+		gs 'sex_ev_condoms', 'npc_no_condom_react'
 	end
 end
 
@@ -1802,14 +1802,14 @@ if $ARGS[0] = 'temp_disable_condoms':
 				cla & *clr
 				$sex_ev['bed_room']
 				iif($sex_ev['type'] ! 'hookup','"Let''s skip the condom today," you smile. ', '"We don''t need to use condoms," you smile. ') + '"I trust you."'
-				gs 'sex_ev_condoms', 'npc_temp_no_condom_react '
+				gs 'sex_ev_condoms', 'npc_temp_no_condom_react'
 			end
 
 			act 'It''ll feel better':
 				cla & *clr
 				$sex_ev['bed_room']
 				iif($sex_ev['type'] ! 'hookup','"Let''s skip the condom today," you smile. ', '"We don''t need to use condoms," you smile. ') + '"It''ll feel better bareback."'
-				gs 'sex_ev_condoms', 'npc_temp_no_condom_react '
+				gs 'sex_ev_condoms', 'npc_temp_no_condom_react'
 			end
 
 			if birth_control['think_safe'] = 1 and $sex_ev['type'] = 'hookup':
@@ -1820,7 +1820,7 @@ if $ARGS[0] = 'temp_disable_condoms':
 					cla & *clr
 					$sex_ev['bed_room']
 					'"We don''t need to use condoms," you smile. ' + iif(tabletkishot > 0, '"I''m on the shot."', '"I''m on the pill."')
-					gs 'sex_ev_condoms', 'npc_temp_no_condom_react '
+					gs 'sex_ev_condoms', 'npc_temp_no_condom_react'
 				end
 			elseif mesec > 0:
 				act 'I''m on my period':
@@ -1828,7 +1828,7 @@ if $ARGS[0] = 'temp_disable_condoms':
 					cla & *clr
 					$sex_ev['bed_room']
 					'"Let''s skip the condom today," you smile. "I don''t think I can get pregnant on my period."'
-					gs 'sex_ev_condoms', 'npc_temp_no_condom_react '
+					gs 'sex_ev_condoms', 'npc_temp_no_condom_react'
 				end
 			elseif $stat['preg_risk'] = 'safe':
 				act 'It''s a safe day':
@@ -1836,7 +1836,7 @@ if $ARGS[0] = 'temp_disable_condoms':
 					cla & *clr
 					$sex_ev['bed_room']
 					'"Let''s skip the condom," you smile. "It''s a safe day for me. I won''t get pregnant."'
-					gs 'sex_ev_condoms', 'npc_temp_no_condom_react '
+					gs 'sex_ev_condoms', 'npc_temp_no_condom_react'
 				end
 			elseif $stat['preg_risk'] = 'prob_safe':
 				act 'It''s probably safe day':
@@ -1849,7 +1849,7 @@ if $ARGS[0] = 'temp_disable_condoms':
 !!					else
 						*nl
 						'<i>Probably...</i> you think quietly to yourself.'
-						gs 'sex_ev_condoms', 'npc_temp_no_condom_react '
+						gs 'sex_ev_condoms', 'npc_temp_no_condom_react'
 !!					end
 				end
 			end
@@ -1867,11 +1867,11 @@ if $ARGS[0] = 'father_check':
 	else
 		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
 	end
-	if $boy = $potfather_temp[2]: potfather_counter += 1
+	if $npcID = $potfather_temp[2]: potfather_counter += 1
 	if potfather_counter < arrsize('$wombpotfath'): jump 'potfather_loop'
 end
 
-if $ARGS[0] = 'npc_preg_react ':
+if $ARGS[0] = 'npc_preg_react':
 	if npc_creampie_count[$npcID] > 0:
 		'<<$npc_firstname[$npcID]>>''s eyes go wide.'
 		if npc_childfree[$npcID] > 0:
@@ -1895,7 +1895,7 @@ if $ARGS[0] = 'npc_preg_react ':
 	end
 end
 
-if $ARGS[0] = 'npc_no_condom_react ':
+if $ARGS[0] = 'npc_no_condom_react':
 	if npc_condom_conscious[$npcID] = 2 or (npc_condom_conscious[$npcID] = 1 and (rand(npc_willpwr[$npcID],100) - npc_rel[$npcID]) > pcs_persuas):
 		sex_ev['condom'] = 1
 		sex_ev['npc_condom_insist'] = 1
@@ -1917,7 +1917,7 @@ if $ARGS[0] = 'npc_no_condom_react ':
 	end
 end
 
-if $ARGS[0] = 'npc_temp_no_condom_react ':
+if $ARGS[0] = 'npc_temp_no_condom_react':
 	if npc_condom_conscious[$npcID] = 2 or (npc_condom_conscious[$npcID] = 1 and (rand(npc_willpwr[$npcID],100) - npc_rel[$npcID]) > pcs_persuas):
 		sex_ev['condom'] = 1
 		sex_ev['npc_condom_insist'] = 1
@@ -2198,7 +2198,7 @@ if $ARGS[0] = 'pc_dangerous_day2':
 
 		act 'I trust you':
 			cla & *clr
-			gs 'npc_relationship', 'modify', $boy, 'like'
+			gs 'npc_relationship', 'modify', $npcID, 'like'
 			$sex_ev['bed_room']
 			'"No, it''s okay," you say, shaking your head and smiling. "I trust you."'
 			if npc_childfree[$npcID] = 1:

+ 81 - 57
locations/sex_ev_cowgirl.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = 'cowgirl_insert_slow':
 	gs 'stat'
 	$sex_ev['position'] = 'cowgirl'
 	if sex_ev['no_condom'] = 1:
-		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter2.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter4.mp4"></video></center>'
 	else
 		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter_condom1.mp4"></video></center>'
 	end
@@ -169,7 +169,7 @@ if $ARGS[0] = 'cowgirl_insert_slow':
 
 	act 'Enjoyment':
 		cla
-		$sex_ev['fuck_enjoyment'] = 'enjoy'
+		!! $sex_ev['fuck_enjoyment'] = 'enjoy'
 
 		act 'Moan':
 			cla & *nl
@@ -312,7 +312,7 @@ if $ARGS[0] = 'cowgirl_insert_orgasm':
 	if orgasm_buildup >= 100 or pcs_traits['easy_orgasms'] > 0 and hypnoHardToCum = 0:
 		act 'Orgasm!':
 			cla & *clr
-			$sex_ev['fuck_enjoyment'] = 'enjoy'
+			!! $sex_ev['fuck_enjoyment'] = 'enjoy'
 			if sex_ev['orgasm'] = orgasm:
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal', -1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
@@ -416,14 +416,22 @@ if $ARGS[0] = 'cowgirl_menu2':
 end
 
 if $ARGS[0] = 'cowgirl_goto':
-	sex_ev['cock_inserted'] = 1
-	if sex_ev['speed'] = 0: sex_ev['speed'] = rand(1,3)
-	act 'Ride him':gt 'sex_ev_cowgirl', 'cowgirl<<sex_ev[''speed'']>>'
+	if npc_two_pump[$npcID] > 0 and sex_ev['2pump'] = 0:
+		act 'Continue': gt 'sex_ev_cum', '2pumpchump'
+	else
+		sex_ev['cock_inserted'] = 1
+		if sex_ev['speed'] = 0: sex_ev['speed'] = rand(1,3)
+		act 'Ride him':gt 'sex_ev_cowgirl', 'cowgirl<<sex_ev[''speed'']>>'
+	end
 end
 if $ARGS[0] = 'cowgirl_goto2':
-	sex_ev['cock_inserted'] = 1
-	if sex_ev['speed'] = 0: sex_ev['speed'] = rand(1,3)
-	act 'Ride him':gt 'sex_ev_cowgirl', 'cowgirl<<sex_ev[''speed'']>>.2'
+	if sex_ev['fuck_count'] = 0:
+		act 'Continue': gt 'sex_ev_cum', '2pumpchump'
+	else
+		sex_ev['cock_inserted'] = 1
+		if sex_ev['speed'] = 0: sex_ev['speed'] = rand(1,3)
+		act 'Ride him':gt 'sex_ev_cowgirl', 'cowgirl<<sex_ev[''speed'']>>.2'
+	end
 end
 
 if $ARGS[0] = 'cowgirl_change_position':
@@ -575,9 +583,17 @@ end
 
 if $ARGS[0] = 'cowgirl_vid':
 	if sex_ev['speed'] = 1:
-		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/slow2.mp4"></video></center>'
+		if sex_ev['condom'] = 1:
+			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/condom<<rand(1,2)>>.mp4"></video></center>'
+		else
+			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/slow<<rand(2,5)>>.mp4"></video></center>'
+		end
 	elseif sex_ev['speed'] = 2:
-		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/med<<rand(1,4)>>.mp4"></video></center>'
+		if sex_ev['condom'] = 1:
+			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/condom<<rand(1,2)>>.mp4"></video></center>'
+		else
+			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/med<<rand(1,4)>>.mp4"></video></center>'
+		end
 	elseif sex_ev['speed'] = 3:
 		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/hard<<rand(1,4)>>.mp4"></video></center>'
 	end
@@ -585,6 +601,7 @@ end
 
 if $ARGS[0] = 'cowgirl1':
 	sex_ev['cowgirl_fuck'] = 1
+	sex_ev['orgasm'] = orgasm
 	!! slow pace
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
 	sex_ev['speed'] = 1
@@ -593,7 +610,7 @@ if $ARGS[0] = 'cowgirl1':
 	if $sex_ev['fuck_enjoyment'] ! '': gt 'sex_ev_cowgirl', 'cowgirl1.2'
 	!! sex_ev['cowgirl_fuck'] tracks if you fuck in this position
 !!	if pcs_vag = 0:gt 'sex_ev_virgin', 'cowgirl_virg_norm1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	gs 'sex_ev_cowgirl', 'cowgirl_vid'
 	if mesec > 0:
 !!		'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/blood1.jpg"></center>'
@@ -786,7 +803,7 @@ if $ARGS[0] = 'cowgirl1.2':
 	sex_ev['speed'] = 1
 	$sex_ev['position'] = 'cowgirl'
 	$sex_ev['pos_speed'] = 'cowgirl1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	gs 'sex_ev_cowgirl', 'cowgirl_vid'
 	if $sex_ev['fuck_enjoyment'] = 'painful':
@@ -891,8 +908,8 @@ if $ARGS[0] = 'cowgirl1.2':
 		*nl
 		gs 'sex_ev_cowgirl', 'cowgirl1_boy_talk2'
 	elseif sex_ev['casual_talk'] > 0:
-		if mid($boy,1,1) = 'A':
-			gs 'sex_ev_sex_talk_<<$boy>>', 'talk_output'
+		if mid($npcID,1,1) = 'A':
+			gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_output'
 !!			else
 
 		end
@@ -909,7 +926,7 @@ if $ARGS[0] = 'cowgirl1.bored':
 	sex_ev['cowgirl_fuck'] = 1
 	cla & *clr
 	$sex_ev['pos_speed'] = 'cowgirl1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/slow2.mp4"></video></center>'
 	'You keep fucking him at a slow pace. It''s boring.'
@@ -918,6 +935,7 @@ end
 
 if $ARGS[0] = 'cowgirl2':
 	sex_ev['cowgirl_fuck'] = 1
+	sex_ev['orgasm'] = orgasm
 	!! medium pace
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
 	sex_ev['speed'] = 2
@@ -926,7 +944,6 @@ if $ARGS[0] = 'cowgirl2':
 	if $sex_ev['fuck_enjoyment'] ! '': gt 'sex_ev_cowgirl', 'cowgirl2.2'
 	!! sex_ev['cowgirl_fuck'] tracks if you fuck in this position
 !!	if pcs_vag = 0:gt 'sex_ev_virgin', 'cowgirl_virg_norm1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
 	gs 'sex_ev_cowgirl', 'cowgirl_vid'
 	if mesec > 0:
 !!		'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/blood1.jpg"></center>'
@@ -937,6 +954,7 @@ if $ARGS[0] = 'cowgirl2':
 	end
 
 	if npc_sexskill[$npcID] > 75:
+		
 		$sex_ev['fuck_enjoyment'] = 'enjoy'
 		if $npc_dick_class[$npcID] = 'short':
 			'An uncontrollable gasp escapes your lips on the next bounce as <<$npc_firstname[$npcID]>>''s hips meet yours in a thrust from underneath. He''s not just proactive, he''s attentive too. You can feel how his movements react to yours, each thrust feeling better than the last. His dick may be small but <i>damn</i>, does he know how to use it.'
@@ -965,6 +983,7 @@ if $ARGS[0] = 'cowgirl2':
 			$sex_ev['fuck_enjoyment'] = 'unsatisfying'
 			sex_ev['fake_enjoy'] = 1
 			sex_ev['moan'] = 2
+			
 
 			if $npc_dick_class[$npcID] = 'short':
 				'Proactive, but not amazing. He''s putting in the effort, but that can only go so far with such a small dick. Beyond that, his movements just aren''t syncing up with yours' + iif(npc_fuck_times[$npcID] > 0, ' today ', ' ') + 'and you find yourself stifling a sigh, feeling like your itch is not getting scratched with each new bounce on his cock. Maybe this would get another girl off, but certainly not you...'
@@ -1097,7 +1116,7 @@ if $ARGS[0] = 'cowgirl2.2':
 	sex_ev['speed'] = 2
 	$sex_ev['position'] = 'cowgirl'
 	$sex_ev['pos_speed'] = 'cowgirl2'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	gs 'sex_ev_cowgirl', 'cowgirl_vid'
 	if $sex_ev['fuck_enjoyment'] = 'painful':
@@ -1205,8 +1224,8 @@ if $ARGS[0] = 'cowgirl2.2':
 		*nl
 		gs 'sex_ev_cowgirl', 'cowgirl2_boy_talk2'
 	elseif sex_ev['casual_talk'] > 0:
-		if mid($boy,1,1) = 'A':
-			gs 'sex_ev_sex_talk_<<$boy>>', 'talk_output'
+		if mid($npcID,1,1) = 'A':
+			gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_output'
 !!			else
 
 		end
@@ -1223,7 +1242,7 @@ if $ARGS[0] = 'cowgirl2.bored':
 	sex_ev['cowgirl_fuck'] = 1
 	cla & *clr
 	$sex_ev['pos_speed'] = 'cowgirl2'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/med2.mp4"></video></center>'
 	'You keep fucking him at a medium pace. It''s boring.'
@@ -1232,6 +1251,7 @@ end
 
 if $ARGS[0] = 'cowgirl3':
 	sex_ev['cowgirl_fuck'] = 1
+	sex_ev['orgasm'] = orgasm
 	!! fast/rough pace
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
 	sex_ev['speed'] = 3
@@ -1240,7 +1260,7 @@ if $ARGS[0] = 'cowgirl3':
 	if $sex_ev['fuck_enjoyment'] ! '': gt 'sex_ev_cowgirl', 'cowgirl3.2'
 	!! sex_ev['cowgirl_fuck'] tracks if you fuck in this position
 !!	if pcs_vag = 0:gt 'sex_ev_virgin', 'cowgirl_virg_norm1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	gs 'sex_ev_cowgirl', 'cowgirl_vid'
 	if mesec > 0:
 !!		'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/blood1.jpg"></center>'
@@ -1412,7 +1432,7 @@ if $ARGS[0] = 'cowgirl3.2':
 	sex_ev['speed'] = 3
 	$sex_ev['position'] = 'cowgirl'
 	$sex_ev['pos_speed'] = 'cowgirl3'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	if rand(0,1) = 1:
 		sex_ev['cowgirl_rand'] = 1
@@ -1864,41 +1884,45 @@ end
 if $ARGS[0] = 'cowgirl1.2_dirty_talk':
 !! '"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal. "You''re so deep! I can feel you inside me..."'
 
-	if $sex_ev['dirty_talk'] = 'cock':
-		if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
-			'"Ahh~! Your cock feels so good~!" you moan, your voice a hoarse with arousal as you roll your hips over <<$npc_firstname[$npcID]>>. "Your tiny dick is gonna make me come~!"'
-		elseif $npc_dick_desc[$npcID] = 'chode':
-			'"Ahh~! Your cock feels so good~!" you moan, your voice a hoarse with arousal as you roll your hips over <<$npc_firstname[$npcID]>>. "Your fat chode is gonna make me come~!"'
-		elseif $npc_dick_desc[$npcID] = 'skinny':
-			'"Ahh~! Your cock feels so good~!" you moan, your voice a hoarse with arousal as you roll your hips over <<$npc_firstname[$npcID]>>. "I can feel you moving inside me~! It''s so good~!"'
-		elseif $npc_dick_desc[$npcID] = 'normal':
-			'"Ahh~! Your cock feels so good~!" you moan, your voice a hoarse with arousal as you roll your hips over <<$npc_firstname[$npcID]>>. "You''re filling me up just right~! It''s like your cock was made for my pussy~!"'
-		elseif $npc_dick_desc[$npcID] = 'thick':
-			if pcs_vag <= 10:
-				'"Ahh~! You''re <i>so big~!</i>" you moan, your voice a hoarse with arousal. "I can barely fit you inside me~! It''s stretching me out! Oh <i>fuck~!</i> It''s making me so wet..."'
-			else
-				'"Ahh~! You''re <i>so big~!</i>" you moan, your voice a hoarse with arousal. "Oh <i>fuck~!</i> I love riding your big fucking cock~!"'
-			end
-		elseif $npc_dick_desc[$npcID] = 'long':
-			'"Ahh~! You''re <i>so deep~!</i>" you moan, your voice a hoarse with arousal. "Oh <i>fuck~!</i> I can feel you so far inside me~!"'
-		elseif $npc_dick_desc[$npcID] = 'huge':
-			if pcs_vag <= 10:
-				'"Ungh~! <i>Fuck</i> you''re big~!" you groan, your voice a hoarse with arousal. "I can barely fit you inside me~! It''s stretching me out! Oh <i>fuck~!</i> I love your cock~!"'
-			else
-				'"Ungh~! You''re <i>so big~!</i>" you moan, your voice a hoarse with arousal. "Oh <i>fuck~!</i> I''m so full~! I can''t get enough of your huge fucking cock~!"'
-			end
-		elseif $npc_dick_desc[$npcID] = 'enormous':
-			if pcs_vag <= 10:
-				'"Ungh~! <i>Fuck~!</i>" you groan. "Your cock is fucking enormous~! My pussy can barely take it~! Nngh~! I can''t stop moving~! It''s too fucking good~!"'
-			else
-				'"Ungh~! I love your cock~!" you moan. "I love your enormous fucking cock inside my pussy~! I want to ride this cock forever~!"'
+	if $sex_ev['dirty_talk'] = 'cock':	
+		if rand(1,2) = 1:
+			if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
+				'"Ahh~! Your cock feels so good~!" you moan, your voice a hoarse with arousal as you roll your hips over <<$npc_firstname[$npcID]>>. "Your tiny dick is gonna make me come~!"'
+			elseif $npc_dick_desc[$npcID] = 'chode':
+				'"Ahh~! Your cock feels so good~!" you moan, your voice a hoarse with arousal as you roll your hips over <<$npc_firstname[$npcID]>>. "Your fat chode is gonna make me come~!"'
+			elseif $npc_dick_desc[$npcID] = 'skinny':
+				'"Ahh~! Your cock feels so good~!" you moan, your voice a hoarse with arousal as you roll your hips over <<$npc_firstname[$npcID]>>. "I can feel you moving inside me~! It''s so good~!"'
+			elseif $npc_dick_desc[$npcID] = 'normal':
+				'"Ahh~! Your cock feels so good~!" you moan, your voice a hoarse with arousal as you roll your hips over <<$npc_firstname[$npcID]>>. "You''re filling me up just right~! It''s like your cock was made for my pussy~!"'
+			elseif $npc_dick_desc[$npcID] = 'thick':
+				if pcs_vag <= 10:
+					'"Ahh~! You''re <i>so big~!</i>" you moan, your voice a hoarse with arousal. "I can barely fit you inside me~! It''s stretching me out! Oh <i>fuck~!</i> It''s making me so wet..."'
+				else
+					'"Ahh~! You''re <i>so big~!</i>" you moan, your voice a hoarse with arousal. "Oh <i>fuck~!</i> I love riding your big fucking cock~!"'
+				end
+			elseif $npc_dick_desc[$npcID] = 'long':
+				'"Ahh~! You''re <i>so deep~!</i>" you moan, your voice a hoarse with arousal. "Oh <i>fuck~!</i> I can feel you so far inside me~!"'
+			elseif $npc_dick_desc[$npcID] = 'huge':
+				if pcs_vag <= 10:
+					'"Ungh~! <i>Fuck</i> you''re big~!" you groan, your voice a hoarse with arousal. "I can barely fit you inside me~! It''s stretching me out! Oh <i>fuck~!</i> I love your cock~!"'
+				else
+					'"Ungh~! You''re <i>so big~!</i>" you moan, your voice a hoarse with arousal. "Oh <i>fuck~!</i> I''m so full~! I can''t get enough of your huge fucking cock~!"'
+				end
+			elseif $npc_dick_desc[$npcID] = 'enormous':
+				if pcs_vag <= 10:
+					'"Ungh~! <i>Fuck~!</i>" you groan. "Your cock is fucking enormous~! My pussy can barely take it~! Nngh~! I can''t stop moving~! It''s too fucking good~!"'
+				else
+					'"Ungh~! I love your cock~!" you moan. "I love your enormous fucking cock inside my pussy~! I want to ride this cock forever~!"'
+				end
+			elseif $npc_dick_desc[$npcID] = 'lengthy':
+				'"Oh <i>fuck!</i> I can feel you in my stomach~!" you groan. "I can''t even fit you all the way inside me~! Fuck~! I can feel you knocking on my cervix~! Ahh~! I can feel you wiggling inside me~!"'
+			elseif $npc_dick_desc[$npcID] = 'gigantic':
+				'"Oh <i>fuck!</i> I can feel you in my stomach~!" you groan. "I can''t even fit you all the way inside me~! Fuck~! I can feel you knocking on my cervix~! Oh fuck~! You''re filling me all the way up~!"'
+			elseif $npc_dick_desc[$npcID] = 'monster':
+				'"<i>Ungh~! Fuck~!</i>" you groan, struggling to ride <<$npc_firstname[$npcID]>>''s massive cock. "Your cock is so <i>fucking big~!</i> It''s like a baseball bat in my pussy~! I can feel you in my stomach~! Nngh~! I feel like I''m gonna throw up~! But I can''t stop moving~! Oh god it''s gonna rip me in half~!"'
 			end
-		elseif $npc_dick_desc[$npcID] = 'lengthy':
-			'"Oh <i>fuck!</i> I can feel you in my stomach~!" you groan. "I can''t even fit you all the way inside me~! Fuck~! I can feel you knocking on my cervix~! Ahh~! I can feel you wiggling inside me~!"'
-		elseif $npc_dick_desc[$npcID] = 'gigantic':
-			'"Oh <i>fuck!</i> I can feel you in my stomach~!" you groan. "I can''t even fit you all the way inside me~! Fuck~! I can feel you knocking on my cervix~! Oh fuck~! You''re filling me all the way up~!"'
-		elseif $npc_dick_desc[$npcID] = 'monster':
-			'"<i>Ungh~! Fuck~!</i>" you groan, struggling to ride <<$npc_firstname[$npcID]>>''s massive cock. "Your cock is so <i>fucking big~!</i> It''s like a baseball bat in my pussy~! I can feel you in my stomach~! Nngh~! I feel like I''m gonna throw up~! But I can''t stop moving~! Oh god it''s gonna rip me in half~!"'
+		else
+			'"Fuck~!" you pant. "Your cock is so fucking hard inside me~! Oh fuck~! Oh fuck~!"'
 		end
 	elseif $sex_ev['dirty_talk'] = 'arousal':
 		!! dirty talk about your arousal

+ 261 - 140
locations/sex_ev_cum.qsrc

@@ -387,7 +387,7 @@ if $ARGS[0] = 'cum_decider':
 	if $sex_ev['preg_risk'] = 'danger' and npc_selfish[$npcID] = 1 and npc_childfree[$npcID] ! 1:
 		sex_ev['extra_caution'] = 0
 	elseif ($sex_ev['preg_risk'] = 'danger' or (npc_diligent[$npcID] > 0 and $npc_cum_pref[$npcID] = 'pullout')) and sex_ev['no_condom'] = 1:
-		sex_ev['extra_caution'] = rand(0,1)
+		sex_ev['extra_caution'] = rand(0,(1+npc_diligent[$npcID]))
 	end
 	if sex_ev['creampie_allowance'] ! 1 or npc_know_bc[$npcID] = 0: sex_ev['extra_caution'] = 0
 
@@ -399,9 +399,8 @@ if $ARGS[0] = 'cum_decider':
 !!	if sex_ev['cum_choice'] = 10 and sex_ev['fuck'] = 1:
 
 !! if the boy has the two-pump chump trait or loses concentration, he will unexpectedly finish inside without warning or barely manage to pull out in time
-	if sex_ev['cum_choice'] = 10 or sex_ev['two_pump'] = 1 or sex_ev['cant_hold_cum'] = 1:
+	if sex_ev['cum_choice'] = 10 or sex_ev['2pump'] = 1 or sex_ev['cant_hold_cum'] = 1:
 		sex_ev['cum_warn'] = 0
-		if sex_ev['two_pump'] = 1: sex_ev['two_pump'] = 2
 
 		if sex_ev['extra_caution'] > 0 and sex_ev['no_condom'] = 1:
 			$sex_ev['cum_choice'] = 'pullout'
@@ -497,6 +496,11 @@ end
 if $ARGS[0] = 'fuck_cum':
 	cla
 	!! flags to remember what kind of fucking happened during sex
+	if sex_ev['speed'] < 3:
+		gs 'sex_ev_sex', 'fuck_arousal_code'
+	else
+		gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+	end
 	if sex_ev['morning_after'] = 1:sex_ev['morning_fuck'] = 1
 	sex_ev['fuck'] = 1
 	sex_ev['cock_inserted'] = 1
@@ -517,8 +521,8 @@ if $ARGS[0] = 'fuck_cum':
 
 	if (sex_ev['cycle_limit'] + sex_ev['extra_stim'] > npc_sex_stamina[$npcID] and sex_ev['boy_cocaine'] = 0 and rand(1,10) <= npc_sex_stamina[$npcID]) or (sex_ev['boy_cocaine'] = 1 and sex_ev['cycle_limit'] + sex_ev['extra_stim'] = 10): sex_ev['boy_cum'] = 1
 
-	if npc_two_pump[$npcID] = 1 and sex_ev['two_pump'] = 0:
-		sex_ev['two_pump'] = 1
+	if npc_two_pump[$npcID] = 1 and sex_ev['2pump'] = 0:
+		sex_ev['2pump'] = 1
 		sex_ev['fuck_count'] += 1
 		sex_ev['boy_cum'] = 1
 	end
@@ -532,7 +536,9 @@ if $ARGS[0] = 'fuck_cum':
 		!!gs 'sex_ev_cum', 'fuck_cum_random'
 		gs 'sex_ev_cum', 'cum_decider'
 	end
-	if sex_ev['girl_orgasm'] > 0 and sex_ev['cycle_limit'] + sex_ev['extra_stim'] <= npc_sex_stamina[$npcID] + 1:
+	if sex_ev['2pump'] = 1:
+		act'Continue': gt 'sex_ev_cum', '2pumpchump'
+	elseif sex_ev['girl_orgasm'] > 0 and sex_ev['cycle_limit'] + sex_ev['extra_stim'] <= npc_sex_stamina[$npcID] + 1:
 		gs 'sex_ev_cum', 'girl_cum'
 	elseif sex_ev['boy_cum'] > 0:
 		gs 'sex_ev_cum', 'fuck_cum2'
@@ -949,7 +955,7 @@ if $ARGS[0] = 'cum_jerkoff':
 	$sex_ev['cum_describe2'] = 'looking down at the strands of cum coating your fingers'
 	$sex_ev['last_cum'] = 'hand'
 	sex_ev['cum_hand'] += 1
-	gs 'cum_call', 'hands', $boy, 1
+	gs 'cum_call', 'hands', $npcID, 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/handjob/bossbjcum.jpg"></center>'
 	if sex_ev['condom'] = 1:
@@ -980,7 +986,7 @@ if $ARGS[0] = 'cum_facial':
 !!{	if sex_ev['position'] = 'miss' and npc_cum_cannon[[$npcID] = 1:
 
 	else}
-		gs 'cum_call', 'face', $boy, 1
+		gs 'cum_call', 'face', $npcID, 1
 		if pcs_makeup > 1:pcs_makeup = 0
 		!! differing descriptions based on position
 		cla & *clr
@@ -1009,6 +1015,7 @@ if $ARGS[0] = 'cum_facial':
 		gs 'sex_ev_cum', 'facial_tongue_spit'
 		gs 'sex_ev_cum', 'facial_brace'
 		act 'Jerk him yourself':gt 'sex_ev_cum', 'facial_jerk_him'
+		act 'Jerk him into your mouth':gt 'sex_ev_cum', 'facial_jerk_mouth'
 
 !!		act 'Let him jerk off on your face':gt 'sex_ev_cum', 'facial_he_jerks'
 !!	end
@@ -1046,17 +1053,17 @@ if $ARGS[0] = 'facial_jerk_him':
 		'Climax breaks inside you just as hot cum erupts from <<$npc_firstname[$npcID]>>''s cock, spattering across your O-face.'
 	else
 		if $sex_ev['position'] = 'miss' and sex_ev['condom'] = 1:
-			'You open up your legs, letting <<$npc_firstname[$npcID]>> slip his cock from inside you. He tears the condom off and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurts out, coating your face.'
+			'You open up your legs, letting <<$npc_firstname[$npcID]>> slip his cock from inside you. He tears the condom off and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurting out, coating your face.'
 		elseif $sex_ev['position'] = 'miss':
-			'You open up your legs, letting <<$npc_firstname[$npcID]>> slip his cock from inside you, and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurts out, coating your face.'
+			'You open up your legs, letting <<$npc_firstname[$npcID]>> slip his cock from inside you, and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurting out, coating your face.'
 		elseif $sex_ev['position'] = 'doggy' and sex_ev['condom'] = 1:
-			'You pull away from <<$npc_firstname[$npcID]>> and turn around, laying down on the bed. He tears the condom off and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurts out, coating your face.'
+			'You pull away from <<$npc_firstname[$npcID]>> and turn around, laying down on the bed. He tears the condom off and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurting out, coating your face.'
 		elseif $sex_ev['position'] = 'miss':
-			'You pull away from <<$npc_firstname[$npcID]>> and turn around, laying down on the bed. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurts out, coating your face.'
+			'You pull away from <<$npc_firstname[$npcID]>> and turn around, laying down on the bed. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurting out, coating your face.'
 		elseif $sex_ev['position'] = 'cowgirl' and sex_ev['condom'] = 1:
-			'You hop off of <<$npc_firstname[$npcID]>> and lay down on the bed while he tears off the condom. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurts out, coating your face.'
+			'You hop off of <<$npc_firstname[$npcID]>> and lay down on the bed while he tears off the condom. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurting out, coating your face.'
 		elseif $sex_ev['position'] = 'cowgirl':
-			'You hop off of <<$npc_firstname[$npcID]>> and lay down on the bed. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurts out, coating your face.'
+			'You hop off of <<$npc_firstname[$npcID]>> and lay down on the bed. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurting out, coating your face.'
 		end
 	end
 	*nl
@@ -1064,7 +1071,72 @@ if $ARGS[0] = 'facial_jerk_him':
 		'The warm liquid making contact with your skin is the only thing left you need and you come with him, getting caught in the throes of orgasm as you keep working his shaft, emptying his balls all over your face.'
 	end
 	gs 'sex_ev_cum', 'facial_wipe_eyes'
-	gs 'sex_ev_reactions', 'cum_react '
+	gs 'sex_ev_reactions', 'cum_react'
+end
+
+if $ARGS[0] = 'facial_jerk_mouth':
+	sex_ev['cock_inserted'] = 0
+	sex_ev['cum_face'] += 1
+	sex_ev['cum_mouth'] += 1
+	sex_ev['facial_count'] += 1
+	sex_ev['pc_facial_jerk'] += 1
+	$sex_ev['last_cum'] = 'facial'
+	if sex_ev['he_ask_creampie'] = 1:
+		$sex_ev['cum_describe1'] = 'Sorry,'
+	else
+		$sex_ev['cum_describe1'] = 'Thanks,'
+	end
+	$sex_ev['cum_describe2'] = 'blinking the cum from your eyes'
+	cla & *clr
+	'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum15.mp4"></video></center>'
+	if sex_ev['his_choice'] ! 2:
+		if sex_ev['cum_where'] = 1:
+			'"In my mouth!"'
+		elseif sex_ev['he_ask_mouth'] = 1:
+			'"Okay," you say.'
+		elseif sex_ev['he_ask'] = 1 and sex_ev['he_ask_facial'] ! 1:
+			'"Cum in my mouth instead!"'
+		elseif sex_ev['not_inside'] = 1:
+			'"Not inside me!" you yelp frantically.'
+		end
+	end
+	if sex_ev['orgasm'] < orgasm:
+		if $sex_ev['position'] = 'miss' and sex_ev['condom'] = 1:
+			'<<$npc_firstname[$npcID]>> slips his cock from between your legs and tears off the condom as he straddles your chest. Taking hold of his length, you pump his shaft while frantically working your clit at the same time. You''re so close! You just need to-'
+		elseif $sex_ev['position'] = 'miss':
+			'<<$npc_firstname[$npcID]>> slips his cock from between your legs and moves to straddle your chest. Taking hold of his length, you pump his shaft while frantically working your clit at the same time. You''re so close! You just need to-'
+		elseif $sex_ev['position'] = 'doggy' and sex_ev['condom'] = 1:
+			'<<$npc_firstname[$npcID]>> slips his cock out from behind you and tears off the condom as you flip over onto your back and he straddles your chest. Taking hold of his length, you pump his shaft while frantically working your clit at the same time. You''re so close! You just need to-'
+		elseif $sex_ev['position'] = 'doggy':
+			'<<$npc_firstname[$npcID]>> slips his cock out from behind you as you flip over onto your back and he straddles your chest. Taking hold of his length, you pump his shaft while frantically working your clit at the same time. You''re so close! You just need to-'
+		elseif $sex_ev['position'] = 'cowgirl' and sex_ev['condom'] = 1:
+			'You hop off of <<$npc_firstname[$npcID]>> and lay down on the bed while he tears off the condom. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft while frantically working your clit at the same time. You''re so close! You just need to-'
+		elseif $sex_ev['position'] = 'cowgirl':
+			'You hop off of <<$npc_firstname[$npcID]>> and lay down on the bed. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft while frantically working your clit at the same time. You''re so close! You just need to-'
+		end
+		*nl
+		'Climax breaks inside you just as hot cum erupts from <<$npc_firstname[$npcID]>>''s cock, spattering all over your tongue and across your cheeks.'
+	else
+		if $sex_ev['position'] = 'miss' and sex_ev['condom'] = 1:
+			'You open up your legs, letting <<$npc_firstname[$npcID]>> slip his cock from inside you. He tears the condom off and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurting out, spattering all over your tongue and across your cheeks.'
+		elseif $sex_ev['position'] = 'miss':
+			'You open up your legs, letting <<$npc_firstname[$npcID]>> slip his cock from inside you, and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurting out, spattering all over your tongue and across your cheeks.'
+		elseif $sex_ev['position'] = 'doggy' and sex_ev['condom'] = 1:
+			'You pull away from <<$npc_firstname[$npcID]>> and turn around, laying down on the bed. He tears the condom off and you pull him close so he''s straddling you. Taking hold of him, you pump his shaft no more than twice before thick, hot cum comes spurting out, spattering all over your tongue and across your cheeks.'
+		elseif $sex_ev['position'] = 'miss':
+			'You pull away from <<$npc_firstname[$npcID]>> and turn around, laying down on the bed. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurting out, spattering all over your tongue and across your cheeks.'
+		elseif $sex_ev['position'] = 'cowgirl' and sex_ev['condom'] = 1:
+			'You hop off of <<$npc_firstname[$npcID]>> and lay down on the bed while he tears off the condom. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurting out, spattering all over your tongue and across your cheeks.'
+		elseif $sex_ev['position'] = 'cowgirl':
+			'You hop off of <<$npc_firstname[$npcID]>> and lay down on the bed. Pulling him close so he''s straddling you, you take hold of his cock and pump his shaft no more than twice before thick, hot cum comes spurting out, spattering all over your tongue and across your cheeks.'
+		end
+	end
+	*nl
+	if orgasm > sex_ev['orgasm']:
+		'The warm liquid making contact with your skin is the only thing left you need and you come with him, getting caught in the throes of orgasm as you keep working his shaft, emptying his balls all over your face.'
+	end
+	gs 'sex_ev_cum', 'facial_wipe_eyes'
+	gs 'sex_ev_reactions', 'cum_react'
 end
 
 if $ARGS[0] = 'facial_he_jerks':
@@ -1081,8 +1153,9 @@ if $ARGS[0] = 'cum_cannon_facial':
 end
 
 if $ARGS[0] = 'facial_wipe_eyes':
+	gs 'sex_ev_reactions', 'bask_satisfaction'
 	act 'Wipe your eyes':
-		gs 'cum_call', 'hands', $boy, 1
+		gs 'cum_call', 'hands', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial31.jpg"></center>'
@@ -1107,7 +1180,7 @@ if $ARGS[0] = 'facial_close_eyes':
 			'The warm cum making contact with your skin is the only thing left you need and you come with him, quivering in orgasm as he empties his balls all over your face.'
 		end
 		gs 'sex_ev_cum', 'facial_wipe_eyes'
-		gs 'sex_ev_reactions', 'cum_react '
+		gs 'sex_ev_reactions', 'cum_react'
 	end
 end
 
@@ -1118,7 +1191,7 @@ if $ARGS[0] = 'facial_tongue_cum':
 		sex_ev['cum_mouth'] += 1
 		sex_ev['facial_count'] += 1
 		cla & *clr
-		gs 'cum_call', 'breasts', $boy, 1
+		gs 'cum_call', 'breasts', $npcID, 1
 		$sex_ev['last_cum'] = 'face_mouth'
 		gs 'stat'
 		'<center><video autoplay loop src="images/shared/sex/cum/facial/facial25.mp4"></video></center>'
@@ -1140,7 +1213,7 @@ if $ARGS[0] = 'facial_tongue_cum':
 		end
 		act 'Gulp':
 			cla & *clr
-			gs 'cum_call', 'mouth_swallow', $boy, 1
+			gs 'cum_call', 'mouth_swallow', $npcID, 1
 			!!stat['swallow'] += 1
 			sex_ev['swallow'] = 1
 			sex_ev['swallow_count'] += 1
@@ -1163,12 +1236,12 @@ if $ARGS[0] = 'facial_tongue_cum':
 			npc_seen_swallow[$npcID] = 1
 
 			gs 'sex_ev_cum', 'facial_wipe_eyes'
-			gs 'sex_ev_reactions', 'cum_react '
+			gs 'sex_ev_reactions', 'cum_react'
 		end
 
 		act 'Force it down (hide your disgust)':
 			cla & *clr
-			gs 'cum_call', 'mouth_swallow', $boy, 1
+			gs 'cum_call', 'mouth_swallow', $npcID, 1
 			!!stat['swallow'] += 1
 			sex_ev['swallow'] = 1
 			sex_ev['swallow_count'] += 1
@@ -1190,7 +1263,7 @@ if $ARGS[0] = 'facial_tongue_cum':
 			npc_seen_swallow[$npcID] = 1
 
 			gs 'sex_ev_cum', 'facial_wipe_eyes'
-			gs 'sex_ev_reactions', 'cum_react '
+			gs 'sex_ev_reactions', 'cum_react'
 		end
 		gs 'sex_ev_cum', 'cum_mouth2'
 	end
@@ -1201,9 +1274,9 @@ if $ARGS[0] = 'facial_tongue_spit':
 		$sex_ev['next_act1'] = 'sex_ev_after'
 		$sex_ev['next_act2'] = 'pre'
 		cla & *clr
-		gs 'cum_call', 'mouth', $boy, 1
-		gs 'cum_call', 'face', $boy, 1
-		gs 'cum_call', 'hair', $boy, 1
+		gs 'cum_call', 'mouth', $npcID, 1
+		gs 'cum_call', 'face', $npcID, 1
+		gs 'cum_call', 'hair', $npcID, 1
 		sex_ev['facial_count'] += 1
 		sex_ev['spit_count'] += 1
 		sex_ev['cum_mouth'] += 1
@@ -1219,7 +1292,7 @@ if $ARGS[0] = 'facial_tongue_spit':
 			'The warm cum making contact with your tongue is the only thing left you need and you come with him, even as more cum continues to splash against your cheeks and dribble down your chin.'
 		end
 		gs 'sex_ev_cum', 'facial_wipe_eyes'
-		gs 'sex_ev_reactions', 'cum_react '
+		gs 'sex_ev_reactions', 'cum_react'
 	end
 end
 
@@ -1227,7 +1300,7 @@ if $ARGS[0] = 'facial_brace':
 	act 'Brace yourself (disgust)':
 		$sex_ev['last_cum'] = 'facial'
 		sex_ev['facial_count'] += 1
-		sex_ev['react '] = 1
+		sex_ev['react'] = 1
 		cla & *clr
 		gs 'stat'
 		'<center><video autoplay loop src="images/shared/sex/cum/facial/facial30.mp4"></video></center>'
@@ -1425,7 +1498,7 @@ if $ARGS[0] = 'cum_mouth2':
 			sex_ev['spit'] = 1
 			sex_ev['spit_count'] += 1
 			$sex_ev['last_cum'] = 'spit'
-			gs 'cum_call', 'mouth', $boy, 1
+			gs 'cum_call', 'mouth', $npcID, 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit1.mp4"></video></center>'
@@ -1443,12 +1516,12 @@ if $ARGS[0] = 'cum_mouth2':
 			else
 				$sex_ev['last_cum'] = 'swallow'
 			end
-			gs 'cum_call', 'mouth_swallow', $boy, 1
+			gs 'cum_call', 'mouth_swallow', $npcID, 1
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 			'Taking a step back, you open your mouth again to show <<$npc_firstname[$npcID]>> how much cum is still inside before taking a deep breath and swallowing his entire load in one gulp. Afterwards, you stick your tongue back out to show him a clean mouth that swallowed every last drop.'
 			act 'Continue':cla & gs 'sex_ev_sex', 'sex_end'
-			gs 'sex_ev_reactions', 'cum_react '
+			gs 'sex_ev_reactions', 'cum_react'
 		end
 	end
 
@@ -1457,7 +1530,7 @@ if $ARGS[0] = 'cum_mouth2':
 		sex_ev['spit'] = 1
 		sex_ev['swallow'] = 0
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'mouth', $boy, 1
+		gs 'cum_call', 'mouth', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		if $sex_ev['last_cum'] = 'mouth':
@@ -1478,8 +1551,8 @@ if $ARGS[0] = 'cum_mouth2':
 			sex_ev['spit_count'] += 1
 			sex_ev['mouth_cum_gross'] = 1
 			sex_ev['gag'] = 1
-			sex_ev['react '] = 1
-			gs 'cum_call', 'mouth', $boy, 1
+			sex_ev['react'] = 1
+			gs 'cum_call', 'mouth', $npcID, 1
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/gag2.mp4"></video></center>'
 			'The intensity of the bitter flavor is far more than you expect and you immediately pull your mouth off, spitting out the first load. You stick your tongue out, trying to soldier through and at least take the rest of it but as soon as the next shot hits your tongue your gag reflex kicks in instead, causing you to retch.'
 			'Still holding onto <<$npc_firstname[$npcID]>>''s cock with one hand, you clamp your other hand over your mouth, throat convulsing. It smears the cum on your lips all over your face, but you somehow manage to stop yourself from throwing up all over the bed.'
@@ -1584,7 +1657,7 @@ if $ARGS[0] = 'cum_tits1':
 	sex_ev['cock_inserted'] = 0
 	$sex_ev['last_cum'] = 'tits'
 	sex_ev['cum_tits'] += 1
-	gs 'cum_call', 'face', $boy, 1
+	gs 'cum_call', 'face', $npcID, 1
 	!! differing descriptions based on position
 	cla & *nl
 	if sex_ev['tits_ask'] = 1:
@@ -1631,7 +1704,7 @@ if $ARGS[0] = 'cum_tits2':
 	cla & *clr
 	sex_ev['pc_titcum_jerk'] = 1
 	$sex_ev['last_cum'] = 'tits'
-	gs 'cum_call', 'breasts', $boy, 1
+	gs 'cum_call', 'breasts', $npcID, 1
 	'<center><video autoplay loop src="images/shared/sex/cum/chest/tits2.mp4"></video></center>'
 	if sex_ev['condom'] = 1:
 		'Beckoning <<$npc_firstname[$npcID]>> towards you, he moves forward, straddling your stomach with his legs. You take hold of his member with your hand and immediately start working it. Within two pumps, cum spurts from the tip of his cock, the thick white liquid spattering across your chest, hot against your skin.'
@@ -1645,8 +1718,8 @@ if $ARGS[0] = 'cum_tits3':
 	sex_ev['cock_inserted'] = 0
 	cla & *clr
 	$sex_ev['last_cum'] = 'tits'
-	gs 'cum_call', 'breasts', $boy, 1
-	gs 'cum_call', 'stomach', $boy, 1
+	gs 'cum_call', 'breasts', $npcID, 1
+	gs 'cum_call', 'stomach', $npcID, 1
 	'<center><video autoplay loop src="images/shared/sex/cum/chest/tits4.mp4"></video></center>'
 
 	if sex_ev['he_ask'] > 0:
@@ -1687,8 +1760,8 @@ if $ARGS[0] = 'cum_tits4':
 			sex_ev['cum_tits'] = 1
 			$sex_ev['last_cum'] = 'tits'
 			sex_ev['cum_count'] += 1
-			gs 'cum_call', 'breasts', $boy, 1
-			gs 'cum_call', 'hands', $boy, 1
+			gs 'cum_call', 'breasts', $npcID, 1
+			gs 'cum_call', 'hands', $npcID, 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/chest/tits1.mp4"></video></center>'
@@ -1714,7 +1787,7 @@ if $ARGS[0] = 'cum_tits_end':
 	!! missing code
 	!! sex_end?
 	!! clean code?
-	gs 'sex_ev_reactions', 'cum_react '
+	gs 'sex_ev_reactions', 'cum_react'
 end
 
 if $ARGS[0] = 'creampie_code':
@@ -1729,9 +1802,9 @@ if $ARGS[0] = 'creampie_code':
 	end
 !!	if birth_control['think_safe'] = 0: sex_ev['risky_creampie'] = 1
 
-	gs 'cum_call', '',$boy,1
+	gs 'cum_call', '',$npcID,1
 	$sex_ev['last_cum'] = 'creampie'
-	if $npc_cum_pref = 'creampie': gs 'npc_relationship', 'modify', $boy, 'like'
+	if $npc_cum_pref = 'creampie': gs 'npc_relationship', 'modify', $npcID, 'like'
 	gs 'stat'
 end
 
@@ -1960,7 +2033,7 @@ if $ARGS[0] = 'cum_inside':
 				'You lay there patiently, letting <<$npc_firstname[$npcID]>> empty himself into your womb, waiting until you no longer feel him twitching inside you.'
 				act 'Continue':cla & gs 'sex_ev_sex', 'sex_end'
 				gs 'sex_ev_cum', 'cum_inside_pull_away'
-				gs 'sex_ev_reactions', 'cum_react '
+				gs 'sex_ev_reactions', 'cum_react'
 			end
 
 			act 'Come together':
@@ -2005,7 +2078,7 @@ if $ARGS[0] = 'cum_inside':
 				'You lay there, trying not to squirm as <<$npc_firstname[$npcID]>> orgasm pumps load after load into your womb. Despite your disgust, you don''t move, waiting until you no longer feel him twitching inside you.'
 				act 'Continue':cla & gs 'sex_ev_sex', 'sex_end'
 				gs 'sex_ev_cum', 'cum_inside_pull_away'
-				gs 'sex_ev_reactions', 'cum_react '
+				gs 'sex_ev_reactions', 'cum_react'
 			end
 !!		end
 	elseif $sex_ev['position'] = 'doggy':
@@ -2108,7 +2181,7 @@ if $ARGS[0] = 'cum_inside':
 			end
 		end
 	elseif $sex_ev['position'] = 'anal':
-		gs 'cum_call', 'anus', $boy, 1
+		gs 'cum_call', 'anus', $npcID, 1
 		!!{		if pcs_horny > 90:
 			$orgasm_or = 'yes'
 			gs 'sex_ev_sex', 'fuck_arousal_cum_code'
@@ -2192,7 +2265,7 @@ if $ARGS[0] = 'cum_inside_pull_away':
 				if sex_ev['surprise_cum_together'] = 1 and sex_ev['came_together'] < 3:
 					*nl
 					'<<$npc_firstname[$npcID]>>''s cum.'
-					gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react '
+					gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react'
 				else
 					gs 'sex_ev_sex', 'sex_end'
 				end
@@ -2211,7 +2284,7 @@ if $ARGS[0] = 'cum_inside_pull_away':
 				*nl
 				'<<$npc_firstname[$npcID]>>''s cum.'
 				if sex_ev['came_together'] = 2:
-					gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react '
+					gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react'
 				else
 					gs 'sex_ev_sex', 'sex_end'
 				end
@@ -2295,7 +2368,7 @@ end
 if $ARGS[0] = 'anal_cum_together':
 	sex_ev['came_together'] = 1
 	$sex_ev['last_cum'] = 'anal_creampie'
-	gs 'cum_call', 'anus', $boy, 1
+	gs 'cum_call', 'anus', $npcID, 1
 	cla & *nl
 !!	if sex_ev['he_ask_creampie'] = 1:
 	if sex_ev['he_ask_creampie_yes'] = 1:
@@ -2369,7 +2442,7 @@ if $ARGS[0] = 'surprise_cum_together':
 	else
 		'As your orgasm finishes winding down, you realize with a start that <<$npc_firstname[$npcID]>> isn''t moving and appears to be breathing very heavily.'
 	end
-	gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react '
+	gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react'
 end
 
 if $ARGS[0] = 'anal_surprise_cum_together':
@@ -2382,14 +2455,14 @@ if $ARGS[0] = 'anal_surprise_cum_together':
 		sex_ev['anal_surprise_cum_together'] = 1
 		sex_ev['simultaneous_orgasm_count'] += 1
 		$sex_ev['last_cum'] = 'anal_creampie'
-		gs 'cum_call', 'anus', $boy, 1
+		gs 'cum_call', 'anus', $npcID, 1
 		'As your orgasm finishes winding down, you realize with a start that your ass feels very... <i><b>full</b></i>...'
 		!! previously act 'What the fuck!':
 		gs 'sex_ev_reactions', 'anal_did_you_come_inside'
 	else
 		'As your orgasm finishes winding down, you realize with a start that <<$npc_firstname[$npcID]>> isn''t moving and appears to be breathing very heavily.'
 	end
-	gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react '
+	gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react'
 end
 
 if $ARGS[0] = 'cum_together2':
@@ -2432,7 +2505,7 @@ if $ARGS[0] = 'cum_force':
 	sex_ev['creampie_force'] = 1
 	!! differing descriptions based on position
 	if sex_ev['condom'] = 1 and sex_ev['no_condom'] = 0:
-		gs 'cum_call', '',$boy,1,3
+		gs 'cum_call', '',$npcID,1,3
 !!{		if pcs_horny > 90:
 			$orgasm_or = 'yes'
 			gs 'sex_ev_sex', 'fuck_arousal_cum_code'
@@ -2599,8 +2672,8 @@ if $ARGS[0] = 'cum_pullout':
 			sex_ev['cum_stomach'] += 1
 			sex_ev['cum_stomach'] += 1
 			$sex_ev['cum_describe2'] = 'looking at the white liquid glazing your stomach'
-			gs 'cum_call', 'stomach', $boy, 1
-			gs 'cum_call', 'breasts', $boy, 1
+			gs 'cum_call', 'stomach', $npcID, 1
+			gs 'cum_call', 'breasts', $npcID, 1
 !!			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			'<center><video autoplay loop src="images/shared/sex/cum/stomach/bellycum<<rand(3,4)>>.mp4"></video></center>'
 			'"Pull out!" ' + iif(sex_ev['speed'] < 3, 'you cry.', 'you scream.')
@@ -2608,8 +2681,8 @@ if $ARGS[0] = 'cum_pullout':
 			'<<$npc_firstname[$npcID]>> spreads your legs and yanks his cock from your pussy. After only a couple seconds of jacking himself off, cum erupts from the tip, spattering thick white droplets across your belly and chest.'
 		elseif $sex_ev['position'] = 'doggy':
 			sex_ev['cum_back'] += 1
-			gs 'cum_call', 'butt', $boy,1
-			gs 'cum_call', 'back', $boy,1
+			gs 'cum_call', 'butt', $npcID,1
+			gs 'cum_call', 'back', $npcID,1
 			$sex_ev['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
 			'"Pull out!" ' + iif(sex_ev['speed'] < 3, 'you cry.', 'you scream.')
@@ -2617,7 +2690,7 @@ if $ARGS[0] = 'cum_pullout':
 			'Not even a second passes between feeling <<$npc_firstname[$npcID]>>''s cock slip from your snatch and when hot liquid spatters across your back and dribbles onto your ass.'
 		elseif $sex_ev['position'] = 'cowgirl':
 			$sex_ev['cum_describe2'] = 'looking back at the white liquid glazing your ass'
-			gs 'cum_call', 'butt', $boy,1
+			gs 'cum_call', 'butt', $npcID,1
 			sex_ev['cum_ass'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 			'"Pull out!" ' + iif(sex_ev['speed'] < 3, 'you cry.', 'you scream.')
@@ -2626,8 +2699,8 @@ if $ARGS[0] = 'cum_pullout':
 		end
 	else
 		if $sex_ev['position'] = 'miss':
-			gs 'cum_call', 'stomach', $boy, 1
-			gs 'cum_call', 'breasts', $boy, 1
+			gs 'cum_call', 'stomach', $npcID, 1
+			gs 'cum_call', 'breasts', $npcID, 1
 			$sex_ev['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			sex_ev['cum_stomach'] += 1
 !!			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
@@ -2648,8 +2721,8 @@ if $ARGS[0] = 'cum_pullout':
 				end
 			end
 		elseif $sex_ev['position'] = 'doggy':
-			gs 'cum_call', 'butt', $boy,1
-			gs 'cum_call', 'back', $boy,1
+			gs 'cum_call', 'butt', $npcID,1
+			gs 'cum_call', 'back', $npcID,1
 			sex_ev['cum_back'] += 1
 			sex_ev['cum_ass'] += 1
 			$sex_ev['cum_describe2'] = 'looking back at the white liquid glazing your ass'
@@ -2671,11 +2744,11 @@ if $ARGS[0] = 'cum_pullout':
 			end
 		elseif $sex_ev['position'] = 'cowgirl':
 			if sex_ev['not_inside'] = 1 or sex_ev['condom'] = 1:
-				gs 'cum_call', 'butt', $boy,1
-				gs 'cum_call', 'back', $boy,1
+				gs 'cum_call', 'butt', $npcID,1
+				gs 'cum_call', 'back', $npcID,1
 				sex_ev['cum_stomach'] += 1
 				$sex_ev['cum_describe2'] = 'looking at the white liquid glazing your stomach'
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
+				'<center><video autoplay loop src="images/shared/sex/cum/pullout_cowgirl1.mp4"></video></center>'
 				if sex_ev['not_inside'] = 1:'"Not inside me!" you yelp frantically.'
 				*nl
 				if sex_ev['condom'] = 1:
@@ -2684,8 +2757,8 @@ if $ARGS[0] = 'cum_pullout':
 					'"Oh fuck!" <<$npc_firstname[$npcID]>> suddenly cries out. He barely slips out of you in time and within a split second you feel his cum spatter across your ass and back.'
 				end
 			else
-				gs 'cum_call', 'butt', $boy,1
-				gs 'cum_call', 'back', $boy,1
+				gs 'cum_call', 'butt', $npcID,1
+				gs 'cum_call', 'back', $npcID,1
 				sex_ev['cum_back'] += 1
 				sex_ev['cum_ass'] += 1
 				$sex_ev['cum_describe2'] = 'looking at the white liquid glazing your stomach'
@@ -2815,7 +2888,7 @@ if $ARGS[0] = 'creampie_surprise2':
 end
 
 if $ARGS[0] = 'creampie_surprise_cum_together':
-	sex_ev['react '] = 1
+	sex_ev['react'] = 1
 	if $sex_ev['position'] = 'miss':
 		'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
 		'You lay there, breathing heavily with <<$npc_firstname[$npcID]>> on top of you.'
@@ -2833,7 +2906,7 @@ if $ARGS[0] = 'creampie_surprise_cum_together':
 		'"Did... did we... did you...?" he pants.'
 	end
 
-!!	gs 'sex_ev_reactions_creampie', 'creampie_react '
+!!	gs 'sex_ev_reactions_creampie', 'creampie_react'
 	gs 'sex_ev_reactions', 'react_menu'
 
 	if (sex_ev['orgasm_count'] >= 5 or pcs_sleep < 20) and (hour >= 20 or hour =< 4):
@@ -2990,7 +3063,7 @@ end
 if $ARGS[0] = 'anal_creampie_surprise':
 !!	if sex_ev['condom'] = 1 and sex_ev['no_condom'] ! 1:gt 'sex_ev_cum', 'cum_condom'
 	sex_ev['creampie_surprise'] = 1
-	gs 'cum_call', 'anus', $boy, 1
+	gs 'cum_call', 'anus', $npcID, 1
 	$sex_ev['last_cum'] = 'anal_creampie'
 	if sex_ev['no_condom'] = 1 and sex_ev['creampie_allowance'] < 1 and npc_creampie_permission[$npcID] < 1: sex_ev['accidental_creampie_count'] += 1
 	if $sex_ev['position'] = 'miss':
@@ -3091,7 +3164,7 @@ if $ARGS[0] = 'anal_creampie_surprise2':
 end
 
 if $ARGS[0] = 'anal_creampie_surprise_cum_together':
-	sex_ev['react '] = 1
+	sex_ev['react'] = 1
 	'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
 	'You let your knees give out underneath you, falling down to the bed with <<$npc_firstname[$npcID]>> on top of you. Breathing heavily, you look over your shoulder at him.'
 	if npc_know_love_creampie[$npcID] = 1:
@@ -3101,7 +3174,7 @@ if $ARGS[0] = 'anal_creampie_surprise_cum_together':
 		'"Did... did we... did you...?" he pants.'
 	end
 
-!!	gs 'sex_ev_reactions_creampie', 'creampie_react '
+!!	gs 'sex_ev_reactions_creampie', 'creampie_react'
 	gs 'sex_ev_reactions', 'react_menu'
 
 	if (sex_ev['orgasm_count'] >= 5 or pcs_sleep < 20) and (hour >= 20 or hour =< 4):
@@ -3164,10 +3237,10 @@ end
 
 if $ARGS[0] = 'cum_condom':
 	cla & *clr
-	gs 'cum_call', '',$boy,1,3
+	gs 'cum_call', '', $npcID, 1, 3
 	$sex_ev['last_cum'] = 'condom'
 	!! remove later when reactions are written
-!!	sex_ev['react '] = 1
+!!	sex_ev['react'] = 1
 
 
 	if sex_ev['orgasm'] < orgasm:
@@ -3368,102 +3441,150 @@ if $ARGS[0] = 'broken_condom2':
 	end
 end
 
-if $ARGS[0] = 'girl_cum_condom_react ':
+if $ARGS[0] = 'girl_cum_condom_react':
 
 end
 
 
+if $ARGS[0] = '2pump_enjoyment_desc':
+	if $sex_ev['fuck_enjoyment'] = 'enjoy':
+		'Not that the enjoyment lasts very long.'
+	elseif $sex_ev['fuck_enjoyment'] = 'unsatisfying':
+		'Not that the experience lasts very long.'
+	elseif $sex_ev['fuck_enjoyment'] = 'painful':
+		'Thankfully, the pain doesn''t last very long.'
+	else
+		!! failsafe
+		'Though it doesn''t last very long.'
+	end
+	'"Oh fuck! I''m cumming!"'
+end
+
 if $ARGS[0] = '2pumpchump':
-	act 'Continue':
-		if sex_ev['condom'] = 1 and sex_ev['no_condom'] = 0:
+	if $sex_ev['cum_choice'] = 'creampie_surprise' or $sex_ev['cum_choice'] = 'creampie' or sex_ev['condom'] = 1:
+		gs 'cum_call', '', $npcID, 1, 3
+		!! remove later when reactions are written
+	!!	sex_ev['react'] = 1
+		if $sex_ev['position'] = 'miss':
+			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie1.mp4"></video></center>'
+			gs 'sex_ev_cum', '2pump_enjoyment_desc'
+			'It can''t be more than 30 seconds before <<$npc_usedname[$npcID]>> suddenly stiffens up and thrusts his dick into you to the hilt.'
+		elseif $sex_ev['position'] = 'doggy':
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum71.jpg"></center>'
+			gs 'sex_ev_cum', '2pump_enjoyment_desc'
+			'It can''t be more than 30 seconds before <<$npc_usedname[$npcID]>> suddenly stiffens up and thrusts his dick to the hilt behind you.'
+		elseif $sex_ev['position'] = 'cowgirl':
+			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
+			gs 'sex_ev_cum', '2pump_enjoyment_desc'
+			'It can''t be more than 30 seconds before <<$npc_usedname[$npcID]>> suddenly stiffens up, grabs your hips, and pulls you down all the way to the base of his cock.'
+		end
+		if sex_ev['condom'] = 1:
 			$sex_ev['last_cum'] = 'condom'
-			gs 'cum_call', '',$boy,1,3
-			!! remove later when reactions are written
-		!!	sex_ev['react '] = 1
-			if $sex_ev['position'] = 'miss':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
-				'<<$npc_firstname[$npcID]>> thrusts into you no more than <<rand(1,5)>> times total when his body suddenly stiffens up and groans, "Oh fuck!"'
-			elseif $sex_ev['position'] = 'doggy':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum71.jpg"></center>'
-				'<<$npc_firstname[$npcID]>> thrusts into from behind you no more than <<rand(1,5)>> times total when his body suddenly stiffens up and you hear him groan, "Oh fuck!"'
-			elseif $sex_ev['position'] = 'cowgirl':
-				'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
-				'You bounce on top of <<$npc_firstname[$npcID]>> no more than <<rand(1,5)>> times total when his body suddenly stiffens beneath you and he grabs your hips, groaning, "Oh fuck!"'
-			end
-			'<<$npc_firstname[$npcID]>>''s cock throbs inside you, as well as something distinct moving beneath the latex of the condom. Seems like he''s already come.'
+			'His cock throbs inside you and distinct moves inside the latex of the condom.'
 			if condom_break > 0:
 				gs 'sex_ev_cum', 'broken_condom1'
 			else
-				gs 'sex_ev_cum', '2pumpchump_condom'
+				act 'Continue': gt 'sex_ev_cum', '2pumpchump_condom'
 			end
-		elseif rand(1,2) = 1 and sex_ev['extra_caution'] = 0 and sex_ev['no_condom'] = 1 and sex_ev['creampie_allowance'] ! 1:
+		elseif sex_ev['no_condom'] = 1:
 			sex_ev['creampie_surprise'] = 1
 			gs 'sex_ev_cum', 'creampie_code'
-			if $sex_ev['position'] = 'miss':
-				'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie1.mp4"></video></center>'
-				'<<$npc_firstname[$npcID]>> thrusts into you no more than <<rand(1,5)>> times total when he suddenly grabs you tight as his body stiffens up, groaning, "Oh fuck!"'
-			elseif $sex_ev['position'] = 'doggy':
-				'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/doggy3.mp4"></video></center>'
-				'<<$npc_firstname[$npcID]>> thrusts into you from behind no more than <<rand(1,5)>> times total when he suddenly grabs you tight as his body stiffens up, groaning, "Oh fuck!"'
-			elseif $sex_ev['position'] = 'cowgirl':
-				'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
-				'You bounce on top of <<$npc_firstname[$npcID]>> no more than <<rand(1,5)>> times total when he suddenly grabs you tight and his body stiffens beneath you, groaning, "Oh fuck!"'
-			end
 			*nl
 			'His cock pulses within you and warmth floods your pussy.'
 			gs 'sex_ev_cum', '2pumpchump_creampie'
-		else
-			$sex_ev['last_cum'] = 'pullout'
-			sex_ev['cock_inserted'] = 0
-			if $sex_ev['position'] = 'miss':
-				gs 'cum_call', 'stomach', $boy, 1
-				$sex_ev['cum_describe2'] = 'looking at the white liquid glazing your stomach'
-				sex_ev['cum_stomach'] += 1
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
-				'<<$npc_firstname[$npcID]>> thrusts into you no more than <<rand(1,5)>> times total when he suddenly suddenly cries out, "Oh fuck!"'
-				*nl
-				'His cock slips from your pussy and immediately sticky white liquid erupts from the tip, spattering across your stomach.'
-			elseif $sex_ev['position'] = 'doggy':
-				gs 'cum_call', 'butt', $boy,1
-				gs 'cum_call', 'back', $boy,1
-				sex_ev['cum_back'] += 1
-				sex_ev['cum_ass'] += 1
-				$sex_ev['cum_describe2'] = 'looking back at the white liquid glazing your ass'
-				'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
-				'<<$npc_firstname[$npcID]>> thrusts into you from behind no more than <<rand(1,5)>> times total when he suddenly suddenly cries out, "Oh fuck!"'
-				*nl
-				'His cock slips from your snatch and not even a moment later, hot sticky liquid spatters across your ass and back.'
-			elseif $sex_ev['position'] = 'cowgirl':
-				if sex_ev['not_inside'] = 1:
-					gs 'cum_call', 'stomach', $boy, 1
-					sex_ev['cum_stomach'] += 1
-					$sex_ev['cum_describe2'] = 'looking at the white liquid glazing your stomach'
-					'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
-					'You bounce on top of <<$npc_firstname[$npcID]>> no more than <<rand(1,5)>> times total when he suddenly groans, "Oh fuck!"'
-					*nl
-					'He pushes you off him and onto your back, his cock popping out of you along the way. The second it clears your pussy, sticky white liquid erupts from the tip and spatters across your stomach.'
-				end
-			end
-			gs 'sex_ev_cum', '2pumpchump_pullout'
 		end
+	else
+		$sex_ev['last_cum'] = 'pullout'
+		sex_ev['cock_inserted'] = 0
+		if $sex_ev['position'] = 'miss':
+			gs 'cum_call', 'stomach', $npcID, 1
+			$sex_ev['cum_describe2'] = 'looking at the white liquid glazing your stomach'
+			sex_ev['cum_stomach'] += 1
+			'<center><video autoplay loop src="images/shared/sex/cum/stomach/bellycum5.mp4"></video></center>'
+			gs 'sex_ev_cum', '2pump_enjoyment_desc'
+			'It can''t be more than 30 seconds before <<$npc_usedname[$npcID]>> suddenly pulls out.'
+			*nl
+			'He pumps his shaft with his hand exactly once and cum erupts from the tip, spattering across your stomach.'
+		elseif $sex_ev['position'] = 'doggy':
+			gs 'cum_call', 'butt', $npcID,1
+			gs 'cum_call', 'back', $npcID,1
+			sex_ev['cum_back'] += 1
+			sex_ev['cum_ass'] += 1
+			$sex_ev['cum_describe2'] = 'looking back at the white liquid glazing your ass'
+			'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
+			'It can''t be more than 30 seconds before <<$npc_usedname[$npcID]>> suddenly pulls out.'
+			*nl
+			'His cock slips from your snatch and not even a moment later, hot sticky liquid spatters across your ass and back.'
+		elseif $sex_ev['position'] = 'cowgirl':
+			gs 'cum_call', 'butt', $npcID,1
+			gs 'cum_call', 'back', $npcID,1
+			sex_ev['cum_stomach'] += 1
+			$sex_ev['cum_describe2'] = 'looking at the white liquid glazing your stomach'
+			'<center><video autoplay loop src="images/shared/sex/cum/pullout_cowgirl1.mp4"></video></center>'
+			'It can''t be more than 30 seconds before <<$npc_usedname[$npcID]>> suddenly slips his cock out from under you and feel something hot and wet spattering across your back.'
+		end
+		act 'Continue': gt 'sex_ev_cum', '2pumpchump_pullout'
 	end
 end
 
 if $ARGS[0] = '2pumpchump_condom':
-	act 'Continue':
+	sex_ev['cock_inserted'] = 0
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/shared/sex/cum/condom1.jpg"></center>'
+	if $sex_ev['position'] = 'miss':
+		'As <<$npc_firstname[$npcID]>> withdraws his cock from your pussy, you can see that the latex covering it is sagging and filled with white liquid. Any doubt you had that he hadn''t just nutted immediately is erased by the visual evidence.'
+	elseif $sex_ev['position'] = 'doggy':
+		'As <<$npc_firstname[$npcID]>> withdraws his cock from your pussy, you look over your shoulder and can see that the latex covering it is sagging and filled with white liquid. Any doubt you had that he hadn''t just nutted immediately is erased by the visual evidence.'
+	elseif $sex_ev['position'] = 'cowgirl':
+		'As you pull yourself off of <<$npc_firstname[$npcID]>>, his cock flops from your pussy you can see clearly that the latex covering it is sagging and filled with white liquid. Any doubt you had that he hadn''t just nutted immediately is erased by the visual evidence.'
+	end
+	*nl
+	'He looks incredibly uncomfortable and embarrassed.'
+	gs 'sex_ev_reactions', '2pump_react'
+end
+
+
+if $ARGS[0] = '2pumpchump_creampie':
+	act'Let him pull out':
+		sex_ev['cock_inserted'] = 0
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/condom1.jpg"></center>'
 		if $sex_ev['position'] = 'miss':
-			'As <<$npc_firstname[$npcID]>> withdraws his cock from your pussy, you can see that the latex covering it is sagging and filled with white liquid. Any doubt you had that he hadn''t just nutted immediately is erased by the visual evidence.'
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/oops.jpg"></center>'
+			'As <<$npc_firstname[$npcID]>> withdraws his cock from your pussy, feel a <i>pop</i> inside you and milky white fluid spills out from your snatch.'
 		elseif $sex_ev['position'] = 'doggy':
-			'As <<$npc_firstname[$npcID]>> withdraws his cock from your pussy, you look over your shoulder and can see that the latex covering it is sagging and filled with white liquid. Any doubt you had that he hadn''t just nutted immediately is erased by the visual evidence.'
+			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/doggy2.mp4"></video></center>'
+			'As <<$npc_firstname[$npcID]>> withdraws his cock from your pussy, feel a <i>pop</i> inside you and something thick dribble out of your snatch.'
 		elseif $sex_ev['position'] = 'cowgirl':
+			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cowgirl3.mp4"></video></center>'
 			'As you pull yourself off of <<$npc_firstname[$npcID]>>, his cock flops from your pussy you can see clearly that the latex covering it is sagging and filled with white liquid. Any doubt you had that he hadn''t just nutted immediately is erased by the visual evidence.'
 		end
 		*nl
 		'He looks incredibly uncomfortable and embarrassed.'
-		gs 'sex_ev_reactions', '2pump_react '
+		gs 'sex_ev_reactions', '2pump_react'
+	end
+	gs 'sex_ev_reactions_creampie', 'did_you_come_inside'
+end
+
+if $ARGS[0] = '2pumpchump_pullout':
+	sex_ev['cock_inserted'] = 0
+	cla & *clr
+	if $sex_ev['position'] = 'miss':
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
+	elseif $sex_ev['position'] = 'doggy':
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+	elseif $sex_ev['position'] = 'cowgirl':
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_cowgirl1.jpg"></center>'
+	end
+	if $sex_ev['position'] = 'miss':
+		'You look down at the cum spattered across your belly.'
+	elseif $sex_ev['position'] = 'doggy':
+		'You look over your shoulder at the cum spattered across your back.'
+	elseif $sex_ev['position'] = 'cowgirl':
+		'You look over your shoulder at the cum spattered across your back.'
 	end
+	*nl
+	'He looks incredibly uncomfortable and embarrassed.'
+	gs 'sex_ev_reactions', '2pump_react'
 end
 
 

+ 43 - 32
locations/sex_ev_doggy.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'doggy_start':
 !!	elseif sex_ev['change_pos'] = 1:
 	if sex_ev['first_insertion'] = 0:
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy1.jpg"></center>'
 		'<<$npc_firstname[$npcID]>> pushes you down onto the bed and puts his hands on your knees and spreads your legs apart, placing his <<$npc_dick_desc[$npcID]>> cock right on top of your pussy as he prepares to fuck you.'
 		act '"I''ve been waiting for this"':
 			cla & *nl
@@ -211,24 +211,24 @@ if $ARGS[0] = 'doggy_insert_slow':
 
 			act 'Enjoyment':
 				cla
-				$sex_ev['fuck_enjoyment'] = 'enjoy'
+				!! $sex_ev['fuck_enjoyment'] = 'enjoy'
 
 				act 'Moan':
 					cla & *nl
 					'You let out a loud moan as heat fills up your insides and your pussy begins to salivate with just the insertion of his cock.'
-					gs 'sex_ev_doggy', 'doggy_goto2'
+					gs 'sex_ev_doggy', 'doggy_goto'
 				end
 
 				act 'Groan':
 					cla & *nl
 					'You let out a husky groan as an indescribable <i>ache</i> rocks through your insides. Like a crumb of bread to a woman starving to death, just the insertion of his cock sets your lustful hunger ablaze.'
-					gs 'sex_ev_doggy', 'doggy_goto2'
+					gs 'sex_ev_doggy', 'doggy_goto'
 				end
 
 				act 'Gasp':
 					cla & *nl
 					'You gasp as the pleasure of his insertion sends heat washing through your hips and electric tingles racing across your skin.'
-					gs 'sex_ev_doggy', 'doggy_goto2'
+					gs 'sex_ev_doggy', 'doggy_goto'
 				end
 
 				act 'Say something sexy':
@@ -256,7 +256,7 @@ if $ARGS[0] = 'doggy_insert_slow':
 							'"Ah~!" you moan, toes curling as he finishes inserting his <<$npc_dick_desc[$npcID]>> cock into your pussy, and give him a lascivious smile. "You''re a perfect fit for my pussy..."'
 						end
 					end
-					gs 'sex_ev_doggy', 'doggy_goto2'
+					gs 'sex_ev_doggy', 'doggy_goto'
 				end
 
 				if $npc_dick_desc[$npcID] = 'long' or $npc_dick_desc[$npcID] = 'huge' or $npc_dick_desc[$npcID] = 'enormous' or $npc_dick_desc[$npcID] = 'lengthy' or $npc_dick_desc[$npcID] = 'gigantic' or $npc_dick_desc[$npcID] = 'monster':
@@ -275,7 +275,7 @@ if $ARGS[0] = 'doggy_insert_slow':
 								'"Nngh~! <i>Fuck,</i> you''re so big!" you groan loudly, grinning as you do.'
 							end
 						end
-						gs 'sex_ev_doggy', 'doggy_goto2'
+						gs 'sex_ev_doggy', 'doggy_goto'
 					end
 				end
 			end
@@ -352,7 +352,7 @@ if $ARGS[0] = 'doggy_insert_orgasm':
 	if orgasm_buildup >= 100 or pcs_traits['easy_orgasms'] > 0 and hypnoHardToCum = 0:
 		act 'Orgasm!':
 			cla & *clr
-			$sex_ev['fuck_enjoyment'] = 'enjoy'
+			!! $sex_ev['fuck_enjoyment'] = 'enjoy'
 			if sex_ev['orgasm'] = orgasm:
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal', -1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
@@ -440,7 +440,9 @@ if $ARGS[0] = 'doggy_goto':
 end
 
 if $ARGS[0] = 'doggy_goto2':
-	if sex_ev['fuck_count'] = 0:
+	if npc_two_pump[$npcID] > 0 and sex_ev['2pump'] = 0:
+		act 'Continue': gt 'sex_ev_cum', '2pumpchump'
+	elseif sex_ev['fuck_count'] = 0:
 		gs 'sex_ev_doggy', 'doggy_goto'
 	else
 		sex_ev['cock_inserted'] = 1
@@ -487,7 +489,7 @@ if $ARGS[0] = 'doggy_pain2':
 	act 'Don''t ruin the mood':
 		cla & *clr
 		$orgasm_or = 'no'
-		gs 'sex_ev_sex', 'fuck_arousal_code'
+		
 		'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/3.jpg"></center>'
 		'As much as you want the pain to stop, the idea of speaking up and ruining the mood makes you cringe. Instead, you let your arms collapse and bury your face into the pillow, hoping that it muffles the sound you make every time <<$npc_firstname[$npcID]>> thrusts into you.'
 		gs 'sex_ev_cum', 'fuck_cum'
@@ -603,13 +605,14 @@ end
 
 if $ARGS[0] = 'doggy1':
 	sex_ev['doggy_fuck'] = 1
+	sex_ev['orgasm'] = orgasm
 	!! slow pace
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
 	$sex_ev['position'] = 'doggy'
 	$sex_ev['pos_speed'] = 'doggy1'
 	!! sex_ev['doggy_fuck'] tracks if you fuck in this position
 	if pcs_vag = 0 and sex_ev['fuck_count'] = 0:gt 'sex_ev_virgin', 'doggy_virg_norm1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/slow1.mp4"></video></center>'
 	if mesec > 0:
 !!		'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/blood1.jpg"></center>'
@@ -814,7 +817,7 @@ if $ARGS[0] = 'doggy1.1':
 	$sex_ev['position'] = 'doggy'
 	$sex_ev['pos_speed'] = 'doggy1'
 	sex_ev['speed'] = 1
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/slow2.mp4"></video></center>'
 	gs 'sex_ev_doggy', 'doggy1.1_desc'
@@ -827,7 +830,7 @@ if $ARGS[0] = 'doggy1.2':
 	$sex_ev['position'] = 'doggy'
 	$sex_ev['pos_speed'] = 'doggy1'
 	sex_ev['speed'] = 1
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	gs 'sex_ev_doggy', 'doggy_vid'
 	if $sex_ev['fuck_enjoyment'] = 'painful':
@@ -923,8 +926,8 @@ if $ARGS[0] = 'doggy1.2':
 		gs 'sex_ev_doggy', 'doggy1_boy_talk2'
 		*nl
 	elseif sex_ev['casual_talk'] > 0:
-		if mid($boy,1,1) = 'A':
-			gs 'sex_ev_sex_talk_<<$boy>>', 'talk_output'
+		if mid($npcID,1,1) = 'A':
+			gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_output'
 !!			else
 
 		end
@@ -953,13 +956,14 @@ end
 
 if $ARGS[0] = 'doggy2':
 	sex_ev['doggy_fuck'] = 1
+	sex_ev['orgasm'] = orgasm
 	!! medium pace
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
 	$sex_ev['position'] = 'doggy'
 	$sex_ev['pos_speed'] = 'doggy2'
 	!! sex_ev['doggy_fuck'] tracks if you fuck in this position
 	if pcs_vag = 0 and sex_ev['fuck_count'] = 0:gt 'sex_ev_virgin', 'doggy_virg_norm1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/med1.mp4"></video></center>'
 	if mesec > 0:
 !!		'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/blood1.jpg"></center>'
@@ -1126,7 +1130,7 @@ if $ARGS[0] = 'doggy2':
 			cla & *clr
 			$sex_ev['fuck_enjoyment'] = 'unsatisfying'
 			$orgasm_or = 'no'
-			gs 'sex_ev_sex', 'fuck_arousal_code'
+			
 			'<center><video autoplay loop src="images/shared/sex/vag/doggy/med2.mp4"></video></center>'
 			'You sigh internally, but decide not to ruin the mood. <<$npc_firstname[$npcID]>> continues to enthusiastically clap your cheeks and you let your expression lapse into boredom, grateful that at least you don''t have to act like you''re having a good time.'
 			gs 'sex_ev_cum', 'fuck_cum'
@@ -1155,7 +1159,7 @@ if $ARGS[0] = 'doggy2':
 			cla & *clr
 			sex_ev['bored'] = 1
 			$orgasm_or = 'no'
-			gs 'sex_ev_sex', 'fuck_arousal_code'
+			
 			'<center><video autoplay loop src="images/shared/sex/vag/doggy/med2.mp4"></video></center>'
 			'You sigh internally, but decide not to ruin the mood. <<$npc_firstname[$npcID]>> continues to enthusiastically clap your cheeks and you let your expression lapse into boredom, grateful that at least you don''t have to act like you''re having a good time.'
 			gs 'sex_ev_cum', 'fuck_cum'
@@ -1171,7 +1175,7 @@ if $ARGS[0] = 'doggy2.1':
 	$sex_ev['position'] = 'doggy'
 	$sex_ev['pos_speed'] = 'doggy2'
 	sex_ev['speed'] = 2
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	gs 'sex_ev_doggy', 'doggy_vid'
 	gs 'sex_ev_doggy', 'doggy2.1_desc'
@@ -1185,7 +1189,7 @@ if $ARGS[0] = 'doggy2.2':
 	$sex_ev['position'] = 'doggy'
 	$sex_ev['pos_speed'] = 'doggy2'
 	sex_ev['speed'] = 2
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	gs 'sex_ev_doggy', 'doggy_vid'
 	if $sex_ev['fuck_enjoyment'] = 'painful':
@@ -1265,8 +1269,8 @@ if $ARGS[0] = 'doggy2.2':
 			*nl
 			'All your dirty talk is just that: talk. For all the effort <<$npc_firstname[$npcID]>> is putting in, you can''t say it feels very good. But you don''t want <<$npc_firstname[$npcID]>> to feel bad about it either so you play along, pretending otherwise.'
 		elseif sex_ev['casual_talk'] > 0:
-			if mid($boy,1,1) = 'A':
-				gs 'sex_ev_sex_talk_<<$boy>>', 'talk_output'
+			if mid($npcID,1,1) = 'A':
+				gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_output'
 	!!			else
 
 			end
@@ -1293,8 +1297,8 @@ if $ARGS[0] = 'doggy2.2':
 		gs 'sex_ev_doggy', 'doggy2_boy_talk1'
 		gs 'sex_ev_doggy', 'doggy2_boy_talk2'
 	elseif sex_ev['casual_talk'] > 0:
-		if mid($boy,1,1) = 'A':
-			gs 'sex_ev_sex_talk_<<$boy>>', 'talk_output'
+		if mid($npcID,1,1) = 'A':
+			gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_output'
 !!			else
 
 		end
@@ -1311,7 +1315,7 @@ if $ARGS[0] = 'doggy2.bored':
 	sex_ev['doggy_fuck'] = 1
 	cla & *clr
 	$sex_ev['pos_speed'] = 'doggy2'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/bored2.mp4"></video></center>'
 	'He keeps fucking you at a medium pace. It''s boring.'
@@ -1321,6 +1325,7 @@ end
 if $ARGS[0] = 'doggy3':
 	sex_ev['doggy_fuck'] = 1
 	sex_ev['rough_check'] = 1
+	sex_ev['orgasm'] = orgasm
 	!! fast/rough pace
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
 	$sex_ev['position'] = 'doggy'
@@ -1490,7 +1495,7 @@ if $ARGS[0] = 'doggy3':
 						sex_ev['orgasm'] = orgasm
 						sex_ev['rough_enjoy'] = 1
 						$sex_ev['fuck_enjoyment'] = 'enjoy'
-						gs 'sex_ev_sex', 'fuck_arousal_code'
+						
 						cla & *nl
 						'You scream another cry of agonizing pleasure and grimace at <<$npc_firstname[$npcID]>>.'
 						'"If you slow down I will <i>fucking</i> kill you," you snarl, throwing your hips forward to slam into his for more force.'
@@ -1625,7 +1630,7 @@ if $ARGS[0] = 'doggy3.1':
 		'"Yeah <i>bitch?!</i>" <<$npc_firstname[$npcID]>> snarls. "You want me to fuck you harder? Well, then take it you fucking slut!" and starts roughly fucking you in a way completely unlike his previous mannerisms.'
 		act 'Enjoy it':
 			cla & *nl
-			gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+			
 			sex_ev['rough_enjoy'] = 1
 			$sex_ev['fuck_enjoyment'] = 'enjoy'
 			gs 'sex_ev_doggy', 'doggy3.1_desc'
@@ -1643,7 +1648,7 @@ if $ARGS[0] = 'doggy3.1':
 			gs 'sex_ev_cum', 'fuck_cum'
 		end
 	else
-		gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+		
 		'<center><video autoplay loop src="images/shared/sex/vag/doggy/hard1.mp4"></video></center>'
 		'<<$npc_firstname[$npcID]>> picks up the pace, pounding you from behind. You throw your hips back in joyous ecstasy, feeling greater and greater pleasure every time his hips slam into you.'
 !!		gs 'sex_ev_doggy', 'doggy3.1_desc'
@@ -1660,7 +1665,7 @@ if $ARGS[0] = 'doggy3.2':
 	$sex_ev['position'] = 'doggy'
 	$sex_ev['pos_speed'] = 'doggy3'
 	sex_ev['speed'] = 3
-	gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+	
 	cla & *clr
 	gs 'sex_ev_doggy', 'doggy_vid'
 	if $sex_ev['fuck_enjoyment'] = 'painful':
@@ -2083,7 +2088,9 @@ end
 if $ARGS[0] = 'doggy1.2_dirty_talk':
 !! '"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal. "You''re so deep! I can feel you inside me..."'
 	if $sex_ev['dirty_talk'] = 'cock':
-		if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
+		if rand(1,3) = 1:
+			iif(stat['no_sex_swearing'] = 0, '"Fuck~!" you pant. "Your cock is so fucking hard inside me~! Oh fuck~! Oh fuck~!"', '<i>"Nngh~!"</i> you groan. "You''re so hard inside me~! <i>Mmph~!</i> It feels so good~!"')
+		elseif $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
 			'"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal as <<$npc_firstname[$npcID]>> does an amazing job fucking you with his tiny cock. "You''re so good! Right there~! Right there!"'
 		elseif $npc_dick_desc[$npcID] = 'chode':
 			'"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal as <<$npc_firstname[$npcID]>> does an amazing job fucking you with his stubby cock. "Fuck me with your fat chode!"'
@@ -2405,7 +2412,9 @@ end
 if $ARGS[0] = 'doggy2.2_dirty_talk':
 !!	'"Ah! Fuck! Just like that!" you moan loudly. "Fuck my pussy with your big cock! Right there! Fuck! You''re so good!"'
 	if $sex_ev['dirty_talk'] = 'cock':
-		if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
+		if rand(1,3) = 1:
+			iif(stat['no_sex_swearing'] = 0, '"Fuck~!" you pant. "Your cock is so fucking hard inside me~! Oh fuck~! Oh fuck~!"', '<i>"Nngh~!"</i> you groan. "You''re so hard inside me~! <i>Mmph~!</i> It feels so good~!"')
+		elseif $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
 			'"Ah! <i>Fuck!</i> Yes! Yes! Fuck my pussy with your tiny dick! " you moan loudly. "Don''t stop! You''re so <i>fucking</i> good!"'
 		elseif $npc_dick_desc[$npcID] = 'chode':
 			'"Ah! <i>Fuck!</i> Yes! Yes! Fuck my pussy with your fat chode! " you moan loudly. "Don''t stop! You''re so <i>fucking</i> good!"'
@@ -2830,7 +2839,9 @@ end
 if $ARGS[0] = 'doggy3.2_dirty_talk':
 !!	'"Yes! Fuck! Yes! Just like that!" you scream. "Pound my pussy! Clap my ass! Fill me with your cock!"'
 	if $sex_ev['dirty_talk'] = 'cock':
-		if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
+		if rand(1,3) = 1:
+			iif(stat['no_sex_swearing'] = 0, '"Fuck~!" you pant. "Your cock is so fucking hard inside me~! Oh fuck~! Oh fuck~!"', '<i>"Nngh~!"</i> you groan. "You''re so hard inside me~! <i>Mmph~!</i> It feels so good~!"')
+		elseif $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
 			'"Yes! Fuck! Yes! Just like that!" you scream so hard it hurts. "Clap my fucking ass! Fuck me with your tiny cock!"'
 		elseif $npc_dick_desc[$npcID] = 'chode':
 			'"Yes! Fuck! Yes! Just like that!" you scream so hard it hurts. "Clap my fucking ass! "Fuck me with your fat chode!"'

+ 1 - 1
locations/sex_ev_dress_talking.qsrc

@@ -757,7 +757,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		gs 'booty_call', 'set_booty_call_date'
 		gs 'sex_ev_leave', 'dress_loop'
 		'"I think I can fit that in," you smirk, <<$sex_ev[''dress_describe'']>>.'
-		if npc_humor[$npcID] = 2:
+		if $npc_humor[$npcID] = 'perverted':
 			'"You sure can," <<$npc_firstname[$npcID]>> grins lewdly at you.'
 		else
 			'"Great," <<$npc_firstname[$npcID]>> grins back.'

+ 10 - 10
locations/sex_ev_events.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'sex_film_protest':
 					!! if npc_abusive[$npcID] > 0: he doesn''t delete it
 					!! $sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 					!! $sex_ev['video_dialogue'] = 'Please~! Mmph~! I don''t want to be filmed~!'
-					!! $sex_ev['video_author'] = $boy
+					!! $sex_ev['video_author'] = $npcID
 				else
 					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 					if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
@@ -67,7 +67,7 @@ if $ARGS[0] = 'sex_film_protest':
 						$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Fuck, you look so hot."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
 					end
 
-					$sex_ev['video_author'] = $boy
+					$sex_ev['video_author'] = $npcID
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					'"Please~! Mmph~! I don''t want to be filmed~!" you whimper again, feeling cold panic fill your chest.'
@@ -109,10 +109,10 @@ if $ARGS[0] = 'sex_film_protest':
 					!! if npc_abusive[$npcID] > 0: he doesn''t delete it
 					!! $sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 					!!$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"'
-					!! $sex_ev['video_author'] = $boy
+					!! $sex_ev['video_author'] = $npcID
 				else
 					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					$sex_ev['video_author'] = $boy
+					$sex_ev['video_author'] = $npcID
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					'"Seriously~! Nngh~! Stop it~!" you keep protesting, face hot with self consciousness and annoyance.'
@@ -140,7 +140,7 @@ if $ARGS[0] = 'sex_film_protest':
 				sex_ev['phone_film'] = 2
 				$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 				$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."'
-				$sex_ev['video_author'] = $boy
+				$sex_ev['video_author'] = $npcID
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
 				'You let <<$npc_firstname[$npcID]>> film you getting fucked by him, fuming in silence, occasionally turning to cover your face just to spite him.'
@@ -163,7 +163,7 @@ if $ARGS[0] = 'sex_film_protest':
 					!!$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck! Fuck off~! Put that thing away~!"'
 				else
 					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					$sex_ev['video_author'] = $boy
+					$sex_ev['video_author'] = $npcID
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					'"Fuck off~! Put that thing away~!" you shout, steaming hot with anger.'
@@ -225,7 +225,7 @@ if $ARGS[0] = 'sex_film_accept':
 		act 'Blush':
 			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
 			$sex_ev['video_dialogue'] = '"Mmph~! Mmph~! Mmm~! Nnn~!"<br>"You''re so fucking hot."'
-			$sex_ev['video_author'] = $boy
+			$sex_ev['video_author'] = $npcID
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
 			'Your cheeks flush with warmth as you realize what <<$npc_firstname[$npcID]>>''s doing and turn your face in embarrassment but don''t make any complaints.'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'sex_film_accept':
 		act 'Ignore the camera':
 			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
 			$sex_ev['video_dialogue'] = '"Hah~! Haa~! Ah~! Haa~!"<br>"You''re so fucking hot."'
-			$sex_ev['video_author'] = $boy
+			$sex_ev['video_author'] = $npcID
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
 			'"Hah~! Haa~! Ah~! Haa~!" You ignore the camera completely, focusing on <<$npc_firstname[$npcID]>>''s cock pumping inside you and just try to stay the moment, letting moans escape your lips as they come. If he wants to film it, he can do what he wants.'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'sex_film_accept':
 		act 'Put on a show':
 			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
 			$sex_ev['video_dialogue'] = '"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodI''mgonnacome~!"<br>"Yeah you like that?"<br>"Don''t stop~! Don''t stop~!"'
-			$sex_ev['video_author'] = $boy
+			$sex_ev['video_author'] = $npcID
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
 			'"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodImgonnacome~!"'
@@ -355,7 +355,7 @@ if $ARGS[0] = 'offer_ciga1':
 					end
 
 					act 'It''s okay ':
-						gs 'npc_relationship', 'modify', $boy, 'like'
+						gs 'npc_relationship', 'modify', $npcID, 'like'
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 						'You shake your head.'

+ 12 - 12
locations/sex_ev_favorite_part.qsrc

@@ -207,7 +207,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 		if npc_tasty_cum[$npcID] ! 1:
 			act 'Your cum is disgusting':
 				npc_gross_cum[$npcID] = 1
-				gs 'npc_relationship', 'modify', $boy, 'dislike'
+				gs 'npc_relationship', 'modify', $npcID, 'dislike'
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk3.jpg"></center>'
 				'"You could stand to eat some more fruit if you want me to keep doing it," you say, wrinkling your nose. "Your cum tastes <i>horrible</i>. It''s like drinking expired caviar."'
@@ -217,14 +217,14 @@ if $ARGS[0] = 'cum_mouth_favorite':
 				if npc_argumentative[$npcID] = 1 or npc_insecure[$npcID] = 1:
 					'"Come on, it can''t be that bad," <<$npc_firstname[$npcID]>> scowls at you.'
 					act 'Insist':
-						gs 'npc_relationship', 'modify', $boy, 'dislike'
+						gs 'npc_relationship', 'modify', $npcID, 'dislike'
 						cla & *nl
 						'"Yes, it can be and it is," you say, making a face at him. "I <i>wish</i> was making this up. Yuck!"'
 						gs 'sex_ev_pillow_talk', 'topic_route'
 					end
 					
 					act 'Maybe exaggerating':
-						gs 'npc_relationship', 'modify', $boy, 'like'
+						gs 'npc_relationship', 'modify', $npcID, 'like'
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 						'"Well..." you say. "Maybe I''m exaggerating just a <i>little</i>. But I still don''t like the taste."'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 					end
 					
 					act 'Get sarcastic':
-						gs 'npc_relationship', 'modify', $boy, 'dislike'
+						gs 'npc_relationship', 'modify', $npcID, 'dislike'
 						cla & *clr
 						'<center><video autoplay loop src="images/shared/sex/after/pillow_talk_eyeroll.mp4"></video></center>'
 						'"<i>It can''t be that bad,</i>" you repeat, mocking <<$npc_firstname[$npcID]>> with a squeaky high voice. "I''d like to see you get down there and blow yourself to completion. Then we''ll see."'
@@ -717,7 +717,7 @@ if $ARGS[0] = 'npc_miss_fav1':
 	$sex_ev['boy_favorite'] = 'missionary'
 	'"I liked fucking you," he grins. "Especially when I got to be on top."'
 	act 'Me too':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla
 		act 'It''s pleasant':
 			cla & *nl
@@ -767,7 +767,7 @@ if $ARGS[0] = 'npc_miss_fav1':
 	end
 	
 	act 'Isn''t missionary boring?':
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		cla & *clr
 		if npc_argumentative[$npcID] = 1:
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk3.jpg"></center>'
@@ -787,7 +787,7 @@ if $ARGS[0] = 'npc_doggy_fav1':
 	$sex_ev['boy_favorite'] = 'doggy'
 	'"I liked fucking you," he grins. "Especially when I got to fuck you from behind."'
 	act 'Me too':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla
 		act 'Feels better':
 			cla & *nl
@@ -827,7 +827,7 @@ if $ARGS[0] = 'npc_doggy_fav1':
 	end
 	
 	act 'Isn''t doggy boring?':
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		cla & *clr
 		if npc_argumentative[$npcID] = 1:
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk3.jpg"></center>'
@@ -851,7 +851,7 @@ if $ARGS[0] = 'npc_cowgirl_fav1':
 		'"I liked when you were on top," he grins.'
 	end
 	act 'Me too':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla
 		act 'Feels better':
 			cla & *nl
@@ -890,7 +890,7 @@ if $ARGS[0] = 'npc_cowgirl_fav1':
 	end
 	
 	act 'Cowgirl sucks':
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		cla & *clr
 		if npc_argumentative[$npcID] = 1:
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'npc_cowgirl_fav1':
 end
 
 if $ARGS[0] = 'npc_argue_lashout':
-	gs 'npc_relationship', 'modify', $boy, 'dislike'
+	gs 'npc_relationship', 'modify', $npcID, 'dislike'
 	'"Why''re you being such a bitch?" <<$npc_firstname[$npcID]>> scowls back. "What''s the point of asking me what I liked if you''re just going to piss on it?"'
 	act 'Let it slide':
 		cla & *clr
@@ -917,7 +917,7 @@ if $ARGS[0] = 'npc_argue_lashout':
 	end
 	
 	act 'Apologize':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 		'<<$npc_firstname[$npcID]>>''s response causes you to start. After a moment of shock, you shake your head.'

+ 179 - 47
locations/sex_ev_foreplay.qsrc

@@ -1,9 +1,32 @@
 # sex_ev_foreplay
+!! ------------------------- Functional Code -----------------------
+
+
+if $ARGS[0] = '69_code':
+	if $sex_ev['foreplay_enjoyment'] ! 'enjoy': $orgasm_or = 'no'
+	gs 'arousal', 'bj', 5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
+	gs 'arousal', 'cuni', 5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
+end
+
+if $ARGS[0] = 'bj_code':
+	if $sex_ev['foreplay_enjoyment'] ! 'enjoy': $orgasm_or = 'no'
+	gs 'arousal', 'bj', 5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
+end
+
+if $ARGS[0] = 'cuni_code':
+	if $sex_ev['foreplay_enjoyment'] ! 'enjoy': $orgasm_or = 'no'
+	gs 'arousal', 'cuni', 5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
+end
+
+
 !! ------------------------- Generic Sex Event Foreplay -----------------------
 
 
 
-if $ARGS[0] = 'cock_react ':
+
+
+
+if $ARGS[0] = 'cock_react':
 
 end
 
@@ -42,7 +65,7 @@ if $ARGS[0] = 'generous_initiative':
 		if sex_ev['start_shower'] = 1:
 			'<<$npc_firstname[$npcID]>> drags you back into the bedroom, your hair still wet from the shower, and shoves you backwards onto the bed kneeling between your legs.'
 		else
-			'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
+			'<<$npc_firstname[$npcID]>> begins laying a trail of kisses down your stomach, leading down between your legs.'
 		end
 		gs 'sex_ev_foreplay', 'kuni_start'
 	elseif sex_ev['sensitive_cuni'] = 1:
@@ -52,7 +75,7 @@ if $ARGS[0] = 'generous_initiative':
 		if sex_ev['start_shower'] = 1:
 			'<<$npc_firstname[$npcID]>> drags you back into the bedroom and shoves you backwards onto onto the bed, starting a trail of kisses up your wet stomach, towards your breasts.'
 		else
-			'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed and begins leaving a new trail of kisses up your stomach, towards your breasts.'
+			'<<$npc_firstname[$npcID]>> begins leaving a new trail of kisses up your stomach, towards your breasts.'
 		end
 		act 'Continue':gs 'sex_ev_foreplay', 'nipple_play'
 	end
@@ -220,6 +243,13 @@ end
 
 !! --------------------- generous stuff ---------------------------------------------------
 
+if $ARGS[0] = 'fingering_start':
+	$sex_ev['position'] = 'fingering'
+	gs 'arousal', 'vaginal_finger', 5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
+	'<center><video autoplay loop src="images/shared/sex/foreplay/fingering1.mp4"></video></center>'
+	'<<$npc_usedname[$npcID]>> starts fingering you.'
+end
+
 if $ARGS[0] = 'kuni_ask':
 	act 'Ask him to eat you out':
 		cla & *nl
@@ -376,6 +406,7 @@ if $ARGS[0] = 'period_lick':
 		act 'Don''t stop!':
 			$orgasm_or = 'yes'
 			gs 'arousal', 'cuni',rand(1,2), 'no_orgasm_msg', $sex_ev['prostitution_flag']
+			$orgasm_or = ''
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/kuni/pussylickorgasm2.mp4"></video></center>'
@@ -442,6 +473,7 @@ if $ARGS[0] = 'pussy_lick':
 		act 'Don''t stop!':
 			$orgasm_or = 'yes'
 			gs 'arousal', 'cuni',rand(5,10), 'no_orgasm_msg', $sex_ev['prostitution_flag']
+			$orgasm_or = ''
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/kuni/pussylickorgasm2.mp4"></video></center>'
@@ -479,6 +511,7 @@ if $ARGS[0] = 'pussy_lick_loop':
 			pcs_horny = 90
 			$orgasm_or = 'yes'
 			gs 'arousal', 'cuni',rand(5,10), 'no_orgasm_msg', $sex_ev['prostitution_flag']
+			$orgasm_or = ''
 			gs 'stat'
 			sex_ev['orgasm_count'] += 1
 			sex_ev['consecutive_cuni_orgasm'] += 1
@@ -747,7 +780,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 		act 'Take it in stride (swallow)':
 			sex_ev['bj_cum'] = 1
 			sex_ev['swallow'] = 1
-			gs 'cum_call', 'mouth_swallow', $boy, 1
+			gs 'cum_call', 'mouth_swallow', $npcID, 1
 			sex_ev['cum_count'] += 1
 			gs 'stat'
 			cla & *clr
@@ -761,7 +794,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 		act 'Take it in stride (spit)':
 			sex_ev['bj_cum'] = 2
 			sex_ev['spit'] = 1
-			gs 'cum_call', 'mouth', $boy, 1
+			gs 'cum_call', 'mouth', $npcID, 1
 			sex_ev['cum_count'] += 1
 			gs 'stat'
 			cla & *clr
@@ -776,7 +809,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			sex_ev['bj_cum'] = 4
 			sex_ev['gag'] = 1
 			sex_ev['cum_count'] += 1
-			gs 'cum_call', 'mouth', $boy, 1
+			gs 'cum_call', 'mouth', $npcID, 1
 			gs 'stat'
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
 			'The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erupting with cum and spilling all over <<$npc_firstname[$npcID]>>''s cock and the floor.'
@@ -806,7 +839,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 						'"I promise, I''ll swallow it all next time."'
 						'"Good girl."'
 						gs 'sex_ev_sex', 'sex_end'
-!!						act 'React ':
+!!						act 'react':
 !!							cla & *clr
 !!							'He called you a "good girl" just now. It makes you think...'
 !!						end
@@ -847,7 +880,7 @@ if $ARGS[0] = 'bj_sub_cum_hand':
 		$sex_ev['last_cum'] = 'hand'
 		sex_ev['cum_hand'] = 1
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'hands', $boy, 1
+		gs 'cum_call', 'hands', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/handjob/hand0,1.mp4"></video></center>'
@@ -968,7 +1001,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth2':
 		sex_ev['cum_mouth'] = 1
 		sex_ev['swallow'] = 1
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'mouth_swallow', $boy, 1
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
 		$sex_ev['cum_choice'] = 'swallow'
 		$sex_ev['last_cum'] = 'mouth'
 		gs 'stat'
@@ -991,7 +1024,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_spit':
 		sex_ev['swallow'] = 0
 		sex_ev['cum_count'] += 1
 		$sex_ev['last_cum'] = 'mouth'
-		gs 'cum_call', 'mouth', $boy, 1
+		gs 'cum_call', 'mouth', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit6.mp4"></video></center>'
@@ -1014,7 +1047,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_gag':
 		sex_ev['cum_count'] += 1
 		$sex_ev['cum_choice'] = 'mouth'
 		$sex_ev['last_cum'] = 'mouth'
-		gs 'cum_call', 'mouth', $boy, 1
+		gs 'cum_call', 'mouth', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/yuck2.mp4"></video></center>'
@@ -1027,11 +1060,11 @@ end
 
 if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 	act 'Swallow':
-		sex_ev['cum_swallow'] += 1
+		sex_ev['swallow_count'] += 1
 		$sex_ev['last_cum'] = 'mouth'
 		sex_ev['swallow'] = 1
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'mouth_swallow', $boy, 1
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow4.mp4"></video></center>'
@@ -1042,18 +1075,18 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 	end
 
 	act 'Swallow (gross)':
-		sex_ev['cum_swallow'] += 1
+		sex_ev['swallow_count'] += 1
 		$sex_ev['last_cum'] = 'mouth'
 		sex_ev['swallow'] = 1
-		sex_ev['react '] = 1
+		sex_ev['react'] = 1
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'mouth_swallow', $boy, 1
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/yuck1.mp4"></video></center>'
 		'Thick, salty sperm sprays into your mouth and you can''t help but feel just a little bit nauseous even as you continue to suck out more cum from <<$npc_firstname[$npcID]>>''s cock. But you power through regardless, and with a grimace of deep disgust, you force it down, swallowing the entire load.'
 		*nl
-		if sex_ev['cum_swallow'] > 1:
+		if sex_ev['swallow_count'] > 1:
 			'"<i>Yeech</i>!" you wince. "I''m never going to get used to that!"'
 			'"But you still keep doing it anyway," <<$npc_firstname[$npcID]>> smirks.'
 			'"Yeah, yeah, shut up," you say, rolling your eyes and sticking out your tongue, trying to air it out.'
@@ -1105,7 +1138,7 @@ if $ARGS[0] = 'bj_sub_cum_face1.2':
 		sex_ev['cum_face'] = 1
 		$sex_ev['last_cum'] = 'facial'
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'face', $boy, 1
+		gs 'cum_call', 'face', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -1123,7 +1156,7 @@ if $ARGS[0] = 'bj_sub_cum_face1.2':
 		sex_ev['cum_face'] = 1
 		$sex_ev['last_cum'] = 'facial'
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'face', $boy, 1
+		gs 'cum_call', 'face', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -1140,12 +1173,12 @@ if $ARGS[0] = 'bj_sub_cum_face1.2':
 
 	act 'Stick our your tongue (swallow)':
 		sex_ev['cum_face'] = 1
-		sex_ev['cum_swallow'] += 1
+		sex_ev['swallow_count'] += 1
 		$sex_ev['last_cum'] = 'face_mouth'
 		sex_ev['swallow'] = 1
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'face', $boy, 1
-		gs 'cum_call', 'mouth_swallow', $boy, 1
+		gs 'cum_call', 'face', $npcID, 1
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/facial/facial25.mp4"></video></center>'
@@ -1171,9 +1204,9 @@ if $ARGS[0] = 'bj_sub_cum_face1.2':
 		$sex_ev['last_cum'] = 'face_mouth'
 		sex_ev['spit'] = 1
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'face', $boy, 1
-		gs 'cum_call', 'hair', $boy, 1
-		gs 'cum_call', 'mouth', $boy, 1
+		gs 'cum_call', 'face', $npcID, 1
+		gs 'cum_call', 'hair', $npcID, 1
+		gs 'cum_call', 'mouth', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/facial/facial29.mp4"></video></center>'
@@ -1236,7 +1269,7 @@ if $ARGS[0] = 'bj_sub_cum_tits1.2':
 		sex_ev['cum_tits'] = 1
 		sex_ev['cum_count'] += 1
 		$sex_ev['last_cum'] = 'tits'
-		gs 'cum_call', 'breasts', $boy, 1
+		gs 'cum_call', 'breasts', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/chest/jerk1.mp4"></video></center>'
@@ -1254,7 +1287,7 @@ if $ARGS[0] = 'bj_sub_cum_tits2':
 		sex_ev['cum_tits'] = 1
 		$sex_ev['last_cum'] = 'tits'
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'breasts', $boy, 1
+		gs 'cum_call', 'breasts', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/chest/jerk1.mp4"></video></center>'
@@ -1269,8 +1302,8 @@ if $ARGS[0] = 'bj_sub_cum_tits2':
 			sex_ev['cum_tits'] = 1
 			sex_ev['cum_count'] += 1
 			$sex_ev['last_cum'] = 'tits'
-			gs 'cum_call', 'breasts', $boy, 1
-			gs 'cum_call', 'hands', $boy, 1
+			gs 'cum_call', 'breasts', $npcID, 1
+			gs 'cum_call', 'hands', $npcID, 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/chest/tits1.mp4"></video></center>'
@@ -1301,7 +1334,7 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 		'Semen spills into your mouth and you struggle against him, trying to pull away but he holds you firmly onto his manhood. Tears stream from your eyes, running down your face. All you can do is briefly cough as cum continues to fill your mouth.'
 	end
 	act 'Gag':
-		gs 'cum_call', 'mouth', $boy, 1
+		gs 'cum_call', 'mouth', $npcID, 1
 		sex_ev['cum_count'] += 1
 		gs 'stat'
 		cla & *clr
@@ -1314,10 +1347,10 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 		gs 'sex_ev_foreplay', 'bj_force_cum_submit'
 	end
 	act 'Swallow!':
-		sex_ev['cum_swallow'] += 1
+		sex_ev['swallow_count'] += 1
 		$sex_ev['last_cum'] = 'swallow'
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'mouth_swallow', $boy, 1
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/forced1.mp4"></video></center>'
@@ -1330,10 +1363,10 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 	end
 
 	act 'Swallow (take it in stride)':
-		sex_ev['cum_swallow'] += 1
+		sex_ev['swallow_count'] += 1
 		$sex_ev['last_cum'] = 'swallow'
 		sex_ev['cum_count'] += 1
-		gs 'cum_call', 'mouth_swallow', $boy, 1
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
@@ -1701,12 +1734,12 @@ if $ARGS[0] = 'foreplay_choose':
 
 	if $sex_ev['position'] ! 'blowjob':gs 'sex_ev_foreplay', 'bj_dom1'
 
-!!	if $sex_ev['position'] ! '69':gs 'sex_ev_foreplay', '69_dom1'
+!!	if $sex_ev['position'] ! '69':gs 'sex_ev_foreplay', '69_start'
 
 	if $sex_ev['position'] ! 'facesit':gs 'sex_ev_foreplay', 'facesit_1'
 
 	gs 'sex_ev_foreplay', 'kuni_ask'
-
+	
 	act 'Let him lead':
 		cla & *nl
 		if ((npc_caretaker[$npcID] = 1 and sex_ev['orgasm_count'] = 0) or npc_pussyeater[$npcID] = 1) and rand(1,2) = 1:
@@ -1833,7 +1866,7 @@ end
 if $ARGS[0] = 'hj_cum1':
 	sex_ev['cum_count'] += 1
 	sex_ev['cum_hand'] = 1
-	gs 'cum_call', 'hands', $boy, 1
+	gs 'cum_call', 'hands', $npcID, 1
 	cla & *clr
 	!! change media
 	'<center><video autoplay loop src="images/shared/sex/cum/handjob/hand0,1.mp4"></video></center>'
@@ -1909,7 +1942,7 @@ if $ARGS[0] = 'bj_dom1_cum':
 		end
 
 		act 'In your mouth (swallow)':
-			sex_ev['cum_swallow'] += 1
+			sex_ev['swallow_count'] += 1
 			gs 'sex_ev_foreplay', 'bj_dom_swallow1'
 		end
 
@@ -2065,7 +2098,7 @@ if $ARGS[0] = 'bj_dom2_cum_act ':
 		act 'Tease him to completion':gt 'sex_ev_foreplay', 'bj_dom_tease_cum'
 
 		act 'In your mouth':
-			sex_ev['cum_swallow'] += 1
+			sex_ev['swallow_count'] += 1
 			gs 'sex_ev_foreplay', 'bj_dom_swallow1'
 		end
 
@@ -2091,7 +2124,7 @@ end
 
 if $ARGS[0] = 'bj_dom_tease_cum':
 	cla & *clr
-	gs 'cum_call', 'hands', $boy, 1
+	gs 'cum_call', 'hands', $npcID, 1
 	$sex_ev['cum_choice'] = 'hand'
 	sex_ev['cum_count'] += 1
 	'<center><video autoplay loop src="images/shared/sex/cum/tease_cum1.mp4"></video></center>'
@@ -2101,7 +2134,7 @@ end
 
 if $ARGS[0] = 'bj_dom_spit1':
 !!	sex_ev['cum_mouth_ask'] += 1
-	gs 'cum_call', 'mouth', $boy, 1
+	gs 'cum_call', 'mouth', $npcID, 1
 	sex_ev['swallow'] = 1
 	$sex_ev['cum_choice'] = 'mouth'
 	sex_ev['cum_count'] += 1
@@ -2129,16 +2162,16 @@ if $ARGS[0] = 'bj_dom_swallow1':
 	'You quickly wrap your lips around his cock and plunge down as far as you can go. Not even a second later, he explodes in your mouth, shaft pulsing between your lips, warm liquid splashing against your tonsils. You hold yourself there, eyes tearing up as you let him ride out his orgasm halfway down your throat.'
 	gs 'sex_ev_foreplay', 'bj_sub_cum_mouth_spit'
 	act 'Gulp':
-		gs 'cum_call', 'mouth_swallow', $boy, 1
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
 		sex_ev['cum_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/deep2.mp4"></video></center>'
 		'Carefully, very carefully, you slowly draw your lips back up <<$npc_firstname[$npcID]>>''s cock, sucking the whole time to make sure not a single drop of his cum spills around your lips. It''s really difficult to keep sucking and not choke on the cum pooling at the back of your throat. The effort makes your eyes water, but you still manage to draw all the way back up to his tip where you finally swallow his load and get your first gasp of clean air.'
-		act 'Continue':gt 'sex_ev_foreplay', 'bj_dom_swallow_react '
+		act 'Continue':gt 'sex_ev_foreplay', 'bj_dom_swallow_react'
 	end
 end
 
-if $ARGS[0] = 'bj_dom_swallow_react ':
+if $ARGS[0] = 'bj_dom_swallow_react':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
 	if $npc_cum_pref[$npcID] = 'mouth' and $npc_cum_pref_know[$npcID] = '':
@@ -2261,11 +2294,15 @@ end
 !!
 !!end
 
-if $ARGS[0] = '69_dom1':
-!!{	act '69 him':
+if $ARGS[0] = '69_start':
+!!{	act '69 with <<$npc_usedname[$npcID]>>':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/69/pre1.jpg"></center>'
 		$sex_ev['position'] = '69'
+		sex_ev['fuck_pos'] = 0
+		sex_ev['cock_inserted'] = 0
+		sex_ev['69_count'] += 1
+		sex_ev['orgasm'] = orgasm
 		if sex_ev['foreplay_change'] >= 1:
 			'You crawl towards <<$npc_firstname[$npcID]>>, throwing your legs over his head and scooching your ass over his head. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
 			sex_ev['foreplay_change'] = 2
@@ -2273,10 +2310,104 @@ if $ARGS[0] = '69_dom1':
 			sex_ev['foreplay_change'] += 1
 			'You push <<$npc_firstname[$npcID]>> back onto the bed and throw your legs over him, reversing yourself in the process, and scooch your ass back towards him. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
 		end
-
+		act'Enjoy it': $sex_ev['foreplay_enjoyment'] = 'enjoy'
+		act'Token effort': $sex_ev['foreplay_enjoyment'] = 'unsatisfying'
+		act'Distracting': $sex_ev['foreplay_enjoyment'] = 'distracted'
 	end}
 end
 
+if $ARGS[0] = '69_1':
+	'<center><video autoplay loop src="images/shared/sex/69/<<rand(1,2)>>.mp4"></video></center>'
+	'You sixty-nine with <<$npc_usedname[$npcID]>>'
+	if $sex_ev['foreplay_enjoyment'] = 'enjoy':
+		'You enjoy it.'
+	elseif $sex_ev['foreplay_enjoyment'] = 'unsatisfying':
+		'This isn''t really your thing but you''re going to keep pretending for now.'
+	elseif $sex_ev['foreplay_enjoyment'] = 'distracted':
+		'Wow, it is <i>really</i> distracting trying to suck a dick while you''re getting your pussy eaten at the same time. You can''t focus on pleasing him <i>or</i> the pleasure for yourself. This sucks.'	
+	end
+	gs 'sex_ev_foreplay', '69_cum_sort'
+end
+
+if $ARGS[0] = '69_2':
+	'<center><video autoplay loop src="images/shared/sex/69/<<rand(1,2)>>.mp4"></video></center>'
+	sex_ev['cycle_limit'] += 1
+	if $sex_ev['foreplay_enjoyment'] = 'enjoy':
+		'You keep enjoying sixty-nining with <<$npc_usedname[$npcID]>>.'
+	elseif $sex_ev['foreplay_enjoyment'] = 'unsatisfying':
+		'You keep putting in a token effort sucking <<$npc_usedname[$npcID]>>''s dick.'
+	elseif $sex_ev['foreplay_enjoyment'] = 'distracted':
+		'You keep getting distracting trying to suck <<$npc_usedname[$npcID]>>''s dick.'	
+	end
+	gs 'sex_ev_foreplay', '69_cum_sort'
+end
+
+if $ARGS[0] = '69_cum_sort':
+	if rand(1,10) = npc_sex_stamina[$npcID] - 1 or (rand(1,10) > npc_sex_stamina[$npcID] - 2 and $npc_fav_pos[$npcID] = '69'):
+		sex_ev['cum_mouth_surprise'] = 1
+	elseif sex_ev['cycle_limit'] >= npc_sex_stamina[$npcID]:
+		sex_ev['boy_cum'] = 1
+	end
+	if sex_ev['orgasm'] < orgasm:
+		*nl
+		'Just a little more... a little more... and you''re gonna...'
+		act'Come!': gt 'sex_ev_foreplay', '69_girl_cum'
+	elseif sex_ev['cant_hold_cum'] = 1:
+		gs 'sex_ev_foreplay', '69_cum_surprise'
+	elseif sex_ev['boy_cum'] = 1:
+		gs 'sex_ev_foreplay', '69_cum_warn'
+	elseif rand(1,10) > 7 and $npc_fav_pos[$npcID] ! '69':
+		*nl
+		'After a few minutes, you feel his hand tapping your ass, trying to slow you down.'
+		if sex_ev['fuck_count'] = 0:
+			'"Hey-" he grunts. "If you keep that up, I''m gonna come. I still wanna fuck you."'
+		else
+			'"Hey-" he grunts. "If you keep that up, I''m gonna come. I wanna fuck again."'
+		end
+		gs 'sex_ev_foreplay', '69_cum_menu'
+	else
+		act'Keep 69ing': gt 'sex_ev_foreplay', '69_2'
+		gs 'sex_ev_foreplay', 'foreplay_choose'
+	end
+end
+
+if $ARGS[0] = '69_cum_menu':
+	act 'Pull back (sex)':
+		sex_ev['must_fuck'] = 1
+		cla & *clr
+		$sex_ev['bed_room']
+		'You pull your mouth off his cock with a pop and look back at him, a grin on your lips.'
+		'"Me too," you say, throwing your self off of his face.'
+		gs 'sex_ev_sex', 'sex_start'
+	end
+	act'Suck him dry': gt 'sex_ev_foreplay', '69_boy_cum'
+end
+
+if $ARGS[0] = '69_boy_cum':
+	gs 'cum_call', 'mouth_swallow', $npcID, 1
+	cla & *clr
+	'<center><video autoplay loop src="images/shared/sex/cum/mouth/69_cum1.mp4"></video></center>'
+	
+end
+
+if $ARGS[0] = '69_girl_cum':
+	'<center><video autoplay loop src="images/shared/sex/cum/mouth/69_cum1.mp4"></video></center>'
+	'<i>Fuck!</i>'
+	if sex_ev['boy_cum'] = 0:
+		'Pleasure explodes through your body, your pussy quivering uncontrollably beneath the ministrations of <<$npc_usedname[$npcID]>>''s tongue even as your eyes roll back in your head. Your thighs tighten around his head and your throat is choked with his cock and everything is <i>perfect</i> as your vision goes white in mind numbing ecstasy for a few moments. When your orgasm finally dies down, you take a shuddering gasp through your nose, lips still wrapped around <<$npc_usedname[$npcID]>>''s cock.'
+		act'Keep 69ing': gt 'sex_ev_foreplay', '69_2'
+		gs 'sex_ev_foreplay', 'foreplay_choose'
+	else
+		$sex_ev['last_cum'] = 'mouth'
+		sex_ev['came_together'] = 2
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
+		'Pleasure explodes through your body, your pussy quivering uncontrollably beneath the ministrations of <<$npc_usedname[$npcID]>>''s tongue. Even as your eyes roll back in your head, a second explosion goes off in your mouth and suddenly your throat is filled with thick, salty, cum. Your thighs tighten around <<$npc_usedname[$npcID]>>''s head, wrestling your need to breath with your orgasm and choking down his cum.'
+		*nl
+		'It takes a while for your orgasm to die down but once it does, you realize there''s nothing left to swallow either and take a shuddering gasp through your nose, lips still wrapped around <<$npc_usedname[$npcID]>>''s softening cock.'
+		gs 'sex_ev_sex', 'sex_end'
+	end
+end
+
 if $ARGS[0] = 'facesit_1':
 	act 'Sit on his face':
 		cla & *clr
@@ -2377,6 +2508,7 @@ if $ARGS[0] = 'facesit_3':
 		act 'Come again':
 			$orgasm_or = 'yes'
 			gs 'arousal', 'cuni', rand(2,5), 'no_orgasm_msg', $sex_ev['prostitution_flag']
+			$orgasm_or = ''
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/facesit/orgasm1.mp4"></video></center>'

+ 26 - 25
locations/sex_ev_leave.qsrc

@@ -107,17 +107,17 @@ end
 
 if $ARGS[0] = 'break_up':
 	if $npc_rel_type[$npcID] = 'fuckbuddy':
-		gs 'lover', 'remove_fuckbuddy', $boy
+		gs 'lover', 'remove_fuckbuddy', $npcID
 	elseif $npc_rel_type[$npcID] = 'sugar_daddy':
-		gs 'lover', 'remove_sugar_daddy', $boy
+		gs 'lover', 'remove_sugar_daddy', $npcID
 	else
-		gs 'lover', 'remove', $boy
+		gs 'lover', 'remove', $npcID
 	end
 	act 'Leave':gt 'sex_ev_leave', 'exit'
 end
 
 if $ARGS[0] = 'fuckbuddy_add':
-	gs 'lover', 'add_fuckbuddy', $boy
+	gs 'lover', 'add_fuckbuddy', $npcID
 	npc_fuckbuddy[$npcID] = 1
 	npc_no_booty_call[$npcID] = daystart
 end
@@ -125,7 +125,7 @@ end
 if $ARGS[0] = 'sugar_daddy_add':
 
 	!!if $npc_rel_type[$npcID] ! 'fuckbuddy': gs 'sex_ev_leave', 'fuckbuddy_add'
-	gs 'lover', 'add_sugar_daddy', $boy
+	gs 'lover', 'add_sugar_daddy', $npcID
 	npc_sugar_daddy_price[$npcID] = sex_ev['sugar_daddy_offer'] * 100
 	if $npc_rel_type[$npcID] ! 'sugar_daddy':
 		$npc_rel_type[$npcID] = 'sugar_daddy'
@@ -136,7 +136,7 @@ if $ARGS[0] = 'sugar_daddy_add':
 end
 
 if $ARGS[0] = 'lover_add':
-	gs 'lover', 'add', $boy
+	gs 'lover', 'add_boyfriend', $npcID
 end
 
 if $ARGS[0] = 'ending':
@@ -168,14 +168,16 @@ if $ARGS[0] = 'ending':
 	end
 	if sex_ev['break_up'] > 0:
 		if $npc_rel_type[$npcID] = 'fuckbuddy':
-			gs 'lover', 'remove_fuckbuddy', $boy
+			gs 'lover', 'remove_fuckbuddy', $npcID
 		elseif $npc_rel_type[$npcID] = 'sugar_daddy':
-			gs 'lover', 'remove_sugar_daddy', $boy
+			gs 'lover', 'remove_sugar_daddy', $npcID
 		else
-			gs 'lover', 'remove', $boy
+			gs 'lover', 'remove_boyfriend', $npcID
 		end
 	end
 	killvar 'sex_ev'
+	killvar '$npc_pref_traits'
+	killvar 'npc_pref_values'
 end
 
 if $ARGS[0] = 'leaving_dialogue':
@@ -362,7 +364,7 @@ if $ARGS[0] = 'leaving_end':
 end
 
 if $ARGS[0] = 'npc_leave':
-	if $boy = 'A34':
+	if $npcID = 'A34':
 		gs 'sex_ev_A34', 'kolka_leave'
 	else
 	!!{	if npc_latesleeper[$npcID] = 1 and sex_ev['boy_wakeup'] = 0 and sex_ev['boy_asleep'] = 1 and $home['current'] ! 'parents_home':
@@ -536,7 +538,7 @@ end
 if $ARGS[0] = 'hurry_leave':
 	act 'No time for goodbyes':
 		cla & *nl
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		$sex_ev['leave_dialogue'] = ' without even saying goodbye'
 		gs 'sex_ev_leave', 'hurry_leave2'
 	end
@@ -616,9 +618,9 @@ end
 if $ARGS[0] = 'hurry_leave_finish':
 	cla & *nl
 	'"<<$sex_ev[''leave_action'']>><<$sex_ev[''leave_dialogue'']>>.'
-	if (rand(1,3) = 1 or npc_goal[$npcID] = 3) and sex_ev['fuckbuddy_invite'] = 1:
+	if (rand(1,3) = 1 or $npc_rel_goal[$npcID] = 'serious') and sex_ev['fuckbuddy_invite'] = 1:
 		act 'Leave':msg 'Unfortunately, he never ends up texting you.' & gt 'sex_ev_leave', 'exit'
-	elseif (rand(1,3) = 1 or npc_goal[$npcID] = 1) and sex_ev['date_invite'] = 1:
+	elseif (rand(1,3) = 1 or $npc_rel_goal[$npcID] = 'sex') and sex_ev['date_invite'] = 1:
 		act 'Leave':msg 'Unfortunately, he never ends up texting you.' & gt 'sex_ev_leave', 'exit'
 	else
 		if sex_ev['fuckbuddy_invite'] = 1:
@@ -714,13 +716,12 @@ if $ARGS[0] = 'unsatisfied_breakup':
 end
 
 if $ARGS[0] = 'no_more_cheating_breakup':
-	if pcs_lover > 0 and (npc_know_have_boyfriend + npc_know_have_girlfriend = 0):
-		act 'I''ve started seeing somebody':
+	if (stat['boyfriends_current'] > 0 or stat['girlfriends_current'] > 0) and (npc_know_have_boyfriend + npc_know_have_girlfriend = 0):		act 'I''ve started seeing somebody':
 			cla & *clr
 			npc_know_cheat[$npcID] = 1
 			$sex_ev['bed_room']
 			'"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[$npcID] < 7:
+			if $npc_fidelity[$boy] ! 'faithful' and $npc_fidelity[$boy] ! 'open':
 				'"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
@@ -769,7 +770,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 			end
 		end
 
-		if pcs_lover - pcs_girlfriends > 0:
+		if stat['boyfriends_current'] > 0:
 			act 'I can''t keep cheating on my boyfriend':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
@@ -782,7 +783,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 				gs 'sex_ev_leave', 'break_up'
 			end
 		end
-		if pcs_girlfriends > 0:
+		if stat['girlfriends_current'] > 0:
 			act 'I can''t keep cheating on my girlfriend':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
@@ -888,7 +889,7 @@ if $ARGS[0] = 'prostitution_wakeup1':
 			end
 
 			act 'Be transactional':
-				gs 'npc_relationship', 'modify', $boy, 'dislike'
+				gs 'npc_relationship', 'modify', $npcID, 'dislike'
 				cla & *clr
 				$sex_ev['bed_room']
 				'Without any particular courtesy or care, you shake <<$npc_firstname[$npcID]>>''s shoulder until he starts awake.'
@@ -922,7 +923,7 @@ if $ARGS[0] = 'prostitution_wakeup2':
 
 
 	act 'Peck him on the lips':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *clr
 		$sex_ev['bed_room']
 		'"Thanks daddy," you smile, tucking the money into your purse and giving him a quick peck on the lips before slipping out the door.'
@@ -930,7 +931,7 @@ if $ARGS[0] = 'prostitution_wakeup2':
 	end
 
 	act 'Kiss him deeply':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *clr
 		$sex_ev['bed_room']
 		'"Thanks daddy," you smile. You tuck the money into your purse and turn back, suddenly pulling <<$npc_firstname[$npcID]>>''s face into a deep kiss, inhaling his taste, his scent, and pushing your tongue between his lips. It''s several seconds before you let it end and a trail of saliva hangs between you when you finally break the kiss. After a smoldering gaze, you lick your lips and slip out the door.'
@@ -968,7 +969,7 @@ if $ARGS[0] = 'sneak_out_note1':
 	if sex_ev['prostitution'] = 1 and sex_ev['prostitution_paid'] = 0:
 		act 'This one''s a freebie':
 			cla & *clr
-			gs 'npc_relationship', 'modify', $boy, 'like'
+			gs 'npc_relationship', 'modify', $npcID, 'like'
 			sex_ev['prostitution_freebie'] = 1
 			$sex_ev['hall_way']
 			$sex_ev['note_desc1'] = '<i>Consider last night a freebie.</i>'
@@ -1091,9 +1092,9 @@ if $ARGS[0] = 'sneak_out_note_end':
 		'Satisfied, you leave your note on the counter and quietly slip out the door, letting it click shut behind you.'
 	end
 
-	if (rand(1,3) = 1 or npc_goal[$npcID] = 3) and sex_ev['fuckbuddy_invite'] = 1:
+	if (rand(1,3) = 1 or $npc_rel_goal[$npcID] = 'serious') and sex_ev['fuckbuddy_invite'] = 1:
 		act 'Leave':msg 'Unfortunately, he never ends up texting you.' & gt 'sex_ev_leave', 'exit'
-	elseif (rand(1,3) = 1 or npc_goal[$npcID] = 1) and sex_ev['date_invite'] = 1:
+	elseif (rand(1,3) = 1 or $npc_rel_goal[$npcID] = 'sex') and sex_ev['date_invite'] = 1:
 		act 'Leave':msg 'Unfortunately, he never ends up texting you.' & gt 'sex_ev_leave', 'exit'
 	else
 		if sex_ev['fuckbuddy_invite'] = 1:
@@ -1490,7 +1491,7 @@ if $ARGS[0] = 'see_a_friend':
 end
 
 if $ARGS[0] = 'another_fuckbuddy':
-	if arrsize('$fuckbuddy') > 1:
+	if stat['fuckbuddies_current'] > 1:
 		act 'Another booty call':
 			sex_ev['leaving'] = 1
 			cla & *clr

+ 48 - 37
locations/sex_ev_miss.qsrc

@@ -165,19 +165,19 @@ if $ARGS[0] = 'miss_insert_slow':
 				act 'Moan':
 					cla & *nl
 					'You let out a loud moan as heat fills up your insides and your pussy begins to salivate with just the insertion of his cock.'
-					gs 'sex_ev_miss', 'miss_goto2'
+					gs 'sex_ev_miss', 'miss_goto'
 				end
 
 				act 'Groan':
 					cla & *nl
 					'You let out a husky groan as an indescribable <i>ache</i> rocks through your insides. Like a crumb of bread to a woman starving to death, just the insertion of his cock sets your lustful hunger ablaze.'
-					gs 'sex_ev_miss', 'miss_goto2'
+					gs 'sex_ev_miss', 'miss_goto'
 				end
 
 				act 'Gasp':
 					cla & *nl
 					'Your legs kip as he finishes his insertion and you gasp as heat washes through your hips and electric tingles race across your skin.'
-					gs 'sex_ev_miss', 'miss_goto2'
+					gs 'sex_ev_miss', 'miss_goto'
 				end
 
 				act 'Say something sexy':
@@ -205,7 +205,7 @@ if $ARGS[0] = 'miss_insert_slow':
 							'"Ah~!" you moan, legs kipping as he finishes inserting his <<$npc_dick_desc[$npcID]>> cock into your pussy, and give him a lascivious smile. "You''re a perfect fit for my pussy..."'
 						end
 					end
-					gs 'sex_ev_miss', 'miss_goto2'
+					gs 'sex_ev_miss', 'miss_goto'
 				end
 				if $npc_dick_class[$ARGS[1]] = 'big' or $npc_dick_class[$ARGS[1]] = 'extra_big':
 					act 'He''s big!':
@@ -228,7 +228,7 @@ if $ARGS[0] = 'miss_insert_slow':
 								'"Nngh~! <i>Fuck,</i> you''re so big!" you groan huskily.'
 							end
 						end
-						gs 'sex_ev_miss', 'miss_goto2'
+						gs 'sex_ev_miss', 'miss_goto'
 					end
 				end
 			end
@@ -238,7 +238,7 @@ if $ARGS[0] = 'miss_insert_slow':
 				act 'Gasp':
 					cla & *nl
 					'Your legs kip up in discomfort as <<$npc_firstname[$npcID]>> rests his weight on top of you, immediately hitting an awkward angle that causes you to gasp as pain lances through your pussy.'
-					gs 'sex_ev_miss', 'miss_goto2'
+					gs 'sex_ev_miss', 'miss_goto'
 				end
 
 				if $npc_dick_desc[$npcID] = 'long' or $npc_dick_desc[$npcID] = 'huge' or $npc_dick_desc[$npcID] = 'enormous' or $npc_dick_desc[$npcID] = 'lengthy' or $npc_dick_desc[$npcID] = 'gigantic' or $npc_dick_desc[$npcID] = 'monster':
@@ -248,7 +248,7 @@ if $ARGS[0] = 'miss_insert_slow':
 						act 'Groan':
 							cla & *nl
 							'You let out a painful groan as your insides <i>ache</i> as if you had been punched in the gut. Which in some ways, you have been...'
-							gs 'sex_ev_miss', 'miss_goto2'
+							gs 'sex_ev_miss', 'miss_goto'
 						end
 
 						if npc_fuck_times[$npcID] = 0:
@@ -393,7 +393,9 @@ if $ARGS[0] = 'miss_goto':
 	end
 end
 if $ARGS[0] = 'miss_goto2':
-	if sex_ev['fuck_count'] = 0:
+	if npc_two_pump[$npcID] > 0 and sex_ev['2pump'] = 0:
+		act 'Continue': gt 'sex_ev_cum', '2pumpchump'
+	elseif sex_ev['fuck_count'] = 0:
 		gs 'sex_ev_miss', 'miss_goto'
 	else
 		$sex_ev['position'] = 'miss'
@@ -551,7 +553,7 @@ end
 
 if $ARGS[0] = 'miss_vid':
 	if sex_ev['speed'] = 1:
-		'<center><video autoplay loop src="images/shared/sex/vag/miss/slow<<rand(1,2)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/vag/miss/slow<<rand(1,3)>>.mp4"></video></center>'
 	elseif sex_ev['speed'] = 2:
 		'<center><video autoplay loop src="images/shared/sex/vag/miss/med<<rand(1,3)>>.mp4"></video></center>'
 	elseif sex_ev['speed'] = 3:
@@ -562,6 +564,7 @@ end
 if $ARGS[0] = 'miss1':
 	!! slow pace
 	sex_ev['miss_fuck'] = 1
+	sex_ev['orgasm'] = orgasm
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
 	$sex_ev['position'] = 'miss'
 	$sex_ev['pos_speed'] = 'miss1'
@@ -570,7 +573,7 @@ if $ARGS[0] = 'miss1':
 	sex_ev['missionary_fuck'] = 1
 	sex_ev['kiss'] = 0
 	if pcs_vag = 0 and sex_ev['fuck_count'] = 0:gt 'sex_ev_virgin', 'miss_virg_norm1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	gs 'sex_ev_miss', 'miss_vid'
 	if mesec > 0:
 !!		if sex_ev['condom'] = 1 and sex_ev['no_condom'] ! 1:
@@ -741,7 +744,7 @@ if $ARGS[0] = 'miss1':
 			sex_ev['bored'] = 1
 			$sex_ev['fuck_enjoyment'] = 'unsatisfying'
 			$orgasm_or = 'no'
-			gs 'sex_ev_sex', 'fuck_arousal_code'
+			
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/slow2.mp4"></video></center>'
 			'As much as you want <<$npc_firstname[$npcID]>> to pick up the pace, you don''t want to be a bitch about it so you bite your tongue, going back to trying to get off on this or at least derive some kind of enjoyment out of it, ultimately failing on both counts.'
 			gs 'sex_ev_cum', 'fuck_cum'
@@ -781,7 +784,7 @@ if $ARGS[0] = 'miss1.1':
 	$sex_ev['pos_speed'] = 'miss1'
 	sex_ev['speed'] = 1
 	sex_ev['kiss'] = 0
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	cla & *clr
 	gs 'sex_ev_miss', 'miss_vid'
 !!	'<<$npc_firstname[$npcID]>> slows down, no longer fucking you, but making love to you instead. You can feel every contour of him inside you, and you moan softly with every thrust.'
@@ -796,7 +799,7 @@ if $ARGS[0] = 'miss1.2':
 	$sex_ev['pos_speed'] = 'miss1'
 	sex_ev['speed'] = 1
 	sex_ev['kiss'] = 0
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	gs 'sex_ev_events', 'sex_film_code'
 	cla & *clr
 	gs 'sex_ev_miss', 'miss_vid'
@@ -888,8 +891,8 @@ if $ARGS[0] = 'miss1.2':
 			*nl
 			'All your dirty talk is just that: talk. Your pussy still barely feels anything other than the occasional bump, but you don''t want <<$npc_firstname[$npcID]>> to feel bad about it either so you play along, pretending it feels good.'
 		elseif sex_ev['casual_talk'] > 0:
-			if mid($boy,1,1) = 'A':
-				gs 'sex_ev_sex_talk_<<$boy>>', 'talk_output'
+			if mid($npcID,1,1) = 'A':
+				gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_output'
 !!			else
 
 			end
@@ -926,8 +929,8 @@ if $ARGS[0] = 'miss1.2':
 			gs 'sex_ev_miss', 'miss1_boy_talk1'
 			gs 'sex_ev_miss', 'miss1_boy_talk2'
 		elseif sex_ev['casual_talk'] > 0:
-			if mid($boy,1,1) = 'A':
-				gs 'sex_ev_sex_talk_<<$boy>>', 'talk_output'
+			if mid($npcID,1,1) = 'A':
+				gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_output'
 	!!			else
 
 			end
@@ -949,7 +952,7 @@ if $ARGS[0] = 'miss1.bored':
 	sex_ev['miss_fuck'] = 1
 	$sex_ev['pos_speed'] = 'miss1'
 	sex_ev['kiss'] = 0
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	gs 'sex_ev_miss', 'miss1_boy_talk1'
 	gs 'sex_ev_miss', 'miss1_boy_talk2'
 	*nl
@@ -962,6 +965,7 @@ end
 if $ARGS[0] = 'miss2':
 	!! medium pace
 	sex_ev['miss_fuck'] = 1
+	sex_ev['orgasm'] = orgasm
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
 	sex_ev['kiss'] = 0
 	$sex_ev['position'] = 'miss'
@@ -969,7 +973,7 @@ if $ARGS[0] = 'miss2':
 	!! sex_ev['missionary_fuck'] tracks if you fuck in this position
 	sex_ev['missionary_fuck'] = 1
 	if pcs_vag = 0 and sex_ev['fuck_count'] = 0:gt 'sex_ev_virgin', 'miss_virg_norm1'
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsex0.mp4"></video></center>'
 	if mesec > 0:
 !!		if sex_ev['condom'] = 1 and sex_ev['no_condom'] ! 1:
@@ -1139,7 +1143,7 @@ if $ARGS[0] = 'miss2.1':
 	$sex_ev['position'] = 'miss'
 	$sex_ev['pos_speed'] = 'miss2'
 	sex_ev['speed'] = 2
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	sex_ev['kiss'] = 0
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/med1.mp4"></video></center>'
@@ -1159,7 +1163,7 @@ if $ARGS[0] = 'miss2.2':
 	$sex_ev['pos_speed'] = 'miss2'
 	sex_ev['speed'] = 2
 	sex_ev['kiss'] = 0
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	gs 'sex_ev_events', 'sex_film_code'
 	cla & *clr
 	gs 'sex_ev_miss', 'miss_vid'
@@ -1261,8 +1265,8 @@ if $ARGS[0] = 'miss2.2':
 		gs 'sex_ev_miss', 'miss2_boy_talk1'
 		gs 'sex_ev_miss', 'miss2_boy_talk2'
 	elseif sex_ev['casual_talk'] > 0:
-		if mid($boy,1,1) = 'A':
-			gs 'sex_ev_sex_talk_<<$boy>>', 'talk_output'
+		if mid($npcID,1,1) = 'A':
+			gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_output'
 !!			else
 
 		end
@@ -1282,7 +1286,7 @@ if $ARGS[0] = 'miss2.bored':
 	cla & *clr
 	$sex_ev['pos_speed'] = 'miss2'
 	sex_ev['kiss'] = 0
-	gs 'sex_ev_sex', 'fuck_arousal_code'
+	
 	sex_ev['boy_cum'] = 2
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/med3.mp4"></video></center>'
@@ -1291,6 +1295,7 @@ if $ARGS[0] = 'miss2.bored':
 end
 
 if $ARGS[0] = 'miss3':
+	sex_ev['orgasm'] = orgasm
 	sex_ev['miss_fuck'] = 1
 	sex_ev['rough_check'] = 1
 	if sex_ev['condom'] ! 1: sex_ev['no_condom'] = 1
@@ -1447,7 +1452,7 @@ if $ARGS[0] = 'miss3':
 				$sex_ev['fuck_enjoyment'] = 'painful'
 				cla & *clr
 				$orgasm_or = 'no'
-				gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+				
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
 				'For whatever reason, you can''t bring yourself to say anything, and simply endure the rough treatment. You sigh in relief when <<$npc_firstname[$npcID]>> releases your hair but only for a brief moment when he uses his extra hand to grab hold of your ass and pound you even harder. You grab onto the edge of the bed and hang on for dear life, whimpering as he mercilessly fucks you.'
 				gs 'sex_ev_cum', 'fuck_cum'
@@ -1475,7 +1480,7 @@ if $ARGS[0] = 'miss3':
 						sex_ev['orgasm'] = orgasm
 						sex_ev['rough_enjoy'] = 1
 						$sex_ev['fuck_enjoyment'] = 'enjoy'
-						gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+						
 						cla & *nl
 						'You scream another cry of agonizing pleasure and glare at <<$npc_firstname[$npcID]>>.'
 						'"If you slow down I will <i>fucking</i> kill you," you snarl, throwing your hips forward to slam into his for more force.'
@@ -1568,7 +1573,7 @@ if $ARGS[0] = 'miss3.1':
 		'"Yeah <i>bitch?!</i>" <<$npc_firstname[$npcID]>> snarls. "You want me to fuck you harder? Well, then take it you fucking slut!" and starts roughly fucking you in a way completely unlike his previous mannerisms.'
 		act 'Enjoy it':
 			cla & *nl
-			gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+			
 			sex_ev['rough_enjoy'] = 1
 			$sex_ev['fuck_enjoyment'] = 'enjoy'
 			gs 'sex_ev_miss', 'miss3.1_desc'
@@ -1586,7 +1591,7 @@ if $ARGS[0] = 'miss3.1':
 			gs 'sex_ev_cum', 'fuck_cum'
 		end
 	else
-		gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+		
 		'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 
 		gs 'sex_ev_miss', 'miss3.1_desc'
@@ -1663,7 +1668,7 @@ if $ARGS[0] = 'miss3.2':
 			'All your dirty talk is just that: talk. <<$npc_firstname[$npcID]>> continues to relentlessly smash your pussy with his cock and you honestly can''t say it feels very good. But you don''t want <<$npc_firstname[$npcID]>> to feel bad about it either so you play along, pretending otherwise.'
 		end
 	else
-		gs 'sex_ev_sex', 'fuck_rough_arousal_code'
+		
 		if sex_ev['cum_speed_up'] = 1:
 			sex_ev['cum_speed_up'] = 0
 			*nl
@@ -1701,11 +1706,11 @@ if $ARGS[0] = 'miss_kiss':
 		cla & *nl
 		sex_ev['kiss_skip'] = 1
 		if npc_no_kiss[$npcID] = 2:
-			gs 'npc_relationship', 'modify', $boy, 'dislike'
+			gs 'npc_relationship', 'modify', $npcID, 'dislike'
 			'You turn your head, shying away from his lips.'
 			'"Not right now," you say, smiling apologetically.'
 		elseif npc_no_kiss[$npcID] = 1:
-			gs 'npc_relationship', 'modify', $boy, 'dislike'
+			gs 'npc_relationship', 'modify', $npcID, 'dislike'
 			'"Hey!" you say, annoyedly jerking your head away. "I told you! No kissing!"'
 		else
 			npc_no_kiss[$npcID] = 1
@@ -1718,7 +1723,7 @@ if $ARGS[0] = 'miss_kiss':
 		npc_like[$npcID] += 2
 		sex_ev['kiss'] = 1
 		gs 'arousal', 'kiss', -rand(1,2), 'no_orgasm_msg', $sex_ev['prostitution_flag']
-		gs 'sex_ev_sex', 'fuck_arousal_code'
+		
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/vag/miss/kiss1.mp4"></video></center>'
 		if sex_ev['cuni_count'] > 0:
@@ -1780,7 +1785,7 @@ if $ARGS[0] = 'miss_kiss':
 
 	act 'Turn your head':
 		cla & *nl
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		'You turn your head, shying away from his lips.'
 		'"Not right now," you say.'
 		gs 'sex_ev_cum', 'fuck_cum'
@@ -2094,7 +2099,9 @@ if $ARGS[0] = 'miss1.2_dirty_talk':
 	sex_ev['dirty_talk'] += 1
 	if $sex_ev['dirty_talk'] = 'cock':
 		!! dirty talk about his cock
-		if rand(1,2) = 1:
+		if rand(1,3) = 1:
+			iif(stat['no_sex_swearing'] = 0, '"Fuck~!" you pant. "Your cock is so fucking hard inside me~! Oh fuck~! Oh fuck~!"', '<i>"Nngh~!"</i> you groan. "You''re so hard inside me~! <i>Mmph~!</i> It feels so good~!"')
+		elseif rand(1,2) = 1:
 			if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
 				iif(stat['no_sex_swearing'] = 0, '"Fuck~! Yes~! Just like that~!" you moan. "Fuck me with your tiny dick!"', '"Fuck~! Yes~! Just like that~!" you moan. "Your tiny dick feels so good~!"')
 			elseif $npc_dick_desc[$npcID] = 'chode':
@@ -2468,7 +2475,9 @@ end
 if $ARGS[0] = 'miss2.2_dirty_talk':
 !!	'"Ah! Fuck! Just like that!" you moan loudly. "Fuck my pussy with your big cock! Right there! Fuck! You''re so good!"'
 	if $sex_ev['dirty_talk'] = 'cock':
-		if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
+		if rand(1,3) = 1:
+			iif(stat['no_sex_swearing'] = 0, '"Fuck~!" you pant. "Your cock is so fucking hard inside me~! Oh fuck~! Oh fuck~!"', '<i>"Nngh~!"</i> you groan. "You''re so hard inside me~! <i>Mmph~!</i> It feels so good~!"')
+		elseif $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
 			iif(stat['no_sex_swearing'] = 0, '"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Fuck my pussy with your tiny dick! Oh fuck! Oh fuck!"', '')
 		elseif $npc_dick_desc[$npcID] = 'chode':
 			iif(stat['no_sex_swearing'] = 0, '"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Fuck my pussy with your fat chode! Oh fuck! You''re so thick!"', '')
@@ -2878,8 +2887,10 @@ end
 if $ARGS[0] = 'miss3.2_dirty_talk':
 	if $sex_ev['dirty_talk']  = 'cock':
 		!! dirty talk about his cock
-		if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
-			iif(stat['no_sex_swearing'] = 0, '"Yes! Yes! Just like that!" you scream at the top of your lungs. "Fuck me with your tiny cock! Pound my pussy!"', '')
+		if rand(1,3) = 1:
+			iif(stat['no_sex_swearing'] = 0, '"Fuck~!" you pant. "Your cock is so fucking hard inside me~! Oh fuck~! Oh fuck~!"', '<i>"Nngh~!"</i> you groan. "You''re so hard inside me~! <i>Mmph~!</i> It feels so good~!"')
+		elseif $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
+			iif(stat['no_sex_swearing'] = 0, '"Yes! Yes! Just like that!" you scream at the top of your lungs. "Fuck me with your tiny cock! Pound my pussy with your pencil dick!"', '')
 		elseif $npc_dick_desc[$npcID] = 'chode':
 			iif(stat['no_sex_swearing'] = 0, '"Yes! Yes! Just like that!" you scream at the top of your lungs. "Fuck me with your fat chode! Pound my pussy!"', '')
 		elseif $npc_dick_desc[$npcID] = 'skinny':

+ 9 - 9
locations/sex_ev_morning.qsrc

@@ -339,7 +339,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		gs 'booty_call', 'set_sex_ev_date'
 		cla & *nl
 		'"I think I can fit that in," you smirk, <<$sex_ev[''dress_describe'']>>.'
-		if npc_humor[$npcID] = 2:
+		if $npc_humor[$npcID] = 'perverted':
 			'"You sure can," <<$npc_firstname[$npcID]>> grins lewdly at you.'
 		else
 			'"Great," <<$npc_firstname[$npcID]>> grins back.'
@@ -485,7 +485,7 @@ if $ARGS[0] = 'breakfast_in_bed':
 	end
 	act 'How sweet':
 		cla & *nl
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		'"That''s sweet of you," you smile back, genuinely a little touched that he would do this for you.'
 		'"It''s no big deal," he shrugs. "Anything I can help you with first?"'
 		'He shows you the tray which is filled with quite a spread.'
@@ -557,7 +557,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 	act 'Eggs ':
 		cla & *nl
 		'"A bit of protein sounds good right now," you smile, reaching for the plate with fried eggs on it.'
-		if npc_humor[$npcID] = 2:
+		if $npc_humor[$npcID] = 'perverted':
 			'<<$npc_firstname[$npcID]>> snickers, giving you a dirty smirk, saying, "I got some protein for you to swallow if you really want some."'
 			act 'Roll your eyes':
 				cla & *nl
@@ -586,7 +586,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 	act 'Kolbasa':
 		cla & *nl
 		'"A bit of protein sounds good right now," you smile, reaching for the sandwiches, the slice of bread with cheese and kolbasa.'
-		if npc_humor[$npcID] = 2:
+		if $npc_humor[$npcID] = 'perverted':
 			'"If it''s protein you want, I got some for you..." <<$npc_firstname[$npcID]>> snickers.'
 			act 'Roll your eyes':
 				cla & *nl
@@ -946,7 +946,7 @@ if $ARGS[0] = 'coffee_menu':
 				end
 
 				act 'Knew he''d like that reference':
-					gs 'npc_relationship', 'modify', $boy, 'like'
+					gs 'npc_relationship', 'modify', $npcID, 'like'
 					cla & *nl
 					'"I thought you''d like that reference," you say, grinning into your mug of coffee. "You''re such a nerd."'
 					'"It''s a funny movie," he grins back. "What can I say?"'
@@ -993,7 +993,7 @@ if $ARGS[0] = 'coffee_together':
 	gs 'beverage', 'coffee'
 	sex_ev['breakfast_finished'] = 1
 	minut += 5
-	gs 'npc_relationship', 'modify', $boy, 'like'
+	gs 'npc_relationship', 'modify', $npcID, 'like'
 	gs 'sex_ev_morning', 'breakfast_image'
 	'The two of you settle down at <<$npc_firstname[$npcID]>>''s table and sip away at your coffee, casually chit-chatting with each other until there''s nothing but dregs left.'
 	act 'Wash your mugs ':gt 'sex_ev_morning', 'breakfast_dishes'
@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'eat_breakfast1':
 	if sex_ev['cooking_total'] = 1 and sex_ev['coffee_make'] = 1:gt 'sex_ev_morning', 'coffee_together'
 	sex_ev['breakfast_finished'] = 1
 	if sex_ev['boy_asleep'] = 1: sex_ev['boy_asleep'] = 0
-	gs 'npc_relationship', 'modify', $boy, 'like'
+	gs 'npc_relationship', 'modify', $npcID, 'like'
 	act 'Eat a small portion':gs 'sex_ev_morning', 'eat_breakfast2'
 	act 'Eat a medium portion':gs 'sex_ev_morning', 'eat_breakfast3'
 	act 'Eat a lot':gs 'sex_ev_morning', 'eat_breakfast4'
@@ -1247,7 +1247,7 @@ end
 if $ARGS[0] = 'after_breakfast_sex':
 	act '"Down boy"':
 		cla
-		if sex_ev['sex_after_breakfast'] = 1:gs 'npc_relationship', 'modify', $boy, 'dislike'
+		if sex_ev['sex_after_breakfast'] = 1:gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		act 'Don''t have time':
 			cla & *nl
 			'"Tsk! Down boy!" you chide, rolling your eyes and taking his hands to forcibly pull them off your body. "I don''t have time for this."'
@@ -1296,7 +1296,7 @@ if $ARGS[0] = 'after_breakfast_sex':
 	if sex_ev['cooking_total'] ! 1 or sex_ev['coffee_make'] ! 1:
 		act 'Not after eating':
 			cla & *nl
-			if sex_ev['sex_after_breakfast'] = 1:gs 'npc_relationship', 'modify', $boy, 'dislike'
+			if sex_ev['sex_after_breakfast'] = 1:gs 'npc_relationship', 'modify', $npcID, 'dislike'
 			'"Ugh!" you groan, giving <<$npc_firstname[$npcID]>> a look of disgust and forcibly pulling his hands off your body. "Right when I feel all gross after eating? How can you even <i>think</i> about that right now?"'
 			gs 'sex_ev_morning', 'morning_menu1'
 		end

+ 41 - 19
locations/sex_ev_pillow_talk.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'topics':
 	cla
 	gs 'sex_ev_pillow_talk', 'stop_talk'
 	if sex_ev['unique_npc'] = 1:
-		gs 'sex_ev_pillow_talk_<<$boy>>', 'topic_menu'
+		gs 'sex_ev_pillow_talk_<<$npcID>>', 'topic_menu'
 	else
 		if sex_ev['angry_after'] = 0:
 			act 'Small talk':cla & gs 'sex_ev_pillow_talk2', 'small_talk'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'ran_out_of_condoms':
 end
 
 if $ARGS[0] = 'condom_buy_fight':
-	gs 'npc_relationship', 'modify', $boy, 'dislike'
+	gs 'npc_relationship', 'modify', $npcID, 'dislike'
 	'"<i>You</i> could always buy more condoms," <<$npc_firstname[$npcID]>> grumbles. "I don''t see why it''s all up to me to get the condoms!"'
 	act 'Don''t respond':
 		cla & *nl
@@ -592,7 +592,7 @@ if $ARGS[0] = 'condom_buy_fight':
 		gs 'sex_ev_pillow_talk', 'sex_talk'
 	end
 	act 'He''s got a point':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *nl
 		pc_buy_condoms[$npcID] = 1
 		'"I guess you''ve got a point," you say, giving <<$npc_firstname[$npcID]>> a guilty smile. "I''ll try to buy some for next time."'
@@ -600,7 +600,7 @@ if $ARGS[0] = 'condom_buy_fight':
 	end
 
 	act 'He''s the one with the dick (argue)':
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		cla & *nl
 		'"You''re the one with the dick," you scowl. "So it''s your job to get the condoms."'
 		'"My money that''s getting spent too! I don''t see you chipping into the safe sex fun!"'
@@ -639,7 +639,7 @@ end
 
 if $ARGS[0] = 'condom_buy_fight2':
 	act 'It''s his responsibility!':
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		cla & *nl
 		'"Cause it''s your dick! Take responsibility for it!"'
 		'"It takes two to fuck, you selfish slut!"'
@@ -647,14 +647,14 @@ if $ARGS[0] = 'condom_buy_fight2':
 	end
 
 	act 'Babies are expensive too!':
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		cla & *nl
 		'"Yeah, because <i>I''m</i> the one in danger of getting pregnant! If I have a kid, are you going to chip in then?" you shout at him.'
 		if npc_caretaker[$npcID] = 1 and npc_childfree ! 1:
 			'"Of course I am!" <<$npc_firstname[$npcID]>> yells back.'
 			gs 'sex_ev_pillow_talk', 'condom_buy_apology'
 			act 'I don''t believe you!':
-				gs 'npc_relationship', 'modify', $boy, 'dislike'
+				gs 'npc_relationship', 'modify', $npcID, 'dislike'
 				cla & *clr
 				$sex_ev['bed_room']
 				'"Bullshit!" you say. "That''s what all guys say. But as soon as a there''s a baby in a girl''s belly, they all run!"'
@@ -665,7 +665,7 @@ if $ARGS[0] = 'condom_buy_fight2':
 			gs 'sex_ev_pillow_talk', 'condom_buy_apology'
 
 			act 'What the fuck did you just say?':
-				gs 'npc_relationship', 'modify', $boy, 'dislike'
+				gs 'npc_relationship', 'modify', $npcID, 'dislike'
 				npc_big_fight[$npcID] = daystart
 				cla & *clr
 				$sex_ev['bed_room']
@@ -707,7 +707,7 @@ end
 
 if $ARGS[0] = 'condom_buy_apology':
 	act 'Apologize':
-		gs 'npc_relationship', 'modify', $boy, 'love'
+		gs 'npc_relationship', 'modify', $npcID, 'love'
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 		'You open your mouth to respond but the argument dies in your throat.'
@@ -860,6 +860,28 @@ if $ARGS[0] = 'all_these_used_condoms':
 end
 
 
+if $ARGS[0] = 'sorry_condoms1':
+	if sex_ev['condoms_used'] + sex_ev['pc_condoms_used'] > 0 and sex_ev['wish_no_condoms_talk'] = 0 and sex_ev['fuck_count'] > 0 and sex_ev['creampie_count'] = 0 and sex_ev['pc_wants_condoms'] = 1:
+		act 'Sorry about the condom':
+			sex_ev['wish_no_condoms_talk'] = 1
+			gs 'sex_ev_pillow_talk', 'pillow_picture1', 1
+			if $sex_ev['preg_risk'] = 'danger':
+				'"I''m really sorry about the condoms by the way," you say, looking meaningfully at the used rubber he tossed aside. "I don''t want to use them either, but it''s just too dangerous to go without one today."'
+			else
+				'"I''m really sorry about the condoms by the way," you say, looking meaningfully at the used rubber he tossed aside. "I don''t want to use them either, but I just can''t risk getting pregnant."'
+			end
+			if npc_condom_conscious[$npcID] > 0:
+				'"You say that like I don''t use condoms regularly." He looks amused.'
+			elseif npc_caretaker[$npcID] > 0:
+				'"Don''t be sorry. I''m not the one who has to deal with the consequences if you get pregnant." <<$npc_usedname[$npcID]>> softly rests his hand on the side of your hip. "It''s your body."'
+			else
+				'"Would''ve been better without it," he replies wistfully.'
+			end
+			gs 'sex_ev_pillow_talk', 'topic_route'
+		end
+	end
+end
+
 if $ARGS[0] = 'wish_no_condoms1':
 	if sex_ev['condoms_used'] + sex_ev['pc_condoms_used'] > 0 and sex_ev['wish_no_condoms_talk'] = 0 and sex_ev['fuck_count'] > 0 and sex_ev['creampie_count'] = 0:
 		act 'Wish we didn''t need condoms':
@@ -1188,7 +1210,7 @@ if $ARGS[0] = 'always_condoms1':
 			end
 
 			act 'Very considerate of him':
-				gs 'npc_relationship', 'modify', $boy, 'like'
+				gs 'npc_relationship', 'modify', $npcID, 'like'
 				cla & *nl
 				'"That''s really considerate of you," you remark. "A lot of guys try to talk girls into going bareback, not thinking about the consequences. It''s nice to be with a guy who''s thinking about that stuff first instead of later."'
 				'"Well I think I''d find it pretty annoying if I got a bad case of the crabs too," <<$npc_firstname[$npcID]>> laughs back.'
@@ -1240,7 +1262,7 @@ if $ARGS[0] = 'love_going_bareback':
 				if npc_no_condoms[$npcID] > 0:
 					'"That''s why I never use condoms," <<$npc_firstname[$npcID]>> says smugly. "They''re bad for the environment."'
 				else
-					if npc_humor[$npcID] = 1:
+					if $npc_humor[$npcID] = 'childish':
 						'"Well they <i>are</i> technically artificial," he chuckles to himself. "I don''t think latex is a commonly occurring material in the wild."'
 					elseif npc_bareback[$npcID] = 2 and $sex_ev['preg_risk'] ! 'danger':
 						'"Good thing today wasn''t a danger day," <<$npc_firstname[$npcID]>> smiles back at you.'
@@ -1829,7 +1851,7 @@ if $ARGS[0] = 'cant_believe_creampie':
 			elseif ($npc_cum_pref[$npcID] = 'creampie' or npc_know_love_creampie[$npcID] = 1) and (npc_selfish[$npcID] > 0 or npc_abusive[$npcID] > 0 or $npc_humor[$npcID] = 'childish'):
 				'"But it still felt good, didn''t it?" <<$npc_firstname[$npcID]>> grins back.'
 				act 'Admit it':
-					gs 'npc_relationship', 'modify', $boy, 'like'
+					gs 'npc_relationship', 'modify', $npcID, 'like'
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/smile1.jpg"></center>'
 					'"But it still felt good, didn''t it?" <<$npc_firstname[$npcID]>> grins back.'
@@ -1839,9 +1861,9 @@ if $ARGS[0] = 'cant_believe_creampie':
 				end
 
 				act 'Admit begrudgingly':
-					gs 'npc_relationship', 'modify', $boy, 'like'
+					gs 'npc_relationship', 'modify', $npcID, 'like'
 					cla & *nl
-					'"Hrmgh... Yeah I guess..." you admit with a deep scowl, unwilling to give him the satisfaction. Though it doesn''t seem to stop him from chuckling while ' + iif(cum_loc['vagina'] > 0, ' watching his cum flow out of your pussy.', ', looking down at the pussy that was filled with his cum until recently.')
+					'"Hrmgh... Yeah I guess..." you admit with a deep scowl, unwilling to give him the satisfaction. Though it doesn''t seem to stop him from chuckling while' + iif(cum_loc['vagina'] > 0, ' watching his cum flow out of your pussy.', ', looking down at the pussy that was filled with his cum until recently.')
 					'"I knew you loved it."'
 					'"Shut up."'
 					gs 'sex_ev_pillow_talk', 'topic_route'
@@ -1867,7 +1889,7 @@ if $ARGS[0] = 'cant_believe_creampie':
 					end
 
 					act 'Not the point!':
-						gs 'npc_relationship', 'modify', $boy, 'dislike'
+						gs 'npc_relationship', 'modify', $npcID, 'dislike'
 						cla & *nl
 						'"That''s not the point!" you sneer back. "Just because I''m on the <<$sex_ev[''bc_type'']>> doesn''t mean you can just do that whenever you want!"'
 						gs 'sex_ev_pillow_talk', 'topic_route'
@@ -2532,7 +2554,7 @@ if $ARGS[0] = 'high_five2':
 	'<<$npc_firstname[$npcID]>> holds up his hand up in the air, causing you to glance over at him.'
 	'"Come on," he says. "Don''t leave me hanging."'
 	act 'Leave him hanging':
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/after/pillow_talk_eyeroll.mp4"></video></center>'
 		'"Oh come on," you roll your eyes. "Have some class."'
@@ -2542,7 +2564,7 @@ end
 
 if $ARGS[0] = 'agree_high_five':
 	act 'Agree (High five)':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/after/high_five.mp4"></video></center>'
 		'"Hell yeah," you laugh, slapping against his hand with yours with a satisfying clap.'
@@ -2553,7 +2575,7 @@ end
 
 if $ARGS[0] = 'weird_high_five':
 	act 'You''re weird (high five)':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/after/high_five.mp4"></video></center>'
 		'"You''re weird," you say, giving him a look, but slap your hand against his anyways before sinking back into the bed.'
@@ -2564,7 +2586,7 @@ end
 
 if $ARGS[0] = 'fine_high_five':
 	act 'Fine (High five)':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/after/high_five.mp4"></video></center>'
 		'"Okay, <i>fine</i>," you say, rolling your eyes but reach over and slap your hand against his anyways, an amused smile on your face.'

+ 11 - 11
locations/sex_ev_pillow_talk2.qsrc

@@ -352,7 +352,7 @@ if $ARGS[0] = 'favorite_position':
 			if $npc_fav_pos[$npcID] = 'miss':
 				'"I know it''s kind of basic, but I like missionary."'
 				act 'Me too':
-					gs 'npc_relationship', 'modify', $boy, 'like'
+					gs 'npc_relationship', 'modify', $npcID, 'like'
 					cla
 					act 'It''s pleasant':
 						cla & *nl
@@ -404,7 +404,7 @@ if $ARGS[0] = 'favorite_position':
 			elseif $npc_fav_pos[$npcID] = 'doggy':
 				'"I like fucking girls doggystyle."'
 				act 'Me too':
-					gs 'npc_relationship', 'modify', $boy, 'like'
+					gs 'npc_relationship', 'modify', $npcID, 'like'
 					cla
 					act 'Feels better':
 						cla & *nl
@@ -439,7 +439,7 @@ if $ARGS[0] = 'favorite_position':
 			elseif $npc_fav_pos[$npcID] = 'cowgirl':
 				'"I like it when the girl''s on top. Watching her tits bounce, seeing her moan."'
 				act 'Me too':
-					gs 'npc_relationship', 'modify', $boy, 'like'
+					gs 'npc_relationship', 'modify', $npcID, 'like'
 					cla
 					act 'It''s fun':
 						cla & *nl
@@ -559,7 +559,7 @@ if $ARGS[0] = 'dont_hookup':
 				'"Oh really? What made me the exception?"'
 				act 'He''s cute':
 					cla & *nl
-					gs 'npc_relationship', 'modify', $boy, 'like'
+					gs 'npc_relationship', 'modify', $npcID, 'like'
 					'"I thought you were cute." You peck him on the cheek. "I couldn''t resist."'
 					gs 'sex_ev_pillow_talk2', 'small_talk'
 				end
@@ -656,7 +656,7 @@ if $ARGS[0] = 'take_a_shower':
 			else
 				'"I''m gonna go take a shower," you declare, hauling yourself out of bed.'
 			end
-			if rand(1,10) < npc_sexdrive[$npcID] or $boy = 'A34':
+			if rand(1,10) < npc_sexdrive[$npcID] or $npcID = 'A34':
 				'"Why don''t I join you in there?" <<$npc_firstname[$npcID]>> asks with a glint in his eye. "I could keep you company."'
 				act 'I prefer to be alone':
 					cla & *nl
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'dance_talk':
 		if $npc_humor[$npcID] = 'perverted':
 			'"Is it the kind that requires a pole and ends with you naked?" he grins.'
 			act 'Laugh':
-				gs 'npc_relationship', 'modify', $boy, 'like'
+				gs 'npc_relationship', 'modify', $npcID, 'like'
 				cla & *nl
 				'You giggle at his joke.'
 				if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
@@ -1056,7 +1056,7 @@ if $ARGS[0] = 'dance_talk':
 			end
 
 			act 'Irritation':
-				gs 'npc_relationship', 'modify', $boy, 'dislike'
+				gs 'npc_relationship', 'modify', $npcID, 'dislike'
 				cla & *nl
 				'"Don''t be gross," you scowl at him. "For your information we''re a dance troupe. And I don''t appreciate you making jokes about what we do."'
 				gs 'sex_ev_pillow_talk2', 'small_talk'
@@ -1119,7 +1119,7 @@ if $ARGS[0] = 'dance_talk':
 				gs 'sex_ev_pillow_talk2', 'small_talk'
 			end
 			act 'Dance for him':
-				gs 'npc_relationship', 'modify', $boy, 'love'
+				gs 'npc_relationship', 'modify', $npcID, 'love'
 				cla & *clr
 				$sex_ev['bed_room']
 				'"Okay," you smile, slipping out of bed. What kind of dance should you show him?'
@@ -1194,7 +1194,7 @@ if $ARGS[0] = 'show_dance':
 	act 'Want me to show you?':
 		sex_ev['get_up'] = 1
 		npc_seen_dance[$npcID] = 1
-		gs 'npc_relationship', 'modify', $boy, 'love'
+		gs 'npc_relationship', 'modify', $npcID, 'love'
 		minut += 5
 		cla & *nl
 		'"Wanna see me dance?" you ask. "I can show you right now?"'
@@ -1702,7 +1702,7 @@ if $ARGS[0] = 'morning_start_day':
 				else
 					'"Well, this is a nice way to start the day," you sigh happily, stretching out on the bed.'
 				end
-				if npc_humor[$npcID] = 3:
+				if $npc_humor[$npcID] = 'intellectual':
 					'"As requested Ms. <<$pcs_lastname>>, your <<hour>>AM wake up call," <<$npc_firstname[$npcID]>> says, doing a mock half-bow.'
 				else
 					'"You really like it when I fuck you while you''re sleeping don''t you?" <<$npc_firstname[$npcID]>> grins.'
@@ -1714,7 +1714,7 @@ if $ARGS[0] = 'morning_start_day':
 				end
 
 				act 'I know you like it':
-					gs 'npc_relationship', 'modify', $boy, 'like'
+					gs 'npc_relationship', 'modify', $npcID, 'like'
 					cla & *nl
 					'"I know you like doing it," you smile fondly. "It makes you happy, so it makes me happy too."'
 					gs 'sex_ev_pillow_talk', 'topic_route'

+ 183 - 52
locations/sex_ev_reactions.qsrc

@@ -1,9 +1,9 @@
 # sex_ev_reactions
 
-if $ARGS[0] = 'cum_react ':
-	if sex_ev['react '] = 0:
-		act 'React ':
-			sex_ev['react '] = 1
+if $ARGS[0] = 'cum_react':
+	if sex_ev['react'] = 0:
+		act 'React':
+			sex_ev['react'] = 1
 			cla
 			gs 'sex_ev_reactions', 'react_menu'
 		end
@@ -15,10 +15,10 @@ end
 
 if $ARGS[0] = 'react_menu':
 	gs 'sex_ev_reactions', 'bask_satisfaction'
-	gs 'sex_ev_reactions', 'handjob_react '
-	gs 'sex_ev_reactions', 'kuni_react '
-	gs 'sex_ev_reactions_creampie', 'creampie_react '
-	gs 'sex_ev_reactions', 'anal_react '
+	gs 'sex_ev_reactions', 'handjob_react'
+	gs 'sex_ev_reactions', 'kuni_react'
+	gs 'sex_ev_reactions_creampie', 'creampie_react'
+	gs 'sex_ev_reactions', 'anal_react'
 	gs 'sex_ev_reactions', 'swallow_react1'
 	gs 'sex_ev_reactions', 'cum_mouth_like_that'
 	gs 'sex_ev_reactions', 'cum_tits_react1'
@@ -32,7 +32,7 @@ if $ARGS[0] = 'react_menu':
 	gs 'sex_ev_reactions', 'no_tits_cum'
 end
 
-if $ARGS[0] = 'handjob_react ':
+if $ARGS[0] = 'handjob_react':
 	if $sex_ev['last_cum'] = 'hand':
 		act 'I like to finish the job':
 			cla & *nl
@@ -42,7 +42,7 @@ if $ARGS[0] = 'handjob_react ':
 	end
 end
 
-if $ARGS[0] = 'kuni_react ':
+if $ARGS[0] = 'kuni_react':
 	if $sex_ev['position'] = 'kuni' or $sex_ev['position'] = 'facesit':
 		act 'You''re good at that':
 			sex_ev['good_at_cuni'] = 1
@@ -117,7 +117,7 @@ if $ARGS[0] = 'bask_satisfaction':
 	if sex_ev['catch_breath'] = 0:
 		act 'Catch your breath':
 			sex_ev['catch_breath'] = 1
-			sex_ev['react '] = 0
+			sex_ev['react'] = 0
 			sex_ev['did_we_cum_together'] = 0
 			cla & *clr
 			if sex_ev['orgasm'] < orgasm and sex_ev['cum_together_fake'] ! 1:
@@ -147,7 +147,7 @@ if $ARGS[0] = 'bask_route':
 	cla & *clr
 	minut += rand(1,3)
 	gs 'stat'
-	if sex_ev['catch_breath'] = 0: sex_ev['react '] = 1
+	if sex_ev['catch_breath'] = 0: sex_ev['react'] = 1
 	if sex_ev['orgasm'] < orgasm and sex_ev['cum_together_fake'] ! 1:
 		!! if Sveta came
 		if $sex_ev['last_cum'] = 'creampie':
@@ -404,7 +404,7 @@ if $ARGS[0] = 'bask_external_cum1':
 			end
 		end
 	elseif $sex_ev['last_cum'] = 'pullout':
-		if $sex_ev['position'] = 'miss' or $sex_ev['position'] = 'cowgirl':
+		if $sex_ev['position'] = 'miss':
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			if orgasm - sex_ev['orgasm'] > 1:
 				if sex_ev['catch_breath'] = 1:
@@ -573,7 +573,7 @@ if $ARGS[0] = 'why_not_inside':
 
 					act 'But it feels good':
 						cla & *nl
-						gs 'npc_relationship', 'modify', $boy, 'dislike'
+						gs 'npc_relationship', 'modify', $npcID, 'dislike'
 						'"So?" you smile wryly. "Pleasure is pleasure. Not really thinking about the consequences right now."'
 						'"Maybe for you..."'
 						gs 'sex_ev_sex', 'sex_end'
@@ -581,7 +581,7 @@ if $ARGS[0] = 'why_not_inside':
 
 					act 'The risk makes it sexy':
 						cla & *nl
-						gs 'npc_relationship', 'modify', $boy, 'dislike'
+						gs 'npc_relationship', 'modify', $npcID, 'dislike'
 						'"But that''s the best part," you grin. "The risk is what makes it exciting."'
 						'"Maybe for you..."'
 						gs 'sex_ev_sex', 'sex_end'
@@ -662,10 +662,10 @@ if $ARGS[0] = 'cum_mouth_like_that':
 	end
 end
 
-if $ARGS[0] = 'anal_react ':
+if $ARGS[0] = 'anal_react':
 	if $sex_ev['position'] = 'anal':
 		act 'Happy anal creampie':
-			act 'Go back': cla & gs 'sex_ev_reactions', 'anal_react '
+			act 'Go back': cla & gs 'sex_ev_reactions', 'anal_react'
 			gs 'sex_ev_reactions', 'anal_cp_felt_great'
 			gs 'sex_ev_reactions', 'anal_cp_full'
 			gs 'sex_ev_reactions', 'love_anal_creampies'
@@ -680,7 +680,7 @@ if $ARGS[0] = 'anal_cp_felt_great':
 	if sex_ev['surprise_cum_together'] ! 1:
 		act 'That felt great':
 			cla & *clr
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			if sex_ev['cock_inserted'] = 0:
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/analcreampie/after1.jpg"></center>'
 				if orgasm > sex_ev['orgasm']:
@@ -750,7 +750,7 @@ if $ARGS[0] = 'anal_cp_full':
 				'"I feel... <i>full</i>..." you murmur, savouring the warmth as much as you can even as it dribbles from your puckered hole.'
 			end
 		end
-		sex_ev['react '] = 1
+		sex_ev['react'] = 1
 		minut += rand(1,2)
 		gs 'stat'
 
@@ -762,7 +762,7 @@ if $ARGS[0] = 'love_anal_creampies':
 	if sex_ev['first_creampie'] ! 1:
 		if npc_know_love_creampie[$npcID] = 1:
 			act 'I love it when you come inside':
-				sex_ev['react '] = 1
+				sex_ev['react'] = 1
 				cla & *clr
 				minut += rand(2,5)
 				gs 'stat'
@@ -783,7 +783,7 @@ if $ARGS[0] = 'love_anal_creampies':
 			end
 		else
 			act 'I love anal creampies':
-				sex_ev['react '] = 1
+				sex_ev['react'] = 1
 				cla & *clr
 				minut += rand(2,5)
 				gs 'stat'
@@ -811,7 +811,7 @@ end
 if $ARGS[0] = 'cant_pregnant':
 	act 'Good thing you can''t get pregnant':
 		minut += rand(2,5)
-		sex_ev['react '] = 1
+		sex_ev['react'] = 1
 		cla & *clr
 		if sex_ev['cock_inserted'] = 0:
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
@@ -1003,6 +1003,12 @@ if $ARGS[0] = 'cum_bad_taste':
 	end
 end
 
+if $ARGS[0] = '69_react':
+	if $sex_ev['position'] = '69'
+	
+	end
+end
+
 if $ARGS[0] = 'facial_smile_img':
 	if $pcs_haircol = 'black':
 		$sex_ev['facial_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_black1.jpg"></center>'
@@ -1026,7 +1032,7 @@ if $ARGS[0] = 'facial_happy_reacts':
 		gs 'sex_ev_reactions', 'facial_smile_img'
 		act 'How do I look?':
 			cla & *clr
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			$sex_ev['facial_pic']
 			'"So, how do I look?" you ask, with a cum glazed smile.'
 			if npc_rough[$npcID] > 0 and rand(0,1) = 1:
@@ -1225,7 +1231,7 @@ if $ARGS[0] = 'cum_tasty':
 	if pcs_traits['cumeater'] = 1 and ($sex_ev['last_cum'] = 'face_mouth' or $sex_ev['last_cum'] = 'mouth'):
 		act 'Tasty':
 			cla & *clr
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			$sex_ev['bed_room']
 			'"Mmmm," you lick your lips, catching some of the stray shots of cum that still coat your face. "You taste good."'
 			if $npc_cum_pref[$npcID] = 'mouth':
@@ -1278,7 +1284,7 @@ if $ARGS[0] = 'facial_ruined_makeup':
 		if ($sex_ev['last_cum'] = 'facial' or $sex_ev['last_cum'] = 'face_mouth'):
 			act 'You ruined my makeup (joke)':
 				sex_ev['ruin_makeup'] = 1
-				sex_ev['react '] = 1
+				sex_ev['react'] = 1
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/cum/facial/facial_after1.mp4"></video></center>'
 				'"Look what you''ve done," you say in a mock stern tone, smiling through the cum coating your face. "You''ve fucked up my makeup. Now what am I supposed to do?"'
@@ -1290,7 +1296,7 @@ if $ARGS[0] = 'facial_ruined_makeup':
 		elseif sex_ev['ruin_makeup'] ! 1:
 			act 'You ruined my makeup (joke)':
 				sex_ev['ruin_makeup'] = 1
-				sex_ev['react '] = 1
+				sex_ev['react'] = 1
 				cla & *clr
 				$sex_ev['bed_room']
 				'Looking down at the sheets, you notice dark streaks across them. You wipe the corners of your eyes and find smears of black on your fingers.'
@@ -2113,50 +2119,175 @@ if $ARGS[0] = 'quickshot_tease1':
 	end
 end
 
-if $ARGS[0] = '2pump_react ':
-	act 'Play it off':
-		cla & *nl
-		'"Oh damn!" you say, shaking your fist in mock anger. "My pussy is just too tight! Damn my tight pussy and it''s ability to get guys off!"'
-		'Meeting <<$npc_firstname[$npcID]>>''s eyes, you flash him a smile and he smiles back. Seems that you managed to take the edge off his embarrassment.'
-		gs 'sex_ev_reactions', '2pump_react2'
+if $ARGS[0] = '2pump_smile':
+	if $sex_ev['last_cum'] = 'pullout':
+		if $sex_ev['position'] = 'miss':
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
+		elseif $sex_ev['position'] = 'doggy':
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+		elseif $sex_ev['position'] = 'cowgirl':
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/smile1.jpg"></center>'
+		end
+	elseif sex_ev['cock_inserted'] = 0:
+		gs 'sex_ev_reactions_creampie', 'creampie_pull_out_image'
+	else
+		if $sex_ev['position'] = 'miss':
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/4.jpg"></center>'
+		elseif $sex_ev['position'] = 'doggy':
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/smile1.jpg"></center>'
+		elseif $sex_ev['position'] = 'cowgirl':
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/smile1.jpg"></center>'
+		end
 	end
+end
 
-	act 'Reassure him':
-		cla & *nl
-		if npc_fuck_times[$npcID] = 1:
-			'"It''s okay," you coo softly. "It happens sometimes.'
-		else
-
+if $ARGS[0] = '2pump_irate':
+	if $sex_ev['last_cum'] = 'pullout':
+		if $sex_ev['position'] = 'miss':
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
+		elseif $sex_ev['position'] = 'doggy':
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+		elseif $sex_ev['position'] = 'cowgirl':
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
+		end
+	elseif sex_ev['cock_inserted'] = 0:
+		gs 'sex_ev_reactions_creampie', 'creampie_pull_out_image'
+	else
+		if $sex_ev['position'] = 'miss':
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/1.jpg"></center>'
+		elseif $sex_ev['position'] = 'doggy':
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/shock1.jpg"></center>'
+		elseif $sex_ev['position'] = 'cowgirl':
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
 		end
-		gs 'sex_ev_reactions', '2pump_react2'
 	end
+end
 
-	act 'Already? Seriously?':
-
-	end
+if $ARGS[0] = '2pump_react':
+	gs 'sex_ev_reactions_creampie', 'creampie_wtf_instant'
+	gs 'sex_ev_reactions_creampie', 'creampie_accident_oh_shit'
+	gs 'sex_ev_reactions_creampie', 'idk_you_panic_instant'
+	gs 'sex_ev_reactions_creampie', 'did_you_come_inside'
+	act'That was fast':
+		cla & *nl
+		'"Well, that was fast," you comment.'
+		'"S-sorry..." he says, blush deepening.'
+		act 'Play it off':
+			if npc_insecure[$npcID] > 0:
+				gs 'npc_relationship', 'modify', $npcID, 'love'
+			else
+				gs 'npc_relationship', 'modify', $npcID, 'like'
+			end
+			cla & *clr
+			gs 'sex_ev_reactions', '2pump_smile'
+			'"Oh damn!" you say, shaking your fist in mock anger. "My pussy is just too tight! Damn my vice-like vagina and its ability to get guys off!"'
+			'Meeting <<$npc_firstname[$npcID]>>''s eyes, you flash him a smile and he smiles back. Seems that you managed to take the edge off his embarrassment.'
+			gs 'sex_ev_reactions', '2pump_react2'
+		end
 
-	act 'Tease him (good humor)':
+		act 'Reassure him':
+			if npc_insecure[$npcID] > 0:
+				gs 'npc_relationship', 'modify', $npcID, 'love'
+			else
+				gs 'npc_relationship', 'modify', $npcID, 'like'
+			end
+			cla & *clr
+			gs 'sex_ev_reactions', '2pump_smile'
+			if npc_fuck_times[$npcID] = 0:
+				'"It''s okay," you coo softly. "It happens sometimes."'
+				'"Maybe with some other guys," he says, clearly embarrassed. "It''s... kind of a regular thing with me..."'
+			else
+				'"It''s okay," you coo softly. "It''s not your fault."'
+				'"I just wish-" He cuts off, grimacing.'
+				'"It''s okay. It''s okay..."'
+			end
+			gs 'sex_ev_reactions', '2pump_react2'
+		end
 
-	end
+		act 'Cute':
+			if npc_insecure[$npcID] > 0:
+				gs 'npc_relationship', 'modify', $npcID, 'love'
+			else
+				gs 'npc_relationship', 'modify', $npcID, 'like'
+			end
+			cla & *clr
+			gs 'sex_ev_reactions', '2pump_smile'
+			if npc_fuck_times[$npcID] = 0:
+				'"Don''t worry," you smile. "I think it''s cute."'
+				'"Really?" he asks hesitantly. "Cause... this kind of happens every time..."'
+				'"Yeah," you reassure him. "A guy can''t hold it in for even a minute inside me? <i>Very</i> cute."'
+			else
+				'"You''re so cute when you do that," you smile.'
+				'"When I... prematurely ejaculate?"'
+				'"Yes," you say, smile broadening. "<i>Especially</i> when you do that."'
+			end
+			gs 'sex_ev_reactions', '2pump_react2'
+		end
 
-	act 'Cute':
+		act 'That was <i>hot</i>':
+			if npc_insecure[$npcID] > 0:
+				gs 'npc_relationship', 'modify', $npcID, 'love'
+			else
+				gs 'npc_relationship', 'modify', $npcID, 'like'
+			end
+			cla & *clr
+			gs 'sex_ev_reactions', '2pump_smile'
+			if npc_fuck_times[$npcID] = 0:
+				'"<i>Fuck</i>, that was so hot," you grin.'
+				'"Sorry I... wait what?"'
+				'"Nothing''s hotter than when a guy can''t hold his cum with me," you say, smile broadening. "Makes me feel like a sex <i>goddess</i>."'
+			else
+				'"It''s so <i>hot</i> when you do that," you grin.'
+				'"When I... prematurely ejaculate?"'
+				'"<i>Yes</i>," you say, smile broadening. "Makes me feel like a sex goddess that you can''t hold your cum when you''re inside me."'
+			end
+			gs 'sex_ev_reactions', '2pump_react2'
+		end
 
+		if stat['men_fucked'] > 0:
+			act 'Used to it (nice)':
+				cla & *clr
+				gs 'sex_ev_reactions', '2pump_smile'
+				if npc_fuck_times[$npcID] = 0:
+					'"Don''t worry," you smirk. "Guys do this all the time."'
+					'"Maybe with some other guys," he says, clearly embarrassed. "It''s... kind of a regular thing with me..."'
+					'"Well, then I guess we''re both used to it then," you grin.'
+				else
+					'"Don''t worry," you smile reassuringly. "I''m used to this."'
+					'"Doesn''t mean I''m not embarrassed..."'
+					'"Don''t be. It''s just who you are."'
+				end
+				gs 'sex_ev_reactions', '2pump_react2'
+			end
+		end
 	end
-
-	if npc_fuck_times[$npcID] > 0:
-		act 'Used to it (nice)':
-
+	
+	act 'Already? Seriously?':
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
+		cla & *clr
+		gs 'sex_ev_reactions', '2pump_irate'
+		if npc_fuck_times[$npcID] = 0:
+			'"Are you kidding me?" you huff. "You came? Already?!"'
+			'He grimaces, clearly embarrassed and your comment not helping.'
+		else
+			'"Ugh, can you at least go five minutes without busting your nut?" you huff in irritation.'
+			'He grimaces, clearly embarrassed and your comment not helping.'
 		end
+		gs 'sex_ev_reactions', '2pump_react2'
 	end
 end
 
 
 if $ARGS[0] = '2pump_react2':
-	if npc_fuck_times[$npcID] > 1 and npc_sexdrive[$npcID] > 1:
+	!! if npc_fuck_times[$npcID] > 1 and npc_sexdrive[$npcID] > 1:
 		act 'Ready to go again?':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
-			'"Now that that''s out of the way, you ready to go again?" you ask.'
+			if npc_fuck_times[$npcID] = 0:
+				'"So... is that your only shot or you ready to go again?" you ask.'
+			else
+				'"Now that that''s out of the way, you ready to go again?" you ask.'
+			end
 			if (rand(1,10) >= npc_sexdrive[$npcID] or sex_ev['cum_count'] >= 5 + sex_ev['extra_cum']) and sex_ev['boy_cum'] = 1:
 				gs 'sex_ev_after', 'fucked_out'
 			else
@@ -2166,7 +2297,7 @@ if $ARGS[0] = '2pump_react2':
 				gs 'sex_ev_sex', 'sex_menu'
 			end
 		end
-	end
+	!! end
 end
 
 --- sex_ev_reactions ---------------------------------

+ 40 - 57
locations/sex_ev_reactions_creampie.qsrc

@@ -2,7 +2,7 @@
 
 !! -------------------- creampie reactions --------------------------------
 
-if $ARGS[0] = 'creampie_react ':
+if $ARGS[0] = 'creampie_react':
 	if sex_ev['cock_inserted'] = 1:gs 'sex_ev_cum', 'cum_inside_pull_away'
 	if $sex_ev['last_cum'] = 'creampie':
 !!		if sex_ev['creampie_surprise'] = 1:
@@ -15,7 +15,7 @@ if $ARGS[0] = 'creampie_react ':
 			gs 'sex_ev_reactions_creampie', 'creampie_conflicted'
 
 			gs 'sex_ev_reactions_creampie', 'creampie_unhappy'
-			gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react '
+			gs 'sex_ev_reactions_creampie', 'creampie_cum_together_react'
 			gs 'sex_ev_talk', 'free_creampies'
 			gs 'sex_ev_reactions_creampie', 'creampie_safe_day'
 			gs 'sex_ev_reactions_creampie', 'did_you_come_inside'
@@ -361,7 +361,7 @@ if $ARGS[0] = 'creampie_unhappy':
 	end
 end
 
-if $ARGS[0] = 'creampie_cum_together_react ':
+if $ARGS[0] = 'creampie_cum_together_react':
 	if sex_ev['came_together'] ! 3 and (sex_ev['came_together'] = 2 or sex_ev['surprise_cum_together'] = 1) and sex_ev['hypno_came_together'] ! 1:
 		act 'Did we come together?':
 			sex_ev['came_together'] = 3
@@ -404,7 +404,7 @@ if $ARGS[0] = 'creampie_cum_together_react ':
 			end
 			sex_ev['did_we_cum_together'] = 2
 			act 'Continue':cla & gs 'sex_ev_sex', 'sex_end'
-			gs 'sex_ev_reactions_creampie', 'creampie_react '
+			gs 'sex_ev_reactions_creampie', 'creampie_react'
 		end
 	elseif sex_ev['hypno_came_together'] = 1 and sex_ev['did_we_cum_together'] = 1:
 		act 'Lie about coming together':
@@ -880,16 +880,16 @@ if $ARGS[0] = 'cum_together_no_bc2':
 end
 
 if $ARGS[0] = 'pull-out_finish':
-	if (sex_ev['pullout_ask'] = 1 or sex_ev['not_inside'] = 1) and sex_ev['creampie_surprise'] = 1 and sex_ev['pull-out_fail_react '] = 0:
+	if (sex_ev['pullout_ask'] = 1 or sex_ev['not_inside'] = 1) and sex_ev['creampie_surprise'] = 1 and sex_ev['pull-out_fail_react'] = 0:
 		act iif(sex_ev['not_inside'] = 1, '[not]... inside...', '[pull]... out...'):
 			cla & *nl
-			sex_ev['pull-out_fail_react '] = 1
+			sex_ev['pull-out_fail_react'] = 1
 			if sex_ev['came_together'] > 0:
 				iif(sex_ev['not_inside'] = 1, '"not... in... side..."', '"... out..."') + ' you finish belatedly. You gulp, panting to catch your breath, guts twisted in conflict between your wish that he had pulled out and the orgasm that just rocked your world.'
 			else
 				iif(sex_ev['not_inside'] = 1, '"not... in... side..."', '"... out..."') + ' you finish belatedly.'
 			end
-			gs 'sex_ev_reactions_creampie', 'creampie_react '
+			gs 'sex_ev_reactions_creampie', 'creampie_react'
 		end
 	end
 end
@@ -1273,7 +1273,7 @@ if $ARGS[0] = 'cum_together_yeah':
 	if npc_know_love_creampie[$npcID] ! 1:
 		act 'Yeah':
 			cla & *nl
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			minut += rand(2,5)
 			gs 'stat'
 			if sex_ev['cum_together_fake'] = 0:
@@ -1302,7 +1302,7 @@ if $ARGS[0] = 'creampie_felt_great':
 	if sex_ev['surprise_cum_together'] ! 1:
 		act 'That felt great':
 			cla & *clr
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			sex_ev['creampie_allowance'] = 1
 			if sex_ev['cock_inserted'] = 0:
 				gs 'sex_ev_reactions_creampie', 'creampie_pull_out_image'
@@ -1418,7 +1418,7 @@ if $ARGS[0] = 'feel_full':
 			end
 		end
 
-		sex_ev['react '] = 1
+		sex_ev['react'] = 1
 		minut += rand(1,2)
 		gs 'stat'
 
@@ -1431,7 +1431,7 @@ if $ARGS[0] = 'love_creampies':
 		if npc_know_love_creampie[$npcID] = 1:
 			act 'I love it when you come inside':
 				sex_ev['creampie_allowance'] = 1
-				sex_ev['react '] = 1
+				sex_ev['react'] = 1
 				cla & *clr
 				minut += rand(2,5)
 				gs 'stat'
@@ -1458,7 +1458,7 @@ if $ARGS[0] = 'love_creampies':
 			end
 		else
 			act 'I love creampies':
-				sex_ev['react '] = 1
+				sex_ev['react'] = 1
 				sex_ev['creampie_allowance'] = 1
 				cla & *clr
 				minut += rand(2,5)
@@ -1620,7 +1620,7 @@ end
 
 if $ARGS[0] = 'creampie_pc_startled':
 !!	if sex_ev['creampie_allowance'] = 0 and sex_ev['creampie_ask'] ! 1 and sex_ev['came_together'] = 0 and npc_free_creampies[$npcID] ! 2:
-	if sex_ev['creampie_ask'] ! 1 and sex_ev['creampie_force'] ! 1 and sex_ev['came_together'] = 0 and npc_free_creampies[$npcID] ! 2:
+	if sex_ev['creampie_ask'] ! 1 and sex_ev['creampie_force'] ! 1 and sex_ev['came_together'] = 0 and npc_free_creampies[$npcID] ! 2 and $sex_ev['reaction'] ! 'startled':
 		act 'Startled':
 			$sex_ev['reaction'] = 'startled'
 			cla & *clr
@@ -1632,8 +1632,12 @@ if $ARGS[0] = 'creampie_pc_startled':
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
 			end
 			'You gasp in surprise, freezing up as <<$npc_firstname[$npcID]>>''s cock continues to pulse inside you.'
-			if sex_ev['cock_inserted'] = 1:gs 'sex_ev_cum', 'cum_inside_pull_away'
-			gs 'sex_ev_reactions_creampie', 'did_you_come_inside'
+			if sex_ev['2pump'] = 1:
+				gs 'sex_ev_cum', '2pumpchump_creampie'
+			elseif sex_ev['cock_inserted'] = 1:
+				gs 'sex_ev_cum', 'cum_inside_pull_away'
+				gs 'sex_ev_reactions_creampie', 'did_you_come_inside'
+			end
 		end
 	end
 end
@@ -1663,7 +1667,7 @@ if $ARGS[0] = 'take_in_stride1':
 			end
 			act 'Continue':cla & gs 'sex_ev_sex', 'sex_end'
 			gs 'sex_ev_cum', 'cum_inside_pull_away'
-			gs 'sex_ev_reactions', 'cum_react '
+			gs 'sex_ev_reactions', 'cum_react'
 		end
 	end
 end
@@ -1692,7 +1696,12 @@ if $ARGS[0] = 'did_you_come_inside':
 				end
 			end
 			!! the following section has many different menus to account for continuity of choices depending on how the boy responds
-			if sex_ev['cum_warn'] = 1 and sex_ev['surprise_cum_together'] = 1:
+			if sex_ev['2pump'] = 1:
+				!! if npc_insecure[$npcID] = 1:
+				!! else
+				'"Y-yeah..." he mumbles.'
+				gs 'sex_ev_reactions', '2pump_react'
+			elseif sex_ev['cum_warn'] = 1 and sex_ev['surprise_cum_together'] = 1:
 				'"I was trying to tell you," <<$npc_firstname[$npcID]>> pants, breathing hard. "I was going to come... But you weren''t listening..."'
 				act 'Take it in stride':
 					cla
@@ -1871,7 +1880,7 @@ if $ARGS[0] = 'delayed_creampie_orgasm1':
 			sex_ev['orgasm_count'] += 1
 			sex_ev['simultaneous_orgasm_count'] += 1
 			sex_ev['came_together'] = 2
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal',-1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 			gs 'stat'
@@ -2380,7 +2389,7 @@ end
 if $ARGS[0] = 'creampie_wtf_instant':
 	if sex_ev['creampie_allowance'] ! 1 and sex_ev['creampie_ask'] ! 1 and npc_free_creampies[$npcID] ! 2 and sex_ev['virgin_creampie_request'] ! 1:
 		act 'What the fuck!':
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			sex_ev['mad'] = 1
 			sex_ev['creampie_wtf'] += 1
 			cla & *clr
@@ -2399,7 +2408,7 @@ end
 if $ARGS[0] = 'creampie_wtf_after':
 	if sex_ev['creampie_allowance'] ! 1 and sex_ev['creampie_ask'] ! 1 and npc_free_creampies[$npcID] ! 2 and sex_ev['virgin_creampie_request'] ! 1:
 		act 'What the fuck!':
-			sex_ev['react '] = 1
+			sex_ev['react'] = 1
 			sex_ev['mad'] = 1
 			sex_ev['creampie_wtf'] += 1
 			cla & *clr
@@ -2444,33 +2453,7 @@ if $ARGS[0] = 'creampie_wtf_menu':
 			sex_ev['cock_inserted'] = 0
 			gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
 			gs 'sex_ev_reactions_creampie', 'creampie_wtf_no_bc'
-			if sex_ev['ma_pill_tomorrow'] = 1:
-				'"Why bother? Weren''t you gonna get the pill tomorrow anyways?"'
-				gs 'sex_ev_reactions_creampie', 'not_creampie_pass'
-				act 'You promised!':
-					cla & *clr
-					gs 'sex_ev_reactions_creampie', 'creampie_wtf_image3'
-					'"That doesn''t matter!" you hiss. "You promised!"'
-					'<<$npc_firstname[$npcID]>> rolls his eyes and shrugs.'
-					gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
-					gs 'sex_ev_reactions_creampie', 'creampie_forgive'
-					gs 'sex_ev_after', 'quit'
-				end
-			else
-				if (npc_abusive[$npcID] = 1 or npc_selfish[$npcID] = 1) and (npc_childfree[$npcID] = 0 or npc_know_bc[$npcID] = 1):
-					if rand(0,1) = 1:
-						'"It''s not like it matters after the first one," he grunts dismissively. "Don''t get bent out of shape."'
-					else
-						'"It''s not like it makes any difference at this point," he says, waving his hand dismissively. "Just buy some plan B tomorrow."'
-					end
-					gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
-				else
-					'"Fuck! I''m so sorry! " he says, looking as panicked as you are mad. "It was an accident! I swear! I didn''t mean to!"'
-				end
-				gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
-				gs 'sex_ev_reactions_creampie', 'creampie_forgive'
-				gs 'sex_ev_reactions_creampie', 'creampie_wtf_no_bc'
-			end
+			gs 'sex_ev_reactions_creampie', 'boy_creampie_react'
 		end
 	end
 	gs 'sex_ev_reactions_creampie', 'creampie_wtf_no_bc'
@@ -2557,7 +2540,7 @@ if $ARGS[0] = 'creampie_wtf_no_bc':
 				end
 			elseif sex_ev['pc_skip_the_condom'] = 1:
 				if npc_childfree[$npcID] > 0:
-					gs 'npc_relationship', 'modify', $boy, 'hate'
+					gs 'npc_relationship', 'modify', $npcID, 'hate'
 					'"Then why didn''t you want to use a <i>fucking condom?</i>" <<$npc_firstname[$npcID]>> shouts back, now looking equally as agitated as you.'
 				else
 					'"Should''ve asked to use a condom then," he shrugs.'
@@ -2565,7 +2548,7 @@ if $ARGS[0] = 'creampie_wtf_no_bc':
 			end
 			gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
 			gs 'sex_ev_reactions_creampie', 'creampie_forgive'
-			gs 'sex_ev_reactions_creampie', 'boy_creampie_react '
+			gs 'sex_ev_reactions_creampie', 'boy_creampie_react'
 		end
 	end
 end
@@ -2669,7 +2652,7 @@ if $ARGS[0] = 'idk_you_mad':
 						'"I only let guys I trust come inside me!" you sneer.'
 						gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
 						gs 'sex_ev_reactions_creampie', 'creampie_forgive'
-						gs 'sex_ev_reactions_creampie', 'boy_creampie_react '
+						gs 'sex_ev_reactions_creampie', 'boy_creampie_react'
 					end
 
 					act 'Only with guys you trust':
@@ -2678,7 +2661,7 @@ if $ARGS[0] = 'idk_you_mad':
 						'"I only let guys I trust come inside me!" you sneer.'
 						gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
 						gs 'sex_ev_reactions_creampie', 'creampie_forgive'
-						gs 'sex_ev_reactions_creampie', 'boy_creampie_react '
+						gs 'sex_ev_reactions_creampie', 'boy_creampie_react'
 					end
 
 					act 'What if he''s got STDs?':
@@ -2687,7 +2670,7 @@ if $ARGS[0] = 'idk_you_mad':
 						'"I don''t know if you''re clean!"'
 						gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
 						gs 'sex_ev_reactions_creampie', 'creampie_forgive'
-						gs 'sex_ev_reactions_creampie', 'boy_creampie_react '
+						gs 'sex_ev_reactions_creampie', 'boy_creampie_react'
 					end
 
 					act 'Only for boyfriends':
@@ -2712,7 +2695,7 @@ if $ARGS[0] = 'idk_you_mad':
 						end
 						gs 'sex_ev_reactions_creampie', 'creampie_wtf_end'
 						gs 'sex_ev_reactions_creampie', 'creampie_forgive'
-						gs 'sex_ev_reactions_creampie', 'boy_creampie_react '
+						gs 'sex_ev_reactions_creampie', 'boy_creampie_react'
 					end
 				end
 			end
@@ -2768,7 +2751,7 @@ if $ARGS[0] = 'idk_you_panic_after':
 	end
 end
 
-if $ARGS[0] = 'boy_creampie_react ':
+if $ARGS[0] = 'boy_creampie_react':
 	if sex_ev['ma_pill_tomorrow'] = 1:
 		gs 'sex_ev_reactions_creampie', 'not_creampie_pass'
 	elseif npc_know_bc[$npcID] = 1 and (npc_abusive[$npcID] = 1 or npc_selfish[$npcID] = 1):
@@ -3090,7 +3073,7 @@ if $ARGS[0] = 'creampie_accident_birth_control':
 					'The look on his face sends you into uncontrollable giggles and you relent.'
 					'"I''m kidding," you laugh. I''m on the <<$sex_ev[''bc_type'']>>. I won''t get pregnant."'
 					if npc_childfree[$npcID] > 0:
-						gs 'npc_relationship', 'modify', $boy, 'dislike'
+						gs 'npc_relationship', 'modify', $npcID, 'dislike'
 						'"That''s not funny!" <<$npc_firstname[$npcID]>> scowls.'
 					else
 						'"That''s not funny!" <<$npc_firstname[$npcID]>> says, though you can see his own smile breaking through.'
@@ -3330,10 +3313,10 @@ if $ARGS[0] = 'creampie_freakout_gtg':
 end
 
 if $ARGS[0] = 'pullout_game_tease':
-	if sex_ev['pullout_game'] > 0 and $sex_ev['last_cum'] = 'creampie' and sex_ev['creampie_surprise'] = 1 and sex_ev['pullout_game_react '] = 0 and sex_ev['creampie_allowance'] = 0:
+	if sex_ev['pullout_game'] > 0 and $sex_ev['last_cum'] = 'creampie' and sex_ev['creampie_surprise'] = 1 and sex_ev['pullout_game_react'] = 0 and sex_ev['creampie_allowance'] = 0:
 		act 'Pullout game, huh? (laugh it off)':
 			cla & *clr
-			sex_ev['pullout_game_react '] = 1
+			sex_ev['pullout_game_react'] = 1
 			if $sex_ev['position'] = 'miss':
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/4.jpg"></center>'
 			elseif $sex_ev['position'] = 'doggy':

+ 37 - 31
locations/sex_ev_sex.qsrc

@@ -162,22 +162,24 @@ if $ARGS[0] = 'position_choose':
 			gs 'sex_ev_miss', 'missionary_start'
 			gs 'sex_ev_doggy', 'doggy_start'
 			gs 'sex_ev_cowgirl', 'cowgirl_start'
-	!!		gs 'sex_ev_anal', 'anal_start'
+			gs 'sex_ev_anal', 'anal_start'
 		else
 			!! boy wins initiative
 			cla
-			if rand(0,1) = 1:
-				if $npc_fav_pos[$npcID] = 'miss':
-					gs 'sex_ev_miss', 'missionary_start'
-				elseif $npc_fav_pos[$npcID] = 'doggy':
-					gs 'sex_ev_doggy', 'doggy_start'
-				elseif $npc_fav_pos[$npcID] = 'cowgirl':
-					gs 'sex_ev_cowgirl', 'cowgirl_start'
+			act'Continue':
+				if rand(0,1) = 1:
+					if $npc_fav_pos[$npcID] = 'miss':
+						gs 'sex_ev_miss', 'missionary_start'
+					elseif $npc_fav_pos[$npcID] = 'doggy':
+						gs 'sex_ev_doggy', 'doggy_start'
+					elseif $npc_fav_pos[$npcID] = 'cowgirl':
+						gs 'sex_ev_cowgirl', 'cowgirl_start'
+					else
+						gs 'sex_ev_sex', 'rand_position'
+					end
 				else
 					gs 'sex_ev_sex', 'rand_position'
 				end
-			else
-				gs 'sex_ev_sex', 'rand_position'
 			end
 		end
 	end
@@ -405,12 +407,12 @@ if $ARGS[0] = 'fuck_continue':
 			
 			if sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
 
-!!				gs 'sex_ev_sex_talk_<<$boy>>', 'completion_checker'
+!!				gs 'sex_ev_sex_talk_<<$npcID>>', 'completion_checker'
 				
 				act 'Talk while fucking':
 					cla
-					if mid($boy,1,1) = 'A':
-						gs 'sex_ev_sex_talk_<<$boy>>', 'talk_menu'
+					if mid($npcID,1,1) = 'A':
+						gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_menu'
 					else
 						gs 'sex_ev_sex_talk', 'talk_menu'
 					end
@@ -429,12 +431,12 @@ if $ARGS[0] = 'fuck_continue':
 			end}
 			if sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
 
-!!				gs 'sex_ev_sex_talk_<<$boy>>', 'completion_checker'
+!!				gs 'sex_ev_sex_talk_<<$npcID>>', 'completion_checker'
 				
 				act 'Talk while fucking':
 					cla
-					if mid($boy,1,1) = 'A':
-						gs 'sex_ev_sex_talk_<<$boy>>', 'talk_menu'
+					if mid($npcID,1,1) = 'A':
+						gs 'sex_ev_sex_talk_<<$npcID>>', 'talk_menu'
 					else
 						gs 'sex_ev_sex_talk', 'talk_menu'
 					end
@@ -609,11 +611,12 @@ if $ARGS[0] = 'position_change':
 		end
 	end
 	
-!!{	if $sex_ev['position'] ! 'anal':
-		gs 'sex_ev_anal', 'anal_start'
+	if $sex_ev['position'] ! 'anal':
+		!! gs 'sex_ev_anal', 'anal_start'
+		'ANAL STUFF IS CRASHING'
 	else
 		act 'Keep taking it up the ass':gt 'sex_ev_anal', 'anal<<sex_ev[''speed'']>>.2'
-	end}
+	end
 end
 
 if $ARGS[0] = 'fuck_me_faster':
@@ -706,10 +709,10 @@ if $ARGS[0] = 'sex_end':
 !!	act 'Clean up': gs 'sex_ev_after', 'wipe_menu'
 !!	gs 'sex_ev_after', 'his_wipes'
 	gs 'sex_ev_after', 'cum_clean'
-	if sex_ev['react '] = 0:
+	if sex_ev['react'] = 0:
 		gs 'sex_ev_after', 'facial_mouth_clean'
 		gs 'sex_ev_reactions', 'cum_kiss_cock'
-		gs 'sex_ev_reactions', 'cum_react '
+		gs 'sex_ev_reactions', 'cum_react'
 	end
 	gs 'sex_ev_cum', 'cum_inside_pull_away'
 	
@@ -784,7 +787,7 @@ if $ARGS[0] = 'take_a_break':
 		!! if Sveta came
 		minut += rand(1,3)
 		gs 'stat'
-		sex_ev['react '] = 1
+		sex_ev['react'] = 1
 		if $sex_ev['last_cum'] = 'creampie':
 			if sex_ev['cock_inserted'] = 0:
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
@@ -1530,6 +1533,8 @@ if $ARGS[0] = 'session_reset':
 	sex_ev['fucked_out'] = 0
 	sex_ev['cock_inserted'] = 0
 	sex_ev['first_insertion'] = 0
+	if sex_ev['2pump'] > 0: sex_ev['2pump'] = 0
+	$sex_ev['fuck_enjoyment'] = ''
 	gs 'sex_ev_sex', 'reset'
 end
 
@@ -1566,7 +1571,7 @@ if $ARGS[0] = 'reset':
 	sex_ev['creampie_surprise'] = 0
 	sex_ev['surprise_cum_together'] = 0
 	sex_ev['cum_together_fake'] = 0
-	sex_ev['cum_react '] = 0
+	sex_ev['cum_react'] = 0
 	if sex_ev['mad'] = 1:sex_ev['mad'] = 2
 	sex_ev['boy_cum'] = 0
 	sex_ev['bj_cum'] = 0
@@ -1588,7 +1593,7 @@ if $ARGS[0] = 'reset':
 	sex_ev['swallow'] = 0
 	sex_ev['spit'] = 0
 	sex_ev['gag'] = 0
-	sex_ev['react '] = 0
+	sex_ev['react'] = 0
 	sex_ev['force_initiative'] = 0
 	sex_ev['smoke_break'] = 0
 	!!sex_ev['first_break'] = 0
@@ -1621,11 +1626,12 @@ if $ARGS[0] = 'reset':
 	sex_ev['boy_smoked'] = 0
 	sex_ev['shower'] = 0
 	sex_ev['pee_after'] = 0
-	sex_ev['pull-out_fail_react '] = 0
+	sex_ev['pull-out_fail_react'] = 0
 	sex_ev['catch_breath'] = 0
 	if sex_ev['morning_after'] = 1 and sex_ev['morning_fuck'] = 0: sex_ev['morning_fuck'] = 1
 	sex_ev['not_yet'] = 0
 	sex_ev['need_break'] = 0
+	if sex_ev['2pump'] = 1: sex_ev['2pump'] = 2
 end
 
 if $ARGS[0] = 'pain':
@@ -1975,15 +1981,15 @@ end
 
 if $ARGS[0] = 'sleep_cum':
 	if $npc_cum_pref[$npcID] = 'creampie' and ((npc_condom_conscious[$npcID] ! 1 and npc_childfree[$npcID] ! 1) or (npc_free_creampies[$npcID] = 1 and ($sex_ev['preg_risk'] ! 'safe' or $sex_ev['preg_risk'] = 'prob_safe')) or npc_free_creampies[$npcID] = 2 or npc_know_bc[$npcID] = 1):
-		gs 'cum_call', '', $boy,1
+		gs 'cum_call', '', $npcID,1
 	elseif $npc_cum_pref[$npcID] = 'mouth' or $npc_cum_pref[$npcID] = 'face':
-		gs 'cum_call', 'face', $boy, 1
+		gs 'cum_call', 'face', $npcID, 1
 	elseif $npc_cum_pref[$npcID] = 'tits':
-		gs 'cum_call', 'breasts', $boy, 1
+		gs 'cum_call', 'breasts', $npcID, 1
 	elseif $npc_cum_pref[$npcID] = 'pullout':
-		gs 'cum_call', 'stomach', $boy, 1
+		gs 'cum_call', 'stomach', $npcID, 1
 	else
-		gs 'cum_call', 'stomach', $boy, 1
+		gs 'cum_call', 'stomach', $npcID, 1
 	end
 	act '. . .':gt 'sex_ev_after', 'sleep_function'
 end
@@ -2037,7 +2043,7 @@ if $ARGS[0] = 'wakeup_sex_options':
 	*nl
 	if npc_sleep_sex_okay[$npcID] > 0:
 		!! npc_sleep_sex_okay[$npcID] = 2 means you''ve asked him to wake you up for sleep sex
-		if npc_humor[$npcID] = 1 and $npc_apt_spare[$npcID] = 'gaming' and rand(1,3) = 1:
+		if $npc_humor[$npcID] = 'childish' and $npc_apt_spare[$npcID] = 'gaming' and rand(1,3) = 1:
 			sex_ev['skyrim_joke'] = 1
 			'"You''re finally awake," <<$npc_firstname[$npcID]>> says, putting on a stern face and a gruff voice. "You were trying to cross the border, right?"'
 		else

+ 35 - 11
locations/sex_ev_shower.qsrc

@@ -379,7 +379,11 @@ if $ARGS[0] = 'shower_sex_menu':
 			gs 'sex_ev_shower', 'shower_together_end'
 		end
 	else
-		gs 'sex_ev_shower', 'shower_together_jerkoff1'
+		if $sex_ev['position'] ! 'handjob':
+			gs 'sex_ev_shower', 'shower_together_jerkoff1'
+		else
+			gs 'sex_ev_shower', 'shower_together_jerkoff2'
+		end
 		gs 'sex_ev_shower', 'together_bj1'
 		gs 'sex_ev_shower', 'together_fuck_menu'
 	end
@@ -398,7 +402,11 @@ if $ARGS[0] = 'shower_reach_cock':
 			gs 'sex_ev_shower', 'shower_together_end'
 		else
 			'He groans under your touch, growing in stiffness beneath the gentle jerking of your hand.'
-			gs 'sex_ev_shower', 'shower_together_jerkoff1'
+			if $sex_ev['position'] ! 'handjob':
+				gs 'sex_ev_shower', 'shower_together_jerkoff1'
+			else
+				gs 'sex_ev_shower', 'shower_together_jerkoff2'
+			end
 			gs 'sex_ev_shower', 'together_bj1'
 			gs 'sex_ev_shower', 'together_fuck_menu'
 		end
@@ -419,6 +427,22 @@ if $ARGS[0] = 'shower_together_makeout1':
 end
 
 if $ARGS[0] = 'shower_together_jerkoff1':
+	act 'Jerk his cock':
+		$sex_ev['position'] = 'handjob'
+		gs 'arousal', 'clit_finger', -5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
+		gs 'arousal', 'hj', rand(2,5), 'no_orgasm_msg', $sex_ev['prostitution_flag']
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/fun2.mp4"></video></center>'
+		'You reach back for <<$npc_firstname[$npcID]>>''s cock as he keeps groping your tits from behind. Both your breathing intensifies as you jerk his shaft and he squeezes your nipples.'
+		*nl
+		'It feels as though the steam should be coming from your heavy breaths instead of the water.'
+		act 'Make him cum':gs 'sex_ev_shower', 'shower_together_jerkoff_cum'
+		gs 'sex_ev_shower', 'together_bj1'
+		gs 'sex_ev_shower', 'together_fuck_menu'
+	end
+end
+
+if $ARGS[0] = 'shower_together_jerkoff2':
 	act 'Jerk his cock':
 		$sex_ev['position'] = 'handjob'
 		gs 'arousal', 'clit_finger', -5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
@@ -703,7 +727,7 @@ end
 
 if $ARGS[0] = 'shower_together_jerkoff_cum':
 	$sex_ev['last_cum'] = 'jerkoff'
-	gs 'cum_call', 'stomach', $boy, 1
+	gs 'cum_call', 'stomach', $npcID, 1
 	sex_ev['cum_count'] += 1
 	sex_ev['orgasm_count'] += 1
 	cla & *clr
@@ -727,7 +751,7 @@ if $ARGS[0] = 'shower_together_jerkoff_cum':
 end
 
 if $ARGS[0] = 'shower_cum_mouth1':
-	gs 'cum_call', 'mouth_swallow', $boy, 1
+	gs 'cum_call', 'mouth_swallow', $npcID, 1
 	sex_ev['cum_count'] += 1
 	gs 'stat'
 	cla & *clr
@@ -744,7 +768,7 @@ if $ARGS[0] = 'shower_cum_mouth2':
 	sex_ev['cum_mouth'] += 1
 	$sex_ev['last_cum'] = 'mouth'
 	act 'Spit it out':
-		gs 'cum_call', 'mouth', $boy, 1
+		gs 'cum_call', 'mouth', $npcID, 1
 		sex_ev['spit_count'] += 1
 		cla & *clr
 		$sex_ev['bath_room']
@@ -753,7 +777,7 @@ if $ARGS[0] = 'shower_cum_mouth2':
 	end
 
 	act 'Swallow':
-		gs 'cum_call', 'mouth_swallow', $boy, 1
+		gs 'cum_call', 'mouth_swallow', $npcID, 1
 		sex_ev['swallow'] = 1
 		sex_ev['swallow_count'] += 1
 		cla & *clr
@@ -785,7 +809,7 @@ if $ARGS[0] = 'shower_cum_facial_after':
 end
 
 if $ARGS[0] = 'shower_creampie1':
-	gs 'cum_call', '', $boy, 1
+	gs 'cum_call', '', $npcID, 1
 	sex_ev['shower_creampie'] += 1
 	sex_ev['creampie_count'] += 1
 	$sex_ev['last_cum'] = 'creampie'
@@ -844,7 +868,7 @@ if $ARGS[0] = 'shower_cum_together1':
 		$orgasm_or = 'yes'
 		gs 'arousal', 'vaginal', -1
 	end
-	gs 'cum_call', '', $boy, 1
+	gs 'cum_call', '', $npcID, 1
 	sex_ev['shower_creampie'] += 1
 	sex_ev['creampie_count'] += 1
 	cla & *clr
@@ -872,7 +896,7 @@ if $ARGS[0] = 'shower_creampie_after':
 end
 
 if $ARGS[0] = 'shower_creampie_surprise':
-	gs 'cum_call', '', $boy, 1
+	gs 'cum_call', '', $npcID, 1
 	sex_ev['shower_creampie'] += 1
 	sex_ev['creampie_count'] += 1
 	cla & *clr
@@ -1064,7 +1088,7 @@ end
 
 if $ARGS[0] = 'shower_together_ending_kiss':
 	act 'Kiss him':
-		gs 'npc_relationship', 'modify', $boy, 'like'
+		gs 'npc_relationship', 'modify', $npcID, 'like'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/kiss2.mp4"></video></center>'
 		if sex_ev['orgasm'] < orgasm:
@@ -1083,7 +1107,7 @@ if $ARGS[0] = 'shower_together_ending_kiss':
 end
 
 if $ARGS[0] = 'shower_together_towel':
-	if $boy = 'A34': gt 'sex_ev_A34', 'kolka_shower_end'
+	if $npcID = 'A34': gt 'sex_ev_A34', 'kolka_shower_end'
 	sex_ev['boy_in_shower'] = 0
 	sex_ev['shower'] = 1
 	if sex_ev['morning_after'] > 0: sex_ev['morning_shower'] = 1

+ 228 - 103
locations/sex_ev_start.qsrc

@@ -169,9 +169,9 @@ if $ARGS[0] = 'hookup_initiate':
 			gs 'npcStat', $npclastgenerated
 			dynamic $npc_preferences[$npcID]
 		end
-	elseif mid($boy,1,1) = 'C':
+	elseif mid($npcID,1,1) = 'C':
 		gs 'npcpreservec', $npclastgenerated
-		gs 'boystat', $npclastsaved
+		gs 'npcStat', $npclastsaved
 	end
 	stat['hookup_count'] += 1
 	if arrpos('$hookup_partners', $npcID) < 0: $hookup_partners[] = $npcID
@@ -217,7 +217,7 @@ if $ARGS[0] = 'city_hotel_img_init':
 end
 
 if $ARGS[0] = 'fb_npc_home_start':
-!!	gs 'boystat', $ARGS[1]
+!!	gs 'npcStat', $ARGS[1]
 	$sex_ev['type'] = 'booty_call'
 	if (booty_call_invite[$npcID] = daystart or npc_booty_call_date[$npcID] = daystart or npc_booty_call_date[$npcID] = daystart) and npc_last_booty_call[$npcID] ! daystart:
 		gt 'sex_ev_start', 'fb_invited_start'
@@ -233,51 +233,51 @@ end
 if $ARGS[0] = 'fb_npc_home_fast_start':
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'lover_home_img_init'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'date_npc_home_start':
-!!	gs 'boystat', $ARGS[1]
+!!	gs 'npcStat', $ARGS[1]
 	$sex_ev['type'] = 'lover_sex'
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'lover_home_img_init'
 !!	act 'Take it slow': gt 'sex_ev_start', 'slow_undress'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'unique_pc_home_start':
 	sex_ev['unique_npc'] = 1
 	gs 'sex_ev_start', 'pc_home_img_init'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'hookup_pc_home_start':
 	gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'pc_home_img_init'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'hookup_npc_home_start':
 	gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'lover_home_img_init'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'pc_home_start':
 	if $ARGS[1] = 'hookup': gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'pc_home_img_init'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'npc_home_start':
 	if $ARGS[1] = 'hookup': gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'lover_home_img_init'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'hookup_hotel_start':
@@ -288,7 +288,7 @@ if $ARGS[0] = 'hookup_hotel_start':
 		gs 'sex_ev_start', 'city_hotel_img_init'
 	end
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'hookup_party_start':
@@ -297,14 +297,14 @@ if $ARGS[0] = 'hookup_party_start':
 	$sex_ev['bed_room'] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<rand(1,2)>>/bedroom.jpg"></center>'
 	sex_ev['action_restricted'] = 1
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'unique_npc_start':
 	sex_ev['unique_npc'] = 1
 	gs 'sex_ev_start', 'lover_home_img_init'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'unique_npc_bed_start':
@@ -340,7 +340,7 @@ if $ARGS[0] = 'fb_hotel_start':
 		gs 'sex_ev_start', 'city_hotel_img_init'
 	end
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'fb_invited_start':
@@ -444,7 +444,7 @@ if $ARGS[0] = 'fb_invited_start':
 			else
 				'"Come on in," he says, and leads you inside.'
 			end
-			act 'Take it to the bed':gt 'sex_ev_start', 'frantic_undress'
+			gs 'sex_ev_start', 'undress_menu'
 		end
 
 		act 'Shut up and let''s fuck':
@@ -454,7 +454,7 @@ if $ARGS[0] = 'fb_invited_start':
 			else
 				'"Shut up and fuck me already," you say, putting your hands on his chest and pushing him inside towards the bedroom. "I''m here to fuck. So let''s fuck."'
 			end
-			act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+			gs 'sex_ev_start', 'undress_menu'
 		end
 
 		if pcs_makeup > 1:
@@ -467,7 +467,7 @@ if $ARGS[0] = 'fb_invited_start':
 				else
 					'"Don''t mess up my makeup," you say, walking past him towards the bedroom.'
 				end
-				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+				gs 'sex_ev_start', 'undress_menu'
 				if date = daystart and date_hour_meet <= hour + 1:
 					act 'I have a date soon':
 						cla & *clr
@@ -478,7 +478,7 @@ if $ARGS[0] = 'fb_invited_start':
 						else
 							'"Don''t mess up my makeup," you say, walking past him towards the bedroom. "I have a date right after this."'
 						end
-						act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+						gs 'sex_ev_start', 'undress_menu'
 					end
 				elseif date = daystart:
 					act 'I have a date later':
@@ -490,7 +490,7 @@ if $ARGS[0] = 'fb_invited_start':
 						else
 							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date later. I don''t want to do it again."'
 						end
-						act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+						gs 'sex_ev_start', 'undress_menu'
 					end
 				end
 				if hour >= 18 and $region = 'pav' and (week = 5 or week = 6):
@@ -503,7 +503,7 @@ if $ARGS[0] = 'fb_invited_start':
 						!!else
 						!!	'"Don''t mess up my makeup," you say, walking past him towards the bedroom. "I''m going to the disco after this."'
 						!!end
-						act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+						gs 'sex_ev_start', 'undress_menu'
 					end
 				end
 			end
@@ -512,7 +512,7 @@ if $ARGS[0] = 'fb_invited_start':
 			act 'Make it fast (school)':
 				cla & *nl
 				'"Let''s make this fast," you say. "I have to get to class."'
-				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+				gs 'sex_ev_start', 'undress_menu'
 			end
 		end
 		if mc_inventory['normal_condoms'] > 0 and npc_bareback[$npcID] = 0:
@@ -527,7 +527,7 @@ if $ARGS[0] = 'fb_invited_start':
 				else
 					'"Fuck yeah," he says as he drags you inside.'
 				end
-				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+				gs 'sex_ev_start', 'undress_menu'
 			end
 		end
 		if mc_inventory['morning_after_pill'] > 0 and npc_bareback[$npcID] = 0 and npc_know_bc[$npcID] = 0:
@@ -538,79 +538,80 @@ if $ARGS[0] = 'fb_invited_start':
 				sex_ev['ma_pill'] = 1
 				act 'No condoms':
 					cla & *clr
-					$sex_ev['bed_room']
+					$sex_ev['hall_way']
 					'"I brought a morning after pill," you whisper in his ear. "<i>We can skip the condoms today.</i>"'
-					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+					gs 'sex_ev_start', 'undress_menu'
 				end
 
 				act 'Come inside me':
 					sex_ev['creampie_allowance'] = 1
 					cla & *clr
-					$sex_ev['bed_room']
+					$sex_ev['hall_way']
 					'"I brought a morning after pill," you whisper in his ear. "<i>Fill me with your cum.</i>"'
-					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+					gs 'sex_ev_start', 'undress_menu'
 				end
 			end
 		end
 		if $pantyworntype = 'none' and $braworntype = 'none':
 			act 'Tell him you''re not wearing underwear':
+				sex_ev['commando'] = 1
 				cla & *clr
-				$sex_ev['bed_room']
+				$sex_ev['hall_way']
 				'You step inside and draw close to <<$npc_firstname[$npcID]>>. You lean in and whisper in his ear...'
 				*nl
 				'<i>"I''m not wearing any underwear."</i>'
-				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+				gs 'sex_ev_start', 'undress_menu'
 			end
 		end
 		if birth_control['think_safe'] = 1 and npc_know_bc[$npcID] = 0:
 			act 'Tell him you''re on birth control':
 				gs 'sex_ev_stats', 'birth_control_know'
 				cla & *clr
-				$sex_ev['bed_room']
+				$sex_ev['hall_way']
 				'You step inside and draw close to <<$npc_firstname[$npcID]>>. You lean in and whisper in his ear...'
 				*nl
 				act 'No condoms':
 					cla & *clr
-					$sex_ev['bed_room']
+					$sex_ev['hall_way']
 					if npc_know_bc_not_effective[$npcID] = 1 or npc_bc_promise[$npcID] = 1:
 						'"<i>My birth control is ready. Let''s go bareback today.</i>"'
 					else
 						'"<i>I''m on birth control now. Let''s go bareback today.</i>"'
 					end
-					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+					gs 'sex_ev_start', 'undress_menu'
 				end
 
 				act 'Creampies are okay today':
 					sex_ev['creampie_allowance'] = 1
 					cla & *clr
-					$sex_ev['bed_room']
+					$sex_ev['hall_way']
 					if npc_know_bc_not_effective[$npcID] = 1 or npc_bc_promise[$npcID] = 1:
 						'"<i>My birth control is ready. You can come inside me.</i>"'
 					else
 						'"<i>I''m on birth control now. You can come inside me.</i>"'
 					end
-					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+					gs 'sex_ev_start', 'undress_menu'
 				end
 			end
 		elseif mesec > 0:
 			act '"I''m on my period"':
 				cla & *clr
-				$sex_ev['bed_room']
+				$sex_ev['hall_way']
 				'You step inside and draw close to <<$npc_firstname[$npcID]>>. You lean in and whisper in his ear...'
 				*nl
 				act 'No condoms':
 					cla & *clr
-					$sex_ev['bed_room']
+					$sex_ev['hall_way']
 					'"<i>I''m on my period right now. Let''s go bareback today.</i>"'
-					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+					gs 'sex_ev_start', 'undress_menu'
 				end
 
 				act 'Come inside me':
 					sex_ev['creampie_allowance'] = 1
 					cla & *clr
-					$sex_ev['bed_room']
+					$sex_ev['hall_way']
 					'"<i>I''m on my period right now. You can come inside me.</i>"'
-					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+					gs 'sex_ev_start', 'undress_menu'
 				end
 			end
 		end
@@ -618,9 +619,9 @@ if $ARGS[0] = 'fb_invited_start':
 		if npc_shave_promise[$npcID] > 0 and pcs_pubes < 4:
 			act 'Tell him you shaved':
 				cla & *clr
-				$sex_ev['bed_room']
+				$sex_ev['hall_way']
 				'"I have a special surprise too," you say, stepping inside and drawing close to <<$npc_firstname[$npcID]>>. You lean in and whisper in his ear, "<i>I shaved my pussy for you.</i>"'
-				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
+				gs 'sex_ev_start', 'undress_menu'
 			end
 		end
 !!	act 'Stumble over to the couch':gt 'sex_ev_start', 'couch_start'
@@ -675,16 +676,16 @@ if $ARGS[0] = 'fb_uninvited_start':
 		end
 
 		if rand(1,10) < npc_sexdrive[$npcID]:
-			if npc_humor[$npcID] = 2 and $npc_cum_pref[$npcID] = 'creampie':
+			if $npc_humor[$npcID] = 'perverted' and $npc_cum_pref[$npcID] = 'creampie':
 				'"I''m the only one who''s gonna be coming inside," he says, leering at your ass as he steps aside to let you in.'
-			elseif npc_humor[$npcID] = 2 and $npc_cum_pref[$npcID] = 'mouth':
+			elseif $npc_humor[$npcID] = 'perverted' and $npc_cum_pref[$npcID] = 'mouth':
 				'"I''m the only one who''s gonna be coming inside," he says, leering at your ass as he steps aside to let you in. "In your mouth that is."'
 			elseif npc_booty_call_date[$npcID] = daystart:
 				'"As long as those clothes are coming off in the next 10 seconds," he says, leering at your ass as he steps aside to let you in.'
 			else
 				'"Well I won''t say no to a free fuck," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
 			end
-			act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
+			gs 'sex_ev_start', 'undress_menu'
 		else
 			gs 'sex_ev_start', 'uninvited_deny'
 		end
@@ -695,7 +696,7 @@ if $ARGS[0] = 'fb_uninvited_start':
 		if rand(1,10) < npc_sexdrive[$npcID]:
 			'"Surprise!" you shout gleefully at a startled <<$npc_firstname[$npcID]>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.'
 			'"Well I won''t say no if that''s what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
-			act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
+			gs 'sex_ev_start', 'undress_menu'
 		else
 			gs 'sex_ev_start', 'uninvited_deny'
 		end
@@ -707,7 +708,7 @@ if $ARGS[0] = 'fb_uninvited_start':
 			'<<$npc_firstname[$npcID]>> stands there startled as you step forward, putting your hand on his chest.'
 			'"I need a good fuck and I need it right now," you say.'
 			'A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.'
-			act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
+			gs 'sex_ev_start', 'undress_menu'
 		else
 			gs 'sex_ev_start', 'uninvited_deny'
 		end
@@ -733,7 +734,7 @@ if $ARGS[0] = 'girlfriend_surprise1':
 		cla & *nl
 		'"Surprise!" you shout gleefully at a startled <<$npc_firstname[$npcID]>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.'
 		'"Well I won''t say no if that''s what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
-		act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
+		gs 'sex_ev_start', 'undress_menu'
 	end
 
 	act 'I need a good fuck':
@@ -741,7 +742,7 @@ if $ARGS[0] = 'girlfriend_surprise1':
 		'<<$npc_firstname[$npcID]>> stands there startled as you step forward, putting your hand on his chest.'
 		'"I need a good fuck and I need it right now," you say.'
 		'A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.'
-		act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
+		gs 'sex_ev_start', 'undress_menu'
 	end
 
 	if drunk = 1:
@@ -766,60 +767,6 @@ if $ARGS[0] = 'girlfriend_cheater1':
 	'Sveta: "ehhh, I''m just here to..."'
 end
 
-if $ARGS[0] = 'slow_undress_start':
-	gs 'sex_ev_start', 'begin'
-end
-
-if $ARGS[0] = 'frantic_undress_start':
-
-end
-
-if $ARGS[0] = 'frantic_undress':
-	act 'Clothes. Off. Bed. Now.':
-		cla & *clr
-		gs 'sex_ev_start', 'undress_function'
-		gs 'arousal', 'foreplay', 2
-		gs 'arousal', 'foreplay_give', -2
-		gs 'stat'
-		'<center><video autoplay loop src="images/shared/sex/misc/undress1.mp4"></video></center>'
-		!! initiative call
-		if $sex_ev['loc'] = 'house_party':
-			if npc_humor[$npcID] = 2 or $npc_fidelity[$npcID] = 'cheater':
-				'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. Before you can fully get your <<$sex_ev[''top_noun'']>> off, rough hands slide over your skin.'
-				'"Girls like you all want the same thing," he grins as he tears it off and pins you to the wall. His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
-			elseif npc_humor[$npcID] = 1:
-				'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. His eyes light up as your breasts are exposed and he openly leers at them.'
-				'"Fuck..." The way <<$npc_firstname[$npcID]>> stares at your boobs, he looks like a boy on Christmas day. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
-			elseif npc_humor[$npcID] = 3:
-				'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. Before you can fully get your <<$sex_ev[''top_noun'']>> off, warm hands slide stop you.'
-				'"Hold up your arms," he orders as he expertly pulls it over your shoulders. His slightly labored breath makes you want to rush but he takes his time. By the time you''re make the bed, you are naked and panting.'
-			else
-				'You tear each other''s clothes off, leaving a trail of discarded fabrics.'
-			end
-		else
-			if npc_humor[$npcID] = 2 or $npc_fidelity[$npcID] = 'cheater':
-				'The moment you''re through the door, the both of you begin discarding clothes in a hurry. Before you can fully get your <<$sex_ev[''top_noun'']>> off, rough hands slide over your skin.'
-				'"Girls like you all want the same thing," he says as he rips it off and pins you to the wall. His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
-			elseif npc_humor[$npcID] = 1:
-				'<<$npc_firstname[$npcID]>> can''t keep his eyes off you as you lead him.'
-				'"Fuck," he groans as you start to undress once you''re inside the door. His eyes light up as your breasts are exposed and he openly leers at them. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
-			elseif npc_humor[$npcID] = 3:
-				'The moment you''re through the door, the both of you begin discarding clothes in a hurry. Before you can fully get your <<$sex_ev[''top_noun'']>> off, warm hands slide stop you.'
-				'"Hold up your arms," he orders as he expertly pulls it over your shoulders. His slightly labored breath makes you want to rush but he takes his time. By the time you''re make the bed, you are naked and panting.'
-			else
-				'You tear each other''s clothes off, leaving a trail of discarded fabrics.'
-			end
-		end
-		if $sex_ev['loc'] ! 'pc_home' or $home['current'] ! 'parents_home':
-			gs 'sex_ev_foreplay', 'bed_start'
-		else
-			act 'Go to your bed':gs 'sex_ev_foreplay', 'bed_start'
-
-			act 'Go to Anya''s bed':$sex_ev['bed_choice'] = 'anya_bed' & sisterQW['sex_bed_count'] += 1 & sisterQW['sex_bed'] = daystart & gs 'sex_ev_foreplay', 'bed_start'
-		end
-	end
-end
-
 if $ARGS[0] = 'undress_function':
 	if sex_ev['undressed_check'] ! 1:
 		sex_ev['undressed_check'] = 1
@@ -838,6 +785,12 @@ if $ARGS[0] = 'undress_function':
 		else
 			$sex_ev['top_noun'] = 'top'
 		end
+		
+		if CloSkirtShortness > 0:
+			$sex_ev['bottom_noun'] = 'skirt'
+		else
+			$sex_ev['bottom_noun'] = 'pants'
+		end
 		if CloStyle2 = 4: npc_know_schoolgirl[$npcID] = 1
 		if $clothingworntype ! 'nude':gs 'clothing', 'strip'
 		if $braworntype ! 'none':gs 'bras', 'remove'
@@ -845,6 +798,178 @@ if $ARGS[0] = 'undress_function':
 	end
 end
 
+if $ARGS[0] = 'undress_menu':
+	gs 'sex_ev_start', 'undress_function'
+	act 'Undress each other slowly': gt 'sex_ev_start', 'slow_undress'
+	act 'Clothes. Off. Bed. Now.': gt 'sex_ev_start', 'frantic_undress'
+	if sex_ev['CloDress'] ! 1:
+		act 'Pull off your top': gt 'sex_ev_start', 'top_undress'
+	end
+end
+
+if $ARGS[0] = 'slow_undress':
+	gs 'arousal', 'foreplay', 1
+	gs 'arousal', 'foreplay_give', -1
+	gs 'stat'
+	'<center><video autoplay loop src="images/shared/sex/undress/undress2.mp4"></video></center>'
+	if $sex_ev['loc'] = 'house_party':
+		'You and <<$npc_usedname[$npcID]>> take your time, slowly helping each other out of your clothes. As they fall to the floor, the noise of the party behind you starts to fade into the background and you make your way over to the bed.'
+	else
+		'You and <<$npc_usedname[$npcID]>> take your time, slowly helping each other out of your clothes and let them fall to the floor with a faint rustle.'
+	end
+	if $sex_ev['loc'] ! 'pc_home' or $home['current'] ! 'parents_home':
+		gs 'sex_ev_foreplay', 'bed_start'
+	else
+		act 'Go to your bed':gs 'sex_ev_foreplay', 'bed_start'
+
+		act 'Go to Anya''s bed':$sex_ev['bed_choice'] = 'anya_bed' & sisterQW['sex_bed_count'] += 1 & sisterQW['sex_bed'] = daystart & gs 'sex_ev_foreplay', 'bed_start'
+	end
+end
+
+if $ARGS[0] = 'frantic_undress':
+	gs 'arousal', 'foreplay', 2
+	gs 'arousal', 'foreplay_give', -2
+	gs 'stat'
+	'<center><video autoplay loop src="images/shared/sex/undress/undress1.mp4"></video></center>'
+	!! initiative call
+	if $sex_ev['loc'] = 'house_party':
+		if $npc_humor[$npcID] = 'perverted' or $npc_fidelity[$npcID] = 'cheater':
+			'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. Before you can fully get your <<$sex_ev[''top_noun'']>> off, rough hands slide over your skin.'
+			'"Girls like you all want the same thing," he grins as he tears it off and pins you to the wall. His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
+		elseif $npc_humor[$npcID] = 'childish':
+			'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. His eyes light up as your breasts are exposed and he openly leers at them.'
+			'"Fuck..." The way <<$npc_firstname[$npcID]>> stares at your boobs, he looks like a boy on Christmas day. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
+		elseif $npc_humor[$npcID] = 'intellectual':
+			'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. Before you can fully get your <<$sex_ev[''top_noun'']>> off, warm hands slide stop you.'
+			'"Hold up your arms," he orders as he expertly pulls it over your shoulders. His slightly labored breath makes you want to rush but he takes his time. By the time you''re make the bed, you are naked and panting.'
+		else
+			'You tear each other''s clothes off, leaving a trail of discarded fabrics.'
+		end
+	else
+		if $npc_humor[$npcID] = 'perverted' or $npc_fidelity[$npcID] = 'cheater':
+			'The moment you''re through the door, the both of you begin discarding clothes in a hurry. Before you can fully get your <<$sex_ev[''top_noun'']>> off, rough hands slide over your skin.'
+			'"Girls like you all want the same thing," he says as he rips it off and pins you to the wall. His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
+		elseif $npc_humor[$npcID] = 'childish':
+			'<<$npc_firstname[$npcID]>> can''t keep his eyes off you as you lead him.'
+			'"Fuck," he groans as you start to undress once you''re inside the door. His eyes light up as your breasts are exposed and he openly leers at them. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
+		elseif $npc_humor[$npcID] = 'intellectual':
+			'The moment you''re through the door, the both of you begin discarding clothes in a hurry. Before you can fully get your <<$sex_ev[''top_noun'']>> off, warm hands slide stop you.'
+			'"Hold up your arms," he orders as he expertly pulls it over your shoulders. His slightly labored breath makes you want to rush but he takes his time. By the time you''re make the bed, you are naked and panting.'
+		else
+			'You tear each other''s clothes off, leaving a trail of discarded fabrics.'
+		end
+	end
+	gs 'sex_ev_start', 'starting_route'
+end
+
+if $ARGS[0] = 'top_undress':
+	gs 'arousal', 'foreplay', 1
+	gs 'arousal', 'foreplay_give', -1
+	gs 'stat'
+	
+	if arrpos('$body_count', $npcID) < 0:
+		if $npc_humor[$npcID] = 'perverted' or $npc_fidelity[$npcID] = 'cheater':
+			'<center><video autoplay loop src="images/shared/sex/undress/top2.mp4"></video></center>'
+			'You pull off your top, giving <<$npc_usedname[$npcID]>> his first look at your breasts.'
+			'"I love sluts like you," he says, reaching up to grab your neck and pin you to the wall. A shiver pulses through you and you can''t tell whether it''s fear or arousal.'
+			'Maybe both.'
+			'His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
+		elseif $npc_humor[$npcID] = 'childish':
+			'<center><video autoplay loop src="images/shared/sex/undress/top1.mp4"></video></center>'
+			'You pull off your top, giving <<$npc_usedname[$npcID]>> his first look at your breasts.'
+			'"Fuck," he gulps, eyes lighting up and eagerly drinking in the sight. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
+		elseif $npc_humor[$npcID] = 'intellectual':
+			'<center><video autoplay loop src="images/shared/sex/undress/top1.mp4"></video></center>'
+			'You pull off your top, giving <<$npc_usedname[$npcID]>> his first look at your breasts.'
+			'"Nice pair you''ve got there," he smirks, taking off his own shirt off as well and moving towards the bed.'
+		else
+			'<center><video autoplay loop src="images/shared/sex/undress/top1.mp4"></video></center>'
+			'You pull off your top, giving <<$npc_usedname[$npcID]>> his first look at your breasts.'
+			'"Beautiful," he smiles, moving you towards the bed.'
+		end
+	else
+		if $npc_fav_body_part[$npcID] = 'tits':
+			'<center><video autoplay loop src="images/shared/sex/undress/top1.mp4"></video></center>'
+			'You pull off your top, revealing your breasts to <<$npc_usedname[$npcID]>>.'
+			'"Never get tired of seeing those," he grins, moving you towards the bed.'
+		elseif $npc_humor[$npcID] = 'perverted' or $npc_fidelity[$npcID] = 'cheater':
+			'<center><video autoplay loop src="images/shared/sex/undress/top2.mp4"></video></center>'
+			'You pull off your top, revealing your breasts to <<$npc_usedname[$npcID]>>.'
+			'"Good slut," he murmurs, reaching up to grab your neck and pin you to the wall. A shiver pulses through you and you can''t tell whether it''s fear or arousal.'
+			'Maybe both.'
+			'Before you can determine which, he starts moving you towards the bed.'
+		elseif $npc_humor[$npcID] = 'childish':
+			'<center><video autoplay loop src="images/shared/sex/undress/top1.mp4"></video></center>'
+			'You pull off your top, revealing your breasts to <<$npc_usedname[$npcID]>>.'
+			'"Fuck," he gulps, eyes lighting up and eagerly drinking in the sight. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
+		elseif $npc_humor[$npcID] = 'intellectual':
+			'<center><video autoplay loop src="images/shared/sex/undress/top1.mp4"></video></center>'
+			'You pull off your top, revealing your breasts to <<$npc_usedname[$npcID]>>.'
+			'"Nice pair you''ve got there," he smirks, taking off his own shirt off as well and moving towards the bed.'
+		else
+			'<center><video autoplay loop src="images/shared/sex/undress/top1.mp4"></video></center>'
+			'You pull off your top, revealing your breasts to <<$npc_usedname[$npcID]>>.'
+			'"Beautiful," he smiles, moving you towards the bed.'
+		end
+	end
+	if $lastwornpantytype['sex_ev'] ! 'none':
+		act'Let him take off your panties': gt 'sex_ev_start', 'panty_undress'
+	elseif $sex_ev['bottom_noun'] = 'skirt':
+		act'Show him what''s under your skirt (nothing)': gt 'sex_ev_start', 'pantyless_skirt'
+	end
+end
+
+if $ARGS[0] = 'panty_undress':
+	gs 'arousal', 'foreplay', 1
+	gs 'arousal', 'foreplay', -5
+	'<center><video autoplay loop src="images/shared/sex/undress/panties1.mp4"></video></center>'
+	if npc_sex_speed[$npcID] = 3 or npc_dirty_lover[$npcID] = 1:
+		'<<$npc_usedname[$npcID]>> roughly shoves you back onto the bed and grabs hold of your panties, tugging them over your hips and down your thighs, leaving you completely naked.'
+	else
+		'You let yourself fall back onto the bed and lift your legs with a glimmer in your eyes. <<$npc_usedname[$npcID]>> takes the hint and grabs hold of your panties, tugging them over your hips and down your thighs, leaving you completely naked.'
+	end
+	gs 'sex_ev_start', 'starting_route'
+end
+
+if $ARGS[0] = 'pantyless_skirt':
+	'<center><video autoplay loop src="images/shared/sex/undress/skirt_drop1.mp4"></video></center>'
+	
+	'You trail behind <<$npc_usedname[$npcID]>> on the way to the bed, letting him lay back on it as a mischievous smirk plays on your lips. You drop ' + iif(sex_ev['CloDress'] = 1, 'the rest of your dress', 'your skirt') + ' to the floor to let him see what''s underneath.'
+
+	if sex_ev['commando'] = 1:
+		'"I see you weren''t lying about not wearing any underwear," he says, staring at your bare pussy.'
+	else
+		'All he does is grin in delight at the sight of your bare pussy between your thighs.'
+	end
+	
+	act 'Let him lead':
+		cla & *nl
+		if ((npc_caretaker[$npcID] = 1 and sex_ev['orgasm_count'] = 0) or npc_pussyeater[$npcID] = 1) and rand(1,2) = 1:
+			gs 'sex_ev_foreplay', 'generous_initiative'
+		elseif npc_selfish[$npcID] = 1:
+			gs 'sex_ev_foreplay', 'selfish_initiative'
+		else
+			if rand(0,1) = 1:
+				gs 'sex_ev_foreplay', 'generous_initiative'
+			else
+				gs 'sex_ev_foreplay', 'selfish_initiative'
+			end
+		end
+	end
+	act'Go down on him': gt 'sex_ev_foreplay', 'bj_sub1'
+	act'Mount him (cowgirl)': gt 'sex_ev_cowgirl', 'cowgirl_start'
+end
+
+if $ARGS[0] = 'starting_route':
+	if $sex_ev['loc'] ! 'pc_home' or $home['current'] ! 'parents_home':
+		gs 'sex_ev_foreplay', 'bed_start'
+	else
+		act 'Go to your bed':gs 'sex_ev_foreplay', 'bed_start'
+
+		act 'Go to Anya''s bed':$sex_ev['bed_choice'] = 'anya_bed' & sisterQW['sex_bed_count'] += 1 & sisterQW['sex_bed'] = daystart & gs 'sex_ev_foreplay', 'bed_start'
+	end
+end
+
 if $ARGS[0] = 'pre_reaction':
 	if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
 		'<<$npc_firstname[$npcID]>>''s pants drop, revealing... what the fuck? Is that a micropenis?'
@@ -914,7 +1039,7 @@ if $ARGS[0] = 'mey_home_start':
 	elseif locat['katja'] = 7 or locat['katja'] = 9:
 
 	end
-	gs 'sex_ev_start', 'frantic_undress'
+	gs 'sex_ev_start', 'undress_menu'
 end
 
 if $ARGS[0] = 'mey_vicky_spot':

+ 9 - 0
locations/sex_ev_stats.qsrc

@@ -59,6 +59,15 @@ if $ARGS[0] = 'starting_stats':
 end
 
 if $ARGS[0] = 'save_stats':
+	if $sex_ev['loc'] = 'pc_home':
+		if $sex_ev['bed_choice'] ! 'anya_bed':
+			stat['bed_cum'] = daystart
+		else
+			stat['anya_bed_cum'] = daystart
+		end
+	end
+	
+	if arrpos('$body_count', $npcID) < 0: $body_count[] = $npcID
 	!! number of times you have initiated or responded to a booty call
 !!	npc_bootycalls[$npcID] += 1
 

+ 5 - 5
locations/sex_ev_talk.qsrc

@@ -854,7 +854,7 @@ if $ARGS[0] = 'creampie_permission3':
 		cla & *nl
 		'"But it''ll feel good," you grin at him.'
 		if npc_childfree[$npcID] > 0:
-			gs 'npc_relationship', 'modify', $boy, 'dislike'
+			gs 'npc_relationship', 'modify', $npcID, 'dislike'
 			'"That doesn''t matter," <<$npc_firstname[$npcID]>> scowls. "I don''t want kids."'
 			'"Ugh, boo. You''re no fun."'
 			gs 'sex_ev_talk', 'topic_exit'
@@ -921,7 +921,7 @@ end
 if $ARGS[0] = 'forgot_bc_talk':
 	sex_ev['forgot_bc_chat'] = 1
 	if npc_childfree[$npcID] > 0 and (npc_argumentative[$npcID] > 0 or npc_abusive[$npcID] > 0) and sex_ev['creampie_count'] > 0:
-		gs 'npc_relationship', 'modify', $boy, 'dislike'
+		gs 'npc_relationship', 'modify', $npcID, 'dislike'
 		'"What the fuck?!" <<$npc_firstname[$npcID]>> exclaims. "Are you fucking kidding me? How could you forget? You better not get pregnant on me. I am <i>not</i> having your fucking kids."'
 		act 'Wallow':
 			cla & *nl
@@ -930,7 +930,7 @@ if $ARGS[0] = 'forgot_bc_talk':
 		end
 
 		act 'Tell him to fuck off':
-			gs 'npc_relationship', 'modify', $boy, 'dislike'
+			gs 'npc_relationship', 'modify', $npcID, 'dislike'
 			sex_ev['angry_after'] = 1
 			cla & *nl
 			'"<i>''Your''</i> kids?" you say, glaring at him. "If I get pregnant, you''re not the one who''s gonna have to push your ugly baby out her pussy! Don''t try to make this about you. You can fuck off!"'
@@ -952,7 +952,7 @@ if $ARGS[0] = 'forgot_bc_talk':
 
 			act 'Morning after pill (fuck off)':
 				gs 'medical_din', 'morning_after_pill_function'
-				gs 'npc_relationship', 'modify', $boy, 'dislike'
+				gs 'npc_relationship', 'modify', $npcID, 'dislike'
 				sex_ev['angry_after'] = 1
 				sex_ev['ma_pill'] = 2
 				cla & *nl
@@ -1339,7 +1339,7 @@ if $ARGS[0] = 'borrow_planb':
 				end
 
 				if birth_control['think_safe'] = 1 and npc_selfish[$npcID] = 1:
-					gs 'npc_relationship', 'modify', $boy, 'dislike'
+					gs 'npc_relationship', 'modify', $npcID, 'dislike'
 					'"You want to spend my money on a ''just in case''? Fuck no! You can buy it yourself. If you can''t afford it, that''s what birth control is for in the first place."'
 					gs 'sex_ev_talk', 'borrow_money_exit'
 				elseif npc_childfree[$npcID] = 1:

+ 7 - 7
locations/sex_ev_talk2.qsrc

@@ -44,14 +44,14 @@ if $ARGS[0] = 'preg_boy_react1':
 end
 
 if $ARGS[0] = 'preg_father_tell':
-	if arrpos('$wombpotfath', $boy) >= 0 and arrsize('$wombpotfath') = 1:
+	if arrpos('$wombpotfath', $npcID) >= 0 and arrsize('$wombpotfath') = 1:
 		act 'Tell him he''s the father':
 			$sex_ev['boy_is_father'] = 'yes'
 			cla & *nl
 			'"I''m pregnant." His eyes go wide. "You''re the father."'
 			gs 'sex_ev_talk2', 'preg_talk2'
 		end
-	elseif arrpos('$wombpotfath', $boy) >= 0:
+	elseif arrpos('$wombpotfath', $npcID) >= 0:
 		act 'You''re unsure but say it''s his':
 			$sex_ev['boy_is_father'] = 'yes'
 			cla & *nl
@@ -66,7 +66,7 @@ if $ARGS[0] = 'preg_father_tell':
 			'"Maybe," you say, chewing on your lip. "I''m... not sure if you''re the father..."'
 			gs 'sex_ev_talk2', 'preg_talk2'
 		end
-	elseif arrpos('$wombpotfath', $boy) = 0:
+	elseif arrpos('$wombpotfath', $npcID) = 0:
 		act 'Tell him he''s not the father':
 			$sex_ev['boy_is_father'] = 'no'
 			cla & *nl
@@ -109,7 +109,7 @@ end
 
 if $ARGS[0] = 'preg_talk_worried':
 	act 'Worried':
-		$sex_ev['preg_react '] = 'worried'
+		$sex_ev['preg_react'] = 'worried'
 		cla & *nl
 		'Saying it out loud fills you with indescribable anxiety and you chew on your lip, your face scrunching up with worry.'
 		gs 'sex_ev_talk2', 'preg_talk3'
@@ -119,9 +119,9 @@ end
 if $ARGS[0] = 'preg_talk_smile':
 	if $sex_ev['boy_is_father'] = 'yes':
 		act 'Smile':
-			$sex_ev['preg_react '] = 'smile'
+			$sex_ev['preg_react'] = 'smile'
 			cla & *nl
-			if arrpos('$wombpotfath', $boy) >= 0:
+			if arrpos('$wombpotfath', $npcID) >= 0:
 				'Saying it out loud fills your chest with an uncontainable joy and your lips widen into a loving smile.'
 			else
 				'You know he can''t possibly be the father, but you deliver the lie with a warm smile.'
@@ -182,7 +182,7 @@ if $ARGS[0] = 'preg_talk4':
 	'"Could it be mine?" he asks.'
 	act 'Maybe':
 		cla & *nl
-		if arrpos('$wombpotfath', $boy) >= 0:
+		if arrpos('$wombpotfath', $npcID) >= 0:
 			'"It <i>could</i> be," you admit.'
 		else
 			'"It could be," you lie. The timing doesn''t match up. It couldn''t possibly belong to him.'

+ 18 - 18
locations/sex_ev_virgin.qsrc

@@ -950,17 +950,17 @@ if $ARGS[0] = 'miss_virg_norm1':
 	'<<$npc_firstname[$npcID]>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn''t stop though, and keeps pushing until... you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren''t really sure.'
 	'"You okay?"'
 	act 'It hurts':
-		$sex_ev['virgin_react '] = 'hurt'
+		$sex_ev['virgin_react'] = 'hurt'
 		gs 'sex_ev_virgin', 'miss_virg_norm1.1'
 	end
 
 	act 'I''m fine':
-		$sex_ev['virgin_react '] = 'fine'
+		$sex_ev['virgin_react'] = 'fine'
 		gs 'sex_ev_virgin', 'miss_virg_norm1.1'
 	end
 
 	act 'Just hum':
-		$sex_ev['virgin_react '] = 'mmm'
+		$sex_ev['virgin_react'] = 'mmm'
 		gs 'sex_ev_virgin', 'miss_virg_norm1.1'
 	end
 
@@ -971,14 +971,14 @@ if $ARGS[0] = 'miss_virg_norm1':
 
 	if $npc_dick_desc[$npcID] = 'long' or $npc_dick_desc[$npcID] = 'huge' or $npc_dick_desc[$npcID] = 'enormous' or $npc_dick_desc[$npcID] = 'lengthy' or $npc_dick_desc[$npcID] = 'gigantic' or $npc_dick_desc[$npcID] = 'monster':
 		act 'He''s big!':
-			$sex_ev['virgin_react '] = 'big'
+			$sex_ev['virgin_react'] = 'big'
 			gs 'sex_ev_virgin', 'miss_virg_norm1.1'
 		end
 	end
 end
 
 if $ARGS[0] = 'miss_virg_norm1.1':
-	gs 'sex_ev_virgin', '<<$sex_ev[''virgin_react '']>>_react1'
+	gs 'sex_ev_virgin', '<<$sex_ev[''virgin_react'']>>_react1'
 	act 'Continue':
 		cla & *clr
 		if sex_ev['condom'] = 1:
@@ -986,7 +986,7 @@ if $ARGS[0] = 'miss_virg_norm1.1':
 		else
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/blood1.jpg"></center>'
 		end
-		gs 'sex_ev_virgin', '<<$sex_ev[''virgin_react '']>>_react2'
+		gs 'sex_ev_virgin', '<<$sex_ev[''virgin_react'']>>_react2'
 		'"I''ll be gentle," he says, and begins to move again.'
 		act 'Continue':
 			cla & *clr
@@ -1129,27 +1129,27 @@ if $ARGS[0] = 'doggy_virg_norm1':
 	'<<$npc_firstname[$npcID]>> slowly presses his cock inside you from behind. It fills you up, stretching your walls before bumping against your hymen. After a brief pause, he pushes through, tearing your maidenhood and causing you to gasp. Whether in excitement or pain, you aren''t really sure yet.'
 	'"You okay?"'
 	act 'It hurts':
-		$sex_ev['virgin_react '] = 'hurt'
+		$sex_ev['virgin_react'] = 'hurt'
 		gs 'sex_ev_virgin', 'doggy_virg_norm1.1'
 	end
 
 	act 'I''m fine':
-		$sex_ev['virgin_react '] = 'fine'
+		$sex_ev['virgin_react'] = 'fine'
 		gs 'sex_ev_virgin', 'doggy_virg_norm1.1'
 	end
 
 	act 'Just hum':
-		$sex_ev['virgin_react '] = 'mmm'
+		$sex_ev['virgin_react'] = 'mmm'
 		gs 'sex_ev_virgin', 'doggy_virg_norm1.1'
 	end
 end
 
 if $ARGS[0] = 'doggy_virg_norm1.1':
-	gs 'sex_ev_virgin', '<<$sex_ev[''virgin_react '']>>_react1'
+	gs 'sex_ev_virgin', '<<$sex_ev[''virgin_react'']>>_react1'
 	act 'Continue':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/blood1.jpg"></center>'
-		gs 'sex_ev_virgin', '<<$sex_ev[''virgin_react '']>>_react2'
+		gs 'sex_ev_virgin', '<<$sex_ev[''virgin_react'']>>_react2'
 		'"I''ll be gentle," he says, and begins to move again.'
 		act 'Continue':
 			cla & *clr
@@ -1837,11 +1837,11 @@ if $ARGS[0] = 'virgin_enjoyment':
 			*nl
 			if $sex_ev['pos_speed'] = 'cowgirl3':
 				'This was a fucking terrible idea! Why did you think that you could lose your virginity like this? Why are you even trying? Tears well up in your eyes as you continue to impale yourself on <<$npc_firstname[$npcID]>>''s cock, wondering to yourself why you''re so fucking stupid.'
-			elseif $sex_ev['virgin_react '] = 'hurt':
+			elseif $sex_ev['virgin_react'] = 'hurt':
 				'What initially started as a painful experience continues to be one. Every time <<$npc_firstname[$npcID]>>''s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You spend each moment praying he''ll just cum already and your agony can end.'
-			elseif $sex_ev['virgin_react '] = 'fine':
+			elseif $sex_ev['virgin_react'] = 'fine':
 				'It wasn''t so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<$npc_firstname[$npcID]>>''s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it''s over.'
-			elseif $sex_ev['virgin_react '] = 'mmm':
+			elseif $sex_ev['virgin_react'] = 'mmm':
 				'It wasn''t so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<$npc_firstname[$npcID]>>''s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it''s over.'
 			end
 			!!act 'Continue':cla & gs 'sex_ev_cum', 'fuck_cum'
@@ -1877,11 +1877,11 @@ if $ARGS[0] = 'virgin_enjoyment':
 			gs 'stat'
 			'<i>... this is starting to feel really good...</i>'
 			*nl
-			if $sex_ev['virgin_react '] = 'hurt':
+			if $sex_ev['virgin_react'] = 'hurt':
 				'The initial pain you felt is still there, but now there''s something else that''s going along with it. Like an itch you''ve never been able to scratch or a "fullness" you''ve never experienced. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.'
-			elseif $sex_ev['virgin_react '] = 'fine':
+			elseif $sex_ev['virgin_react'] = 'fine':
 				'That "fullness" you remarked upon earlier has somehow become even more full as <<$npc_firstname[$npcID]>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.'
-			elseif $sex_ev['virgin_react '] = 'mmm':
+			elseif $sex_ev['virgin_react'] = 'mmm':
 				'That "fullness" you remarked upon earlier has somehow become even more full as <<$npc_firstname[$npcID]>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.'
 			end
 			act 'Continue at this pace':
@@ -2105,7 +2105,7 @@ if $ARGS[0] = 'first_time_talk':
 	gs 'sex_ev_virgin', 'big_cock_virgin'
 end
 
-if $ARGS[0] = 'arrogant_react ':
+if $ARGS[0] = 'arrogant_react':
 	act 'Thought: Really?!':
 		cla & *nl
 		'<i>Fuck, really?!</i> you think to yourself. <i>This isn''t how it always feels?</i>'

+ 9 - 9
locations/sex_ev_wakeup.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'start':
 	if sex_ev['lover_left'] = 1:gt 'sex_ev_wakeup', 'wake_alone'
 	if sex_ev['sleep_fuck'] = 1:gt 'sex_ev_wakeup', 'sleep_fuck_wake'
 	if (npc_earlyriser[$npcID] = 1 or hour >= 7) and (rand(1,10) < npc_sexdrive[$npcID]):
-!!		if ($npc_cum_pref[$npcID] = 'facial' or npc_humor[$npcID] = 2) and rand(1,2) = 2:
+!!		if ($npc_cum_pref[$npcID] = 'facial' or $npc_humor[$npcID] = 'perverted') and rand(1,2) = 2:
 			gs 'sex_ev_wakeup', 'cumshot_wakeup1'
 !!		else
 !!			gt 'sex_ev_sex', 'wakeup_fondling'
@@ -465,7 +465,7 @@ if $ARGS[0] = 'kiss_wake':
 			cla & *clr
 			gs 'arousal', 'kiss', 1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 			sex_ev['boy_asleep'] = 0
-			gs 'npc_relationship', 'modify', $boy, 'like'
+			gs 'npc_relationship', 'modify', $npcID, 'like'
 			'<center><img <<$set_imgh>> src="images/shared/sex/kiss/bed1.jpg"></center>'
 			'You roll over onto <<$npc_firstname[$npcID]>>, resting your breasts on his chest as you straddle him.'
 			'"Good <i>-mmmph-</i> morning," you murmur, planting a kiss on his lips.'
@@ -555,7 +555,7 @@ if $ARGS[0] = 'bj_wake':
 		end
 	else
 		act 'Stop':
-			gs 'npc_relationship', 'modify', $boy, 'dislike'
+			gs 'npc_relationship', 'modify', $npcID, 'dislike'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/blowjob/bj48.mp4"></video></center>'
 			'You pull away, working his cock with your hand.'
@@ -613,7 +613,7 @@ if $ARGS[0] = 'after_sleepfuck_wake':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk4.jpg"></center>'
 			'"That was nice," you smile sleepily at <<$npc_firstname[$npcID]>>. "Our little mid-night romp I mean. Slept like a baby after. How about you?"'
-			if npc_humor[$npcID] = 3:
+			if $npc_humor[$npcID] = 'intellectual':
 				'"I would say that fucking you always puts me to sleep, but that feels like sending the wrong message," he smiles back.'
 			else
 				'"I sleep better after a good fuck too," he grins.'
@@ -700,7 +700,7 @@ if $ARGS[0] = 'cumshot_wakeup_clean1':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
 		gs 'arousal', 'bj', 1, 'sub'
-		gs 'cum_call', 'mouth_swallow', $boy, 1, 0, 5
+		gs 'cum_call', 'mouth_swallow', $npcID, 1, 0, 5
 		'Before you can make any more protest, <<$npc_firstname[$npcID]>>''s cock pushes into your mouth. Your eyes accuse him of being a jerk but your lips suck obediently, drawing the last drops of cum from his shaft.'
 		gs 'sex_ev_morning', 'morning_menu1'
 	end
@@ -718,7 +718,7 @@ if $ARGS[0] = 'cumshot_wakeup_clean2':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
 		gs 'arousal', 'bj', 1, 'sub'
-		gs 'cum_call', 'mouth_swallow', $boy, 1, 0, 5
+		gs 'cum_call', 'mouth_swallow', $npcID, 1, 0, 5
 		'"Oh fiiiine," you say, mock frowning as <<$npc_firstname[$npcID]>>''s cock pushes past your lips and you subserviently suck out the last drops of cum from it.'
 		gs 'sex_ev_morning', 'morning_menu1'
 	end
@@ -918,7 +918,7 @@ end
 
 if $ARGS[0] = 'cheat_no_guilt_start':
 	if pcs_lovers + pcs_girlfriends > 0:
-		if arrpos('$pcs_lover_arr', $boy) = -1:
+		if arrpos('$pcs_lover_arr', $npcID) = -1:
 			if pcs_lover - pcs_girlfriends > 0:
 				act 'Your boyfriend (no guilt)':$sex_ev['cheat'] = 'boyfriend' & gs 'sex_ev_wakeup', 'cheat_no_guilt1'
 			end
@@ -955,7 +955,7 @@ end
 if $ARGS[0] = 'guilt_init':
 	if sex_ev['guilt_check'] = 0:
 		sex_ev['guilt_check'] = 1
-!!		if pcs_lover + pcs_girlfriends > 0 and $boy ! 'one_of_svetas_lovers': sex_ev['guilt_count'] += 1
+!!		if pcs_lover + pcs_girlfriends > 0 and $npcID ! 'one_of_svetas_lovers': sex_ev['guilt_count'] += 1
 		if pcs_lover + pcs_girlfriends > 0: sex_ev['guilt_count'] += 1
 		if sex_ev['buy_virginity'] > 0 and sex_ev['fuck_count'] > 0: sex_ev['guilt_count'] += 1
 !!		if sex_ev['prostitution'] = 1: sex_ev['guilt_count'] += 1
@@ -976,7 +976,7 @@ if $ARGS[0] = 'guilt_start':
 				'You jolt awake as a lance of guilt pierces your chest.'
 			end
 
-			if $boy ! 'one_of_svetas_lovers':
+			if $npcID ! 'one_of_svetas_lovers':
 				if pcs_lover - pcs_girlfriends > 0:
 					act 'Your boyfriend':$sex_ev['cheat'] = 'boyfriend' & gs 'sex_ev_wakeup', 'cheat_guilt1'
 				end

+ 2 - 2
locations/sex_ev_work_talk1.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'whats_your_job':
 				cla & *nl
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
 				if npc_insecure[$npcID] = 1:
-					gs 'npc_relationship', 'modify', $boy, 'hate'
+					gs 'npc_relationship', 'modify', $npcID, 'hate'
 					'"What the fuck?" <<$npc_firstname[$npcID]>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"'
 					'"I was just joking," you say.'
 					'"Jokes are supposed to be funny."'
@@ -147,7 +147,7 @@ if $ARGS[0] = 'whats_your_job':
 			act 'That''s cool':
 				cla & *nl
 				'"Oh, that''s cool. So you know how to get people in shape? Got any tips to keep a girl''s figure?"'
-				if npc_humor[$npcID] = 2:
+				if $npc_humor[$npcID] = 'perverted':
 					'"Lots of sex," he grins. "It''s great cardio."'
 				else
 					'"Watch what you eat," he shrugs. "Fewer calories in than out. That''s all that matters if you want to lose weight."'