Forráskód Böngészése

Merge remote-tracking branch 'hornguy6/master'

Kevin_Smarts 1 éve
szülő
commit
f019fd324b

+ 192 - 95
locations/booty_call_after.qsrc

@@ -283,14 +283,7 @@ if $ARGS[0] = 'well_continue2':
 	act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 	act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
 	act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
-	if booty_call['cock_remove'] = 0:
-		act'Keep fucking':
-			cla
-			gs 'booty_call_sex', 'reset'
-			gs 'booty_call_condoms', 'condoms'
-			gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
-		end
-	end
+	gs'booty_call_sex', 'keep_fucking_act'
 end
 
 if $ARGS[0] = 'keep_going':
@@ -847,7 +840,7 @@ if $ARGS[0] = 'black_out_wake':
 end
 
 if $ARGS[0] = 'black_out_wake_options':
-	act'Get dressed':gt'booty_call_after', 'black_out_wake2'
+	act'Find your clothes':gt'booty_call_after', 'black_out_wake2'
 	
 	act'Shower?':
 		pc_know_npc_has_girlfriend[$boy] = 1
@@ -1081,6 +1074,7 @@ if $ARGS[0] = 'after_sex1':
 end
 
 if $ARGS[0] = 'pull_apart':
+	booty_call['cock_remove'] = 1
 	if $booty_call['cum_choice'] = 'creampie':
 		if $booty_call['position'] = 'miss':
 			'<center><video autoplay loop src="images/shared/sex/after/miss_after1.mp4"></video></center>'
@@ -1151,66 +1145,9 @@ if $ARGS[0] = 'after_sex2':
 			gs'booty_call_after', 'relax_together'
 		end
 	end
-	act'Use his bathroom':
-		cla
-		act'Use the mirror':
-			$locM = 'booty_call_after'
-			$locM_arg = 'after_sex2_w_picture'
-			gt 'mirror', 'start'
-		end
+	
+	act'Use his bathroom':gt'booty_call_after', 'boy_bathroom'
 		
-		if (pcs_breath ! 1 or cumloc[12] = 1) and (travel_brush = 1 or overnight_bag[$boy] = 1):
-			menu_off = 1
-			*clr & cla
-			minut += 3
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 1
-			teeth['brushed'] +=1
-			if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
-				'<center><video autoplay loop src="images/shared/home/bathroom/brushteeth.mp4"></center>'
-				play 'sound/brushteeth.mp3',100
-			else
-				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brushteeth.jpg"></center>'
-			end
-			*nl
-			'You brush your teeth and now they are clean and minty fresh.'
-			gs'booty_call_after', 'after_sex2'
-		end
-		if booty_call['sleep_fuck'] = 0 and booty_call['wakeup_fuck'] = 0:
-			if booty_call['shower'] = 0:
-				act'Take a shower':gs'booty_call_shower', 'after_borrow_shower'
-			end
-		end
-		if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
-			act 'Use a sanitary pad (0:02)':
-				menu_off = 1
-				*clr & cla
-				sanpad -= 1
-				isprokp = 1
-				minut += 2
-				pcs_mood -= 5
-				'<center><img <<$set_imgh>> src="images/pc/body/pee/period/pad/<<rand(2,3)>>.jpg"></center>'
-				*nl
-				'You use a sanitary pad.'
-				gs'booty_call_after', 'after_sex2'
-			end
-		end
-		if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
-			act 'Use a tampon (0:02)':
-				menu_off = 1
-				*clr & cla
-				tampon -= 1
-				isprok = 1
-				minut += 2
-				pcs_mood -= 5
-				'<center><img <<$set_imgh>> src="images/pc/body/pee/period/tampon/6.jpg"></center>'
-				*nl
-				'You use a tampon.'
-				gs'booty_call_after', 'after_sex2'
-			end
-		end
-	end
 	if booty_call['cigarette'] = 0 and (siga > 0 or npc_smoker[$boy] > 0) and booty_call['npc_late'] ! 1:
 		act'Smoke a cigarette':cla & gs'booty_call_after', 'smoke_ciga1'
 	end
@@ -1236,6 +1173,109 @@ if $ARGS[0] = 'after_sex2':
 	gs'booty_call_after', 'spend_night_ask'
 end
 
+if $ARGS[0] = 'boy_bathroom':
+	booty_call['get_up'] = 1
+	cla & *clr
+	$npc_apt_bathroom[$boy]
+	act'Back to the bedroom':
+		if booty_call['sleepover'] = 0:
+			gt 'booty_call_after', 'after_sex2_w_picture'
+		else
+			gt 'booty_call_morning', 'wakeup2'
+		end
+	end
+	act'Use the mirror':
+		$locM = 'booty_call_after'
+		$locM_arg = 'boy_bathroom'
+		gt 'mirror', 'start'
+	end
+	
+	if (pcs_breath ! 1 or cumloc[12] = 1) and (travel_brush = 1 or overnight_bag[$boy] = 1):
+		menu_off = 1
+		*clr & cla
+		minut += 3
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		pcs_breath = 1
+		teeth['brushed'] +=1
+		if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
+			'<center><video autoplay loop src="images/shared/home/bathroom/brushteeth.mp4"></center>'
+			play 'sound/brushteeth.mp3',100
+		else
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brushteeth.jpg"></center>'
+		end
+		*nl
+		'You brush your teeth and now they are clean and minty fresh.'
+		act'Continue':gs'booty_call_after', 'boy_bathroom'
+	end
+	if booty_call['sleep_fuck'] = 0 and booty_call['wakeup_fuck'] = 0:
+		if booty_call['shower'] = 0:
+			act'Take a shower':gs'booty_call_shower', 'after_borrow_shower'
+		end
+	end
+	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
+		act 'Use a sanitary pad (0:02)':
+			menu_off = 1
+			*clr & cla
+			sanpad -= 1
+			isprokp = 1
+			minut += 2
+			pcs_mood -= 5
+			'<center><img <<$set_imgh>> src="images/pc/body/pee/period/pad/<<rand(2,3)>>.jpg"></center>'
+			*nl
+			'You use a sanitary pad.'
+			act'Continue':gs'booty_call_after', 'boy_bathroom'
+		end
+	end
+	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
+		act 'Use a tampon (0:02)':
+			menu_off = 1
+			*clr & cla
+			tampon -= 1
+			isprok = 1
+			minut += 2
+			pcs_mood -= 5
+			'<center><img <<$set_imgh>> src="images/pc/body/pee/period/tampon/6.jpg"></center>'
+			*nl
+			'You use a tampon.'
+			act'Continue':gs'booty_call_after', 'boy_bathroom'
+		end
+	end
+	
+	if cum_loc['vagina'] > 0:
+		act'Let the cum drain from your pussy (0:15)':
+			cumspclnt = 3
+			gs 'cum_cleanup'
+			minut += 15
+			cla
+			act'Wait it out':
+				gs'stat'
+				cla & *clr
+				!! IMAGE HERE
+				'You sit on the toilet humming to yourself while you wait for <<$npc_firstname[$boy]>>''s cum to drain from your pussy. It takes a long time with minutes passing between sudden gushes of semen pouring out of your snatch.'
+				*nl
+				'After about fifteen minutes, you figure you''re safe and grab some toilet paper to wipe the last strands from your labia.'
+				act'Continue':gs'booty_call_after', 'boy_bathroom'
+			end
+			
+			if siga > 0:
+				act'Smoke to pass the time':
+					gs 'drugs', 'smoke'
+					gs'stat'
+					cla & *clr
+					!! IMAGE HERE
+					'You know this is going to take a long time so you take your smokes and a lighter into the bathroom with you.'
+					*nl
+					'Plopping down on the toilet, you light up while waiting for <<$npc_firstname[$boy]>>''s cum to drain from your pussy. Minutes pass between sudden gushes of semen pouring out of your snatch and you pass the time puffing smoke and flicking ashes.'
+					*nl
+					'After about fifteen minutes, you figure you''re safe and grab some toilet paper to wipe the last strands from your labia before making your long-drained cigarette is fully extinguished and tossing it in the trash.'
+					act'Continue':gs'booty_call_after', 'boy_bathroom'
+				end
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'relax_together':
 	cla
 	booty_call['relax_after'] = 1
@@ -1256,7 +1296,7 @@ if $ARGS[0] = 'relax_together':
 end
 
 if $ARGS[0] = 'cock_clean':
-	if booty_call['cock_cleanup'] ! 1 and booty_call['fuck'] > 0:
+	if booty_call['cock_cleanup'] ! 1 and booty_call['fuck'] > 0 and booty_call['get_up'] ! 1:
 		act'Clean his cock':
 			booty_call['cock_cleanup'] = 1
 			cla & *clr
@@ -1330,7 +1370,7 @@ if $ARGS[0] = 'kiss':
 end
 
 if $ARGS[0] = 'plan_b':
-	if booty_call['creampie_count'] > 0 and morning_after_pill > 0 and booty_call['plan_b'] = 0 and birth_control['think_safe'] = 0 and booty_call['angry_after'] = 0:
+	if booty_call['creampie_count'] > 0 and morning_after_pill > 0 and booty_call['plan_b'] = 0 and birth_control['think_safe'] = 0 and booty_call['angry_after'] = 0 and mesec = 0:
 		act'Take a morning after pill':
 			booty_call['plan_b'] = 2
 			cla & *clr
@@ -1379,20 +1419,35 @@ end
 
 if $ARGS[0] = 'birth_control_pill_take':
 !!	if birth_control['remind_hour'] > 0 and hour >= birth_control['remind_hour'] and hour <= birth_control['remind_hour'] + 1 and tabletkiday ! daystart and booty_call['angry_after'] = 0:
-	if birth_control['remind_hour'] > 0 and tabletkiday ! daystart and booty_call['angry_after'] = 0:
+	if birth_control['remind_hour'] > 0 and tabletkiday ! daystart and booty_call['angry_after'] = 0 and booty_call['bc_take'] ! 1:
 		act'Take your birth control':
 			birth_control['message_skip'] = daystart
+			booty_call['bc_take'] = 1
 			gs'din_bad', 'quick_takepill'
 			cla & *clr
 			$npc_apt_bedroom[$boy]
-			'You notice your phone winking a calendar reminder at you:'
-			*nl
-			'<i><font color="pink"><b>Take your vitamins!</b></font></i>'
-			*nl
-			'Right, you need to take your birth control pill for the day.'
+			if birth_control['remind_hour'] > 0 and hour >= birth_control['remind_hour'] and hour <= birth_control['remind_hour'] + 1 and tabletkiday ! daystart and booty_call['bc_take'] ! 1:
+				'You notice your phone winking a calendar reminder at you:'
+				*nl
+				'<i><font color="pink"><b>Take your vitamins!</b></font></i>'
+				*nl
+				'Right, you need to take your birth control pill for the day.'
+			else
+				'A spark fires somewhere in the back of your brain reminding you of something very important.'
+				*nl
+				if birth_control['remind_hour'] > 0:
+					'"Oh shit! I almost forgot to take my birth control!"'
+				else
+					'Right, you need to take your birth control pill for the day.'
+				end
+			end
 			act'Take it shyly':
 				cla & *clr
-				$npc_apt_bedroom[$boy]
+				if booty_call['get_up'] = 0:
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				else
+					$npc_apt_bedroom[$boy]
+				end
 				if cumloc[0] > 0:
 					'With <<$npc_firstname[$boy]>>''s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.'
 					*nl
@@ -1421,7 +1476,12 @@ if $ARGS[0] = 'birth_control_pill_take':
 			end
 			
 			act'Take it sexily':
-				cla & *nl
+				cla & *clr
+				if booty_call['get_up'] = 0:
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				else
+					$npc_apt_bedroom[$boy]
+				end
 				if cumloc[0] > 0:
 					'With <<$npc_firstname[$boy]>>''s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.'
 					*nl
@@ -1455,7 +1515,7 @@ if $ARGS[0] = 'birth_control_pill_take':
 end
 
 if $ARGS[0] = 'smoke_ciga1':
-	if siga > 0 and booty_call['cigarette'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
+	if siga > 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
 		act'One of yours':booty_call['cigarette'] = 1 & gt'booty_call_after', 'smoke_ciga2'
 
 		act'Play with your phone':
@@ -1465,7 +1525,7 @@ if $ARGS[0] = 'smoke_ciga1':
 		end
 	end
 
-	if npc_smoker[$boy] > 0 and booty_call['annoyed'] = 0 and booty_call['bum_cigarette'] = 0 and booty_call['cigarette'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
+	if npc_smoker[$boy] > 0 and booty_call['annoyed'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
 		act'Bum a cigarette':
 			booty_call['bum_cigarette'] = 1
 			siga += 1
@@ -1524,7 +1584,7 @@ if $ARGS[0] = 'smoke_phone':
 end
 
 if $ARGS[0] = 'spend_night_ask':
-	if (hour >= 20 or daystage = 1 or daystage = 5) and booty_call['spend_night'] = 0 and booty_call['angry_after'] = 0:
+	if (hour >= 20 or $daystage['desc'] = 'mid_night') and booty_call['spend_night'] = 0 and booty_call['angry_after'] = 0 and booty_call['sleepover'] = 0:
 		act'Ask to spend the night':
 			booty_call['spend_night'] = 1
 			cla & *clr
@@ -1617,13 +1677,28 @@ if $ARGS[0] = 'spend_night':
 	end
 end
 
-if $ARGS[0] = 'dressing1':
-	cla & *clr
+if $ARGS[0] = 'dressing_image':
 	if booty_call['CloDress'] = 1:
 		'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/bed_dress.jpg"></center>'
-	else
+	elseif $booty_call['dress_describe'] = 'pulling your panties up your legs and fastening your bra around your chest':
+		'<center><video autoplay loop src="images/pc/activities/misc/dress_underwear1.mp4"></video></center>'
+	elseif $booty_call['dress_describe'] = 'fastening your bra around your chest':
+		'<center><video autoplay loop src="images/pc/activities/misc/dress_bra1.mp4"></video></center>'
+	elseif $booty_call['dress_describe'] = 'zipping your skirt up over your hips':
+		'<center><video autoplay loop src="images/pc/activities/misc/dress_skirt1.mp4"></video></center>'
+	elseif $booty_call['dress_describe'] = 'tugging your pants over your hips':
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
+	elseif booty_call['hotel'] = 1:
+		!! IMAGE HERE
+		!! hotel room image
+	else
+		$npc_apt_bedroom[$boy]
 	end
+end
+
+if $ARGS[0] = 'dressing1':
+	cla & *clr
+	gs'booty_call_after', 'dressing_image'
 	if booty_call['towel'] = 1:
 		booty_call['towel'] = 0
 	else
@@ -1670,7 +1745,9 @@ end
 
 if $ARGS[0] = 'not_leaving':
 	act'Not yet':
-		cla & *nl
+		cla & *clr
+		gs'booty_call_after', 'dressing_image'
+		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 		'"Not yet," you say, <<$booty_call[''dress_describe'']>>. "Just tired of hanging around naked."'
 		'"I''m never tired of seeing you naked."'
 		'"Whatever," you roll your eyes.'
@@ -1681,7 +1758,9 @@ end
 if $ARGS[0] = 'leaving_soon':
 	act'Yeah':
 		booty_call['leaving'] = 1
-		cla & *nl
+		cla & *clr
+		gs'booty_call_after', 'dressing_image'
+		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 		if booty_call['sleepover'] < 1:
 			'"Yeah," you say, <<$booty_call[''dress_describe'']>>.'
 			gs 'booty_call_after', 'dressing2'
@@ -1703,7 +1782,9 @@ if $ARGS[0] = 'going_disco':
 	if hour >= 18 and (week = 5 or week = 6):
 		if $region = 'pav':
 			act'Going to the disco':
-				cla & *nl
+				cla & *clr
+				gs'booty_call_after', 'dressing_image'
+				'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 				if booty_call['disco_after'] = 1:
 					'"Weren''t you listening to me?" you say, <<$booty_call[''dress_describe'']>>. "I told you, I''m going to the disco tonight."'
 				else
@@ -1716,7 +1797,9 @@ if $ARGS[0] = 'going_disco':
 			end
 		else
 			act'Going to the club':
-				cla & *nl
+				cla & *clr
+				gs'booty_call_after', 'dressing_image'
+				'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 				if booty_call['club_after'] = 1:
 					'"Weren''t you listening to me?" you say, <<$booty_call[''dress_describe'']>>. "I told you, I''m going clubbing tonight."'
 				else
@@ -1735,7 +1818,9 @@ if $ARGS[0] = 'mom_late':
 	if mid($start_type,1,2) = 'sg' and hour >= 20:
 		act'Mom will kill me':
 			booty_call['mom_kill'] = 1
-			cla & *nl
+			cla & *clr
+			gs'booty_call_after', 'dressing_image'
+			'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 			if hour < 3:
 				'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "I''m already going to be in trouble as it is, but if I don''t come home at all tonight, my mom will kill me."'
 			else
@@ -1751,7 +1836,9 @@ end
 if $ARGS[0] = 'need_homework':
 	if lernHome > 0:
 		act'Need to finish my homework':
-			cla & *nl
+			cla & *clr
+			gs'booty_call_after', 'dressing_image'
+			'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "I need to do my homework."'
 			gs'booty_call_after', 'dress_loop'
 !!			if rand(0,1) = 1:
@@ -1776,7 +1863,9 @@ end
 if $ARGS[0] = 'going_school':
 	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
 		act'School':
-			cla & *nl
+			cla & *clr
+			gs'booty_call_after', 'dressing_image'
+			'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 			if booty_call['late_for_school'] = 1 and hour >= 8:
 				'"I already told you, I''m late for school," you say, <<$booty_call[''dress_describe'']>>. "But thanks for letting me spend the night. And the second fuck," you add with a wink.'
 			elseif booty_call['late_for_school'] = 1:
@@ -1956,7 +2045,15 @@ end
 
 if $ARGS[0] = 'dress_loop':
 	:dress_loop_start
-	if $lastwornpantytype['booty_call'] ! 'none' and $pantyworntype = 'none' and booty_call['panty_wear'] ! 1:
+	if $lastwornpantytype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! 'none' and $pantyworntype = 'none'and booty_call['panty_wear'] ! 1 and booty_call['bra_wear'] ! 1:
+		booty_call['panty_wear'] = 1
+		booty_call['bra_wear'] = 1
+		killvar 'lastwornpantytype'
+		killvar 'lastwornpantynumber'
+		killvar 'lastwornbratype'
+		killvar 'lastwornbranumber'
+		$booty_call['dress_describe'] = 'pulling your panties up your legs and fastening your bra around your chest'
+	elseif $lastwornpantytype['booty_call'] ! 'none' and $pantyworntype = 'none' and booty_call['panty_wear'] ! 1:
 		gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
 		killvar 'lastwornpantytype'
 		killvar 'lastwornpantynumber'
@@ -1982,10 +2079,10 @@ if $ARGS[0] = 'dress_loop':
 				$booty_call['dress_describe'] = 'smoothing your skirt out'
 			end
 		else
-			if CloSkirtShortness > 0 and booty_call['skirt_wear'] = 0 and booty_call['dress_end'] ! 1:
+			if CloSkirtShortness > 0 and booty_call['skirt_wear'] ! 1 and booty_call['dress_end'] ! 1:
 				booty_call['skirt_wear'] = 1
 				$booty_call['dress_describe'] = 'zipping your skirt up over your hips'
-			elseif booty_call['pants_wear'] = 0 and booty_call['dress_end'] ! 1:
+			elseif booty_call['dress_end'] ! 1 and booty_call['pants_wear'] ! 1:
 				booty_call['pants_wear'] = 1
 				$booty_call['dress_describe'] = 'tugging your pants over your hips'
 			else
@@ -2164,7 +2261,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 			$npc_apt_bedroom[$boy]
 			'"The truth is, I''ve started seeing somebody. The sex has been good, but..." You shake your head, grabbing your purse. "I can''t keep doing this. I don''t want to fuck things up."'
 			if npc_fidelity[$boy] < 7:
-				'"Come on," he says. "We''re just having fun. It''s not cheating if it''s just physical. When you masturbate in the shower, you''re not cheating on him with your showerhead are you?"'
+				'"Come on," he says. "We''re just having fun. It''s not cheating if it''s just physical. When you masturbate in the shower, it''s not cheating on him with your showerhead are you?"'
 				act'No means no':
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'

+ 1 - 14
locations/booty_call_morning.qsrc

@@ -430,20 +430,7 @@ if $ARGS[0] = 'wakeup1':
 			act'Look for <<$npc_firstname[$boy]>>':gt'booty_call_shower', 'morning_look1'
 		end
 	else
-		act'Use his bathroom':
-			cla
-			act'Use the mirror':
-				booty_call['out_of_bed'] = 1
-				$locM = 'booty_call_morning'
-				$locM_arg = 'wakeup2'
-				gt 'mirror', 'start'
-			end
-			if booty_call['morning_shower'] = 0:
-				act'Take a shower (0:10)':gt'booty_call_morning', 'shower'
-			elseif booty_call['morning_shower'] > 0 and pcs_sweat > 19:
-				act'Take another shower (0:05)':gt'booty_call_morning', '2nd_shower'
-			end
-		end
+		act'Use his bathroom':gt'booty_call_after', 'boy_bathroom'
 	end
 	
 	if npc_latesleeper[$boy] ! 1 and booty_call['breakfast_eat'] = 0 and booty_call['npc_morning_shower'] ! 1:

+ 5 - 1
locations/booty_call_pillow_talk2.qsrc

@@ -1168,7 +1168,11 @@ if $ARGS[0] = 'wakeup_sex_late_for_school':
 			if cum_loc['vagina'] > 0:
 				act'Gonna leak all day':
 					cla & *nl
-					'"I don''t even have time to shower," you say. "Which means I''m going to have to go through all my classes leaking your cum."'
+					if $lastwornpantytype['booty_call'] ! 'none':
+						'"I don''t even have time to shower and clean my pussy out," you say. "Your cum is going to be soaking into my panties all day."'
+					else
+						'"I don''t even have time to shower and clean my pussy out," you say. "Your cum is going to be running down my legs all day."'
+					end
 					'You give <<$npc_firstname[$boy]>> a wry smirk.'
 					gs'booty_call_pillow_talk2', 'morning_sex_talk'
 				end

+ 14 - 7
locations/booty_call_sex.qsrc

@@ -312,6 +312,18 @@ if $ARGS[0] = 'keep_fucking':
 	end
 end
 
+if $ARGS[0] = 'keep_fucking_act':
+	if booty_call['cock_remove'] = 0:
+		act'Keep fucking':
+			$booty_call['reset_pos'] = $booty_call['position']
+			cla
+			gs 'booty_call_sex', 'reset'
+			gs 'booty_call_condoms', 'condoms'
+			gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
+		end
+	end
+end
+
 if $ARGS[0] = 'take_a_break':
 	act'Take a break':
 		cla & *clr
@@ -339,6 +351,7 @@ if $ARGS[0] = 'take_a_break':
 				gs 'booty_call_sex', 'break_ask'
 				
 				act'Pull apart':
+					booty_call['cock_remove'] = 1
 					cla & *clr
 					if $booty_call['position'] = 'miss':
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
@@ -360,7 +373,6 @@ if $ARGS[0] = 'take_a_break':
 					elseif $booty_call['position'] = 'doggy':
 						'You let your legs give out from under you, collapsing to the bed with <<$npc_firstname[$boy]>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.'
 					elseif $booty_call['position'] = 'cowgirl':
-						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
 						'You collapse onto <<$npc_firstname[$boy]>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.'
 					end
 					gs 'booty_call_sex', 'break_time'
@@ -648,12 +660,7 @@ if $ARGS[0] = 'keep_going':
 				gs'booty_call_sex', 'reset'
 				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-				act'Keep fucking':
-					cla
-					gs 'booty_call_sex', 'reset'
-					gs 'booty_call_condoms', 'condoms'
-					gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
-				end
+				gs'booty_call_sex', 'keep_fucking_act'
 			end
 		else
 			cla & *clr

+ 7 - 0
locations/booty_call_start.qsrc

@@ -1791,6 +1791,13 @@ if $ARGS[0] = 'foreplay_choose':
 			end
 		end
 	end
+	
+	if booty_call['fuck_count'] = 0 and $booty_call['position'] = '':
+		act'Skip the foreplay':
+			booty_call['skip_foreplay'] = 1
+			gt 'booty_call_sex', 'sex_pre'
+		end
+	end
 end
 
 if $ARGS[0] = 'foreplay_rand':

+ 7 - 0
locations/booty_call_stats.qsrc

@@ -27,6 +27,13 @@ if $ARGS[0] = 'starting_stats':
 	booty_call['orgasm'] = orgasm
 	booty_call['orgasm_limit'] = orgasm + 6
 	booty_call['pc_condom_count'] = prezik
+	if minut < 45:
+		booty_call['start_hour'] = hour
+	elseif hour < 23:
+		booty_call['start_hour'] = hour + 1
+	else
+		booty_call['start_hour'] = 0
+	end
 	if $start_type[1] ! 'nomagic': booty_call['magik'] = pcs_magik
 	if npc_fuckbuddy[$boy] ! 1: npc_fuckbuddy[$boy] = 1
 end

+ 91 - 0
locations/booty_call_talk.qsrc

@@ -1758,6 +1758,97 @@ if $ARGS[0] = 'creampie_panic':
 	end
 end
 
+if $ARGS[0] = 'forgot_bc_talk':
+	
+	if npc_childfree[$boy] > 0 and (npc_argumentative[$boy] > 0 or npc_abusive[$boy] > 0) and booty_call['creampie_count'] > 0:
+		npc_rel[$boy] -= 10
+		'"What the fuck?!" <<$npc_firstname[$boy]>> 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
+			'"I know, I know!" you moan miserably, berating yourself as much as he''s berating you. "I''m a fucking idiot. I''m sorry, I''m so sorry."'
+			gs'booty_call_morning','wakeup2'
+		end
+		
+		act'Tell him to fuck off':
+			npc_rel[$boy] -= 10
+			booty_call['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!"'
+			gs'booty_call_morning','wakeup2'
+		end
+		
+		if morning_after_pill > 0:
+			act'Morning after pill (sorry)':
+				gs 'medical_din', 'morning_after_pill_function'
+				cla & *nl
+				'"I know, I know!" you moan miserably, berating yourself as much as he''s berating you. "I''m sorry, I''m so sorry. I know I fucked up. But I have this at least."'
+				*nl
+				'You fish a plan B pill out of your bag and hold it up for him to see.'
+				*nl
+				'"This ought to buy us some protection," you say, putting it in your mouth and crunching it down dry.'
+				gs'booty_call_morning','wakeup2'
+			end
+			
+			act'Morning after pill (fuck off)':
+				gs 'medical_din', 'morning_after_pill_function'
+				npc_rel[$boy] -= 10
+				booty_call['angry_after'] = 1
+				cla & *nl
+				'"<i>''Your''</i> kids?" you say, glaring at him. "You know what? You can fuck off! I made a mistake and I admitted it. And you I have the fucking solution," you say, defiantly holding up your morning after pill.'
+				*nl
+				'"So you can fuck off!" you say again, throwing the pill in your mouth and crunching it down dry. "This is what I get for wanting to be accountable and transparent," you grumble, grinding your teeth on the bitter medicine.'
+				gs'booty_call_morning','wakeup2'
+			end
+		end
+	elseif booty_call['creampie_count'] = 0:
+		'"So what? I didn''t come inside you last night," <<$npc_firstname[$boy]>> says, looking confused.'
+		if npc_bareback[$boy] > 0:
+			'"Yeah but it may mean we need to start using condoms again for a while," you sigh.'
+		else
+			'"Yeah but I''m supposed to take it every day," you sigh.'
+		end
+		gs'booty_call_talk','forgot_bc_exit'
+	else
+!!		if npc_childfree[$boy] > 0:
+			'"Shit," <<$npc_firstname[$boy]>> says, looking concerned. "What are you gonna do?"'
+			act'I don''t know':
+				cla & *nl
+				'"I don''t know," you say, looking back at him apologetically. "Hope we get lucky I guess?"'
+				gs'booty_call_talk','forgot_bc_exit'
+			end
+			
+			if morning_after_pill > 0:
+				act'Take your morning after pill':
+					gs 'medical_din', 'morning_after_pill_function'
+					cla & *nl
+					'"I have this," you say, fishing around in your bag to pull out your morning after pill.'
+					*nl
+					'"This ought to buy us some protection," you say, putting it in your mouth.'
+					'"Does that work if you were already on the pill? You only forgot one day."'
+					'"Can''t hurt," you mumble around the pill as you crunch it down.'
+					gs'booty_call_talk','forgot_bc_exit'
+				end
+			else
+				act'Buy some plan B?':
+					cla & *nl
+					'"Buy a morning after pill?" you say, shrugging. "I don''t know. Does it still work when you''re already sort of on birth control?"'
+					*nl
+					'<<$npc_firstname[$boy]>> shrugs back. Great help.'
+					gs'booty_call_talk','forgot_bc_exit'
+				end
+			end
+!!		end
+	end
+end
+
+if $ARGS[0] = 'forgot_bc_exit':
+	if $temp_loc = 'booty_call_morning':
+		gs'booty_call_morning','wakeup2'
+	else
+		gs'booty_call_pillow_talk2', 'morning_sex_talk'
+	end
+end
+
 if $ARGS[0] = 'cum_mouth_like_that':
 	if $booty_call['last_cum'] = 'swallow':
 		act'Did you like that?':

+ 5 - 3
locations/booty_call_work_talk1.qsrc

@@ -1,12 +1,14 @@
 # booty_call_work_talk1
 
 if $ARGS[0] = 'job_talk':
+	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
+	act'Change the subject':cla & gs 'booty_call_pillow_talk', 'topics'
 	if npc_job_known = 0:
 		gs'booty_call_work_talk1', 'whats_your_job'
 	else
-		act'Ask him about work':
+!!		act'Ask him about work':
 		
-		end
+!!		end
 	end
 end
 
@@ -278,7 +280,7 @@ if $ARGS[0] = 'whats_your_job':
 		elseif $npc_occupation[$boy] = 'businessman':
 			'"I run a company I founded," <<$npc_firstname[$boy]>> says casually.'
 			'"Oh wow. Explains the apartment. What do you sell?"'
-			'"Imported cars from China. Everybody needs a car."'
+			'"Imported cars from China. Everybody needs cars."'
 			'"Very practical," you nod."'
 			gs'booty_call_pillow_talk2', 'small_talk'
 		elseif $npc_occupation[$boy] = 'lawyer':

+ 1 - 1
locations/dateF.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	$location_type = 'event_outdoors'
 	gs 'girl'
 	*clr & cla
-
+	act 'Ignore her and hurry away':gt $loc, $loc_arg
 	!!1) Sveta in a school uniform
 	if PCloStyle2 = 4:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'

+ 175 - 170
locations/dateM.qsrc

@@ -23,39 +23,42 @@ if $ARGS[0] = 'start':
 		gs 'npcgeneratec', 0, 'Stranger', rand(18,45), rand(3,4)
 	end
 	gs 'boyStat', $npclastgenerated
-	
+	act 'Ignore him and hurry away':gt $loc, $loc_arg
 !!1) Sveta in a school uniform
 	if PCloStyle2 = 4:
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
-		'As he nears you, he presents himself; "Hi. My name is <<$boydesc>>. What are you doing here all by yourself?"'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
+!!		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
+!!		'As he nears you, he presents himself; "Hi. My name is <<$npc_firstname[$boy]>>. What are you doing here all by yourself?"'
+		'A man approaches, smiling at you.'
+		'"Hi. My name is <<$npc_firstname[$boy]>>. What are you doing here all by yourself?"'
+
 		act 'Greet him':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 			'"Hi! My name is <<$pcs_nickname>>." you answer. "School just ended so I was trying to figure out what to do for the rest of the day."'
-			'"Oh really." After a moment of silence <<$boydesc>> finally speaks up; "Don''t take this the wrong way but what school do you attend?" he asks.'
+			'"Oh really." After a moment of silence <<$npc_firstname[$boy]>> finally speaks up; "Don''t take this the wrong way but what school do you attend?" he asks.'
 			act 'Don''t tell him which school':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 				'You break out into laughter, "Why would I tell you that, for all I know you could be a rapist."'
 				'"Did you just accuse me for a rapist?" he asks as his voice changes to a more serious tone.'
 				'"I didn''t mean to make you upset, but don''t you thinks it''s a bit strange for someone unknown to walk up a schoolgirl and ask what school they go to?" you answer.'
-				'<<$boydesc>> clearly upset by your question just turns around and walks away without saying another word.'
+				'<<$npc_firstname[$boy]>> clearly upset by your question just turns around and walks away without saying another word.'
 				'"What a strange guy." you think to yourself as you watch him going away muttering something to himself.'
 				act 'Continue': gt $loc, $loc_arg
 			end
 			act 'Tell him':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 				'"I don''t really know if I should tell you that. For all I know you might be a creepy guy, that wants to kidnap me."'
 				'"I''m sorry I knew I would come off as creepy but I got a bit thrown off by your school outfit. I didn''t mean anything by it."'
 				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Thanks, I think..." you answer thinking he''s pretty cute while squirming.'
 					'"Okay, I''ll tell you but you must promise me one thing." you tease him.'
-					'Staying quiet for a moment, <<$boydesc>> is contemplating what he should answer, finally deciding, "Sure, whatever you want, I can''t say to a girl in a hot school outfit..."'
-					'You tell <<$boydesc>> what school you attend. "I know of that school, it''s known for its hot girls." You blush a little as he''s definitely flirting with you. "May I entertain you for the rest of the day?" he asks.'
+					'Staying quiet for a moment, <<$npc_firstname[$boy]>> is contemplating what he should answer, finally deciding, "Sure, whatever you want, I can''t say to a girl in a hot school outfit..."'
+					'You tell <<$npc_firstname[$boy]>> what school you attend. "I know of that school, it''s known for its hot girls." You blush a little as he''s definitely flirting with you. "May I entertain you for the rest of the day?" he asks.'
 				else
 					'You think to yourself there shouldn''t be any problems since you''re in another place. You tell him the name of the school as he looks at you confused, "I''ve never heard of that school."'
 					'"It''s the school in Pavlovsk." you tell him.'
@@ -64,31 +67,31 @@ if $ARGS[0] = 'start':
 				end
 				act 'I would love to':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"Sure, that sounds fun and I just so happen to have some time to kill." You say with a wink.'
-					'"Great!" answers <<$boydesc>> "So, what do you want to do?".'
+					'"Great!" answers <<$npc_firstname[$boy]>> "So, what do you want to do?".'
 					gs 'dateM', 'date_choice'
 				end
 				act 'I would love to but can''t right now':
 					*clr & cla
 					gs 'boyfrend', 'start'
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
-					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to his contact list.'
+					'"I say that''s a great idea. I''ll be in touch." <<$npc_firstname[$boy]>> adds your number to his contact list.'
 					'"You better be." you say teasingly.'
 					act 'Continue': gt $loc, $loc_arg
 				end
 				act 'Decline':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'As you''re talking you get a creepy feeling about this guy, "I''m sorry but I just remembered I was supposed to meet a friend."'
-					'<<$boydesc>> looks at you disappointed. "Oh, that''s a shame. Could I get-..."'
+					'<<$npc_firstname[$boy]>> looks at you disappointed. "Oh, that''s a shame. Could I get-..."'
 					'You''re already moving away from him before he even finished his sentence not hearing what he wanted.'
 					act 'Continue': gt $loc, $loc_arg
 				end
 				act 'Decline politely':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"I''m sorry but I''m not interested. I sort of have a boyfriend..." you answer wanting to reject the guys as easy as possible.'
 					'"That''s too bad... I should have guessed a girl in that hot outfit would be taken."'
 					'As you move away from him, you''re glad you declined, especially after the last comment.'
@@ -96,43 +99,43 @@ if $ARGS[0] = 'start':
 				end
 				act'How about we fuck?':
 					cla & *clr
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"How about a fuck for the road instead?"'
 					'"Excuse me?" It''s his turn to look surprised now.'
 					'"You, me, your place, we have sex right now. How about it?"'
 					'"I knew it, schoolgirls are the best," he grins. You let him grab you by the arm and tow you off towards a nearby apartment complex.'
-					if $region = 'city_center' or $region = 'city_residential' or $region = 'city_industrial' or $region = 'city_island' or $region = 'city_lake' or $region = 'city_park':
+					if $region = 'city_center' or $region = 'city' or $region = 'city' or $region = 'city_island' or $region = 'city_lake' or $region = 'city_park':
 						gs 'fame', 'city', 'sex', 2
-					elseif $region = 'pav_commercial' or $region = 'pav_park' or $region = 'pav_residential':
+					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					gs 'npcpreservec', $npclastgenerated
-					act 'Go to his place':gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
 				end
 			end
 		end
 	!!2) Gopnik Sveta
 	elseif gruptipe = 4:
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
-		'As he nears you, you hear him say, "Hey baby, you seem like a girl that likes to have fun. What do you say, wanna hang out?"'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
+!!		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
+		'A man approaches, smiling at you.'
+		'"Hey baby, you seem like a girl that likes to have fun. What do you say, wanna hang out?"'
 		act 'Look at him':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 			'You give him a once over and then give him an amused look, "What did you say? I hope you know what you''re getting yourself into."'
 			'Not fazed by your brashness he continues on, "I know it''s just a front with girls like you. All of you just act hard but I''ve got you all figured out. Tell me this instead, what is your name?"'
 			act 'No':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 				'"How about I kick your ass instead? Now get out of her before you know what my boot feels like shoved up your ass." you reply angrily.'
 				'"Okay, okay, sheesh... take it easy." he says loudly as he''s moving away from you.'
 				act 'Continue': gt $loc, $loc_arg
 			end
 			act 'Answer him':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 				'You give him a contemptuous look. "Oh, you have us all figured out do you? My name is <<$pcs_nickname>>, not that it is any of your business."'
 				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Well, I spotted you while I was on my way to a friends place and your looks caught my attention. Simply said, I want to add another trophy to my trophy wall." he impudently answers.'
@@ -146,9 +149,9 @@ if $ARGS[0] = 'start':
 				act 'Not now':
 					*clr & cla
 					gs 'boyfrend', 'start'
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"I''m busy right now." You tell him and watch him become disappointed. "But maybe I will get bored out of my skull and you will seem like a better open, so take my number and maybe I will answer if you call."'
-					'He laughs at your response. "Thanks. I''ll try to make sure to call you when you''re really bored." <<$boydesc>> adds your number to his contact list.'
+					'He laughs at your response. "Thanks. I''ll try to make sure to call you when you''re really bored." <<$npc_firstname[$boy]>> adds your number to his contact list.'
 					'"Don''t count on it loser." you answer.'
 					act 'Continue': gt $loc, $loc_arg
 				end
@@ -156,166 +159,168 @@ if $ARGS[0] = 'start':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff1.jpg"></center>'
 					'"Fuck off loser, I only date real men, the kinda that would kick your ass just for laughs!" you answer.'
-					'<<$boydesc>> looks at you in shock as he was not ready for you to react that way. "Well, I thought we could just have a little fun together..."'
-					'As you''re getting more annoyed you give him a shove making him back up a couple of steps. "Get the fuck out of here before I kick your ass!" <<$boydesc>> seeing he''s getting nowhere moves away quickly.'
+					'<<$npc_firstname[$boy]>> looks at you in shock as he was not ready for you to react that way. "Well, I thought we could just have a little fun together..."'
+					'As you''re getting more annoyed you give him a shove making him back up a couple of steps. "Get the fuck out of here before I kick your ass!" <<$npc_firstname[$boy]>> seeing he''s getting nowhere moves away quickly.'
 					act 'Continue': gt $loc, $loc_arg
 				end
 				act 'Fine':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'You give him a hard look and eye him up and down. "Fine I''m fucking bored anyways, but you''re paying."'
 					'"Good, I expected no other outcome." he says. "I''ll give it to you to decide what we should do?".'
 					gs 'dateM', 'date_choice'
 				end
 				act'How about we fuck?':
 					cla & *clr
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"How about a fuck for the road instead?"'
 					'"Excuse me?" It''s his turn to look surprised now.'
 					'"You, me, your place, we have sex right now. How about it?"'
 					'"Fuck yeah," he grins. You let him grab you by the arm and tow you off towards a nearby apartment complex.'
-					if $region = 'city_center' or $region = 'city_residential' or $region = 'city_industrial' or $region = 'city_island' or $region = 'city_lake' or $region = 'city_park':
+					if $region = 'city_center' or $region = 'city' or $region = 'city' or $region = 'city_island' or $region = 'city_lake' or $region = 'city_park':
 						gs 'fame', 'city', 'sex', 2
-					elseif $region = 'pav_commercial' or $region = 'pav_park' or $region = 'pav_residential':
+					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					gs 'npcpreservec', $npclastgenerated
-					act 'Go to his place':gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
 				end
 			end
 		end
 	!!3 - unattractive or average Sveta
 	elseif hotcat < 6:
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
-		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<$boydesc>>."'
-		act 'Refuse and walk away':
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
+!!		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
+!!		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<$npc_firstname[$boy]>>."'
+		'A man approaches, smiling at you.'
+		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<$npc_firstname[$boy]>>."'
+		act 'Give him a fake number':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 			'Not really impressed, you decide to teach him a lesson, "Sure thing, here''s my number."'
-			'<<$boydesc>> quickly scribbles it down not knowing you''ve just given him a totally unknown number.'
+			'<<$npc_firstname[$boy]>> quickly scribbles it down not knowing you''ve just given him a totally unknown number.'
 			act 'Continue': gt $loc, $loc_arg
 		end
 		act 'Grasp hand':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-			'Even though you know it''s impolite to shake hands with the opposite sex, you think <<$boydesc>> is cute-looking and even though you''re not sure about this you decide grasping his hand.'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
+			'Even though you know it''s impolite to shake hands with the opposite sex, you think <<$npc_firstname[$boy]>> is cute-looking and even though you''re not sure about this you decide grasping his hand.'
 			'"Aren''t you going to tell me your name?" he asks.'
 	!!I would suggest an option for Sveta to be happy about it.
 			act 'Decline':gt 'dateM', 'decline'
 			act 'Happily tell him your name':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 				'All of a sudden you get a bubbly feeling in your stomach thinking if he''s really asking your name?'
 				'You break out in a smile telling him, "My name is <<$pcs_nickname>>."'
-				'"What a beautiful name and a loving smile." <<$boydesc>> tells you.'
-				'You start blushing as <<$boydesc>> compliments you... "So what do you say <<$pcs_nickname>> would you like to go on a date with me?"'
+				'"What a beautiful name and a loving smile." <<$npc_firstname[$boy]>> tells you.'
+				'You start blushing as <<$npc_firstname[$boy]>> compliments you... "So what do you say <<$pcs_nickname>> would you like to go on a date with me?"'
 				!!Go on date, same answer no matter what time of day or weather
 				act 'Decline':gt 'dateM', 'decline'
 				act 'I would love to':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'You think about it a moment and figure why not "Sure I would love to out with you."'
-					'"Great!" answers <<$boydesc>> "So, what do you want to do?".'
+					'"Great!" answers <<$npc_firstname[$boy]>> "So, what do you want to do?".'
 					gs 'dateM', 'date_choice'
 				end
 				act 'I would love to but can''t right now':
 					*clr & cla
 					gs 'boyfrend', 'start'
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
-					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to his contact list.'
+					'"I say that''s a great idea. I''ll be in touch." <<$npc_firstname[$boy]>> adds your number to his contact list.'
 					'"You better be." you say teasingly.'
 					act 'Continue': gt $loc, $loc_arg
 				end
 				act'How about we fuck?':
 					cla & *clr
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"How about a fuck for the road instead?"'
 					'"Excuse me?" It''s his turn to look surprised now.'
 					'"You, me, your place, we have sex right now. How about it?"'
 					'"Fuck yeah," he grins. You let him grab you by the arm and tow you off towards a nearby apartment complex.'
-					if $region = 'city_center' or $region = 'city_residential' or $region = 'city_industrial' or $region = 'city_island' or $region = 'city_lake' or $region = 'city_park':
+					if $region = 'city_center' or $region = 'city' or $region = 'city' or $region = 'city_island' or $region = 'city_lake' or $region = 'city_park':
 						gs 'fame', 'city', 'sex', 2
-					elseif $region = 'pav_commercial' or $region = 'pav_park' or $region = 'pav_residential':
+					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					gs 'npcpreservec', $npclastgenerated
-					act 'Go to his place':gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
 				end
 			end
 		end
 	!!4) Attractive Sveta 
 	else
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
-		'He walks up to full of confidence, "Damn, baby, on a scale from 1 to 10, you''re an 11. How about a date?"'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
+!!		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
+!!		'He walks up to full of confidence, "Damn, baby, on a scale from 1 to 10, you''re an 11. How about a date?"'
+		'A man approaches, smiling confidently at you.'
+		'"Damn, baby, on a scale from 1 to 10, you''re an 11. How about a date?"'
+		
 		act 'Excuse me?':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-			'"Yeah, you heard me." said <<$boydesc>>. "Don''t act all that surprised, you''re good-looking, I''m good-looking we would be the perfect couple, so what do you say?"'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
+			'"Yeah, you heard me." said <<$npc_firstname[$boy]>>. "Don''t act all that surprised, you''re good-looking, I''m good-looking we would be the perfect couple, so what do you say?"'
 			'"Isn''t someone full of confidence," you comment, seizing control of the conversation, as you contemplate your next move...'
 			act 'Remain silent':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 				'"Come on, gorgeous, don''t give me the silent treatment."'
 				'As you hear the word gorgeous you melt straight away. You blush and mumble thanks, stammering like a buffoon.'
-				'<<$boydesc>> noticing that you''re having some trouble, smiles and tells you, "I''ll ask you one more time, I don''t want to come off as desperate." he says laughing.'
+				'<<$npc_firstname[$boy]>> noticing that you''re having some trouble, smiles and tells you, "I''ll ask you one more time, I don''t want to come off as desperate." he says laughing.'
 				'"Someone not desperate would have introduced themselves first and told me their name first. I don''t want to talk to a complete stranger."'
-				'"<<$boydesc>>! And yours?" he asks you confidently, seeing a glimmer of hope.'
+				'"<<$npc_firstname[$boy]>>! And yours?" he asks you confidently, seeing a glimmer of hope.'
 				'"<<$pcs_nickname>>." you answer.'
-				'"Just as I expected a beautiful name for a beautiful girl..." <<$boydesc>> quickly replies.'
+				'"Just as I expected a beautiful name for a beautiful girl..." <<$npc_firstname[$boy]>> quickly replies.'
 				!!Go on date, same answer no matter what time of day or weather
 				act 'Decline':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
-					'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t think I had a chance but you can''t blame me for trying."'
+					'<<$npc_firstname[$boy]>> looks at you disappointed. "Oh well, I didn''t think I had a chance but you can''t blame me for trying."'
 					'The two of you say goodbye to each other.'
 					act 'Continue': gt $loc, $loc_arg
 				end
 				act 'Look at him in disgust':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"I''m sorry, it''s good that you have all this confidence, but I''m way out of your league. There''s no way I would be caught seen out with you."'
 					'"What did you say, you little..." you''re not able to hear the rest as you walk away...'
 					act 'Continue': gt $loc, $loc_arg
 				end
 				act 'Agree to a date':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"Stop, you''re making me blush again. Sure, sounds like fun, I would love to."'
-					'"Great!" answers <<$boydesc>> "So, what do you want to do gorgeous?".'
+					'"Great!" answers <<$npc_firstname[$boy]>> "So, what do you want to do gorgeous?".'
 					gs 'dateM', 'date_choice'
 				end
 				act 'I would love to but can''t right now':
 					*clr & cla
 					gs 'boyfrend', 'start'
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
-					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to his contact list.'
+					'"I say that''s a great idea. I''ll be in touch." <<$npc_firstname[$boy]>> adds your number to his contact list.'
 					'"You better be." you say teasingly.'
 					act 'Continue': gt $loc, $loc_arg
 				end
 			end
 			act'How about we fuck?':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 				'"How about a fuck for the road instead?"'
 				'"Excuse me?" It''s his turn to look surprised now.'
 				'"You, me, your place, we have sex right now. How about it?"'
 				'"Fuck yeah," he grins. You let him grab you by the arm and tow you off towards a nearby apartment complex.'
-				if $region = 'city_center' or $region = 'city_residential' or $region = 'city_industrial' or $region = 'city_island' or $region = 'city_lake' or $region = 'city_park':
+				if $region = 'city_center' or $region = 'city' or $region = 'city' or $region = 'city_island' or $region = 'city_lake' or $region = 'city_park':
 					gs 'fame', 'city', 'sex', 2
-				elseif $region = 'pav_commercial' or $region = 'pav_park' or $region = 'pav_residential':
+				elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 					gs 'fame', 'pav', 'sex', 2
 				end
-				gs 'npcpreservec', $npclastgenerated
-				act 'Go to his place':gt 'hookup', 'start'
+				act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
 			end
 		end
 	end
@@ -323,9 +328,9 @@ end
 
 if $args[0] = 'decline':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 	'"I''m sorry but I don''t feel us clicking so I''ll have to decline."'
-	'<<$boydesc>> looks at you disappointed then shrugs. "Well can''t blame a guy for trying right."'
+	'<<$npc_firstname[$boy]>> looks at you disappointed then shrugs. "Well can''t blame a guy for trying right."'
 	'The two of you say goodbye to each other.'
 	act 'Continue': gt $loc, $loc_arg
 	!!this goes back to what ever street it started on
@@ -355,7 +360,7 @@ if $ARGS[0] = 'datepark':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_'+ rand(1,2) +'.jpg"></center>'
 	'"Since it''s such a beautiful day today, let''s go for a walk in the park." you suggest.'
-	'"Sounds great. Lets go." <<$boydesc>> walks with you towards the park.'
+	'"Sounds great. Lets go." <<$npc_firstname[$boy]>> walks with you towards the park.'
 	'The two of you walk in the park for a while causally talking, getting knowing each other. After a while he suggests sitting down.'
 	!!Jump to park 
 	act 'Watch people':
@@ -363,30 +368,30 @@ if $ARGS[0] = 'datepark':
 		minut += 45
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/parkwatch.jpg"></center>'
-		'The two of you sit down and begin commenting on the people walking by. You laugh while <<$boydesc>> makes up stories about their backgrounds and quirks.'
-		'There are a few times you almost get caught as you point and laugh. As you''re sitting down an ice cream pushcart appears, generating quite a buzz around it. <<$boydesc>> asks you, "I sure could go for some ice cream. Would you also like some ice cream?"'
+		'The two of you sit down and begin commenting on the people walking by. You laugh while <<$npc_firstname[$boy]>> makes up stories about their backgrounds and quirks.'
+		'There are a few times you almost get caught as you point and laugh. As you''re sitting down an ice cream pushcart appears, generating quite a buzz around it. <<$npc_firstname[$boy]>> asks you, "I sure could go for some ice cream. Would you also like some ice cream?"'
 		act 'Yeah':
 			*clr & cla
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/date/parkice.jpg"></center>'
-			'<<$boydesc>> runs away to the pushcart and comes back with two ice creams. "Here you go, <<$pcs_nickname>> I hope you''ll enjoy it."'
-			'You nod and thank him. The two of you continue talking while eating the ice cream. As you finish <<$boydesc>> asks, "Shall we move on?"'
+			'<<$npc_firstname[$boy]>> runs away to the pushcart and comes back with two ice creams. "Here you go, <<$pcs_nickname>> I hope you''ll enjoy it."'
+			'You nod and thank him. The two of you continue talking while eating the ice cream. As you finish <<$npc_firstname[$boy]>> asks, "Shall we move on?"'
 			act 'Nod':
 				*clr & cla
 				minut += 15
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/date/parkholding.jpg"></center>'
 				'As you continue walking the two of you begin holding hands. You''re really enjoying yourself by now everything is going really well.'
-				'You don''t even notice that the two of you strayed off the beaten path, all of a sudden <<$boydesc>> stops and whispers in your ear, "Now that we''re at a secluded spot, you know what would make this date even better?"'
+				'You don''t even notice that the two of you strayed off the beaten path, all of a sudden <<$npc_firstname[$boy]>> stops and whispers in your ear, "Now that we''re at a secluded spot, you know what would make this date even better?"'
 				act 'What?':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/shared/date/parklean.jpg"></center>'
-					'Before you''re even able to respond <<$boydesc>> leans in and kisses you on the lips.'
+					'Before you''re even able to respond <<$npc_firstname[$boy]>> leans in and kisses you on the lips.'
 					act 'Make out':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/shared/date/parkmake.jpg"></center>'
-						'Feeling frisky you kiss <<$boydesc>> back. Not before long the two of you are having a make out session, french kissing each other.'
+						'Feeling frisky you kiss <<$npc_firstname[$boy]>> back. Not before long the two of you are having a make out session, french kissing each other.'
 						'You feel yourself getting more and more aroused, maybe you should stop before the situation escalates too much...'
 						gs 'arousal', 'kiss', 3, 'exhibitionism'
 						gs 'stat'
@@ -403,17 +408,17 @@ if $ARGS[0] = 'datepark':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/shared/date/parkkiss.jpg"></center>'
 							'You decide to ignore the little voice in your back head and continue on the make out session.'
-							'<<$boydesc>> pulls you in closer and slowly begins rubbing your wet slit through your clothes. You let out a soft whimper as he''s touching you.'
+							'<<$npc_firstname[$boy]>> pulls you in closer and slowly begins rubbing your wet slit through your clothes. You let out a soft whimper as he''s touching you.'
 							gs 'arousal', 'kiss', 4, 'exhibitionism'
 							gs 'stat'
-							'As you''re pressed against <<$boydesc>> you feel his bulge through his pants. The two of you quickly remove your clothes, playing with each other''s sensitive parts.'
+							'As you''re pressed against <<$npc_firstname[$boy]>> you feel his bulge through his pants. The two of you quickly remove your clothes, playing with each other''s sensitive parts.'
 							act 'On your knees':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/shared/date/parkhj.jpg"></center>'
 								'You give him a lustful smirk and get down on your knees. You quickly unbutton his pants and let his semi-grown cock hang loose.'
 								'Looking at it you say, "Let me help you get ready for what''s to come." as you grab it with your hand and start jerking him off.'
-								'<<$boydesc>> lets out a groan and you feel his cock growing bigger and bigger. After a minute or so his cock is pulsating and you''re ready to move on.'
-								'You keep teasing him on as you lick his penis head and penis shaft. <<$boydesc>>''s cock twitches as you keep licking him.'
+								'<<$npc_firstname[$boy]>> lets out a groan and you feel his cock growing bigger and bigger. After a minute or so his cock is pulsating and you''re ready to move on.'
+								'You keep teasing him on as you lick his penis head and penis shaft. <<$npc_firstname[$boy]>>''s cock twitches as you keep licking him.'
 								gs 'arousal', 'hj', 4, 'exhibitionism'
 								gs 'arousal', 'bj', 4, 'exhibitionism'
 								gs 'stat'
@@ -428,20 +433,20 @@ if $ARGS[0] = 'datepark':
 									act 'Doggy':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/shared/date/parkdoggy.jpg"></center>'
-										'You''re already wet and ready for him as you spread your legs as he bends down. <<$boydesc>> slowly runs his shaft along your wet pussy teasing you right back as a payback for before.'
-										'You let out a sigh as he slowly enters you. Holding your waist, <<$boydesc>> slowly increases his pace. It doesn''t take long for him to be at full pace. You feel great as his strong member alternately fills and pleasantly stretches your pussy.'
+										'You''re already wet and ready for him as you spread your legs as he bends down. <<$npc_firstname[$boy]>> slowly runs his shaft along your wet pussy teasing you right back as a payback for before.'
+										'You let out a sigh as he slowly enters you. Holding your waist, <<$npc_firstname[$boy]>> slowly increases his pace. It doesn''t take long for him to be at full pace. You feel great as his strong member alternately fills and pleasantly stretches your pussy.'
 										$orgasm_or = 'custom'
-										$orgasm_txt = 'Suddenly, <<$boydesc>> pounds you at just the right pace and your whole body starts to shiver in orgasm. The intensity of the orgasm nearly makes you scream, but you bite down on your lip and do your best to stifle down the moans so no one hears you.'
+										$orgasm_txt = 'Suddenly, <<$npc_firstname[$boy]>> pounds you at just the right pace and your whole body starts to shiver in orgasm. The intensity of the orgasm nearly makes you scream, but you bite down on your lip and do your best to stifle down the moans so no one hears you.'
 										gs 'arousal', 'vaginal', 6, 'exhibitionism'
 										gs 'stat'
-										'Even <<$boydesc>> is groaning and grimacing badly by now ready to cum.'
+										'Even <<$npc_firstname[$boy]>> is groaning and grimacing badly by now ready to cum.'
 										act 'Finish':
 											*clr & cla
 											minut += 10
 											gs 'cum_call', 'labia', $boydesc
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/shared/date/parkfinish.jpg"></center>'
-											'<<$boydesc>> can''t contain himself anymore, he''s loudly groaning and as soon he pulls out of you he cums coating your pussy lips.'
+											'<<$npc_firstname[$boy]>> can''t contain himself anymore, he''s loudly groaning and as soon he pulls out of you he cums coating your pussy lips.'
 											'Both of you fall down to the ground, breathing heavily, trying to come to your senses. After a while you into his eyes and start laughing.'
 											'"That was great <<$pcs_nickname>>. We''ll have to do this again." You get up and clean yourself, straightening out your clothes the best you can. "Shall we head back?" you ask.'
 											act 'Walk back':gt 'dateM', 'walk_back'
@@ -457,7 +462,7 @@ if $ARGS[0] = 'datepark':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/shared/date/parkback.jpg"></center>'
 						'At first you are surprised by the kiss and return it but quickly you pull back as you push him away. "Stop, I''m enjoying the date but I''m not that kind of girl if you thought otherwise."'
-						'He shakes his head. "No, not at all. I''m not going to make you do something you don''t want." <<$boydesc>> answers.'
+						'He shakes his head. "No, not at all. I''m not going to make you do something you don''t want." <<$npc_firstname[$boy]>> answers.'
 						act 'Walk back':gt 'dateM', 'walk_back'
 					end
 				end
@@ -472,12 +477,12 @@ if $ARGS[0] = 'walk_back':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/parkholding.jpg"></center>'
 	'As you finish up the two still holding hands walk all the way back to the park entrance. You stand there for a while feeling that awkward silence creeping up as neither of you know how to end the date.'
-	'"I''ve had a great time." you say smiling. "Yeah, me too..." <<$boydesc>> says quietly. "Could I get your number so I can call you?"'
+	'"I''ve had a great time." you say smiling. "Yeah, me too..." <<$npc_firstname[$boy]>> says quietly. "Could I get your number so I can call you?"'
 	act 'Sure':
 		*clr & cla
 		gs 'boyfrend', 'start'
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/givenumber.jpg"></center>'
-		'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
+		'You give <<$npc_firstname[$boy]>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
 		'You end the date by him giving you a kiss on the cheek.'
 		act 'Leave':gt $loc, $loc_arg
 	end
@@ -486,7 +491,7 @@ if $ARGS[0] = 'walk_back':
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/datereject.jpg"></center>'
 		'"I''ve really enjoyed the date but I''m sorry I can''t give you my number..."'
 		'"But why, I thought..." Before he continues you stop him telling him that you''re sorry once again but that it won''t work out between the two of you.'
-		'<<$boydesc>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll meet you once again."'
+		'<<$npc_firstname[$boy]>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll meet you once again."'
 		act 'Leave':gt $loc, $loc_arg
 	end
 end
@@ -501,7 +506,7 @@ if $ARGS[0] = 'datecinema':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
-	'"How about we go and see a movie?" you ask <<$boydesc>>'
+	'"How about we go and see a movie?" you ask <<$npc_firstname[$boy]>>'
 	'"Sounds like a great idea. There''s a movie theater nearby."'
 	'You arrive at the movie theater and look at the display showing what movies are playing right now.'
 	act 'Decide on a movie':
@@ -509,7 +514,7 @@ if $ARGS[0] = 'datecinema':
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/theater/cinema.jpg"></center>'
-		'"How about this one?" <<$boydesc>> points at a movie.'
+		'"How about this one?" <<$npc_firstname[$boy]>> points at a movie.'
 		'You shake your head, "No, I''m not in the mood for that. How about this one?" you point at a comedy.'
 		'"Perfect, I love comedies." he comments.'
 		act 'Buy tickets':
@@ -517,8 +522,8 @@ if $ARGS[0] = 'datecinema':
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/cinema/theaterbuy.jpg"></center>'
-			'You and <<$boydesc>> stand in line waiting to approach the box office.'
-			'As you''ve bought the tickets, <<$boydesc>> asks, "Would you like something from the concession stand?"'
+			'You and <<$npc_firstname[$boy]>> stand in line waiting to approach the box office.'
+			'As you''ve bought the tickets, <<$npc_firstname[$boy]>> asks, "Would you like something from the concession stand?"'
 			'"Yeah, I would love some popcorn!" you answer excitingly.'
 			'He smiles and walks over to the concession stand, returning with a big popcorn tub, handing it over to you.'
 			'You shine up immediately, thanking him for buying it for you.'
@@ -534,9 +539,9 @@ if $ARGS[0] = 'datecinema':
 					*clr & cla
 					minut += 15
 					'<center><img <<$set_imgh>> src="images/locations/shared/cinema/kino_'+ rand(1,3) +'.jpg"></center>'
-					'As you''re about to grab some popcorn from the tub, <<$boydesc>> unknowingly goes to grab some popcorn too, touching your hand.'
+					'As you''re about to grab some popcorn from the tub, <<$npc_firstname[$boy]>> unknowingly goes to grab some popcorn too, touching your hand.'
 					'He''s startled as he didn''t expect your hand to be there either. You acknowledge his touch by teasingly whispering, "Are you trying to make a move on me?"'
-					'<<$boydesc>> nervously smiles at you. "Sorry it wasn''t my intentions to make you feel uncomfortable."'
+					'<<$npc_firstname[$boy]>> nervously smiles at you. "Sorry it wasn''t my intentions to make you feel uncomfortable."'
 					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Tease him (<<will_cost>> Willpower)':
@@ -546,22 +551,22 @@ if $ARGS[0] = 'datecinema':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/shared/date/theatertease.jpg"></center>'
 							'Feeling frisky and not wanting to let go of the opportunity you tell him, "Come on, no need to get so defensive. Let me show you a thing."'
-							'You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<$boydesc>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.'
+							'You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<$npc_firstname[$boy]>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.'
 							'"Let me show you a great time." you slyly tell him. "Just relax and enjoy yourself."'
 							act 'Get on your knees':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/shared/date/theaterbj.jpg"></center>'
-								'You go down on your knees removing your shirt and bra showing your body to <<$boydesc>>. You begin playing with his rock hard penis through the pants.'
-								'<<$boydesc>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.'
-								'You unbutton his pants and pull down his briefs. The rock hard cock pops out while you look at <<$boydesc>> smiling. "Keep quiet now we don''t want to get caught."'
-								'You grab <<$boydesc>> by the shaft and your lips embrace the top of his cock. After a while you pick up the pace moving the head up and down while <<$boydesc>> is trying his best to keep quiet.'
+								'You go down on your knees removing your shirt and bra showing your body to <<$npc_firstname[$boy]>>. You begin playing with his rock hard penis through the pants.'
+								'<<$npc_firstname[$boy]>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.'
+								'You unbutton his pants and pull down his briefs. The rock hard cock pops out while you look at <<$npc_firstname[$boy]>> smiling. "Keep quiet now we don''t want to get caught."'
+								'You grab <<$npc_firstname[$boy]>> by the shaft and your lips embrace the top of his cock. After a while you pick up the pace moving the head up and down while <<$npc_firstname[$boy]>> is trying his best to keep quiet.'
 								gs 'arousal', 'bj', 5, 'dom', 'exhibitionism'
 								gs 'stat'
 								act 'Lay down on the seat':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/shared/date/theatercuni.jpg"></center>'
 									'After a few minutes you stop and get up, lean into him telling him that it''s his turn to impress you.'
-									'You lay down on the empty seats next to you and spread your legs. <<$boydesc>> by now very aroused dives in and begins playing with your wet clit.'
+									'You lay down on the empty seats next to you and spread your legs. <<$npc_firstname[$boy]>> by now very aroused dives in and begins playing with your wet clit.'
 									'His tongue does wonders to your clit and there are a few times you can''t contain yourself just wanting to scream out loud in pleasure.'
 									gs 'arousal', 'cuni', 5, 'dom', 'exhibitionism'
 									gs 'stat'
@@ -569,8 +574,8 @@ if $ARGS[0] = 'datecinema':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/shared/date/theatercow.jpg"></center>'
 										'He stops to let you rest just as you''re nearing the orgasm, feeling irritated you decide to get even.'
-										'You make <<$boydesc>> sit down again and plant yourself on top of his cock, letting out a quiet whimper as you don''t want the guy in front of you to find out what the two of you are doing.'
-										'As you control the pace you switch it up multiple times bouncing up and down as you see this as a payback for not letting you orgasm before. <<$boydesc>> is clearly having some trouble holding himself as his cock is growing inside you.'
+										'You make <<$npc_firstname[$boy]>> sit down again and plant yourself on top of his cock, letting out a quiet whimper as you don''t want the guy in front of you to find out what the two of you are doing.'
+										'As you control the pace you switch it up multiple times bouncing up and down as you see this as a payback for not letting you orgasm before. <<$npc_firstname[$boy]>> is clearly having some trouble holding himself as his cock is growing inside you.'
 										gs 'arousal', 'vaginal', 5, 'dom', 'exhibitionism'
 										gs 'stat'
 										act 'Back to laying down':
@@ -578,8 +583,8 @@ if $ARGS[0] = 'datecinema':
 											gs 'cum_call', 'stomach', $boydesc
 											gs 'cum_call', 'breasts', $boydesc
 											'<center><img <<$set_imgh>> src="images/locations/shared/date/theatervag.jpg"></center>'
-											'By now <<$boydesc>> is almost drained and the smallest touch would make him cum. You decide to give him a breather as you once again lay down spreading your legs once again while your pussy juice drips all over the seat.'
-											'As soon as <<$boydesc>> enters you he''s already heavily panting. You whisper angrily to him "Don''t you dare cum yet. I''m still not pleased." <<$boydesc>> does his best and keeps thrusting for a minute or two not being able to hold on anymore.'
+											'By now <<$npc_firstname[$boy]>> is almost drained and the smallest touch would make him cum. You decide to give him a breather as you once again lay down spreading your legs once again while your pussy juice drips all over the seat.'
+											'As soon as <<$npc_firstname[$boy]>> enters you he''s already heavily panting. You whisper angrily to him "Don''t you dare cum yet. I''m still not pleased." <<$npc_firstname[$boy]>> does his best and keeps thrusting for a minute or two not being able to hold on anymore.'
 											gs 'arousal', 'vaginal', 5, 'dom', 'exhibitionism'
 											gs 'stat'
 											'He starts groaning pulling out his cock out of you and shoots the load all over you. His warm spunk hits your stomach and breast as he jerks out the last drips. You take your finger and swipe a small sample off your stomach putting it in your mouth. It tastes great.'
@@ -588,17 +593,17 @@ if $ARGS[0] = 'datecinema':
 												minut += 10
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/shared/date/theatercaught.jpg"></center>'
-												'While the two of you are returning to your senses all of a sudden someone flashes a light at you. It''s the usher... You''re totally caught as you''re still laying down naked with <<$boydesc>> cum splattered all over you.'
-												'"What the hell are you two doing!" the usher yells. The guy that sat in front of you stands up noticing you laying naked quickly picks up the phone and tries taking some pictures. <<$boydesc>> pulls up his pants and gets dressed, leaving you all naked to fend for yourself.'
+												'While the two of you are returning to your senses all of a sudden someone flashes a light at you. It''s the usher... You''re totally caught as you''re still laying down naked with <<$npc_firstname[$boy]>> cum splattered all over you.'
+												'"What the hell are you two doing!" the usher yells. The guy that sat in front of you stands up noticing you laying naked quickly picks up the phone and tries taking some pictures. <<$npc_firstname[$boy]>> pulls up his pants and gets dressed, leaving you all naked to fend for yourself.'
 												'"Kids these days. It''s the third time I catch couples doing this shit this week. Pick up your stuff and get the hell out of here, you''re lucky I don''t have the time to call the cops."'
-												'You''re blemishing red as you quickly get dressed, grabbing your stuff, running out of the theater. You can hear some of the other people commenting on the situation as you walk past them. <<$boydesc>> is walking besides you and also has his head down looking at the ground as ashamed as you.'
+												'You''re blemishing red as you quickly get dressed, grabbing your stuff, running out of the theater. You can hear some of the other people commenting on the situation as you walk past them. <<$npc_firstname[$boy]>> is walking besides you and also has his head down looking at the ground as ashamed as you.'
 												act 'Outside':
 													*clr & cla
 													$location_type = 'public_outdoors'
 													minut += 5
 													gs 'stat'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
-													'"Wow, that''s never happened to me before." <<$boydesc>> tells you.'
+													'"Wow, that''s never happened to me before." <<$npc_firstname[$boy]>> tells you.'
 													'"I only regret us getting caught. If we''ve only been able to keep quiet. Nothing do anything about that now." you say smiling.'
 													'"I guess I should ask for your for your number now that we''ve got to know each other really well?"'
 													act 'Sure': gt 'dateM', 'cinema_sure'
@@ -618,7 +623,7 @@ if $ARGS[0] = 'datecinema':
 						minut += 45
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/shared/cinema/kino_'+ rand(1,3) +'.jpg"></center>'
-						'After a while <<$boydesc>> leans towards you and whispers if you''re enjoying yourself.'
+						'After a while <<$npc_firstname[$boy]>> leans towards you and whispers if you''re enjoying yourself.'
 						'You turn to him nodding, as you''re nodding he leans in once again and gives you a kiss. The two of you hold hands for the rest of the movie.'
 						act 'Outside':
 							*clr & cla
@@ -626,7 +631,7 @@ if $ARGS[0] = 'datecinema':
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
-							'The movie finishes and the lights get turned on. You and <<$boydesc>> walk outside where you talk about how funny the movie was.'
+							'The movie finishes and the lights get turned on. You and <<$npc_firstname[$boy]>> walk outside where you talk about how funny the movie was.'
 							'"I enjoyed the kissing part more." you say to him. He blushes a bit as you compliment him.'
 							'"Glad to hear that. I guess then I''m not coming on to strong asking you for your number?"'
 							act 'Sure': gt 'dateM', 'cinema_sure'
@@ -643,7 +648,7 @@ if $ARGS[0] = 'cinema_sure':
 	*clr & cla
 	gs 'boyfrend', 'start'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/givenumber.jpg"></center>'
-	'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
+	'You give <<$npc_firstname[$boy]>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
 	'You end the date by him giving you a kiss on the cheek.'
 	act 'Leave':gt $loc, $loc_arg
 end
@@ -653,7 +658,7 @@ if $ARGS[0] = 'cinema_sorry':
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/datereject.jpg"></center>'
 	'"I''ve really enjoyed the date but I''m sorry I can''t give you my number..."'
 	'"But why, I thought..." Before he continues you stop him telling him that you''re sorry once again but that it won''t work out between the two of you.'
-	'<<$boydesc>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll meet you once again."'
+	'<<$npc_firstname[$boy]>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll meet you once again."'
 	act 'Leave':gt $loc, $loc_arg
 end
 
@@ -668,7 +673,7 @@ if $ARGS[0] = 'datecafe':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafe.jpg"></center>'
-	'"How about a coffee?" you ask <<$boydesc>>.'
+	'"How about a coffee?" you ask <<$npc_firstname[$boy]>>.'
 	'"Great idea <<$pcs_nickname>> I know a great place."'
 	'The two of you enter the café and find a secluded spot where you can be left alone.'
 	act 'Interact':
@@ -676,8 +681,8 @@ if $ARGS[0] = 'datecafe':
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/cafetalk.jpg"></center>'
-		'"This is a nice spot. So tell me about yourself <<$pcs_nickname>>?" <<$boydesc>> asks as soon as you sit down.'
-		'You tell him a little about your family, where you''re from and the likes. All while <<$boydesc>> carefully listens to your every word just like he''s analyzing you in his head.'
+		'"This is a nice spot. So tell me about yourself <<$pcs_nickname>>?" <<$npc_firstname[$boy]>> asks as soon as you sit down.'
+		'You tell him a little about your family, where you''re from and the likes. All while <<$npc_firstname[$boy]>> carefully listens to your every word just like he''s analyzing you in his head.'
 		'The conversation takes a deeper meaning as he keeps probing you with more serious questions about you.'
 		act 'Order':
 			*clr & cla
@@ -685,8 +690,8 @@ if $ARGS[0] = 'datecafe':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/date/cafewaitress.jpg"></center>'
 			'As you prepare yourself to answer another one of his questions the waitress comes over, asking nervously if you''re ready to order. "Poor girl..." you think "she''s probably just started working here."'
-			'She scribbles down your order, as she re-reads the order, she manages to stammer through your order but when it comes to <<$boydesc>> she messes up.'
-			'"What is wrong with you? Can''t you write down a simple order?" <<$boydesc>> reacts.'
+			'She scribbles down your order, as she re-reads the order, she manages to stammer through your order but when it comes to <<$npc_firstname[$boy]>> she messes up.'
+			'"What is wrong with you? Can''t you write down a simple order?" <<$npc_firstname[$boy]>> reacts.'
 			'You sit there looking in shock wondering what you should do...'
 			gs 'willpower', 'misc', 'self'
 			if will_cost <= pcs_willpwr:
@@ -698,8 +703,8 @@ if $ARGS[0] = 'datecafe':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/shared/date/cafereact.jpg"></center>'
 					'The poor waitress returns after a while with your order. You look at her with an apologetic look.'
-					'"Hope everything is in order." <<$boydesc>> says. Feeling a bit irritated you kick him under the table, while thanking her.'
-					'<<$boydesc>> looks at you in dispair, "What? Did I do anything wrong?"'
+					'"Hope everything is in order." <<$npc_firstname[$boy]>> says. Feeling a bit irritated you kick him under the table, while thanking her.'
+					'<<$npc_firstname[$boy]>> looks at you in dispair, "What? Did I do anything wrong?"'
 					'"Well, first off, you don''t need to be a jerk to the waitress." you angrily tell him.'
 					'"I''m sorry but I''m just really nervous being on a date with you so I acted out." You can see that he''s remorseful but you still don''t want to carry on a conversation with him.'
 					act 'Continue date':gt 'dateM', 'cafepeople'
@@ -714,9 +719,9 @@ if $ARGS[0] = 'datecafe':
 					gs 'willpower', 'pay', 'self'
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/shared/date/cafetelloff.jpg"></center>'
-					'Not liking the way <<$boydesc>> treated the waitress you go on the attack against <<$boydesc>>. You''re appalled by how he behaves. With such poor first-impression you decide you don''t ever want to see this bottom-feeder again.'
+					'Not liking the way <<$npc_firstname[$boy]>> treated the waitress you go on the attack against <<$npc_firstname[$boy]>>. You''re appalled by how he behaves. With such poor first-impression you decide you don''t ever want to see this bottom-feeder again.'
 					'"You should really learn some manners. To treat a human being like that is despicable. You should be ashamed of yourself."'
-					'<<$boydesc>> looks at you in fear as he wasn''t expecting you to react like that.'
+					'<<$npc_firstname[$boy]>> looks at you in fear as he wasn''t expecting you to react like that.'
 					'"Nothing to say? No need to, I''m done. Enjoy the date alone you loser." You quickly get up and walk out of the café.'
 					act 'Rush out':gt $loc, $loc_arg
 				end
@@ -729,8 +734,8 @@ if $ARGS[0] = 'datecafe':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/date/cafequiet.jpg"></center>'
 				'The poor waitress returns after a while with your order. You look at her with an apologetic look.'
-				'"Hope everything is in order." <<$boydesc>> says. You''re not confident enough commenting on how an unknown person is behaving so you keep your mouth shut.'
-				'<<$boydesc>> looks at with confidence, "What? She had it coming. I get irritated by weak people."'
+				'"Hope everything is in order." <<$npc_firstname[$boy]>> says. You''re not confident enough commenting on how an unknown person is behaving so you keep your mouth shut.'
+				'<<$npc_firstname[$boy]>> looks at with confidence, "What? She had it coming. I get irritated by weak people."'
 				'You nod in agreement not wanting egging him on.'
 				act 'Continue date':gt 'dateM', 'cafepeople'
 			end
@@ -741,8 +746,8 @@ if $ARGS[0] = 'datecafe':
 				'<center><img <<$set_imgh>> src="images/locations/shared/date/cafemad.jpg"></center>'
 				'"Yeah, I can''t believe this place hired someone this bad."'
 				'The waitress returns after a while with your order. You look at her angrily.'
-				'"Hope everything is in order." <<$boydesc>> says. "Yeah, it would be a shame if we needed to talk with the manager." you sourly tell her.'
-				'The waitress asks for forgiveness once again before going away. <<$boydesc>> looks at you impressed, "I must say, the way you handled her was perfect. I''m getting so turned on."'
+				'"Hope everything is in order." <<$npc_firstname[$boy]>> says. "Yeah, it would be a shame if we needed to talk with the manager." you sourly tell her.'
+				'The waitress asks for forgiveness once again before going away. <<$npc_firstname[$boy]>> looks at you impressed, "I must say, the way you handled her was perfect. I''m getting so turned on."'
 				'"Thanks, one should not be accepting bad service no matter who you are."'
 				act 'Continue date':gt 'dateM', 'cafepeople'
 			end
@@ -755,7 +760,7 @@ if $ARGS[0] = 'cafepeople':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafewatching.jpg"></center>'
-	'The two of you sit there awkwardly in silence for a while when all of a sudden both of you react to a man sitting a bit further away. You begin laughing while <<$boydesc>> makes up stories about his background and quirks.'
+	'The two of you sit there awkwardly in silence for a while when all of a sudden both of you react to a man sitting a bit further away. You begin laughing while <<$npc_firstname[$boy]>> makes up stories about his background and quirks.'
 	'There are a few times you almost get caught by the man as you point and laugh.'
 	act 'Finish the date':gt 'dateM', 'cafeend'
 end
@@ -765,13 +770,13 @@ if $ARGS[0] = 'cafeend':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafefinish.jpg"></center>'
-	'After a while you end observing the man and tell <<$boydesc>>, "Well, thanks for the coffee but I should be on my way."'
-	'"I had a great time, you''re really fun to hang out with." <<$boydesc>> tells you. "Could I get your number?"'
+	'After a while you end observing the man and tell <<$npc_firstname[$boy]>>, "Well, thanks for the coffee but I should be on my way."'
+	'"I had a great time, you''re really fun to hang out with." <<$npc_firstname[$boy]>> tells you. "Could I get your number?"'
 	act 'Sure':
 		*clr & cla
 		gs 'boyfrend', 'start'
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/givenumber.jpg"></center>'
-		'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
+		'You give <<$npc_firstname[$boy]>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
 		'You end the date by him giving you a kiss on the cheek.'
 		act 'Leave':gt $loc, $loc_arg
 	end
@@ -780,7 +785,7 @@ if $ARGS[0] = 'cafeend':
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/datereject.jpg"></center>'
 		'"I''ve really enjoyed the date but I''m not impressed by your first-impression, you were too harsh to that waitress..."'
 		'"But why, I thought..." Before he continues you stop him telling him that you''re sorry once again but that it won''t work out between the two of you.'
-		'<<$boydesc>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll meet you once again."'
+		'<<$npc_firstname[$boy]>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll meet you once again."'
 		act 'Leave':gt $loc, $loc_arg
 	end
 end
@@ -795,18 +800,18 @@ if $ARGS[0] = 'datebar':
 	minut += 20
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/barinside.jpg"></center>'
-	'"How about going to a bar?" you ask <<$boydesc>>.'
+	'"How about going to a bar?" you ask <<$npc_firstname[$boy]>>.'
 	'"Great idea <<$pcs_nickname>> I know a great bar with great drinks and lightning."'
 	'The two of you enter this buzzing hip bar and find a spot where you have a great overview over the place.'
 	act 'Order':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/bardrink1.jpg"></center>'
-		'As you sit down <<$boydesc>> asks you, "Would you like to drink something?"'
+		'As you sit down <<$npc_firstname[$boy]>> asks you, "Would you like to drink something?"'
 		act 'I''ll have a beer, thanks':
 			*clr & cla
 			gs 'drugs', 'alcohol', 'beer'
 			'<center><img <<$set_imgh>> src="images/locations/shared/date/barorder_'+ rand(1,2) +'.jpg"></center>'
-			'"My kind of girl." <<$boydesc>> tells you.'
+			'"My kind of girl." <<$npc_firstname[$boy]>> tells you.'
 			act 'Talk':gt 'dateM', 'bartalk'
 		end
 
@@ -814,7 +819,7 @@ if $ARGS[0] = 'datebar':
 			*clr & cla
 			gs 'drugs', 'alcohol', 'vodka'
 			'<center><img <<$set_imgh>> src="images/locations/shared/date/barorder_'+ rand(1,2) +'.jpg"></center>'
-			'"My kind of girl." <<$boydesc>> tells you.'
+			'"My kind of girl." <<$npc_firstname[$boy]>> tells you.'
 			act 'Talk':gt 'dateM', 'bartalk'
 		end
 	end
@@ -826,8 +831,8 @@ if $ARGS[0] = 'bartalk':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/barinside.jpg"></center>'
-	'<<$boydesc>> goes to the bar counter and after a while returns with the drinks.'
-	'"This place is packed." you say to <<$boydesc>>'
+	'<<$npc_firstname[$boy]>> goes to the bar counter and after a while returns with the drinks.'
+	'"This place is packed." you say to <<$npc_firstname[$boy]>>'
 	'"Yeah, it''s pretty cool, I think it''s the night when there is a band playing live here, so I guess that''s why it''s so packed."'
 	act 'Continue on':
 		*clr & cla
@@ -835,8 +840,8 @@ if $ARGS[0] = 'bartalk':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/barband.jpg"></center>'
 		'As you sit there talking to each other, the lights suddenly go dim and you hear a guitar riff playing.'
-		'The band steps out and starts playing. You''re amazed over how well they play and turn to <<$boydesc>> "They are pretty good don''t you think?"'
-		'<<$boydesc>> nods his head. "Yeah they are, do you want another drink?"'
+		'The band steps out and starts playing. You''re amazed over how well they play and turn to <<$npc_firstname[$boy]>> "They are pretty good don''t you think?"'
+		'<<$npc_firstname[$boy]>> nods his head. "Yeah they are, do you want another drink?"'
 		!!add to buzz
 		act 'Sure':
 			*clr & cla
@@ -846,7 +851,7 @@ if $ARGS[0] = 'bartalk':
 			'<center><img <<$set_imgh>> src="images/locations/shared/date/bardiscuss.jpg"></center>'
 			'"Are you trying to get me drunk?" you say winking towards him.'
 			'"No comments." he responds smiling.'
-			'"Well, I''m having a great time so why not." <<$boydesc>> goes over to the counter and returns with two new drinks.'
+			'"Well, I''m having a great time so why not." <<$npc_firstname[$boy]>> goes over to the counter and returns with two new drinks.'
 			if pcs_danc > 30:
 				act 'Dance':
 					*clr & cla
@@ -854,9 +859,9 @@ if $ARGS[0] = 'bartalk':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/shared/date/bardancing.jpg"></center>'
 					'Some time goes by and you''re not able to contain yourself anymore, you got to dance.'
-					'"Would you like to dance?" you ask <<$boydesc>>.'
+					'"Would you like to dance?" you ask <<$npc_firstname[$boy]>>.'
 					'He shakes his head. "I am no dancer, but you should if you want to dance." He says indicating you should get out on the dance floor yourself.'
-					'You get up from the chair and walk up near the stage and begin moving sensually, teasing <<$boydesc>>.'
+					'You get up from the chair and walk up near the stage and begin moving sensually, teasing <<$npc_firstname[$boy]>>.'
 					act 'Return to your date':
 						*clr & cla
 						minut += 15
@@ -874,12 +879,12 @@ if $ARGS[0] = 'bartalk':
 							'<center><img <<$set_imgh>> src="images/locations/shared/date/barrestroom.jpg"></center>'
 							'You excuse yourself by saying you need to visit the restroom. You walk off and lock the door behind you, looking in the mirror as everything begins to spin.'
 							'You don''t know how long you''ve been in the restroom but all of a sudden you hear a knock on the door, "Are you alright? You''ve been in there for a while now."'
-							'Recognizing <<$boydesc>> voice, you come to your senses and open the door, quickly pulling him in.'
+							'Recognizing <<$npc_firstname[$boy]>> voice, you come to your senses and open the door, quickly pulling him in.'
 							'"What''s happening?" he asks as you lean into him and begin kissing him.'
 							act 'Make out':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/shared/date/barmakeout.jpg"></center>'
-								'<<$boydesc>> doesn''t seem to mind your brashness. He begins grabbing you all over your body, adding even more to your arousal.'
+								'<<$npc_firstname[$boy]>> doesn''t seem to mind your brashness. He begins grabbing you all over your body, adding even more to your arousal.'
 								'As you''re kissing you feel his fingers playing with your wet clit through the panties.'
 								'"Get down on your knees <<$pcs_nickname>>."'
 								gs 'arousal', 'foreplay', 2
@@ -892,7 +897,7 @@ if $ARGS[0] = 'bartalk':
 										gs 'arousal', 'end'
 										'<center><img <<$set_imgh>> src="images/locations/shared/date/barinside.jpg"></center>'
 										'You can''t get yourself to go through this. Excusing yourself you walk back to the table and sit down.'
-										'<<$boydesc>> arrives shortly after you to the table. The whole situation is too awkward now and you begin to blush as you''re really ashamed of your actions. You''re starting to panic a bit...'
+										'<<$npc_firstname[$boy]>> arrives shortly after you to the table. The whole situation is too awkward now and you begin to blush as you''re really ashamed of your actions. You''re starting to panic a bit...'
 										act 'Finish the date':gt 'dateM', 'barend'
 									end
 								else
@@ -903,29 +908,29 @@ if $ARGS[0] = 'bartalk':
 									'<center><img <<$set_imgh>> src="images/locations/shared/date/barbj.jpg"></center>'
 									'You''re too aroused to do anything else. You quickly drop down on your knees, grabbing hold of his pants, ripping them open.'
 									'His erect penis pops out and you can clearly see some pre-cum around the foreskin.'
-									'You devour his flaccid penis with your mouth, swallowing it whole with ease. <<$boydesc>> is all warmed up, his cock is twitching and he''s right at the edge as you stop, "Oh, no we''re not done yet."'
+									'You devour his flaccid penis with your mouth, swallowing it whole with ease. <<$npc_firstname[$boy]>> is all warmed up, his cock is twitching and he''s right at the edge as you stop, "Oh, no we''re not done yet."'
 									gs 'arousal', 'bj', 3, 'deepthroat'
 									gs 'stat'
 									act 'Stand up':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/shared/date/barfuck.jpg"></center>'
-										'You tell him to rest for a moment while you get ready. You pull down your panties exposing your wet cunt, you play with yourself as <<$boydesc>> catches his breath. "That''s enough rest." you tell him.'
+										'You tell him to rest for a moment while you get ready. You pull down your panties exposing your wet cunt, you play with yourself as <<$npc_firstname[$boy]>> catches his breath. "That''s enough rest." you tell him.'
 										'You have him stand behind you as you grab hold of the sink. "Come on, fuck me good." you tell him.'
-										'<<$boydesc>> grabs his cock and enters you. You moan as he begins thrusting. You feel your pussy walls getting stretched and it''s a great feeling. He''s picking up the pace and you feel his cock twitching once again.'
+										'<<$npc_firstname[$boy]>> grabs his cock and enters you. You moan as he begins thrusting. You feel your pussy walls getting stretched and it''s a great feeling. He''s picking up the pace and you feel his cock twitching once again.'
 										$orgasm_or = 'custom'
-										$orgasm_txt = 'Even though he''s edging <<$boydesc>> doesn''t slow down. He keeps on fucking you balls deep and you can''t hold on anymore. You begin loudly moaning, your pussy tensing with you orgasming all over his cock.'
+										$orgasm_txt = 'Even though he''s edging <<$npc_firstname[$boy]>> doesn''t slow down. He keeps on fucking you balls deep and you can''t hold on anymore. You begin loudly moaning, your pussy tensing with you orgasming all over his cock.'
 										gs 'arousal', 'vaginal', 3
 										gs 'arousal', 'end'
 										gs 'cum_call', '', $boydesc
 										gs 'stat'
-										'It doesn''t take long before <<$boydesc>> is panting heavily and just as you''re about to say not to cum inside you, you feel a warm stream shoot up deep inside of you.'
+										'It doesn''t take long before <<$npc_firstname[$boy]>> is panting heavily and just as you''re about to say not to cum inside you, you feel a warm stream shoot up deep inside of you.'
 										act 'Clean up':
 											*clr & cla
 											cumspclnt = 15
 											gs 'cum_cleanup'
 											'<center><img <<$set_imgh>> src="images/locations/shared/date/barcream.jpg"></center>'
 											'Your knees are still shaking as he finishes, you don''t even care that he has cum inside of you. You grab some toilet paper and begin wiping the cum dripping out of your pussy.'
-											'"That was great <<$pcs_nickname>>." <<$boydesc>> compliments you. "You were not bad yourself" you tell him.'
+											'"That was great <<$pcs_nickname>>." <<$npc_firstname[$boy]>> compliments you. "You were not bad yourself" you tell him.'
 											act 'Finish the date':gt 'dateM', 'barend'
 										end
 									end
@@ -940,7 +945,7 @@ if $ARGS[0] = 'bartalk':
 				minut += 20
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/date/bardiscuss_'+ rand(1,4) +'.jpg"></center>'
-				'You and <<$boydesc>> continue talking even if it''s hard to hear what he says at some times because of the loud music.'
+				'You and <<$npc_firstname[$boy]>> continue talking even if it''s hard to hear what he says at some times because of the loud music.'
 				'Mostly you talk about yours and his backgrounds and future plans.'
 				'You''re so into the conversation that you don''t even notice that the band left and that the bar is half empty.'
 				act 'Finish the date':gt 'dateM', 'barend'
@@ -954,13 +959,13 @@ if $ARGS[0] = 'barend':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/bardiscuss_'+ rand(1,4) +'.jpg"></center>'
-	'You tell <<$boydesc>>, "I''ve had a great time but we should be on our way."'
-	'"I had a great time, you''re really fun to hang out with." <<$boydesc>> tells you. "Could I get your number?"'
+	'You tell <<$npc_firstname[$boy]>>, "I''ve had a great time but we should be on our way."'
+	'"I had a great time, you''re really fun to hang out with." <<$npc_firstname[$boy]>> tells you. "Could I get your number?"'
 	act 'Sure':
 		*clr & cla
 		gs 'boyfrend', 'start'
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/givenumber.jpg"></center>'
-		'You give <<$boydesc>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
+		'You give <<$npc_firstname[$boy]>> your number. "Now I really hope you don''t forget to call me." you tell him. "Oh, don''t worry about that I''ll be in touch." he says.'
 		'You end the date by him giving you a kiss on the cheek.'
 		act 'Leave':gt $loc, $loc_arg
 	end
@@ -969,7 +974,7 @@ if $ARGS[0] = 'barend':
 		'<center><img <<$set_imgh>> src="images/locations/shared/date/barreject.jpg"></center>'
 		'"I''ve really enjoyed the date but I just can''t I''ve made a fool of myself..."'
 		'"No you didn''t, I understand..." Before he continues you stop him telling him that you''re sorry once again but you''re too ashamed to see him again.'
-		'<<$boydesc>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll meet you once again."'
+		'<<$npc_firstname[$boy]>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I''ll meet you once again."'
 		act 'Leave':gt $loc, $loc_arg
 	end
 end