\$boy[[:>:]] -> $sex.npcId

sugarcube/src/activities/abductionCustomer.tw

@@ -1023,7 +1023,7 @@
 	<</if>>
 	<<set $pc.pcs_ass += 1>>
 	<<set $cumnostd = 1>>
-	<<gs 'cum_call' 'anus' $boy>>
+	<<gs 'cum_call' 'anus' $sex.npcId>>
 	<<run $pc.sexStatInc('anal','aware',1)>>
 	<<if getvar("$buyout") == 1>>
 		<<actCLA 'Continue'>>

sugarcube/src/activities/bootycall/booty_call.tw

@@ -16,7 +16,7 @@
 		<!-- !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[$i]] or npc_booty_call[$FuckBuddy[$i]] = daystart) and npc_rel[$FuckBuddy[$i]] > 0 and npc_no_booty_call[$FuckBuddy[$i]] ! daystart and npc_big_fight[$FuckBuddy[$i]] < daystart - 7:-->
 		<!-- !!		temporary removal of npc_rel requirement until boy initiated breakups can occur-->
 		<!-- !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[$i]] or npc_booty_call[$FuckBuddy[$i]] = daystart) and npc_no_booty_call[$FuckBuddy[$i]] ! daystart and (npc_big_fight[$FuckBuddy[$i]] < daystart - 7 and daystart > 7):-->
-		<<if $npcs.get($boy,'booty_call_date') != $time.daystart and (rand(1,10) <= $npcs.get($FuckBuddy[$i,'sexdrive')] or $npcs.get($FuckBuddy[$i,'booty_call')] == daystart) and $npcs.get($FuckBuddy[$i,'no_booty_call')] != $time.daystart>>
+		<<if $npcs.get($sex.npcId,'booty_call_date') != $time.daystart and (rand(1,10) <= $npcs.get($FuckBuddy[$i,'sexdrive')] or $npcs.get($FuckBuddy[$i,'booty_call')] == daystart) and $npcs.get($FuckBuddy[$i,'no_booty_call')] != $time.daystart>>
 			<<gs 'booty_call' 'scheduler3'>>
 		<<else>>
 			<<setinit $npcs.get($FuckBuddy[$i,'no_booty_call')] = $time.daystart>>
@@ -37,7 +37,7 @@
 	<</if>>
 <</if>>
 <!-- !!	if npc_start_free_time[$FuckBuddy[$i]] = 0 or npc_day_off[$FuckBuddy[$i]] = 0 or npc_end_free_time[$FuckBuddy[$i]] = 0:-->
-<!-- !!		$boy = $FuckBuddy[$i]-->
+<!-- !!		$sex.npcId = $FuckBuddy[$i]-->
 <!-- !!	end-->
 <!-- !!		if ((rand(1,10) <= npc_sexdrive[$FuckBuddy[$i]] or npc_booty_call[$FuckBuddy[$i]] = daystart) and (rand(1,npc_rel[$FuckBuddy[$i]]) > 0)) and npc_no_booty_call[$FuckBuddy[$i]] ! daystart and npc_big_fight[$FuckBuddy[$i]] < daystart - 7:-->
 <!-- !!			elseif week < 6:-->
@@ -46,28 +46,28 @@
 <!-- !!				booty_call_time[$FuckBuddy[$i]] = 600 + rand(0,720)-->
 <<if $location_var[$here][0] == 'set_booty_call_date'>>
 	<<if getvar("$sex_ev['invite_today']") == 1>>
-		<<run $npcs.set($boy,'booty_call_date',$time.daystart)>>
+		<<run $npcs.set($sex.npcId,'booty_call_date',$time.daystart)>>
 	<<elseif getvar("$sex_ev['invite_tomorrow']") == 1>>
-		<<run $npcs.set($boy,'booty_call_date',$time.daystart + 1)>>
+		<<run $npcs.set($sex.npcId,'booty_call_date',$time.daystart + 1)>>
 	<</if>>
-	<<if $npcs.get($boy,'booty_call_time') == 0>>
-		<<run $npcs.set($boy,'booty_call_time',$npcs.get($boy,'start_free_time'))>>
+	<<if $npcs.get($sex.npcId,'booty_call_time') == 0>>
+		<<run $npcs.set($sex.npcId,'booty_call_time',$npcs.get($sex.npcId,'start_free_time'))>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'block_booty_calls'>>
 	<<if getvar("$sex_ev['invite_today']") == 1>>
-		<<run $npcs.set($boy,'booty_call_date',0)>>
-		<<run $npcs.set($boy,'no_booty_call',$time.daystart)>>
-		<<run $npcs.set($boy,'booty_call_time',0)>>
+		<<run $npcs.set($sex.npcId,'booty_call_date',0)>>
+		<<run $npcs.set($sex.npcId,'no_booty_call',$time.daystart)>>
+		<<run $npcs.set($sex.npcId,'booty_call_time',0)>>
 	<<elseif getvar("$sex_ev['invite_tomorrow']") == 1>>
-		<<run $npcs.set($boy,'no_booty_call',$time.daystart + 1)>>
+		<<run $npcs.set($sex.npcId,'no_booty_call',$time.daystart + 1)>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'SMS raiser'>>
 	<<set $i = 0>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :booty_call_sms_raiser_loop'>>
 	<<if $i < arrsize('$FuckBuddy')>>
-		<<if $booty_call_time[$FuckBuddy[$i]] < ((hour * 60) + minut) and $npcs.get($FuckBuddy[$i,'no_booty_call')] != $time.daystart and $npcs.get($boy,'last_booty_call') != $time.daystart>>
+		<<if $booty_call_time[$FuckBuddy[$i]] < ((hour * 60) + minut) and $npcs.get($FuckBuddy[$i,'no_booty_call')] != $time.daystart and $npcs.get($sex.npcId,'last_booty_call') != $time.daystart>>
 			<<gs 'booty_call_sms' 'start' $FuckBuddy[$i]>>
 			<<gs 'booty_call_sms' 'Add SMS' $FuckBuddy[$i]>>
 			<<setinit $booty_call_time[$FuckBuddy[$i]] = 2399>>
@@ -205,9 +205,9 @@
 	<</actCLA>>
 	<<actCLA 'I`m on my way'>>
 		<b><font color="pink">ill come right now ;)</font></b>
-		<<if $npcs.get($boy,'humor') <= 1>>
+		<<if $npcs.get($sex.npcId,'humor') <= 1>>
 				<b><font color="blue">my cock is waiting for you</font></b>
-		<<elseif $npcs.get($boy,'humor') == 2>>
+		<<elseif $npcs.get($sex.npcId,'humor') == 2>>
 			<!-- FAILED TO CONVERT
 				'	<b><font color="blue">in the street?</font></b>'
 			-----
@@ -229,7 +229,7 @@
 
 			-->
 			<<warn "CONVERSION ERROR 4689f1a404008ebfa5e2aea4add3efe7">>
-		<<elseif $npcs.get($boy,'humor') == 3>>
+		<<elseif $npcs.get($sex.npcId,'humor') == 3>>
 				<b><font color="blue">phrasing</font></b>
 		<</if>>
 		<!-- !! missing code-->

sugarcube/src/activities/bootycall/booty_call_favorite_part.tw

@@ -10,38 +10,38 @@
 			<<image "shared/sex/after/pillow_talk4.jpg">>
 			<<set $time.minutes += 1>>
 			<p>"Was it good for you?" you ask pleasantly.</p>
-			<<if $npcs.get($boy,'cum_pref') == 'creampie' and getvar("$booty_call['creampie_count']") > 0>>
+			<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie' and getvar("$booty_call['creampie_count']") > 0>>
 				<<gs 'booty_call_favorite_part' 'creampie_favorite'>>
-			<<elseif $npcs.get($boy,'cum_pref') == 'mouth' and getvar("$booty_call['mouth_cum']") > 0>>
+			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'mouth' and getvar("$booty_call['mouth_cum']") > 0>>
 				<<gs 'booty_call_favorite_part' 'cum_mouth_favorite'>>
-			<<elseif $npcs.get($boy,'cum_pref') == 'facial' and getvar("$booty_call['facial']") > 0>>
+			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'facial' and getvar("$booty_call['facial']") > 0>>
 				<<gs 'booty_call_favorite_part' 'facial_favorite'>>
-			<<elseif $npcs.get($boy,'cum_pref') == 'tits' and getvar("$booty_call['tit_cum']") > 0>>
+			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'tits' and getvar("$booty_call['tit_cum']") > 0>>
 				<<gs 'booty_call_favorite_part' 'tit_cum_favorite'>>
-			<<elseif $npcs.get($boy,'pussyeater') == 1 and getvar("$booty_call['cuni_orgasm']") > 0>>
+			<<elseif $npcs.get($sex.npcId,'pussyeater') == 1 and getvar("$booty_call['cuni_orgasm']") > 0>>
 				<<gs 'booty_call_favorite_part' 'pussyeat_favorite'>>
-			<<elseif $npcs.get($boy,'fav_pos') == 'missionary' and getvar("$booty_call['miss_fuck']") == 1>>
+			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'missionary' and getvar("$booty_call['miss_fuck']") == 1>>
 				<<gs 'booty_call_favorite_part' 'npc_miss_fav1'>>
-			<<elseif $npcs.get($boy,'fav_pos') == 'doggy' and getvar("$booty_call['doggy_fuck']") == 1>>
+			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'doggy' and getvar("$booty_call['doggy_fuck']") == 1>>
 				<<gs 'booty_call_favorite_part' 'npc_doggy_fav1'>>
-			<<elseif $npcs.get($boy,'fav_pos') == 'cowgirl' and getvar("$booty_call['cowgirl_fuck']") == 1>>
+			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'cowgirl' and getvar("$booty_call['cowgirl_fuck']") == 1>>
 				<<gs 'booty_call_favorite_part' 'npc_cowgirl_fav1'>>
-			<<elseif $npcs.get($boy,'fav_pos') == 'blowjob' and getvar("$booty_call['bj_count']") > 0>>
+			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'blowjob' and getvar("$booty_call['bj_count']") > 0>>
 				<<gs 'booty_call_favorite_part' 'npc_bj_fav1'>>
-				<!-- !! elseif <<=$npcs.get($boy,'fav_pos')>> = 'titjob':-->
+				<!-- !! elseif <<=$npcs.get($sex.npcId,'fav_pos')>> = 'titjob':-->
 				<!-- !!	 gs'booty_call_favorite_part', 'pussyeat_favorite'-->
 			<<else>>
 				<<if getvar("$booty_call['virgin']") != 1>>
-					<<if $booty_call['cum_count'] >= $npcs.get($boy,'sexdrive')>>
+					<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
 						<p>"My dick hurts," he says grinning. "You drained my balls. So yeah, it was good. What about you?"</p>
-					<<elseif $booty_call['cum_count'] < $npcs.get($boy,'sexdrive') / 2>>
+					<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
 						<p>"I could've gone a few more times," he says. "But it wasn't bad. How about you?"</p>
 					<<else>>
 						<p>"Yeah, it was," he says. "How about you?"</p>
 					<</if>>
 					<<gs 'booty_call_favorite_part' 'good_for_you_too'>>
 				<<else>>
-					<<if $booty_call['cum_count'] >= $npcs.get($boy,'sexdrive')>>
+					<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
 						"My dick hurts," he says grinning. "You drained my balls. So yeah, it was good."
 					<<else>>
 						"I could''ve gone a few more times," he says. "But it wasn''t bad."
@@ -71,8 +71,8 @@
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
 	<<if getvar("$booty_call['surprise_creampie_count']") >= 3>>
-		<p>"Your pussy is amazing," <<=$npcs.get($boy,'firstname')>> says. "It's like you were sucking me in, I couldn't stop coming inside you."</p>
-		<<if $npcs.get($boy,'free_creampies') < 1>>
+		<p>"Your pussy is amazing," <<=$npcs.get($sex.npcId,'firstname')>> says. "It's like you were sucking me in, I couldn't stop coming inside you."</p>
+		<<if $npcs.get($sex.npcId,'free_creampies') < 1>>
 			<<actCLA 'Ask next time (tease)'>>
 				"It would be nice if you would ask before you do," you smile teasingly. "I'm not just a cum receptacle you know."
 				<p>"Sorry," he replies, though he doesn't look it. "What about you? What was your favorite part?"</p>
@@ -85,13 +85,13 @@
 			<</actCLA>>
 		<</if>>
 	<<else>>
-		<<if $npcs.get($boy,'rel') < 100>>
-			<p>"It felt so good to come inside you," <<=$npcs.get($boy,'firstname')>> says. "Other guys are into facials and watching girls swallow, which is fine I guess, but there's nothing like filling a pussy up with cum. What about you?"</p>
+		<<if $npcs.get($sex.npcId,'rel') < 100>>
+			<p>"It felt so good to come inside you," <<=$npcs.get($sex.npcId,'firstname')>> says. "Other guys are into facials and watching girls swallow, which is fine I guess, but there's nothing like filling a pussy up with cum. What about you?"</p>
 		<<else>>
 			<<if getvar("$booty_call['simultaneous_orgasm_count']") > 0>>
-				<p>"I love coming inside you," <<=$npcs.get($boy,'firstname')>> says smiling warmly at you. "Especially when you come too. It drives me crazy feeling you orgasm on my cock. What about you?"</p>
+				<p>"I love coming inside you," <<=$npcs.get($sex.npcId,'firstname')>> says smiling warmly at you. "Especially when you come too. It drives me crazy feeling you orgasm on my cock. What about you?"</p>
 			<<else>>
-				<p>"I love coming inside you," <<=$npcs.get($boy,'firstname')>> says smiling warmly at you. "I want to fill your pussy with cum and never stop. What about you?"</p>
+				<p>"I love coming inside you," <<=$npcs.get($sex.npcId,'firstname')>> says smiling warmly at you. "I want to fill your pussy with cum and never stop. What about you?"</p>
 			<</if>>
 		<</if>>
 		<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
@@ -100,7 +100,7 @@
 <<if $location_var[$here][0] == 'cum_mouth_favorite'>>
 	<<if getvar("$booty_call['swallow_count']") > 0>>
 		<<setinit $booty_call['boy_favorite'] = 'swallowing'>>
-		<p>"It was so hot watching you swallow," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<p>"It was so hot watching you swallow," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 		<<actCLA 'I aim to please'>>
 			"Glad you thought so," you smile pleasantly. "I aim to please."
 			<p>"So what about you? What did you like?"</p>
@@ -111,36 +111,36 @@
 			<p>"So what about you? What did you like?"</p>
 			<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 		<</actCLA>>
-		<<if $npcs.get($boy,'tasty_cum') != 1>>
+		<<if $npcs.get($sex.npcId,'tasty_cum') != 1>>
 			<<actCLA 'Your cum is disgusting'>>
-				<<run $npcs.set($boy,'gross_cum',1)>>
-				<<run $npcs.dec($boy,'rel',2)>>
+				<<run $npcs.set($sex.npcId,'gross_cum',1)>>
+				<<run $npcs.dec($sex.npcId,'rel',2)>>
 				<<image "shared/sex/after/pillow_talk3.jpg">>
 				"You could stand to eat some more fruit if you want me to keep doing it," you say, wrinkling your nose. "Your cum tastes <i>horrible</i>. It's like drinking expired caviar."
 				You stick your tongue out, half gagging at the lingering flavour.
-				<<if $npcs.get($boy,'argumentative') == 1 or $npcs.get($boy,'insecure') == 1>>
-					<p>"Come on, it can't be that bad," <<=$npcs.get($boy,'firstname')>> scowls at you.</p>
+				<<if $npcs.get($sex.npcId,'argumentative') == 1 or $npcs.get($sex.npcId,'insecure') == 1>>
+					<p>"Come on, it can't be that bad," <<=$npcs.get($sex.npcId,'firstname')>> scowls at you.</p>
 					<<actCLA 'Insist'>>
-						<<run $npcs.dec($boy,'rel',1)>>
+						<<run $npcs.dec($sex.npcId,'rel',1)>>
 						<p>"Yes, it can be and it is," you say, making a face at him. "I <i>wish</i> was making this up. Yuck!"</p>
 						<<gs 'booty_call_pillow_talk' 'topics'>>
 					<</actCLA>>
 					<<actCLA 'Maybe exaggerating'>>
-						<<run $npcs.inc($boy,'rel',1)>>
+						<<run $npcs.inc($sex.npcId,'rel',1)>>
 						<<image "shared/sex/after/pillow_talk2.jpg">>
 						"Well..." you say. "Maybe I'm exaggerating just a <i>little</i>. But I still don't like the taste."
 						You give him an apologetic smile which he seems to accept when he smiles back.
 						<<gs 'booty_call_pillow_talk' 'topics'>>
 					<</actCLA>>
 					<<actCLA 'Get sarcastic'>>
-						<<run $npcs.dec($boy,'rel',1)>>
+						<<run $npcs.dec($sex.npcId,'rel',1)>>
 						<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
-						<p>"<i>It can't be that bad,</i>" you repeat, mocking <<=$npcs.get($boy,'firstname')>> with a squeaky high voice. "I'd like to see you get down there and blow yourself to completion. Then we'll see."</p>
+						<p>"<i>It can't be that bad,</i>" you repeat, mocking <<=$npcs.get($sex.npcId,'firstname')>> with a squeaky high voice. "I'd like to see you get down there and blow yourself to completion. Then we'll see."</p>
 						<<gs 'booty_call_pillow_talk' 'angry_end2'>>
 					<</actCLA>>
 				<<else>>
 					<<if getvar("$booty_call['swallow_count']") > 1>>
-						<p>"If it's so bad, why did you keep doing it?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+						<p>"If it's so bad, why did you keep doing it?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 						<<actCLA 'For you (affectionate)'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"Cause I like you too much to say no," you say, smirking wryly at him.
@@ -158,33 +158,33 @@
 						<<actCLA 'Acquiring taste'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"I figure if I do it enough times maybe I'll get used to it," you say, eyeballing him with a grim expression. "Starting to have my doubts though."
-							<p><<=$npcs.get($boy,'firstname')>> laughs.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
 							<p>"Well I appreciate the effort. What about you? Was there something I did to make you feel good?"</p>
 							<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 						<</actCLA>>
 						<<actCLA 'Spitting is quitting'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"Cause spitting is quitting," you say, eyeballing him. "If I start something, I'm gonna finish it."
-							<p><<=$npcs.get($boy,'firstname')>> laughs.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
 							<p>"You certainly do. What about you then? Was there something I did to make you feel good?"</p>
 							<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 						<</actCLA>>
 					<<else>>
-						<p>"Sorry I guess," <<=$npcs.get($boy,'firstname')>> says, looking a little embarrassed. "Was there something you did enjoy?"</p>
+						<p>"Sorry I guess," <<=$npcs.get($sex.npcId,'firstname')>> says, looking a little embarrassed. "Was there something you did enjoy?"</p>
 						<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 					<</if>>
 				<</if>>
 			<</actCLA>>
 		<</if>>
-		<<if $npcs.get($boy,'gross_cum') != 1>>
+		<<if $npcs.get($sex.npcId,'gross_cum') != 1>>
 			<<actCLA 'You`re delicious'>>
-				<<run $npcs.set($boy,'tasty_cum',1)>>
+				<<run $npcs.set($sex.npcId,'tasty_cum',1)>>
 				<<if $pc.trait('cumeater') > 0>>
 					"Your cum is delicious," you grin. "I like all cum, but yours is like a fine shot of vodka. Smooth and leaves you wanting more."
 				<<else>>
 					"Your cum is delicious," you grin. "I don't usually like cum all that much, but yours is really nice. It's almost sweet."
 				<</if>>
-				<p><<=$npcs.get($boy,'firstname')>> looks pretty pleased with himself at that.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> looks pretty pleased with himself at that.</p>
 				<p>"What else did you like?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
@@ -192,14 +192,14 @@
 		<<if $pc.trait('cumeater') > 0>>
 			<<actCLA 'I love cum'>>
 				"I love cum," you grin. "If it's in my mouth, I can't help but swallow."
-				<p><<=$npcs.get($boy,'firstname')>> can't seem to help but grin back at you.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> can't seem to help but grin back at you.</p>
 				<p>"What else did you like?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 		<</if>>
 	<<else>>
 		<<setinit $booty_call['boy_favorite'] = 'cum_in_mouth'>>
-		<p>"Coming in your mouth felt great," <<=$npcs.get($boy,'firstname')>> says. "I wish you'd swallow though."</p>
+		<p>"Coming in your mouth felt great," <<=$npcs.get($sex.npcId,'firstname')>> says. "I wish you'd swallow though."</p>
 		<<actCLA 'I don`t like it'>>
 			"I don't like it," you say, wrinkling your nose. "It's just <i>weird</i> swallowing cum."
 			<p>"Then what <i>do</i> you like?"</p>
@@ -215,23 +215,23 @@
 			<p>"So if you liked me more, you'd swallow for me?"</p>
 			<<actCLA 'No (tease)'>>
 				"No," you smirk teasingly. "Now that I know it's what you want, maybe I'll keep spitting just to fuck with you."
-				<<if $npcs.get($boy,'argumentative') == 1>>
-					<p>"Way to be a bitch about it," <<=$npcs.get($boy,'firstname')>> scowls, grumbling to himself.</p>
+				<<if $npcs.get($sex.npcId,'argumentative') == 1>>
+					<p>"Way to be a bitch about it," <<=$npcs.get($sex.npcId,'firstname')>> scowls, grumbling to himself.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($boy,'firstname')>> chuckles. "So what do <i>you</i> like then? So I know what to avoid in the future?"</p>
+					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what do <i>you</i> like then? So I know what to avoid in the future?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</if>>
 			<</actCLA>>
 			<<actCLA 'Maybe'>>
 				"Maybe," you smirk teasingly.
-				<p>"Okay, I see how it is," <<=$npcs.get($boy,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you like me?"</p>
+				<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you like me?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Yes'>>
 				"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."
 				<!-- !! insert invite for date if relationship high enough-->
-				<p>"Well in that case," <<=$npcs.get($boy,'firstname')>> smiles back. "What do I do to make you like me?"</p>
+				<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What do I do to make you like me?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -240,20 +240,20 @@
 			<p>"So if I were your boyfriend, you'd swallow for me?"</p>
 			<<actCLA 'No (tease)'>>
 				"No," you smirk teasingly. "Not now that I know how much you''d love it. If we started dating, maybe I''d spit just to drive you crazy."
-				<<if $npcs.get($boy,'argumentative') == 1>>
-					<p>"Way to be a bitch about it," <<=$npcs.get($boy,'firstname')>> scowls, grumbling to himself.</p>
+				<<if $npcs.get($sex.npcId,'argumentative') == 1>>
+					<p>"Way to be a bitch about it," <<=$npcs.get($sex.npcId,'firstname')>> scowls, grumbling to himself.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($boy,'firstname')>> chuckles. "So what do <i>you</i> like then? So I know how to drive <i>you</i> crazy."</p>
+					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what do <i>you</i> like then? So I know how to drive <i>you</i> crazy."</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</if>>
 			<</actCLA>>
 			<<actCLA 'Maybe'>>
 				"Maybe," you smirk teasingly.
-				<<if $npcs.get($boy,'know_cheat') == 1>>
-					<p>"Okay, I see how it is," <<=$npcs.get($boy,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know how to steal you from your boyfriend."</p>
+				<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
+					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know how to steal you from your boyfriend."</p>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($boy,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
+					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
 				<</if>>
 				<!-- !! insert option for "are you being serious?"-->
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
@@ -261,10 +261,10 @@
 			<<actCLA 'Yes'>>
 				"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."
 				<!-- !! insert invite to start dating-->
-				<<if $npcs.get($boy,'know_cheat') == 1>>
-					<p>"Well in that case," <<=$npcs.get($boy,'firstname')>> smiles back. "What do I do to make you break up with your boyfriend for me?"</p>
+				<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
+					<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What do I do to make you break up with your boyfriend for me?"</p>
 				<<else>>
-					<p>"Well in that case," <<=$npcs.get($boy,'firstname')>> smiles back. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
+					<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
 				<</if>>
 				<!-- !! insert option for "are you being serious?"-->
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
@@ -275,11 +275,11 @@
 <<if $location_var[$here][0] == 'facial_favorite'>>
 	<<setinit $booty_call['boy_favorite'] = 'facial'>>
 	<<if getvar("$booty_call['pc_facial_jerk']") == 1>>
-		<p>"I love seeing your face covered in cum," <<=$npcs.get($boy,'firstname')>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
+		<p>"I love seeing your face covered in cum," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
 	<<elseif getvar("$booty_call['facial_swallow']") > 0>>
-		<p>"I love seeing your face covered in cum," <<=$npcs.get($boy,'firstname')>> grins. "Plus it was a bonus watching you swallow after. That was hot."</p>
+		<p>"I love seeing your face covered in cum," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Plus it was a bonus watching you swallow after. That was hot."</p>
 	<<else>>
-		<p>"I love blowing my load all over your face," <<=$npcs.get($boy,'firstname')>> grins. "It's fucking hot."</p>
+		<p>"I love blowing my load all over your face," <<=$npcs.get($sex.npcId,'firstname')>> grins. "It's fucking hot."</p>
 	<</if>>
 	<<actCLA 'Glad you enjoyed it'>>
 		<<if getvar("$cum_loc['face']") > 0>>
@@ -326,37 +326,37 @@
 			<p>"If it's so gross, why do you let me do it?"</p>
 			<<actCLA 'Sex is a two way street'>>
 				<p>"Cause it goes both ways," you shrug. "If I don't let you do stuff to me that you enjoy then how can I ask the same of you?"</p>
-				<p>"Well, what do you enjoy then?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+				<p>"Well, what do you enjoy then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Cause you like it'>>
 				<<actCLA '(Affectionate)'>>
 					"Cause I know you like it," you smirk. "And I like turning you on."
-					<p>"Well, what can I do to turn you on then?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+					<p>"Well, what can I do to turn you on then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 				<<actCLA '(Sarcastic)'>>
 					"Cause I know you're a pervert," you say eyeballing him. "And pervs like seeing girls get facials."
-					<p>"We sure do," <<=$npcs.get($boy,'firstname')>> chuckles. "But what about you? What do you like?"</p>
+					<p>"We sure do," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "But what about you? What do you like?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA 'You didn`t ask'>>
 				<p>"Cause you didn't ask!" you scowl. "Only thing I knew was that you pulled out and before I could say anything you're blowing your load on my face."</p>
-				<<if $npcs.get($boy,'argumentative') == 1 or $npcs.get($boy,'insecure') == 1>>
+				<<if $npcs.get($sex.npcId,'argumentative') == 1 or $npcs.get($sex.npcId,'insecure') == 1>>
 				<<else>>
 				<</if>>
 			<</actCLA>>
 			<<actCLA 'I don`t get a say (subservient)'>>
 				<p>"Cause it's not up to me," you shrug. "Sex is about making the guy feel good. I'm the girl you're fucking. If you want to come on my face, who am I to stop you?"</p>
-				<<if $npcs.get($boy,'caretaker') == 1>>
-					<p>"Well I don't want you to feel like you always have to be serving me," <<=$npcs.get($boy,'firstname')>> smiles back. "What can I do to make you feel good?"</p>
+				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
+					<p>"Well I don't want you to feel like you always have to be serving me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What can I do to make you feel good?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
-				<<elseif $npcs.get($boy,'abusive') == 1>>
-					<p>"Glad you know your place," <<=$npcs.get($boy,'firstname')>> says smugly.</p>
+				<<elseif $npcs.get($sex.npcId,'abusive') == 1>>
+					<p>"Glad you know your place," <<=$npcs.get($sex.npcId,'firstname')>> says smugly.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"That's nice of you," <<=$npcs.get($boy,'firstname')>> smiles back.</p>
+					<p>"That's nice of you," <<=$npcs.get($sex.npcId,'firstname')>> smiles back.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</if>>
 			<</actCLA>>
@@ -366,9 +366,9 @@
 <<if $location_var[$here][0] == 'tit_cum_favorite'>>
 	<<setinit $booty_call['boy_favorite'] = 'tit_cum'>>
 	<<if getvar("$booty_call['pc_titcum_jerk']") == 1>>
-		<p>"I love coming all over your tits," <<=$npcs.get($boy,'firstname')>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
+		<p>"I love coming all over your tits," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
 	<<else>>
-		<p>"I love coming all over your tits," <<=$npcs.get($boy,'firstname')>> grins. "You look so sexy like that."</p>
+		<p>"I love coming all over your tits," <<=$npcs.get($sex.npcId,'firstname')>> grins. "You look so sexy like that."</p>
 	<</if>>
 	<<actCLA 'Glad you enjoyed it'>>
 		<<if getvar("$cum_loc['tits']") > 0>>
@@ -415,37 +415,37 @@
 			<p>"If it's so gross, why do you let me do it?"</p>
 			<<actCLA 'Sex is a two way street'>>
 				<p>"Cause it goes both ways," you shrug. "If I don't let you do stuff to me that you enjoy then how can I ask the same of you?"</p>
-				<p>"Well, what do you enjoy then?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+				<p>"Well, what do you enjoy then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Cause you like it'>>
 				<<actCLA '(Affectionate)'>>
 					"Cause I know you like it," you smirk. "And I like turning you on."
-					<p>"Well, what can I do to turn you on then?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+					<p>"Well, what can I do to turn you on then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 				<<actCLA '(Sarcastic)'>>
 					"Cause I know you're a pervert," you say eyeballing him. "And pervs like seeing girls get slimed."
-					<p>"We sure do," <<=$npcs.get($boy,'firstname')>> chuckles. "But what about you? What do you like?"</p>
+					<p>"We sure do," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "But what about you? What do you like?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA 'You didn`t ask'>>
 				<p>"Cause you didn't ask!" you scowl. "Only thing I knew was that you pulled out and before I could say anything you're blowing your load all over my chest!"</p>
-				<<if $npcs.get($boy,'argumentative') == 1 or $npcs.get($boy,'insecure') == 1>>
+				<<if $npcs.get($sex.npcId,'argumentative') == 1 or $npcs.get($sex.npcId,'insecure') == 1>>
 				<<else>>
 				<</if>>
 			<</actCLA>>
 			<<actCLA 'I don`t get a say (subservient)'>>
 				<p>"Cause it's not up to me," you shrug. "Sex is about making the guy feel good. I'm the girl you're fucking. If you want to come on my tits, who am I to stop you?"</p>
-				<<if $npcs.get($boy,'caretaker') == 1>>
-					<p>"Well I don't want you to feel like you always have to be serving me," <<=$npcs.get($boy,'firstname')>> smiles back. "What can I do to make you feel good?"</p>
+				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
+					<p>"Well I don't want you to feel like you always have to be serving me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What can I do to make you feel good?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
-				<<elseif $npcs.get($boy,'abusive') == 1>>
-					<p>"Glad you know your place," <<=$npcs.get($boy,'firstname')>> says smugly.</p>
+				<<elseif $npcs.get($sex.npcId,'abusive') == 1>>
+					<p>"Glad you know your place," <<=$npcs.get($sex.npcId,'firstname')>> says smugly.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"That's nice of you," <<=$npcs.get($boy,'firstname')>> smiles back.</p>
+					<p>"That's nice of you," <<=$npcs.get($sex.npcId,'firstname')>> smiles back.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</if>>
 			<</actCLA>>
@@ -454,7 +454,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pussyeat_favorite'>>
 	<<setinit $booty_call['boy_favorite'] = 'pussyeating'>>
-	<p>"I love the way you taste," <<=$npcs.get($boy,'firstname')>> smiles.</p>
+	<p>"I love the way you taste," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
 	<<actCLA 'What do I taste like?'>>
 		<p>"Yeah?" you smirk back. "What do I taste like?"</p>
 		<p>"Hmm... A little salty. Maybe a little sweet too. Not exactly sure how to describe it other than to say you taste delicious. Did you enjoy it too?"</p>
@@ -463,14 +463,14 @@
 	<<actCLA 'What do you like about eating pussy?'>>
 		<p>"Why do you like eating pussy so much?" you giggle. "You're not gonna come from it."</p>
 		<<if rand(0,1) == 1>>
-			<p>"I just like giving more than I like receiving," <<=$npcs.get($boy,'firstname')>> shrugs. "It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste. What can I say? I just think it's fun. What about you? What do you like?"</p>
+			<p>"I just like giving more than I like receiving," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste. What can I say? I just think it's fun. What about you? What do you like?"</p>
 			<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 		<<else>>
-			<p>"Well, do you like giving blowjobs?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+			<p>"Well, do you like giving blowjobs?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 			<<actCLA 'No'>>
 				<p>"Uhh, no?" You cock your head. "It's boring and makes my neck hurt and my jaw ache."</p>
-				<p>"Oh. Well, how do I explain it then?" <<=$npcs.get($boy,'firstname')>> rubs his chin. "I just like giving more than I like receiving. It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste."</p>
-				<p><<=$npcs.get($boy,'firstname')>> shrugs.</p>
+				<p>"Oh. Well, how do I explain it then?" <<=$npcs.get($sex.npcId,'firstname')>> rubs his chin. "I just like giving more than I like receiving. It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste."</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
 				<p>"What can I say? I just think it's fun. What about you? What do you like?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
@@ -479,19 +479,19 @@
 				<p>"What do you like about it?"</p>
 				<<actCLA 'Making you feel good'>>
 					"I like making the guy feel good," you say. "Making <i>you</i> feel good. I love how when I use my tongue just right, I can feel your entire body respond through your cock."
-					<p>"Same thing with eating pussy," <<=$npcs.get($boy,'firstname')>> smirks back. "I like giving more than receiving. It's fun to make girls squirm and I love the taste of pussy. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I like giving more than receiving. It's fun to make girls squirm and I love the taste of pussy. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 				<<actCLA 'The taste'>>
 					"Something about having a cock in my mouth just feels good," you say. "The sweaty rough texture, the sort of musky smell. It's like licking a warm salty popsicle."
-					<p>"Same thing with eating pussy," <<=$npcs.get($boy,'firstname')>> smirks back. "I love the taste of pussy. And it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I love the taste of pussy. And it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 				<<actCLA 'The control'>>
 					<p>"I guess because of the control?" you say. "There's something... empowering about having a cock in my mouth. Like I could just chomp down and cause tons of pain but also that I have a direct line to the pleasure a guy is feeling. <i>I</i> get to decide if he gets to feel good. <i>I</i> get to decide if he gets to come. I can edge him, I can tease him, I can swallow him whole, make him gasp. Something about that just... turns me on."</p>
-					<p>"Same thing with eating pussy," <<=$npcs.get($boy,'firstname')>> smirks back. "I like giving more than receiving. I love the taste of pussy and it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I like giving more than receiving. I love the taste of pussy and it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
@@ -514,13 +514,13 @@
 	<<setinit $booty_call['boy_favorite'] = 'missionary'>>
 	"I liked fucking you," he grins. "Especially when I got to be on top."
 	<<actCLA 'Me too'>>
-		<<run $npcs.inc($boy,'rel',1)>>
+		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		<<actCLA 'It`s pleasant'>>
 			"Me too," you smile back. "There''s just something... pleasant about missionary. Can't explain it but it's my favorite way to fuck."
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 		<<actCLA 'It`s intimate'>>
-			<<if getvar("$booty_call['creampie_count']") > 0 and (getvar("$booty_call['creampie_allowance']") > 0 or $npcs.get($boy,'free_creampies') > 0)>>
+			<<if getvar("$booty_call['creampie_count']") > 0 and (getvar("$booty_call['creampie_allowance']") > 0 or $npcs.get($sex.npcId,'free_creampies') > 0)>>
 				"Me too," you smile back. "I like how I can see your face when you come inside me."
 			<<else>>
 				"Me too," you smile back. "I like how we can stare into each other''s eyes while we fuck."
@@ -544,8 +544,8 @@
 		<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 	<</actCLA>>
 	<<actCLA 'Isn`t missionary boring?'>>
-		<<run $npcs.dec($boy,'rel',1)>>
-		<<if $npcs.get($boy,'argumentative') == 1>>
+		<<run $npcs.dec($sex.npcId,'rel',1)>>
+		<<if $npcs.get($sex.npcId,'argumentative') == 1>>
 			<<image "shared/sex/after/pillow_talk3.jpg">>
 			<p>"Don't you think missionary is kind of boring?" you sigh unhappily. "It's just so... basic."</p>
 			<<gs 'booty_call_favorite_part' 'npc_argue_lashout'>>
@@ -561,7 +561,7 @@
 	<<setinit $booty_call['boy_favorite'] = 'doggy'>>
 	"I liked fucking you," he grins. "Especially when I got to fuck you from behind."
 	<<actCLA 'Me too'>>
-		<<run $npcs.inc($boy,'rel',1)>>
+		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		<<actCLA 'Feels better'>>
 			"Me too," you grin back. "It feels better in doggy. Hits the inside of my pussy just right."
 			<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -587,8 +587,8 @@
 		<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 	<</actCLA>>
 	<<actCLA 'Isn`t doggy boring?'>>
-		<<run $npcs.dec($boy,'rel',1)>>
-		<<if $npcs.get($boy,'argumentative') == 1>>
+		<<run $npcs.dec($sex.npcId,'rel',1)>>
+		<<if $npcs.get($sex.npcId,'argumentative') == 1>>
 			<<image "shared/sex/after/pillow_talk3.jpg">>
 			<p>"Don't you think doggy is kind of boring?" you sigh unhappily. "I'm just on hands and knees the whole time staring at the wall and you can't see anything of me except my ass."</p>
 			<<gs 'booty_call_favorite_part' 'npc_argue_lashout'>>
@@ -602,13 +602,13 @@
 <</if>>
 <<if $location_var[$here][0] == 'npc_cowgirl_fav1'>>
 	<<setinit $booty_call['boy_favorite'] = 'cowgirl'>>
-	<<if $npcs.get($boy,'fav_body_part') == 'tits'>>
+	<<if $npcs.get($sex.npcId,'fav_body_part') == 'tits'>>
 		"I liked when you were on top," he grins. "I love the view of your tits bouncing around in front of me."
 	<<else>>
 		"I liked when you were on top," he grins.
 	<</if>>
 	<<actCLA 'Me too'>>
-		<<run $npcs.inc($boy,'rel',1)>>
+		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		<<actCLA 'Feels better'>>
 			<p>"Me too," you grin back. "I love bouncing on your dick! I can't get that feeling in any other position."</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -634,8 +634,8 @@
 		<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 	<</actCLA>>
 	<<actCLA 'Cowgirl sucks'>>
-		<<run $npcs.dec($boy,'rel',1)>>
-		<<if $npcs.get($boy,'argumentative') == 1>>
+		<<run $npcs.dec($sex.npcId,'rel',1)>>
+		<<if $npcs.get($sex.npcId,'argumentative') == 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<p>"Really? I hate cowgirl," you sigh. "It's so tiring, just bouncing up and down on your dick for ages until you come. Makes my legs sore."</p>
 			<<gs 'booty_call_favorite_part' 'npc_argue_lashout'>>
@@ -648,17 +648,17 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'npc_argue_lashout'>>
-	<<run $npcs.dec($boy,'rel',1)>>
-	<p>"Why're you being such a bitch?" <<=$npcs.get($boy,'firstname')>> scowls back. "What's the point of asking me what I liked if you're just going to piss on it?"</p>
+	<<run $npcs.dec($sex.npcId,'rel',1)>>
+	<p>"Why're you being such a bitch?" <<=$npcs.get($sex.npcId,'firstname')>> scowls back. "What's the point of asking me what I liked if you're just going to piss on it?"</p>
 	<<actCLA 'Let it slide'>>
 		<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
 		A spike of anger jolts through you and your body stiffens for a fight by instinct. But you take a deep breath through your nose and turn your head, choosing not to pursue conflict and just let it go instead.
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
 	<<actCLA 'Apologize'>>
-		<<run $npcs.inc($boy,'rel',1)>>
+		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		<<image "shared/sex/after/pillow_talk2.jpg">>
-		<p><<=$npcs.get($boy,'firstname')>>'s response causes you to start. After a moment of shock, you shake your head.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>>'s response causes you to start. After a moment of shock, you shake your head.</p>
 		"You're right," you say ruefully. "I'm sorry. I shouldn''t have said that."
 		He turns to look at you, chewing on his cheek for a few seconds.
 		"It's whatever," he mumbles back.
@@ -687,7 +687,7 @@
 		<<actCLA 'Everything together'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"All of it," you smile warmly. "I loved how everything came together."
-			<p><<=$npcs.get($boy,'firstname')>> returns the smile with more than a hint of satisfaction.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> returns the smile with more than a hint of satisfaction.</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -708,10 +708,10 @@
 			<<actCLA 'Making you feel good'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "I love the way I can make you groan and buck your hips just with my mouth. It makes me feel sexy."
-				<<if $npcs.get($boy,'fav_pos') == 'blowjob'>>
-					<p>"Blowjobs are my favorite," <<=$npcs.get($boy,'firstname')>> smiles back running his thumb across your lips. "But the head you give is especially great."</p>
+				<<if $npcs.get($sex.npcId,'fav_pos') == 'blowjob'>>
+					<p>"Blowjobs are my favorite," <<=$npcs.get($sex.npcId,'firstname')>> smiles back running his thumb across your lips. "But the head you give is especially great."</p>
 				<<else>>
-					<p>"You've got magic lips," <<=$npcs.get($boy,'firstname')>> smiles back, running his thumb across your lips.</p>
+					<p>"You've got magic lips," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, running his thumb across your lips.</p>
 				<</if>>
 				<<gs 'booty_call_favorite_part' 'pc_bj_fav2'>>
 				<<gs 'booty_call_favorite_part' 'pc_bj_fav3'>>
@@ -719,18 +719,18 @@
 			<<actCLA 'Oral fixation'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "I think I have some kind of oral fixation. Something about having a cock in my mouth just feels <i>good</i>."
-				<p>"Oral fixation huh?" <<=$npcs.get($boy,'firstname')>> says, running his thumb across your lips.</p>
+				<p>"Oral fixation huh?" <<=$npcs.get($sex.npcId,'firstname')>> says, running his thumb across your lips.</p>
 				<<gs 'booty_call_favorite_part' 'pc_bj_fav3'>>
 			<</actCLA>>
 			<<actCLA 'The taste'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "It tastes good."
 				<<if getvar("$booty_call['mouth_cum_gross']") == 1>>
-					<p>"You didn't seem to think that when I came in your mouth," <<=$npcs.get($boy,'firstname')>> smirks.</p>
+					<p>"You didn't seem to think that when I came in your mouth," <<=$npcs.get($sex.npcId,'firstname')>> smirks.</p>
 					"Okay, <i>that's</i> different," you protest. "I said I like the taste of your cock, not the taste of your cum."
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"Explains why you're so good at it," <<=$npcs.get($boy,'firstname')>> smirks, running his thumb across your lips. "You were gobbling it up like it was your last meal."</p>
+					<p>"Explains why you're so good at it," <<=$npcs.get($sex.npcId,'firstname')>> smirks, running his thumb across your lips. "You were gobbling it up like it was your last meal."</p>
 					<<gs 'booty_call_favorite_part' 'pc_bj_fav2'>>
 					<<gs 'booty_call_favorite_part' 'pc_bj_fav3'>>
 				<</if>>
@@ -746,7 +746,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pc_bj_fav3'>>
 	<<actCLA 'Suck his thumb'>>
-		<p>As his thumb trails past you let it slip into your mouth. Almost instinctively, you begin sucking on it like a tiny dick, making doe eyes at <<=$npcs.get($boy,'firstname')>> for a few seconds until you let it pop from your lips.</p>
+		<p>As his thumb trails past you let it slip into your mouth. Almost instinctively, you begin sucking on it like a tiny dick, making doe eyes at <<=$npcs.get($sex.npcId,'firstname')>> for a few seconds until you let it pop from your lips.</p>
 		An intense silence hangs between you as you just keep staring at each other for several more moments.
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
@@ -756,7 +756,7 @@
 		<<actCLA 'The sex'>>
 			<<if getvar("$booty_call['virgin']") == 1>>
 				"I liked the sex," you grin, unable to contain your pleasure.
-				<p>"Not bad for your first time huh?" <<=$npcs.get($boy,'firstname')>> grins back.</p>
+				<p>"Not bad for your first time huh?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
 				<<actCLA 'Agree'>>
 					You shake your head.
 					"You made for a memorable first fuck."
@@ -771,7 +771,7 @@
 					<<actCLA 'When we did it missionary'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when we did it in missionary," you smile.
-						<p>"Yeah?" <<=$npcs.get($boy,'firstname')>> grins back. "That's your favorite position?"</p>
+						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "That's your favorite position?"</p>
 						<<actCLA 'Not usually'>>
 							"Hmmm... It's not usually my favorite," you shrug. "But something about it was nice this time."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -781,7 +781,7 @@
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<</actCLA>>
 						<<actCLA 'It`s intimate'>>
-							<<if getvar("$booty_call['creampie_count']") > 0 and (getvar("$booty_call['creampie_allowance']") > 0 or $npcs.get($boy,'free_creampies') > 0)>>
+							<<if getvar("$booty_call['creampie_count']") > 0 and (getvar("$booty_call['creampie_allowance']") > 0 or $npcs.get($sex.npcId,'free_creampies') > 0)>>
 								"I like the intimacy of it," you say. "I like how I can see your face when you come inside me."
 							<<else>>
 								"I like the intimacy of it," you say. "I like how I can see your face while you fuck me."
@@ -798,7 +798,7 @@
 					<<actCLA 'When we did it doggy'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when you fucked me doggy," you smile.
-						<p>"Yeah?" <<=$npcs.get($boy,'firstname')>> grins back. "You like it doggy?"</p>
+						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like it doggy?"</p>
 						<<actCLA 'Not usually'>>
 							"Hmmm... It's not <i>usually</i> my favorite," you shrug. "But it was good this time. Nice to mix things up."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -813,7 +813,7 @@
 						<</actCLA>>
 						<<actCLA 'Feels dirty'>>
 							"It feels dirty," you grin wickedly. "And I like it dirty."
-							<p>"You dirty girl," <<=$npcs.get($boy,'firstname')>> smirks back.</p>
+							<p>"You dirty girl," <<=$npcs.get($sex.npcId,'firstname')>> smirks back.</p>
 							<p>"Stop!" you tease. "You're gonna make me come."</p>
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<</actCLA>>
@@ -823,7 +823,7 @@
 					<<actCLA 'When I got to ride you'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when I got to be on top," you smile.
-						<p>"Yeah?" <<=$npcs.get($boy,'firstname')>> grins back. "You like to ride?"</p>
+						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like to ride?"</p>
 						<<actCLA 'Not usually'>>
 							<p>"Hmmm... It's not <i>usually</i> my favorite," you shrug. "But who doesn't like a good ride now and then?"</p>
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -845,7 +845,7 @@
 				<<if getvar("$booty_call['gentle_fuck']") == 1>>
 					<<actCLA 'When you were gentle'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
-						<p>"I liked it when you were gentle, " you say, smiling warmly at <<=$npcs.get($boy,'firstname')>>.</p>
+						<p>"I liked it when you were gentle, " you say, smiling warmly at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 						<<gs 'booty_call_pillow_talk' 'topics'>>
 					<</actCLA>>
 				<</if>>
@@ -854,13 +854,13 @@
 						<<setinit $booty_call['rough_pillow_talk'] = 1>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you fucked me hard," you grin.
-						<p>"You like it that way?" <<=$npcs.get($boy,'firstname')>> grins.</p>
+						<p>"You like it that way?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 						<<actCLA 'Sometimes'>>
 							"Not always," you shrug. "But any one speed is boring if you don't mix it up. A good pounding is always welcome provided the timing is right."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<</actCLA>>
 						<<actCLA 'Admit it'>>
-							<<run $npcs.set($boy,'knows_pc_likes_rough',1)>>
+							<<run $npcs.set($sex.npcId,'knows_pc_likes_rough',1)>>
 							"Sure do," you admit freely. "Nothing I love more than a good pounding."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<</actCLA>>
@@ -870,31 +870,31 @@
 							<<setinit $booty_call['rough_pillow_talk'] = 1>>
 							<<image "shared/sex/after/pillow_talk1.jpg">>
 							"I liked it when you got rough with me," you grin.
-							<p>"You like it rough?" <<=$npcs.get($boy,'firstname')>> grins back.</p>
+							<p>"You like it rough?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
 							<<actCLA 'Sometimes'>>
 								<p>"Not always," you shrug. "But what girl doesn't like to get rough housed now and again?"</p>
 								<<gs 'booty_call_pillow_talk' 'topics'>>
 							<</actCLA>>
 							<<actCLA 'Admit it'>>
-								<<run $npcs.set($boy,'knows_pc_likes_rough',1)>>
+								<<run $npcs.set($sex.npcId,'knows_pc_likes_rough',1)>>
 								"I love it when guys get rough with me," you admit freely. "There''s something so sexy about it, something so intense, so <i>primal</i>. And I love the exhausted feeling that comes after like we just fucked each other''s brains out."
 								<<gs 'booty_call_pillow_talk' 'topics'>>
 							<</actCLA>>
 							<<actCLA 'Liked the pain'>>
-								<<run $npcs.set($boy,'knows_pc_likes_rough',1)>>
+								<<run $npcs.set($sex.npcId,'knows_pc_likes_rough',1)>>
 								"I love it when guys get rough with me," you admit freely. "I kind of hurts, but in like a good way. There''s something so sexy about it, something so intense, so <i>primal</i>. And I love the exhausted feeling that comes after like we just fucked each other''s brains out."
 								<<gs 'booty_call_pillow_talk' 'topics'>>
 							<</actCLA>>
 							<<actCLA 'Sub'>>
-								<<run $npcs.set($boy,'knows_pc_likes_rough',1)>>
+								<<run $npcs.set($sex.npcId,'knows_pc_likes_rough',1)>>
 								"I love it when guys get rough with me," you admit freely. "Especially when they do it in a way that is like they're just <i>taking</i> what they want and I'm powerless to stop them. I don't know what it is, but there''s just something <i>hot</i> about that."
 								<<gs 'booty_call_pillow_talk' 'topics'>>
 							<</actCLA>>
 						<</actCLA>>
 					<</if>>
-					<<if $npcs.get($boy,'knows_pc_likes_rough') == 1>>
+					<<if $npcs.get($sex.npcId,'knows_pc_likes_rough') == 1>>
 						<<actCLA 'The usual pounding'>>
-							<<run $npcs.set($boy,'knows_pc_likes_rough',1)>>
+							<<run $npcs.set($sex.npcId,'knows_pc_likes_rough',1)>>
 							"Just the usual pounding," you grin. "I love it when you fuck me hard."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<</actCLA>>
@@ -909,7 +909,7 @@
 		<<actCLA 'The sex (shy)'>>
 			<<if getvar("$booty_call['virgin']") == 1>>
 				<p>"I liked- I liked the sex," you mumble, a crimson blush spreading through your cheeks.</p>
-				<p>"Not bad for your first time huh?" <<=$npcs.get($boy,'firstname')>> grins back.</p>
+				<p>"Not bad for your first time huh?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
 				<<actCLA 'Agree'>>
 					You shake your head, smiling shyly, feeling your blush intensify.
 					<i>Oh my! How embarrassing!</i>
@@ -924,7 +924,7 @@
 					<<actCLA 'When we did it missionary'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when... when we did it in missionary," you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($boy,'firstname')>> grins back. "That's your favorite position?"</p>
+						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "That's your favorite position?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -947,7 +947,7 @@
 					<<actCLA 'When we did it doggy'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you, uhm... when you did me from behind..." you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($boy,'firstname')>> grins back. "You like it doggy?"</p>
+						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like it doggy?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -962,7 +962,7 @@
 						<</actCLA>>
 						<<actCLA 'Feels dirty'>>
 							<p>"Y-yes," you admit. "I kind of like how, uhm... <i>dirty</i>... it feels..."</p>
-							<p>"You dirty girl," <<=$npcs.get($boy,'firstname')>> replies and you feel your blush intensify.</p>
+							<p>"You dirty girl," <<=$npcs.get($sex.npcId,'firstname')>> replies and you feel your blush intensify.</p>
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<</actCLA>>
 					<</actCLA>>
@@ -971,7 +971,7 @@
 					<<actCLA 'When I got to ride you'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when, uhm... when I got to be on top..." you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($boy,'firstname')>> grins back. "You like to ride?"</p>
+						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like to ride?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1002,7 +1002,7 @@
 						<<setinit $booty_call['rough_pillow_talk'] = 1>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you, uhm... when you fucked me hard..." you say, a crimson blush spreading through your cheeks.
-						<p>"You like to get pounded?" <<=$npcs.get($boy,'firstname')>> grins.</p>
+						<p>"You like to get pounded?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 						<<actCLA 'Sometimes'>>
 							<p>"Not a-always," you stammer. "But it's nice now and again..."</p>
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1017,7 +1017,7 @@
 							<<setinit $booty_call['rough_pillow_talk'] = 1>>
 							<<image "shared/sex/after/pillow_talk1.jpg">>
 							"I liked it when you, uhm... when you got rough with me..." you say, a crimson blush spreading through your cheeks.
-							<p>"You like it rough?" <<=$npcs.get($boy,'firstname')>> grins.</p>
+							<p>"You like it rough?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 							<<actCLA 'Sometimes'>>
 								<p>"Not a-always," you stammer. "But the variety was nice..."</p>
 								<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1076,29 +1076,29 @@
 	<<if getvar("$booty_call['creampie_count']") > 0>>
 		<<actCLA 'When you came inside'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<<if $booty_call['boy_favorite'] == 'creampie' and $npcs.get($boy,'free_creampies') < 1 and getvar("$booty_call['surprise_creampie_count']") > 0>>
-				<<if $npcs.get($boy,'know_not_bc') == 1>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($boy,'firstname')>> can say anything. "But you still need to ask before you do it! You know I'm not on birth control so it's extra important!"</p>
+			<<if $booty_call['boy_favorite'] == 'creampie' and $npcs.get($sex.npcId,'free_creampies') < 1 and getvar("$booty_call['surprise_creampie_count']") > 0>>
+				<<if $npcs.get($sex.npcId,'know_not_bc') == 1>>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! You know I'm not on birth control so it's extra important!"</p>
 				<<elseif getvar("$birth_control['think_safe']") != 1>>
 					<<gs 'booty_call_stats' 'no_birth_control_know'>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($boy,'firstname')>> can say anything. "But you still need to ask before you do it! I'm not on birth control so it's dangerous."</p>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! I'm not on birth control so it's dangerous."</p>
 				<<else>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($boy,'firstname')>> can say anything. "But you still need to ask before you do it! Just because it feels good doesn't mean you can't ask permission!"</p>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! Just because it feels good doesn't mean you can't ask permission!"</p>
 				<</if>>
 			<<elseif $booty_call['boy_favorite'] == 'creampie'>>
 				<<if getvar("$cum_loc['vagina']") > 0>>
-					<p>"The same as you," you smile warmly at <<=$npcs.get($boy,'firstname')>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
+					<p>"The same as you," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
 				<<else>>
-					<p>"The same as you," you smile warmly at <<=$npcs.get($boy,'firstname')>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
+					<p>"The same as you," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
 				<</if>>
 			<<else>>
 				<<if getvar("$cum_loc['vagina']") > 0>>
-					<p>"I liked it when you came inside me," you smile warmly at <<=$npcs.get($boy,'firstname')>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
+					<p>"I liked it when you came inside me," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
 				<<else>>
-					<p>"I liked it when you came inside me," you smile warmly at <<=$npcs.get($boy,'firstname')>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
+					<p>"I liked it when you came inside me," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
 				<</if>>
 			<</if>>
-			<<if getvar("$booty_call['accidental_creampie_convo']") == 0 and ($npcs.get($boy,'know_not_bc') == 1 or getvar("$booty_call['risky_creampie']") > 0 or $npcs.get($boy,'childfree') > 0) and getvar("$booty_call['safe_day']") != 1 and getvar("$booty_call['probably_safe_day']") != 1>>
+			<<if getvar("$booty_call['accidental_creampie_convo']") == 0 and ($npcs.get($sex.npcId,'know_not_bc') == 1 or getvar("$booty_call['risky_creampie']") > 0 or $npcs.get($sex.npcId,'childfree') > 0) and getvar("$booty_call['safe_day']") != 1 and getvar("$booty_call['probably_safe_day']") != 1>>
 				<<gs 'booty_call_talk' 'boy_accidental_creampie'>>
 			<<else>>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1123,7 +1123,7 @@
 			<</if>>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
-		<<if getvar("$booty_call['swallow_count']") > 0 and $npcs.get($boy,'gross_cum') != 1>>
+		<<if getvar("$booty_call['swallow_count']") > 0 and $npcs.get($sex.npcId,'gross_cum') != 1>>
 			<<actCLA 'When I swallowed'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $booty_call['boy_favorite'] == 'swallowing'>>
@@ -1134,7 +1134,7 @@
 					<</if>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"I liked it when I swallowed your cum," you tell <<=$npcs.get($boy,'firstname')>>.</p>
+					<p>"I liked it when I swallowed your cum," you tell <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 					<p>"What did you like about it?" he asks in response, eyes gleaming with arousal and curiosity.</p>
 					<<actCLA 'The situation'>>
 						<p>"Just... doing it I guess?" you say with a shy smile. "There's just something... <i>hot</i> about swallowing a guys's load. I don't really get it myself if I'm being honest. All I know is that it turns me on."</p>
@@ -1160,7 +1160,7 @@
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $booty_call['boy_favorite'] == 'facial'>>
 					"The same as you," you admit with a smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>."
-					<p>"You look sexy too," <<=$npcs.get($boy,'firstname')>> grins.</p>
+					<p>"You look sexy too," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 				<<else>>
 					"I liked it when you came on my face," you smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>."
 				<</if>>
@@ -1176,7 +1176,7 @@
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $booty_call['boy_favorite'] == 'tit_cum'>>
 					"The same as you," you admit with a smile. "There''s something strangely hot about when a guy blows his load all over my tits. I just feel... <i>sexy</i>. And the warmth is oddly comforting..."
-					<p>"You look sexy too," <<=$npcs.get($boy,'firstname')>> grins.</p>
+					<p>"You look sexy too," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 				<<else>>
 					"I liked it when you came on my face," you smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>. And the warmth is oddly comforting..."
 				<</if>>
@@ -1187,7 +1187,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'good_for_you_too'>>
 	<<actCLA 'Satisfied'>>
-		<p>"I had fun," you say, smiling at <<=$npcs.get($boy,'firstname')>>.</p>
+		<p>"I had fun," you say, smiling at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
 	<<if getvar("$booty_call['fuck_count']") > 0>>
@@ -1209,17 +1209,17 @@
 			<<actCLA '(in a good way)'>>
 				<<setinit $booty_call['keep_it_up'] = 1>>
 				<<setinit $booty_call['sore_pussy_talk'] = 1>>
-				<<if $booty_call['cum_count'] == $npcs.get($boy,'sexdrive')>>
-					<p>"I might not be able to walk right for a week either," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<=$npcs.get($boy,'firstname')>> shape."</p>
+				<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
+					<p>"I might not be able to walk right for a week either," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<=$npcs.get($sex.npcId,'firstname')>> shape."</p>
 				<<else>>
-					<p>"I'm not gonna be able to walk right for a week," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<=$npcs.get($boy,'firstname')>> shape."</p>
+					<p>"I'm not gonna be able to walk right for a week," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<=$npcs.get($sex.npcId,'firstname')>> shape."</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 			<<actCLA '(in a bad way)'>>
 				<<setinit $booty_call['keep_it_up'] = 1>>
 				<<setinit $booty_call['sore_pussy_talk'] = 1>>
-				<<if $booty_call['cum_count'] == $npcs.get($boy,'sexdrive')>>
+				<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
 					"I might not be able to walk right for a week either," you wince, rubbing your thighs over your aching pussy. "I might have a hard time sitting down tomorrow..."
 				<<else>>
 					"I'm not gonna be able to walk right for a week," you wince, rubbing your thighs over your aching pussy. "I might have a hard time sitting down tomorrow..."
@@ -1232,11 +1232,11 @@
 			<<actCLA '(in a good way)'>>
 				<<setinit $booty_call['sore_pussy_talk'] = 1>>
 				"I'm a little sore," you say with a half smile, rubbing your wet thighs together over your delightfully tender sex. "But in a good way."
-				<<if $npcs.get($boy,'gymrat') == 1>>
-					<p>"Like the soreness after a workout?" <<=$npcs.get($boy,'firstname')>> asks amusedly.</p>
+				<<if $npcs.get($sex.npcId,'gymrat') == 1>>
+					<p>"Like the soreness after a workout?" <<=$npcs.get($sex.npcId,'firstname')>> asks amusedly.</p>
 					"Yeah," you nod. "Something like that. But in my pussy."
 				<<else>>
-					<p>"How can you feel sore in a good way?" <<=$npcs.get($boy,'firstname')>> asks amusedly.</p>
+					<p>"How can you feel sore in a good way?" <<=$npcs.get($sex.npcId,'firstname')>> asks amusedly.</p>
 					"I just do," you shrug. "Besides, it's your fault for fucking me so well."
 				<</if>>
 				You both grin at that.
@@ -1251,27 +1251,27 @@
 	<</if>>
 	<<if $booty_call['orgasm_count'] + getvar("$booty_call['fake_orgasm_count']") > 3>>
 		<<actCLA 'Lots of orgasms'>>
-			<p>"You made me come lots," you say, flashing a tired smile at <<=$npcs.get($boy,'firstname')>>. "It was more than good."</p>
+			<p>"You made me come lots," you say, flashing a tired smile at <<=$npcs.get($sex.npcId,'firstname')>>. "It was more than good."</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<<elseif getvar("$booty_call['orgasm_count']") > 0>>
 		<<actCLA 'You got me off'>>
-			<p>"You made me come," you say, smiling at <<=$npcs.get($boy,'firstname')>>. "How could I complain?"</p>
+			<p>"You made me come," you say, smiling at <<=$npcs.get($sex.npcId,'firstname')>>. "How could I complain?"</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<</if>>
-	<<if $booty_call['cum_count'] == $npcs.get($boy,'sexdrive')>>
+	<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
 		<<actCLA 'Could`ve gone more rounds'>>
 			"I could''ve gone a few more rounds," you say wistfully.
 			"Sorry," he says, looking a little embarrassed. "The spirit is willing, but the flesh is spongey and bruised.
 			<<actCLA 'Laugh'>>
-				<p><<=$npcs.get($boy,'firstname')>>'s response makes you laugh out loud.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>>'s response makes you laugh out loud.</p>
 				"That's okay," you giggle. "I forgive you."
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 			<<actCLA 'Roll your eyes'>>
 				<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
-				<p>You roll your eyes to the heavens though <<=$npcs.get($boy,'firstname')>> looks quite amused by his own joke.</p>
+				<p>You roll your eyes to the heavens though <<=$npcs.get($sex.npcId,'firstname')>> looks quite amused by his own joke.</p>
 				"You've endured such hardship, getting fucked by me so many times," you say flatly.
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
@@ -1281,7 +1281,7 @@
 		<<actCLA 'I`m full (of cum)'>>
 			<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 			<<setinit $booty_call['creampie_pillow_talk'] = 1>>
-			<p>"I'm all full," you smile, rubbing your belly in tired satisfaction as <<=$npcs.get($boy,'firstname')>>'s cum overflows from your snatch.</p>
+			<p>"I'm all full," you smile, rubbing your belly in tired satisfaction as <<=$npcs.get($sex.npcId,'firstname')>>'s cum overflows from your snatch.</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<</if>>

sugarcube/src/activities/bootycall/booty_call_leave.tw

@@ -5,16 +5,16 @@
 	<<gs 'booty_call_leave' 'ending'>>
 	<<set $time.minutes += 2>>
 	<!-- !! exit should be based on type of apartment and location-->
-	<<if $npcs.get($boy,'residence') == 1>>
+	<<if $npcs.get($sex.npcId,'residence') == 1>>
 		<!-- !! Pav residential exit-->
 		<<gt 'pav_residential'>>
-	<<elseif $npcs.get($boy,'residence') == 2>>
+	<<elseif $npcs.get($sex.npcId,'residence') == 2>>
 		<!-- !! Student dorms exit-->
 		<<gt 'city_island'>>
-	<<elseif $npcs.get($boy,'residence') == 3>>
+	<<elseif $npcs.get($sex.npcId,'residence') == 3>>
 		<!-- !! St. Petersburg Residential exit-->
 		<<gt 'city_residential'>>
-	<<elseif $npcs.get($boy,'residence') == 4>>
+	<<elseif $npcs.get($sex.npcId,'residence') == 4>>
 		<!-- !! St. Petersburg City Center exit-->
 		<<gt 'city_center'>>
 		<!-- !!{ disabled for bug testing
@@ -37,7 +37,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'break_up'>>
-	<<gs 'lover' 'remove fuckbuddy' $boy>>
+	<<gs 'lover' 'remove fuckbuddy' $sex.npcId>>
 	<<actCLA 'Leave'>>
 		<<gt 'booty_call_leave' 'exit'>>
 	<</actCLA>>
@@ -50,14 +50,14 @@
 
 	<</if>>
 	<<if getvar("$booty_call['fuck']") > 0>>
-		<<setinit $know_virgin[$boy] = 0>>
+		<<setinit $know_virgin[$sex.npcId] = 0>>
 
 	<</if>>
 	<<if getvar("$booty_call['creampie_orgasm']") == 1>>
 		<<setinit $stat_memory['creampie_orgasm'] = $time.daystart>>
 
 	<</if>>
-	<<run $npcs.set($boy,'last_sex',$time.daystart)>>
+	<<run $npcs.set($sex.npcId,'last_sex',$time.daystart)>>
 	<<set $booty_call to null>>
 <</if>>
 <<if $location_var[$here][0] == 'leaving_dialogue'>>
@@ -79,12 +79,12 @@
 		<<setinit $booty_call['leave_dialogue'] = 'Text me'>>
 		<<gs 'booty_call_leave' 'leaving_action'>>
 	<</actCLA>>
-	<<if $npcs.get($boy,'booty_call') == $time.daystart and getvar("$booty_call['sleepover']") == 1>>
+	<<if $npcs.get($sex.npcId,'booty_call') == $time.daystart and getvar("$booty_call['sleepover']") == 1>>
 		<<actCLA '"See you soon"'>>
 			<<setinit $booty_call['leave_dialogue'] = 'See you soon'>>
 			<<gs 'booty_call_leave' 'leaving_action'>>
 		<</actCLA>>
-	<<elseif $npcs.get($boy,'booty_call') == $time.daystart + 1>>
+	<<elseif $npcs.get($sex.npcId,'booty_call') == $time.daystart + 1>>
 		<<actCLA '"See you tomorrow"'>>
 			<<setinit $booty_call['leave_dialogue'] = 'See you tomorrow'>>
 			<<gs 'booty_call_leave' 'leaving_action'>>
@@ -126,9 +126,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'breakup_start'>>
 	<<actCLA 'Break things off'>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"This is the last time I'm coming over," you say, abruptly.
-		<p>"Huh?" <<=$npcs.get($boy,'firstname')>> looks at you oddly. "What are you talking about?"</p>
+		<p>"Huh?" <<=$npcs.get($sex.npcId,'firstname')>> looks at you oddly. "What are you talking about?"</p>
 		"Don't text me expecting a booty call after this."
 		<p>"Why not?" he asks.</p>
 		<<actCLA 'Don`t explain'>>
@@ -143,7 +143,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'unsatisfied_breakup'>>
 	<<actCLA 'You don`t satisfy me'>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"You're just not what I want out of a fuckbuddy," you say flatly.
 		<<actCLA 'Sexually incompatible'>>
 			<<video "shared/romance/misc/depart_annoyed1.mp4">>
@@ -151,23 +151,23 @@
 			You shrug once, grab your things, and leave without another word.
 			<<gs 'booty_call_leave' 'break_up'>>
 		<</actCLA>>
-		<<if $npcs.get($boy,'sexdrive') == 1 or $npcs.get($boy,'two_pump') == 1>>
+		<<if $npcs.get($sex.npcId,'sexdrive') == 1 or $npcs.get($sex.npcId,'two_pump') == 1>>
 			<<actCLA 'You`re a two pump chump'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"You're just not what I want out of a fuckbuddy," you say flatly. "You come too fast. I can't trust you to get me off."
 				<p>"Wait but-"</p>
 				<<gs 'booty_call_leave' 'isnt_going_to_work'>>
 			<</actCLA>>
-		<<elseif $npcs.get($boy,'sexdrive') < 5>>
+		<<elseif $npcs.get($sex.npcId,'sexdrive') < 5>>
 			<<actCLA 'You don`t last long enough for me'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"You're just not what I want out of a fuckbuddy," you say flatly. "You can't keep it up and I can't trust you to get me off."
 				<p>"Wait but-"</p>
 				<<gs 'booty_call_leave' 'isnt_going_to_work'>>
 			<</actCLA>>
 		<<else>>
 			<<actCLA 'You last too long'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"You're just not what I want out of a fuckbuddy," you say flatly. "Honestly, your sex drive is way too high. By the time you're satisfied, my pussy is sore."
 				<p>"Wait but-"</p>
 				<<gs 'booty_call_leave' 'isnt_going_to_work'>>
@@ -179,10 +179,10 @@
 <<if $location_var[$here][0] == 'no_more_cheating_breakup'>>
 	<<if getvar("$pcs_lovers") > 0 and $npc_know_have_boyfriend + getvar("$npc_know_have_girlfriend") == 0>>
 		<<actCLA 'I`ve started seeing somebody'>>
-			<<run $npcs.set($boy,'know_cheat',1)>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<run $npcs.set($sex.npcId,'know_cheat',1)>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"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 $npcs.get($boy,'fidelity') < 7>>
+			<<if $npcs.get($sex.npcId,'fidelity') < 7>>
 				<p>"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?"</p>
 				<<actCLA 'No means no'>>
 					<<video "shared/romance/misc/depart_annoyed1.mp4">>
@@ -193,9 +193,9 @@
 				<<actCLA 'Well...'>>
 					You pause, biting your lip in consideration.
 					<<actCLA 'As long as it`s just physical'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"Well..." you say slowly. "As long as it's <i>just</i> physical..."
-						<p>"Thatta girl," <<=$npcs.get($boy,'firstname')>> grins from bed.</p>
+						<p>"Thatta girl," <<=$npcs.get($sex.npcId,'firstname')>> grins from bed.</p>
 						<<gs 'booty_call_after' 'cheating_end'>>
 					<</actCLA>>
 					<<actCLA 'Set some rules'>>
@@ -221,7 +221,7 @@
 		<<if $pcs_lovers - getvar("$pcs_girlfriends") > 0>>
 			<<actCLA 'I can`t keep cheating on my boyfriend'>>
 				<<video "shared/romance/misc/depart_annoyed1.mp4">>
-				<<if $npcs.get($boy,'know_cheat') == 1>>
+				<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
 					"I can't keep cheating on my boyfriend like this," you say, hanging your head shamefully. "It's wrong, and I just can't do this anymore. I have to go."
 				<<else>>
 					<p>"The truth is, I'm in a relationship with somebody," you say, hanging your head shamefully. "I've been cheating on them with you this whole time. It's wrong, and I— I just can't do this anymore!"</p>
@@ -233,7 +233,7 @@
 		<<if getvar("$pcs_girlfriends") > 0>>
 			<<actCLA 'I can`t keep cheating on my girlfriend'>>
 				<<video "shared/romance/misc/depart_annoyed1.mp4">>
-				<<if $npcs.get($boy,'know_cheat') == 1>>
+				<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
 					"I can't keep cheating on my girlfriend like this," you say, hanging your head shamefully. "It's wrong, and I just can't do this anymore. I have to go."
 				<<else>>
 					<p>"The truth is, I'm in a relationship with somebody," you say, hanging your head shamefully. "I've been cheating on them with you this whole time. It's wrong, and I— I just can't do this anymore!"</p>
@@ -253,12 +253,12 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'no_condom_breakoff'>>
-	<<if $npcs.get($boy,'no_condoms_know') == 1>>
+	<<if $npcs.get($sex.npcId,'no_condoms_know') == 1>>
 		<<actCLA 'I can`t do this (break things off)'>>
 			<!-- !! add in rape chance later-->
 			<<video "shared/romance/misc/depart_annoyed1.mp4">>
 			"Fuck this," you say, getting up and grabbing your clothes.
-			<p>"Where the fuck are you going?" <<=$npcs.get($boy,'firstname')>> asks in bewilderment.</p>
+			<p>"Where the fuck are you going?" <<=$npcs.get($sex.npcId,'firstname')>> asks in bewilderment.</p>
 			"I'm not gonna be fuckbuddies with a guy who never uses condoms," you sneer at him. "<i>Don't</i> text me again."
 			The second you're dressed you stalk out the door and slam it behind you.
 			<<gs 'booty_call_leave' 'break_up'>>
@@ -270,19 +270,19 @@
 		<<gt 'booty_call_leave' 'sneak_out2'>>
 	<</actCLA>>
 	<<actCLA 'Leave a note'>>
-		<<=$npcs.get($boy,'apt_hall')>>
-		<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($boy,'firstname')>> either, you find a piece of paper and a pen and scribble out a quick message.</p>
+		<<=$npcs.get($sex.npcId,'apt_hall')>>
+		<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you find a piece of paper and a pen and scribble out a quick message.</p>
 		<<gs 'booty_call_leave' 'sneak_out_note1'>>
 	<</actCLA>>
 	<<if $wardrobe.pantyworntype != 'none'>>
 		<<actCLA 'Leave your panties'>>
-			<<run $npcs.inc($boy,'panty_give',1)>>
+			<<run $npcs.inc($sex.npcId,'panty_give',1)>>
 			<<gs 'panties' 'dispose'>>
-			<<=$npcs.get($boy,'apt_hall')>>
+			<<=$npcs.get($sex.npcId,'apt_hall')>>
 			<<if getvar("$CloSkirtShortness") > 0>>
-				<p>Suddenly feeling naughty, you quickly slip your panties down your legs, leaving your pussy bare underneath your skirt. You loop your warm underwear around the handle of <<=$npcs.get($boy,'firstname')>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
+				<p>Suddenly feeling naughty, you quickly slip your panties down your legs, leaving your pussy bare underneath your skirt. You loop your warm underwear around the handle of <<=$npcs.get($sex.npcId,'firstname')>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
 			<<else>>
-				<p>Suddenly feeling naughty, you pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up back up, sans panties. You loop your warm underwear around the handle of <<=$npcs.get($boy,'firstname')>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
+				<p>Suddenly feeling naughty, you pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up back up, sans panties. You loop your warm underwear around the handle of <<=$npcs.get($sex.npcId,'firstname')>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
 			<</if>>
 			<<actCLA 'Leave'>>
 				<<gt 'booty_call_leave' 'exit'>>
@@ -290,13 +290,13 @@
 		<</actCLA>>
 		<<actCLA 'Leave your a note on your panties'>>
 			<<setinit $booty_call['panty_note'] = 1>>
-			<<run $npcs.inc($boy,'panty_give',1)>>
+			<<run $npcs.inc($sex.npcId,'panty_give',1)>>
 			<<gs 'panties' 'dispose'>>
-			<<=$npcs.get($boy,'apt_hall')>>
+			<<=$npcs.get($sex.npcId,'apt_hall')>>
 			<<if getvar("$CloSkirtShortness") > 0>>
-				<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($boy,'firstname')>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly slip your panties down from underneath your skirt and then rummage for a big marker.</p>
+				<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly slip your panties down from underneath your skirt and then rummage for a big marker.</p>
 			<<else>>
-				<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($boy,'firstname')>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up, sans panties. Then you rummage for a big marker.</p>
+				<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up, sans panties. Then you rummage for a big marker.</p>
 			<</if>>
 			You pop the cap with a grin and start scribbling.
 			<<gs 'booty_call_leave' 'sneak_out_note1'>>
@@ -305,20 +305,20 @@
 <</if>>
 <<if $location_var[$here][0] == 'sneak_out_note1'>>
 	<<actCLA 'Thanks for letting me stay over'>>
-		<<=$npcs.get($boy,'apt_hall')>>
+		<<=$npcs.get($sex.npcId,'apt_hall')>>
 		<<setinit $booty_call['note_desc1'] = '<i>Thanks for letting me spend the night.</i>'>>
 		$booty_call['note_desc1']
 		<<gs 'booty_call_leave' 'sneak_out_note2'>>
 	<</actCLA>>
 	<<actCLA 'I had a good time'>>
-		<<=$npcs.get($boy,'apt_hall')>>
+		<<=$npcs.get($sex.npcId,'apt_hall')>>
 		<<setinit $booty_call['note_desc1'] = '<i>I had a good time last night.</i>'>>
 		$booty_call['note_desc1']
 		<<gs 'booty_call_leave' 'sneak_out_note2'>>
 	<</actCLA>>
 	<<if getvar("$booty_call['fuck_count']") > 0>>
 		<<actCLA 'Thanks for the fuck'>>
-			<<=$npcs.get($boy,'apt_hall')>>
+			<<=$npcs.get($sex.npcId,'apt_hall')>>
 			<<setinit $booty_call['note_desc1'] = '<i>Thanks for the fuck.</i>'>>
 			$booty_call['note_desc1']
 			<<gs 'booty_call_leave' 'sneak_out_note2'>>
@@ -344,35 +344,35 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'sneak_out_note3'>>
-	<<=$npcs.get($boy,'apt_hall')>>
+	<<=$npcs.get($sex.npcId,'apt_hall')>>
 	<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>>
 	You sign it with...
 	<<actCLA 'Just your name'>>
-		<<=$npcs.get($boy,'apt_hall')>>
+		<<=$npcs.get($sex.npcId,'apt_hall')>>
 		<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> - <<$pc.name_nick>>
 		<<gs 'booty_call_leave' 'sneak_out_note_end'>>
 	<</actCLA>>
 	<<actCLA 'A smiley face'>>
-		<<=$npcs.get($boy,'apt_hall')>>
+		<<=$npcs.get($sex.npcId,'apt_hall')>>
 		<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> <b><i>:)</i></b>
 		You leave a little face, unable to keep yourself from smiling as you dot two little eyes over the mouth.
 		<<gs 'booty_call_leave' 'sneak_out_note_end'>>
 	<</actCLA>>
 	<<actCLA 'A winky face'>>
-		<<=$npcs.get($boy,'apt_hall')>>
+		<<=$npcs.get($sex.npcId,'apt_hall')>>
 		<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> <b><i>;)</i></b>
 		You leave a little face, unable to keep yourself from smiling as you dot little winky eyes over the mouth.
 		<<gs 'booty_call_leave' 'sneak_out_note_end'>>
 	<</actCLA>>
 	<<actCLA 'A heart'>>
-		<<=$npcs.get($boy,'apt_hall')>>
+		<<=$npcs.get($sex.npcId,'apt_hall')>>
 		<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> <b><i><3</i></b>
 		You punctuate the note with a tiny little heart, feeling warmth in your chest as you do.
 		<<gs 'booty_call_leave' 'sneak_out_note_end'>>
 	<</actCLA>>
 	<<if $pc.pcs_makeup > 2>>
 		<<actCLA 'A kiss'>>
-			<<=$npcs.get($boy,'apt_hall')>>
+			<<=$npcs.get($sex.npcId,'apt_hall')>>
 			<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>>
 			<<if getvar("$booty_call['panty_note']") == 1>>
 				You run your tongue over your lips and press them together a moment before planting a big sloppy wet smooch on your own underwear. As you pull back, your lipstick leaves a large kiss on the soft fabric. Good thing you did your makeup before you left.
@@ -385,7 +385,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'sneak_out_note_end'>>
 	<<if getvar("$booty_call['panty_note']") == 1>>
-		<p>Satisfied, you leave your panties on the counter and quietly slip out the door, wondering what <<=$npcs.get($boy,'firstname')>> will think when he discovers them.</p>
+		<p>Satisfied, you leave your panties on the counter and quietly slip out the door, wondering what <<=$npcs.get($sex.npcId,'firstname')>> will think when he discovers them.</p>
 	<<else>>
 		Satisfied, you leave your note on the counter and quietly slip out the door, letting it click shut behind you.
 	<</if>>
@@ -394,8 +394,8 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'sneak_out2'>>
-	<<=$npcs.get($boy,'apt_hall')>>
-	<p>You tip toe your way to the door, turning the handle as gently as you can so you don't disturb <<=$npcs.get($boy,'firstname')>>, closing it with a soft click behind you.</p>
+	<<=$npcs.get($sex.npcId,'apt_hall')>>
+	<p>You tip toe your way to the door, turning the handle as gently as you can so you don't disturb <<=$npcs.get($sex.npcId,'firstname')>>, closing it with a soft click behind you.</p>
 	<<actCLA 'Leave'>>
 		<<gt 'booty_call_leave' 'exit'>>
 	<</actCLA>>
@@ -435,7 +435,7 @@
 		<!-- !! IMAGE HERE-->
 		<!-- !! hotel room image-->
 	<<else>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'dress_start_desc'>>
@@ -449,18 +449,18 @@
 <<if $location_var[$here][0] == 'dressing1'>>
 	<!-- !!	gs'booty_call_leave', 'dress'-->
 	<<gs 'booty_call_leave' 'dress_loop'>>
-	<<if getvar("$booty_call['sleepover']") == 1 and $npcs.get($boy,'latesleeper') == 1 and getvar("$booty_call['boy_asleep']") != 0>>
+	<<if getvar("$booty_call['sleepover']") == 1 and $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$booty_call['boy_asleep']") != 0>>
 		<<if getvar("$booty_call['towel']") == 1>>
 			<<setinit $booty_call['towel'] = 0>>
-			<p>You drop the towel and quietly reach down for your clothes and try to pick them up without waking <<=$npcs.get($boy,'firstname')>>.</p>
+			<p>You drop the towel and quietly reach down for your clothes and try to pick them up without waking <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 		<<else>>
-			<p>You quietly reach down for where you left your clothes and try to pick them up without waking <<=$npcs.get($boy,'firstname')>>.</p>
+			<p>You quietly reach down for where you left your clothes and try to pick them up without waking <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 		<</if>>
 		<<gs 'booty_call_leave' 'dressing2'>>
 	<<else>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
 		<<if getvar("$booty_call['angry_after']") == 1 or getvar("$booty_call['annoyed']") > 0>>
-			<p>"I have to go," you say flatly, reaching down for your clothes without looking at <<=$npcs.get($boy,'firstname')>>.</p>
+			<p>"I have to go," you say flatly, reaching down for your clothes without looking at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<<elseif getvar("$booty_call['cant_stay']") == 1>>
 			<!-- !! there is an additional dress_loop here to make it possible to give panties here-->
@@ -469,7 +469,7 @@
 			<<gs 'booty_call_leave' 'dressing2'>>
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<<elseif getvar("$booty_call['npc_late']") == 0>>
-			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks as you are $booty_call['dress_describe'].</p>
+			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you are $booty_call['dress_describe'].</p>
 			<<gs 'booty_call_leave' 'not_leaving'>>
 			<<gs 'booty_call_leave' 'leaving_soon'>>
 			<<gs 'booty_call_leave' 'something_to_do'>>
@@ -485,7 +485,7 @@
 				<<gs 'booty_call_leave' 'dress_talk'>>
 			<</if>>
 		<<else>>
-			<p><<=$npcs.get($boy,'firstname')>> starts getting dressed next to you.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> starts getting dressed next to you.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
 		<!-- !!	act'Talk while you dress':-->
@@ -506,7 +506,7 @@
 <<if $location_var[$here][0] == 'dressing_finish'>>
 	<!-- !!	if booty_call['dress_end'] ! 1:-->
 	<<actCLA 'Finish getting dressed'>>
-		<!-- !!			<<=$npcs.get($boy,'apt_bedroom')>>-->
+		<!-- !!			<<=$npcs.get($sex.npcId,'apt_bedroom')>>-->
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>You finish $booty_call['dress_describe'].</p>
 		<<gs 'booty_call_after' 'after_sex_dressed'>>
@@ -517,7 +517,7 @@
 	<<actCLA 'Not yet'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 		<p>"Not yet," you say, $booty_call['dress_describe']. "Just tired of hanging around naked."</p>
 		"I'm never tired of seeing you naked."
 		"Whatever," you roll your eyes.
@@ -529,14 +529,14 @@
 		<<setinit $booty_call['leaving'] = 1>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 		<<if getvar("$booty_call['sleepover']") < 1>>
 			<p>"Yeah," you say, $booty_call['dress_describe'].</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<<else>>
 			<p>"Yeah," you say, $booty_call['dress_describe'].</p>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$sex.npcId] == $time.weekday or $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				<<gs 'booty_call_leave' 'dressing2'>>
@@ -551,7 +551,7 @@
 			<<actCLA 'Going to the disco'>>
 				<<gs 'booty_call_leave' 'dress_loop'>>
 				<<gs 'booty_call_leave' 'dress_start_desc'>>
-				<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+				<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 				<<if getvar("$booty_call['disco_after']") == 1>>
 					<p>"Weren't you listening to me?" you say, $booty_call['dress_describe']. "I told you, I'm going to the disco tonight."</p>
 				<<else>>
@@ -565,7 +565,7 @@
 			<<actCLA 'Going to the club'>>
 				<<gs 'booty_call_leave' 'dress_loop'>>
 				<<gs 'booty_call_leave' 'dress_start_desc'>>
-				<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+				<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 				<<if getvar("$booty_call['club_after']") == 1>>
 					<p>"Weren't you listening to me?" you say, $booty_call['dress_describe']. "I told you, I'm going clubbing tonight."</p>
 				<<else>>
@@ -584,7 +584,7 @@
 			<<setinit $booty_call['mom_kill'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 			<<if $time.hour < 3>>
 				<p>"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."</p>
 			<<else>>
@@ -600,7 +600,7 @@
 		<<actCLA 'Need to finish my homework'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "I need to do my homework."</p>
 			<!-- !!			if rand(0,1) = 1:-->
 			<p>"Seriously? That's what you're in a rush for?"</p>
@@ -625,14 +625,14 @@
 		<<setinit $booty_call['leaving'] = 1>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 		<<if getvar("$booty_call['sleepover']") < 1>>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "Have a few things I need to get done."</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<<else>>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "Have a few things I need to get done. Thanks for letting me spend the night."</p>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$sex.npcId] == $time.weekday or $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				"No problem."
@@ -646,14 +646,14 @@
 		<<setinit $booty_call['leaving'] = 1>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 		<<if getvar("$booty_call['sleepover']") < 1>>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "Need to see a friend later."</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<<else>>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "Need to see a friend later. Thanks for letting me spend the night."</p>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$sex.npcId] == $time.weekday or $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				"No problem."
@@ -668,9 +668,9 @@
 			<<setinit $booty_call['leaving'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 			<p>"Yeah," you smirk, $booty_call['dress_describe']. "Got another booty call to show up to."</p>
-			<p>"You really get around don't you?" <<=$npcs.get($boy,'firstname')>> smirks back.</p>
+			<p>"You really get around don't you?" <<=$npcs.get($sex.npcId,'firstname')>> smirks back.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<</actCLA>>
@@ -681,7 +681,7 @@
 		<<actCLA 'School'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 			<<if getvar("$booty_call['late_for_school']") == 1 and $time.hour >= 8>>
 				<p>"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.</p>
 			<<elseif getvar("$booty_call['late_for_school']") == 1>>
@@ -691,7 +691,7 @@
 			<<else>>
 				<p>"Gotta get ready for school," you say, $booty_call['dress_describe']. "Thanks for letting me spend the night."</p>
 			<</if>>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$sex.npcId] == $time.weekday or $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				"No problem."
@@ -706,10 +706,10 @@
 		<<actCLA 'It`s a school night'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 			<!-- !! if schoolprogul = 1:-->
 			<p>"It's a school night," you say, $booty_call['dress_describe']. "Gotta get home so I can set my alarm and get up for class tomorrow."</p>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$sex.npcId] == $time.weekday or $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				<<gs 'booty_call_leave' 'dressing2'>>
@@ -721,17 +721,17 @@
 <<if $location_var[$here][0] == 'panty_gift'>>
 	<<if $wardrobe.pantyworntype != 'none' and $wardrobe.braworntype == 'none' and $wardrobe.clothingworntype == 'nude' and getvar("$booty_call['mad']") == 0 and getvar("$booty_call['fuck_count']") > 0>>
 		<<actCLA 'Give him your panties'>>
-			<<run $npcs.inc($boy,'panty_give',1)>>
+			<<run $npcs.inc($sex.npcId,'panty_give',1)>>
 			<<gs 'panties' 'dispose'>>
 			<<video "shared/romance/misc/panty_gift.mp4">>
 			Just after you put on your panties, a sexy thought pops into your head.
 			"But before I go," you say mischievously. "I have a gift for you."
-			<<if $npcs.get($boy,'panty_give') == 1>>
-				<p>"A gift?" <<=$npcs.get($boy,'firstname')>> asks curiously.</p>
-				<p>In one smooth motion, you slide your panties down your legs and daintily toss them onto the rumpled sheets of the bed on which you fucked <<=$npcs.get($boy,'firstname')>>.</p>
+			<<if $npcs.get($sex.npcId,'panty_give') == 1>>
+				<p>"A gift?" <<=$npcs.get($sex.npcId,'firstname')>> asks curiously.</p>
+				<p>In one smooth motion, you slide your panties down your legs and daintily toss them onto the rumpled sheets of the bed on which you fucked <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 				<<gs 'booty_call_leave' 'panty_gift2'>>
 			<<else>>
-				<p>"Another pair of your panties?" <<=$npcs.get($boy,'firstname')>> grins.</p>
+				<p>"Another pair of your panties?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 				<p>"You guessed correctly," you grin back. "And your prize is-!"</p>
 				In one smooth motion, you slide your panties down your legs and daintily toss them into the rumpled sheets of the bed you were just fucked in.
 				"Enjoy," you smirk.
@@ -744,15 +744,15 @@
 	<<actCLA 'You did a good job'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"You did a good job," you smile, $booty_call['dress_describe']. "Consider that your reward."</p>
-		<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
-			<<if getvar("$pc_know_npc_has_girlfriend["+$boy+"]") == 0>>
-				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
+		<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
+			<<if getvar("$pc_know_npc_has_girlfriend["+$sex.npcId+"]") == 0>>
+				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
 
 			<</if>>
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'booty_call_leave' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p><<=$npcs.get($boy,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
 	<</actCLA>>
@@ -763,30 +763,30 @@
 		<<else>>
 			<p>"Something to remember the day," you smile, $booty_call['dress_describe']. "Keep the good times in mind."</p>
 		<</if>>
-		<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
-			<<if getvar("$pc_know_npc_has_girlfriend["+$boy+"]") == 0>>
-				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
+		<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
+			<<if getvar("$pc_know_npc_has_girlfriend["+$sex.npcId+"]") == 0>>
+				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
 
 			<</if>>
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'booty_call_leave' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p>"Maybe I should frame it," <<=$npcs.get($boy,'firstname')>> snickers.</p>
+			<p>"Maybe I should frame it," <<=$npcs.get($sex.npcId,'firstname')>> snickers.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Consider it a trophy'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"Consider it a trophy," you smile, $booty_call['dress_describe']. "Think of it as proof of conquest."</p>
-		<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
-			<<if getvar("$pc_know_npc_has_girlfriend["+$boy+"]") == 0>>
-				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
+		<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
+			<<if getvar("$pc_know_npc_has_girlfriend["+$sex.npcId+"]") == 0>>
+				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
 
 			<</if>>
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'booty_call_leave' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p><<=$npcs.get($boy,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
 	<</actCLA>>
@@ -794,15 +794,15 @@
 		<<actCLA 'To remember my virginity'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<p>"To remember my virginity," you smile, $booty_call['dress_describe']. "And that you made me a woman."</p>
-			<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
-				<<if getvar("$pc_know_npc_has_girlfriend["+$boy+"]") == 0>>
-					<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
+			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
+				<<if getvar("$pc_know_npc_has_girlfriend["+$sex.npcId+"]") == 0>>
+					<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
 
 				<</if>>
 				<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 				<<gs 'booty_call_leave' 'panty_gift_girlfriend'>>
 			<<else>>
-				<p><<=$npcs.get($boy,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
 				<<gs 'booty_call_leave' 'dressing2'>>
 			<</if>>
 		<</actCLA>>
@@ -820,24 +820,24 @@
 	<<actCLA 'Say they`re yours'>>
 		<<gs 'booty_call_leave' 'dress_loop_code'>>
 		<p>"Tell her they're yours," you shrug with a wry smirk, $booty_call['dress_describe']. "A guy can't wear a cute pair of panties now and then?"</p>
-		<<if $npcs.get($boy,'insecure') == 1>>
+		<<if $npcs.get($sex.npcId,'insecure') == 1>>
 			<<gs 'booty_call_leave' 'dress_loop_code'>>
-			<p><<=$npcs.get($boy,'firstname')>>'s face immediately reddens and he looks at you with an angry glare.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>>'s face immediately reddens and he looks at you with an angry glare.</p>
 			<p>"What the fuck? I'm not some twink who puts on girlie panties like a fucking faggot!"</p>
 			<<actCLA 'I was kidding (amused)'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"I was just kidding," you snicker, rolling your eyes. "Bad joke, sorry."
-				<p>You move to $booty_call['dress_describe'] but <<=$npcs.get($boy,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
+				<p>You move to $booty_call['dress_describe'] but <<=$npcs.get($sex.npcId,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
 				<<gs 'booty_call_leave' 'dressing2'>>
 			<</actCLA>>
 			<<actCLA 'I was kidding (acerbic)'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
-				<p>"Christ, I was just kidding," you say, giving <<=$npcs.get($boy,'firstname')>> a look of exasperation. "Of course I wasn't seriously suggesting that. Take a joke, dumbass."</p>
-				<p>You start $booty_call['dress_describe'] but <<=$npcs.get($boy,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+				<p>"Christ, I was just kidding," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a look of exasperation. "Of course I wasn't seriously suggesting that. Take a joke, dumbass."</p>
+				<p>You start $booty_call['dress_describe'] but <<=$npcs.get($sex.npcId,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
 				<<gs 'booty_call_leave' 'dressing2'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($boy,'firstname')>> laughs aloud.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> laughs aloud.</p>
 			"Yeah, I bet that''d get me off the hook."
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
@@ -990,11 +990,11 @@
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<p>"Got any plans for the rest day?" you ask, casually $booty_call['dress_describe'].</p>
 			<<gs 'booty_call_leave' 'dress_talk'>>
-			<<if $npcs.get($boy,'day_off') == $time.weekday>>
-				<p>"Not really," <<=$npcs.get($boy,'firstname')>> shrugs. "It's my day off so I'm just chilling."</p>
+			<<if $npcs.get($sex.npcId,'day_off') == $time.weekday>>
+				<p>"Not really," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "It's my day off so I'm just chilling."</p>
 				<<gs 'booty_call_leave' 'pc_booty_call_invite'>>
 			<<else>>
-				<p>"I have to go to work," <<=$npcs.get($boy,'firstname')>> replies.</p>
+				<p>"I have to go to work," <<=$npcs.get($sex.npcId,'firstname')>> replies.</p>
 				<<gs 'booty_call_leave' 'when_do_you_get_off'>>
 			<</if>>
 		<</actCLA>>
@@ -1016,15 +1016,15 @@
 			<<setinit $booty_call['good_time'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<if getvar("$booty_call['spend_night_thanks']") == 1>>
-				<p>"Last night was really great," you smile at <<=$npcs.get($boy,'firstname')>>. "I had a lot of fun."</p>
+				<p>"Last night was really great," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I had a lot of fun."</p>
 			<<elseif getvar("$booty_call['sleepover']") == 1>>
-				<p>"I had a great time last night," you smile at <<=$npcs.get($boy,'firstname')>>.</p>
+				<p>"I had a great time last night," you smile at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 			<<else>>
-				<p>"This was really fun," you smile at <<=$npcs.get($boy,'firstname')>>. "I had a great time."</p>
+				<p>"This was really fun," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I had a great time."</p>
 			<</if>>
 			<<if getvar("$booty_call['blue_ball']") == 0>>
 				<p>"Me too," he smirks back, watching you $booty_call['dress_describe'].</p>
-			<<elseif $npcs.get($boy,'selfish') == 1>>
+			<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
 				"Still bullshit that I didn''t get to finish properly," he mutters sourly.
 			<<else>>
 				<p>"I just wish it didn't have to end so soon," he replies, watching you $booty_call['dress_describe'].</p>
@@ -1043,14 +1043,14 @@
 			<<setinit $booty_call['spend_night_thanks'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<if getvar("$booty_call['good_time']") == 1>>
-				<p>"Thanks for letting me stay over too," you tell <<=$npcs.get($boy,'firstname')>>. "I really appreciate it."</p>
+				<p>"Thanks for letting me stay over too," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "I really appreciate it."</p>
 			<<else>>
-				<p>"Thanks for letting me spend the night," you tell <<=$npcs.get($boy,'firstname')>>. "I really appreciate it."</p>
+				<p>"Thanks for letting me spend the night," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "I really appreciate it."</p>
 			<</if>>
-			<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
-				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
+			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
+				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
 				<p>"Lucky my girlfriend wasn't coming over," he smirks back, watching you $booty_call['dress_describe'].</p>
-			<<elseif $npcs.get($boy,'caretaker') == 1 or $npcs.get($boy,'generous') == 1>>
+			<<elseif $npcs.get($sex.npcId,'caretaker') == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 				<p>"Yeah no problem," he smiles back, watching you $booty_call['dress_describe'].</p>
 			<<elseif getvar("$booty_call['pass_out']") == 1>>
 				<p>"You passed out on me," he shrugs, watching you $booty_call['dress_describe']. "What was I supposed to do? Wake you up and kick you out?"</p>
@@ -1068,7 +1068,7 @@
 	<<actCLA 'Ask what time he gets off'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"What time do you get off?" you ask while $booty_call['dress_describe'].</p>
-		<p>"Around npc_start_free_time[$boy]. Why?"</p>
+		<p>"Around npc_start_free_time[$sex.npcId]. Why?"</p>
 		<<actCLA 'Just curious'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<p>"Just curious," you shrug, $booty_call['dress_describe'] next.</p>
@@ -1086,17 +1086,17 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'npc_date_later_response'>>
-	<<if $npcs.get($boy,'know_cheat') == 1>>
-		<<if $npcs.get($boy,'fidelity') < 7>>
-			<p>"You're still with that stick in the mud?" <<=$npcs.get($boy,'firstname')>> scoffs.</p>
+	<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
+		<<if $npcs.get($sex.npcId,'fidelity') < 7>>
+			<p>"You're still with that stick in the mud?" <<=$npcs.get($sex.npcId,'firstname')>> scoffs.</p>
 		<<else>>
 		<</if>>
 	<<else>>
-		<<run $npcs.set($boy,'know_cheat',1)>>
-		<<if $npcs.get($boy,'fidelity') < 7>>
-			<p>"And you're fucking me right before your date?" <<=$npcs.get($boy,'firstname')>> snickers. "Hot."</p>
+		<<run $npcs.set($sex.npcId,'know_cheat',1)>>
+		<<if $npcs.get($sex.npcId,'fidelity') < 7>>
+			<p>"And you're fucking me right before your date?" <<=$npcs.get($sex.npcId,'firstname')>> snickers. "Hot."</p>
 		<<else>>
-			<p>"Oh." <<=$npcs.get($boy,'firstname')>> looks away uncomfortably.</p>
+			<p>"Oh." <<=$npcs.get($sex.npcId,'firstname')>> looks away uncomfortably.</p>
 		<</if>>
 	<</if>>
 <</if>>
@@ -1105,25 +1105,25 @@
 		<<actCLA 'Ask to come over later'>>
 			<<setinit $booty_call['invite_today'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
-			<<if $npcs.get($boy,'day_off') == $time.weekday>>
+			<<if $npcs.get($sex.npcId,'day_off') == $time.weekday>>
 				<<if getvar("$booty_call['sleepover']") == 1>>
 					<p>"Want to do this again later?" you grin, $booty_call['dress_describe'].</p>
 				<<else>>
 					<p>"Want to do this again later?" you grin, $booty_call['dress_describe']. "In the daytime?"</p>
 				<</if>>
-				<<if rand(1,10) / 2 <= $npcs.get($boy,'sexdrive')>>
+				<<if rand(1,10) / 2 <= $npcs.get($sex.npcId,'sexdrive')>>
 					<p>"Maybe. What time were you thinking?"</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_timeset'>>
 				<<else>>
-					<p>"Twice in one day might be a little bit too much for me," <<=$npcs.get($boy,'firstname')>> smiles back ruefully.</p>
+					<p>"Twice in one day might be a little bit too much for me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back ruefully.</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 				<</if>>
 			<<else>>
-				<<if rand(1,10) / 2 <= $npcs.get($boy,'sexdrive')>>
+				<<if rand(1,10) / 2 <= $npcs.get($sex.npcId,'sexdrive')>>
 					<p>"What time were you thinking?"</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_timeset'>>
 				<<else>>
-					<p>"Think I might be a little too tapped out from work," <<=$npcs.get($boy,'firstname')>> grunts.</p>
+					<p>"Think I might be a little too tapped out from work," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 				<</if>>
 			<</if>>
@@ -1133,8 +1133,8 @@
 			<<setinit $booty_call['invite_tomorrow'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<p>"Want to do this again tomorrow?" you ask, flashing a smile while you're $booty_call['dress_describe'].</p>
-			<<if $npcs.get($boy,'day_off') == $time.weekday + 1 or ($npcs.get($boy,'day_off') == 1 and $time.weekday == 7)>>
-				<<if rand(1,10) / 2 <= $npcs.get($boy,'sexdrive')>>
+			<<if $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($npcs.get($sex.npcId,'day_off') == 1 and $time.weekday == 7)>>
+				<<if rand(1,10) / 2 <= $npcs.get($sex.npcId,'sexdrive')>>
 					<p>"Hmm... It'll be my day off... What time were you thinking?"</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_timeset'>>
 				<<else>>
@@ -1142,7 +1142,7 @@
 					<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 				<</if>>
 			<<else>>
-				<<if rand(1,10) / 2 <= $npcs.get($boy,'sexdrive')>>
+				<<if rand(1,10) / 2 <= $npcs.get($sex.npcId,'sexdrive')>>
 					<p>"What time were you thinking?"</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_timeset'>>
 				<<else>>
@@ -1156,9 +1156,9 @@
 <<if $location_var[$here][0] == 'pc_booty_call_timeset'>>
 	<<actCLA 'How about...'>>
 		<<warn 'JUMP MARKER ENCOUNTERED: :invalid_timeset'>>
-		<<run $npcs.set($boy,'booty_call_time',input ("When do you want to set your reminder? (Pick an hour 1 - 22. A reminder icon will appear in the stat display during that hour.)"))>>
-		<<if $npcs.get($boy,'booty_call_time') < $npcs.get($boy,'start_free_time') or $npcs.get($boy,'booty_call_time') > 22>>
-			<<msg 'Invalid input. Pick an hour between npc_start_free_time[$boy] and 22.'>>
+		<<run $npcs.set($sex.npcId,'booty_call_time',input ("When do you want to set your reminder? (Pick an hour 1 - 22. A reminder icon will appear in the stat display during that hour.)"))>>
+		<<if $npcs.get($sex.npcId,'booty_call_time') < $npcs.get($sex.npcId,'start_free_time') or $npcs.get($sex.npcId,'booty_call_time') > 22>>
+			<<msg 'Invalid input. Pick an hour between npc_start_free_time[$sex.npcId] and 22.'>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump invalid_timeset'>>
 		<<else>>
 			<<gs 'booty_call_leave' 'pc_booty_call_invite2'>>
@@ -1168,22 +1168,22 @@
 <<if $location_var[$here][0] == 'pc_booty_call_invite2'>>
 	<<gs 'booty_call_leave' 'dress_loop'>>
 	<<if getvar("$booty_call['invite_today']") == 1>>
-		<<if $npcs.get($boy,'booty_call_time') == $npcs.get($boy,'start_free_time')>>
-			<p>"How about npc_booty_call_time[$boy]?" you smirk $booty_call['dress_describe']. "We can get off together."</p>
+		<<if $npcs.get($sex.npcId,'booty_call_time') == $npcs.get($sex.npcId,'start_free_time')>>
+			<p>"How about npc_booty_call_time[$sex.npcId]?" you smirk $booty_call['dress_describe']. "We can get off together."</p>
 			<<gs 'booty_call_leave' 'pc_booty_call_invite_accepted'>>
 		<<else>>
-			<p>"How about npc_booty_call_time[$boy]?" you ask $booty_call['dress_describe'].</p>
-			<<if $npcs.get($boy,'booty_call_time') > $npcs.get($boy,'end_free_time')>>
-				<p>"Sorry, that doesn't work for me," <<=$npcs.get($boy,'firstname')>> grunts.</p>
+			<p>"How about npc_booty_call_time[$sex.npcId]?" you ask $booty_call['dress_describe'].</p>
+			<<if $npcs.get($sex.npcId,'booty_call_time') > $npcs.get($sex.npcId,'end_free_time')>>
+				<p>"Sorry, that doesn't work for me," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
 				<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 			<<else>>
 				<<gs 'booty_call_leave' 'pc_booty_call_invite_accepted'>>
 			<</if>>
 		<</if>>
 	<<else>>
-		<p>"How about npc_booty_call_time[$boy]?" you ask $booty_call['dress_describe'].</p>
-		<<if $npcs.get($boy,'booty_call_time') > $npcs.get($boy,'end_free_time')>>
-			<p>"Sorry, that doesn't work for me," <<=$npcs.get($boy,'firstname')>> grunts.</p>
+		<p>"How about npc_booty_call_time[$sex.npcId]?" you ask $booty_call['dress_describe'].</p>
+		<<if $npcs.get($sex.npcId,'booty_call_time') > $npcs.get($sex.npcId,'end_free_time')>>
+			<p>"Sorry, that doesn't work for me," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
 			<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 		<<else>>
 			<<gs 'booty_call_leave' 'pc_booty_call_invite_accepted'>>
@@ -1191,7 +1191,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'pc_booty_call_invite_accepted'>>
-	<p>"That sounds good," <<=$npcs.get($boy,'firstname')>> grins back. "Okay, see you then."</p>
+	<p>"That sounds good," <<=$npcs.get($sex.npcId,'firstname')>> grins back. "Okay, see you then."</p>
 	<<gs 'booty_call' 'set_booty_call_date'>>
 	<<gs 'booty_call_leave' 'dress_talk'>>
 <</if>>
@@ -1205,36 +1205,36 @@
 	<<if getvar("$booty_call['plans_later_talk']") == 0>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<setinit $booty_call['plans_later_talk'] = 1>>
-		<<if $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1)>>
+		<<if $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1)>>
 			<<setinit $booty_call['invite_tomorrow'] = 1>>
-			<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
-				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
-				<p>"You busy tomorrow?" <<=$npcs.get($boy,'firstname')>> asks as you're $booty_call['dress_describe']. "It'll be my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
+			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
+				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
+				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It'll be my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
 			<<else>>
-				<p>"You busy tomorrow?" <<=$npcs.get($boy,'firstname')>> asks as you're $booty_call['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
+				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
 			<</if>>
-		<<elseif $npcs.get($boy,'day_off') == $time.weekday and (getvar("$booty_call['sleepover']") == 1 or $time.hour < 5)>>
+		<<elseif $npcs.get($sex.npcId,'day_off') == $time.weekday and (getvar("$booty_call['sleepover']") == 1 or $time.hour < 5)>>
 			<<setinit $booty_call['invite_today'] = 1>>
-			<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
-				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
-				<p>"You busy later?" <<=$npcs.get($boy,'firstname')>> asks as you're $booty_call['dress_describe']. "Today's my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
+			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
+				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
+				<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "Today's my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
 			<<else>>
-				<p>"You busy later?" <<=$npcs.get($boy,'firstname')>> asks as you're $booty_call['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
+				<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
 			<</if>>
 		<<else>>
 			<<setinit $booty_call['invite_tomorrow'] = 1>>
-			<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
-				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
-				<p>"You busy tomorrow?" <<=$npcs.get($boy,'firstname')>> asks as you're $booty_call['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
+			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
+				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
+				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
 			<<else>>
-				<p>"You busy tomorrow?" <<=$npcs.get($boy,'firstname')>> asks as you're $booty_call['dress_describe']. "Want to come by and do this again?"</p>
+				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "Want to come by and do this again?"</p>
 			<</if>>
 		<</if>>
 		<<gs 'booty_call_leave' 'busy_tomorrow'>>
 		<<actCLA 'What time?'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<p>"That depends," you say, $booty_call['dress_describe']. "What time were you thinking?"</p>
-			<p>"npc_start_free_time[$boy]?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+			<p>"npc_start_free_time[$sex.npcId]?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 			<<gs 'booty_call_leave' 'busy_time'>>
 			<<gs 'booty_call_leave' 'booty_call_plan'>>
 		<</actCLA>>
@@ -1249,7 +1249,7 @@
 		<<else>>
 			<p>"I can't, sorry," you say, $booty_call['dress_describe']. "I'm busy."</p>
 		<</if>>
-		<p>"Damn," <<=$npcs.get($boy,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>
 <</if>>
@@ -1258,7 +1258,7 @@
 		<<gs 'booty_call' 'block_booty_calls'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"I can't, sorry," you say, $booty_call['dress_describe']. "I have something to do then."</p>
-		<p>"Damn," <<=$npcs.get($boy,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>
 <</if>>
@@ -1267,24 +1267,24 @@
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"Sounds good," you grin, $booty_call['dress_describe']. "I'll see you then."</p>
-		<p>"Great," <<=$npcs.get($boy,'firstname')>> grins back.</p>
+		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>
 	<<actCLA 'I`ve got nothing better to do'>>
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"Sure," you smirk, $booty_call['dress_describe']. "I got nothing better to do."</p>
-		<p>"Great," <<=$npcs.get($boy,'firstname')>> grins back.</p>
+		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>
 	<<actCLA 'I could fit it in'>>
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"I think I can fit that in," you smirk, $booty_call['dress_describe'].</p>
-		<<if $npcs.get($boy,'humor') == 2>>
-			<p>"You sure can," <<=$npcs.get($boy,'firstname')>> grins lewdly at you.</p>
+		<<if $npcs.get($sex.npcId,'humor') == 2>>
+			<p>"You sure can," <<=$npcs.get($sex.npcId,'firstname')>> grins lewdly at you.</p>
 		<<else>>
-			<p>"Great," <<=$npcs.get($boy,'firstname')>> grins back.</p>
+			<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
 		<</if>>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>

sugarcube/src/activities/bootycall/booty_call_pillow_talk2.tw

@@ -25,38 +25,38 @@
 				<<setinit $booty_call['weather_pillow_talk'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"It's so hot today," you pant. "I'm sweating after that. And not just from the sex."
-				<p>"Yeah," <<=$npcs.get($boy,'firstname')>> nods. "I'm practically dripping."</p>
+				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> nods. "I'm practically dripping."</p>
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 		<<elseif getvar("$weather.temperature") <= 10>>
 			<<actCLA 'It`s so cold'>>
 				<<setinit $booty_call['weather_pillow_talk'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"Brrr," you shiver, cuddling up closer against <<=$npcs.get($boy,'firstname')>>'s body. "It's so chilly today."</p>
-				<p>"You get cold easily?" <<=$npcs.get($boy,'firstname')>> asks, seemingly pleased by your naked body pressed up against his.</p>
+				<p>"Brrr," you shiver, cuddling up closer against <<=$npcs.get($sex.npcId,'firstname')>>'s body. "It's so chilly today."</p>
+				<p>"You get cold easily?" <<=$npcs.get($sex.npcId,'firstname')>> asks, seemingly pleased by your naked body pressed up against his.</p>
 				<<actCLA 'Not really'>>
-					<<setinit $pc_gets_chilly[$boy] = -1>>
+					<<setinit $pc_gets_chilly[$sex.npcId] = -1>>
 					"Not really," you shake your head. "I'm usually pretty tolerant of the cold. Must be the contrast from how warm I was during the sex."
 					<<actCLA 'Smile'>>
-						<p>You smile softly at <<=$npcs.get($boy,'firstname')>> who grins back confidently, wrapping his arm around you.</p>
+						<p>You smile softly at <<=$npcs.get($sex.npcId,'firstname')>> who grins back confidently, wrapping his arm around you.</p>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 					<<actCLA 'Grin'>>
-						<p>You grin at <<=$npcs.get($boy,'firstname')>> who grins back just as wide as he wraps his arm around you.</p>
+						<p>You grin at <<=$npcs.get($sex.npcId,'firstname')>> who grins back just as wide as he wraps his arm around you.</p>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 					<<actCLA 'Demure'>>
-						<p>You snuggle in closer to <<=$npcs.get($boy,'firstname')>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.</p>
+						<p>You snuggle in closer to <<=$npcs.get($sex.npcId,'firstname')>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.</p>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Sometimes'>>
-					<p>"Sometimes yes, sometimes no. I think I'm just like anybody else," you shrug, snuggling closer into <<=$npcs.get($boy,'firstname')>>'s warmth.</p>
+					<p>"Sometimes yes, sometimes no. I think I'm just like anybody else," you shrug, snuggling closer into <<=$npcs.get($sex.npcId,'firstname')>>'s warmth.</p>
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'I`m always cold'>>
-					<<setinit $pc_gets_chilly[$boy] = 1>>
-					<p>"I'm always cold," you shiver, snuggling as far as you can into <<=$npcs.get($boy,'firstname')>>'s warmth. "I would wear a jacket in the summer."</p>
+					<<setinit $pc_gets_chilly[$sex.npcId] = 1>>
+					<p>"I'm always cold," you shiver, snuggling as far as you can into <<=$npcs.get($sex.npcId,'firstname')>>'s warmth. "I would wear a jacket in the summer."</p>
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -68,9 +68,9 @@
 		<<actCLA 'What do you like about my body?'>>
 			<<setinit $booty_call['body_talk'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>"What do you find sexy about me?" you ask <<=$npcs.get($boy,'firstname')>>.</p>
-			<<if $npcs.get($boy,'fav_body_part') == 'tits'>>
-				<!-- !!			if npc_humor[$boy] = 2:-->
+			<p>"What do you find sexy about me?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<<if $npcs.get($sex.npcId,'fav_body_part') == 'tits'>>
+				<!-- !!			if npc_humor[$sex.npcId] = 2:-->
 				<!-- !!				'"Your tits," he grins, bending his head and popping your nipple into his mouth for a gentle suckle. "Definitely your tits."'-->
 				<!-- !!			else-->
 				"Your breasts," he smiles, glancing down to admire them.
@@ -79,35 +79,35 @@
 					<<image "shared/sex/after/pillow_talk2.jpg">>
 					<<if $pc.pcs_cupsize <= 15>>
 						<p>"You really think so?" you ask, surprised. You self consciously grope yourself, saying, "You don't think they're too small?"</p>
-						<<if $npcs.get($boy,'tit_pref') == 1>>
+						<<if $npcs.get($sex.npcId,'tit_pref') == 1>>
 							"I love all tits," he says, bowing his head to kiss along the side of your breast. "But I love small tits like yours most of all."
-						<<elseif $npcs.get($boy,'tit_pref') == 2>>
+						<<elseif $npcs.get($sex.npcId,'tit_pref') == 2>>
 							"My preferences run a little bigger," he admits but smiles at you. "But tits are tits. I love them all."
-						<<elseif $npcs.get($boy,'tit_pref') == 3>>
+						<<elseif $npcs.get($sex.npcId,'tit_pref') == 3>>
 							"I do like it when girls have a big rack," he admits but smiles at you. "But tits are tits. I love them all."
-						<<elseif $npcs.get($boy,'tit_pref') == 4>>
+						<<elseif $npcs.get($sex.npcId,'tit_pref') == 4>>
 							"I love gigantic tits," he admits but smiles at you. "But tits are tits. I love them all."
 						<<else>>
 							"Boobs are boobs," he says, bowing his head to kiss along the side of your breast. He grins. "And I love all boobs."
 						<</if>>
 					<<elseif $pc.pcs_cupsize > 25>>
 						<p>"You really think so?" you ask, surprised. You self consciously grope yourself, saying, "You don't think they're too too big?"</p>
-						<<if $npcs.get($boy,'tit_pref') == 1>>
+						<<if $npcs.get($sex.npcId,'tit_pref') == 1>>
 							"I prefer smaller boobs to bigger ones," he admits but smiles at you. "But tits are tits. I love them all."
-						<<elseif $npcs.get($boy,'tit_pref') == 2>>
+						<<elseif $npcs.get($sex.npcId,'tit_pref') == 2>>
 							"My preferences run a little smaller," he admits but smiles at you. "But tits are tits. I love them all."
-						<<elseif $npcs.get($boy,'tit_pref') >= 3>>
+						<<elseif $npcs.get($sex.npcId,'tit_pref') >= 3>>
 							"I love big titties," he grins, admiring your glorious rack. "Actually, I love all titties. But big titties are the best."
 						<<else>>
 							"Boobs are boobs," he says, bowing his head to kiss along the side of your breast. He grins. "And I love all boobs."
 						<</if>>
 					<<else>>
 						<p>"You really think so?" you ask, surprised. You self consciously grope yourself, saying, "You really like them that much? You don't wish they were... different?"</p>
-						<<if $npcs.get($boy,'tit_pref') == 1>>
+						<<if $npcs.get($sex.npcId,'tit_pref') == 1>>
 							"I prefer smaller boobs generally," he admits but smiles at you. "But tits are tits. I love them all."
-						<<elseif $npcs.get($boy,'tit_pref') == 2>>
+						<<elseif $npcs.get($sex.npcId,'tit_pref') == 2>>
 							"They're perfect," he says, bowing his head to kiss along the side of your breast. He grins. "And I love all boobs."
-						<<elseif $npcs.get($boy,'tit_pref') >= 3>>
+						<<elseif $npcs.get($sex.npcId,'tit_pref') >= 3>>
 							"I do like it when girls have a big rack," he admits but smiles at you. "But tits are tits. I love them all."
 						<<else>>
 							"Boobs are boobs," he says, bowing his head to kiss along the side of your breast. He grins. "And I love all boobs."
@@ -117,7 +117,7 @@
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<p>"Aww! Thanks," you smile fondly at <<=$npcs.get($boy,'firstname')>>. "Means a lot to me that you think so."</p>
+					<p>"Aww! Thanks," you smile fondly at <<=$npcs.get($sex.npcId,'firstname')>>. "Means a lot to me that you think so."</p>
 					"Boobs are great," he grins. "And your boobs are especially great because you let me fuck you."
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
@@ -126,8 +126,8 @@
 					"They're the best," he nods, bowing his head to kiss one.
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
-			<<elseif $npcs.get($boy,'fav_body_part') == 'ass'>>
-				<<if $npcs.get($boy,'humor') <= 2>>
+			<<elseif $npcs.get($sex.npcId,'fav_body_part') == 'ass'>>
+				<<if $npcs.get($sex.npcId,'humor') <= 2>>
 					"It's all about dat ass," he grins, reaching around to give said ass a firm squeeze.
 				<<else>>
 					"I love your ass," he smiles, running his hand up your thigh to give your bottom a firm squeeze.
@@ -140,7 +140,7 @@
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<p>"Aww! Thanks," you smile fondly at <<=$npcs.get($boy,'firstname')>>. "Means a lot to me that you think so."</p>
+					<p>"Aww! Thanks," you smile fondly at <<=$npcs.get($sex.npcId,'firstname')>>. "Means a lot to me that you think so."</p>
 					"There''s something irresistible about a good ass," he grins, grabbing another handful of yours.
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
@@ -156,7 +156,7 @@
 					"Damn right," he grins, unable to resist giving it another grab.
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
-			<<elseif $npcs.get($boy,'fav_body_part') == 'pussy'>>
+			<<elseif $npcs.get($sex.npcId,'fav_body_part') == 'pussy'>>
 				<<arouse 'foreplay' 1 `['no_orgasm_msg']`>>
 				"I love your pussy," he says, his fingers slowly running up the inside of your thigh to caress your lower lips.
 				<<actCLA 'Really?'>>
@@ -164,32 +164,32 @@
 					<<arouse 'vaginal_finger' -5 `['no_orgasm_msg']`>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
 					<p>"You really think so?" you ask. "Not my boobs or my ass or-"</p>
-					<p>Your next words are interrupted by a gasp as <<=$npcs.get($boy,'firstname')>> drives a finger knuckle deep into your just-fucked pussy. Soft squelching sounds emanate from between your legs as he gently caresses your insides, forcing whimpers from your lips while he stares into your eyes.</p>
+					<p>Your next words are interrupted by a gasp as <<=$npcs.get($sex.npcId,'firstname')>> drives a finger knuckle deep into your just-fucked pussy. Soft squelching sounds emanate from between your legs as he gently caresses your insides, forcing whimpers from your lips while he stares into your eyes.</p>
 					"Yeah..." he says, giving a predatory smile as he draws his hand away trailing strands of your juices. "Your pussy is the best."
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<<if getvar("$booty_call['fuck_count']") > 0 or $npcs.get($boy,'fuck_times') > 0>>
-						<p>"Glad you think so," you smile at <<=$npcs.get($boy,'firstname')>>. "I'd hate to find out you don't appreciate the pussy you're fucking."</p>
+					<<if getvar("$booty_call['fuck_count']") > 0 or $npcs.get($sex.npcId,'fuck_times') > 0>>
+						<p>"Glad you think so," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I'd hate to find out you don't appreciate the pussy you're fucking."</p>
 					<<else>>
-						<p>"Glad you think so," you smile at <<=$npcs.get($boy,'firstname')>>. "Always nice to get compliments."</p>
+						<p>"Glad you think so," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "Always nice to get compliments."</p>
 					<</if>>
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'I like it too'>>
-					<<if getvar("$booty_call['fuck_count']") > 0 or $npcs.get($boy,'fuck_times') > 0>>
-						<p>"Me too," you grin at <<=$npcs.get($boy,'firstname')>>. "I like the way it lets me fuck you."</p>
+					<<if getvar("$booty_call['fuck_count']") > 0 or $npcs.get($sex.npcId,'fuck_times') > 0>>
+						<p>"Me too," you grin at <<=$npcs.get($sex.npcId,'firstname')>>. "I like the way it lets me fuck you."</p>
 					<<else>>
-						<p>"Me too," you grin at <<=$npcs.get($boy,'firstname')>>. "I've always thought my pussy was cute."</p>
+						<p>"Me too," you grin at <<=$npcs.get($sex.npcId,'firstname')>>. "I've always thought my pussy was cute."</p>
 					<</if>>
 					"Glad we're in agreement," he grins back.
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
-				<<if !$pc.thinksIsVirgin or getvar("$booty_call['fuck_count']") > 0 or $npcs.get($boy,'fuck_times') > 0>>
+				<<if !$pc.thinksIsVirgin or getvar("$booty_call['fuck_count']") > 0 or $npcs.get($sex.npcId,'fuck_times') > 0>>
 					<<actCLA 'You just like fucking it'>>
 						"You're just saying that because you get to fuck it," you smirk teasingly.
-						<<if $npcs.get($boy,'pussyeater') == 1 and (getvar("$booty_call['kuni']") > 0 or $npcs.get($boy,'kuni_times'))>>
+						<<if $npcs.get($sex.npcId,'pussyeater') == 1 and (getvar("$booty_call['kuni']") > 0 or $npcs.get($sex.npcId,'kuni_times'))>>
 							<<arouse 'vaginal_finger' 1 `['no_orgasm_msg']`>>
 							<<arouse 'vaginal_finger' -5 `['no_orgasm_msg']`>>
 							"That's not true," he smirks back. "I love eating it too."
@@ -202,14 +202,14 @@
 							"You taste good," he says, licking his lips.
 						<<else>>
 							"That's not the <i>only</i> reason," he says. "There''s just something hot about them. But yours is especially hot when I'm fucking it."
-							<p><<=$npcs.get($boy,'firstname')>> grins shamelessly.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> grins shamelessly.</p>
 						<</if>>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 				<<elseif getvar("$booty_call['virgin']") == 1>>
 					<<actCLA 'You`re just saying that because you deflowered me'>>
 						"You're just saying that because I was a virgin and you're the first one who got to fuck it," you smirk teasingly.
-						<<if $npcs.get($boy,'pussyeater') == 1 and (getvar("$booty_call['kuni']") > 0 or $npcs.get($boy,'kuni_times'))>>
+						<<if $npcs.get($sex.npcId,'pussyeater') == 1 and (getvar("$booty_call['kuni']") > 0 or $npcs.get($sex.npcId,'kuni_times'))>>
 							<<arouse 'vaginal_finger' 1 `['no_orgasm_msg']`>>
 							<<arouse 'vaginal_finger' -5 `['no_orgasm_msg']`>>
 							"That's not true," he smirks back. "I love eating it too."
@@ -222,14 +222,14 @@
 							"But you were also really tight," he says, licking his lips. "Mmm... You taste good..."
 						<<else>>
 							"That's not the <i>only</i> reason," he says. "There''s just something hot about them. But yours is especially hot because I got to be your first."
-							<p><<=$npcs.get($boy,'firstname')>> grins shamelessly.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> grins shamelessly.</p>
 						<</if>>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
-				<<elseif getvar("$booty_call['fuck_count']") == 0 and $npcs.get($boy,'fuck_times') == 0>>
+				<<elseif getvar("$booty_call['fuck_count']") == 0 and $npcs.get($sex.npcId,'fuck_times') == 0>>
 					<<actCLA 'You just want to fuck me'>>
 						"You're just saying that because you want to fuck me," you smirk teasingly.
-						<<if $npcs.get($boy,'pussyeater') == 1 and (getvar("$booty_call['kuni']") > 0 or $npcs.get($boy,'kuni_times'))>>
+						<<if $npcs.get($sex.npcId,'pussyeater') == 1 and (getvar("$booty_call['kuni']") > 0 or $npcs.get($sex.npcId,'kuni_times'))>>
 							<<arouse 'vaginal_finger' 1 `['no_orgasm_msg']`>>
 							<<arouse 'vaginal_finger' -5 `['no_orgasm_msg']`>>
 							"Not just that," he smirks back. "I like the taste."
@@ -249,7 +249,7 @@
 			<<else>>
 				<<arouse 'foreplay' 1 `['no_orgasm_msg']`>>
 				<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
-				<!-- !! <<=$npcs.get($boy,'fav_body_part')>> = 'thighs':-->
+				<!-- !! <<=$npcs.get($sex.npcId,'fav_body_part')>> = 'thighs':-->
 				"Your legs," he says, slowly caressing his fingers up and down the curve of your thigh. It's tantalizing, the way he dances the tips across your skin, sending goosebumps wherever they go.
 				<<actCLA 'Really?'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
@@ -262,14 +262,14 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'made_me_late1'>>
-	<<if getvar("$schoolprogul") > 0 and $npcs.get($boy,'school_absences') < $schoolprogul and $npcs.get($boy,'school_absences') > 0>>
+	<<if getvar("$schoolprogul") > 0 and $npcs.get($sex.npcId,'school_absences') < $schoolprogul and $npcs.get($sex.npcId,'school_absences') > 0>>
 		<<actCLA 'Made me late for school again'>>
 			<<actCLA 'Annoyed'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<<if $npcs.get($boy,'last_sex') == $time.daystart>>
-					<p>"You made me late for school this morning," you grumble, eyeballing <<=$npcs.get($boy,'firstname')>>. "Again."</p>
+				<<if $npcs.get($sex.npcId,'last_sex') == $time.daystart>>
+					<p>"You made me late for school this morning," you grumble, eyeballing <<=$npcs.get($sex.npcId,'firstname')>>. "Again."</p>
 				<<else>>
-					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<=$npcs.get($boy,'firstname')>>.</p>
+					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk2' 'made_me_late2'>>
 			<</actCLA>>
@@ -281,10 +281,10 @@
 		<<actCLA 'Made me late for school'>>
 			<<actCLA 'Annoyed'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<<if $npcs.get($boy,'last_sex') == $time.daystart>>
-					<p>"You made me late for school this morning," you grumble, eyeballing <<=$npcs.get($boy,'firstname')>>.</p>
+				<<if $npcs.get($sex.npcId,'last_sex') == $time.daystart>>
+					<p>"You made me late for school this morning," you grumble, eyeballing <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 				<<else>>
-					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<=$npcs.get($boy,'firstname')>>.</p>
+					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk2' 'made_me_late2'>>
 			<</actCLA>>
@@ -303,13 +303,13 @@
 				<<setinit $booty_call['plans_later_talk'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<p>"Got any plans for the rest day?" you ask.</p>
-				<<if $npcs.get($boy,'day_off') == $time.weekday>>
+				<<if $npcs.get($sex.npcId,'day_off') == $time.weekday>>
 					<p>"Not really," he shrugs. "It's my day off so I'm just chilling. What about you?"</p>
 					<<gs 'booty_call_pillow_talk2' 'pc_plans_later'>>
 				<<else>>
-					<<if $npcs.get($boy,'end_free_time') >= $time.hour and $time.hour > 0>>
+					<<if $npcs.get($sex.npcId,'end_free_time') >= $time.hour and $time.hour > 0>>
 						"I have to go to work after this," he says, checking the time. "Shit, I'm gonna be late. I gotta get going now."
-						<p><<=$npcs.get($boy,'firstname')>> hauls himself out of bed and you guess you should do the same.</p>
+						<p><<=$npcs.get($sex.npcId,'firstname')>> hauls himself out of bed and you guess you should do the same.</p>
 						<<setinit $booty_call['npc_late'] = 1>>
 						<<gs 'booty_call_after' 'after_sex2'>>
 					<<else>>
@@ -329,7 +329,7 @@
 			<<actCLA 'Doing anything else today?'>>
 				<<setinit $booty_call['what_do_today'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"So, what else have you done today? Besides me I mean," you smirk at <<=$npcs.get($boy,'firstname')>>.</p>
+				<p>"So, what else have you done today? Besides me I mean," you smirk at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 				<<gs 'booty_call_pillow_talk2' 'day_events'>>
 			<</actCLA>>
 		<</if>>
@@ -420,36 +420,36 @@
 <</if>>
 <<if $location_var[$here][0] == 'cum_drip_tease'>>
 	<<if getvar("$cum_loc['vagina']") > 0>>
-		<<actCLA 'Show off $npcs.get('+$boy,'firstname')+''s cum'>>
+		<<actCLA 'Show off $npcs.get('+$sex.npcId,'firstname')+''s cum'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$booty_call['disco_after']") == 1>>
 				"Thinking about going to the disco later," you reply. "I wanna go dancing with your cum running down my thighs."
 			<<elseif getvar("$booty_call['club_after']") == 1>>
 				"Thinking about going clubbing later," you reply. "I wanna go dancing with your cum running down my thighs."
 			<</if>>
-			<p>You give <<=$npcs.get($boy,'firstname')>> a mischievous smirk, rubbing your legs together where his cum still leaks from your snatch.</p>
+			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> a mischievous smirk, rubbing your legs together where his cum still leaks from your snatch.</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'day_events'>>
-	<<if $npcs.get($boy,'work_end') < $time.hour and $npcs.get($boy,'day_off') != $time.weekday>>
-		<p>"Just work," <<=$npcs.get($boy,'firstname')>> shrugs turning to look at you. "Getting together with you was my fun time today. What about you?"</p>
+	<<if $npcs.get($sex.npcId,'work_end') < $time.hour and $npcs.get($sex.npcId,'day_off') != $time.weekday>>
+		<p>"Just work," <<=$npcs.get($sex.npcId,'firstname')>> shrugs turning to look at you. "Getting together with you was my fun time today. What about you?"</p>
 		<<gs 'booty_call_pillow_talk2' 'pc_day_events'>>
 		<<gs 'booty_call_pillow_talk2' 'pc_plans_later'>>
 		<!-- !!		gs'booty_call_work_talk1', 'job_talk'-->
 	<<else>>
-		<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6 and rand(1,3) == 1>>
-			<p>"Went on a date with my girlfriend," <<=$npcs.get($boy,'firstname')>> responds casually.</p>
+		<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6 and rand(1,3) == 1>>
+			<p>"Went on a date with my girlfriend," <<=$npcs.get($sex.npcId,'firstname')>> responds casually.</p>
 			<<actCLA 'Uncomfortable'>>
 				"Oh. I see..." you murmur uncomfortably. You leave it at that, unsure of what else to say.
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 			<<actCLA 'How was it?'>>
 				<p>"Oh, that's cool," you reply pleasantly. "How was it? Your date?"</p>
-				<<if $npcs.get($boy,'goal') < 3>>
+				<<if $npcs.get($sex.npcId,'goal') < 3>>
 					"It was okay." He turns to grin at you. "This was way more fun."
-				<<elseif rand(1,3) == 1 and $npcs.get($boy,'car') == 1>>
+				<<elseif rand(1,3) == 1 and $npcs.get($sex.npcId,'car') == 1>>
 					<p>"It was nice. I took her to a barbecue joint down the way. She gave me a blowjob in the car on the drive back," he grins. " What about you?"</p>
 				<<elseif rand(1,2) == 1>>
 					<p>"We saw a movie together. It was nice.  What about you?"</p>
@@ -459,9 +459,9 @@
 				<<gs 'booty_call_pillow_talk2' 'pc_day_events'>>
 			<</actCLA>>
 		<<else>>
-			<<if $npcs.get($boy,'gymrat') == 1>>
+			<<if $npcs.get($sex.npcId,'gymrat') == 1>>
 				<p>"Had a good workout at the gym. Had an even better one here in my bed," he smirks at you. "What about you?"</p>
-			<<elseif $npcs.get($boy,'apt_spare') == 'gaming'>>
+			<<elseif $npcs.get($sex.npcId,'apt_spare') == 'gaming'>>
 				<p>"Played video games at home. I've been really into this new game that came out recently. What about you?"</p>
 			<<else>>
 				<p>"Nothing much. It's my day off so I just sort of hung out and relaxed. You're the only thing I've done today," he grins back. "What about you?"</p>
@@ -484,7 +484,7 @@
 	<<if $pc.isSchoolStudent and getvar("$q.school.homeworkLeft") == 0 and $time.isSchoolHoliday == 0>>
 		<<actCLA 'Homework'>>
 			"Just did my homework," you shrug. "Got the boring stuff out of the way so I could enjoy my fun without worry."
-			<p>You give <<=$npcs.get($boy,'firstname')>> an affectionate smile.</p>
+			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> an affectionate smile.</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
@@ -505,14 +505,14 @@
 	end} -->
 <</if>>
 <<if $location_var[$here][0] == 'dance_talk'>>
-	<<if $npcs.get($boy,'know_dance') == 0>>
-		<<run $npcs.set($boy,'know_dance',1)>>
+	<<if $npcs.get($sex.npcId,'know_dance') == 0>>
+		<<run $npcs.set($sex.npcId,'know_dance',1)>>
 		<p>"You're a dancer?"</p>
 		"Mhmm."
-		<<if $npcs.get($boy,'humor') == 2>>
+		<<if $npcs.get($sex.npcId,'humor') == 2>>
 			<p>"Is it the kind that requires a pole and ends with you naked?" he grins.</p>
 			<<actCLA 'Laugh'>>
-				<<run $npcs.inc($boy,'rel',2)>>
+				<<run $npcs.inc($sex.npcId,'rel',2)>>
 				You giggle at his joke.
 				<<if getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") == 0>>
 					"No, we're a dance troupe. Though I could always ask our the leader if we can start stripping during the show."
@@ -526,7 +526,7 @@
 				<<gs 'booty_call_pillow_talk2' 'show_dance'>>
 			<</actCLA>>
 			<<actCLA 'Irritation'>>
-				<<run $npcs.dec($boy,'rel',2)>>
+				<<run $npcs.dec($sex.npcId,'rel',2)>>
 				"Don't be gross," you scowl at him. "For your information we're a dance troupe. And I don't appreciate you making jokes about what we do."
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
@@ -553,7 +553,7 @@
 				<<if getvar("$AlbinaQW['StarletsShutDown']") == 0>>
 					<<actCLA 'Part of a dance troupe'>>
 						<<setinit $booty_call['dance_type'] = 'starlet'>>
-						<p>"I'm part of a dance troupe in Pavlovsk. The Starlets, ever heard of us?" <<=$npcs.get($boy,'firstname')>> shakes his head. "Oh, well we do performances every few weeks. That's my practice later."</p>
+						<p>"I'm part of a dance troupe in Pavlovsk. The Starlets, ever heard of us?" <<=$npcs.get($sex.npcId,'firstname')>> shakes his head. "Oh, well we do performances every few weeks. That's my practice later."</p>
 						<p>"So you're saying there's a bunch of other sexy girls just like you who all dance together?" he grins. "Sounds hot."</p>
 						<<actCLA 'Keep talking'>>
 							 <<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -563,7 +563,7 @@
 				<<else>>
 					<<actCLA 'Used to be part of a dance troupe'>>
 						<<setinit $booty_call['dance_type'] = 'starlet'>>
-						<p>"I used to dance as part of a troupe in Pavlovsk. The Starlets, ever heard of them?" <<=$npcs.get($boy,'firstname')>> shakes his head. "Oh, well we did performances every few weeks. But we had to shut down because of some stuff."</p>
+						<p>"I used to dance as part of a troupe in Pavlovsk. The Starlets, ever heard of them?" <<=$npcs.get($sex.npcId,'firstname')>> shakes his head. "Oh, well we did performances every few weeks. But we had to shut down because of some stuff."</p>
 						"Damn, I would have thought a bunch of sexy girls dancing would be impossible to get rid of," he grins. "I bet the customers rioted."
 						<<actCLA 'Keep talking'>>
 							 <<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -582,16 +582,16 @@
 			"It's too bad your dance group shut down," he says. "I would have really liked to see it."
 			"Yeah... too bad..." you mumble.
 		<</if>>
-		<<if rand(1,2) == 1 and $npcs.get($boy,'seen_dance') == 1>>
-			<p>"Could you dance for me again?" <<=$npcs.get($boy,'firstname')>> asks. "It was really sexy the last time you showed me."</p>
+		<<if rand(1,2) == 1 and $npcs.get($sex.npcId,'seen_dance') == 1>>
+			<p>"Could you dance for me again?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "It was really sexy the last time you showed me."</p>
 			<<actCLA 'Not right now'>>
 				<<image "shared/sex/after/pillow_talk2.jpg">>
-				<p>"Sorry, I can't right now. My legs are still a little wobbly," you say, giving <<=$npcs.get($boy,'firstname')>> a suggestive look as you rub your wet thighs together.</p>
+				<p>"Sorry, I can't right now. My legs are still a little wobbly," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a suggestive look as you rub your wet thighs together.</p>
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 			<<actCLA 'Dance for him'>>
-				<<run $npcs.inc($boy,'rel',5)>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<run $npcs.inc($sex.npcId,'rel',5)>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<p>"Okay," you smile, slipping out of bed. What kind of dance should you show him?</p>
 				<<actCLA 'Shuffle for him'>>
 					<<video "pc/activities/dancing/shuffle_naked1.mp4">>
@@ -605,38 +605,38 @@
 						You grab your shoes from the hallway and come back, doing a freestyle shuffle for him, bouncing up and down with nothing covering you but your sneakers.
 					<</if>>
 					<p>"Happy now?" you ask with a twirl and a smile.</p>
-					<p><<=$npcs.get($boy,'firstname')>> just nods back, too busy enjoying the show.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
 					<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 				<</actCLA>>
 				<<actCLA 'A sexy one'>>
 					<<video "pc/activities/dancing/sexy_naked1.mp4">>
 					<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($boy,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your face and legs.</p>
+						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your face and legs.</p>
 					<<elseif getvar("$cum_loc['face']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($boy,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your face.</p>
+						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your face.</p>
 					<<elseif getvar("$cum_loc['vagina']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($boy,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your legs.</p>
+						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your legs.</p>
 					<<else>>
-						<p>You hop out of bed and start swaying your hips, shaking your ass at <<=$npcs.get($boy,'firstname')>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
+						<p>You hop out of bed and start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
 					<</if>>
 					<p>"Happy now?" you ask with a husky voice.</p>
-					<p><<=$npcs.get($boy,'firstname')>> just nods back, too busy enjoying the show.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
 					<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 				<</actCLA>>
 				<<if getvar("$AlbinaQW['StarletsJoined']") > 0>>
 					<<actCLA 'A Starlets routine'>>
 						<<video "pc/activities/dancing/shuffle_naked1.mp4">>
 						<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($boy,'firstname')>>'s cum still painting your face and running down your legs.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still painting your face and running down your legs.</p>
 						<<elseif getvar("$cum_loc['face']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($boy,'firstname')>>'s cum still painting your face.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still painting your face.</p>
 						<<elseif getvar("$cum_loc['vagina']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($boy,'firstname')>>'s cum still running down your legs.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still running down your legs.</p>
 						<<else>>
 							You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine.
 						<</if>>
 						<p>"Happy now?" you ask with a twirl and a smile.</p>
-						<p><<=$npcs.get($boy,'firstname')>> just nods back, too busy enjoying the show.</p>
+						<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
 						<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 					<</actCLA>>
 				<</if>>
@@ -649,8 +649,8 @@
 <<if $location_var[$here][0] == 'show_dance'>>
 	<<actCLA 'Want me to show you?'>>
 		<<setinit $booty_call['get_up'] = 1>>
-		<<run $npcs.set($boy,'seen_dance',1)>>
-		<<run $npcs.inc($boy,'rel',5)>>
+		<<run $npcs.set($sex.npcId,'seen_dance',1)>>
+		<<run $npcs.inc($sex.npcId,'rel',5)>>
 		<<set $time.minutes += 5>>
 		<p>"Wanna see me dance?" you ask. "I can show you right now?"</p>
 		"Sure, I''d love to."
@@ -670,23 +670,23 @@
 <</if>>
 <<if $location_var[$here][0] == 'show_shuffle'>>
 	<<actCLA 'Show him a shuffle'>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<p>"Okay! Let me just put my shoes on. It's kind of hard to do this with bare feet."</p>
 		You hop out of bed and grab your shoes from where you tossed them, tugging each one on before moving to a clear space in the room.
 		<<actCLA 'Shuffle'>>
 			<<video "pc/activities/dancing/shuffle_naked1.mp4">>
-			<p>Picking a favorite song of yours in your head, you skip your way into the middle of <<=$npcs.get($boy,'firstname')>>'s floor and show him how you shuffle. With every step, your ass cheeks jiggle and your breasts bounce wildly, and the silliness of it spreads an uncontrollable grin across your lips.</p>
+			<p>Picking a favorite song of yours in your head, you skip your way into the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s floor and show him how you shuffle. With every step, your ass cheeks jiggle and your breasts bounce wildly, and the silliness of it spreads an uncontrollable grin across your lips.</p>
 			<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($boy,'firstname')>>'s apartment, his cum all over your face and running down your legs.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum all over your face and running down your legs.</p>
 			<<elseif getvar("$cum_loc['face']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($boy,'firstname')>>'s apartment, his cum all over your face.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum all over your face.</p>
 			<<elseif getvar("$cum_loc['vagina']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($boy,'firstname')>>'s apartment, his cum dripping from your snatch and running down your legs.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum dripping from your snatch and running down your legs.</p>
 			<<else>>
-				<p>You're sure you must be quite a sight, shuffling in the middle of <<=$npcs.get($boy,'firstname')>>'s apartment with nothing covering you but your sneakers.</p>
+				<p>You're sure you must be quite a sight, shuffling in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment with nothing covering you but your sneakers.</p>
 			<</if>>
 			<p>"Pretty good, right?" you say with a twirl, still grinning and still dancing.</p>
-			<p>"Oh yeah. <i>Really</i> good," <<=$npcs.get($boy,'firstname')>> replies. Though the look on his face says he's not really talking about your dance moves.</p>
+			<p>"Oh yeah. <i>Really</i> good," <<=$npcs.get($sex.npcId,'firstname')>> replies. Though the look on his face says he's not really talking about your dance moves.</p>
 			<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -694,33 +694,33 @@
 <<if $location_var[$here][0] == 'show_sexy'>>
 	<<actCLA 'Dance sexily'>>
 		<<video "pc/activities/dancing/sexy_naked1.mp4">>
-		<p>You hop out of bed and start swaying your hips, shaking your ass at <<=$npcs.get($boy,'firstname')>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
+		<p>You hop out of bed and start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
 		<p>"Pretty hot, right?"</p>
 		"Yeah..."
-		<p><<=$npcs.get($boy,'firstname')>> doesn't say anything more. He's too busy drooling as until you finish dancing.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything more. He's too busy drooling as until you finish dancing.</p>
 		<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'show_starlets'>>
 	<<if getvar("$AlbinaQW['StarletsJoined']") > 0>>
 		<<actCLA 'Starlets routine'>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"Okay! Let me just put my shoes on. It's kind of hard to do this with bare feet."</p>
 			You hop out of bed and grab your shoes from where you tossed them, tugging each one on before moving to a clear space in the room.
 			<<if getvar("$AlbinaQW['StarletsShutDown']") == 0>>
-				<p>"Ready?" you ask and <<=$npcs.get($boy,'firstname')>> nods. "This is one of our routines our troupe uses for performances."</p>
+				<p>"Ready?" you ask and <<=$npcs.get($sex.npcId,'firstname')>> nods. "This is one of our routines our troupe uses for performances."</p>
 			<<else>>
-				<p>"Ready?" you ask and <<=$npcs.get($boy,'firstname')>> nods. "This is one of the dances my old troupe used to do."</p>
+				<p>"Ready?" you ask and <<=$npcs.get($sex.npcId,'firstname')>> nods. "This is one of the dances my old troupe used to do."</p>
 			<</if>>
 			<<actCLA 'Dance for him'>>
 				<<video "pc/activities/dancing/modern_naked1.mp4">>
 				Without further ado, you count off a time in your head and jump into the routine that Albina devised for the Starlets. It feels different, going through the movements in nothing but your sneakers as opposed to wearing tight spandex. Makes you wonder if Albina devised it at home naked.
-				<p>The look on <<=$npcs.get($boy,'firstname')>>'s face as you dance almost makes you burst into giggles but you somehow manage to contain it to a wide grin instead.</p>
+				<p>The look on <<=$npcs.get($sex.npcId,'firstname')>>'s face as you dance almost makes you burst into giggles but you somehow manage to contain it to a wide grin instead.</p>
 				<<actCLA 'Continue'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					You end the routine, sticking the final pose and breathing hard.
 					<p>"So?" you pant. "What did you think?"</p>
-					<p>"I think that was the sexiest dance I've ever seen," <<=$npcs.get($boy,'firstname')>> grins.</p>
+					<p>"I think that was the sexiest dance I've ever seen," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 					<<actCLA 'Glad you enjoyed it'>>
 						"I'm glad you enjoyed it," you smile back, finally managing to catch your breath as you stand up straight.
 						<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
@@ -738,15 +738,15 @@
 	<<actCLA 'Back into bed'>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		<<if $booty_call['dance_type'] == 'modern' or $booty_call['dance_type'] == 'starlet'>>
-			<p>Your little performance finished, you kick off your shoes and snuggle back into the bed with <<=$npcs.get($boy,'firstname')>>, picking up your pillow talk from where you left off.</p>
+			<p>Your little performance finished, you kick off your shoes and snuggle back into the bed with <<=$npcs.get($sex.npcId,'firstname')>>, picking up your pillow talk from where you left off.</p>
 		<<else>>
-			<p>Your little performance finished, you snuggle back into the bed with <<=$npcs.get($boy,'firstname')>>, picking up your pillow talk from where you left off.</p>
+			<p>Your little performance finished, you snuggle back into the bed with <<=$npcs.get($sex.npcId,'firstname')>>, picking up your pillow talk from where you left off.</p>
 		<</if>>
 		<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 	<</actCLA>>
 	<<actCLA 'Do something else'>>
 		$npc_apt_bedroom
-		<p>Since you've already gotten out of <<=$npcs.get($boy,'firstname')>>'s bed, you figure you ought to do something other than crawl back in.</p>
+		<p>Since you've already gotten out of <<=$npcs.get($sex.npcId,'firstname')>>'s bed, you figure you ought to do something other than crawl back in.</p>
 		<<gs 'booty_call_after' 'after_sex2'>>
 	<</actCLA>>
 <</if>>
@@ -762,25 +762,25 @@
 	<<gs 'booty_call_pillow_talk2' 'dick_grab_image'>>
 	<<if getvar("$booty_call['dick_play']") == 0>>
 		<<setinit $booty_call['dick_play'] = 1>>
-		<<if $npcs.get($boy,'dick_play') == 0>>
-			<<if $booty_call['cum_count'] == $npcs.get($boy,'sexdrive')>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+		<<if $npcs.get($sex.npcId,'dick_play') == 0>>
+			<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
 				"If you're trying to get me hard, I don't think I can go again," he chuckles.
-			<<elseif $booty_call['cum_count'] < $npcs.get($boy,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+			<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 				<p>"You trying to get me hard again?" he snickers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, immediately stiffening between your fingers.</p>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, immediately stiffening between your fingers.</p>
 				<p>"You want to go again?" he grins.</p>
 			<</if>>
 			"That's not what I'm doing," you say, affectionately rolling your eyes. "I'm just... playing with it."
 		<<else>>
-			<<if $booty_call['cum_count'] == $npcs.get($boy,'sexdrive')>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
-			<<elseif $booty_call['cum_count'] < $npcs.get($boy,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+			<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+			<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 			<</if>>
 			<p>"Amusing yourself with my dick again?"</p>
 			"Yeah," you grin back shamelessly.
@@ -800,25 +800,25 @@
 	<<gs 'booty_call_pillow_talk2' 'dick_grab_image'>>
 	<<if getvar("$booty_call['dick_play']") == 0>>
 		<<setinit $booty_call['dick_play'] = 1>>
-		<<if $npcs.get($boy,'dick_play') == 0>>
-			<<if $booty_call['cum_count'] == $npcs.get($boy,'sexdrive')>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+		<<if $npcs.get($sex.npcId,'dick_play') == 0>>
+			<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
 				"If you're trying to get me hard, I don't think I can go again," he chuckles.
-			<<elseif $booty_call['cum_count'] < $npcs.get($boy,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+			<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 				<p>"You trying to get me hard again?" he snickers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, immediately stiffening between your fingers.</p>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, immediately stiffening between your fingers.</p>
 				<p>"You want to go again?" he grins.</p>
 			<</if>>
 			"That's not what I'm doing," you say, affectionately rolling your eyes. "I'm just... playing with it."
 		<<else>>
-			<<if $booty_call['cum_count'] == $npcs.get($boy,'sexdrive')>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
-			<<elseif $booty_call['cum_count'] < $npcs.get($boy,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+			<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+			<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($boy,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 			<</if>>
 			<p>"Amusing yourself with my dick again?"</p>
 			"Yeah," you grin back shamelessly.
@@ -842,10 +842,10 @@
 	<<if getvar("$booty_call['whats_it_like_dick_talk']") == 0>>
 		<<actCLA 'What`s it like having a dick?'>>
 			<<gs 'booty_call_pillow_talk2' 'dick_grab_image'>>
-			<p>"What's it like having a dick?" you ask, giving <<=$npcs.get($boy,'firstname')>>'s meat a funny look as you fondle it.</p>
-			<<if $npcs.get($boy,'humor') == 1>>
+			<p>"What's it like having a dick?" you ask, giving <<=$npcs.get($sex.npcId,'firstname')>>'s meat a funny look as you fondle it.</p>
+			<<if $npcs.get($sex.npcId,'humor') == 1>>
 				<p>"What's it like having a pussy?" he shrugs. "I don't know, it's just a dick. I have one. I don't know how to explain that."</p>
-			<<elseif $npcs.get($boy,'humor') == 2>>
+			<<elseif $npcs.get($sex.npcId,'humor') == 2>>
 				"Like having a brain between your legs that wants to fuck all the time," he grins.
 				<p>"Seriously?" you ask, staring at it even harder.</p>
 				"Fucker gets hard whenever it feels like it, whether there''s a pussy to be fucked or not," he chuckles. "But pussy is always what it wants."
@@ -855,7 +855,7 @@
 				"Random erections can be... awkward..."
 				<p>"Random?" you ask confusedly. "What do you mean?"</p>
 				"It's like it has a mind of its own," he chuckles. "Gets hard for no reason at all."
-				<p>"That's cause all guys want is sex," you giggle but <<=$npcs.get($boy,'firstname')>> shakes his head.</p>
+				<p>"That's cause all guys want is sex," you giggle but <<=$npcs.get($sex.npcId,'firstname')>> shakes his head.</p>
 				<p>"No," he says. "Even when I'm not horny. Sometimes I'll just be watching TV or going to the store and suddenly, bam-! I'm hard. Gotta figure out how to stuff it down there without everybody thinking I'm a pervert."</p>
 				<p>"Really???" you ask, staring in bewilderment at his inactive cock.</p>
 			<</if>>
@@ -880,16 +880,16 @@
 	<<if getvar("$booty_call['dicks_compliment_talk']") == 0>>
 		<<actCLA 'Compliment his dick'>>
 			<<gs 'booty_call_pillow_talk2' 'dick_grab_image'>>
-			<p>"You have a great dick, you know that?" you say while giving <<=$npcs.get($boy,'firstname')>>'s manhood an appreciative fondle.</p>
-			<p>"Yeah?" <<=$npcs.get($boy,'firstname')>> grins.</p>
+			<p>"You have a great dick, you know that?" you say while giving <<=$npcs.get($sex.npcId,'firstname')>>'s manhood an appreciative fondle.</p>
+			<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 			<<actCLA 'You know how to use it'>>
 				"Not every guy with a cock like yours knows how to use it," you smile. "But you sure do. Fucked me silly with this thing."
-				<p><<=$npcs.get($boy,'firstname')>> looks more than a little smug after your compliment.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> looks more than a little smug after your compliment.</p>
 				<<gs 'booty_call_pillow_talk2' 'dick_talk_topics'>>
 			<</actCLA>>
-			<<if $npcs.get($boy,'dick_desc') == 'thick' or $npcs.get($boy,'dick_desc') == 'long' or $npcs.get($boy,'dick_desc') == 'huge' or $npcs.get($boy,'dick_desc') == 'enormous' or $npcs.get($boy,'dick_desc') == 'lengthy' or $npcs.get($boy,'dick_desc') == 'gigantic' or $npcs.get($boy,'dick_desc') == 'monster'>>
+			<<if $npcs.get($sex.npcId,'dick_desc') == 'thick' or $npcs.get($sex.npcId,'dick_desc') == 'long' or $npcs.get($sex.npcId,'dick_desc') == 'huge' or $npcs.get($sex.npcId,'dick_desc') == 'enormous' or $npcs.get($sex.npcId,'dick_desc') == 'lengthy' or $npcs.get($sex.npcId,'dick_desc') == 'gigantic' or $npcs.get($sex.npcId,'dick_desc') == 'monster'>>
 				<<actCLA 'It`s huge'>>
-					<p>"Yeah. I mean, look at this thing," you say, running your fingers along its <<=$npcs.get($boy,'dick_desc')>> shaft. "How could I <i>not</i> be impressed by a cock like this?"</p>
+					<p>"Yeah. I mean, look at this thing," you say, running your fingers along its <<=$npcs.get($sex.npcId,'dick_desc')>> shaft. "How could I <i>not</i> be impressed by a cock like this?"</p>
 					<<gs 'booty_call_pillow_talk2' 'dick_talk_topics'>>
 				<</actCLA>>
 			<</if>>
@@ -901,12 +901,12 @@
 		<<actCLA 'What does it feel like to fuck a girl?'>>
 			<<gs 'booty_call_pillow_talk2' 'dick_grab_image'>>
 			<p>"What's it like having sex as a guy?" you ask curiously. "I mean like, I know what it's like to get fucked. But what's it like to do the fucking?"</p>
-			<<if $npcs.get($boy,'humor') == 1>>
+			<<if $npcs.get($sex.npcId,'humor') == 1>>
 				"Like having my dick surrounded with hot sticky goo," he says, grinning childishly. "Once I'm in, I just want to keep pumping until I explode."
-			<<elseif $npcs.get($boy,'humor') == 2>>
-				<p>"Hot and wet," <<=$npcs.get($boy,'firstname')>> smiles affectionately. "Like having my dick wrapped in warm silk that squeezes me tight and pulls me in. That's what your pussy feels like."</p>
+			<<elseif $npcs.get($sex.npcId,'humor') == 2>>
+				<p>"Hot and wet," <<=$npcs.get($sex.npcId,'firstname')>> smiles affectionately. "Like having my dick wrapped in warm silk that squeezes me tight and pulls me in. That's what your pussy feels like."</p>
 			<<else>>
-				<p>"It's... hot," <<=$npcs.get($boy,'firstname')>> says.</p>
+				<p>"It's... hot," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 				"I know it's hot," you roll your eyes. "Of course fucking is hot."
 				"No, I mean temperature hot," he replies, causing you to twerk your head in confusion. "You expect it to be wet inside, and soft, and smooth, but it's also really physically hot. It's like a pussy is an oven and my dick gets baked when I put it in."
 				<p>"<i>Really?</i>" Your eyes go wide, looking down at your own pussy in awe.</p>
@@ -934,19 +934,19 @@
 			<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 			<<setinit $booty_call['start_the_day'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<<if $npcs.get($boy,'sleep_sex_okay') > 0>>
+			<<if $npcs.get($sex.npcId,'sleep_sex_okay') > 0>>
 				"Well, that was a nice way to wake up," you sigh happily, stretching out on the bed.
-				<<if $npcs.get($boy,'humor') == 3>>
-					<p>"As requested Ms. $pc.name_last, your hourAM wake up call," <<=$npcs.get($boy,'firstname')>> says, doing a mock half-bow.</p>
+				<<if $npcs.get($sex.npcId,'humor') == 3>>
+					<p>"As requested Ms. $pc.name_last, your hourAM wake up call," <<=$npcs.get($sex.npcId,'firstname')>> says, doing a mock half-bow.</p>
 				<<else>>
-					<p>"You really like it when I fuck you while you're sleeping don't you?" <<=$npcs.get($boy,'firstname')>> grins.</p>
+					<p>"You really like it when I fuck you while you're sleeping don't you?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 				<</if>>
 				<<actCLA 'It feels really good'>>
 					"It feels really good," you giggle, rubbing your thighs together, maybe still a little dick drunk.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 				<<actCLA 'I know you like it'>>
-					<<run $npcs.inc($boy,'rel',2)>>
+					<<run $npcs.inc($sex.npcId,'rel',2)>>
 					"I know you like doing it," you smile fondly. "It makes you happy, so it makes me happy too."
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
@@ -970,9 +970,9 @@
 					<<gs 'booty_call_pillow_talk2' 'morning_sleep_fuck_okay'>>
 				<</actCLA>>
 				<<actCLA 'You should do it more often'>>
-					<<run $npcs.set($boy,'sleep_sex_okay',2)>>
+					<<run $npcs.set($sex.npcId,'sleep_sex_okay',2)>>
 					"You should do it again," you say with an erotic smirk. "Feels good to wake up with cock inside me."
-					<p>"Really?" <<=$npcs.get($boy,'firstname')>> looks surprised. "You mean I can do that whenever I want?"</p>
+					<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> looks surprised. "You mean I can do that whenever I want?"</p>
 					"Just make sure I wake up before you finish," you grin.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
@@ -1018,11 +1018,11 @@
 				<<setinit $booty_call['morning_sore_pussy'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
-					<p>"How am I going to get through my classes today?" you say, giving <<=$npcs.get($boy,'firstname')>> a loopy smile. "If I fall asleep in school today, it's your fault."</p>
-					<p>"I'll take credit for that," <<=$npcs.get($boy,'firstname')>> grins.</p>
+					<p>"How am I going to get through my classes today?" you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a loopy smile. "If I fall asleep in school today, it's your fault."</p>
+					<p>"I'll take credit for that," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 				<<else>>
-					<p>"We might have overdone it," you say, giving <<=$npcs.get($boy,'firstname')>> a loopy smile. "I already want to go back to bed."</p>
-					<<if $npcs.get($boy,'day_off') == $time.weekday>>
+					<p>"We might have overdone it," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a loopy smile. "I already want to go back to bed."</p>
+					<<if $npcs.get($sex.npcId,'day_off') == $time.weekday>>
 						"I just might after you leave," he replies with a mirror of your expression.
 					<<else>>
 						"Tell me about it," he sighs. "I still have to go to work after this."
@@ -1043,10 +1043,10 @@
 			<<gs 'shortgs' 'calendar_display'>>
 			<<if $time.hour < 8>>
 				"Damn," you mutter. "I might be late for school cause of that."
-				<<if $npcs.get($boy,'caretaker') == 1>>
-					<p>"Sorry," <<=$npcs.get($boy,'firstname')>> says, looking genuinely apologetic.</p>
+				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
+					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, looking genuinely apologetic.</p>
 				<<else>>
-					<p>"Sorry," <<=$npcs.get($boy,'firstname')>> says, the grin on his face making him look like he doesn't mean it at all.</p>
+					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, the grin on his face making him look like he doesn't mean it at all.</p>
 				<</if>>
 				<<if $time.minutes <= 30 and $region == 'pav' and $time.hour == 7>>
 					<<actCLA 'I might still make it'>>
@@ -1075,10 +1075,10 @@
 				<</if>>
 			<<elseif $time.hour == 8>>
 				"Shit," you curse. "I'm late for school."
-				<<if $npcs.get($boy,'caretaker') == 1>>
-					<p>"Sorry," <<=$npcs.get($boy,'firstname')>> says, looking genuinely apologetic.</p>
+				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
+					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, looking genuinely apologetic.</p>
 				<<else>>
-					<p>"Sorry," <<=$npcs.get($boy,'firstname')>> says, the grin on his face making him not look like he means it at all.</p>
+					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, the grin on his face making him not look like he means it at all.</p>
 				<</if>>
 				<<actCLA 'I need to hurry'>>
 					"I gotta get out of here," you say. "I can't afford to be absent too many times."
@@ -1102,7 +1102,7 @@
 					<<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."
 					<</if>>
-					<p>You give <<=$npcs.get($boy,'firstname')>> a wry smirk.</p>
+					<p>You give <<=$npcs.get($sex.npcId,'firstname')>> a wry smirk.</p>
 					<<gs 'booty_call_pillow_talk2' 'morning_sex_talk'>>
 				<</actCLA>>
 			<</if>>
@@ -1123,7 +1123,7 @@ end
 } -->
 <<if $location_var[$here][0] == 'forgot_bc_talk1'>>
 	<<if getvar("$booty_call['forgot_bc']") == 1 and getvar("$booty_call['forgot_bc_chat']") == 0>>
-		<<actCLA 'Tell $npcs.get('+$boy,'firstname')+' you forgot your birth control'>>
+		<<actCLA 'Tell $npcs.get('+$sex.npcId,'firstname')+' you forgot your birth control'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"I have something to confess," you say. "I forgot to take my birth control last night..."
 			<<gs 'booty_call_talk' 'forgot_bc_talk'>>
@@ -1137,12 +1137,12 @@ end
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
 	<<actCLA 'Yes'>>
-		<<run $npcs.set($boy,'sleep_sex_okay',2)>>
+		<<run $npcs.set($sex.npcId,'sleep_sex_okay',2)>>
 		<p>"Sure," you smirk wryly. "Why not?"</p>
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
 	<<actCLA 'Do whatever you want to me'>>
-		<<run $npcs.set($boy,'sleep_sex_okay',2)>>
+		<<run $npcs.set($sex.npcId,'sleep_sex_okay',2)>>
 		"You can do whatever you want to me," you say with a smouldering look. 
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
@@ -1151,21 +1151,21 @@ end
 <<if $location_var[$here][0] == 'new_with_you_boy'>>
 	<<setinit $booty_call['new_with_you'] = 1>>
 	<<image "shared/sex/after/pillow_talk1.jpg">>
-	<p>"So, anything new going on with you?" <<=$npcs.get($boy,'firstname')>> asks.</p>
+	<p>"So, anything new going on with you?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
 	<<actCLA 'Nothing new'>>
 		"Not really," you shrug. "Same old same old."
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
-	<<if $npcs.get($boy,'know_have_girlfriend') == 1 or $npcs.get($boy,'know_have_boyfriend') == 1>>
+	<<if $npcs.get($sex.npcId,'know_have_girlfriend') == 1 or $npcs.get($sex.npcId,'know_have_boyfriend') == 1>>
 		<<if $pcs_lovers + getvar("$pcs_girlfriends") == 0>>
 			<<actCLA 'Single now'>>
 				<<gs 'booty_call_stats' 'single_know'>>
 				<<actCLA 'Broke up with...'>>
 					<<actCLA 'My boyfriend'>>
-						<p>"I broke up with my boyfriend," you tell <<=$npcs.get($boy,'firstname')>>. "So I guess I'm single now."</p>
+						<p>"I broke up with my boyfriend," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "So I guess I'm single now."</p>
 					<</actCLA>>
 					<<actCLA 'My girlfriend'>>
-						<p>"I broke up with my boyfriend," you tell <<=$npcs.get($boy,'firstname')>>. "So I guess I'm single now."</p>
+						<p>"I broke up with my boyfriend," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "So I guess I'm single now."</p>
 					<</actCLA>>
 				<</actCLA>>
 				<!-- !!{	act'Got broken up with...':

sugarcube/src/activities/bootycall/booty_call_sex.tw

@@ -7,13 +7,13 @@
 			<<gs 'booty_call_virgin' 'start1'>>
 		<</actCLA>>
 	<<elseif getvar("$booty_call['fuck_count']") == 0 and ($booty_call['position'] != 'miss' or $booty_call['position'] != 'doggy' or $booty_call['position'] != 'cowgirl')>>
-		<<actCLA 'Fuck $npcs.get('+$boy,'firstname')+''>>
+		<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
 			<<setinit $booty_call['must_fuck'] = 1>> <<gs 'booty_call_sex' 'sex_pre'>>
 		<</actCLA>>
 	<<elseif getvar("$booty_call['cock_inserted']") == 1 and $booty_call['last_cum'] == 'creampie' and ($booty_call['position'] == 'miss' or $booty_call['position'] == 'doggy' or $booty_call['position'] == 'cowgirl')>>
 		<<actCLA 'Fuck again'>>
 			<<setinit $booty_call['must_fuck'] = 1>>
-			<<if $booty_call['cum_count'] >= $npcs.get($boy,'sexdrive') + $booty_call['extra_cum']>>
+			<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $booty_call['extra_cum']>>
 				<<gs 'booty_call_after' 'fucked_out'>>
 			<<else>>
 				<!-- !!					cla & *nl-->
@@ -41,12 +41,12 @@
 	<<else>>
 		<<actCLA 'Fuck again'>>
 			<<setinit $booty_call['fuck_again'] = 1>>
-			<<if $booty_call['cum_count'] >= $npcs.get($boy,'sexdrive') + $booty_call['extra_cum']>>
+			<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $booty_call['extra_cum']>>
 				<<gs 'booty_call_after' 'fucked_out'>>
 			<<else>>
 				<!-- !!					cla & *clr-->
 				<!-- !!					'<<image `'shared/sex/misc/smile.jpg'`>>'-->
-				<!-- !!					'"Ready to go again?" you grin eagerly at <<<<=$npcs.get($boy,'firstname')>>>>.'-->
+				<!-- !!					'"Ready to go again?" you grin eagerly at <<<<=$npcs.get($sex.npcId,'firstname')>>>>.'-->
 				<!-- !!					'"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock while you decide what position you want to fuck in next.'-->
 				<<gs 'booty_call_sex' 'reset'>>
 				<<setinit $booty_call['must_fuck'] = 1>>
@@ -60,7 +60,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'sex_pre'>>
-	<<=$npcs.get($boy,'apt_bedroom')>>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<if getvar("$booty_call['fuck_count']") == 0>>
 		<<if getvar("$booty_call['skip_foreplay']") == 1>>
 			"I need you inside me <i>now</i>," you gasp, desperate to skip the foreplay and get to the fucking already.
@@ -71,7 +71,7 @@
 			"Enough of the foreplay," you say with a lusty growl. "It's time to fuck."
 		<<elseif getvar("$booty_call['not_today']") == 1>>
 			<<setinit $booty_call['not_today'] = 2>>
-			<p>"I thought you didn't want to fuck today," <<=$npcs.get($boy,'firstname')>> says with a wry smile.</p>
+			<p>"I thought you didn't want to fuck today," <<=$npcs.get($sex.npcId,'firstname')>> says with a wry smile.</p>
 			"Changed my mind," you grin back.
 		<<elseif getvar("$booty_call['position_choose']") == 0>>
 			"I want you inside me," you smile seductively.
@@ -83,12 +83,12 @@
 			After a minute or so, he starts to stiffen up again.
 			<i>Finally...</i>
 		<<else>>
-			<p>"I haven't had enough yet," you say, seductively, pulling <<=$npcs.get($boy,'firstname')>> towards you.</p>
+			<p>"I haven't had enough yet," you say, seductively, pulling <<=$npcs.get($sex.npcId,'firstname')>> towards you.</p>
 		<</if>>
 	<</if>>
-	<<if getvar("$know_virgin["+$boy+"]") == 1>>
-		<<setinit $know_virgin[$boy] = 2>>
-		<p>"I thought you said you were saving your virginity," <<=$npcs.get($boy,'firstname')>> says, looking a little confused but extremely excited.</p>
+	<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
+		<<setinit $know_virgin[$sex.npcId] = 2>>
+		<p>"I thought you said you were saving your virginity," <<=$npcs.get($sex.npcId,'firstname')>> says, looking a little confused but extremely excited.</p>
 		"I accidentally lost it somewhere," you grin. "Now hurry up and fuck me."
 	<</if>>
 	<<setinit $booty_call['position_choose'] = 1>>
@@ -115,16 +115,16 @@
 				<</if>>
 				<<setinit $booty_call['must_fuck'] = 1>>
 				<<setinit $booty_call['force_initiative'] = 2>>
-				<<if $npcs.get($boy,'fav_pos') == 'missionary'>>
+				<<if $npcs.get($sex.npcId,'fav_pos') == 'missionary'>>
 					<<gs 'booty_call_miss' 'missionary_start'>>
-				<<elseif $npcs.get($boy,'fav_pos') == 'doggy'>>
+				<<elseif $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
 					<<gs 'booty_call_doggy' 'doggy_start'>>
-				<<elseif $npcs.get($boy,'fav_pos') == 'cowgirl'>>
+				<<elseif $npcs.get($sex.npcId,'fav_pos') == 'cowgirl'>>
 					<<gs 'booty_call_cowgirl' 'cowgirl_start'>>
 				<<else>>
 					<<gs 'booty_call_sex' 'rand_position'>>
 				<</if>>
-				<!-- !!				if npc_condom_conscious[$boy] = 1 or booty_call['condom'] = 1:-->
+				<!-- !!				if npc_condom_conscious[$sex.npcId] = 1 or booty_call['condom'] = 1:-->
 				<!-- !!			end-->
 			<</actCLA>>
 			<<gs 'booty_call_miss' 'missionary_start'>>
@@ -133,11 +133,11 @@
 		<<else>>
 			<!-- !! boy wins initiative-->
 			<<if rand(0,1) == 1>>
-				<<if $npcs.get($boy,'fav_pos') == 'missionary'>>
+				<<if $npcs.get($sex.npcId,'fav_pos') == 'missionary'>>
 					<<gs 'booty_call_miss' 'missionary_start'>>
-				<<elseif $npcs.get($boy,'fav_pos') == 'doggy'>>
+				<<elseif $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
 					<<gs 'booty_call_doggy' 'doggy_start'>>
-				<<elseif $npcs.get($boy,'fav_pos') == 'cowgirl'>>
+				<<elseif $npcs.get($sex.npcId,'fav_pos') == 'cowgirl'>>
 					<<gs 'booty_call_cowgirl' 'cowgirl_start'>>
 				<<else>>
 					<<gs 'booty_call_sex' 'rand_position'>>
@@ -153,15 +153,15 @@
 		<<setinit $booty_call['must_fuck'] = 1>>
 
 	<</if>>
-	<<if $npcs.get($boy,'lovername') == ''>>
+	<<if $npcs.get($sex.npcId,'lovername') == ''>>
 		"Do whatever you want to me babe," you smile.
 	<<else>>
-		<p>"Do whatever you want to me <<=$npcs.get($boy,'lovername')>>," you smile.</p>
+		<p>"Do whatever you want to me <<=$npcs.get($sex.npcId,'lovername')>>," you smile.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p><<=$npcs.get($boy,'firstname')>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.</p>
 			"I wanna fuck your pussy."
 			<<actCLA 'Stop him (virgin)'>>
 				<<gt 'booty_call_virgin' 'wait'>>
@@ -170,16 +170,16 @@
 				<<gs 'booty_call_virgin' 'start3'>>
 			<</actCLA>>
 		<<elseif rand(0,1) == 1>>
-			<<if $npcs.get($boy,'fav_pos') == 'missionary'>>
+			<<if $npcs.get($sex.npcId,'fav_pos') == 'missionary'>>
 				<<gs 'booty_call_miss' 'missionary_start'>>
-			<<elseif $npcs.get($boy,'fav_pos') == 'doggy'>>
+			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
 				<<gs 'booty_call_doggy' 'doggy_start'>>
-			<<elseif $npcs.get($boy,'fav_pos') == 'cowgirl'>>
+			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'cowgirl'>>
 				<<gs 'booty_call_cowgirl' 'cowgirl_start'>>
-			<<elseif $npcs.get($boy,'fav_pos') == 'blowjob' and getvar("$booty_call['must_fuck']") != 1>>
+			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'blowjob' and getvar("$booty_call['must_fuck']") != 1>>
 				<<gs 'booty_call_start' 'bj_ask'>>
-			<<elseif $npcs.get($boy,'pussyeater') == 1 and getvar("$booty_call['must_fuck']") != 1>>
-				<p><<=$npcs.get($boy,'firstname')>> starts leading a trail of kisses down your stomach towards your pussy.</p>
+			<<elseif $npcs.get($sex.npcId,'pussyeater') == 1 and getvar("$booty_call['must_fuck']") != 1>>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> starts leading a trail of kisses down your stomach towards your pussy.</p>
 				<<gs 'booty_call_start' 'kuni_start'>>
 			<<else>>
 				<<gs 'booty_call_sex' 'rand_position'>>
@@ -208,8 +208,8 @@
 		<<elseif getvar("$booty_call['position_rand']") == 4 and getvar("$booty_call['must_fuck']") != 1>>
 			<!-- !! blowjob-->
 			<<gs 'booty_call_start' 'bj_ask'>>
-		<<elseif getvar("$booty_call['position_rand']") == 5 and getvar("$booty_call['must_fuck']") != 1 and (getvar("$booty_call['creampie_count']") < 1 or $npcs.get($boy,'pussyeater') == 1)>>
-			<p><<=$npcs.get($boy,'firstname')>> starts leading a trail of kisses down your stomach towards your pussy.</p>
+		<<elseif getvar("$booty_call['position_rand']") == 5 and getvar("$booty_call['must_fuck']") != 1 and (getvar("$booty_call['creampie_count']") < 1 or $npcs.get($sex.npcId,'pussyeater') == 1)>>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> starts leading a trail of kisses down your stomach towards your pussy.</p>
 			<<gs 'booty_call_start' 'kuni_start'>>
 		<<else>>
 			<!-- !! failsafe: default to missionary-->
@@ -353,10 +353,10 @@
 	<<gs 'booty_call_after' 'tap_out'>>
 <</if>>
 <<if $location_var[$here][0] == 'speed_select'>>
-	<<if getvar("$booty_call['too_rough']") == 1 or $npcs.get($boy,'no_rough') > 0>>
+	<<if getvar("$booty_call['too_rough']") == 1 or $npcs.get($sex.npcId,'no_rough') > 0>>
 		<<setinit $booty_call['speed'] = rand(1,2)>>
 	<<else>>
-		<<setinit $booty_call['speed'] = npc_sex_speed[$boy] + rand(-1,1)>>
+		<<setinit $booty_call['speed'] = npc_sex_speed[$sex.npcId] + rand(-1,1)>>
 		<<if getvar("$booty_call['speed']") <= 0>>
 			<<setinit $booty_call['speed'] = 1>>
 
@@ -396,7 +396,7 @@
 			<<if getvar("$booty_call['cock_inserted']") == 0>>
 				<<image "shared/sex/cum/vagcreampie/miss1.jpg">>
 				<<gs 'booty_call_sex' 'break_ask'>>
-				<p>You flop down onto the bed beside <<=$npcs.get($boy,'firstname')>>, feeling his cum trickling from your pussy.</p>
+				<p>You flop down onto the bed beside <<=$npcs.get($sex.npcId,'firstname')>>, feeling his cum trickling from your pussy.</p>
 				A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.
 				<<gs 'booty_call_sex' 'break_time'>>
 			<<else>>
@@ -413,24 +413,24 @@
 					<<if $booty_call['last_cum'] == 'creampie'>>
 						<<if $booty_call['position'] == 'miss'>>
 							<<image "shared/sex/cum/vagcreampie/after1.jpg">>
-							<p><<=$npcs.get($boy,'firstname')>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<=$npcs.get($boy,'firstname')>>'s cum trickle from your pussy.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<=$npcs.get($sex.npcId,'firstname')>>'s cum trickle from your pussy.</p>
 						<<elseif $booty_call['position'] == 'doggy'>>
 							<<image "shared/sex/cum/vagcreampie/doggy2.jpg">>
-							<p><<=$npcs.get($boy,'firstname')>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<=$npcs.get($boy,'firstname')>>'s cum trickles from your pussy.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<=$npcs.get($sex.npcId,'firstname')>>'s cum trickles from your pussy.</p>
 						<<elseif $booty_call['position'] == 'cowgirl'>>
 							<<image "shared/sex/cum/vagcreampie/after1.jpg">>
-							<p>You climb off of <<=$npcs.get($boy,'firstname')>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.</p>
+							<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.</p>
 						<</if>>
 					<<elseif $booty_call['last_cum'] == 'condom'>>
 						<<if $booty_call['position'] == 'miss'>>
 							<<video "shared/sex/after/miss_after1.mp4">>
-							<p><<=$npcs.get($boy,'firstname')>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed, feeling your your pussy continue to leak as <<=$npcs.get($boy,'firstname')>> pulls off the used condom and tosses it aside.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed, feeling your your pussy continue to leak as <<=$npcs.get($sex.npcId,'firstname')>> pulls off the used condom and tosses it aside.</p>
 						<<elseif $booty_call['position'] == 'doggy'>>
 							<<video "shared/sex/after/doggy_after1.mp4">>
-							<p><<=$npcs.get($boy,'firstname')>> climbs off of you and you roll over to face him, thighs slick with your own juices and head swimming with post-fuck endorphins, while he pulls off the used condom and tosses it aside.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and you roll over to face him, thighs slick with your own juices and head swimming with post-fuck endorphins, while he pulls off the used condom and tosses it aside.</p>
 						<<elseif $booty_call['position'] == 'cowgirl'>>
 							<<video "shared/sex/after/cowgirl_after1.mp4">>
-							<p>You climb off of <<=$npcs.get($boy,'firstname')>>, flopping down beside him and let yourself sink into the softness of the bed, sighing with satisfaction as you feel post-fuck juices continue to leak from your pussy and <<=$npcs.get($boy,'firstname')>> pulls off the used condom and tosses it aside.</p>
+							<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him and let yourself sink into the softness of the bed, sighing with satisfaction as you feel post-fuck juices continue to leak from your pussy and <<=$npcs.get($sex.npcId,'firstname')>> pulls off the used condom and tosses it aside.</p>
 						<</if>>
 					<</if>>
 					<<if getvar("$booty_call['speed']") <= 2>>
@@ -442,11 +442,11 @@
 				<</actCLA>>
 				<<actCLA 'Stay like this'>>
 					<<if $booty_call['position'] == 'miss'>>
-						<p>You lay still, leaving <<=$npcs.get($boy,'firstname')>>'s occasionally twitching cock stuffed inside you, your pussy full of his cum, taking deep breaths as you wind down.</p>
+						<p>You lay still, leaving <<=$npcs.get($sex.npcId,'firstname')>>'s occasionally twitching cock stuffed inside you, your pussy full of his cum, taking deep breaths as you wind down.</p>
 					<<elseif $booty_call['position'] == 'doggy'>>
-						<p>You let your legs give out from under you, collapsing to the bed with <<=$npcs.get($boy,'firstname')>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.</p>
+						<p>You let your legs give out from under you, collapsing to the bed with <<=$npcs.get($sex.npcId,'firstname')>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.</p>
 					<<elseif $booty_call['position'] == 'cowgirl'>>
-						<p>You collapse onto <<=$npcs.get($boy,'firstname')>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.</p>
+						<p>You collapse onto <<=$npcs.get($sex.npcId,'firstname')>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.</p>
 					<</if>>
 					<<if getvar("$booty_call['speed']") <= 2>>
 						<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
@@ -459,7 +459,7 @@
 		<<elseif $booty_call['last_cum'] == 'condom'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$booty_call['cock_inserted']") == 0>>
-				<p>You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the bed. <<=$npcs.get($boy,'firstname')>> removes the condom from his cock, tossing it aside before laying down beside you.</p>
+				<p>You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the bed. <<=$npcs.get($sex.npcId,'firstname')>> removes the condom from his cock, tossing it aside before laying down beside you.</p>
 				<<if getvar("$booty_call['speed']") <= 2>>
 					<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
 				<<else>>
@@ -467,11 +467,11 @@
 				<</if>>
 			<<else>>
 				<<if $booty_call['position'] == 'miss'>>
-					<p><<=$npcs.get($boy,'firstname')>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
 				<<elseif $booty_call['position'] == 'doggy'>>
-					<p><<=$npcs.get($boy,'firstname')>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You turn over onto your back and breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You turn over onto your back and breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
 				<<elseif $booty_call['position'] == 'cowgirl'>>
-					<p>You climb off of <<=$npcs.get($boy,'firstname')>>, flopping down beside him as he removes the condom from his softening cock, and let yourself sink into the softness of the bed. He ties off the rubber and tosses it aside.</p>
+					<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him as he removes the condom from his softening cock, and let yourself sink into the softness of the bed. He ties off the rubber and tosses it aside.</p>
 				<</if>>
 				<<if getvar("$booty_call['speed']") <= 2>>
 					<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
@@ -483,26 +483,26 @@
 		<<else>>
 			<<if $booty_call['last_cum'] == 'face_mouth'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the warm mask of <<=$npcs.get($boy,'firstname')>>'s cum across your face, its salty taste on your tongue.</p>
+				<p>You lay back, breathing slowly as you wind down, the warm mask of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your face, its salty taste on your tongue.</p>
 			<<elseif $booty_call['last_cum'] == 'spit'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the salty taste of <<=$npcs.get($boy,'firstname')>>'s sperm on your tongue as it dribbles down your chin.</p>
+				<p>You lay back, breathing slowly as you wind down, the salty taste of <<=$npcs.get($sex.npcId,'firstname')>>'s sperm on your tongue as it dribbles down your chin.</p>
 			<<elseif $booty_call['last_cum'] == 'swallow'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the salty taste of <<=$npcs.get($boy,'firstname')>>'s sperm still on your lips.</p>
+				<p>You lay back, breathing slowly as you wind down, the salty taste of <<=$npcs.get($sex.npcId,'firstname')>>'s sperm still on your lips.</p>
 			<<elseif $booty_call['last_cum'] == 'facial'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the warm mask of <<=$npcs.get($boy,'firstname')>>'s cum across your face already beginning to cool.</p>
+				<p>You lay back, breathing slowly as you wind down, the warm mask of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your face already beginning to cool.</p>
 			<<elseif $booty_call['last_cum'] == 'tits'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
-				<p>You lay back, breathing slowly as you wind down, the warm glaze of <<=$npcs.get($boy,'firstname')>>'s cum across your chest already beginning to cool.</p>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+				<p>You lay back, breathing slowly as you wind down, the warm glaze of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your chest already beginning to cool.</p>
 			<<elseif $booty_call['last_cum'] == 'pullout'>>
 				<<if $booty_call['position'] == 'miss' or $booty_call['position'] == 'cowgirl'>>
 					<<image "shared/sex/cum/stomach/sleep1.jpg">>
 					You lay back, breathing slowly as you wind down, feeling the warm cum on your belly already beginning to cool.
 				<<elseif $booty_call['position'] == 'doggy'>>
 					<<image "shared/sex/cum/back1.jpg">>
-					<p>You just lay there, <<=$npcs.get($boy,'firstname')>>'s cum spattered across your ass, breathing slowly as you wind down.</p>
+					<p>You just lay there, <<=$npcs.get($sex.npcId,'firstname')>>'s cum spattered across your ass, breathing slowly as you wind down.</p>
 				<</if>>
 			<</if>>
 			A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.
@@ -523,10 +523,10 @@
 	<<else>>
 		<p>"Can we take a quick break?," you gasp. "Can we take a quick break? I need a breather."</p>
 	<</if>>
-	<<if $booty_call['cum_count'] - 2 >= $npcs.get($boy,'sexdrive')>>
+	<<if $booty_call['cum_count'] - 2 >= $npcs.get($sex.npcId,'sexdrive')>>
 		"Yeah," he pants back. "I think I need one too."
 	<<else>>
-		<!-- !!		if npc_selfish[$boy] = 1:-->
+		<!-- !!		if npc_selfish[$sex.npcId] = 1:-->
 		<!-- !!		else-->
 		"Sure," he nods.
 		<!-- !!		end-->
@@ -549,7 +549,7 @@
 	<<if getvar("$birth_control['remind_icon']") == 1>>
 		<<actCLA 'Take your birth control'>>
 			<<setinit $birth_control['message_skip'] = $time.daystart>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$birth_control['remind_hour']") > 0 and $time.hour >= $birth_control['remind_hour'] and $time.hour <= $birth_control['remind_hour'] + 1 and $tabletkiday != $time.daystart and getvar("$booty_call['bc_take']") != 1>>
 				"Wait," you say, noticing your phone blinking at you from your purse.
 				<i><font color="pink"><b>Take your vitamins!</b></font></i>
@@ -565,12 +565,12 @@
 			<<setinit $booty_call['bc_take'] = 1>>
 			<<gs 'din_bad' 'quick_takepill'>>
 			<<actCLA 'Take it shyly'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<<if getvar("$booty_call['cock_inserted']") == 1>>
-					<p>You somehow manage to grab hold of your purse without extricating yourself from <<=$npcs.get($boy,'firstname')>> and pop a birth control pill from the packaging.</p>
+					<p>You somehow manage to grab hold of your purse without extricating yourself from <<=$npcs.get($sex.npcId,'firstname')>> and pop a birth control pill from the packaging.</p>
 					"This is what the pill is for after all," you blush, shyly placing it between your lips, feeling your pussy squeeze his cock as you swallow.
 				<<elseif $pc.cumAtLocation(0) > 0>>
-					<p>With <<=$npcs.get($boy,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 					<<if getvar("$booty_call['risky_creampie']") == 1>>
 						"Hopefully we won''t have to worry about this stuff soon," you smile, shyly placing the pill between your lips and swallowing.
 					<<else>>
@@ -579,13 +579,13 @@
 				<<else>>
 					You reach down to your purse and pull out your birth control.
 					<<if getvar("$pillcon2") > 20000 and getvar("$birth_control['think_safe']") != 1>>
-						<<run $npcs.set($boy,'know_bc_not_effective',1)>>
+						<<run $npcs.set($sex.npcId,'know_bc_not_effective',1)>>
 						"I think it'll kick in soon," you smile, shyly placing the pill between your lips and swallowing.
 					<<elseif getvar("$pillcon2") > 10000 and getvar("$birth_control['think_safe']") != 1>>
-						<<run $npcs.set($boy,'know_bc_not_effective',1)>>
+						<<run $npcs.set($sex.npcId,'know_bc_not_effective',1)>>
 						"It's gonna be a while before it starts working," you smile, shyly placing the pill between your lips and swallowing.
 					<<elseif getvar("$pillcon2") > 0 and getvar("$birth_control['think_safe']") != 1>>
-						<<run $npcs.set($boy,'know_bc_not_effective',1)>>
+						<<run $npcs.set($sex.npcId,'know_bc_not_effective',1)>>
 						"I only just started it," you smile, shyly placing the pill between your lips and swallowing.
 					<<else>>
 						"This is what the pill is for after all," you smile, shyly placing the pill between your lips and swallowing.
@@ -595,7 +595,7 @@
 			<</actCLA>>
 			<<actCLA 'Take it sexily'>>
 				<<if getvar("$booty_call['cock_inserted']") == 1>>
-					<p>You somehow manage to grab hold of your purse without extricating yourself from <<=$npcs.get($boy,'firstname')>> and pop a birth control pill from the packaging.</p>
+					<p>You somehow manage to grab hold of your purse without extricating yourself from <<=$npcs.get($sex.npcId,'firstname')>> and pop a birth control pill from the packaging.</p>
 					<<if getvar("$booty_call['risky_creampie']") == 1>>
 						"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin, feeling your pussy squeeze his cock as it goes down.
 					<<elseif getvar("$birth_control['think_safe']") == 1>>
@@ -605,7 +605,7 @@
 						"This is what the pill is for after all," you grin, placing it between your lips, feeling your pussy squeeze his cock as you swallow.
 					<</if>>
 				<<elseif $pc.cumAtLocation(0) > 0>>
-					<p>With <<=$npcs.get($boy,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 					<<if getvar("$booty_call['risky_creampie']") == 1>>
 						"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin.
 					<<elseif getvar("$birth_control['think_safe']") == 1>>
@@ -616,13 +616,13 @@
 				<<else>>
 					You reach down to your purse and pull out your birth control.
 					<<if getvar("$pillcon2") > 20000 and getvar("$birth_control['think_safe']") != 1>>
-						<<run $npcs.set($boy,'know_bc_not_effective',1)>>
+						<<run $npcs.set($sex.npcId,'know_bc_not_effective',1)>>
 						"Just a few more days and we'll never have to worry about condoms again," you say, placing the pill between your lips and swallowing with a grin.
 					<<elseif getvar("$pillcon2") > 10000 and getvar("$birth_control['think_safe']") != 1>>
-						<<run $npcs.set($boy,'know_bc_not_effective',1)>>
+						<<run $npcs.set($sex.npcId,'know_bc_not_effective',1)>>
 						"It'll take a little while, but then we'll never have to worry about condoms again," you say, placing the pill between your lips and swallowing with a grin.
 					<<elseif getvar("$pillcon2") > 0 and getvar("$birth_control['think_safe']") != 1>>
-						<<run $npcs.set($boy,'know_bc_not_effective',1)>>
+						<<run $npcs.set($sex.npcId,'know_bc_not_effective',1)>>
 						"I only just started," you say, placing the pill between your lips and swallowing with a grin. "But in about a few weeks, we'll be able to go condom free."
 					<<else>>
 						"Nothing sexier than safe sex," you say, placing the pill between your lips and swallowing with a grin.
@@ -635,13 +635,13 @@
 <</if>>
 <<if $location_var[$here][0] == 'he_end_break'>>
 	<<setinit $booty_call['position_rand'] = rand(1,5)>>
-	<<=$npcs.get($boy,'apt_bedroom')>>
-	<<if getvar("$booty_call['position_rand']") == 1 or $npcs.get($boy,'fav_pos') == 'missionary' or ($pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0 and getvar("$booty_call['position_rand']") <= 3)>>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+	<<if getvar("$booty_call['position_rand']") == 1 or $npcs.get($sex.npcId,'fav_pos') == 'missionary' or ($pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0 and getvar("$booty_call['position_rand']") <= 3)>>
 		<!-- !! missionary-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($boy,'firstname')>> and find him hungrily staring at you. You realize what's about to happen just before he jumps on top of you, eliciting...</p>
+		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you. You realize what's about to happen just before he jumps on top of you, eliciting...</p>
 		<<actCLA '... giggles'>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($boy,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and lines his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and lines his cock up with your pussy.</p>
 			<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<gt 'booty_call_virgin' 'wait'>>
@@ -657,7 +657,7 @@
 		<</actCLA>>
 		<<actCLA '... a yelp of surprise'>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($boy,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and lines his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and lines his cock up with your pussy.</p>
 			<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<gt 'booty_call_virgin' 'wait'>>
@@ -671,37 +671,37 @@
 				<</actCLA>>
 			<</if>>
 		<</actCLA>>
-	<<elseif getvar("$booty_call['position_rand']") == 2 or $npcs.get($boy,'fav_pos') == 'doggy'>>
+	<<elseif getvar("$booty_call['position_rand']") == 2 or $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
 		<!-- !! doggy-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($boy,'firstname')>> and find him hungrily staring at you. You realize what's about to happen just before he jumps you, eliciting...</p>
+		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you. You realize what's about to happen just before he jumps you, eliciting...</p>
 		<<actCLA '... giggles'>>
 			<<image "shared/sex/foreplay/doggy1.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($boy,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass, lining his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass, lining his cock up with your pussy.</p>
 			<<actCLA 'Get fucked'>>
 				<<gs 'booty_call_doggy' 'doggy_goto'>>
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA '... a yelp of surprise'>>
 			<<image "shared/sex/foreplay/doggy1.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($boy,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.</p>
+			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.</p>
 			<<actCLA 'Get fucked'>>
 				<<gs 'booty_call_doggy' 'doggy_goto'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<elseif getvar("$booty_call['position_rand']") == 3 and getvar("$booty_call['must_fuck']") != 1>>
 		<!-- !! blowjob-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($boy,'firstname')>> and find him hungrily staring at you.</p>
+		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you.</p>
 		<p>"What...?" you ask hesitantly.</p>
 		"I can't stop thinking about you sucking my cock," he growls, his stare becoming even more predatory.
 		<<gs 'booty_call_start' 'bj_ask2'>>
-	<<elseif getvar("$booty_call['position_rand']") == 4 and (getvar("$cum_loc['vagina']") == 0 or $npcs.get($boy,'pussyeater') == 1)>>
+	<<elseif getvar("$booty_call['position_rand']") == 4 and (getvar("$cum_loc['vagina']") == 0 or $npcs.get($sex.npcId,'pussyeater') == 1)>>
 		<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
-		<p>After a few minutes, <<=$npcs.get($boy,'firstname')>> climbs on top of you without saying anything.</p>
+		<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> climbs on top of you without saying anything.</p>
 		<p>"Hey, what are you-" you start to ask until his head descends to your stomach. He lightly kisses it, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, slowly heading towards your thighs.</p>
 		<<gs 'booty_call_start' 'kuni_start'>>
 	<<else>>
 		<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
-		<p>After a few minutes, <<=$npcs.get($boy,'firstname')>> climbs on top of you without saying anything.</p>
+		<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> climbs on top of you without saying anything.</p>
 		<p>"Hey, what are you-" you start to ask until his head descends to your neck. He lightly kisses your throat, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, blazing a trail down your collarbone to the breasts his hands are already thoroughly massaging.</p>
 		<<actCLA 'Continue'>>
 			<<gs 'booty_call_start' 'nipple_play'>>
@@ -710,7 +710,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'keep_going'>>
 	<<actCLA 'Keep going?'>>
-		<<if $booty_call['cum_count'] >= $npcs.get($boy,'sexdrive') + $booty_call['extra_cum']>>
+		<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $booty_call['extra_cum']>>
 			<<gs 'booty_call_after' 'fucked_out'>>
 		<<elseif $booty_call['position'] == 'miss' or $booty_call['position'] == 'doggy' or $booty_call['position'] == 'cowgirl'>>
 			<<set $time.minutes += rand(1,2)>>
@@ -718,7 +718,7 @@
 				<p>"Wanna keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before, causing you to grin. "That feels like a yes."</p>
 			<<else>>
 				<<video "shared/sex/misc/wait.mp4">>
-				<p>"Wanna keep going?" you ask, looking over at <<=$npcs.get($boy,'firstname')>>.</p>
+				<p>"Wanna keep going?" you ask, looking over at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 				"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock.
 				<!-- !!act'Sex':cla & gs'booty_call_sex', 'position_choose' & gs 'booty_call_condoms', 'condoms'-->
 			<</if>>
@@ -731,7 +731,7 @@
 			<<if $booty_call['cum_choice'] != ''>>
 				"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock.
 			<<else>>
-				<p>"What do you have in mind?" <<=$npcs.get($boy,'firstname')>> grins back.</p>
+				<p>"What do you have in mind?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
 			<</if>>
 			<<gs 'booty_call_sex' 'reset'>>
 			<<gs 'booty_call_sex' 'sex_menu'>>
@@ -766,25 +766,25 @@
 			<<actCLA 'Have a smoke'>>
 				<<setinit $booty_call['smoke_break'] = 1>>
 				<<gs 'drugs' 'smoke'>>
-				<<if $npcs.get($boy,'smoker') > 0>>
+				<<if $npcs.get($sex.npcId,'smoker') > 0>>
 					<<image "shared/sex/after/bed_smoke3.jpg">>
 					<<if getvar("$booty_call['cock_inserted']") == 0>>
-						<p>You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($boy,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+						<p>You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
 					<<else>>
 						<<setinit $booty_call['cock_inserted'] = 0>>
 						<<if $booty_call['last_cum'] == 'creampie'>>
-							<p>You finally pull apart, immediately feeling <<=$npcs.get($boy,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($boy,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+							<p>You finally pull apart, immediately feeling <<=$npcs.get($sex.npcId,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
 						<<elseif $booty_call['last_cum'] == 'condom'>>
-							<p>You finally pull apart, letting <<=$npcs.get($boy,'firstname')>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($boy,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+							<p>You finally pull apart, letting <<=$npcs.get($sex.npcId,'firstname')>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
 						<</if>>
 					<</if>>
 					Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, and the two of you continue to puff away until there''s but the charred butts left.
 				<<else>>
 					<<image "shared/sex/after/bed_smoke1.jpg">>
 					<<if $booty_call['last_cum'] == 'creampie'>>
-						<p>You finally pull apart, immediately feeling <<=$npcs.get($boy,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
+						<p>You finally pull apart, immediately feeling <<=$npcs.get($sex.npcId,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
 					<<elseif $booty_call['last_cum'] == 'condom'>>
-						<p>You finally pull apart, letting <<=$npcs.get($boy,'firstname')>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
+						<p>You finally pull apart, letting <<=$npcs.get($sex.npcId,'firstname')>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
 					<</if>>
 					Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, puffing away until there''s nothing but a charred butt left.
 				<</if>>
@@ -793,33 +793,33 @@
 		<<else>>
 			<<actCLA 'Got any smokes?'>>
 				<<setinit $booty_call['smoke_break'] = 1>>
-				<<if $npcs.get($boy,'smoker') > 0 and rand(1,20) < 20>>
+				<<if $npcs.get($sex.npcId,'smoker') > 0 and rand(1,20) < 20>>
 					<<set $siga += 1>>
 					<<set $siga_bum = 1>>
 					<<gs 'drugs' 'smoke'>>
 					<<image "shared/sex/after/bed_smoke3.jpg">>
 					<<if getvar("$booty_call['cock_inserted']") == 0>>
-						<p>"Got any smokes?" you ask. <<=$npcs.get($boy,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+						<p>"Got any smokes?" you ask. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 					<<else>>
 						<<setinit $booty_call['cock_inserted'] = 0>>
 						<<if $booty_call['last_cum'] == 'creampie'>>
-							<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<=$npcs.get($boy,'firstname')>>'s cock slip from your pussy before sitting up. <<=$npcs.get($boy,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+							<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 						<<else>>
-							<p>"Got any smokes?" you ask as you pull apart, finally letting <<=$npcs.get($boy,'firstname')>>'s cock slip from your pussy before sitting up. <<=$npcs.get($boy,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+							<p>"Got any smokes?" you ask as you pull apart, finally letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 						<</if>>
 					<</if>>
 					Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, and the two of you continue to puff away until there''s but the charred butts left.
 				<<else>>
 					<<image "shared/sex/after/annoyed1.jpg">>
 					<<if getvar("$booty_call['cock_inserted']") == 0>>
-						<p>"Got any smokes?" you ask but <<=$npcs.get($boy,'firstname')>> just shakes his head.</p>
+						<p>"Got any smokes?" you ask but <<=$npcs.get($sex.npcId,'firstname')>> just shakes his head.</p>
 					<<elseif $booty_call['last_cum'] == 'creampie'>>
-						<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<=$npcs.get($boy,'firstname')>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
+						<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
 					<<else>>
-						<p>"Got any smokes?" you ask as you pull apart, finally letting <<=$npcs.get($boy,'firstname')>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
+						<p>"Got any smokes?" you ask as you pull apart, finally letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
 					<</if>>
 					<<setinit $booty_call['cock_inserted'] = 0>>
-					<<if $npcs.get($boy,'smoker') > 0>>
+					<<if $npcs.get($sex.npcId,'smoker') > 0>>
 						"Fresh out," he shrugs.
 					<<else>>
 						"I don't smoke. It's bad for you y''know."
@@ -835,14 +835,14 @@
 	<<if $booty_call['last_cum'] != ''>>
 		<<actCLA 'Try to get him hard again (hand)'>>
 			<<setinit $booty_call['cock_inserted'] = 0>>
-			<<if $booty_call['cum_count'] >= $npcs.get($boy,'sexdrive') + $booty_call['extra_cum'] and (booty_call['force_harden'] >= 2 or rand(1,3) == 1)>>
+			<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $booty_call['extra_cum'] and (booty_call['force_harden'] >= 2 or rand(1,3) == 1)>>
 				<!-- !! IMAGE HERE-->
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<<if getvar("$booty_call['force_harden']") > 0>>
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $booty_call['cum_choice'] == 'creampie' or $booty_call['cum_choice'] == 'creampie_surprise'>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($boy,'firstname')>> and grab his cock. You work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again. </p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>> and grab his cock. You work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again. </p>
 				<<else>>
 					Taking hold of his cock, you work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again.
 				<</if>>
@@ -856,9 +856,9 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $booty_call['cum_choice'] == 'creampie' or $booty_call['cum_choice'] == 'creampie_surprise'>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($boy,'firstname')>> and grab his cock. You work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<=$npcs.get($boy,'firstname')>> is standing at attention once again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>> and grab his cock. You work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<=$npcs.get($sex.npcId,'firstname')>> is standing at attention once again.</p>
 				<<else>>
-					<p>Taking hold of his cock, you work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<=$npcs.get($boy,'firstname')>> is standing at attention once again.</p>
+					<p>Taking hold of his cock, you work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<=$npcs.get($sex.npcId,'firstname')>> is standing at attention once again.</p>
 				<</if>>
 				<<if getvar("$booty_call['not_done']") == 1>>
 					"Yeah, that's right...  Just like that little guy..."
@@ -880,18 +880,18 @@
 	<<if $booty_call['last_cum'] != ''>>
 		<<actCLA 'Try to get him hard again (mouth)'>>
 			<<setinit $booty_call['cock_inserted'] = 0>>
-			<<if $booty_call['cum_count'] >= $npcs.get($boy,'sexdrive') + $booty_call['extra_cum'] and (booty_call['force_harden'] >= 2 or rand(1,3) == 1)>>
+			<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $booty_call['extra_cum'] and (booty_call['force_harden'] >= 2 or rand(1,3) == 1)>>
 				<!-- !! IMAGE HERE-->
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<<if getvar("$booty_call['force_harden']") > 0>>
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if ($booty_call['last_cum'] == 'creampie' or $booty_call['cum_choice'] == 'creampie_surprise') and getvar("$booty_call['cock_inserted']") == 1>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($boy,'firstname')>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
 				<<elseif $booty_call['last_cum'] == 'condom'>>
-					<p>You pull away and get down in front of <<=$npcs.get($boy,'firstname')>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard agains.</p>
+					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard agains.</p>
 				<<else>>
-					<p>You pull away and get down in front of <<=$npcs.get($boy,'firstname')>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
+					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
 				<</if>>
 				<<if getvar("$booty_call['not_done']") == 1>>
 					<p>"Goddammit!" you growl. "I still wanted more out of you!"</p>
@@ -906,13 +906,13 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $booty_call['last_cum'] == 'creampie' and getvar("$booty_call['cock_inserted']") == 1>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($boy,'firstname')>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.</p>
 				<<elseif $booty_call['last_cum'] == 'creampie' and getvar("$booty_call['cock_inserted']") == 1 and getvar("$booty_call['force_harden']") > 0>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($boy,'firstname')>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<=$npcs.get($boy,'firstname')>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<=$npcs.get($sex.npcId,'firstname')>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..</p>
 				<<elseif $booty_call['last_cum'] == 'condom'>>
-					<p>You pull away and get down in front of <<=$npcs.get($boy,'firstname')>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.</p>
+					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.</p>
 				<<elseif getvar("$booty_call['force_harden']") > 0>>
-					<p>Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, <<=$npcs.get($boy,'firstname')>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again.</p>
+					<p>Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, <<=$npcs.get($sex.npcId,'firstname')>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again.</p>
 				<<else>>
 					Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, the dick between your lips begins to stiffen up again.
 				<</if>>
@@ -1008,20 +1008,20 @@
 <</if>>
 <<if $location_var[$here][0] == 'pain'>>
 	<<if getvar("$booty_call['speed']") != 3>>
-		<<if $npcs.get($boy,'dick_desc') == 'lengthy'>>
+		<<if $npcs.get($sex.npcId,'dick_desc') == 'lengthy'>>
 			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 			<<else>>
 				<<gs 'pain' 1 'cervix' 'hit'>>
 			<</if>>
-		<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
+		<<elseif $npcs.get($sex.npcId,'dick_desc') == 'gigantic'>>
 			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 				<<gs 'pain' 1 'vaginal' 'stretch'>>
 			<<else>>
 				<<gs 'pain' 1 'cervix' 'hit'>>
 			<</if>>
-		<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
+		<<elseif $npcs.get($sex.npcId,'dick_desc') == 'monster'>>
 			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 				<<gs 'pain' 2 'vaginal' 'stretch'>>
@@ -1031,20 +1031,20 @@
 			<</if>>
 		<</if>>
 	<<else>>
-		<<if $npcs.get($boy,'dick_desc') == 'lengthy'>>
+		<<if $npcs.get($sex.npcId,'dick_desc') == 'lengthy'>>
 			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 3 'cervix' 'hit'>>
 			<<else>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 			<</if>>
-		<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
+		<<elseif $npcs.get($sex.npcId,'dick_desc') == 'gigantic'>>
 			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 3 'cervix' 'hit'>>
 				<<gs 'pain' 2 'vaginal' 'stretch'>>
 			<<else>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 			<</if>>
-		<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
+		<<elseif $npcs.get($sex.npcId,'dick_desc') == 'monster'>>
 			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 3 'cervix' 'hit'>>
 				<<gs 'pain' 2 'vaginal' 'stretch'>>
@@ -1085,7 +1085,7 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>Hammock on the water? That doesn''t make any sense. And it doesn''t feel like there''s a pillow between <b>my legs</b>, it feels like it's...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($boy,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'booty_call_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1105,7 +1105,7 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>That doesn''t feel like wood. I'm not being impaled, I'm being...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($boy,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'booty_call_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1129,7 +1129,7 @@
 			<i>Hang on a minute.</i>
 			You moan involuntarily as a spark of pleasure jumps through your chest.
 			<i>I'm not dreaming... I'm...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($boy,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'booty_call_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1149,34 +1149,34 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>It <b>is</b> inside me! And that's not jelly, that's...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($boy,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'booty_call_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'sleep_wake_options'>>
-	<<if $npcs.get($boy,'sleep_sex_okay') < 1>>
+	<<if $npcs.get($sex.npcId,'sleep_sex_okay') < 1>>
 		<<actCLA 'What the fuck!'>>
 			<<gt 'booty_call_sex' 'sleep_wake_wtf'>>
 		<</actCLA>>
-	<<elseif $npcs.get($boy,'sleep_sex_okay') == 1>>
-		<!-- !! npc_sleep_sex_okay[$boy] = 2 means you've asked him to wake you up for sleep sex-->
-		<p>"You're finally awake," <<=$npcs.get($boy,'firstname')>> smiles.</p>
+	<<elseif $npcs.get($sex.npcId,'sleep_sex_okay') == 1>>
+		<!-- !! npc_sleep_sex_okay[$sex.npcId] = 2 means you've asked him to wake you up for sleep sex-->
+		<p>"You're finally awake," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
 	<</if>>
 	<<actCLA 'Moan'>>
 		<<setinit $booty_call['sleep_fuck'] = 2>>
 		<<setinit $booty_call['position'] = 'miss'>>
 		<<video "shared/sex/sleep/wake1.mp4">>
 		<i>Ahh~! Aahn~!</i>
-		<p>You moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($boy,'firstname')>> can keep fucking you.</p>
+		<p>You moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
 		<<if getvar("$npc_sex_speed") <= 2>>
 			<<setinit $booty_call['speed'] = 1>>
-			<<actCLA 'Fuck $npcs.get('+$boy,'firstname')+''>>
+			<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
 				<<gs 'booty_call_miss' 'miss1.2'>>
 			<</actCLA>>
 		<<else>>
 			<<setinit $booty_call['speed'] = 3>>
-			<<actCLA 'Fuck $npcs.get('+$boy,'firstname')+''>>
+			<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
 				<<gs 'booty_call_miss' 'miss3.1'>>
 			<</actCLA>>
 		<</if>>
@@ -1189,7 +1189,7 @@
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 		<<video "shared/sex/vag/miss/orgasm1.mp4">>
-		<p>In your relaxed state of sleep, you didn't realize how close you were to orgasm. The instant you're aware of it, your arousal finally breaks and an orgasm rocks through your body. You whimper sleepily as you squirm beneath <<=$npcs.get($boy,'firstname')>> and your climax washes over you.</p>
+		<p>In your relaxed state of sleep, you didn't realize how close you were to orgasm. The instant you're aware of it, your arousal finally breaks and an orgasm rocks through your body. You whimper sleepily as you squirm beneath <<=$npcs.get($sex.npcId,'firstname')>> and your climax washes over you.</p>
 		<<actCLA 'Back to sleep'>>
 			$booty_call['sleep_video2']
 			<i>That was... nice...</i> you think before tiredness overtakes you and you drift off back to dreamland.
@@ -1201,15 +1201,15 @@
 			<<setinit $booty_call['position'] = 'miss'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			<i>Ahh~! Aahn~!</i>
-			<p>You moan with hoarse arousal as your orgasm fades and control comes back to your body, spreading your legs wider so <<=$npcs.get($boy,'firstname')>> can keep fucking you.</p>
+			<p>You moan with hoarse arousal as your orgasm fades and control comes back to your body, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
 			<<if getvar("$npc_sex_speed") <= 2>>
 				<<setinit $booty_call['speed'] = 1>>
-				<<actCLA 'Fuck $npcs.get('+$boy,'firstname')+''>>
+				<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
 					<<gs 'booty_call_miss' 'miss1.2'>>
 				<</actCLA>>
 			<<else>>
 				<<setinit $booty_call['speed'] = 3>>
-				<<actCLA 'Fuck $npcs.get('+$boy,'firstname')+''>>
+				<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
 					<<gs 'booty_call_miss' 'miss3.1'>>
 				<</actCLA>>
 			<</if>>
@@ -1221,11 +1221,11 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'sleep_wake_wtf'>>
-	<<=$npcs.get($boy,'apt_bedroom')>>
-	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<=$npcs.get($boy,'firstname')>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
-	<<if (npc_caretaker[$boy] == 1 or rand(1,3) == 1) and $npcs.get($boy,'abusive') != 1>>
-		<p><<=$npcs.get($boy,'firstname')>> looks deeply embarrassed.</p>
-		<<if $booty_call['cum_count'] >= $npcs.get($boy,'sexdrive')>>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<=$npcs.get($sex.npcId,'firstname')>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
+	<<if (npc_caretaker[$sex.npcId] == 1 or rand(1,3) == 1) and $npcs.get($sex.npcId,'abusive') != 1>>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> looks deeply embarrassed.</p>
+		<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
 			<p>"I- I'm sorry," he stammers. "After you fell asleep, I woke up. You were right there and I was so hard. I just couldn't get back to sleep. And since we just... you know... I thought I could...</p>
 		<<else>>
 			<p>"I- I'm sorry," he stammers. "After you fell asleep, I was still hard. I just couldn't get to bed. And since we just... you know... I thought I could...</p>
@@ -1246,13 +1246,13 @@
 <</if>>
 <<if $location_var[$here][0] == 'sleep_wtf_forgive'>>
 	<<actCLA 'Don`t do it again'>>
-		<<run $npcs.set($boy,'sleep_sex_okay',-1)>>
+		<<run $npcs.set($sex.npcId,'sleep_sex_okay',-1)>>
 		<p>"... don't do it again, okay?" you warn.</p>
 		<p>"Okay..." he says. After a moment, still blushing, he says, "Since you're awake... do you think we could...?"</p>
 		<<gs 'booty_call_sex' 'sleep_wtf_forgive2'>>
 	<</actCLA>>
 	<<actCLA 'Ask next time'>>
-		<<run $npcs.set($boy,'sleep_sex_okay',1)>>
+		<<run $npcs.set($sex.npcId,'sleep_sex_okay',1)>>
 		<p>"... ask next time, okay?" you say with a soft smile.</p>
 		<p>"Ask?" he says hesitantly. "You mean, wake you up?"</p>
 		<<actCLA 'For permission'>>
@@ -1270,12 +1270,12 @@
 <<if $location_var[$here][0] == 'sleep_wtf_forgive2'>>
 	<<actCLA 'No way'>>
 		<<setinit $booty_call['sleep_fuck'] = -1>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		Your anger returns swiftly.
 		<p>"No! Did you really think I was going to say yes after you were just <i>molesting</i> me in my sleep?"</p>
-		<p><<=$npcs.get($boy,'firstname')>> sighs disappointedly and lays back in bed.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> sighs disappointedly and lays back in bed.</p>
 		<<actCLA 'Time to leave'>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Ugh." You sneer at him as you get up. "I see how it's gonna be. Not gonna get a wink of sleep with you around. I'm leaving."
 			Quick as you can, you gather your things and get dressed and head out the door.
 			<<actCLA 'Leave'>>
@@ -1283,7 +1283,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Back to sleep'>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			You crawl back under the sheets, closing your eyes, and try to get back to sleep.
 			<<actCLA '. . .'>>
 				<<gt 'booty_call_after' 'sleep_function'>>
@@ -1292,7 +1292,7 @@
 	<</actCLA>>
 	<<actCLA 'Oh alright'>>
 		<<setinit $booty_call['sleep_fuck'] = 2>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		You give him a look and after a brief pause, you sigh dramatically, rolling your eyes.
 		<p>"Oh alright. Come here," you say, beckoning him towards you so you can do something about his raging hard-on.</p>
 		<<gs 'booty_call_sex' 'reset'>>
@@ -1300,23 +1300,23 @@
 	<</actCLA>>
 	<<actCLA 'Sure'>>
 		<<setinit $booty_call['sleep_fuck'] = 2>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"Sure," you grin, beckoning him closer so you can put his raging erection to use.
 		<<gs 'booty_call_sex' 'reset'>>
 		<<gs 'booty_call_sex' 'sex_menu'>>
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'sleep_cum'>>
-	<<if $npcs.get($boy,'cum_pref') == 'creampie' and (($npcs.get($boy,'condom_conscious') != 1 and $npcs.get($boy,'childfree') != 1) or ($npcs.get($boy,'free_creampies') == 1 and (getvar("$booty_call['safe_day']") == 1 or getvar("$booty_call['probably_safe_day']") == 1)) or $npcs.get($boy,'free_creampies') == 2 or $npcs.get($boy,'know_bc') == 1)>>
-		<<gs 'cum_call' '' $boy 1>>
-	<<elseif $npcs.get($boy,'cum_pref') == 'mouth' or $npcs.get($boy,'cum_pref') == 'face'>>
-		<<gs 'cum_call' 'face' $boy 1>>
-	<<elseif $npcs.get($boy,'cum_pref') == 'tits'>>
-		<<gs 'cum_call' 'breasts' $boy 1>>
-	<<elseif $npcs.get($boy,'cum_pref') == 'pullout'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+	<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie' and (($npcs.get($sex.npcId,'condom_conscious') != 1 and $npcs.get($sex.npcId,'childfree') != 1) or ($npcs.get($sex.npcId,'free_creampies') == 1 and (getvar("$booty_call['safe_day']") == 1 or getvar("$booty_call['probably_safe_day']") == 1)) or $npcs.get($sex.npcId,'free_creampies') == 2 or $npcs.get($sex.npcId,'know_bc') == 1)>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
+	<<elseif $npcs.get($sex.npcId,'cum_pref') == 'mouth' or $npcs.get($sex.npcId,'cum_pref') == 'face'>>
+		<<gs 'cum_call' 'face' $sex.npcId 1>>
+	<<elseif $npcs.get($sex.npcId,'cum_pref') == 'tits'>>
+		<<gs 'cum_call' 'breasts' $sex.npcId 1>>
+	<<elseif $npcs.get($sex.npcId,'cum_pref') == 'pullout'>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<<else>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<</if>>
 	<<actCLA '. . .'>>
 		<<gt 'booty_call_after' 'sleep_function'>>
@@ -1357,33 +1357,33 @@
 <</if>>
 <<if $location_var[$here][0] == 'wakeup_sex2'>>
 	<<image "shared/sex/vag/miss/3.jpg">>
-	<p>Your eyes flutter open and find <<=$npcs.get($boy,'firstname')>> balls deep inside you, happily fucking you first thing in the morning.</p>
+	<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> balls deep inside you, happily fucking you first thing in the morning.</p>
 	<<gs 'booty_call_sex' 'wakeup_sex_options'>>
 <</if>>
 <<if $location_var[$here][0] == 'wakeup_sex_options'>>
-	<<if $npcs.get($boy,'sleep_sex_okay') > 0>>
-		<!-- !! npc_sleep_sex_okay[$boy] = 2 means you've asked him to wake you up for sleep sex-->
-		<<if $npcs.get($boy,'humor') == 1 and $npcs.get($boy,'apt_spare') == 'gaming' and rand(1,3) == 1>>
+	<<if $npcs.get($sex.npcId,'sleep_sex_okay') > 0>>
+		<!-- !! npc_sleep_sex_okay[$sex.npcId] = 2 means you've asked him to wake you up for sleep sex-->
+		<<if $npcs.get($sex.npcId,'humor') == 1 and $npcs.get($sex.npcId,'apt_spare') == 'gaming' and rand(1,3) == 1>>
 			<<setinit $booty_call['skyrim_joke'] = 1>>
-			<p>"You're finally awake," <<=$npcs.get($boy,'firstname')>> says, putting on a stern face and a gruff voice. "You were trying to cross the border, right?"</p>
+			<p>"You're finally awake," <<=$npcs.get($sex.npcId,'firstname')>> says, putting on a stern face and a gruff voice. "You were trying to cross the border, right?"</p>
 		<<else>>
-			<p>"Good morning," <<=$npcs.get($boy,'firstname')>> smiles. "Have any good dreams?"</p>
+			<p>"Good morning," <<=$npcs.get($sex.npcId,'firstname')>> smiles. "Have any good dreams?"</p>
 		<</if>>
 	<</if>>
 	<<actCLA 'Moan'>>
 		<<gs 'booty_call_sex' 'morning_wake_fuck_code'>>
 		<i>Ahh~! Aahn~!</i>
-		<p>You moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($boy,'firstname')>> can keep fucking you.</p>
+		<p>You moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
 		<<gs 'booty_call_sex' 'wakeup_sex_continue'>>
 	<</actCLA>>
-	<<if $npcs.get($boy,'sleep_sex_okay') < 1>>
+	<<if $npcs.get($sex.npcId,'sleep_sex_okay') < 1>>
 		<<actCLA 'What the fuck!'>>
 			<<gt 'booty_call_sex' 'morning_wake_wtf'>>
 		<</actCLA>>
-	<<elseif $npcs.get($boy,'sleep_sex_okay') == 1>>
+	<<elseif $npcs.get($sex.npcId,'sleep_sex_okay') == 1>>
 		<<actCLA '"You were supposed to wake me" (not mad)'>>
 			<<gs 'booty_call_sex' 'morning_wake_fuck_code'>>
-			<p>"Weren't <i>mm-!</i> you supposed to <i>aah~!</i> wake me?" you moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($boy,'firstname')>> can keep fucking you.</p>
+			<p>"Weren't <i>mm-!</i> you supposed to <i>aah~!</i> wake me?" you moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
 			"I just did," he grins.
 			<<gs 'booty_call_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
@@ -1391,7 +1391,7 @@
 	<<if getvar("$booty_call['skyrim_joke']") == 1>>
 		<<actCLA 'Giggle'>>
 			<<gs 'booty_call_sex' 'morning_wake_fuck_code'>>
-			<p><<=$npcs.get($boy,'firstname')>>'s internet video game joke is stupid to be sure, but despite that you can't help but smile at it.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>>'s internet video game joke is stupid to be sure, but despite that you can't help but smile at it.</p>
 			"You're such a dork," you say, your giggles turning to moans as you feel him thrust again inside you.
 			<<gs 'booty_call_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
@@ -1431,17 +1431,17 @@
 		<<actCLA 'Are you a child?'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			<p>"Ugh," you groan loudly. "Internet memes? Seriously? What are you? Twelve?"</p>
-			<p><<=$npcs.get($boy,'firstname')>> seems to feel no shame at all, letting his shit eating grin widen as he keeps fucking you.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> seems to feel no shame at all, letting his shit eating grin widen as he keeps fucking you.</p>
 			<<gs 'booty_call_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
 		<<actCLA 'That killed the mood'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			"<i>Wow</i>," you say, cringing something awful. "You sure know how to instantly kill the mood. I think we're done here."
-			<p>"Oh come on! It wasn't that bad!" <<=$npcs.get($boy,'firstname')>> tries to protest as you push him away. "Come on, don't be like that."</p>
+			<p>"Oh come on! It wasn't that bad!" <<=$npcs.get($sex.npcId,'firstname')>> tries to protest as you push him away. "Come on, don't be like that."</p>
 			<<actCLA 'Yes it was'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"Uhh, <i>yes</i>. It was," you say, giving him a look of contempt. "I practically felt the moisture in my vagina evaporate. There is no way I'm going to let you fuck me right after saying that with your cock <i>inside</i> me."
-				<p>You successfully push <<=$npcs.get($boy,'firstname')>> off of you, shuddering with utter disgust the moment he's out from between your legs.</p>
+				<p>You successfully push <<=$npcs.get($sex.npcId,'firstname')>> off of you, shuddering with utter disgust the moment he's out from between your legs.</p>
 				<<gs 'booty_call_morning' 'wakeup1'>>
 			<</actCLA>>
 			<<actCLA 'Ugh, fine'>>
@@ -1454,10 +1454,10 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'morning_wake_wtf'>>
-	<<=$npcs.get($boy,'apt_bedroom')>>
-	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<=$npcs.get($boy,'firstname')>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
-	<<if (npc_caretaker[$boy] == 1 or rand(1,3) == 1) and $npcs.get($boy,'abusive') != 1>>
-		<p><<=$npcs.get($boy,'firstname')>> looks deeply embarrassed.</p>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<=$npcs.get($sex.npcId,'firstname')>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
+	<<if (npc_caretaker[$sex.npcId] == 1 or rand(1,3) == 1) and $npcs.get($sex.npcId,'abusive') != 1>>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> looks deeply embarrassed.</p>
 		<p>"I- I'm sorry," he stammers. "I woke up. You were right there and... I thought it would be sexy if I... you know...</p>
 		<<actCLA 'Forgive him'>>
 			Your hard stare softens and you feel the anger slowly drain from your body.
@@ -1475,13 +1475,13 @@
 <</if>>
 <<if $location_var[$here][0] == 'morning_wtf_forgive'>>
 	<<actCLA 'Don`t do it again'>>
-		<<run $npcs.set($boy,'sleep_sex_okay',-1)>>
+		<<run $npcs.set($sex.npcId,'sleep_sex_okay',-1)>>
 		<p>"... don't do it again, okay?" you warn.</p>
 		<p>"Okay..." he says. After a moment, still blushing, he says, "Since you're awake... do you think we could...?"</p>
 		<<gs 'booty_call_sex' 'morning_wtf_forgive2'>>
 	<</actCLA>>
 	<<actCLA 'Wake me up first'>>
-		<<run $npcs.set($boy,'sleep_sex_okay',1)>>
+		<<run $npcs.set($sex.npcId,'sleep_sex_okay',1)>>
 		<p>"... wake me next time, okay?" you say with a soft smile.</p>
 		"I can do that," he grins.
 		<<actCLA 'For permission'>>
@@ -1499,16 +1499,16 @@
 <<if $location_var[$here][0] == 'morning_wtf_forgive2'>>
 	<<actCLA 'No way'>>
 		<<setinit $booty_call['morning_fuck'] = -1>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		Your anger returns swiftly.
 		<p>"No! Did you really think I was going to say yes after you were just <i>molesting</i> me in my sleep?"</p>
-		<p><<=$npcs.get($boy,'firstname')>> sighs disappointedly and lays back in bed.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> sighs disappointedly and lays back in bed.</p>
 		<<gs 'booty_call_morning' 'wakeup1'>>
 	<</actCLA>>
 	<<actCLA 'Oh alright'>>
 		<<setinit $booty_call['morning_fuck'] = 2>>
 		<<setinit $booty_call['start_time'] = $totminut>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		You give him a look and after a brief pause, you sigh dramatically, rolling your eyes.
 		<p>"Oh alright. Come here," you say, beckoning him towards you so you can do something about his raging hard-on.</p>
 		<<gs 'booty_call_sex' 'reset'>>
@@ -1517,7 +1517,7 @@
 	<<actCLA 'Sure'>>
 		<<setinit $booty_call['morning_fuck'] = 2>>
 		<<setinit $booty_call['start_time'] = $totminut>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"Sure," you grin, beckoning him closer so you can put his raging erection to use.
 		<<gs 'booty_call_sex' 'reset'>>
 		<<gs 'booty_call_sex' 'sex_menu'>>
@@ -1527,12 +1527,12 @@
 	<<setinit $booty_call['start_time'] = $totminut>>
 	<<if getvar("$npc_sex_speed") <= 2>>
 		<<setinit $booty_call['speed'] = 1>>
-		<<actCLA 'Fuck $npcs.get('+$boy,'firstname')+''>>
+		<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
 			<<gs 'booty_call_miss' 'miss1.2'>>
 		<</actCLA>>
 	<<else>>
 		<<setinit $booty_call['speed'] = 3>>
-		<<actCLA 'Fuck $npcs.get('+$boy,'firstname')+''>>
+		<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
 			<<gs 'booty_call_miss' 'miss3.1'>>
 		<</actCLA>>
 	<</if>>

sugarcube/src/activities/bootycall/booty_call_stats.tw

@@ -39,8 +39,8 @@
 		<<setinit $booty_call['magik'] = $pcs_magik>>
 
 	<</if>>
-	<<if $npcs.get($boy,'fuckbuddy') != 1>>
-		<<run $npcs.set($boy,'fuckbuddy',1)>>
+	<<if $npcs.get($sex.npcId,'fuckbuddy') != 1>>
+		<<run $npcs.set($sex.npcId,'fuckbuddy',1)>>
 
 	<</if>>
 	<<if $tabletkiday == $time.daystart>>
@@ -50,62 +50,62 @@
 <</if>>
 <<if $location_var[$here][0] == 'save'>>
 	<!-- !! number of times you have initiated or responded to a booty call-->
-	<<run $npcs.inc($boy,'bootycalls',1)>>
+	<<run $npcs.inc($sex.npcId,'bootycalls',1)>>
 	<!-- !! number of times you have had sex with an npc-->
-	<<run $npcs.inc($boy,'fuck_times',$booty_call['fuck'])>>
-	<<run $npcs.inc($boy,'kuni_times',$booty_call['kuni'])>>
+	<<run $npcs.inc($sex.npcId,'fuck_times',$booty_call['fuck'])>>
+	<<run $npcs.inc($sex.npcId,'kuni_times',$booty_call['kuni'])>>
 	<!-- !! number of times you have made your fuckbuddy cum-->
-	<<run $npcs.inc($boy,'cum_count',$booty_call['cum_count'])>>
+	<<run $npcs.inc($sex.npcId,'cum_count',$booty_call['cum_count'])>>
 	<!-- !! number of times your fuckbuddy has brought you to orgasm-->
-	<<run $npcs.inc($boy,'orgasm_count',$booty_call['orgasm_count'])>>
+	<<run $npcs.inc($sex.npcId,'orgasm_count',$booty_call['orgasm_count'])>>
 	<!-- !! number of times you have faked an orgasm-->
-	<<run $npcs.inc($boy,'fake_orgasm_count',$booty_call['fake_orgasm_count'])>>
+	<<run $npcs.inc($sex.npcId,'fake_orgasm_count',$booty_call['fake_orgasm_count'])>>
 	<!-- !! number of times you have been creampied by your fuckbudy-->
-	<<run $npcs.inc($boy,'creampie_count',$booty_call['creampie'])>>
+	<<run $npcs.inc($sex.npcId,'creampie_count',$booty_call['creampie'])>>
 	<!-- !! number of times you have cum together with your fuckbuddy-->
-	<<run $npcs.inc($boy,'cum_together_count',$booty_call['creampie_orgasm'])>>
+	<<run $npcs.inc($sex.npcId,'cum_together_count',$booty_call['creampie_orgasm'])>>
 	<!-- !! number of times your fuckbuddy has cum on your face-->
-	<<run $npcs.inc($boy,'facial_count',$booty_call['facial'])>>
+	<<run $npcs.inc($sex.npcId,'facial_count',$booty_call['facial'])>>
 	<!-- !! number of times your fuckbuddy has cum on your tits-->
-	<<run $npcs.inc($boy,'creampie_count',$booty_call['tit_cum'])>>
+	<<run $npcs.inc($sex.npcId,'creampie_count',$booty_call['tit_cum'])>>
 	<!-- !! number of times your fuckbuddy has pulled out-->
-	<<run $npcs.inc($boy,'pullout_count',$booty_call['pullout'])>>
+	<<run $npcs.inc($sex.npcId,'pullout_count',$booty_call['pullout'])>>
 	<!-- !! number of times your fuckbuddy has cum in your mouth-->
-	<<run $npcs.inc($boy,'mouth_cum_count',$booty_call['mouth_cum'])>>
+	<<run $npcs.inc($sex.npcId,'mouth_cum_count',$booty_call['mouth_cum'])>>
 	<!-- !! number of times you have jerked him to completion-->
-	<<run $npcs.inc($boy,'cum_hand_count',$booty_call['cum_hand'])>>
+	<<run $npcs.inc($sex.npcId,'cum_hand_count',$booty_call['cum_hand'])>>
 	<!-- !! number of times you have swallowed for your fuckbuddy-->
-	<<run $npcs.inc($boy,'swallow_count',$booty_call['swallow_count'])>>
+	<<run $npcs.inc($sex.npcId,'swallow_count',$booty_call['swallow_count'])>>
 	<!-- !! number of times you have spit out his cum-->
-	<<run $npcs.inc($boy,'spit_count',$booty_call['spit_count'])>>
+	<<run $npcs.inc($sex.npcId,'spit_count',$booty_call['spit_count'])>>
 	<!-- !! number of times you have fucked in the shower-->
-	<<run $npcs.inc($boy,'shower_sex_count',$booty_call['shower_sex'])>>
+	<<run $npcs.inc($sex.npcId,'shower_sex_count',$booty_call['shower_sex'])>>
 	<!-- !! number of times your fuckbuddy has cum in your mouth-->
-	<<run $npcs.inc($boy,'mouth_cum_count',$booty_call['mouth_cum'])>>
+	<<run $npcs.inc($sex.npcId,'mouth_cum_count',$booty_call['mouth_cum'])>>
 	<!-- !! number of times you have denied letting your fuckbuddy take your virginity-->
-	<<run $npcs.inc($boy,'virgin_deny',$booty_call['virgin_deny'])>>
+	<<run $npcs.inc($sex.npcId,'virgin_deny',$booty_call['virgin_deny'])>>
 	<!-- !! if your fuckbuddy takes your virginity without consent-->
-	<<run $npcs.inc($boy,'virgin_rapist',$booty_call['virgin_rape'])>>
+	<<run $npcs.inc($sex.npcId,'virgin_rapist',$booty_call['virgin_rape'])>>
 	<<if getvar("$booty_call['sleep_fuck']") > 0>>
 		<<setn $npc_sleep_fuck += 1>>
 
 	<</if>>
 	<<if $time.hour >= 8 and $time.hour < 14 and $time.weekday < 6 and mid($start_type,1,2) == 'sg' and getvar("$SchoolAtestat") == 0 and $time.isSchoolHoliday == 0 and $schoolProgulDay != $time.daystart>>
 		<!-- !!absence from school-->
-		<<run $npcs.set($boy,'school_absences',$schoolprogul)>>
+		<<run $npcs.set($sex.npcId,'school_absences',$schoolprogul)>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'birth_control_know'>>
-	<<run $npcs.set($boy,'know_not_bc',0)>>
-	<<run $npcs.set($boy,'know_bc',1)>>
+	<<run $npcs.set($sex.npcId,'know_not_bc',0)>>
+	<<run $npcs.set($sex.npcId,'know_bc',1)>>
 <</if>>
 <<if $location_var[$here][0] == 'no_birth_control_know'>>
-	<<run $npcs.set($boy,'know_not_bc',1)>>
-	<<run $npcs.set($boy,'know_bc',0)>>
+	<<run $npcs.set($sex.npcId,'know_not_bc',1)>>
+	<<run $npcs.set($sex.npcId,'know_bc',0)>>
 <</if>>
 <<if $location_var[$here][0] == 'single_know'>>
-	<<run $npcs.set($boy,'know_have_boyfriend',0)>>
-	<<run $npcs.set($boy,'know_have_girlfriend',0)>>
+	<<run $npcs.set($sex.npcId,'know_have_boyfriend',0)>>
+	<<run $npcs.set($sex.npcId,'know_have_girlfriend',0)>>
 <</if>>
 <<if $location_var[$here][0] == 'sleep_check'>>
 	<<setinit $booty_call['sleep_cum_vagina'] = $cum_loc['vagina']>>

sugarcube/src/activities/bootycall/booty_call_talk.tw

@@ -8,18 +8,18 @@
 	cla & *clr
 	'<<image `'shared/sex/after/pillow_talk1.jpg'`>>'
 	end} -->
-	<<if $npcs.get($boy,'childfree') == 1 and getvar("$WIP_enabled") == 1>>
+	<<if $npcs.get($sex.npcId,'childfree') == 1 and getvar("$WIP_enabled") == 1>>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Speaking of which..." <<=$npcs.get($boy,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "You're going to get a morning after pill, right?"</p>
+			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "You're going to get a morning after pill, right?"</p>
 		<<else>>
-			<p>"Speaking of which..." <<=$npcs.get($boy,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You're going to get a morning after pill, right?"</p>
+			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You're going to get a morning after pill, right?"</p>
 		<</if>>
 		<<gs 'booty_call_talk' 'childfree_accidental_creampie1'>>
 	<<else>>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Speaking of which..." <<=$npcs.get($boy,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"</p>
+			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"</p>
 		<<else>>
-			<p>"Speaking of which..." <<=$npcs.get($boy,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "Are you gonna be okay...?"</p>
+			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "Are you gonna be okay...?"</p>
 		<</if>>
 		<<gs 'booty_call_talk' 'boy_accidental_creampie2'>>
 	<</if>>
@@ -54,7 +54,7 @@
 					<<else>>
 						"Probably not..." you say hesitantly, grimacing as you do. "It's a pretty risky day for me...
 					<</if>>
-					<<if $npcs.get($boy,'childfree') == 1 or $npcs.get($boy,'caretaker') == 1>>
+					<<if $npcs.get($sex.npcId,'childfree') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
 						<<gs 'booty_call_talk' 'morning_after_money'>>
 					<<else>>
 						<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -63,7 +63,7 @@
 			<</if>>
 			<<actCLA 'I`m not sure'>>
 				"I'm... not sure..." you say hesitantly.
-				<<if $npcs.get($boy,'childfree') == 1 or $npcs.get($boy,'caretaker') == 1>>
+				<<if $npcs.get($sex.npcId,'childfree') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
 					<<gs 'booty_call_talk' 'morning_after_money'>>
 				<<else>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -71,7 +71,7 @@
 			<</actCLA>>
 			<<actCLA 'Roll the dice?'>>
 				<p>"I'm not sure... Maybe we can just roll the dice?" you say with a hesitant smile.</p>
-				<<if $npcs.get($boy,'childfree') == 1 or $npcs.get($boy,'caretaker') == 1>>
+				<<if $npcs.get($sex.npcId,'childfree') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
 					<<gs 'booty_call_talk' 'morning_after_money'>>
 				<<else>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -79,7 +79,7 @@
 			<</actCLA>>
 			<<actCLA 'Need plan B'>>
 				"Not really," you grimace. "I'm definitely going to need some plan B tomorrow."
-				<<if $npcs.get($boy,'childfree') == 1 or $npcs.get($boy,'caretaker') == 1>>
+				<<if $npcs.get($sex.npcId,'childfree') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
 					<<gs 'booty_call_talk' 'morning_after_money'>>
 				<<else>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -87,7 +87,7 @@
 			<</actCLA>>
 			<<actCLA 'Need plan B (safety)'>>
 				"I'll get some plan B tomorrow just to be safe," you say.
-				<<if $npcs.get($boy,'childfree') == 1 or $npcs.get($boy,'caretaker') == 1>>
+				<<if $npcs.get($sex.npcId,'childfree') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
 					<<gs 'booty_call_talk' 'morning_after_money'>>
 				<<else>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -122,7 +122,7 @@
 		<<else>>
 			<<actCLA 'Roll the dice?'>>
 				<p>"I'm not sure... Maybe we can just roll the dice?" you say with a hesitant smile.</p>
-				<<if $npcs.get($boy,'childfree') == 1 or $npcs.get($boy,'caretaker') == 1>>
+				<<if $npcs.get($sex.npcId,'childfree') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
 					<<gs 'booty_call_talk' 'morning_after_money'>>
 				<<else>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -130,7 +130,7 @@
 			<</actCLA>>
 			<<actCLA 'Need plan B'>>
 				"Not really," you grimace. "I'm definitely going to need some plan B tomorrow."
-				<<if $npcs.get($boy,'childfree') == 1 or $npcs.get($boy,'caretaker') == 1>>
+				<<if $npcs.get($sex.npcId,'childfree') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
 					<<gs 'booty_call_talk' 'morning_after_money'>>
 				<<else>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -138,7 +138,7 @@
 			<</actCLA>>
 			<<actCLA 'Need plan B (safety)'>>
 				"I'll get some plan B tomorrow just to be safe," you say.
-				<<if $npcs.get($boy,'childfree') == 1 or $npcs.get($boy,'caretaker') == 1>>
+				<<if $npcs.get($sex.npcId,'childfree') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
 					<<gs 'booty_call_talk' 'morning_after_money'>>
 				<<else>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -149,11 +149,11 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'morning_after_money'>>
-	<p><<=$npcs.get($boy,'firstname')>> looks at you for a moment before reaching down into his discarded trousers to grab his wallet, pulling 800<b>₽</b> out.</p>
+	<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you for a moment before reaching down into his discarded trousers to grab his wallet, pulling 800<b>₽</b> out.</p>
 	"Here," he says, offering the cash to you. "Get a morning after pill tomorrow.
 	<<actCLA 'No, you don`t have to'>>
 		"No," you shake your head. "I can't ask you to do that."
-		<<if $npcs.get($boy,'childfree') == 1>>
+		<<if $npcs.get($sex.npcId,'childfree') == 1>>
 			"Take it," he says insistently. "I don't want any kids running around. You can thank me by making sure you take that pill tomorrow."
 		<<else>>
 			"Don't worry about it," he says, smiling gently. "I think it would suck for both of us if you got pregnant right now."
@@ -161,20 +161,20 @@
 		<<actCLA 'Refuse'>>
 			$npc_apt_bedroom
 			"No, I don't want your money," you say, shaking your head and pushing the money away.
-			<<if $npcs.get($boy,'childfree') == 1>>
-				<p><<=$npcs.get($boy,'firstname')>> stares at you for a moment, looking almost angry.</p>
+			<<if $npcs.get($sex.npcId,'childfree') == 1>>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> stares at you for a moment, looking almost angry.</p>
 				<p>"Just don't fucking get pregnant, okay?" he says, tossing the cash onto his bedside table.</p>
 			<<else>>
-				<p>"If you're sure..." <<=$npcs.get($boy,'firstname')>> says hesitantly, withdrawing his hand.</p>
+				<p>"If you're sure..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, withdrawing his hand.</p>
 			<</if>>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 		<<actCLA 'Take it'>>
-			<<setinit $take_morning_after[$boy] = $time.daystart>>
+			<<setinit $take_morning_after[$sex.npcId] = $time.daystart>>
 			You take the money from him, warmed by the gesture.
 			"Thanks," you say, giving him the most grateful smile you can.
-			<<if $npcs.get($boy,'childfree') == 1>>
-				<p>"Seriously," <<=$npcs.get($boy,'firstname')>> says. "Take that pill."</p>
+			<<if $npcs.get($sex.npcId,'childfree') == 1>>
+				<p>"Seriously," <<=$npcs.get($sex.npcId,'firstname')>> says. "Take that pill."</p>
 			<<else>>
 				He just nods back in return
 			<</if>>
@@ -182,11 +182,11 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<actCLA 'Take the money'>>
-		<<setinit $take_morning_after[$boy] = $time.daystart>>
+		<<setinit $take_morning_after[$sex.npcId] = $time.daystart>>
 		$npc_apt_bedroom
 		You take the money from him, warmed by the gesture.
 		"Thanks," you say, giving him the most grateful smile you can.
-		<<if $npcs.get($boy,'childfree') == 1>>
+		<<if $npcs.get($sex.npcId,'childfree') == 1>>
 			"Don't thank me," he says, shaking his head. "I just don't want any bastard kids running around. You can thank me by making sure you take that pill tomorrow."
 		<<else>>
 			"Don't worry about it," he says, grinning. "I think it would suck for both of us if you got pregnant right now."
@@ -195,12 +195,12 @@
 	<</actCLA>>
 	<<if $finances.cash >= 740>>
 		<<actCLA 'I have enough money'>>
-			<<setinit $take_morning_after[$boy] = $time.daystart>>
+			<<setinit $take_morning_after[$sex.npcId] = $time.daystart>>
 			"No," you shake your head. "You don't have to do that. I have enough money to buy a pill myself."
-			<<if $npcs.get($boy,'childfree') == 1>>
+			<<if $npcs.get($sex.npcId,'childfree') == 1>>
 				"Just make sure you do," he replies. "I don't want any kids running around."
 			<<else>>
-				<p>"If you're sure..." <<=$npcs.get($boy,'firstname')>> says hesitantly, withdrawing his hand.</p>
+				<p>"If you're sure..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, withdrawing his hand.</p>
 			<</if>>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
@@ -231,7 +231,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'free_creampies'>>
-	<<if $npcs.get($boy,'free_creampies') == 0 and getvar("$booty_call['he_ask_creampie']") > 0>>
+	<<if $npcs.get($sex.npcId,'free_creampies') == 0 and getvar("$booty_call['he_ask_creampie']") > 0>>
 		<<if $booty_call['position'] == 'miss'>>
 			<<setinit $booty_call['temp_pic'] = '<center><img $set_imgh src="images/shared/sex/vag/miss/2.jpg"></center>'>>
 		<<elseif $booty_call['position'] == 'doggy'>>
@@ -262,7 +262,7 @@
 				<</if>>
 				<<gs 'booty_call_talk' 'free_creampies2'>>
 			<</actCLA>>
-			<<if $pc_cum_pref_know[$boy] == 'creampie'>>
+			<<if $pc_cum_pref_know[$sex.npcId] == 'creampie'>>
 				<<actCLA 'I know how much you like it'>>
 					$booty_call['temp_pic']
 					<<if getvar("$birth_control['think_safe']") == 1>>
@@ -277,7 +277,7 @@
 			<<if getvar("$birth_control['think_safe']") == 1>>
 				<<actCLA 'I`m on birth control'>>
 					$booty_call['temp_pic']
-					<<if $npcs.get($boy,'know_bc') == 1>>
+					<<if $npcs.get($sex.npcId,'know_bc') == 1>>
 						"You don't need to ask to come inside me y''know," you murmur. "You know I'm on birth control. So if you want to come inside me, you should go right ahead."
 					<<else>>
 						"You don't need to ask to come inside me y''know," you murmur. "I'm on birth control. So if you want to come inside me, you should go right ahead."
@@ -286,22 +286,22 @@
 				<</actCLA>>
 			<<else>>
 				<<actCLA 'Not <i>every</i> time'>>
-					<<run $npcs.set($boy,'free_creampies',1)>>
+					<<run $npcs.set($sex.npcId,'free_creampies',1)>>
 					$booty_call['temp_pic']
 					"You don't need to ask to come inside me y''know," you murmur. "Not <i>every</i> time. I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
-					<p>"Okay." <<=$npcs.get($boy,'firstname')>> smiles back, beaming at you.</p>
+					<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
 					<<gs 'booty_call_talk' 'free_creampies_exit'>>
 				<</actCLA>>
 			<</if>>
 		<</actCLA>>
-		<!-- !!{	elseif npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and birth_control['think_safe'] = 0:
+		<!-- !!{	elseif npc_free_creampies[$sex.npcId] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0 and birth_control['think_safe'] = 0:
 		if stat['safe_day'] = 1:
 		act'It's a safe day':
 		booty_call['safe_day'] = 1
 		cla & *clr
 		$booty_call['temp_pic']
 		'"Don't worry," you smile. "It's a safe day for me. You can come inside me as much as you want today."'
-		if npc_childfree[$boy] = 1: '<<<<=$npcs.get($boy,'firstname')>>>> lets out a sigh of relief.'
+		if npc_childfree[$sex.npcId] = 1: '<<<<=$npcs.get($sex.npcId,'firstname')>>>> lets out a sigh of relief.'
 		gs'booty_call_sex', 'sex_end'
 		end
 		elseif stat['probably_safe_day'] = 1:
@@ -310,7 +310,7 @@
 		cla & *clr
 		$booty_call['temp_pic']
 		'"Don't worry," you smile. "I'm probably safe. It's okay for you to come inside me today."'
-		if npc_childfree[$boy] = 1: '<<<<=$npcs.get($boy,'firstname')>>>> lets out a sigh of relief.'
+		if npc_childfree[$sex.npcId] = 1: '<<<<=$npcs.get($sex.npcId,'firstname')>>>> lets out a sigh of relief.'
 		*nl
 		'<i>Probably...</i> you quietly reiterate to yourself.'
 		gs'booty_call_sex', 'sex_end'
@@ -328,7 +328,7 @@
 		end
 		act'<i>I hope I get pregnant</i>':
 		cla & *nl
-		'<i>I really hope this gets me pregnant,</i> you think giddily to yourself. <i>I want <<<<=$npcs.get($boy,'firstname')>>>>''s babies swimming around inside me...</i>'
+		'<i>I really hope this gets me pregnant,</i> you think giddily to yourself. <i>I want <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s babies swimming around inside me...</i>'
 		gs'booty_call_sex', 'sex_end'
 		end
 		end
@@ -336,105 +336,105 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'free_creampies2'>>
-	<!-- !! npc_free_creampies[$boy] = 1: he will freely creampie you tell him its safe-->
-	<!-- !! npc_free_creampies[$boy] = 2: he will creampie you whenever he wants-->
-	<<if $npcs.get($boy,'abusive') == 1 and $npcs.get($boy,'childfree') != 1>>
-		<<run $npcs.set($boy,'free_creampies',2)>>
-		<<if $npcs.get($boy,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($boy,'firstname')>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
+	<!-- !! npc_free_creampies[$sex.npcId] = 1: he will freely creampie you tell him its safe-->
+	<!-- !! npc_free_creampies[$sex.npcId] = 2: he will creampie you whenever he wants-->
+	<<if $npcs.get($sex.npcId,'abusive') == 1 and $npcs.get($sex.npcId,'childfree') != 1>>
+		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
+		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
 			"Good to know..."
 		<<else>>
 			"Good to know," he smirks amusedly.
 		<</if>>
 		<<gs 'booty_call_talk' 'free_creampies_exit'>>
-	<<elseif ($npcs.get($boy,'selfish') == 1 or $npcs.get($boy,'know_bc') == 1) and ($npcs.get($boy,'childfree') != 1 or $npcs.get($boy,'know_bc') == 1)>>
-		<<run $npcs.set($boy,'free_creampies',2)>>
-		<<if $npcs.get($boy,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($boy,'firstname')>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
+	<<elseif ($npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'know_bc') == 1) and ($npcs.get($sex.npcId,'childfree') != 1 or $npcs.get($sex.npcId,'know_bc') == 1)>>
+		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
+		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
 			"I'm gonna pump you full of so much cum, you're going to still be dripping next week," he says excitedly and you can't help but giggle at his boyish glee.
 		<<else>>
 			"Good to know," he smirks amusedly.
 		<</if>>
 		<<gs 'booty_call_talk' 'free_creampies_exit'>>
 	<<else>>
-		<<if $npcs.get($boy,'childfree') == 1 and $npcs.get($boy,'know_bc') != 1>>
-			<p>"Are you sure...?" <<=$npcs.get($boy,'firstname')>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
+		<<if $npcs.get($sex.npcId,'childfree') == 1 and $npcs.get($sex.npcId,'know_bc') != 1>>
+			<p>"Are you sure...?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
 			<!-- !! add more options later-->
 		<<else>>
-			<p>"Is that really okay?" <<=$npcs.get($boy,'firstname')>> asks, wide-eyed.</p>
+			<p>"Is that really okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, wide-eyed.</p>
 		<</if>>
 		<<actCLA 'I`ll be fine'>>
 			<p>"I'll be fine," you insist, smiling gently. "What could go wrong?"</p>
-			<<if $npcs.get($boy,'childfree') == 1 or rand(1,4) == 1>>
-				<<run $npcs.set($boy,'free_creampies',-1)>>
-				<p>"I'm not comfortable with it," <<=$npcs.get($boy,'firstname')>> says, shaking his head. "Maybe if you started birth control..."</p>
+			<<if $npcs.get($sex.npcId,'childfree') == 1 or rand(1,4) == 1>>
+				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
+				<p>"I'm not comfortable with it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "Maybe if you started birth control..."</p>
 			<<else>>
-				<<run $npcs.set($boy,'free_creampies',2)>>
-				<p>"Okay..." <<=$npcs.get($boy,'firstname')>> says hesitantly, but smiles back at you anyways.</p>
+				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
+				<p>"Okay..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, but smiles back at you anyways.</p>
 			<</if>>
 			<<gs 'booty_call_talk' 'free_creampies_exit'>>
 		<</actCLA>>
 		<<actCLA 'It feels good'>>
 			"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."
-			<<if ($npcs.get($boy,'cum_pref') == 'creampie' and $npcs.get($boy,'childfree') == 1 and rand(npc_willpwr[$boy],100) <= pcs_persuas) or ($npcs.get($boy,'cum_pref') == 'creampie' and $npcs.get($boy,'childfree') != 1)>>
-				<<run $npcs.set($boy,'free_creampies',2)>>
-				<p>Desire wars with willpower within <<=$npcs.get($boy,'firstname')>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
-				<p>"Okay." <<=$npcs.get($boy,'firstname')>> says. "I won't ask anymore."</p>
-			<<elseif $npcs.get($boy,'childfree') == 1>>
-				<<run $npcs.set($boy,'free_creampies',-1)>>
-				<p><<=$npcs.get($boy,'firstname')>> hesitates for a moment before shaking his head.</p>
+			<<if ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') == 1 and rand(npc_willpwr[$sex.npcId],100) <= pcs_persuas) or ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') != 1)>>
+				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
+				<p>Desire wars with willpower within <<=$npcs.get($sex.npcId,'firstname')>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
+				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> says. "I won't ask anymore."</p>
+			<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
+				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before shaking his head.</p>
 				"I'm not comfortable with it," he says. "Maybe if you started birth control..."
 			<<else>>
-				<<run $npcs.set($boy,'free_creampies',2)>>
-				<p><<=$npcs.get($boy,'firstname')>> hesitates for a moment before nodding slowly.</p>
+				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before nodding slowly.</p>
 				"Okay," he says, smiling. "I won''t ask anymore."
 			<</if>>
 			<<gs 'booty_call_talk' 'free_creampies_exit'>>
 		<</actCLA>>
 		<<actCLA 'I'll tell you when it's safe'>>
-			<<run $npcs.set($boy,'free_creampies',1)>>
+			<<run $npcs.set($sex.npcId,'free_creampies',1)>>
 			"I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
-			<p>"Okay." <<=$npcs.get($boy,'firstname')>> smiles back, beaming at you.</p>
+			<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
 			<<gs 'booty_call_talk' 'free_creampies_exit'>>
 		<</actCLA>>
 		<<if getvar("$birth_control['think_safe']") == 1>>
 			<<actCLA 'I`m on birth control'>>
-				<<run $npcs.set($boy,'free_creampies',2)>>
-				<<if $npcs.get($boy,'know_not_bc') == 1>>
-					<<run $npcs.set($boy,'know_not_bc',0)>>
+				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
+				<<if $npcs.get($sex.npcId,'know_not_bc') == 1>>
+					<<run $npcs.set($sex.npcId,'know_not_bc',0)>>
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I started birth control," you smile gently. "And it should be effective now. So you can come inside me as much as you want."
 				<<else>>
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($boy,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<<elseif getvar("$pillcon2") >= 20000>>
 			<<actCLA 'I`m on birth control'>>
-				<<run $npcs.set($boy,'free_creampies',2)>>
-				<<if $npcs.get($boy,'know_not_bc') == 1>>
+				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
+				<<if $npcs.get($sex.npcId,'know_not_bc') == 1>>
 					<<gs 'booty_call_stats' 'no_birth_control_know'>>
 					"I started birth control," you smile gently. "And it should be effective any day now. So you can come inside me as much as you want."
 				<<else>>
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($boy,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<<else>>
 			<<actCLA 'I`m on birth control (lie)'>>
-				<<run $npcs.set($boy,'free_creampies',2)>>
-				<<if $npcs.get($boy,'know_not_bc') == 1>>
+				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
+				<<if $npcs.get($sex.npcId,'know_not_bc') == 1>>
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I started birth control," you lie with a seductively gentle smile. "And it should be effective now. So you can come inside me as much as you want."
 				<<else>>
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($boy,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<</if>>
@@ -449,15 +449,15 @@
 <</if>>
 <<if $location_var[$here][0] == 'forgot_bc_talk'>>
 	<<setinit $booty_call['forgot_bc_chat'] = 1>>
-	<<if $npcs.get($boy,'childfree') > 0 and ($npcs.get($boy,'argumentative') > 0 or $npcs.get($boy,'abusive') > 0) and getvar("$booty_call['creampie_count']") > 0>>
-		<<run $npcs.dec($boy,'rel',10)>>
-		<p>"What the fuck?!" <<=$npcs.get($boy,'firstname')>> 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."</p>
+	<<if $npcs.get($sex.npcId,'childfree') > 0 and ($npcs.get($sex.npcId,'argumentative') > 0 or $npcs.get($sex.npcId,'abusive') > 0) and getvar("$booty_call['creampie_count']") > 0>>
+		<<run $npcs.dec($sex.npcId,'rel',10)>>
+		<p>"What the fuck?!" <<=$npcs.get($sex.npcId,'firstname')>> 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."</p>
 		<<actCLA 'Wallow'>>
 			<p>"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."</p>
 			<<gs 'booty_call_morning' 'wakeup1'>>
 		<</actCLA>>
 		<<actCLA 'Tell him to fuck off'>>
-			<<run $npcs.dec($boy,'rel',10)>>
+			<<run $npcs.dec($sex.npcId,'rel',10)>>
 			<<setinit $booty_call['angry_after'] = 1>>
 			<p>"<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!"</p>
 			<<gs 'booty_call_morning' 'wakeup1'>>
@@ -472,7 +472,7 @@
 			<</actCLA>>
 			<<actCLA 'Morning after pill (fuck off)'>>
 				<<gs 'medical_din' 'morning_after_pill_function'>>
-				<<run $npcs.dec($boy,'rel',10)>>
+				<<run $npcs.dec($sex.npcId,'rel',10)>>
 				<<setinit $booty_call['angry_after'] = 1>>
 				<p>"<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.</p>
 				<p>"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.</p>
@@ -480,16 +480,16 @@
 			<</actCLA>>
 		<</if>>
 	<<elseif getvar("$booty_call['creampie_count']") == 0>>
-		<p>"So what? I didn't come inside you last night," <<=$npcs.get($boy,'firstname')>> says, looking confused.</p>
-		<<if $npcs.get($boy,'bareback') > 0>>
+		<p>"So what? I didn't come inside you last night," <<=$npcs.get($sex.npcId,'firstname')>> says, looking confused.</p>
+		<<if $npcs.get($sex.npcId,'bareback') > 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.
 		<</if>>
 		<<gs 'booty_call_talk' 'forgot_bc_exit'>>
 	<<else>>
-		<!-- !!		if npc_childfree[$boy] > 0:-->
-		<p>"Shit," <<=$npcs.get($boy,'firstname')>> says, looking concerned. "What are you gonna do?"</p>
+		<!-- !!		if npc_childfree[$sex.npcId] > 0:-->
+		<p>"Shit," <<=$npcs.get($sex.npcId,'firstname')>> says, looking concerned. "What are you gonna do?"</p>
 		<<actCLA 'I don`t know'>>
 			<p>"I don't know," you say, looking back at him apologetically. "Hope we get lucky I guess?"</p>
 			<<gs 'booty_call_talk' 'forgot_bc_exit'>>
@@ -506,7 +506,7 @@
 		<<else>>
 			<<actCLA 'Buy some plan B?'>>
 				<p>"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?"</p>
-				<p><<=$npcs.get($boy,'firstname')>> shrugs back. Great help.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> shrugs back. Great help.</p>
 				<<gs 'booty_call_talk' 'forgot_bc_exit'>>
 			<</actCLA>>
 		<</if>>
@@ -536,17 +536,17 @@
 			<<if getvar("$booty_call['get_up']") == 0>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<else>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<</if>>
-			<p>"Hey, can I borrow some money?" you ask <<=$npcs.get($boy,'firstname')>>. "I need it for the morning after pill."</p>
-			<<if rand(1,4) == 1 and $npcs.get($boy,'finance') == 0>>
-				<<if $npcs.get($boy,'selfish') == 1>>
-					<p>"Are you kidding? I barely have any money myself," <<=$npcs.get($boy,'firstname')>> scowls. "I got nothing to give to you."</p>
+			<p>"Hey, can I borrow some money?" you ask <<=$npcs.get($sex.npcId,'firstname')>>. "I need it for the morning after pill."</p>
+			<<if rand(1,4) == 1 and $npcs.get($sex.npcId,'finance') == 0>>
+				<<if $npcs.get($sex.npcId,'selfish') == 1>>
+					<p>"Are you kidding? I barely have any money myself," <<=$npcs.get($sex.npcId,'firstname')>> scowls. "I got nothing to give to you."</p>
 				<<else>>
 					"Actually, I'm a little strapped for cash myself," he mumbles embarrassedly. "I need every ruble right now. Sorry."
 				<</if>>
 				<<gs 'booty_call_talk' 'borrow_money_exit'>>
-			<<elseif $npcs.get($boy,'know_bc') > 0>>
+			<<elseif $npcs.get($sex.npcId,'know_bc') > 0>>
 				<p>"Aren't you on birth control already?" he asks confusedly.</p>
 				<<if getvar("$birth_control['think_safe']") == 1>>
 					"I just like being extra safe," you say.
@@ -554,13 +554,13 @@
 					<<gs 'booty_call_stats' 'no_birth_control_know'>>
 					<p>"I actually stopped a while back... Did I forget to tell you?" you say with an embarrassed smile.</p>
 				<</if>>
-				<<if getvar("$birth_control['think_safe']") == 1 and $npcs.get($boy,'selfish') == 1>>
-					<<run $npcs.dec($boy,'rel',2)>>
+				<<if getvar("$birth_control['think_safe']") == 1 and $npcs.get($sex.npcId,'selfish') == 1>>
+					<<run $npcs.dec($sex.npcId,'rel',2)>>
 					<p>"You want to spend my money on a 'just in case'? Fuck no! You can buy it yourself. If you can't afford it, that's what birth control is for in the first place."</p>
 					<<gs 'booty_call_talk' 'borrow_money_exit'>>
-				<<elseif $npcs.get($boy,'childfree') == 1>>
-					<<if $npcs.get($boy,'selfish') == 1>>
-						<p>"Ugh, how much do you need?" <<=$npcs.get($boy,'firstname')>> grumbles reaching for his wallet.</p>
+				<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
+					<<if $npcs.get($sex.npcId,'selfish') == 1>>
+						<p>"Ugh, how much do you need?" <<=$npcs.get($sex.npcId,'firstname')>> grumbles reaching for his wallet.</p>
 					<<else>>
 						<p>"How much do you need?" he asks.</p>
 					<</if>>
@@ -579,8 +579,8 @@
 	<<actCLA '740 <b>₽</b> (full price)'>>
 		<<set $finances.cash += 740>>
 		<p>"I don't have any money right now," you admit. "So I need the full 740 <b>₽</b> </p>
-		<<if $npcs.get($boy,'selfish') == 1>>
-			<p>"Seriously?" <<=$npcs.get($boy,'firstname')>> scowls as hands over the bills. "You don't have <i>any</i> money? Get a job or something."</p>
+		<<if $npcs.get($sex.npcId,'selfish') == 1>>
+			<p>"Seriously?" <<=$npcs.get($sex.npcId,'firstname')>> scowls as hands over the bills. "You don't have <i>any</i> money? Get a job or something."</p>
 			"Thanks," you say a little stiffly. It's hard to be grateful when someone''s being such an ass about it...
 		<<else>>
 			<p></p>
@@ -597,56 +597,56 @@
 <</if>>
 <<if $location_var[$here][0] == 'cheating_rules'>>
 	<<actCLA 'Done'>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"Those are the rules," you say. "So as long as we follow those, we can keep doing this."
-		<p>"I can agree to that," <<=$npcs.get($boy,'firstname')>> smiles.</p>
+		<p>"I can agree to that," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
 		<<gs 'booty_call_after' 'after_sex_dressed'>>
 	<</actCLA>>
-	<<if $npcs.get($boy,'no_kiss') != 1>>
+	<<if $npcs.get($sex.npcId,'no_kiss') != 1>>
 		<<actCLA 'No kissing'>>
-			<<run $npcs.set($boy,'no_kiss',1)>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<run $npcs.set($sex.npcId,'no_kiss',1)>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"No kissing," you say.
-			<p>"That's fine," <<=$npcs.get($boy,'firstname')>> nods.</p>
+			<p>"That's fine," <<=$npcs.get($sex.npcId,'firstname')>> nods.</p>
 			<<gs 'booty_call_talk' 'cheating_rules'>>
 		<</actCLA>>
 	<</if>>
-	<<if $npcs.get($boy,'boyfriend_creampie_rule') != 2>>
+	<<if $npcs.get($sex.npcId,'boyfriend_creampie_rule') != 2>>
 		<<actCLA 'No creampies'>>
-			<<run $npcs.set($boy,'boyfriend_creampie_rule',2)>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<run $npcs.set($sex.npcId,'boyfriend_creampie_rule',2)>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"You can't come inside me," you say. "That's too far."
-			<<if $npcs.get($boy,'condom_conscious') > 0>>
-				<p>"We always use condoms anyways," <<=$npcs.get($boy,'firstname')>> shrugs.</p>
+			<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
+				<p>"We always use condoms anyways," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'creampie'>>
-				<p>"But that's the best part about fucking you," <<=$npcs.get($boy,'firstname')>> grins.</p>
+				<p>"But that's the best part about fucking you," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 				"I'm serious," you say sternly. "No creampies."
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'mouth'>>
-				<p>"So long as I can watch you swallow," <<=$npcs.get($boy,'firstname')>> grins.</p>
+				<p>"So long as I can watch you swallow," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'facial'>>
-				<p>"So long as I can come all over your pretty face," <<=$npcs.get($boy,'firstname')>> grins.</p>
+				<p>"So long as I can come all over your pretty face," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'tits'>>
-				<p>"So long as I can come all over your beautiful tits," <<=$npcs.get($boy,'firstname')>> grins.</p>
+				<p>"So long as I can come all over your beautiful tits," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'pullout'>>
-				<p>"I prefer the pullout method anyways," <<=$npcs.get($boy,'firstname')>> grins.</p>
+				<p>"I prefer the pullout method anyways," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 			<</if>>
 			<<gs 'booty_call_talk' 'cheating_rules'>>
 		<</actCLA>>
 	<</if>>
-	<<if $npcs.get($boy,'condom_rule') != 1>>
+	<<if $npcs.get($sex.npcId,'condom_rule') != 1>>
 		<<actCLA 'Always condoms'>>
-			<<run $npcs.set($boy,'condom_rule',1)>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<run $npcs.set($sex.npcId,'condom_rule',1)>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"We always have to use a condom," you say.
-			<<if $npcs.get($boy,'no_condoms') > 0>>
+			<<if $npcs.get($sex.npcId,'no_condoms') > 0>>
 				<p>"Oh, come on. We don-"</p>
 				<p>"I'm serious!" you say sternly. "No condoms, no deal."</p>
-			<<elseif $npcs.get($boy,'condom_conscious') > 0>>
-				<p>"We already do," <<=$npcs.get($boy,'firstname')>> smiles.</p>
-			<<elseif $npcs.get($boy,'boyfriend_creampie_rule') > 0>>
-				<p>"A little redundant, don't you think?" <<=$npcs.get($boy,'firstname')>> smirks.</p>
+			<<elseif $npcs.get($sex.npcId,'condom_conscious') > 0>>
+				<p>"We already do," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+			<<elseif $npcs.get($sex.npcId,'boyfriend_creampie_rule') > 0>>
+				<p>"A little redundant, don't you think?" <<=$npcs.get($sex.npcId,'firstname')>> smirks.</p>
 			<<else>>
-				<p>"I guess that's fair," <<=$npcs.get($boy,'firstname')>> says.</p>
+				<p>"I guess that's fair," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<</if>>
 			<<gs 'booty_call_talk' 'cheating_rules'>>
 		<</actCLA>>
@@ -676,24 +676,24 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'rape_explain'>>
-	<<=$npcs.get($boy,'apt_bedroom')>>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<if $pc.sexStat('rape_count') == 1>>
-		<p><<=$npcs.get($boy,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It's as if you're back in that moment, being violated all over again.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It's as if you're back in that moment, being violated all over again.</p>
 	<<elseif $pc.sexStat('rape_count') < 5>>
-		<p><<=$npcs.get($boy,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won't stop flashing before your eyes, memories of your body being violated like a montage you can't escape.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won't stop flashing before your eyes, memories of your body being violated like a montage you can't escape.</p>
 	<<elseif $pc.sexStat('rape_count') < 10>>
-		<p><<=$npcs.get($boy,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they're all violating you at once.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they're all violating you at once.</p>
 	<<else>>
-		<p><<=$npcs.get($boy,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.</p>
 	<</if>>
-	<p>"What just...?" <<=$npcs.get($boy,'firstname')>> stammers confusedly.</p>
+	<p>"What just...?" <<=$npcs.get($sex.npcId,'firstname')>> stammers confusedly.</p>
 	<<actCLA 'Try to hide it'>>
 		"I... I just don't like it rough," you whimper, tears running down your cheeks as you sniff, pathetically trying to wipe them away with the back of your hand.
 	<</actCLA>>
 	<<actCLA 'Tell him what happened'>>
-		<<run $npcs.set($boy,'knows_rape_victim',1)>>
+		<<run $npcs.set($sex.npcId,'knows_rape_victim',1)>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>You crawl up beside <<=$npcs.get($boy,'firstname')>>, still shivering as you wipe the tears from your eyes that won't stop flowing.</p>
+		<p>You crawl up beside <<=$npcs.get($sex.npcId,'firstname')>>, still shivering as you wipe the tears from your eyes that won't stop flowing.</p>
 		<<if $pc.sexStat('rape_count') == 1>>
 			"Listen," you sniff, rubbing your hand across your cheek again. "I was raped once... It was awful and horrible and I... well I... I had a flashback about it just now..."
 		<<elseif $pc.sexStat('rape_count') < 5>>
@@ -703,12 +703,12 @@
 		<<else>>
 			"I've never told you this but..." you sniff, rubbing your hand across your cheek again. "I've been raped... A lot... I don't know why it keeps happening but I've been raped so many times I've lost count... And sometimes the trauma just comes out..."
 		<</if>>
-		<p><<=$npcs.get($boy,'firstname')>> is taken aback and goes quiet. Its several minutes before he finally speaks again.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> is taken aback and goes quiet. Its several minutes before he finally speaks again.</p>
 		<<actCLA 'Continue'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"I'm... I'm so sorry for what happened to you," he says. "I had no idea."
 			"It's not your fault," you sniff again. "You couldn''t have known. I never told you. Until now."
-			<p>"So... I should lay off the rough sex in the future?" <<=$npcs.get($boy,'firstname')>> asks hesitantly.</p>
+			<p>"So... I should lay off the rough sex in the future?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly.</p>
 			<<actCLA 'Just tonight'>>
 				"You don't have to stop getting rough," you say, rubbing your eyes again. "I just... it doesn''t always happen to me during this kind of sex, but I guess something triggered me. I like it rough sometimes, I promise. Just not... tonight..."
 				The conversation trails off.

sugarcube/src/activities/bootycall/booty_call_work_talk1.tw

@@ -19,45 +19,45 @@
 	<<actCLA 'What is your job?'>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		<p>"Hey, I never asked," you muse. "What is it you do for work again?"</p>
-		<<if $npcs.get($boy,'occupation') == 'cashier_supermarket'>>
-			<p>"Nothing special, just a cashier at a generic supermarket," <<=$npcs.get($boy,'firstname')>> shrugs.</p>
+		<<if $npcs.get($sex.npcId,'occupation') == 'cashier_supermarket'>>
+			<p>"Nothing special, just a cashier at a generic supermarket," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
 			<p>"Pyaterochka?" you ask and he nods.</p>
 			"That's the one."
 			<<if $region == 'pav'>>
 				<p>"Huh. I wonder if you know my sister?"</p>
 			<</if>>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'cashier_liquor'>>
-			<p>"Cashier at a liquor store," <<=$npcs.get($boy,'firstname')>> shrugs. "Pretty boring."</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'cashier_liquor'>>
+			<p>"Cashier at a liquor store," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "Pretty boring."</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'cashier_coffee'>>
-			<p>"I work the register at a coffee shop," <<=$npcs.get($boy,'firstname')>> says. "It gets pretty hectic in there sometimes. Especially mornings."</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'cashier_coffee'>>
+			<p>"I work the register at a coffee shop," <<=$npcs.get($sex.npcId,'firstname')>> says. "It gets pretty hectic in there sometimes. Especially mornings."</p>
 			<p>"That's cool. Is the coffee any good?"</p>
 			"It's fine I guess," he shrugs. "Nothing special. Just generic shit."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'barista'>>
-			<p>"I work as a barista at a coffee shop," <<=$npcs.get($boy,'firstname')>> says. "It gets pretty hectic in there sometimes. Especially mornings.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'barista'>>
+			<p>"I work as a barista at a coffee shop," <<=$npcs.get($sex.npcId,'firstname')>> says. "It gets pretty hectic in there sometimes. Especially mornings.</p>
 			<p>"That's cool. Is the coffee any good?"</p>
 			"It is when I make it," he smirks.
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'fast_food'>>
-			<p>"I flip burgers at this chain fast food joint," <<=$npcs.get($boy,'firstname')>> says. " Pay sucks and customers are all assholes. Service industry is shit."</p>
-		<<elseif $npcs.get($boy,'occupation') == 'taxi_driver'>>
-			<p>"I drive a cab in the city," <<=$npcs.get($boy,'firstname')>> says. "Not much, but it pays the bills.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'fast_food'>>
+			<p>"I flip burgers at this chain fast food joint," <<=$npcs.get($sex.npcId,'firstname')>> says. " Pay sucks and customers are all assholes. Service industry is shit."</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'taxi_driver'>>
+			<p>"I drive a cab in the city," <<=$npcs.get($sex.npcId,'firstname')>> says. "Not much, but it pays the bills.</p>
 			<!-- !! if taxi_bj > 10:-->
 			<!-- !! '"I like giving taxi guys blowjobs," you smirk mischievously.'-->
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'masseuse'>>
-			<p>"I work as a masseuse in the city," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'masseuse'>>
+			<p>"I work as a masseuse in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<<actCLA 'That`s cool'>>
 				"That's cool. You'll have to show me your skills sometime," you smile.
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 			<<actCLA 'Tease him'>>
 				<p>"That's cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.</p>
-				<<if $npcs.get($boy,'insecure') == 1>>
-					<<run $npcs.dec($boy,'rel',5)>>
-					<p>"What the fuck?" <<=$npcs.get($boy,'firstname')>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"</p>
+				<<if $npcs.get($sex.npcId,'insecure') == 1>>
+					<<run $npcs.dec($sex.npcId,'rel',5)>>
+					<p>"What the fuck?" <<=$npcs.get($sex.npcId,'firstname')>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"</p>
 					"I was just joking," you say.
 					"Jokes are supposed to be funny."
 				<<elseif getvar("$npc_humor") == 2>>
@@ -69,8 +69,8 @@
 				<</if>>
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
-		<<elseif $npcs.get($boy,'occupation') == 'masseuse_sexual'>>
-			<p>"I work as a masseuse in the city," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'masseuse_sexual'>>
+			<p>"I work as a masseuse in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<<actCLA 'That`s cool'>>
 				"That's cool. You'll have to show me your skills sometime," you smile.
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -100,11 +100,11 @@
 					<</actCLA>>
 				<</actCLA>>
 			<</actCLA>>
-		<<elseif $npcs.get($boy,'occupation') == 'factory'>>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'factory'>>
 			<<if $region == 'pav'>>
-				<p>"I work at the textile factory," <<=$npcs.get($boy,'firstname')>> says.</p>
+				<p>"I work at the textile factory," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<<else>>
-				<p>"I work at the textile factory in the next town over," <<=$npcs.get($boy,'firstname')>> says.</p>
+				<p>"I work at the textile factory in the next town over," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 				<<if mid($start_type,1,2) == 'sg'>>
 					<p>"The one in Pavlovsk?"</p>
 					<p>"Yeah, how'd you know?"</p>
@@ -113,29 +113,29 @@
 				<</if>>
 			<</if>>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'bartender'>>
-			<p>"Bartender," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'bartender'>>
+			<p>"Bartender," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<p>"That's pretty cool. So you have to know how to make a lot of fancy drinks?"</p>
 			"Yeah, but everyone just orders vodka anyways," he snickers.
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'mechanic'>>
-			<p>"I work on cars," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'mechanic'>>
+			<p>"I work on cars," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<p>"Oh cool, like a mechanic?"</p>
 			"Yeah, exactly."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'line_cook'>>
-			<p>"I work in a kitchen," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'line_cook'>>
+			<p>"I work in a kitchen," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<p>"Oh, cool. Like a chef?"</p>
 			"No, I'm just a line cook. Nothing fancy."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'waiter'>>
-			<p>"I wait tables," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'waiter'>>
+			<p>"I wait tables," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'personal_trainer'>>
-			<p>"I work at a gym as a personal trainer," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'personal_trainer'>>
+			<p>"I work at a gym as a personal trainer," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			<<actCLA 'That`s cool'>>
 				<p>"Oh, that's cool. So you know how to get people in shape? Got any tips to keep a girl's figure?"</p>
-				<<if $npcs.get($boy,'humor') == 2>>
+				<<if $npcs.get($sex.npcId,'humor') == 2>>
 					"Lots of sex," he grins. "It's great cardio."
 				<<else>>
 					"Watch what you eat," he shrugs. "Fewer calories in than out. That's all that matters if you want to lose weight."
@@ -147,18 +147,18 @@
 				"Fuck, I wish. I get as many old fat guys as I get girls. None of them want to fuck though. Most of them have boyfriends."
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
-		<<elseif $npcs.get($boy,'occupation') == 'programmer'>>
-			<p>"I work in tech," <<=$npcs.get($boy,'firstname')>> says. "Do the programming for an IT company in the city."</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'programmer'>>
+			<p>"I work in tech," <<=$npcs.get($sex.npcId,'firstname')>> says. "Do the programming for an IT company in the city."</p>
 			<p>"So you can fix my computer if I have a problem?"</p>
 			"Oh fuck," he groans. "Not you too."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'criminal'>>
-			<<if $npcs.get($boy,'criminal_open') == 1>>
-				<<run $npcs.set($boy,'criminal_known',1)>>
-				<<if $npcs.get($boy,'crime_type') == 'drug_dealer'>>
-					<p>"I sell drugs," <<=$npcs.get($boy,'firstname')>> says blatantly.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'criminal'>>
+			<<if $npcs.get($sex.npcId,'criminal_open') == 1>>
+				<<run $npcs.set($sex.npcId,'criminal_known',1)>>
+				<<if $npcs.get($sex.npcId,'crime_type') == 'drug_dealer'>>
+					<p>"I sell drugs," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
-						<<run $npcs.set($boy,'criminal_discomfort',1)>>
+						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
@@ -177,10 +177,10 @@
 						"Not as much as you''d think," he shrugs. "Bosses gotta get their cut. I only make a percentage of what sells."
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
-				<<elseif $npcs.get($boy,'crime_type') == 'enforcer'>>
-					<p>"I'm an enforcer for a gang," <<=$npcs.get($boy,'firstname')>> says blatantly.</p>
+				<<elseif $npcs.get($sex.npcId,'crime_type') == 'enforcer'>>
+					<p>"I'm an enforcer for a gang," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
-						<<run $npcs.set($boy,'criminal_discomfort',1)>>
+						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
@@ -200,10 +200,10 @@
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 				<<else>>
-					<!-- !!<<=$npcs.get($boy,'crime_type')>> = 'thief'-->
-					<p>"I steal things," <<=$npcs.get($boy,'firstname')>> says blatantly.</p>
+					<!-- !!<<=$npcs.get($sex.npcId,'crime_type')>> = 'thief'-->
+					<p>"I steal things," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
-						<<run $npcs.set($boy,'criminal_discomfort',1)>>
+						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
@@ -224,8 +224,8 @@
 					<</actCLA>>
 				<</if>>
 			<<else>>
-				<<if $npcs.get($boy,'crime_type') == 'drug_dealer'>>
-					<p>"I work in pharmaceuticals," <<=$npcs.get($boy,'firstname')>> says.</p>
+				<<if $npcs.get($sex.npcId,'crime_type') == 'drug_dealer'>>
+					<p>"I work in pharmaceuticals," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 					<<if mid($start_type,1,2) == 'sg'>>
 						"That's cool. My aunt is a pharmacist too."
 						"Oh. Good to know."
@@ -233,43 +233,43 @@
 						<p>"Huh. What's that like?"</p>
 						"Like being a drug dealer," he snickers.
 					<</if>>
-				<<elseif $npcs.get($boy,'crime_type') == 'enforcer'>>
-					<p>"I'm a sort of fixer," <<=$npcs.get($boy,'firstname')>> says.</p>
+				<<elseif $npcs.get($sex.npcId,'crime_type') == 'enforcer'>>
+					<p>"I'm a sort of fixer," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 					<p>"Fixer? You mean like a handyman?"</p>
 					"Not really," he shrugs. "It's more like I'm on call to help people out. When someone calls me, I head over and give them a hand."
 					"Sounds... chaotic."
 					"Yeah, a little. Never know exactly what the problem is until I get there."
 				<<else>>
-					<!-- !!<<=$npcs.get($boy,'crime_type')>> = 'thief'-->
-					<p>"I work in acquisitions and sales," <<=$npcs.get($boy,'firstname')>> says.</p>
+					<!-- !!<<=$npcs.get($sex.npcId,'crime_type')>> = 'thief'-->
+					<p>"I work in acquisitions and sales," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 					<p>"So... like a salesman?"</p>
 					<p>"Sort of? I'm kind of a middle man. I get things from people and then sell them to other people."</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</if>>
-		<<elseif $npcs.get($boy,'occupation') == 'businessman'>>
-			<p>"I run a company I founded," <<=$npcs.get($boy,'firstname')>> says casually.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'businessman'>>
+			<p>"I run a company I founded," <<=$npcs.get($sex.npcId,'firstname')>> says casually.</p>
 			<p>"Oh wow. Explains the apartment. What do you sell?"</p>
 			"Imported cars from China. Everybody needs cars."
 			"Very practical," you nod."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'lawyer'>>
-			<p>"I'm the partner at a law firm here in the city," <<=$npcs.get($boy,'firstname')>> says.</p>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'lawyer'>>
+			<p>"I'm the partner at a law firm here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 			"Oh wow. Impressive. Explains the condo."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
-		<<elseif $npcs.get($boy,'occupation') == 'investment_banker'>>
+		<<elseif $npcs.get($sex.npcId,'occupation') == 'investment_banker'>>
 			<<if $booty_call['loc'] != 'pc_home'>>
-				<p>"I work for one of the big banks here in the city," <<=$npcs.get($boy,'firstname')>> says.</p>
+				<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 				<p>"Oh wow. Impressive. Explains the condo," you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 			<<elseif $booty_call['loc'] == 'pc_home'>>
-				<p>"I work for one of the big banks here in the city," <<=$npcs.get($boy,'firstname')>> says.</p>
+				<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 				<p>"And you come over to my place instead of inviting me over to yours?" you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 			<<elseif $booty_call['loc'] == 'hotel'>>
 				<<if $region == 'pav'>>
-					<p>"I work for one of the big banks in the city," <<=$npcs.get($boy,'firstname')>> says.</p>
+					<p>"I work for one of the big banks in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 					<p>"Oh wow. Impressive. Explains this fancy hotel room," you smirk sarcastically at the cheap decor of the motel. "So if I'm looking to start a career in finance I should come to you?"</p>
 				<<else>>
-					<p>"I work for one of the big banks here in the city," <<=$npcs.get($boy,'firstname')>> says.</p>
+					<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
 					<p>"Oh wow. Impressive. Explains this fancy hotel room," you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 				<</if>>
 			<</if>>

sugarcube/src/activities/dating/dateM.tw

@@ -29,7 +29,7 @@
 	<</actCLA>>
 
 	<<set $dateNPCId = $npclastgenerated>>
-	<<set $boy = $dateNPCId>>
+	<<set $sex.npcId = $dateNPCId>>
 
 	<<debug>>
 		<<link "Generate somebody else">>
@@ -53,14 +53,14 @@
 	<!-- !!1) Sveta in a school uniform-->
 	<<if $q.school.func('isWearingSchoolUniform')>>
 		<!-- !!		'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 <<<<=$npcs.get($boy,'firstname')>>>>. What are you doing here all by yourself?"'-->
+		<!-- !!		'As he nears you, he presents himself; "Hi. My name is <<<<=$npcs.get($sex.npcId,'firstname')>>>>. What are you doing here all by yourself?"'-->
 		<p>"Hi. My name is <<=$npcs.get($dateNPCId,'firstname')>>. What are you doing here all by yourself?"</p>
 		<<actCLA 'Greet him'>>
 			<<set $time.minutes += 5>>
 
 			<<image $npcs.get($dateNPCId,'image')>>
 			<p>"Hi! My name is $pc.name_nick." you answer. "School just ended so I was trying to figure out what to do for the rest of the day."</p>
-			<p>"Oh really." After a moment of silence <<=$npcs.get($boy,'firstname')>> finally speaks up; "Don't take this the wrong way but what school do you attend?" he asks.</p>
+			<p>"Oh really." After a moment of silence <<=$npcs.get($sex.npcId,'firstname')>> finally speaks up; "Don't take this the wrong way but what school do you attend?" he asks.</p>
 			<<actCLA 'Don`t tell him which school'>>
 				<<image $npcs.get($dateNPCId,'image')>>
 				<p>You break out into laughter, "Why would I tell you that, for all I know you could be a rapist."</p>
@@ -106,7 +106,7 @@
 				<<actCLA 'Decline'>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					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."
-					<p><<=$npcs.get($boy,'firstname')>> looks at you disappointed. "Oh, that's a shame. Could I get-..."</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you disappointed. "Oh, that's a shame. Could I get-..."</p>
 					You're already moving away from him before he even finished his sentence not hearing what he wanted.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -172,7 +172,7 @@
 					<<datingStart $dateNPCId>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					"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."
-					<p>He laughs at your response. "Thanks. I'll try to make sure to call you when you're really bored." <<=$npcs.get($boy,'firstname')>> adds your number to his contact list.</p>
+					<p>He laughs at your response. "Thanks. I'll try to make sure to call you when you're really bored." <<=$npcs.get($sex.npcId,'firstname')>> adds your number to his contact list.</p>
 					"Don't count on it loser." you answer.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -181,8 +181,8 @@
 				<<actCLA 'Fuck off!'>>
 					<<image "pc/reactions/fuckoff1.jpg">>
 					<p>"Fuck off loser, I only date real men, the kinda that would kick your ass just for laughs!" you answer.</p>
-					<p><<=$npcs.get($boy,'firstname')>> 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..."</p>
-					<p>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!" <<=$npcs.get($boy,'firstname')>> seeing he's getting nowhere moves away quickly.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> 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..."</p>
+					<p>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!" <<=$npcs.get($sex.npcId,'firstname')>> seeing he's getting nowhere moves away quickly.</p>
 					<<actCLA 'Continue'>>
 						<<gt $location>>
 					<</actCLA>>
@@ -213,7 +213,7 @@
 		<!-- !!3 - unattractive or average Sveta-->
 	<<elseif $pc.hotcat < 6>>
 		<!-- !!		'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 <<<<=$npcs.get($boy,'firstname')>>>>."'-->
+		<!-- !!		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<<<=$npcs.get($sex.npcId,'firstname')>>>>."'-->
 		<p>As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<npc $dateNPCId>><</npc>>."</p>
 		<<actCLA 'Give him a fake number'>>
 			<<image $npcs.get($dateNPCId,'image')>>
@@ -246,14 +246,14 @@
 				<<actCLA 'I would love to'>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					You think about it a moment and figure why not "Sure I would love to out with you."
-					<p>"Great!" answers <<=$npcs.get($boy,'firstname')>> "So, what do you want to do?".</p>
+					<p>"Great!" answers <<=$npcs.get($sex.npcId,'firstname')>> "So, what do you want to do?".</p>
 					<<gs 'dateM' 'date_choice'>>
 				<</actCLA>>
 				<<actCLA 'I would love to but can`t right now'>>
 					<<datingStart $dateNPCId>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					<p>"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?"</p>
-					<p>"I say that's a great idea. I'll be in touch." <<=$npcs.get($boy,'firstname')>> adds your number to his contact list.</p>
+					<p>"I say that's a great idea. I'll be in touch." <<=$npcs.get($sex.npcId,'firstname')>> adds your number to his contact list.</p>
 					"You better be." you say teasingly.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -285,22 +285,22 @@
 			<<set $time.minutes += 5>>
 
 			<<image $npcs.get($dateNPCId,'image')>>
-			<p>"Yeah, you heard me." said <<=$npcs.get($boy,'firstname')>>. "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?"</p>
+			<p>"Yeah, you heard me." said <<=$npcs.get($sex.npcId,'firstname')>>. "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?"</p>
 			"Isn''t someone full of confidence," you comment, seizing control of the conversation, as you contemplate your next move...
 			<<actCLA 'Remain silent'>>
 				<<image $npcs.get($dateNPCId,'image')>>
 				"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.
-				<p><<=$npcs.get($boy,'firstname')>> 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.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 				"Someone not desperate would have introduced themselves first and told me their name first. I don't want to talk to a complete stranger."
-				<p>"<<=$npcs.get($boy,'firstname')>>! And yours?" he asks you confidently, seeing a glimmer of hope.</p>
+				<p>"<<=$npcs.get($sex.npcId,'firstname')>>! And yours?" he asks you confidently, seeing a glimmer of hope.</p>
 				<p>"$pc.name_nick." you answer.</p>
-				<p>"Just as I expected a beautiful name for a beautiful girl..." <<=$npcs.get($boy,'firstname')>> quickly replies.</p>
+				<p>"Just as I expected a beautiful name for a beautiful girl..." <<=$npcs.get($sex.npcId,'firstname')>> quickly replies.</p>
 				<!-- !!Go on date, same answer no matter what time of day or weather-->
 				<<actCLA 'Decline'>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					"I'm sorry but I don't feel myself attracted to you enough and I don't want to lead you on."
-					<p><<=$npcs.get($boy,'firstname')>> looks at you disappointed. "Oh well, I didn't think I had a chance but you can't blame me for trying."</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you disappointed. "Oh well, I didn't think I had a chance but you can't blame me for trying."</p>
 					The two of you say goodbye to each other.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -317,14 +317,14 @@
 				<<actCLA 'Agree to a date'>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					"Stop, you're making me blush again. Sure, sounds like fun, I would love to."
-					<p>"Great!" answers <<=$npcs.get($boy,'firstname')>> "So, what do you want to do gorgeous?".</p>
+					<p>"Great!" answers <<=$npcs.get($sex.npcId,'firstname')>> "So, what do you want to do gorgeous?".</p>
 					<<gs 'dateM' 'date_choice'>>
 				<</actCLA>>
 				<<actCLA 'I would love to but can`t right now'>>
 					<<datingStart $dateNPCId>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					<p>"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?"</p>
-					<p>"I say that's a great idea. I'll be in touch." <<=$npcs.get($boy,'firstname')>> adds your number to his contact list.</p>
+					<p>"I say that's a great idea. I'll be in touch." <<=$npcs.get($sex.npcId,'firstname')>> adds your number to his contact list.</p>
 					"You better be." you say teasingly.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -387,30 +387,30 @@
 	<<set $time.minutes += 30>>
 	<<image "locations/shared/park/walk_#.jpg" 1 2>>
 	"Since it's such a beautiful day today, let's go for a walk in the park." you suggest.
-	<p>"Sounds great. Lets go." <<=$npcs.get($boy,'firstname')>> walks with you towards the park.</p>
+	<p>"Sounds great. Lets go." <<=$npcs.get($sex.npcId,'firstname')>> walks with you towards the park.</p>
 	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-->
 	<<actCLA 'Watch people'>>
 		<<set $time.minutes += 45>>
 		<<image "locations/shared/date/parkwatch.jpg">>
-		<p>The two of you sit down and begin commenting on the people walking by. You laugh while <<=$npcs.get($boy,'firstname')>> makes up stories about their backgrounds and quirks.</p>
-		<p>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. <<=$npcs.get($boy,'firstname')>> asks you, "I sure could go for some ice cream. Would you also like some ice cream?"</p>
+		<p>The two of you sit down and begin commenting on the people walking by. You laugh while <<=$npcs.get($sex.npcId,'firstname')>> makes up stories about their backgrounds and quirks.</p>
+		<p>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. <<=$npcs.get($sex.npcId,'firstname')>> asks you, "I sure could go for some ice cream. Would you also like some ice cream?"</p>
 		<<actCLA 'Yeah'>>
 			<<set $time.minutes += 15>>
 			<<image "locations/shared/date/parkice.jpg">>
-			<p><<=$npcs.get($boy,'firstname')>> runs away to the pushcart and comes back with two ice creams. "Here you go, $pc.name_nick I hope you'll enjoy it."</p>
-			<p>You nod and thank him. The two of you continue talking while eating the ice cream. As you finish <<=$npcs.get($boy,'firstname')>> asks, "Shall we move on?"</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> runs away to the pushcart and comes back with two ice creams. "Here you go, $pc.name_nick I hope you'll enjoy it."</p>
+			<p>You nod and thank him. The two of you continue talking while eating the ice cream. As you finish <<=$npcs.get($sex.npcId,'firstname')>> asks, "Shall we move on?"</p>
 			<<actCLA 'Nod'>>
 				<<set $time.minutes += 15>>
 				<<image "locations/shared/date/parkholding.jpg">>
 				As you continue walking the two of you begin holding hands. You're really enjoying yourself by now everything is going really well.
-				<p>You don't even notice that the two of you strayed off the beaten path, all of a sudden <<=$npcs.get($boy,'firstname')>> stops and whispers in your ear, "Now that we're at a secluded spot, you know what would make this date even better?"</p>
+				<p>You don't even notice that the two of you strayed off the beaten path, all of a sudden <<=$npcs.get($sex.npcId,'firstname')>> stops and whispers in your ear, "Now that we're at a secluded spot, you know what would make this date even better?"</p>
 				<<actCLA 'What?'>>
 					<<image "locations/shared/date/parklean.jpg">>
-					<p>Before you're even able to respond <<=$npcs.get($boy,'firstname')>> leans in and kisses you on the lips.</p>
+					<p>Before you're even able to respond <<=$npcs.get($sex.npcId,'firstname')>> leans in and kisses you on the lips.</p>
 					<<actCLA 'Make out'>>
 						<<image "locations/shared/date/parkmake.jpg">>
-						<p>Feeling frisky you kiss <<=$npcs.get($boy,'firstname')>> back. Not before long the two of you are having a make out session, french kissing each other.</p>
+						<p>Feeling frisky you kiss <<=$npcs.get($sex.npcId,'firstname')>> back. Not before long the two of you are having a make out session, french kissing each other.</p>
 						You feel yourself getting more and more aroused, maybe you should stop before the situation escalates too much...
 						<<arouse 'kiss' 3 `['exhibitionism']`>>
 						<<actCLA 'Stop him'>>
@@ -425,15 +425,15 @@
 						<<actCLA 'Who cares'>>
 							<<image "locations/shared/date/parkkiss.jpg">>
 							You decide to ignore the little voice in your back head and continue on the make out session.
-							<p><<=$npcs.get($boy,'firstname')>> 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.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 							<<arouse 'kiss' 4 `['exhibitionism']`>>
-							<p>As you're pressed against <<=$npcs.get($boy,'firstname')>> you feel his bulge through his pants. The two of you quickly remove your clothes, playing with each other's sensitive parts.</p>
+							<p>As you're pressed against <<=$npcs.get($sex.npcId,'firstname')>> you feel his bulge through his pants. The two of you quickly remove your clothes, playing with each other's sensitive parts.</p>
 							<<actCLA 'On your knees'>>
 								<<image "locations/shared/date/parkhj.jpg">>
 								<p>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.</p>
 								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.
-								<p><<=$npcs.get($boy,'firstname')>> 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.</p>
-								<p>You keep teasing him on as you lick his penis head and penis shaft. <<=$npcs.get($boy,'firstname')>>'s cock twitches as you keep licking him.</p>
+								<p><<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
+								<p>You keep teasing him on as you lick his penis head and penis shaft. <<=$npcs.get($sex.npcId,'firstname')>>'s cock twitches as you keep licking him.</p>
 								<<arouse 'hj' 4 `['exhibitionism']`>>
 								<<arouse 'bj' 4 `['exhibitionism']`>>
 								<<actCLA 'Give blowjob'>>
@@ -444,17 +444,17 @@
 									<p>"Damn, $pc.name_nick, you're really a good little cocksucker. How about you get on all fours so I can enjoy that little pussy of yours?"</p>
 									<<actCLA 'Doggy'>>
 										<<image "locations/shared/date/parkdoggy.jpg">>
-										<p>You're already wet and ready for him as you spread your legs as he bends down. <<=$npcs.get($boy,'firstname')>> slowly runs his shaft along your wet pussy teasing you right back as a payback for before.</p>
-										<p>You let out a sigh as he slowly enters you. Holding your waist, <<=$npcs.get($boy,'firstname')>> 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.</p>
+										<p>You're already wet and ready for him as you spread your legs as he bends down. <<=$npcs.get($sex.npcId,'firstname')>> slowly runs his shaft along your wet pussy teasing you right back as a payback for before.</p>
+										<p>You let out a sigh as he slowly enters you. Holding your waist, <<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 										<<set $orgasm_or = 'custom'>>
-										<<set $orgasm_txt = 'Suddenly, $npcs.get($boy,'firstname') 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.'>>
+										<<set $orgasm_txt = 'Suddenly, $npcs.get($sex.npcId,'firstname') 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.'>>
 										<<arouse 'vaginal' 6 `['exhibitionism']`>>
-										<p>Even <<=$npcs.get($boy,'firstname')>> is groaning and grimacing badly by now ready to cum.</p>
+										<p>Even <<=$npcs.get($sex.npcId,'firstname')>> is groaning and grimacing badly by now ready to cum.</p>
 										<<actCLA 'Finish'>>
 											<<set $time.minutes += 10>>
 											<<gs 'cum_call' 'labia' $boydesc>>
 											<<image "locations/shared/date/parkfinish.jpg">>
-											<p><<=$npcs.get($boy,'firstname')>> can't contain himself anymore, he's loudly groaning and as soon he pulls out of you he cums coating your pussy lips.</p>
+											<p><<=$npcs.get($sex.npcId,'firstname')>> can't contain himself anymore, he's loudly groaning and as soon he pulls out of you he cums coating your pussy lips.</p>
 											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.
 											<p>"That was great $pc.name_nick. 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.</p>
 											<<actCLA 'Walk back'>>
@@ -470,7 +470,7 @@
 						<<set $time.minutes += 5>>
 						<<image "locations/shared/date/parkback.jpg">>
 						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."
-						<p>He shakes his head. "No, not at all. I'm not going to make you do something you don't want." <<=$npcs.get($boy,'firstname')>> answers.</p>
+						<p>He shakes his head. "No, not at all. I'm not going to make you do something you don't want." <<=$npcs.get($sex.npcId,'firstname')>> answers.</p>
 						<<actCLA 'Walk back'>>
 							<<gt 'dateM' 'walk_back'>>
 						<</actCLA>>
@@ -484,11 +484,11 @@
 	<<set $time.minutes += 10>>
 	<<image "locations/shared/date/parkholding.jpg">>
 	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.
-	<p>"I've had a great time." you say smiling. "Yeah, me too..." <<=$npcs.get($boy,'firstname')>> says quietly. "Could I get your number so I can call you?"</p>
+	<p>"I've had a great time." you say smiling. "Yeah, me too..." <<=$npcs.get($sex.npcId,'firstname')>> says quietly. "Could I get your number so I can call you?"</p>
 	<<actCLA 'Sure'>>
 		<<datingStart $dateNPCId>>
 		<<image "locations/shared/date/givenumber.jpg">>
-		<p>You give <<=$npcs.get($boy,'firstname')>> 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.</p>
+		<p>You give <<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 		You end the date by him giving you a kiss on the cheek.
 		<<actCLA 'Leave'>>
 			<<gt $location>>
@@ -498,7 +498,7 @@
 		<<image "locations/shared/date/datereject.jpg">>
 		"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.
-		<p><<=$npcs.get($boy,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
 		<<actCLA 'Leave'>>
 			<<gt $location>>
 		<</actCLA>>
@@ -511,20 +511,20 @@
 	<<set $location_type = 'public_indoors'>>
 	<<set $time.minutes += 15>>
 	<<image "locations/pavlovsk/park/theater/kinoteatr.jpg">>
-	<p>"How about we go and see a movie?" you ask <<=$npcs.get($boy,'firstname')>></p>
+	<p>"How about we go and see a movie?" you ask <<=$npcs.get($sex.npcId,'firstname')>></p>
 	"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.
 	<<actCLA 'Decide on a movie'>>
 		<<set $time.minutes += 5>>
 		<<image "locations/pavlovsk/park/theater/cinema.jpg">>
-		<p>"How about this one?" <<=$npcs.get($boy,'firstname')>> points at a movie.</p>
+		<p>"How about this one?" <<=$npcs.get($sex.npcId,'firstname')>> points at a movie.</p>
 		<p>You shake your head, "No, I'm not in the mood for that. How about this one?" you point at a comedy.</p>
 		"Perfect, I love comedies." he comments.
 		<<actCLA 'Buy tickets'>>
 			<<set $time.minutes += 5>>
 			<<image "locations/shared/cinema/theaterbuy.jpg">>
-			<p>You and <<=$npcs.get($boy,'firstname')>> stand in line waiting to approach the box office.</p>
-			<p>As you've bought the tickets, <<=$npcs.get($boy,'firstname')>> asks, "Would you like something from the concession stand?"</p>
+			<p>You and <<=$npcs.get($sex.npcId,'firstname')>> stand in line waiting to approach the box office.</p>
+			<p>As you've bought the tickets, <<=$npcs.get($sex.npcId,'firstname')>> asks, "Would you like something from the concession stand?"</p>
 			<p>"Yeah, I would love some popcorn!" you answer excitingly.</p>
 			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.
@@ -537,55 +537,55 @@
 				<<actCLA 'Eat some popcorn'>>
 					<<set $time.minutes += 15>>
 					<<image "locations/shared/cinema/kino_#.jpg" 1 3>>
-					<p>As you're about to grab some popcorn from the tub, <<=$npcs.get($boy,'firstname')>> unknowingly goes to grab some popcorn too, touching your hand.</p>
+					<p>As you're about to grab some popcorn from the tub, <<=$npcs.get($sex.npcId,'firstname')>> unknowingly goes to grab some popcorn too, touching your hand.</p>
 					<p>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?"</p>
-					<p><<=$npcs.get($boy,'firstname')>> nervously smiles at you. "Sorry it wasn't my intentions to make you feel uncomfortable."</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> nervously smiles at you. "Sorry it wasn't my intentions to make you feel uncomfortable."</p>
 					<<actCLA 'Tease him' undefined `{willpower:['exhib','self']}`>>
 
 							<<set $time.minutes += 5>>
 							<<image "locations/shared/date/theatertease.jpg">>
 							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."
-							<p>You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<=$npcs.get($boy,'firstname')>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.</p>
+							<p>You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<=$npcs.get($sex.npcId,'firstname')>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.</p>
 							"Let me show you a great time." you slyly tell him. "Just relax and enjoy yourself."
 							<<actCLA 'Get on your knees'>>
 								<<image "locations/shared/date/theaterbj.jpg">>
-								<p>You go down on your knees removing your shirt and bra showing your body to <<=$npcs.get($boy,'firstname')>>. You begin playing with his rock hard penis through the pants.</p>
-								<p><<=$npcs.get($boy,'firstname')>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.</p>
-								<p>You unbutton his pants and pull down his briefs. The rock hard cock pops out while you look at <<=$npcs.get($boy,'firstname')>> smiling. "Keep quiet now we don't want to get caught."</p>
-								<p>You grab <<=$npcs.get($boy,'firstname')>> 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 <<=$npcs.get($boy,'firstname')>> is trying his best to keep quiet.</p>
+								<p>You go down on your knees removing your shirt and bra showing your body to <<=$npcs.get($sex.npcId,'firstname')>>. You begin playing with his rock hard penis through the pants.</p>
+								<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.</p>
+								<p>You unbutton his pants and pull down his briefs. The rock hard cock pops out while you look at <<=$npcs.get($sex.npcId,'firstname')>> smiling. "Keep quiet now we don't want to get caught."</p>
+								<p>You grab <<=$npcs.get($sex.npcId,'firstname')>> 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 <<=$npcs.get($sex.npcId,'firstname')>> is trying his best to keep quiet.</p>
 								<<arouse 'bj' 5 `['dom','exhibitionism']`>>
 								<<actCLA 'Lay down on the seat'>>
 									<<image "locations/shared/date/theatercuni.jpg">>
 									After a few minutes you stop and get up, lean into him telling him that it's his turn to impress you.
-									<p>You lay down on the empty seats next to you and spread your legs. <<=$npcs.get($boy,'firstname')>> by now very aroused dives in and begins playing with your wet clit.</p>
+									<p>You lay down on the empty seats next to you and spread your legs. <<=$npcs.get($sex.npcId,'firstname')>> by now very aroused dives in and begins playing with your wet clit.</p>
 									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.
 									<<arouse 'cuni' 5 `['dom','exhibitionism']`>>
 									<<actCLA 'Reverse cowgirl'>>
 										<<image "locations/shared/date/theatercow.jpg">>
 										He stops to let you rest just as you're nearing the orgasm, feeling irritated you decide to get even.
-										<p>You make <<=$npcs.get($boy,'firstname')>> 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.</p>
-										<p>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. <<=$npcs.get($boy,'firstname')>> is clearly having some trouble holding himself as his cock is growing inside you.</p>
+										<p>You make <<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
+										<p>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. <<=$npcs.get($sex.npcId,'firstname')>> is clearly having some trouble holding himself as his cock is growing inside you.</p>
 										<<arouse 'vaginal' 5 `['dom','exhibitionism']`>>
 										<<actCLA 'Back to laying down'>>
 											<<gs 'cum_call' 'stomach' $boydesc>>
 											<<gs 'cum_call' 'breasts' $boydesc>>
 											<<image "locations/shared/date/theatervag.jpg">>
-											<p>By now <<=$npcs.get($boy,'firstname')>> 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.</p>
-											<p>As soon as <<=$npcs.get($boy,'firstname')>> enters you he's already heavily panting. You whisper angrily to him "Don't you dare cum yet. I'm still not pleased." <<=$npcs.get($boy,'firstname')>> does his best and keeps thrusting for a minute or two not being able to hold on anymore.</p>
+											<p>By now <<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
+											<p>As soon as <<=$npcs.get($sex.npcId,'firstname')>> enters you he's already heavily panting. You whisper angrily to him "Don't you dare cum yet. I'm still not pleased." <<=$npcs.get($sex.npcId,'firstname')>> does his best and keeps thrusting for a minute or two not being able to hold on anymore.</p>
 											<<arouse 'vaginal' 5 `['dom','exhibitionism']`>>
 											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.
 											<<actCLA 'Caught'>>
 												<<set $time.minutes += 10>>
 												<<image "locations/shared/date/theatercaught.jpg">>
-												<p>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 <<=$npcs.get($boy,'firstname')>> cum splattered all over you.</p>
-												<p>"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. <<=$npcs.get($boy,'firstname')>> pulls up his pants and gets dressed, leaving you all naked to fend for yourself.</p>
+												<p>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 <<=$npcs.get($sex.npcId,'firstname')>> cum splattered all over you.</p>
+												<p>"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. <<=$npcs.get($sex.npcId,'firstname')>> pulls up his pants and gets dressed, leaving you all naked to fend for yourself.</p>
 												"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."
-												<p>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. <<=$npcs.get($boy,'firstname')>> is walking besides you and also has his head down looking at the ground as ashamed as you.</p>
+												<p>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. <<=$npcs.get($sex.npcId,'firstname')>> is walking besides you and also has his head down looking at the ground as ashamed as you.</p>
 												<<actCLA 'Outside'>>
 													<<set $location_type = 'public_outdoors'>>
 													<<set $time.minutes += 5>>
 													<<image "locations/pavlovsk/park/theater/kinoteatr.jpg">>
-													<p>"Wow, that's never happened to me before." <<=$npcs.get($boy,'firstname')>> tells you.</p>
+													<p>"Wow, that's never happened to me before." <<=$npcs.get($sex.npcId,'firstname')>> tells you.</p>
 													"I only regret us getting caught. If we've only been able to keep quiet. Nothing do anything about that now." you say smiling.
 													<p>"I guess I should ask for your for your number now that we've got to know each other really well?"</p>
 													<<actCLA 'Sure'>>
@@ -605,13 +605,13 @@
 					<<actCLA 'Keep watching the movie'>>
 						<<set $time.minutes += 45>>
 						<<image "locations/shared/cinema/kino_#.jpg" 1 3>>
-						<p>After a while <<=$npcs.get($boy,'firstname')>> leans towards you and whispers if you're enjoying yourself.</p>
+						<p>After a while <<=$npcs.get($sex.npcId,'firstname')>> leans towards you and whispers if you're enjoying yourself.</p>
 						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.
 						<<actCLA 'Outside'>>
 							<<set $location_type = 'public_outdoors'>>
 							<<set $time.minutes += 5>>
 							<<image "locations/pavlovsk/park/theater/kinoteatr.jpg">>
-							<p>The movie finishes and the lights get turned on. You and <<=$npcs.get($boy,'firstname')>> walk outside where you talk about how funny the movie was.</p>
+							<p>The movie finishes and the lights get turned on. You and <<=$npcs.get($sex.npcId,'firstname')>> walk outside where you talk about how funny the movie was.</p>
 							"I enjoyed the kissing part more." you say to him. He blushes a bit as you compliment him.
 							<p>"Glad to hear that. I guess then I'm not coming on to strong asking you for your number?"</p>
 							<<actCLA 'Sure'>>
@@ -630,7 +630,7 @@
 <<if $location_var[$here][0] == 'cinema_sure'>>
 	<<datingStart $dateNPCId>>
 	<<image "locations/shared/date/givenumber.jpg">>
-	<p>You give <<=$npcs.get($boy,'firstname')>> 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.</p>
+	<p>You give <<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 	You end the date by him giving you a kiss on the cheek.
 	<<actCLA 'Leave'>>
 		<<gt $location>>
@@ -640,7 +640,7 @@
 	<<image "locations/shared/date/datereject.jpg">>
 	"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.
-	<p><<=$npcs.get($boy,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
+	<p><<=$npcs.get($sex.npcId,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
 	<<actCLA 'Leave'>>
 		<<gt $location>>
 	<</actCLA>>
@@ -653,21 +653,21 @@
 	<<set $location_type = 'public_indoors'>>
 	<<set $time.minutes += 15>>
 	<<image "locations/shared/date/cafe.jpg">>
-	<p>"How about a coffee?" you ask <<=$npcs.get($boy,'firstname')>>.</p>
+	<p>"How about a coffee?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 	<p>"Great idea $pc.name_nick I know a great place."</p>
 	The two of you enter the café and find a secluded spot where you can be left alone.
 	<<actCLA 'Interact'>>
 		<<set $time.minutes += 10>>
 		<<image "locations/shared/date/cafetalk.jpg">>
-		<p>"This is a nice spot. So tell me about yourself $pc.name_nick?" <<=$npcs.get($boy,'firstname')>> asks as soon as you sit down.</p>
-		<p>You tell him a little about your family, where you're from and the likes. All while <<=$npcs.get($boy,'firstname')>> carefully listens to your every word just like he's analyzing you in his head.</p>
+		<p>"This is a nice spot. So tell me about yourself $pc.name_nick?" <<=$npcs.get($sex.npcId,'firstname')>> asks as soon as you sit down.</p>
+		<p>You tell him a little about your family, where you're from and the likes. All while <<=$npcs.get($sex.npcId,'firstname')>> carefully listens to your every word just like he's analyzing you in his head.</p>
 		The conversation takes a deeper meaning as he keeps probing you with more serious questions about you.
 		<<actCLA 'Order'>>
 			<<set $time.minutes += 5>>
 			<<image "locations/shared/date/cafewaitress.jpg">>
 			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."
-			<p>She scribbles down your order, as she re-reads the order, she manages to stammer through your order but when it comes to <<=$npcs.get($boy,'firstname')>> she messes up.</p>
-			<p>"What is wrong with you? Can't you write down a simple order?" <<=$npcs.get($boy,'firstname')>> reacts.</p>
+			<p>She scribbles down your order, as she re-reads the order, she manages to stammer through your order but when it comes to <<=$npcs.get($sex.npcId,'firstname')>> she messes up.</p>
+			<p>"What is wrong with you? Can't you write down a simple order?" <<=$npcs.get($sex.npcId,'firstname')>> reacts.</p>
 			You sit there looking in shock wondering what you should do...
 			<<actCLA 'React' undefined `{willpower:['misc','self']}`>>
 
@@ -675,8 +675,8 @@
 					<<set $time.minutes += 10>>
 					<<image "locations/shared/date/cafereact.jpg">>
 					The poor waitress returns after a while with your order. You look at her with an apologetic look.
-					<p>"Hope everything is in order." <<=$npcs.get($boy,'firstname')>> says. Feeling a bit irritated you kick him under the table, while thanking her.</p>
-					<p><<=$npcs.get($boy,'firstname')>> looks at you in dispair, "What? Did I do anything wrong?"</p>
+					<p>"Hope everything is in order." <<=$npcs.get($sex.npcId,'firstname')>> says. Feeling a bit irritated you kick him under the table, while thanking her.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you in dispair, "What? Did I do anything wrong?"</p>
 					"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.
 					<<actCLA 'Continue date'>>
@@ -688,9 +688,9 @@
 
 
 					<<image "locations/shared/date/cafetelloff.jpg">>
-					<p>Not liking the way <<=$npcs.get($boy,'firstname')>> treated the waitress you go on the attack against <<=$npcs.get($boy,'firstname')>>. 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.</p>
+					<p>Not liking the way <<=$npcs.get($sex.npcId,'firstname')>> treated the waitress you go on the attack against <<=$npcs.get($sex.npcId,'firstname')>>. 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.</p>
 					"You should really learn some manners. To treat a human being like that is despicable. You should be ashamed of yourself."
-					<p><<=$npcs.get($boy,'firstname')>> looks at you in fear as he wasn't expecting you to react like that.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you in fear as he wasn't expecting you to react like that.</p>
 					<p>"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é.</p>
 					<<actCLA 'Rush out'>>
 						<<gt $location>>
@@ -701,8 +701,8 @@
 				<<set $time.minutes += 10>>
 				<<image "locations/shared/date/cafequiet.jpg">>
 				The poor waitress returns after a while with your order. You look at her with an apologetic look.
-				<p>"Hope everything is in order." <<=$npcs.get($boy,'firstname')>> says. You're not confident enough commenting on how an unknown person is behaving so you keep your mouth shut.</p>
-				<p><<=$npcs.get($boy,'firstname')>> looks at with confidence, "What? She had it coming. I get irritated by weak people."</p>
+				<p>"Hope everything is in order." <<=$npcs.get($sex.npcId,'firstname')>> says. You're not confident enough commenting on how an unknown person is behaving so you keep your mouth shut.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> looks at with confidence, "What? She had it coming. I get irritated by weak people."</p>
 				You nod in agreement not wanting egging him on.
 				<<actCLA 'Continue date'>>
 					<<gt 'dateM' 'cafepeople'>>
@@ -713,8 +713,8 @@
 				<<image "locations/shared/date/cafemad.jpg">>
 				"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.
-				<p>"Hope everything is in order." <<=$npcs.get($boy,'firstname')>> says. "Yeah, it would be a shame if we needed to talk with the manager." you sourly tell her.</p>
-				<p>The waitress asks for forgiveness once again before going away. <<=$npcs.get($boy,'firstname')>> looks at you impressed, "I must say, the way you handled her was perfect. I'm getting so turned on."</p>
+				<p>"Hope everything is in order." <<=$npcs.get($sex.npcId,'firstname')>> says. "Yeah, it would be a shame if we needed to talk with the manager." you sourly tell her.</p>
+				<p>The waitress asks for forgiveness once again before going away. <<=$npcs.get($sex.npcId,'firstname')>> looks at you impressed, "I must say, the way you handled her was perfect. I'm getting so turned on."</p>
 				"Thanks, one should not be accepting bad service no matter who you are."
 				<<actCLA 'Continue date'>>
 					<<gt 'dateM' 'cafepeople'>>
@@ -726,7 +726,7 @@
 <<if $location_var[$here][0] == 'cafepeople'>>
 	<<set $time.minutes += 15>>
 	<<image "locations/shared/date/cafewatching.jpg">>
-	<p>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 <<=$npcs.get($boy,'firstname')>> makes up stories about his background and quirks.</p>
+	<p>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 <<=$npcs.get($sex.npcId,'firstname')>> makes up stories about his background and quirks.</p>
 	There are a few times you almost get caught by the man as you point and laugh.
 	<<actCLA 'Finish the date'>>
 		<<gt 'dateM' 'cafeend'>>
@@ -735,12 +735,12 @@
 <<if $location_var[$here][0] == 'cafeend'>>
 	<<set $time.minutes += 5>>
 	<<image "locations/shared/date/cafefinish.jpg">>
-	<p>After a while you end observing the man and tell <<=$npcs.get($boy,'firstname')>>, "Well, thanks for the coffee but I should be on my way."</p>
-	<p>"I had a great time, you're really fun to hang out with." <<=$npcs.get($boy,'firstname')>> tells you. "Could I get your number?"</p>
+	<p>After a while you end observing the man and tell <<=$npcs.get($sex.npcId,'firstname')>>, "Well, thanks for the coffee but I should be on my way."</p>
+	<p>"I had a great time, you're really fun to hang out with." <<=$npcs.get($sex.npcId,'firstname')>> tells you. "Could I get your number?"</p>
 	<<actCLA 'Sure'>>
 		<<datingStart $dateNPCId>>
 		<<image "locations/shared/date/givenumber.jpg">>
-		<p>You give <<=$npcs.get($boy,'firstname')>> 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.</p>
+		<p>You give <<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 		You end the date by him giving you a kiss on the cheek.
 		<<actCLA 'Leave'>>
 			<<gt $location>>
@@ -750,7 +750,7 @@
 		<<image "locations/shared/date/datereject.jpg">>
 		<p>"I've really enjoyed the date but I'm not impressed by your first-impression, you were too harsh to that waitress..."</p>
 		"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.
-		<p><<=$npcs.get($boy,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
 		<<actCLA 'Leave'>>
 			<<gt $location>>
 		<</actCLA>>
@@ -763,16 +763,16 @@
 	<<set $location_type = 'public_indoors'>>
 	<<set $time.minutes += 20>>
 	<<image "locations/shared/date/barinside.jpg">>
-	<p>"How about going to a bar?" you ask <<=$npcs.get($boy,'firstname')>>.</p>
+	<p>"How about going to a bar?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 	<p>"Great idea $pc.name_nick I know a great bar with great drinks and lightning."</p>
 	The two of you enter this buzzing hip bar and find a spot where you have a great overview over the place.
 	<<actCLA 'Order'>>
 		<<image "locations/shared/date/bardrink1.jpg">>
-		<p>As you sit down <<=$npcs.get($boy,'firstname')>> asks you, "Would you like to drink something?"</p>
+		<p>As you sit down <<=$npcs.get($sex.npcId,'firstname')>> asks you, "Would you like to drink something?"</p>
 		<<actCLA 'I`ll have a beer, thanks'>>
 			<<gs 'drugs' 'alcohol' 'beer'>>
 			<<image "locations/shared/date/barorder_#.jpg" 1 2>>
-			<p>"My kind of girl." <<=$npcs.get($boy,'firstname')>> tells you.</p>
+			<p>"My kind of girl." <<=$npcs.get($sex.npcId,'firstname')>> tells you.</p>
 			<<actCLA 'Talk'>>
 				<<gt 'dateM' 'bartalk'>>
 			<</actCLA>>
@@ -780,7 +780,7 @@
 		<<actCLA 'I`ll have some hard liquor, thanks'>>
 			<<gs 'drugs' 'alcohol' 'vodka'>>
 			<<image "locations/shared/date/barorder_#.jpg" 1 2>>
-			<p>"My kind of girl." <<=$npcs.get($boy,'firstname')>> tells you.</p>
+			<p>"My kind of girl." <<=$npcs.get($sex.npcId,'firstname')>> tells you.</p>
 			<<actCLA 'Talk'>>
 				<<gt 'dateM' 'bartalk'>>
 			<</actCLA>>
@@ -790,15 +790,15 @@
 <<if $location_var[$here][0] == 'bartalk'>>
 	<<set $time.minutes += 15>>
 	<<image "locations/shared/date/barinside.jpg">>
-	<p><<=$npcs.get($boy,'firstname')>> goes to the bar counter and after a while returns with the drinks.</p>
-	<p>"This place is packed." you say to <<=$npcs.get($boy,'firstname')>></p>
+	<p><<=$npcs.get($sex.npcId,'firstname')>> goes to the bar counter and after a while returns with the drinks.</p>
+	<p>"This place is packed." you say to <<=$npcs.get($sex.npcId,'firstname')>></p>
 	"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."
 	<<actCLA 'Continue on'>>
 		<<set $time.minutes += 10>>
 		<<image "locations/shared/date/barband.jpg">>
 		As you sit there talking to each other, the lights suddenly go dim and you hear a guitar riff playing.
-		<p>The band steps out and starts playing. You're amazed over how well they play and turn to <<=$npcs.get($boy,'firstname')>> "They are pretty good don't you think?"</p>
-		<p><<=$npcs.get($boy,'firstname')>> nods his head. "Yeah they are, do you want another drink?"</p>
+		<p>The band steps out and starts playing. You're amazed over how well they play and turn to <<=$npcs.get($sex.npcId,'firstname')>> "They are pretty good don't you think?"</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> nods his head. "Yeah they are, do you want another drink?"</p>
 		<!-- !!add to buzz-->
 		<<actCLA 'Sure'>>
 			<<gs 'drugs' 'alcohol' 'vodka'>>
@@ -806,15 +806,15 @@
 			<<image "locations/shared/date/bardiscuss.jpg">>
 			<p>"Are you trying to get me drunk?" you say winking towards him.</p>
 			"No comments." he responds smiling.
-			<p>"Well, I'm having a great time so why not." <<=$npcs.get($boy,'firstname')>> goes over to the counter and returns with two new drinks.</p>
+			<p>"Well, I'm having a great time so why not." <<=$npcs.get($sex.npcId,'firstname')>> goes over to the counter and returns with two new drinks.</p>
 			<<if $pc.skillLevel("dance") > 30>>
 				<<actCLA 'Dance'>>
 					<<set $time.minutes += 10>>
 					<<image "locations/shared/date/bardancing.jpg">>
 					Some time goes by and you're not able to contain yourself anymore, you got to dance.
-					<p>"Would you like to dance?" you ask <<=$npcs.get($boy,'firstname')>>.</p>
+					<p>"Would you like to dance?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 					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.
-					<p>You get up from the chair and walk up near the stage and begin moving sensually, teasing <<=$npcs.get($boy,'firstname')>>.</p>
+					<p>You get up from the chair and walk up near the stage and begin moving sensually, teasing <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 					<<actCLA 'Return to your date'>>
 						<<set $time.minutes += 15>>
 						<!-- !!add buzz-->
@@ -828,11 +828,11 @@
 							<<image "locations/shared/date/barrestroom.jpg">>
 							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.
 							<p>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."</p>
-							<p>Recognizing <<=$npcs.get($boy,'firstname')>> voice, you come to your senses and open the door, quickly pulling him in.</p>
+							<p>Recognizing <<=$npcs.get($sex.npcId,'firstname')>> voice, you come to your senses and open the door, quickly pulling him in.</p>
 							<p>"What's happening?" he asks as you lean into him and begin kissing him.</p>
 							<<actCLA 'Make out'>>
 								<<image "locations/shared/date/barmakeout.jpg">>
-								<p><<=$npcs.get($boy,'firstname')>> doesn't seem to mind your brashness. He begins grabbing you all over your body, adding even more to your arousal.</p>
+								<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't seem to mind your brashness. He begins grabbing you all over your body, adding even more to your arousal.</p>
 								As you're kissing you feel his fingers playing with your wet clit through the panties.
 								<p>"Get down on your knees $pc.name_nick."</p>
 								<<arouse 'foreplay' 2 >>
@@ -841,7 +841,7 @@
 										<<arousalEnd>>
 										<<image "locations/shared/date/barinside.jpg">>
 										You can't get yourself to go through this. Excusing yourself you walk back to the table and sit down.
-										<p><<=$npcs.get($boy,'firstname')>> 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...</p>
+										<p><<=$npcs.get($sex.npcId,'firstname')>> 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...</p>
 										<<actCLA 'Finish the date'>>
 											<<gt 'dateM' 'barend'>>
 										<</actCLA>>
@@ -851,25 +851,25 @@
 									<<image "locations/shared/date/barbj.jpg">>
 									You're too aroused to do anything else. You quickly drop down on your knees, grabbing hold of his pants, ripping them open.
 									<p>His erect penis pops out and you can clearly see some pre-cum around the foreskin.</p>
-									<p>You devour his flaccid penis with your mouth, swallowing it whole with ease. <<=$npcs.get($boy,'firstname')>> 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."</p>
+									<p>You devour his flaccid penis with your mouth, swallowing it whole with ease. <<=$npcs.get($sex.npcId,'firstname')>> 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."</p>
 									<<arouse 'bj' 3 `['deepthroat']`>>
 									<<actCLA 'Stand up'>>
 										<<image "locations/shared/date/barfuck.jpg">>
-										<p>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 <<=$npcs.get($boy,'firstname')>> catches his breath. "That's enough rest." you tell him.</p>
+										<p>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 <<=$npcs.get($sex.npcId,'firstname')>> catches his breath. "That's enough rest." you tell him.</p>
 										You have him stand behind you as you grab hold of the sink. "Come on, fuck me good." you tell him.
-										<p><<=$npcs.get($boy,'firstname')>> 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.</p>
+										<p><<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 										<<set $orgasm_or = 'custom'>>
-										<<set $orgasm_txt = 'Even though he's edging $npcs.get($boy,'firstname') 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.'>>
+										<<set $orgasm_txt = 'Even though he's edging $npcs.get($sex.npcId,'firstname') 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.'>>
 										<<arouse 'vaginal' 3 >>
 										<<arousalEnd>>
 										<<gs 'cum_call' '' $boydesc>>
-										<p>It doesn't take long before <<=$npcs.get($boy,'firstname')>> 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.</p>
+										<p>It doesn't take long before <<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 										<<actCLA 'Clean up'>>
 											<<set $cumspclnt = 15>>
 											<<gs 'cum_cleanup'>>
 											<<image "locations/shared/date/barcream.jpg">>
 											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.
-											<p>"That was great $pc.name_nick." <<=$npcs.get($boy,'firstname')>> compliments you. "You were not bad yourself" you tell him.</p>
+											<p>"That was great $pc.name_nick." <<=$npcs.get($sex.npcId,'firstname')>> compliments you. "You were not bad yourself" you tell him.</p>
 											<<actCLA 'Finish the date'>>
 												<<gt 'dateM' 'barend'>>
 											<</actCLA>>
@@ -884,7 +884,7 @@
 			<<actCLA 'Keep talking'>>
 				<<set $time.minutes += 20>>
 				<<image "locations/shared/date/bardiscuss_#.jpg" 1 4>>
-				<p>You and <<=$npcs.get($boy,'firstname')>> continue talking even if it's hard to hear what he says at some times because of the loud music.</p>
+				<p>You and <<=$npcs.get($sex.npcId,'firstname')>> continue talking even if it's hard to hear what he says at some times because of the loud music.</p>
 				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.
 				<<actCLA 'Finish the date'>>
@@ -897,12 +897,12 @@
 <<if $location_var[$here][0] == 'barend'>>
 	<<set $time.minutes += 5>>
 	<<image "locations/shared/date/bardiscuss_#.jpg" 1 4>>
-	<p>You tell <<=$npcs.get($boy,'firstname')>>, "I've had a great time but we should be on our way."</p>
-	<p>"I had a great time, you're really fun to hang out with." <<=$npcs.get($boy,'firstname')>> tells you. "Could I get your number?"</p>
+	<p>You tell <<=$npcs.get($sex.npcId,'firstname')>>, "I've had a great time but we should be on our way."</p>
+	<p>"I had a great time, you're really fun to hang out with." <<=$npcs.get($sex.npcId,'firstname')>> tells you. "Could I get your number?"</p>
 	<<actCLA 'Sure'>>
 		<<datingStart $dateNPCId>>
 		<<image "locations/shared/date/givenumber.jpg">>
-		<p>You give <<=$npcs.get($boy,'firstname')>> 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.</p>
+		<p>You give <<=$npcs.get($sex.npcId,'firstname')>> 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.</p>
 		You end the date by him giving you a kiss on the cheek.
 		<<actCLA 'Leave'>>
 			<<gt $location>>
@@ -912,7 +912,7 @@
 		<<image "locations/shared/date/barreject.jpg">>
 		"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.
-		<p><<=$npcs.get($boy,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
 		<<actCLA 'Leave'>>
 			<<gt $location>>
 		<</actCLA>>

sugarcube/src/activities/school/gschool_boys_bathroom.tw

@@ -277,7 +277,7 @@
 			<<set $anal_slip += 4>>
 			<<arouse 'anal' 6 `['sub','rough']`>>
 			<<actCLA 'Finish'>>
-				<<gs 'cum_call' 'anus' $boy>>
+				<<gs 'cum_call' 'anus' $sex.npcId>>
 				<<arousalEnd>>
 				<h2>Boy's bathroom</h2>
 				<<image "characters/pavlovsk/school/boy/radomir/sex/school/boy1cum.jpg">>
@@ -372,8 +372,8 @@
 			<<set $anal_slip += 4>>
 			<<arouse 'anal' 6 >>
 			<<actCLA 'Finish'>>
-				<<gs 'cum_call' 'labia' $boy 1 '' '' 20>>
-				<<gs 'cum_call' 'anus' $boy 1 '' '' 20>>
+				<<gs 'cum_call' 'labia' $sex.npcId 1 '' '' 20>>
+				<<gs 'cum_call' 'anus' $sex.npcId 1 '' '' 20>>
 				<h2>Boy's bathroom</h2>
 				<<image "characters/pavlovsk/school/boy/lazar/sex/school/boy2cum.jpg">>
 				Knowing you don't have much time, you rub your pussy furiously and your climax hits you just as he pulls out of you.
@@ -454,7 +454,7 @@
 						Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you sitting on your knees with his cum on your tongue. You're strangely proud of yourself and let him take one last look at you before you pull your tongue back into your mouth and swallow, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.
 						<<arouse 'bj' 5 >>
 						<<arousalEnd>>
-						<<gs 'cum_call' 'mouth' $boy>>
+						<<gs 'cum_call' 'mouth' $sex.npcId>>
 						He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls..." He pulls up his pants and bends over to give you a quick kiss on the forehead before he finishes getting dressed. You get up and make yourself presentable as well.
 						<<actCLA 'Finish'>>
 							<<gt 'gschool_boys_bathroom' 'boy4_end'>>
@@ -493,7 +493,7 @@
 								Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you sitting on your knees with his cum on your tongue. You're strangely proud of yourself and let him take one last look at you before you pull your tongue back into your mouth and swallow, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.
 								<<arouse 'bj' 5 >>
 								<<arousalEnd>>
-								<<gs 'cum_call' 'mouth' $boy>>
+								<<gs 'cum_call' 'mouth' $sex.npcId>>
 								He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls..." He pulls up his pants and bends over to give you a quick kiss on the forehead before he finishes getting dressed. You get up and make yourself presentable as well.
 								<<actCLA 'Finish'>>
 									<<gt 'gschool_boys_bathroom' 'boy4_end'>>
@@ -506,7 +506,7 @@
 								You glance back at him and grin. He gets the idea and redoubles his efforts to fuck you, his balls slapping against your clit with each powerful thrust. You feel your need for release grow with every thrust and everything he does only seems to make it better. Finally, you feel his dick pulsing inside you as he fills your pussy with his huge load. When he pulls out, you can feel his thick cum slowly leaking out and running down your inner leg.
 								<<arouse 'vaginal' 5 >>
 								<<arousalEnd>>
-								<<gs 'cum_call' 'vagina' $boy>>
+								<<gs 'cum_call' 'vagina' $sex.npcId>>
 								<<actCLA 'Finish'>>
 									<<gt 'gschool_boys_bathroom' 'boy4_end'>>
 								<</actCLA>>
@@ -534,7 +534,7 @@
 							Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you sitting on your knees with his cum on your tongue. You're strangely proud of yourself and let him take one last look at you before you pull your tongue back into your mouth and swallow, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.
 							<<arouse 'bj' 5 >>
 							<<arousalEnd>>
-							<<gs 'cum_call' 'mouth' $boy>>
+							<<gs 'cum_call' 'mouth' $sex.npcId>>
 							He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls..." He pulls up his pants and bends over to give you a quick kiss on the forehead before he finishes getting dressed. You get up and make yourself presentable as well.
 							<<actCLA 'Finish'>>
 								<<gt 'gschool_boys_bathroom' 'boy4_end'>>
@@ -627,9 +627,9 @@
 						<<arouse 'anal' 5 `['group']`>>
 						<!-- Boy A5 -->
 						<<arouse 'bj' 5 `['group']`>>
-						<<gs 'cum_call' 'mouth' $boy>>
+						<<gs 'cum_call' 'mouth' $sex.npcId>>
 						<!-- Boy A3 -->
-						<<gs 'cum_call' 'anus' $boy>>
+						<<gs 'cum_call' 'anus' $sex.npcId>>
 						<<set $noShampoo = 1>>
 						<<gs 'cleanBody'>>
 						<p>Shortly after this, Fedor tenses up and holds your head still, his dick buried deep in your mouth. He shoots his cum deep inside, most of it hitting the back of your throat and getting swallowed instantly, and pumps his manhood even deeper into your mouth a few more times before pulling out and standing up to watch Ivan, who's still pounding your ass. A few seconds later, Ivan groans loudly and buries his dick deep in your ass. You feel a warmth flood inside you as he starts cumming. When his dick leaves your ass, which gapes after his enthusiastic fuck, you feel some of the cum running out. Ivan stands up and smiles. "Fuck, that was great. You're the best $pc.name_nick."</p>
@@ -830,11 +830,11 @@
 						<p>Once they're done, Dan says "Now THAT is one well-trained slut." He laughs at you, still sitting on the ground, and the boys gather up their things and leave.</p>
 						<<set $bathroomindex = 0>>
 						<<warn 'JUMP MARKER ENCOUNTERED: :schoolbathroom_loop'>>
-						<<gs 'cum_call' 'labia' $boy 1 '' '' 8>>
-						<<gs 'cum_call' 'butt' $boy 1 '' '' 8>>
-						<<gs 'cum_call' 'face' $boy 1 '' '' 8>>
-						<<gs 'cum_call' 'breasts' $boy 1 '' '' 8>>
-						<<gs 'cum_call' 'hair' $boy 1 '' '' 8>>
+						<<gs 'cum_call' 'labia' $sex.npcId 1 '' '' 8>>
+						<<gs 'cum_call' 'butt' $sex.npcId 1 '' '' 8>>
+						<<gs 'cum_call' 'face' $sex.npcId 1 '' '' 8>>
+						<<gs 'cum_call' 'breasts' $sex.npcId 1 '' '' 8>>
+						<<gs 'cum_call' 'hair' $sex.npcId 1 '' '' 8>>
 						<<set $bathroomindex += 1>>
 						<!--<<if getvar("$bathroomindex") < 3>>
 							<<gs 'boyStat' $boy1[$bathroomindex]>>
@@ -1075,7 +1075,7 @@
 				<<arouse 'bj' 5 `['group']`>>
 				<<arouse 'kiss' 5 >>
 				<<arousalEnd>>
-				<<gs 'cum_call' 'mouth' $boy>>
+				<<gs 'cum_call' 'mouth' $sex.npcId>>
 				<h2>Boy's bathroom</h2>
 				<<image "locations/pavlovsk/school/bathroom/sex/boys/couplecum.jpg">>
 				<p>He keeps going through your orgasm for some time before he suddenly reaches out, grabs Anushka by the hair and pulls her down. She drops to her knees and he instantly pulls his cock out of your pussy and shoves it straight into her mouth. She doesn't seem to mind - on the contrary, she's blowing him like nothing makes her happier. Arkadi places a hand on your shoulder, pushing you down, and Anushka seems to concur, grabbing your arm and encouraging you to join her. You sink down to your knees beside her, and as soon as they touch the ground, he pulls out of her mouth and shoves his cock straight into yours. You do your best to follow Anushka's example and give him the best blowjob you can while she sucks his balls, and after a minute or so, you switch roles.</p>

sugarcube/src/activities/school/gschool_cheerleading.tw

@@ -707,9 +707,9 @@
 					<<arouse 'bj' 5 >>
 					<<actCLA 'Get your pussies fucked'>>
 						<!-- FAILED TO CONVERT
-							npc_sex[$boy] += 1 & if npc_sex[$boy] = 1: boy += 1
+							npc_sex[$sex.npcId] += 1 & if npc_sex[$sex.npcId] = 1: boy += 1
 						-----
-							<<run $npcs.inc($boy,'sex',1)>> <<set if npc_sex[$boy] = ERROR: FAILED TO CONVERT LITERAL: """1: boy""" + ERROR: FAILED TO CONVERT LITERAL: """= 1""">>
+							<<run $npcs.inc($sex.npcId,'sex',1)>> <<set if npc_sex[$sex.npcId] = ERROR: FAILED TO CONVERT LITERAL: """1: boy""" + ERROR: FAILED TO CONVERT LITERAL: """= 1""">>
 
 						-->
 						<<warn "CONVERSION ERROR c9a26e446722b307527414df0c0a8175">>
@@ -731,7 +731,7 @@
 								<p>She then sits right on your face and starts grinding against you, so you obediently lick and tongue fuck her asshole as cum continues to trickle into your mouth. "Yeah, that's right $pc.name_nick. Lick my asshole clean!" Albina keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.</p>
 								<<arouse 'rimming_give' 5 >>
 								<<set $time.minutes += 5>>
-								<<gs 'cum_call' 'mouth' $boy>>
+								<<gs 'cum_call' 'mouth' $sex.npcId>>
 								<<arousalEnd>>
 								<<actCLA 'Finish'>>
 									<<image "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg">>
@@ -751,7 +751,7 @@
 								She then sits on your face and starts grinding against you as cum continues to trickle into your mouth. She keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.
 								<<arouse 'cuni_give' 5 >>
 								<<set $time.minutes += 5>>
-								<<gs 'cum_call' 'mouth' $boy>>
+								<<gs 'cum_call' 'mouth' $sex.npcId>>
 								<<arousalEnd>>
 								<<actCLA 'Finish'>>
 									<<image "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg">>
@@ -785,7 +785,7 @@
 						<<arouse 'bj' 5 >>
 						<<set $time.minutes += 5>>
 						<<actCLA 'Get your pussies fucked'>>
-							<<run $npcs.inc($boy,'sex',1)>>
+							<<run $npcs.inc($sex.npcId,'sex',1)>>
 							<<video "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome1.mp4">>
 							<p>Lazar then stands. "Time to get fucked girls," he says and Albina gets on all fours on the bench. "Get up there beside her, $pc.name_nick! I want to see both those asses high in the air!" Lazar orders. You obidiently climb onto the bench next to Albina, who playfully wiggles her ass at Lazar. He gives her ass cheek a good slap in response before pushing his cock into her awaiting pussy. You gasp when his fingers plunge inside your pussy and he starts fingering you. He starts thrusting into Albina and fucks for a few minutes while also fingering you before he pulls out of you both and moves in behind you.</p>
 							You feel the tip of his cock push against your pussy and it slides into your hole. He grabs your hips and starts thrusting in and out of you as Albina leans over and starts kissing you. You spend the next few minutes having Lazar alternate between fucking the two of you while your tongues remain locked together.
@@ -804,7 +804,7 @@
 									<p>She then sits on your face and starts grinding against you, so you obediently lick and tobgue fuck her asshole as cum continues to trickle into your mouth. "Yeah, that's right $pc.name_nick. Lick my asshole clean!" Albina keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.</p>
 									<<arouse 'rimming_give' 5 >>
 									<<set $time.minutes += 5>>
-									<<gs 'cum_call' 'mouth' $boy>>
+									<<gs 'cum_call' 'mouth' $sex.npcId>>
 									<<arousalEnd>>
 									<<actCLA 'Finish'>>
 										<<image "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg">>
@@ -824,7 +824,7 @@
 									She then sits on your face and starts grinding against you as cum continues to trickle into your mouth. She keeps grinding against you for the next few seconds while she gives Lazar a final blowjob.
 									<<arouse 'cuni_give' 5 >>
 									<<set $time.minutes += 5>>
-									<<gs 'cum_call' 'mouth' $boy>>
+									<<gs 'cum_call' 'mouth' $sex.npcId>>
 									<<arousalEnd>>
 									<<actCLA 'Finish'>>
 										<<image "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg">>

sugarcube/src/activities/school/gschool_detention.tw

@@ -623,7 +623,7 @@
 	<p>You squat down in front of him again and start jerking him off. All things considered, you are surprised and very pleased with how long he's lasted and you are just about to take Feofan's cock into your mouth again to suck him some more when he groans and shoots his load of sperm across your face. You open wide and some of the follow-up spurts end up in your mouth, but some of the jets still manage to hit your face. You take his dick inside and suck him, swallowing the last few small spurts in your mouth and cleaning him up, relishing the taste of his cum.</p>
 	<<arouse 'hj' 5 `['dom']`>>
 	<<arousalEnd>>
-	<<gs 'cum_call' 'mouth' $boy>>
+	<<gs 'cum_call' 'mouth' $sex.npcId>>
 	When his erection starts to deflate, you release him and begin cleaning yourself up, as does he. He even helps you wipe the cum off your face, making sure you don't miss a spot. Once you are both dressed and presentable once more, you want to head back, but after taking one or two steps in that direction, he grabs your arm and kisses you on the lips. "Thanks for not telling and well... everything. I won''t tell anyone about this, I promise. You're a cool chick." He gives you a look of longing, lust and admiration, then nods his head and heads back out. You follow him a couple of minutes later, taking your seat opposite him again and waiting for detention to end. If detention is always like this, maybe you need to get in trouble more often.
 	<p>You spend the rest of the time playing on your phone and occasionally giving the boy a conspiratorial grin, which he returns in kind. Once detention ends and you start to head out, Feofan catches up to you. "Hey $pc.name_nick, do you think maybe sometime you might want to go out or maybe you want to come over to my place and we can study together or something?" He asks with a hopeful look on his face. You stop and actually consider it for a moment. "Let me think about it." He looks a little crestfallen but still hopeful, he nods and heads out. "Ok $pc.name_nick talk to you Monday."</p>
 	<<actCLA 'Go home'>>
@@ -758,7 +758,7 @@
 					<<set $orgasm_or = 'custom'>>
 					<<arouse 'vaginal_finger' 10 >>
 					During your climax, you don't even notice him shooting his load into your ass, filling you with his hot sticky sperm as you cum together.
-					<<gs 'cum_call' 'anus' $boy>>
+					<<gs 'cum_call' 'anus' $sex.npcId>>
 					<<actCLA 'Finish'>>
 						<h2>Detention</h2>
 						<<image "characters/pavlovsk/school/boy/marcus/sex/school/detmcum.jpg">>
@@ -878,7 +878,7 @@
 				As he does, he says: "Now you know your place, whore. I will have you properly trained before long." Then he breaks into a cruel smile. "We will be seeing a lot more of each other in the future. Now get your ass back to detention, where whores like you belong."
 				<<arouse 'hj' 5 >>
 				<<arousalEnd>>
-				<<gs 'cum_call' 'mouth' $boy>>
+				<<gs 'cum_call' 'mouth' $sex.npcId>>
 				<<actCLA 'Back to detention'>>
 					<h2>Detention</h2>
 					<<image "locations/pavlovsk/school/detention/detention.jpg">>

sugarcube/src/activities/school/gschool_events.tw

@@ -2260,13 +2260,13 @@
 				<<warn "CONVERSION ERROR f22c8644f8830bd71cdb6c1d61e44152">>
 				<<actCLA 'Start sucking'>>
 					<<gs 'boyStat' 'A157'>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<gs 'boyStat' 'A9'>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<gs 'boyStat' 'A10'>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<gs 'boyStat' 'A11'>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 					<p>You kneel down and wrap your $pc_desc['lips'] lips around $boydesc's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 					<p>Finally, you feel a jet of sperm hit the back of your throat and $boydesc moans. "That's right bitch! Swallow it all like a good little slut." $boydesc seems satisfied and tucks his cock back in his pants.</p>
@@ -2397,13 +2397,13 @@
 					<</if>>
 					<<actCLA 'Start sucking'>>
 						<!-- Boy A157 -->
-						<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 						<!-- Boy A9 -->
-						<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 						<!-- Boy A10 -->
-						<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 						<!-- Boy A11 -->
-						<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 						<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 						<p>You kneel down and wrap your $pc_desc['lips'] lips around $boydesc's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 						<p>Finally, you feel a jet of sperm hit the back of your throat and $boydesc moans. "That's right bitch! Swallow it all like a good little slut." $boydesc seems satisfied and tucks his cock back in his pants.</p>

sugarcube/src/activities/school/gschool_events1.tw

@@ -457,11 +457,11 @@
 			<</if>>
 			<<actCLA 'Start sucking'>>
 				<!-- Boy A9 -->
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<!-- Boy A10 -->
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<!-- Boy A11 -->
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 				<p>You kneel down and wrap your $pc_desc['lips'] lips around Vitek's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 				<p>You eventually feel a jet of sperm hit your throat and Vitek moans. "That's right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants before swapping places with Vasily at the door, who comes over and pulls his cock out, ready to get his turn.</p>
@@ -633,11 +633,11 @@
 						<</if>>
 						<<actCLA 'Start sucking'>>
 							<!-- Boy A9 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<!-- Boy A10 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<!-- Boy A11 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 							<p>You kneel down and wrap your $pc_desc['lips'] lips around Vitek's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 							<p>You eventually feel a jet of sperm hit your throat and Vitek moans. "That's right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants before swapping places with Vasily at the door, who comes over and pulls his cock out, ready to get his turn.</p>
@@ -731,11 +731,11 @@
 						<</if>>
 						<<actCLA 'Start sucking'>>
 							<!-- Boy A9 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<!-- Boy A10 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<!-- Boy A11 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 							<p>You kneel down and wrap your $pc_desc['lips'] lips around Vitek's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 							<p>You eventually feel a jet of sperm hit your throat and Vitek moans. "That's right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants before swapping places with Vasily at the door, who comes over and pulls his cock out, ready to get his turn.</p>
@@ -790,11 +790,11 @@
 			<</if>>
 			<<actCLA 'Start sucking'>>
 				<!-- Boy A157 -->
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<!-- Boy A189 -->
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<!-- Boy A156 -->
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 				<p>You kneel down and wrap your $pc_desc['lips'] lips around Arkadi's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 				<p>You eventually feel a jet of sperm hit your throat and Arkadi moans. "That's right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants before swapping places with Niko at the door, who comes over and pulls his cock out, ready to get his turn.</p>
@@ -966,11 +966,11 @@
 						<</if>>
 						<<actCLA 'Start sucking'>>
 							<!-- Boy A157 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<!-- Boy A189 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<!-- Boy A156 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 							<p>You kneel down and wrap your $pc_desc['lips'] lips around Arkadi's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 							<p>You eventually feel a jet of sperm hit your throat and Arkadi moans. "That's right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants before swapping places with Niko at the door, who comes over and pulls his cock out, ready to get his turn.</p>
@@ -1064,11 +1064,11 @@
 						<</if>>
 						<<actCLA 'Start sucking'>>
 							<!-- Boy A157 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<!-- Boy A189 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<!-- Boy A156 -->
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 							<p>You kneel down and wrap your $pc_desc['lips'] lips around Arkadi's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 							<p>You eventually feel a jet of sperm hit your throat and Arkadi moans. "That's right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants before swapping places with Niko at the door, who comes over and pulls his cock out, ready to get his turn.</p>
@@ -1103,11 +1103,11 @@
 	<</if>>
 	<<actCLA 'Start sucking'>>
 		<!-- Boy A9 -->
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<!-- Boy A10 -->
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<!-- Boy A11 -->
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 		<p>You know there's only one way they will let you go, so you dutifully kneel down. Vitek takes his cock out of his pants. Dan stands to your right and takes his cock out too. You wrap your $pc_desc['lips'] lips around Vitek's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 		You eventually feel a jet of sperm hit your throat. "Swallow it all, whore. If you miss a drop, you're licking it up off the ground." Vitek says in a menacing voice, so you diligently swallow his sperm, doing your best to lick it all up from his dick and your lips. Vitek seems satisfied and tucks his cock back in his pants before swapping place with Vasily at the door, who comes over and pulls his cock out, ready to get his turn.
@@ -1141,11 +1141,11 @@
 	<</if>>
 	<<actCLA 'Start sucking'>>
 		<!-- Boy A157 -->
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<!-- Boy A189 -->
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<!-- Boy A156 -->
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "locations/pavlovsk/school/building/sex/rand_scoolboy6.mp4">>
 		<p>You know there's only one way they will let you go, so you dutifully kneel down. Arkadi takes his cock out of his pants. Roman stands to your right and takes his cock out too. You wrap your $pc_desc['lips'] lips around Arkadi's hard cock and start to suck. Not forgetting the others, you spend some time alternating between all the cocks, stroking the ones you're not sucking with your hands.</p>
 		You eventually feel a jet of sperm hit your throat and Arkadi seems satisfied as he tucks his cock back in his pants before swapping places with Niko at the door, who comes over and pulls his cock out, ready to get his turn.

sugarcube/src/activities/school/gschool_lunch.tw

@@ -472,9 +472,9 @@
 			Vitek quickly grabs you by your hair, snarling in your your face. "You know why you're here, slut. Now get down and get to work."
 			<<actCLA 'Suck Vitek`s dick'>>
 				<!-- Boy A9 -->
-				<<run $npcs.inc($boy,'sex',1)>>
+				<<run $npcs.inc($sex.npcId,'sex',1)>>
 				<<arouse 'bj' 10 `['sub']`>>
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<arousalEnd>>
 				<<image "shared/sex/blowjob/toiletbj.jpg">>
 				<p>You obediently kneel before him, rubbing your hand over the bulge in Vitek's sweatpants before pulling out his dick. Clasping your $pc_desc['lips'] lips around the head, you run your tongue around it a few times before starting to suck it in a bit deeper. You don't want him to get angry, so you put some effort into it, sometimes licking his balls and taking his cock down your throat without really straining yourself. He mistakes your obedience for enthusiasm, and laughing, he turns to his friends. "Guys just look at this slut going at it! She's loving it!"</p>

sugarcube/src/activities/school/gschool_sex.tw

@@ -383,11 +383,11 @@
 
 				<</if>>
 				<<if $npcs.get('A158','sex') == 0>>
-					<<run $npcs.set('A158','sex',1)>> <<setn $boy += 1>>
+					<<run $npcs.set('A158','sex',1)>> <<setn $sex.npcId += 1>>
 
 				<</if>>
 				<<if $npcs.get('A156','sex') == 0>>
-					<<run $npcs.set('A156','sex',1)>> <<setn $boy += 1>>
+					<<run $npcs.set('A156','sex',1)>> <<setn $sex.npcId += 1>>
 
 				<</if>>
 				<!-- Boy A158 -->
@@ -499,15 +499,15 @@
 		<<actCLA 'He fucks your pussy'>>
 			<<set $pc.mood += 10>>
 			<<set $cumprecheck = 1>>
-			<<gs 'cum_call' '' $boy 1>>
+			<<gs 'cum_call' '' $sex.npcId 1>>
 			<<image "locations/pavlovsk/school/building/sex/boysex_scool3.jpg">>
 			<<set $orgasm_or = 'yes'>>
 			<<set $orgasm_txt = 'Taking you upstairs to a window sill, he tells you to lay down on your back on the ledge. Once you oblige, he spreads your legs and slowly slides his cock into your dripping pussy, fucking you in low, long thrusts. Every thrust puts him in a little deeper and when he bottoms out in you, he starts fucking you in earnest. You've given into your pleasure a long time ago; you are nothing but putty in his hands, letting him fuck you however he wants as long as you get off on it. Before too long you reach your orgasm and grasp your arms tightly around his neck to keep yourself from falling out the window. Your spasming pussy is milking his cock and you can tell he's getting close.'>>
 			<<gs 'dinsex' 'vaginal_sex' 10>>
 			<<actCLA 'Take his load in your mouth'>>
 				<<run $pc.sexStatInc('bj','aware',1)>>
-				<<gs 'cum_call' 'mouth' $boy 1>>
-				<<gs 'cum_call' 'breasts' $boy 1>>
+				<<gs 'cum_call' 'mouth' $sex.npcId 1>>
+				<<gs 'cum_call' 'breasts' $sex.npcId 1>>
 				<<arousalEnd>>
 				<<image "locations/pavlovsk/school/building/sex/boysex_scool7.jpg">>
 				He pulls you up from the window sill and tells you to get down on your knees before him. "Open your mouth," he says and you happily oblige. He shoves his dick inside your mouth and you enthusiastically suck him off, wanting to feel him squirt his load. Unable to withstand your sweet torture any longer, he growls and you feel the squirts of his cum land on your tongue. It was too much for you and some of it dribbles down your chin and onto your chest, despite your best efforts to swallow it all.
@@ -540,7 +540,7 @@
 					<p>Not able to take any more you collapse in orgasm, falling back against him. You moan loudly as he wraps his arms around your chest and keeps pounding your ass until he shoots his load. When he finally pulls out, a slow trail of cum leaks from your well-stretched hole.</p>
 					<p>After he admires his handiwork for a second, he notices the time. "Oh crap! We're going to be late for class!"</p>
 					You both quickly get dressed and run as fast as you can to make it to class on time.
-					<<gs 'cum_call' 'anus' $boy 1>>
+					<<gs 'cum_call' 'anus' $sex.npcId 1>>
 					<<arouse 'anal' 10 >>
 					<<arousalEnd>>
 					<<actCLA 'Continue'>>

sugarcube/src/autogenerated/unsorted/BDsex.tw

@@ -493,7 +493,7 @@
 		<<set $sexcontra = 0>>
 	<<else>>
 		Thick jets of sharply smelling sperm fill your mouth.
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<</if>>
 	<<actCLA 'Brush up'>>
 		<<gt 'BDsex' 'end'>>

sugarcube/src/autogenerated/unsorted/Club2.tw

@@ -28,7 +28,7 @@
 			<p>Suddenly, the reality of the situation comes flooding back into your head - and a warm liquid comes flooding into your mouth.</p>
 			<<arouse 'bj' 5 `['sub']`>>
 			<<actCLA 'Swallow'>>
-				<<gs 'cum_call' 'mouth_swallow' $boy>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 				<<set $finances.cash += 1000>>
 				<<image "locations/city/citycenter/nightclub/sex/glory3.jpg">>
 				You gather a mouthful of sperm, and then swallow it. Their sperm has a sticky and sharp taste which makes you grimace.
@@ -121,10 +121,10 @@
 						<<set $guy += 2>>
 						<<gs 'npcgeneratec' 0 'Gloryhole Client' `rand(18,60)`>>
 						
-						<<gs 'cum_call' 'mouth_swallow' $boy>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 						<<gs 'npcgeneratec' 0 'Gloryhole Client' `rand(18,60)`>>
 						
-						<<gs 'cum_call' 'mouth_swallow' $boy>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 						<<arousalEnd>>
 						<<if getvar("$pornstudio") == 0>>
 							<<actCLA 'Continue'>>

sugarcube/src/autogenerated/unsorted/Cum_Manage.tw

@@ -104,13 +104,13 @@
 	<<run $pc.sexStatInc('cum_count','aware',1)>>
 	<<set $condom_break = 0>>
 	<!-- !!{	Here we define our important variables.} -->
-	<<set $dick = $npcs.get($boy,'dick')>>
+	<<set $dick = $npcs.get($sex.npcId,'dick')>>
 	<<if getvar("$sexvolume") <= 0>>
 		<<set $sexvolume = 40>>
 
 	<</if>>
 	<<if getvar("$sexspecpot") == 0>>
-		<<set $sexspecpot = $npcs.get($boy,'spermpot')>>
+		<<set $sexspecpot = $npcs.get($sex.npcId,'spermpot')>>
 
 	<</if>>
 	<<if getvar("$sexspecpot") == 0>>
@@ -136,7 +136,7 @@
 
 	<</if>>
 	<!-- !!{Check for previous deposit, and if it was by the same guy and precum, it sets cumarrtemp back by one} -->
-	<!-- !!	if $cumarrnam[cumarrtemp-1] = $boy and cumarrkno[cumarrtemp-1] = -1:cumarrtemp -= 1 & sexspecpot = cumarrppt[$cumarrtemp]-->
+	<!-- !!	if $cumarrnam[cumarrtemp-1] = $sex.npcId and cumarrkno[cumarrtemp-1] = -1:cumarrtemp -= 1 & sexspecpot = cumarrppt[$cumarrtemp]-->
 	<<if getvar("$cumprecheck") == 1 and getvar("$cumnostd") == 0>>
 		<<setinit $cumarrkno[$cumarrtemp] = -1>>
 		<<gs 'dinSex' 'std_trigger'>>
@@ -174,7 +174,7 @@
 			!!	If the boy has a custom specified potency 'sexspecpot', it flags the potency. Otherwise it sets it to the default.
 			!!	Default potency potential is generated from a random multiplier of sexvolume.
 			!!	Sexvolume defaults to 40 (4 mL), but may be overwritten with 'sexvolume'.} -->
-			<<setinit $cumarrnam[$cumarrtemp] = $boy>>
+			<<setinit $cumarrnam[$cumarrtemp] = $sex.npcId>>
 			<<setinit $cumarrage[$cumarrtemp] = 0>>
 			<<setinit $cumarrdel[$cumarrtemp] = 0>>
 			<<setinit $cumarrcnt[$cumarrtemp] = $pc.sexStat('cum_count')>>
@@ -243,7 +243,7 @@
 						<<set $sexcontra = 4>>
 						<<setinit $sparrage[$sparrtemp] = 0>>
 						<<setinit $sparrloc[$sparrtemp] = 0>>
-						<<setinit $sparrnam[$sparrtemp] = $boy>>
+						<<setinit $sparrnam[$sparrtemp] = $sex.npcId>>
 						<<setinit $sparrcnt[$sparrtemp] = $pc.sexStat('cum_count')>>
 						<<setinit $sparrppt[$sparrtemp] = $sexspecpot>>
 						<<setinit $sparrvol[$sparrtemp] += $sexvolume>>
@@ -266,7 +266,7 @@
 					<<setinit $cumarrcon[$cumarrtemp] = 4>>
 					<<setinit $sparrage[$sparrtemp] = 0>>
 					<<setinit $sparrloc[$sparrtemp] = 0>>
-					<<setinit $sparrnam[$sparrtemp] = $boy>>
+					<<setinit $sparrnam[$sparrtemp] = $sex.npcId>>
 					<<setinit $sparrcnt[$sparrtemp] = $pc.sexStat('cum_count')>>
 					<<setinit $sparrppt[$sparrtemp] = $sexspecpot>>
 					<<setinit $sparrvol[$sparrtemp] += $sexvolume>>
@@ -283,7 +283,7 @@
 					<<set $cumcondsanb = $cumarrtemp>>
 					<<setinit $sparrage[$sparrtemp] = 0>>
 					<<setinit $sparrloc[$sparrtemp] = 17>>
-					<<setinit $sparrnam[$sparrtemp] = $boy>>
+					<<setinit $sparrnam[$sparrtemp] = $sex.npcId>>
 					<<setinit $sparrcnt[$sparrtemp] = $pc.sexStat('cum_count')>>
 					<<setinit $sparrppt[$sparrtemp] = $sexspecpot>>
 					<<setinit $sparrvol[$sparrtemp] += $sexvolume>>
@@ -315,7 +315,7 @@
 			<<else>>
 				<<setinit $sparrage[$sparrtemp] = 0>>
 				<<setinit $sparrloc[$sparrtemp] = 0>>
-				<<setinit $sparrnam[$sparrtemp] = $boy>>
+				<<setinit $sparrnam[$sparrtemp] = $sex.npcId>>
 				<<setinit $sparrcnt[$sparrtemp] = $pc.sexStat('cum_count')>>
 				<<setinit $sparrppt[$sparrtemp] = $sexspecpot>>
 				<<setinit $sparrvol[$sparrtemp] += $sexvolume>>
@@ -399,7 +399,7 @@
 				<<setn $pc.pcs_energy += 2>> <<setn $pc.pcs_hydra += 1>>
 
 			<</if>>
-			<<setinit $sparrnam[$sparrtemp] = $boy>>
+			<<setinit $sparrnam[$sparrtemp] = $sex.npcId>>
 			<<setinit $sparrppt[$sparrtemp] = $sexspecpot>>
 			<<setinit $sparrvol[$sparrtemp] += $sexvolume>>
 			<<set $cumsumbod += $sexvolume>>
@@ -417,7 +417,7 @@
 		<<set $sexunaware = 0>>
 		<!-- !!{	And this is the pre ejaculate release talked about above.} -->
 	<<elseif getvar("$sexcontra") < 3 and getvar("$spafinloc") == 0>>
-		<<setinit $cumarrnam[$cumarrtemp] = $boy>>
+		<<setinit $cumarrnam[$cumarrtemp] = $sex.npcId>>
 		<<setinit $cumarrcnt[$cumarrtemp] = $pc.sexStat('cum_count')>>
 		<<setinit $cumarrppt[$cumarrtemp] = $sexspecpot>>
 		<<setinit $cumarrage[$cumarrtemp] = 0>>

sugarcube/src/autogenerated/unsorted/FedorEv2.tw

@@ -200,8 +200,8 @@
 					<<image "characters/pavlovsk/school/boy/fedor/fedorev2/movies/hj.jpg">>
 					<<set 'Feeling his warm penis in your hand and seeing his expression just fills you with excitement and a sense of power as you are in full control his pleasure. You continue to jerk him off as you admire the look of pleasure in his face and the slow throbbing of his cock. Soon Fedor's head slams back in his chair and he lets out a muffled groan as his cock starts rapidly throbbing and erupting squirt after squirt of semen on your ' + iif(PCloskirt = 0,'pants','skirt') + ' and hand. Fedor lays back motionlessly for a few seconds then turns to you with a very satisfied look on his face, he leans toward you and kiss you on the cheek as he whispers "Wow $pc.name_nick, You are the best." then leans back in his chair, zipping his pants.'>>
 					<<arouse 'hj' 5 `['dom']`>>
-					<<gs 'cum_call' 'clothes_hidden' $boy 1>>
-					<<gs 'cum_call' 'hands' $boy 1>>
+					<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
+					<<gs 'cum_call' 'hands' $sex.npcId 1>>
 					<<arousalEnd>>
 					<<actCLA 'Finish watching movie'>>
 						<<gt 'FedorEv2' 'Movie 3'>>
@@ -336,7 +336,7 @@
 		<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/orgasm.mp4">>
 		<<arouse 'vaginal' 5 `['sub']`>>
 		<!-- Boy A5 -->
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 		<<actCLA 'Orgasm'>>
 			<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/vagcum.mp4">>
 			<p>After a few minutes you feel Fedor starting to breathe rapidly and then his breathing stops. He then quickly pulls out of you and groans as he cums all over your stomach. Squirt after squirt, Fedor drains his penis over your stomach. He takes a second to catch his breath, then tells you "you were amazing $pc.name_first", as he wipes the sweat off his forehead. You take a few seconds to catch your breath before you respond, "you were great as well... thank you."</p>
@@ -382,7 +382,7 @@
 						<<arouse 'kiss' 5 `['sub']`>>
 						<<arousalEnd>>
 						<!-- Boy A5 -->
-						<<gs 'cum_call' 'stomach' $boy 1>>
+						<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 						<<actCLA 'Take a shower'>>
 							<<gt 'FedorEv2' 'Wash Up'>>
 						<</actCLA>>
@@ -418,7 +418,7 @@
 				<<arouse 'anal' 5 `['sub']`>>
 				<<arousalEnd>>
 				<!-- Boy A5 -->
-				<<gs 'cum_call' 'anus' $boy 1>>
+				<<gs 'cum_call' 'anus' $sex.npcId 1>>
 				<<actCLA 'Clean up'>>
 					<<gt 'FedorEv2' 'Wash Up'>>
 				<</actCLA>>
@@ -730,7 +730,7 @@
 						<<arouse 'bj' 5 `['dom']`>>
 						<<arousalEnd>>
 						<!-- Boy A5 -->
-						<<gs 'cum_call' 'mouth' $boy 1>>
+						<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 						<<actCLA 'Take me home'>>
 							<<gt 'FedorEv2' 'Park End'>>
 						<</actCLA>>

sugarcube/src/autogenerated/unsorted/FedorEv3.tw

@@ -129,8 +129,8 @@
 	and lets out a muffled groan as his cock starts to rapidly throb in your hand spraying cum all over your legs and leaking on your hand.
 	<p>Fedor leans over to you and whispers in your ear "You know just how to satisfy me. Thanks $pc.name_nick" as he kisses your cheek and then your lips.</p>
 	<!-- Boy A5 -->
-	<<gs 'cum_call' 'clothes_hidden' $boy 1>>
-	<<gs 'cum_call' 'hands' $boy 1>>
+	<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
+	<<gs 'cum_call' 'hands' $sex.npcId 1>>
 	<<arouse 'kiss' 5 >>
 	<<arouse 'hj' 5 `['sub']`>>
 	<<arousalEnd>>
@@ -180,7 +180,7 @@
 				Fedor combs his fingers through your hair as you continue pleasing him. After a few minutes Fedor lets out a muffled groan then shoots his load into your mouth
 				which you happily swallow before returning to watching the movie like nothing happened.
 				<!-- Boy A5 -->
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<arouse 'bj' 5 >>
 				<<arousalEnd>>
 				<<actCLA 'Finish and continue watching the movie'>>
@@ -264,7 +264,7 @@
 	<<image "locations/city/citycenter/mall/cinema/sex/kinosex8.jpg">>
 	<p>You spread your legs and feel Fedor enter you, causing you to moan lightly and Fedor start to thrust faster. You completely forget where you are as you enjoy Fedor roughly fucking your pussy until he lets out a muffled groan as he pulls out of you and paints your stomach with his seed. After a few seconds he pulls up his pants as you put on yours. "You are a great fuck $pc.name_first. I knew I picked the right girl when I chose you." he then kisses your lips.</p>
 	<!-- Boy A5 -->
-	<<gs 'cum_call' 'stomach' $boy 1>>
+	<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<<arouse 'kiss' 5 >>
 	<<arouse 'vaginal' 5 `['sub','exhibitionism']`>>
 	<<arousalEnd>>
@@ -277,7 +277,7 @@
 	<<image "locations/city/citycenter/mall/cinema/sex/kinosex9.jpg">>
 	<p>You spread your legs and feel Fedor enter you, causing you to moan lightly and Fedor start to thrust faster. You completely forget where you are as you enjoy Fedor roughly fucking your pussy until he lets out a muffled groan as he pulls out of you and paints your stomach with his seed. You open your eyes to see a flashlight shined on you, then Fedor exclaims. "Oh shit!" as many people in the theater are staring at both of you. You quickly put on your pants while trying to cover yourself as much as possible then you and Fedor quickly walk out of the theater.</p>
 	<!-- Boy A5 -->
-	<<gs 'cum_call' 'stomach' $boy 1>>
+	<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<<arouse 'vaginal' 5 `['sub','exhibitionism']`>>
 	<<arousalEnd>>
 	<<actCLA 'Leave the theater'>>
@@ -299,7 +299,7 @@
 		<p>filling you with his seed. After a few seconds he pulls up his pants as you put on yours. He looks you in the eyes. "$pc.name_nick You are so precious to me." he then kisses you softly as you both get seated looking around to see if anyone noticed.</p>
 		<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4">>
 		<!-- Boy A5 -->
-		<<gs 'cum_call' '' $boy 1>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
 		<<arouse 'kiss' 5 >>
 		<<arouse 'vaginal' 5 `['sub','exhibitionism']`>>
 		<<arousalEnd>>
@@ -491,7 +491,7 @@
 					<p>leaking down your face as Fedor puts his pants back on then says, "Your pussy is so tight $pc.name_first, I feel like I could fuck you for days but I should get you back</p>
 					home before it gets too late." Fedor then helps you back to your feet and gets you dressed up before walking to the sink to get cleaned up.
 					<<image "characters/pavlovsk/school/boy/fedor/fedorev2/movies/Restroom/Men/Fedor/fedrestcum.jpg">>
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<arouse 'kiss' 5 >>
 					<<arouse 'vaginal' 5 `['sub']`>>
 					<<arousalEnd>>
@@ -505,7 +505,7 @@
 					<p>the back of his head and bring his lips to yours, sharing a deep passionate kiss together and Fedor whispers in your ear "$pc.name_first you're as amazing as ever."</p>
 					he then puts his pants back on and helps you get dressed before leading you to the sink to get cleaned up.
 					<<video "locations/city/residential/sauna/sex/cumbelly4.mp4">>
-					<<gs 'cum_call' 'stomach' $boy 1>>
+					<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 					<<arouse 'kiss' 5 >>
 					<<arouse 'vaginal' 5 `['sub']`>>
 					<<arousalEnd>>
@@ -520,7 +520,7 @@
 						<p>Fedor catches his breath then looks down to you. "I'm so lucky to have you $pc.name_first, I hope we remain together forever." You can feel your cheeks growing</p>
 						red as you reply, "Fedor you are so sweet, There is no one I care about more than you." as you both share a kiss before getting dressed.
 						<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4">>
-						<<gs 'cum_call' '' $boy 1>>
+						<<gs 'cum_call' '' $sex.npcId 1>>
 						<<arouse 'kiss' 5 >>
 						<<arouse 'vaginal' 5 `['sub']`>>
 						<<arousalEnd>>
@@ -553,7 +553,7 @@
 						<p>slowly leaking down your face as Fedor puts his pants back on then remarks "Your pussy is so tight $pc.name_first, I feel like I could fuck you for days but I should</p>
 						get you back home before it gets too late." Fedor then helps you back to your feet and gets you cleaned up before walking you out of the restroom.
 						<<image "characters/pavlovsk/school/boy/fedor/fedorev2/movies/Restroom/Men/Fedor/fedrestcum.jpg">>
-						<<gs 'cum_call' 'face' $boy 1>>
+						<<gs 'cum_call' 'face' $sex.npcId 1>>
 						<<arouse 'kiss' 5 >>
 						<<arouse 'vaginal' 5 `['sub']`>>
 						<<arousalEnd>>
@@ -567,7 +567,7 @@
 						You then spin around and grab him by the back of his head, bringing his lips to yours, sharing a deep passionate kiss together. Fedor whispers
 						<p>in your ear "$pc.name_first you're as amazing as ever." he then puts his pants back on and helps you get cleaned before you both exit the restroom together.</p>
 						<<video "shared/sex/cum/cum5.mp4">>
-						<<gs 'cum_call' 'stomach' $boy 1>>
+						<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 						<<arouse 'kiss' 5 >>
 						<<arouse 'vaginal' 5 `['sub']`>>
 						<<arousalEnd>>
@@ -583,7 +583,7 @@
 							remain together forever." You can feel your cheeks growing red as you reply, "Fedor you are so sweet, I can't picture myself with anyone other
 							than you." as you both share a kiss before getting dressed.
 							<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum10.mp4">>
-							<<gs 'cum_call' '' $boy 1>>
+							<<gs 'cum_call' '' $sex.npcId 1>>
 							<<arouse 'kiss' 5 >>
 							<<arouse 'vaginal' 5 `['sub']`>>
 							<<arousalEnd>>

sugarcube/src/autogenerated/unsorted/FedorEv4.tw

@@ -55,8 +55,8 @@
 								<p>You continue picking up the pace while staring into Fedor's eyes, feeling both the rush of pleasure and the thrill of dominance, Knowing that Fedor's pleasure is completely in your hands. Thrusting faster and faster until you hear Fedor say, "I can't hold on much longer. I'm gonna cum." You give him 3 more thrust then pull Fedor's dick out of you and begin rubbing it with your hands as he cums on your feet. You do your best to milk him dry while staring into his eyes as he cums for you. Fedor takes a few seconds to catch his breath. "Damn $pc.name_first, I love it when you take control."</p>
 								<p>You respond, "What can I say? I know what my man needs." Fedor begins dressed as he replies, "You certainly do... So are you still up for a good movie?" You reply, "Sure but I need to wash up first."</p>
 								<<arouse 'vaginal' 5 `['dom']`>>
-								<<gs 'cum_call' 'hands' $boy 1>>
-								<<gs 'cum_call' 'legs' $boy 1>>
+								<<gs 'cum_call' 'hands' $sex.npcId 1>>
+								<<gs 'cum_call' 'legs' $sex.npcId 1>>
 								<<actCLA 'Go wash up'>>
 									<<arousalEnd>> <<gt 'FedorEv4' 'Bathroom Wash'>>
 								<</actCLA>>
@@ -66,7 +66,7 @@
 									<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum3.mp4">>
 									<p>You continue picking up the pace while staring into Fedor's eyes, feeling both the rush of pleasure and the thrill of dominance, Knowing that Fedor's pleasure is completely in your hands. Thrusting faster and faster until you hear Fedor say, "I can't hold on much longer. I'm gonna cum." You start thrusting rapidly, ready to take his load inside you and after the fourth thrust Fedor groans and you can feel his cum filling you with its warmth. You continue riding him, doing your best to milk his dick dry, feeling him filling your womb almost completely. Fedor take a few seconds to catch his breath. "$pc.name_first you're so damn good at that."</p>
 									<p>You respond, "I will always do my best to please you Fyodor." Fedor gives you a warm smile then begins getting dressed as he replies, "That's my girl. Shall we go and watch a movie together?" You reply, "Sure but I need to wash up first.</p>
-									<<gs 'cum_call' '' $boy 1>>
+									<<gs 'cum_call' '' $sex.npcId 1>>
 									<<arouse 'vaginal' 5 `['dom']`>>
 									<<arousalEnd>>
 									<<actCLA 'Clean up'>>

sugarcube/src/autogenerated/unsorted/FedorEv4_sex.tw

@@ -24,7 +24,7 @@
 					<<video "shared/sex/cum/mouth/yum.mp4">>
 					Fedor then pulls out of you and begins jerking himself while you turn around and take his penis into your mouth. You start sucking and licking until you feel a jet of sperm fill your mouth and instead of swallowing, you look up to Fedor with an open mouth then stare into his eyes as you swallow his cum.
 					<<arouse 'bj' 10 `['sub']`>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<arousalEnd>>
 					<p>Fedor looks at you with a very pleased expression. "You know just what I like." then rubs your forehead, before getting dressed. When you are both dressed Fedor asks "So $pc.name_first, are you still up for that movie?</p>
 					<<actCLA 'Sure thing'>>
@@ -35,7 +35,7 @@
 					<<set $time.minutes += 5>>
 					<<video "shared/sex/cum/chest/cumbreats.mp4">>
 					Fedor then pulls out of you and begins jerking himself while you turn around and kneel down in front of him, firmly massaging your breast as you watch him jerking off. You close your eyes in anticipation of his cum covering your face. After a few seconds you feel squirts of cum over your face. The warmth of if causes you to feel very at ease before you carefully open your eyes to see Fedor admiring the veiw with a very pleased smile on his face. Fedor says, "That's a good look for you." You respond, "If I really look that good then why don't you come over here and give me a kiss." You then lead forward bringing your face to his as he pulls away. "Uhhh, Maybe after you wash up first." You both laugh as Fedor guides you to the bathroom to clean up.
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<arousalEnd>>
 					<<actCLA 'Clean up'>>
 						<<gt 'FedorEv4' 'Bathroom Wash'>>
@@ -45,7 +45,7 @@
 					<<actCLA 'Inside me'>>
 						<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum10.mp4">>
 						<p>Fedor nods his head as he continues thrusting faster. You lay against the wall enjoying his thrusts as you soon feel a burst of warmth fill your womb. Fedor holds you tightly as he fills you with his seed. You do your best to milk him dry as you feel his cum slowly leaking out of your pussy and after a few seconds Fedor catches his breath then says, "Ohh $pc.name_nick You're an absolute gem." The affectionate tone of his voice fills your heart with a sudden warmth. "Oh Fedor, you're so sweet." You and Fedor both get dressed and then Fedor leads you to the bathroom to get washed up.</p>
-						<<gs 'cum_call' '' $boy 1>>
+						<<gs 'cum_call' '' $sex.npcId 1>>
 						<<arouse 'vaginal' 5 `['sub']`>>
 						<<arousalEnd>>
 						<<actCLA 'Wash up'>>
@@ -129,10 +129,10 @@
 				<<video "shared/sex/cum/stomach/cumbelly2.mp4">>
 				<!-- Boy A5 -->
 				<<arouse 'vaginal' 5 `['sub']`>>
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<!-- Boy A3 -->
 				<<arouse 'bj' 5 `['dom']`>>
-				<<gs 'cum_call' 'stomach' $boy 1>>
+				<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 				<<arousalEnd>>
 				<<actCLA 'Wash up'>>
 					<<gt 'FedorEv4' 'Bathroom Wash'>>
@@ -149,9 +149,9 @@
 					<<arouse 'vaginal' 5 `['sub']`>>
 					<<arouse 'bj' 5 `['dom']`>>
 					<!-- Boy A3 -->
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<!-- Boy A5 -->
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arousalEnd>>
 					<<actCLA 'Wash up'>>
 						<<gt 'FedorEv4' 'Bathroom Wash'>>
@@ -165,10 +165,10 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4">>
 					<!-- Boy A3 -->
 					<<arouse 'bj' 5 `['dom']`>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<!-- Boy A5 -->
 					<<arouse 'vaginal' 5 `['sub']`>>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arousalEnd>>
 					<<actCLA 'Wash up'>>
 						<<gt 'FedorEv4' 'Bathroom Wash'>>
@@ -211,12 +211,12 @@
 				<<video "shared/sex/cum/cum3.mp4">>
 				<!-- Boy A3 -->
 				<<arouse 'anal' 5 `['sub']`>>
-				<<gs 'cum_call' 'butt' $boy 1>>
-				<<gs 'cum_call' 'back' $boy 1>>
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'butt' $sex.npcId 1>>
+				<<gs 'cum_call' 'back' $sex.npcId 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<!-- Boy A5 -->
 				<<arouse 'bj' 5 `['sub']`>>
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<arousalEnd>>
 				<<actCLA 'Wash up'>>
 					<<gt 'FedorEv4' 'Bathroom Wash'>>
@@ -229,10 +229,10 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum1.mp4">>
 				<!-- Boy A3 -->
 				<<arouse 'anal' 5 `['sub']`>>
-				<<gs 'cum_call' 'anus' $boy 1>>
+				<<gs 'cum_call' 'anus' $sex.npcId 1>>
 				<!-- Boy A5 -->
 				<<arouse 'bj' 5 `['sub']`>>
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<arousalEnd>>
 				<<actCLA 'Wash up'>>
 					<<gt 'FedorEv4' 'Bathroom Wash'>>
@@ -285,10 +285,10 @@
 						<p>After they are done, they both watch you dripping with their cum as Ivan says, "Damn $pc.name_first you have got to be the naughtiest little minx I ever met." You tilt your head while sharing a playful smile as Ivan gets dressed and waves goodbye then walks out of the house. Fedor gives you a light pat on the butt "I hope you enjoyed yourself. I know I did." you lean forward and give him a kiss on the cheek. Fedor then lifts you up and carries you to the bathroom to get washed up.</p>
 						<<video "shared/sex/cum/facial/cumface2.mp4">>
 						<<arouse 'anal' 5 `['sub']`>>
-						<<gs 'cum_call' 'hair' $boy 1>>
-						<<gs 'cum_call' 'face' $boy 1>>
+						<<gs 'cum_call' 'hair' $sex.npcId 1>>
+						<<gs 'cum_call' 'face' $sex.npcId 1>>
 						<!-- Boy A5 -->
-						<<gs 'cum_call' 'face' $boy 1>>
+						<<gs 'cum_call' 'face' $sex.npcId 1>>
 						<<arouse 'vaginal' 5 `['sub']`>>
 						<<arousalEnd>>
 						<<actCLA 'Wash up'>>
@@ -302,10 +302,10 @@
 							<p>"I want both of you to fill me up at the same time. Think you can do that?" Fedor nods and Ivan has a puzzled look on his face as he says, "Uhh sure, I'm down." as he picks up the pace. You lay in between Ivan and Fedor completely in a trance of pleasure, waiting for them to finish and soon enough you hear them groan as you feel a warm rush filling both your anus and womb simultaneously, causing all of you to let out a perfectly in sync moan as they pump their seed into both of your holes. While you are catching your breath Ivan pulls out from under you and asks "$pc.name_first I trust that you are on the pill... right?"</p>
 							<p>You lower your head and turn away as you hesitantly reply, "Well... Not exactly..." Ivan shoots Fedor a shocked look. "Fedor you are intentionally getting $pc.name_first pregnant?!" Fedor scratches the back of his neck as he responds, "Yeah we've both decided to take our relationship to the next level." Ivan says, "I hope you both know what you are doing. I trust that you will both find a way to make it work." as he gets dressed and leaves the house. Fedor slowly turns to you "I know things will work out great for us." you respond, "Of course it will. Nothing can tear us apart." Fedor gives you a kiss on your forehead before lifting you up and carrying you to the bathroom to get cleaned up.</p>
 							<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum8.mp4">>
-							<<gs 'cum_call' 'anus' $boy 1>>
+							<<gs 'cum_call' 'anus' $sex.npcId 1>>
 							<<arouse 'anal' 5 `['sub']`>>
 							<!-- Boy A5 -->
-							<<gs 'cum_call' '' $boy 1>>
+							<<gs 'cum_call' '' $sex.npcId 1>>
 							<<arouse 'vaginal' 5 `['sub']`>>
 							<<arousalEnd>>
 							<<actCLA 'Wash up'>>
@@ -318,10 +318,10 @@
 							<p>"I want both of you to fill me up at the same time. Think you can do that?" Fedor and Ivan nod as Ivan says, "Damn right, I can do that. You ready Fedor?" Fedor responds, "Hell yeah, it should be easy enough." as he picks up the pace. You lay in between Ivan and Fedor completely in a trace of pleasure, waiting for them to finish and soon enough you hear them groan as you feel a warm rush filling both your anus and womb simultaneously causing all of you to let out a perfectly in sync moan as they pump their seed into both of your holes. While you are catching your breath Ivan pulls out from under you. "$pc.name_first You fuck like a bunny. I love it and can't wait till next time."</p>
 							<p>Fedor turns to him. "Only when I'm involved. I don't want you getting any ideas Ivan." Ivan laughs as he responds, "Worried that I'm going to take your girl? You have nothing to worry about Fey. I would never steal my friend's girl." as he gets dressed and leaves the house. Fedor chuckles then turns to you "You know I was just kidding with Ivan right? I trust you completely." You respond, "Of course. I know that we will be together forever." Fedor gives you a passionate kiss before lifting you up then carrying you to the bathroom to get washed up.</p>
 							<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum8.mp4">>
-							<<gs 'cum_call' 'anus' $boy 1>>
+							<<gs 'cum_call' 'anus' $sex.npcId 1>>
 							<<arouse 'anal' 5 `['sub']`>>
 							<!-- Boy A5 -->
-							<<gs 'cum_call' '' $boy 1>>
+							<<gs 'cum_call' '' $sex.npcId 1>>
 							<<arouse 'vaginal' 5 `['sub']`>>
 							<<arousalEnd>>
 							<<actCLA 'Wash up'>>
@@ -356,7 +356,7 @@
 				<<video "shared/sex/handjob/handjob2.mp4">>
 				<p>You give Fedor a kiss and slowly climb off him then drop to your knees as you begin jerking him off. You stroke Fedor's penis faster while staring into his eyes waiting for him to finish then his eyes begin squinting as he groans and releases his load which leaks down your hands. You enjoy watching as his penis squirts cum into the air and leaking down your hands. Fedor takes a few seconds to catch his breath then looks down at you "$pc.name_first your hands are so soft." as he gets dressed and walks out of the room to get cleaned up.</p>
 				<<video "shared/sex/cum/handjob/hand0,0.mp4">>
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<arouse 'hj' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -368,7 +368,7 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj1.mp4">>
 				<p>You give Fedor a kiss and slowly climb off him then drop to your knees as you wrap your lips around his dick and begin sucking it rapidly until you hear Fedor groan. You feel a warmth filling your mouth and you do your best to swallow every drop of Fedor's precious nectar, knowing how much he enjoys it when you swallow his cum. After you finish, Fedor strokes your cheek. "$pc.name_first you always know just what I need." He then kisses your forehead before getting dressed then leaving the room.</p>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj3.mp4">>
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<arouse 'bj' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -381,7 +381,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum3.mp4">>
 					<p>You continue thrusting faster, riding Fedor's cock as fast as you can as you stare into his eyes. Fedor's head tilts back and he lets out a loud groan as he begins filling you with his seed. You push down on his dick making sure that he is as far inside you as possible. After Fedor finishes filling you up he looks you in the eyes "$pc.name_first you're so perfect. I can't think of anyone who could make me happier than you." Which you respond, "I'll always be here to keep you happy and fully satisfied, my love." Fedor leans forward and gives you a passionate kiss before getting dressed and leaving the room.</p>
 					<<video "shared/sex/cum/vagcreampie/cumvaginal.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'vaginal' 5 `['dom']`>>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -412,7 +412,7 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/sofa6.mp4">>
 				<p>"Pull out and cover me with your cum." Fedor begins picking up his pace, clearly trying to finish as quickly as possible and after a few seconds he pulls out of you and begins spraying his cum all over your chest and stomach as you grab onto his dick doing your best to milk him dry while feeling the squirt of warm cum covering you body. You continue milking him until he's finished and then rub all the cum off his dick while rubbing it all over your chest, enjoying the warmth. Once you're done, Fedor admires your body, covered in his cum. "You really seem to love my cum. Don't you $pc.name_nick?" you respond, "Of course I do, your cum is just the moisturizer I need to keep my skin nice and... moist for you." You and Fedor begin laughing as he picks you up and carries you to the bathroom to clean up.</p>
 				<<video "shared/sex/cum/cum110.mp4">>
-				<<gs 'cum_call' 'stomach' $boy 1>>
+				<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 				<<arouse 'vaginal' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -424,7 +424,7 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/sofa6.mp4">>
 				<p>Fedor grins as he pulls out of you and climbs over you while jerking his penis in front of your face. You stare at Fedor's penis while licking your lips and soon you see it begin to erupt and spray cum all over you face. You close your eyes while enjoying the warmth of his seed on your face, giving Fedor a pleased smile as he continues pumping your face with his cum. When Fedor finishes he looks down to you "You really seem to enjoy cum on your face. Don't you $pc.name_first?" Which you respond, "Only yours babe." Fedor flashes a bright smile as he replies, "That's my girl" Fedor then gets dressed and walks out of the room.</p>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum9.mp4">>
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<arouse 'vaginal' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -437,7 +437,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/sofa6.mp4">>
 					<p>Fedor hears you and continues to increase the pace of his thrust until you feel him tightly grip your hips as begins filling your womb with his seed. You wrap your legs around Fedor's hips, pushing him deeper inside you as the warmth of his seed fills your womb. Fedor looks down at you then gives you a light kiss on the lips before saying "$pc.name_first you are so precious to me. You realize that, don't you?" You return the kiss and respond, "And you are everything to me. I love you Fyodor." Fedor leans forward and gives you a long passionate kiss before climbing off of you and getting dressed.</p>
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'vaginal' 5 `['dom']`>>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -469,7 +469,7 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball3.mp4">>
 				<p></p>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball3.mp4">>
-				<<gs 'cum_call' 'anus' $boy 1>>
+				<<gs 'cum_call' 'anus' $sex.npcId 1>>
 				<<arouse 'anal' 10 >>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -482,7 +482,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball3.mp4">>
 					<p></p>
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball3.mp4">>
-					<<gs 'cum_call' 'anus' $boy 1>>
+					<<gs 'cum_call' 'anus' $sex.npcId 1>>
 					<<arouse 'anal' 10 >>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -504,7 +504,7 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball5.mp4">>
 				<p></p>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball3.mp4">>
-				<<gs 'cum_call' '' $boy 1>>
+				<<gs 'cum_call' '' $sex.npcId 1>>
 				<<arouse 'vaginal' 10 >>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -517,7 +517,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball5.mp4">>
 					<p></p>
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball3.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'vaginal' 10 >>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -599,8 +599,8 @@
 						<<set $time.minutes += 5>>
 						<<video "shared/sex/cum/facial/cumface1.mp4">>
 						You pull Fedor''s dick out of your mouth and begin licking the tip until he groans. You pull away from his dick and open your mouth as he covers your face with his seed, leaving your face feeling warm and sticky as his cum begins dripping down your face and onto your chest. You look up to see Fedor with a very satisfied look on his face while still keeping the camera trained on you causing you to feel flushed as you just remember that he was recording you the whole time. Fedor pats your head as he said "What a great performance. You were great." while closing the camera and walking out of the bathroom.
-						<<gs 'cum_call' 'face' $boy 1>>
-						<<gs 'cum_call' 'breasts' $boy 1>>
+						<<gs 'cum_call' 'face' $sex.npcId 1>>
+						<<gs 'cum_call' 'breasts' $sex.npcId 1>>
 						<<arouse 'bj' 5 `['dom']`>>
 						<<arousalEnd>>
 						<<actCLA 'Get dressed'>>
@@ -612,7 +612,7 @@
 						<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/cum1.jpg">>
 						<p>You continue sucking on Fedor's dick faster as you hear him groan and fill your mouth with his seed which begins dripping down you lip. You slowly look up to see Fedor with a very pleased smile as he keeps the camera trained on you, causing you to feel flushed as you just remember that he was recording you the whole time. Fedor pats your head as he said "You always give the best blowjobs $pc.name_nick." while closing the camera and walking out of the bathroom.</p>
 						<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/cum2.jpg">>
-						<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 						<<arouse 'bj' 5 `['dom']`>>
 						<<arousalEnd>>
 						<<actCLA 'Get dressed'>>
@@ -633,8 +633,8 @@
 						<<set $time.minutes += 5>>
 						<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/fj3.mp4">>
 						You stroke his cock faster as he pushes toward you while holding onto your hips then groans as he shoot his load on your face and chest. Fedor''s cum, almost hits you in the eye causing you to quickly turn away. After Fedor is fully spent he looks down at you with a playful smile "I've seen some girls on the field, who were good with their feet but not the same way you are." You giggle as you place your feet on his chest and give him a playful push. Fedor leans forward and lifts one of you feet up to his face, then gives it a kiss before getting dressed and leaving the bathroom.
-						<<gs 'cum_call' 'face' $boy 1>>
-						<<gs 'cum_call' 'breasts' $boy 1>>
+						<<gs 'cum_call' 'face' $sex.npcId 1>>
+						<<gs 'cum_call' 'breasts' $sex.npcId 1>>
 						<<arouse 'footjob' 5 `['dom']`>>
 						<<arousalEnd>>
 						<<actCLA 'Get dressed'>>
@@ -657,8 +657,8 @@
 						<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/Cam/camanal1.jpg">>
 						Fedor nods and then increases his pace, ramming his pelvis into your ass causing the sound of your bodies slapping together to fill the room until Fedor lets out a groans as he pulls out fo you and begins painting your back with his cum. After Fedor finishes he gives your ass a nice firm smack as he gets up and picks up his camera. Fedor begins wiping a drop of cum off the lens as he turns to you "I'm sure this will look great on that porn site." as he flashes you a playful grin. You point your finger at him with a smile on your face "Don't you dare." and you both laugh as Fedor gets dressed and leaves the bathroom.
 						<<video "shared/sex/cum/cum5.mp4">>
-						<<gs 'cum_call' 'back' $boy 1>>
-						<<gs 'cum_call' 'butt' $boy 1>>
+						<<gs 'cum_call' 'back' $sex.npcId 1>>
+						<<gs 'cum_call' 'butt' $sex.npcId 1>>
 						<<arouse 'anal' 5 >>
 						<<arousalEnd>>
 						<<actCLA 'Get dressed'>>
@@ -670,7 +670,7 @@
 						<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/Cam/camanal1.jpg">>
 						<p>You turn to face Fedor as you say, "I want you to fill my as with your cum." Fedor flashes a wide smile as he replies, "As you wish milady." and begins increasing his pace while giving your ass an occasional smack. After a few seconds Fedor grips your hips firmly and begins filling your ass with his seed as you thrust your hips against his, doing your best to milk him dry. Fedor takes a few seconds to catch his breath as he pulls out of you causing a jet of sperm to pour out of your ass, causing a loud moan to escape your mouth. Fedor picks up the camera and says to himself, "Maybe I should have placed the camera on the other side... oh well, I'm sure it will come out great anyway." he then looks to you "Good job $pc.name_nick you were great." as he gets dressed and leaves the bathroom.</p>
 						<<video "shared/sex/cum/analcreampie/cumanal2.mp4">>
-						<<gs 'cum_call' 'anus' $boy 1>>
+						<<gs 'cum_call' 'anus' $sex.npcId 1>>
 						<<arouse 'anal' 5 `['dom']`>>
 						<<arousalEnd>>
 						<<actCLA 'Get dressed'>>
@@ -691,7 +691,7 @@
 						<<set $time.minutes += 5>>
 						<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum2.mp4">>
 						<p>You turn to Fedor and look into his eyes "I want you to paint my ass cheeks white." He nods with a smile on his face as he groans and paints your ass with his cum. You can feel the trickles of cum covering your ass then slowly leaking down to the floor. Fedor gets up then picks up his camera. Fedor starts watching the video for a few seconds then turns to you "The video came out great. Excellent job $pc.name_nick." you happily nod at Fedor as he gets dressed and leaves the room.</p>
-						<<gs 'cum_call' 'butt' $boy 1>>
+						<<gs 'cum_call' 'butt' $sex.npcId 1>>
 						<<arouse 'vaginal' 5 >>
 						<<arousalEnd>>
 						<<actCLA 'Get dressed'>>
@@ -703,7 +703,7 @@
 							<<set $IvanPregChat = 1>>
 							<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum4.mp4">>
 							<p>You turn around and look Fedor in the eyes as you say, "Fill me with your seed." Fedor gives you a pleased smile as he nods and increases the pace of his thrusts. Soon you hear Fedor groan then feel his seed filling your womb with its warmth. You thrust your hips into Fedors pelvis, trying your best to get his seed as deep inside you as possible. After Fedor catches his breath he pulls out of you, causing a jet of sperm to erupt from your vagina and leak onto the floor. Fedor picks up his camera then watches the video for a few seconds before turning to you "The video came out great. Thank you $pc.name_first." you give Fedor a wide smile as he gets dressed and leaves the room.</p>
-							<<gs 'cum_call' '' $boy 1>>
+							<<gs 'cum_call' '' $sex.npcId 1>>
 							<<arouse 'vaginal' 5 >>
 							<<arousalEnd>>
 							<<actCLA 'Get dressed'>>
@@ -740,7 +740,7 @@
 				<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/sex3.jpg">>
 				<p>Fedor nods as he thrusts inside you a few more times then pulls out, covering your chest with his cum as you reach out and start jerking his dick, milking him as best you can while moaning as you feel his warm seed covering your chest. After Fedor finishes spraying you with his load, he looks down at you and says, "You're really good at milking. Were you raised on a farm or something?" You give him a smirk as you reply, "No, I've never milked cows, only men." He breaks out in laughter and then responds, "Not too many men I hope." You turn away from Fedor as you say, "Well a girl doesn't kiss and tell." he smirks and gives you a playful stare before getting dressed and walking out of the bathroom.</p>
 				<<video "shared/sex/cum/cum2.mp4">>
-				<<gs 'cum_call' 'breasts' $boy 1>>
+				<<gs 'cum_call' 'breasts' $sex.npcId 1>>
 				<<arouse 'vaginal' 5 >>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -754,7 +754,7 @@
 					<p>Fedor reaches for your chest and begins lightly squeezing and rubbing your breasts as he increases his pace. Fedor suddenly grips your waist with both hands and groans as he begins filling your womb with his seed. The warmth of his seed spraying inside you, fills you with a burst of excitement as you thrust your hips milking every last drop out of Fedor's dick. Fedor takes a moment to catch his breath then looks down at you. "$pc.name_first you're the most incredible girl I've even met."</p>
 					You respond, "I just know what you like babe and I give it." Fedor gives you a grateful smile as he pulls out of you causing his cum to leak out of you and on the ground. Fedor leans forward and gives you a gentle kiss before getting dressed and leaving the room.
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'vaginal' 5 >>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -785,7 +785,7 @@
 				<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/sex6.jpg">>
 				VKwip
 				<<video "shared/sex/cum/cum3.mp4">>
-				<<gs 'cum_call' 'back' $boy 1>>
+				<<gs 'cum_call' 'back' $sex.npcId 1>>
 				<<arouse 'vaginal' 5 >>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -798,7 +798,7 @@
 					<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/sex6.jpg">>
 					VKwip
 					<<video "shared/sex/cum/cum81.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'vaginal' 5 >>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -838,7 +838,7 @@
 				-->
 				<<warn "CONVERSION ERROR 6de3c9ee64ebd92deb548c6138b91055">>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum2.mp4">>
-				<<gs 'cum_call' 'butt' $boy 1>>
+				<<gs 'cum_call' 'butt' $sex.npcId 1>>
 				<<arouse 'vaginal' 5 >>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -851,7 +851,7 @@
 					<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/sex/kitchen2.jpg">>
 					Fedor increases his pace as he gives your ass a quick smack. Fedor groans and you feel his warm seed filling your womb. You press your hips against Fedor''s as he finishes pumping you with his seed, Fedor then pulls out of you, causing the cum inside your vagina to leak out which mildly tickles you as it slides down your leg. Fedor then says, "I really lucked out when I met you." you turn to Fedor and respond, "We're both lucky." Fedor give you a wink as he gets dressed then leaves the kitchen.
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum4.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'vaginal' 5 >>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -882,7 +882,7 @@
 				<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/sex/kitchen5.jpg">>
 				Fedor nods and then gives you a few more thrusts as you spread your legs in anticipation. Fedor quickly pulls out of you then groans and begins painting your chest with his cum as you reach out for his penis with both hands, milking him. You feel the warmth of his cum gradually covering your chest as you continue milking him as best you can. After Fedor is spent, he looks down at you, "I love seeing you covered in my cum. You look so sexy." You give Fedor a mischievous smile as he pulls away from you and gets dressed before walking out of the kitchen.
 				<<video "shared/sex/cum/cum110.mp4">>
-				<<gs 'cum_call' 'stomach' $boy 1>>
+				<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 				<<arouse 'vaginal' 5 >>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -895,7 +895,7 @@
 					<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/sex/kitchen5.jpg">>
 					<p>You wrap your legs around Fedor as he thrust his dick further inside you, Fedor then lets out a groan as he begins pumping his seed into your womb. You can feel his penis throbbing inside you, filling you up with his seed. Fedor looks down to you "Your such a great fuck $pc.name_nick." you respond, "Well that's only one of my many talents." to which Fedor replies, "You'll have to show me those other talents sometime." Fedor then gets dressed then walks out of the room.</p>
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'vaginal' 5 >>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -937,7 +937,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/Cam/camhj1.mp4">>
 					You continue rubbing Fedor''s penis while admiring it until you hear Fedor start to groan. You suddenly feel his penis begin throbbing in your hand as he sprays his load into the air. Fedor''s warm cum begins leaking down your hands as you look up at him with a confident grin. Fedor looks down to you and says, "Wow, you are really good with your hands." you give him a wink as he turns off the camera then gets dressed.
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/Cam/camhj2.mp4">>
-					<<gs 'cum_call' 'hands' $boy 1>>
+					<<gs 'cum_call' 'hands' $sex.npcId 1>>
 					<<arouse 'hj' 5 `['dom','exhibitionism']`>>
 					<<arousalEnd>>
 					<<actCLA 'Get up'>>
@@ -955,7 +955,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/Cam/cambj1.mp4">>
 					<p>You pull Fedor's penis out of your mouth then begin licking the shaft firmly. Fedor groans then begins spraying his load in the air which shoots across the room. You begin firmly stroking Fedor's dick, milking every drop out of it while staring into the camera with a seductive grin. Fedor takes a second to catch his breath then says, "Damn $pc.name_first, You really know how work your tongue." as he packs up the camera then gets dressed.</p>
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/lick4.mp4">>
-					<<gs 'cum_call' 'hands' $boy 1>>
+					<<gs 'cum_call' 'hands' $sex.npcId 1>>
 					<<arouse 'bj' 5 `['dom','exhibitionism']`>>
 					<<arousalEnd>>
 					<<actCLA 'Get up'>>
@@ -967,7 +967,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/Cam/cambj1.mp4">>
 					<p>You continue sucking on Fedor's dick while staring at the camera, feeling more turned on as Fedor continues filming you. Fedor suddenly groans and you feel his cum shooting down your throat which you happily swallow, knowing how much it turns Fedor on when you swallow his cum. Fedor looks down at you with a very pleased smile. "You were outstanding $pc.name_first. Thank you." you give him a wink as he closes the camera then gets dressed.</p>
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum1.mp4">>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<arouse 'bj' 5 `['dom','exhibitionism']`>>
 					<<arousalEnd>>
 					<<actCLA 'Get up'>>
@@ -986,7 +986,7 @@
 					<<video "shared/sex/anal/doggy/anal9.mp4">>
 					<p>You look back at Fedor then say, "Paint my ass with your cum." Fedor gives you a wink then increases his pace before pulling his penis out of your ass and painting your ass with his warm seed. You stare directly at the camera as Fedor sprays his cum all over your ass. Fedor gives your lower ass a smack before saying "You have such a tight firm ass $pc.name_nick. I love it." You give Fedor a wink as he gets dressed.</p>
 					<<video "shared/sex/cum/cum5.mp4">>
-					<<gs 'cum_call' 'butt' $boy 1>>
+					<<gs 'cum_call' 'butt' $sex.npcId 1>>
 					<<arouse 'anal' 5 `['sub','exhibitionism']`>>
 					<<arousalEnd>>
 					<<actCLA 'Get up'>>
@@ -998,7 +998,7 @@
 					<<video "shared/sex/anal/doggy/anal9.mp4">>
 					<p>You turn to face the camera then say, "Cum inside my ass." Fedor gives you a pleased smile as he increases his pace. You enjoy the feeling of Fedor's big hard cock in your ass when you hear him groan and begin pumping your ass with his seed. You continue staring into the camera as Fedor fills your ass with cum until he finishes and says, "Your ass is so tight and beautiful $pc.name_first. Just like you." he then leans forward and gives you a kiss on your cheek before getting dressed.</p>
 					<<video "shared/sex/cum/analcreampie/cumanal2.mp4">>
-					<<gs 'cum_call' 'anus' $boy>>
+					<<gs 'cum_call' 'anus' $sex.npcId>>
 					<<arouse 'anal' 5 `['sub','exhibitionism']`>>
 					<<arousalEnd>>
 					<<actCLA 'Get up'>>
@@ -1017,8 +1017,8 @@
 					You look up at Fedor''s reflection. "Cum on my ass."
 					<p>Fedor gives your ass a firm smack as he thrust his hips a few more times before groaning. You can feel Fedor's warm cum covering your ass and back as you bite your lips, enjoying the warmth of Fedor's cum on your back. Fedor rubs your legs as he says, "You're so sexy $pc.name_first." You slowly look up to Fedor and give him a wink. Fedor then pans his camera up your body, recording the cum dripping off your body before turning off the camera then getting dressed.</p>
 					<<video "shared/sex/cum/cum5.mp4">>
-					<<gs 'cum_call' 'back' $boy 1>>
-					<<gs 'cum_call' 'butt' $boy 1>>
+					<<gs 'cum_call' 'back' $sex.npcId 1>>
+					<<gs 'cum_call' 'butt' $sex.npcId 1>>
 					<<arouse 'vaginal' 5 `['sub','exhibitionism']`>>
 					<<arousalEnd>>
 					<<actCLA 'Get up'>>
@@ -1031,7 +1031,7 @@
 						<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/Cam/camvag1.mp4">>
 						<p>You look up at Fedor's reflection. "Fill me with your cum." Fedor has a very pleased smile on his face as he increases his pace. Fedor then groans and you feel his seed filling your womb causing you to let out a loud moan. You look up at the camera as you focus on Fedor's hard cock throbbing inside you and his warm cum filling up your pussy. After a few seconds Fedor asks "How does my cum feel $pc.name_first?" You reply, "It feels so warm and pleasant. Your cum belongs inside me Fyodor." Fedor gives you a sweet smile as he responds, "Ohh $pc.name_first, you are the sweetest, most beautiful girlfriend I could ever ask for." Fedor kisses you passionately as he closes his camera then begins getting dressed.</p>
 						<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum10.mp4">>
-						<<gs 'cum_call' '' $boy 1>>
+						<<gs 'cum_call' '' $sex.npcId 1>>
 						<<arouse 'vaginal' 5 `['sub','exhibitionism']`>>
 						<<arousalEnd>>
 						<<actCLA 'Get up'>>
@@ -1081,7 +1081,7 @@
 			<<actCLA 'Make him cum'>>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/hj3.mp4">>
 				<p>You continue jerking him off and Fedor realizes that you want him to cum, so he leans back and begins lightly grunting as he nears closer to climax. You continue stroking his penis, enjoying the fact you are in complete control of his pleasure at the same time happy that you are able to give your man the release he deserves. Fedor's breathing grows more rapid then stops as his penis begins throbing in your hand. Fedor's penis erupts with his warm cum which you can feel pouring down your hand. You continue milking him until Fedor sits up. "Thank you for that $pc.name_first. It's your turn now."</p>
-				<<gs 'cum_call' 'hands' $boy 1>>
+				<<gs 'cum_call' 'hands' $sex.npcId 1>>
 				<<arouse 'hj' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Your turn'>>
@@ -1107,7 +1107,7 @@
 				<<set $time.minutes += 5>>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/lick4.mp4">>
 				<p>Noticing how close Fedor is to the edge of pleasure, you happily increase the pace of your tongue and even lick up the shaft as Fedor groans and begins shooting his cum in the air. You watch him carefully as he cums over his own chest. Watching him cum for you, gives you a warm feeling in you crotch as your vagina gets more and more wet. Fedor looks down to you "Damn $pc.name_first you are really a pro at this, aren't you?" You respond "Well I know what my man needs." Fedor then replies, "And I know what you need right now"</p>
-				<<gs 'cum_call' 'hands' $boy 1>>
+				<<gs 'cum_call' 'hands' $sex.npcId 1>>
 				<<arouse 'rimming' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Your turn'>>
@@ -1133,7 +1133,7 @@
 				<<set $time.minutes += 5>>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum1.mp4">>
 				<p>You let out a smile as you greatly increase the pace almost fucking his dick with your throat while trying to hold back from gagging. Fedor's head quickly jerks back as his cock begins throbbing in your mouth, filling your throat with his cum. You can feel Fedor's warm cum squirting down your throat and leaking from your lips as you do your best to swallow every single drop, not wanting to waste a drop of Fedor's sweet necter. When Fedor finishes, he looks down to you and says, "You really are amazing $pc.name_first. It's time for your reward."</p>
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<arouse 'bj' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Receive your reward'>>
@@ -1161,7 +1161,7 @@
 				<p>"I'm always ready to cum with you." Fedor immediately returns to licking your clit as you continue sucking his dick, feeling the pleasure build up quickly and then feeling your clitoris heat up as your body begins squirming as waves of pleasure hit your whole body. You moan loudly as you feel Fedor's hands tighten around your hips and his penis begins throbbing in your mouth filling it with his cum which you can't seem to keep from leaking out of your mouth as you climax. After you both finish, you roll off of Fedor and catch your breath as he says, "$pc.name_nick You're the best. You know that right?" You reply, "Only the best deserves the best." Fedor give you a very passionate kiss before getting dressed then walking out of the bedroom.</p>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/vagkiss.mp4">>
 				<<set $orgasm_or = 'yes'>>
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<arouse 'bj' 5 `['sub','dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -1187,8 +1187,8 @@
 				<<set $time.minutes += 5>>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/fj3.mp4">>
 				<p>You greatly increase the pace of your strokes as Fedor raises up to his knees while pushing his chest forward as his pleasure builds up fast. After a few more strokes, Fedor groans and you feel his penis begins throbbing as he sprays his load all over your chest and one drop almost gets in your eye as he covers you in his cum. After Fedor is fully spent, he looks down at you and says, "$pc.name_first how did you get so good with your feet. I didn't know a footjob could be that amazing." You respond, "I guess all those gym classes had to be good for something right?" Fedor chuckles as he gets dressed and walks out of the room.</p>
-				<<gs 'cum_call' 'face' $boy 1>>
-				<<gs 'cum_call' 'breasts' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
+				<<gs 'cum_call' 'breasts' $sex.npcId 1>>
 				<<arouse 'footjob' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Your turn'>>
@@ -1220,8 +1220,8 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/vag2.mp4">>
 				<p>Fedor nods as he continues fucking you at an increased pace and soon pulls out of you and begins jerking his penis over your stomach, covering you in his cum. The warmth of his cum covers both your stomach and chest which greatly excites you. After Fedor finishes he looks down at you and says, "You're amazing as always $pc.name_first, The best fuck a man could ask for." You look up at him and reply, "I could say the same about you, my love." Fedor gives you a passionate kiss before getting dressed and leaving the room.</p>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/vagcum.mp4">>
-				<<gs 'cum_call' 'stomach' $boy 1>>
-				<<gs 'cum_call' 'breasts' $boy 1>>
+				<<gs 'cum_call' 'stomach' $sex.npcId 1>>
+				<<gs 'cum_call' 'breasts' $sex.npcId 1>>
 				<<arouse 'vaginal' 10 >>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -1234,7 +1234,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4">>
 					You look Fedor in the eyes as you reply, "Fill me with your seed, my love." Fedor gives you a passionate kiss as he begin increasing his pace. You can feel Fedor''s penis entering deeper inside you as he groans and begins filling your womb with his warm cum. You can feel his penis throbbing as he continues to pump your pussy with his seed. After Fedor finishes, he looks down to you. "You are the best girlfriend I could ever ask for. I'm so lucky to have you." You look him in the eyes as you reply, "I love you Fyodor and I always will." Fedor leans forward and gives you a long passionate kiss before getting dressed and leaving the room.
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/vagkiss.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'vaginal' 10 >>
 					<<arousalEnd>>
 					<<actCLA 'Get dressed'>>
@@ -1256,8 +1256,8 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/cowgirlkiss2.mp4">>
 				"Cover me with your hot cum." Fedor nods as he quickens his pace then lightly pushes you on your back as he begins jerking off over you. Fedor groans and begins spraying his warm cum on your chest as you lay back enjoying the warmth of his cum cover your stomach and chest. After Fedor finishes catching his breath he looks down to you. "That's my girl. Always enjoying my cum." You give Fedor a mischievous grin as you respond, "Well I hear it's good for my skin." Fedor chuckles as he gets dressed and leaves the room.
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/vagcum.mp4">>
-				<<gs 'cum_call' 'breasts' $boy 1>>
-				<<gs 'cum_call' 'stomach' $boy 1>>
+				<<gs 'cum_call' 'breasts' $sex.npcId 1>>
+				<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 				<<arouse 'vaginal' 10 >>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -1270,7 +1270,7 @@
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum3.mp4">>
 					<p>You look Fedor in the eyes as you reply, "Fill me with your seed, my love." Fedor gives you a passionate kiss as you both increase the pace. You soon feel Fedor's arms tighten around you as he groans. You can feel Fedor's warm seed quickly filling your womb and you continue riding him, trying to keep his dick as far inside you as possible. You let out a loud moan as Fedor finishes pumping your pussy with his seed. Fedor catches his breath before looking you in the eyes "You are the most precious thing in my life. I love you $pc.name_first." You can feel tears begin to form in your eyes as you reply, "I love you too Fyodor, with all my heart." Fedor leans forward then gives you a long passionate kiss before getting dressed and leaving the room.</p>
 					<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/vagkiss.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'kiss' 5 >>
 					<<arouse 'vaginal' 5 `['dom']`>>
 					<<arousalEnd>>
@@ -1299,7 +1299,7 @@
 				Fedor pushes against you and begin pumping you even faster while he wraps his arms around yours giving him more leverage to push his dick deeper in your ass. You let out a loud moan as he rams your ass harder, stretching out your asshole which hurts a bit but the knowledge that you are giving Fedor the pleasure he deserves fills you with excitement, making the pain worth it. Fedor says, "Are you ready for my cum" Which you quickly respond, "Yes Fedor, cum inside me."
 				<p>He then quickens his pace and you feel his bady press firmly against yours as he begins pumping his cum inside your ass. When Fedor is finished he whispers in your ear "How does my bitch like her ass fucking?" You turn back to him with a mischievous grin on your face "I love it when you fuck my ass." Fedor responds "Good girl" then gives your ass one last smack before getting dressed.</p>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/analcum.mp4">>
-				<<gs 'cum_call' 'anus' $boy 1>>
+				<<gs 'cum_call' 'anus' $sex.npcId 1>>
 				<<arouse 'anal' 5 `['sub']`>>
 				<<arousalEnd>>
 				<<actCLA 'Get dressed'>>
@@ -1324,8 +1324,8 @@
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/ride2.mp4">>
 				<p>"Pull out babe." Fedor nods as he quickens his pace then he lightly pulls out of you then groans and begins spraying his warm cum on your back and feet as you stroke his penis, trying to get every last drop out of it. After Fedor finishes catching his breath he looks you in the eyes. "$pc.name_nick I could fuck you for days straight." You give Fedor a mischievous grin as you respond, "Be careful or I might end up holding you to that." Fedor chuckles as he gets dressed and leaves the room.</p>
 				<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum7.mp4">>
-				<<gs 'cum_call' 'butt' $boy 1>>
-				<<gs 'cum_call' 'feet' $boy 1>>
+				<<gs 'cum_call' 'butt' $sex.npcId 1>>
+				<<gs 'cum_call' 'feet' $sex.npcId 1>>
 				<<arouse 'vaginal' 5 `['dom']`>>
 				<<arousalEnd>>
 				<<actCLA 'Take a shower'>>
@@ -1339,7 +1339,7 @@
 					You turn back to face Fedor as you reply, "Fill up my pussy, my love." Fedor gives your ass a firm smack as he increases the pace. You soon feel Fedor''s arms holding you tighter as he groans. You can feel Fedor''s hard cock throbbing inside you, filling you with his warm seed as you continue riding him, trying to keep his dick as far inside you as possible. You let out a loud moan as Fedor finishes pumping your pussy with his seed.
 					<p>Fedor catches his breath before looking you in the eyes "You are the most precious thing in my life. I love you $pc.name_first." You can feel tears begin to form in your eyes as you reply, "I love you too Fyodor, with all my heart." Fedor leans forward then gives you a long passionate kiss before getting dressed and leaving the room.</p>
 					<<video "shared/sex/cum/cum81.mp4">>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<arouse 'kiss' 5 `['dom']`>>
 					<<arouse 'vaginal' 5 `['dom']`>>
 					<<arousalEnd>>
@@ -1413,7 +1413,7 @@
 						<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Shower/shower4.mp4">>
 						Fedor pulls out of you and you quickly drop to your knees then take his dick into your mouth. You begin sucking and massaging his dick with your tongue until you feel his penis begin throbbing in your mouth filling it with his seed and you do your best to swallow as much of it as you can but some of it leaks out the side of your mouth which quickly gets washed away by the stream of water. After you swallow most of Fedor''s cum you look up to see a very satisfied smile on his face as he tells you "I hope you enjoy my cum as much as I enjoy seeing you swallow it." You reply, "Some people like cream on their bagels. I like cream on my throat." as you lick your lips which is followed by a laugh that Fedor joins in on. You blow a kiss at Fedor as he gets dressed and leaves the room.
 						<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/cum1.jpg">>
-						<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 						<<arouse 'bj' 10 `['dom']`>>
 						<<arousalEnd>>
 						<<actCLA 'Finish washing up'>>
@@ -1426,7 +1426,7 @@
 						You give him a smeet smile as you say, "You were amazing Fyodor. Thank you."
 						Which he responds, "My girl deserves nothing less than the best." as he gets dressed then leaves the bathroom.
 						<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/cum2.jpg">>
-						<<gs 'cum_call' 'face' $boy 1>>
+						<<gs 'cum_call' 'face' $sex.npcId 1>>
 						<<arouse 'hj' 10 `['sub']`>>
 						<<arousalEnd>>
 						<<actCLA 'Finish washing up'>>
@@ -1440,7 +1440,7 @@
 							<p>Fedor gives you a passionate kiss as he increases the pace of his thrusts and you do your best to match his thrusts with your own. After a few seconds, Fedor groans and you feel his seed filling your womb with its warmth as you continue thrusting your hips attempting to drain his dick completely. Fedor gives you a passionate kiss and then looks you in the eyes as he says, "$pc.name_first what have i done to deserve a perfect girl like you?"</p>
 							His words of affection catch you off guard as you are left speechless for a few seconds then you recover your thoughts and respond, "You've treated me with love and affection and handled my heart with care and that is why you deserve everything I can offer you." You both stare at each other in silence until Fedor gives you another long kiss and then dries off and gets dressed before leaving the room.
 							<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum3.mp4">>
-							<<gs 'cum_call' '' $boy 1>>
+							<<gs 'cum_call' '' $sex.npcId 1>>
 							<<arouse 'vaginal' 5 >>
 							<<arousalEnd>>
 							<<actCLA 'Finish washing up'>>
@@ -1473,8 +1473,8 @@
 						<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Shower/shower3.jpg">>
 						<p>You give Fedor two more thrusts then quickly pull off him and drop to your knees in front of him just as he groans and sprays his load on your face. You open your mouth, trying to catch as much in your mouth as possible. You can feel some of his cum leaking down your face and throat. The tart taste of his cum causes a minor stinging in your throat as it goes down but you continue to swallow, knowing that it will make Fedor happy. After Fedor is finished emptying is balls he says, "Great job $pc.name_first, You always know just what need." You lick your lips then blow him a kiss as he gets dressed and walks out of the bathroom.</p>
 						<<video "shared/sex/cum/facial/cumface2.mp4">>
-						<<gs 'cum_call' 'face' $boy 1>>
-						<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+						<<gs 'cum_call' 'face' $sex.npcId 1>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 						<<arouse 'vaginal' 5 >>
 						<<arousalEnd>>
 						<<actCLA 'Take a shower'>>
@@ -1488,7 +1488,7 @@
 							You continue riding Fedor''s dick and soon you hear him groan as he begins filling your womb with his seed. You close your eyes and focus on the warmth of his cum entering you while you push yourself down on his dick, so that his seed enter deep inside you. After a few seconds of you feel the throbbing of his penis cease, so you slowly climb off him, feeling his cum leak out of your pussy.
 							<p>You turn to face Fedor and give him a passionate kiss before he says, "You are so perfect $pc.name_first. I want to spend my whole life with you." You give Fedor a warm smile as you respond, "I feel the same way Fyodor. Maybe one day we will be ready to take that step." Fedor replies, "That day will come $pc.name_first. I promise you." Fedor gets dressed then leaves the room.</p>
 							<<video "shared/sex/cum/cum81.mp4">>
-							<<gs 'cum_call' '' $boy 1>>
+							<<gs 'cum_call' '' $sex.npcId 1>>
 							<<arouse 'vaginal' 5 >>
 							<<arousalEnd>>
 							<<actCLA 'Take a shower'>>

sugarcube/src/autogenerated/unsorted/Gnpc2.tw

@@ -361,7 +361,7 @@
 								
 								<<actCLA 'Agree'>>
 									<<gs 'npcgeneratec' 0 'Gopnik' `rand((age - 1)` (age + 1))>>
-									<<setinit $boy[1] = $boy>>
+									<<setinit $sex.npcId[1] = $sex.npcId>>
 									
 									<<set $pc.mood -= 5>>
 									<h1><h2>Men''s Room</h2></h1>
@@ -370,12 +370,12 @@
 									<p>The boys look at you bewildered, "Did you make a mistake? This is the men's room." The guy who brought you smiles "Nah, She's with me." He turns to you, "Okay, cocksucker, get your mouth working." You look at the other guys and ask, "What, right here?" The Boys laugh, "C'mon. You're not embarrassed, are you?"</p>
 									<<actCLA 'Suck his cock'>>
 										<<arouse 'bj' 5 >>
-										<<gs 'cum_call' 'mouth_swallow' $boy>>
+										<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 										<h1><h2>Men''s room</h2></h1>
 										<<image "shared/sex/blowjob/public.jpg">>
 										<p>You squat in front of the guy and unbutton his pants to pull out his stiff dick. The other boys continue smoking and watch the scene. You begin to lick the purple head of his swollen cock and then you open your $pc_desc['lips'] lips and take the cock in your mouth. The Boys start laughing and commenting at what they see, "Look how she smacks those lips." Another echoed, "Where did you find such a cocksucker?" Unfortunately, there's someone who knows you. "Hey that's $pc.name_nick $pc.name_last. Hot Damn!"</p>
 										You blush and your face burns with shame, sucking this dick in front of other guys. Finally the guy starts to cum in your mouth and you try as quickly as possible to swallow his warm sperm. When his cock finally goes limp he tucks it back in his pants. You get up from the floor and begin to wipe your mouth, knowing it now smells like cum. One of the guys chuckled, "Great blowjob, I wouldn''t mind one myself."
-										<<gs 'boyStat' $boy[1]>>
+										<<gs 'boyStat' $sex.npcId[1]>>
 										<<actCLA 'Slip out of the restroom'>>
 											 * pl $clubDescription
 											<p>You try to ignore the guys as you slip out of the restroom and walk back to the dance floor. $boydesc has been looking for you. He comes up to you and asks, "Where have you been? I looked everywhere for you." You say the first thing that comes to your mind, "I went to the toilet." $boydesc asks "Why are you wiping your mouth?"</p>
@@ -401,7 +401,7 @@
 									<</actCLA>>
 									<<actCLA 'Change your mind' undefined `{willpower:['bj','resist']}`>>
 											
-											<<gs 'boyStat' $boy[1]>>
+											<<gs 'boyStat' $sex.npcId[1]>>
 											 * pl $clubDescription
 											<<set $pc.mood -= 10>>
 											<<setinit $otnBoyFrend[$numnpc] = 0>>
@@ -481,7 +481,7 @@
 									<p>Soon $boydesc groaned "$pc.name_nick, I'm going to come."</p>
 									<<actCLA 'Suck on'>>
 										<<arouse 'bj' 5 >>
-										<<gs 'cum_call' 'mouth_swallow' $boy>>
+										<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 										<<image "shared/sex/cum/mouth/cum49.jpg">>
 										<<gs 'dinsex' 'bj_swallow_random'>>
 										<<actCLA 'Further'>>
@@ -560,7 +560,7 @@
 												<p>Soon $boydesc groaned "$pc.name_nick, I'm going to come."</p>
 												<<actCLA 'Suck on'>>
 													<<arouse 'bj' 5 >>
-													<<gs 'cum_call' 'mouth_swallow' $boy>>
+													<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 													<<video "shared/sex/public/c0#.mp4" 0 10>>
 													<<gs 'dinsex' 'bj_swallow_random'>>
 													<<actCLA 'Further'>>
@@ -724,7 +724,7 @@
 					<<actCLA 'Suck on'>>
 						<<set $time.minutes += 5>>
 						<<set $pc.horny += 10>>
-						<<gs 'cum_call' 'mouth_swallow' $boy>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 						<<image "shared/sex/cum/mouth/cum49.jpg">>
 						<<gs 'dinsex' 'bj_swallow_random'>>
 						<<actCLA 'Go home'>>

sugarcube/src/autogenerated/unsorted/Katja_nightclub_sex.tw

@@ -156,7 +156,7 @@
 													<p>"I feel energized," Katja says. "Let's go dance. Bye, <<=$npcs.get($npclastgenerated,'nickname')>>!" she continues, and she practically drags you to the dance floor.</p>
 													<<arouse 'kiss' 3 `['lesbian']`>>
 													<<arousalEnd>>
-													<<gs 'cum_call' 'stomach' $boy 1>>
+													<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 													<<gs 'cum_cleanup'>>
 													<<actCLA 'Follow Katja to the dance floor'>>
 														<<set $time.minutes += 10>> <<gt 'katja_nightclub' 'dance'>>

sugarcube/src/autogenerated/unsorted/LBZhouse.tw

@@ -49,7 +49,7 @@
 		<<video "shared/sex/cum/cumf60.mp4">>
 		<p>You keep his cock inside your mouth as $boydesc fills your mouth with his hot cum. You never break eye contact as you fully milk his cock until he's totally drained. "That was a great blowjob..." As he pulls out his cock you make sure to swallow every single drop.</p>
 		<<arouse 'bj' 5 >>
-		<<gs 'cum_call' 'mouth_swallow' $boy>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 		<<arousalEnd>>
 		<<actCLA 'Shower'>>
 			<<gt 'LBZhouse' 'Shower'>>
@@ -68,7 +68,7 @@
 			<<video "characters/pavlovsk/vadim/sex/mitka2.mp4">>
 			<p>$boydesc throws you on the bed, spreads your legs, and enters you without hesitation. Ignoring the sounds you make, he picks up the pace and fucks you hard, filling the room with wet slaps as he pounds your pussy. Out of the middle of nowhere he stops thrusting and cums inside, surprising you, but since you were going to let him cum inside you decide you aren't mad about it.</p>
 			<<arouse 'vaginal' 5 >>
-			<<gs 'cum_call' '' $boy 0>>
+			<<gs 'cum_call' '' $sex.npcId 0>>
 			<<arousalEnd>>
 			<<actCLA 'Get dressed'>>
 				<<gt 'LBZhouse' 'End'>>
@@ -79,7 +79,7 @@
 			<<video "shared/sex/cum/analcreampie/cumanal2.mp4">>
 			<p>In between your moans, you sense he's about to cum, and tell him to pull out. $boydesc thrusts a couple more times and just manages to pull out as he cums all over your stomach, emptying his balls.</p>
 			<<arouse 'vaginal' 5 >>
-			<<gs 'cum_call' 'stomach' $boy>>
+			<<gs 'cum_call' 'stomach' $sex.npcId>>
 			<<arousalEnd>>
 			<<actCLA 'Hop in the shower'>>
 				<<gt 'LBZhouse' 'Shower'>>
@@ -99,7 +99,7 @@
 		<<video "shared/sex/cum/analcreampie/cumanal2.mp4">>
 		<p>$boydesc is enjoying himself as he pounds your ass before ramming his dick completely inside of your ass, filling you up. Even as he's emptied, you can still feel his cock throb inside of you. He slowly pulls out, giving you one last sensation as he leaves your ass.</p>
 		<<arouse 'anal' 5 >>
-		<<gs 'cum_call' 'anus' $boy>>
+		<<gs 'cum_call' 'anus' $sex.npcId>>
 		<<arousalEnd>>
 		<<actCLA 'Hop in the shower'>>
 			<<gt 'LBZhouse' 'Shower'>>

sugarcube/src/autogenerated/unsorted/LCporn.tw

@@ -13,7 +13,7 @@
 		<<set $randlcpic = rand(1, 7)>>
 		<<run $npcs.inc('A89','rel',5)>>
 		<!-- Boy A89 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<<set $pose = 1>>
 		<<image `'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'`>>
 		You smile encouragingly at Eugene and tell her that she is even hotter than you imagined. Eugene, emboldened by your reaction, starts to help you undress. Finally, she descends upon your naked body like a hungry predator...
@@ -45,7 +45,7 @@
 	<<actCLA 'Fuck me, Eugene!'>>
 		<<run $npcs.inc('A89','rel',5)>>
 		<!-- Boy A89 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<<set $pose = 1>>
 		<<set $randlcpic = rand(1, 7)>>
 		<<image `'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'`>>
@@ -64,14 +64,14 @@
 	<<actCLA 'Let me pleasure you, Eugene!'>>
 		<<run $npcs.inc('A89','rel',5)>>
 		<!-- Boy A89 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<<set $randlcpic = rand(10, 16)>>
 		<<image `'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'`>>
 		<p>You take your clothes off, give Eugene a deep kiss before drop to your knees in front of her. "Mmmm...$pc.name_nick!" she whispers and looks at you intently.</p>
 		<p>Eugene shoves her harden cock deep into your mouth as soon as you open your lips. She helds you firmly by the hair and begins to thrust her hips back and forth, making you take her whole length repeatedly. After a while, with her cock deep down your throat, you begin to wonder how it's possible that she still hasn't reached orgasm yet... guys never last this long!</p>
 		<<arouse 'bj' 20 `['futa','sub','deepthroat']`>>
 		Finally, a good half hour after you started sucking her cock, Eugene finally lets out a loud and girly moan and releases her load all over your face. Thick strands of saliva are running down your chin by now.
-		<<gs 'cum_call' 'face' $boy 1>>
+		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<p>She licks her cum on your face and kisses you. She smiles and starts to get dressed. She tells you: "Thank you, $pc.name_nick! That was great... but I should go back to work before someone realizes I am missing! We've got to do this again, $pc.name_nick!"</p>
 		<<arousalEnd>>
 		<<actCLA 'Get dressed'>>
@@ -81,7 +81,7 @@
 	<<actCLA 'Use me, Eugene'>>
 		<<run $npcs.inc('A89','rel',5)>>
 		<!-- Boy A89 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<<set $randlcpic = rand(1, 4)>>
 		<<image `'locations/city/industrial/bbq/sex/anal<<randlcpic>>.jpg'`>>
 		<<if getvar("$analplugin") == 1>>
@@ -94,7 +94,7 @@
 		<<arouse 'anal_finger' 1 `['lube']`>>
 		<<arouse 'anal' 40 `['futa']`>>
 		She pounds and enjoys your ass for a surprising amount of time, considering how hard and fast she is hammering it. She makes sure to reapply some of the cooking oil as needed, while greatly helps you enjoy the experience as well. Finally, a good half hour after she started fucking your ass, Eugene finally lets out a loud and girly scream and shoots her load deep inside your ass.
-		<<gs 'cum_call' 'anus' $boy 1>>
+		<<gs 'cum_call' 'anus' $sex.npcId 1>>
 		<p>She kisses you and savours the moment. She starts to get dressed and let you know: "Thanks, $pc.name_nick! That was amazing...  I have to go now but come visit me soon, okay, $pc.name_nick? I really want us to spend more time together."</p>
 		<<gs 'dinsex' 'after_anal' 'no_plug'>>
 		<<arousalEnd>>

sugarcube/src/autogenerated/unsorted/LCwork.tw

@@ -212,7 +212,7 @@
 				<p>After you get dressed and he walks you to the door, he grins and says: "Thanks, you were great! She's still a bit shy, but at this rate it won't be long before I can properly introduce her to my buddies, if you know what I mean. Maybe we can do it again next week and you can help her get use to anal." He gives you a dirty wink and gives you randLCpay <b>₽</b> as he walks you out.</p>
 				<<arouse 'anal' 20 `['sub','prostitution']`>>
 				<<arousalEnd>>
-				<<gs 'cum_call' 'anus' $boy>>
+				<<gs 'cum_call' 'anus' $sex.npcId>>
 				<<actCLA 'Leave their apartment building'>>
 					<<set $finances.cash += $randLCpay>> <<gt 'city_residential'>>
 				<</actCLA>>
@@ -300,7 +300,7 @@
 	The man gives you a toothy grin when he feels you wrap your fingers around his cock, but he wants more. He takes you by the hand and guides you to the rear entrance of the diner, into the back alley. He positions you against the dumpsters and eagerly shoves his cock inside you.
 	<<gs 'dinsex' 'vaginal_sex' 6 'unknown'>>
 	Not a surprise, he barely lasts any time at all, with in a few minutes he grunts and pulls out of your pussy and shoots his load all over your ass and without a further word he goes back into the cafe.
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<<arousalEnd>>
 	<<actCLA 'Return to the restroom'>>
 		<<gt 'laketoilet' 'main'>>

sugarcube/src/autogenerated/unsorted/LakeBoyDy.tw

@@ -190,7 +190,7 @@
 		<<set $sashaBeliSex = 1>> <<setn $guy += 1>>
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<set $belgangday = $time.daystart>>
 	<<set $belgangProstitute = 1>>
 	<<image "characters/pavlovsk/vadim/sex/beachblow.jpg">>

sugarcube/src/autogenerated/unsorted/Military.tw

@@ -115,9 +115,9 @@
 	<<actCLA 'Agree'>>
 		<<gs 'npcgeneratec' 0 'Soldier' `rand(18,34)`>>
 		
-		<<setinit $boy[0] = $boy>>
+		<<setinit $sex.npcId[0] = $sex.npcId>>
 		<<gs 'npcgeneratec' 0 'Soldier' `rand(18,34)`>>
-		<<setinit $boy[1] = $npclastgenerated>>
+		<<setinit $sex.npcId[1] = $npclastgenerated>>
 		 		<<image "locations/city/shared/military/sex/pro0.jpg">>
 		<p>Your hands are tied and you are led to the headquarters where they set up an interrogation, then with the words "Now the interrogation begins!", they pull out their cocks. That's what you get for allowing two burly men you do not even know to bind your hands.</p>
 		<<actCLA 'Submit'>>

sugarcube/src/autogenerated/unsorted/NikoEv2.tw

@@ -118,7 +118,7 @@
 				Niko starts pumping you even faster as he gets more excited. You tilt your head back, enjoying the hard cock ramming inside you as he asserts his dominance over you.
 				<<actCLA 'Continue'>>
 					<<set $time.minutes += 5>>
-					<<gs 'cum_call' 'mouth' $boy>>
+					<<gs 'cum_call' 'mouth' $sex.npcId>>
 					<<arouse 'vaginal' 5 >>
 					<<arousalEnd>>
 					<<video "characters/pavlovsk/school/boy/niko/yurikev/cum/throat.mp4">>
@@ -148,7 +148,7 @@
 										<<video "characters/pavlovsk/school/boy/niko/yurikev/sex/throat/bed2.mp4">>
 										You can feel Yurik''s hand rubbing on your sensitive parts. You close your eyes, trying to think of anything but the pain you feel as Yurik roughly fucks your throat. You then open your eyes and try looking around the room, but your vision is all blurry from the tears streaming from your eyes, so you close them again, waiting for this torment to be over.
 										<<actCLA 'Continue'>>
-											<<gs 'cum_call' 'mouth_swallow' $boy>>
+											<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 											<<arouse 'bj' 5 >>
 											<<arousalEnd>>
 											<<video "characters/pavlovsk/school/boy/niko/yurikev/cum/throat1.mp4">>
@@ -257,7 +257,7 @@
 							<<video "shared/sex/cum/mouth/cum1.11.mp4">>
 							You quicken your pace and soon feel his penis throbbing in your mouth as he fills your mouth with his seed. Petia catches his breath before looking down at you. "Wow, Niko wasn''t lying when he said that you were the best at that. We need to do this again sometime."
 							<<actCLA 'Turn to Niko'>>
-								<<gs 'cum_call' 'mouth' $boy>>
+								<<gs 'cum_call' 'mouth' $sex.npcId>>
 								<<arouse 'bj' 5 >>
 								<<arousalEnd>>
 								<center><<image `'images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg'`>></center>
@@ -278,7 +278,7 @@
 										<<video "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj5.mp4">>
 										You can feel your heart flutter as you continue sucking Niko''s dick.
 										<<actCLA 'Continue sucking Niko`s dick'>>
-											<<gs 'cum_call' 'mouth_swallow' $boy>>
+											<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 											<<arouse 'bj' 5 >>
 											<<arousalEnd>>
 											<<video "characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4">>
@@ -400,7 +400,7 @@
 						<<video "characters/pavlovsk/school/boy/niko/nikoev/school/locker/petia2.mp4">>
 						You climb on top of Petia and feel his rock hard penis entering your vagina, the jolt of pleasure causing you to moan loudly. Petia moans with you, almost in perfect harmony, as you start riding his cock. He breathes heavily in your ear before his breath suddenly stops and he lets out a loud moan as he fills the condom, cumming almost immediately.
 						<<actCLA 'Watch Petia cum'>>
-							<<gs 'cum_call' 'butt' $boy>>
+							<<gs 'cum_call' 'butt' $sex.npcId>>
 							<<arouse 'vaginal' 5 >>
 							<<image "characters/shared/headshots_main/big159.jpg">>
 							<p>You continue watching Petia twitching as he has the most powerful orgasm of his life. You can see the ecstasy on his face, the blissful pleasure he's feeling leaves you feeling envious. After a few seconds, Niko approaches. "Wow. That was fucking pathetic. You won't have any chance with a woman unless you pay for it. Now get the fuck out out of here. I need to speak with $pc.name_nick."</p>
@@ -437,7 +437,7 @@
 											<p>Niko thrusts one more time before shaking his head. "No!"</p>
 											He pulls out and starts cumming on your ass.
 											<<actCLA 'Continue'>>
-												<<gs 'cum_call' 'butt' $boy>>
+												<<gs 'cum_call' 'butt' $sex.npcId>>
 												<<arouse 'vaginal' 5 >>
 												<<arousalEnd>>
 												<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/anal.mp4">>
@@ -805,7 +805,7 @@
 				You meekly nod and continue sucking his dick. After a few seconds, Yurik looks down at you. "You don't need to worry girl. You're doing good." You suddenly feel a lot more confident, knowing that he actually does enjoy what you're doing for him. After a few seconds, you can hear him breathing loudly.
 				<<actCLA 'Make him cum'>>
 					<<set $time.minutes += 5>>
-					<<gs 'cum_call' 'mouth_swallow' $boy>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 					<<arouse 'bj' 5 >>
 					<<arousalEnd>>
 					<<video "characters/pavlovsk/school/boy/niko/yurikev/sex/bj/bj1.mp4">>

sugarcube/src/autogenerated/unsorted/NikoPayback.tw

@@ -128,7 +128,7 @@
 		You drop to your knees and unbutton his pants. He looks down at you with a confident grin as you start rubbing his dick against your lips, signaling for you to suck on it. You wrap your lips around his dick and start licking and sucking it firmly, not wanting to anger him. After a few seconds, Niko looks down at you. "Good girl. Keep it up." You continue sucking his dick at a moderate pace, not wanting to overdo it.
 		<<arouse 'bj' 5 `['sub']`>>
 		<<actCLA 'Continue sucking'>>
-			<<gs 'cum_call' 'mouth_swallow' $boy>>
+			<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 			<<arouse 'bj' 5 `['sub']`>>
 			<<arousalEnd>>
 			<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/bj2.mp4">>
@@ -160,7 +160,7 @@
 			<p>Niko recoils in shock before responding. "Wow, you are? I guess I can help you with that. Thanks for offering." He gently guides you towards the sink and undresses you from the waist down before unbuttoning his pants and pressing his dick against your pussy and whispering in your ear. "I'll take this slow for you, okay?"</p>
 			You gratefully nod as Niko slowly pushes his dick inside your pussy and you feel your hymen break. The pain increases when Niko thrusts his hips, pushing his dick deeper inside you and fucking you at a moderate rate.
 			<<actCLA 'Continue'>>
-				<<gs 'cum_call' 'butt' $boy>>
+				<<gs 'cum_call' 'butt' $sex.npcId>>
 				<<arouse 'vaginal' 5 `['sub']`>>
 				<<arousalEnd>>
 				<<video "locations/pavlovsk/school/bathroom/voyvag.mp4">>
@@ -185,7 +185,7 @@
 			His eyes light up. "Good girl. That''s just what I wanted to hear."
 			He starts undressing you before spinning you around and pulling you toward him. You can feel his dick pressing against your pussy before you suddenly feel it enter you, causing a wave of pleasure to fill you. Niko lightly grips your neck and you close your eyes, giving in to the pleasure as he continues to fuck your pussy.
 			<<actCLA 'Continue'>>
-				<<gs 'cum_call' 'legs' $boy>>
+				<<gs 'cum_call' 'legs' $sex.npcId>>
 				<<arouse 'vaginal' 5 `['sub']`>>
 				<<arousalEnd>>
 				<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/vaginal2.mp4">>
@@ -211,7 +211,7 @@
 		<p>His eyes light up. "You really are a naughty little minx, aren't you?"</p>
 		He unbuttons his pants and sits on top of a nearby toilet as you quickly undress and straddle him before sliding down onto his dick, moaning as it penetrates you. Niko starts moaning as you start riding his cock and you moan with him as you feel his dick pushing its way deeper inside you.
 		<<actCLA 'Continue'>>
-			<<gs 'cum_call' 'butt' $boy>>
+			<<gs 'cum_call' 'butt' $sex.npcId>>
 			<<arouse 'vaginal' 5 `['sub']`>>
 			<<arousalEnd>>
 			<center><video autoplay loop src="images/locations/pavlovsk/trainstation/sex/bimbo.boy1,7.mp4"></video></center>
@@ -235,7 +235,7 @@
 		His eyes light up. "I always knew that you were a wild girl. Let''s do this."
 		He gives your ass a firm smack as he wets his hand in the sink and lubes up his dick. You pull down your pants and bend over, closing your eyes and focusing on his dick firmly pushing its way inside your ass, evoking moans from both you and Niko.
 		<<actCLA 'Continue'>>
-			<<gs 'cum_call' 'anus' $boy>>
+			<<gs 'cum_call' 'anus' $sex.npcId>>
 			<<arouse 'anal' 5 `['sub']`>>
 			<<arousalEnd>>
 			<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/anal1.mp4">>
@@ -292,7 +292,7 @@
 			<<video "locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj3.mp4">>
 			<p>You wrap your lips around his dick and start sucking it firmly as Niko looks down at you and spits on your face. "You're my fucking bitch! Don't you ever forget that!" You continue sucking his dick while trying to ignore him as he occasionally spits in your face.</p>
 			<<actCLA 'Continue sucking'>>
-				<<gs 'cum_call' 'mouth_swallow' $boy>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 				<<arouse 'bj' 5 `['rough','sub']`>>
 				<<arousalEnd>>
 				<<video "characters/pavlovsk/school/boy/niko/yurikev/cum/throat6.mp4">>
@@ -309,7 +309,7 @@
 			<p>You open your mouth and close your eyes, waiting for Niko to start. A few seconds later, you feel a warm liquid splashing across your face, filling your mouth and getting in your nose as Niko shouts "SWALLOW IT ALL BITCH!"</p>
 			You try your best not to gag as you attempt to swallow all of his bitter tasting urine. You can't keep yourself from gagging as Niko continues shooting his urine down your throat. He then suddenly rubs his dick against your lips before shoving it into your mouth.
 			<<actCLA 'Suck his dick'>>
-				<<gs 'cum_call' 'mouth_swallow' $boy>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 				<<arouse 'bj' 5 `['rough','sub']`>>
 				<<arousalEnd>>
 				<<video "characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4">>
@@ -330,7 +330,7 @@
 					<<setn $pc.pcs_vag += 1>>
 
 				<</if>>
-				<<gs 'cum_call' 'butt' $boy>>
+				<<gs 'cum_call' 'butt' $sex.npcId>>
 				<<arouse 'vaginal' 5 `['rough','sub']`>>
 				<<arousalEnd>>
 				<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/virgin.mp4">>
@@ -347,7 +347,7 @@
 			<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/vaginal1.mp4">>
 			<p>You slowly approach the sink and spread your legs as Niko approaches you from behind. You feel Niko's dick pressing against your pussy before he shoves it inside, evoking a moan from you as Niko whispers in your ear. "You like it when I shove my dick inside you, don't you $pc.name_nick?"</p>
 			<<actCLA 'Continue'>>
-				<<gs 'cum_call' 'butt' $boy>>
+				<<gs 'cum_call' 'butt' $sex.npcId>>
 				<<arouse 'vaginal' 5 `['rough','sub']`>>
 				<<arousalEnd>>
 				<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/vaginal2.mp4">>
@@ -399,7 +399,7 @@
 			<<video "locations/pavlovsk/school/bathroom/voyanal.mp4">>
 			<p>You feel Niko's dick pressing against your anus before he suddenly forces it inside you, evoking a groan of pain from you. He wastes no time and starts roughly fucking your ass. You let out a few groans of pain as he continues fucking you before leaning forward and whispering in your ear. "How does it feel knowing that you belong to me?" You look back at him in silence, not knowing what he wants you to say, and he grins as he firmly smacks your ass.</p>
 			<<actCLA 'Continue'>>
-				<<gs 'cum_call' 'anus' $boy>>
+				<<gs 'cum_call' 'anus' $sex.npcId>>
 				<<arouse 'anal' 5 `['rough','sub']`>>
 				<<arousalEnd>>
 				<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/anal1.mp4">>
@@ -415,7 +415,7 @@
 			<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/anal2.mp4">>
 			You look back at Niko as he pushes his dick inside your ass, evoking a groan from you as a sharp pain shoots through you. You grasp onto the bottom of the urinal as Niko starts roughly fucking your ass and grabs onto your hair. "You really shouldn''t have tried to avoid me bitch. This could have been quick and painless, but you had to piss me off."
 			<<actCLA 'Continue'>>
-				<<gs 'cum_call' 'anus' $boy>>
+				<<gs 'cum_call' 'anus' $sex.npcId>>
 				<<arouse 'anal' 5 `['rough','sub']`>>
 				<<arousalEnd>>
 				<<video "characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/anal3.mp4">>

sugarcube/src/autogenerated/unsorted/Palatka.tw

@@ -43,9 +43,9 @@
 	<<actCLA 'Post'>>
 		<<gs 'npcgeneratec' 0 'Soldier' `rand(18,34)`>>
 		
-		<<setinit $boy[0] = $boy>>
+		<<setinit $sex.npcId[0] = $sex.npcId>>
 		<<gs 'npcgeneratec' 0 'Soldier' `rand(18,34)`>>
-		<<setinit $boy[1] = $npclastgenerated>>
+		<<setinit $sex.npcId[1] = $npclastgenerated>>
 		<<set $guy += 2>>
 		<<set $picrand = 22>>
 		<<xgt 'sexdvoe' 'var'>>

sugarcube/src/autogenerated/unsorted/ParkKafe.tw

@@ -106,7 +106,7 @@
 					They finish in your mouth and you swallow their sperm greedily
 					<<set $parkarainmouthnow = 1>>
 					<<arouse 'bj' 5 >>
-					<<gs 'cum_call' 'mouth' $boy>>
+					<<gs 'cum_call' 'mouth' $sex.npcId>>
 					<<arousalEnd>>
 					<<actCLA 'Become acquainted'>>
 						<<gt 'parkkafe' 'klof 1'>>
@@ -121,8 +121,8 @@
 					One of them finishes deep inside you while the other pulls out and cums on your ass.
 					<<arouse 'anal' 5 >>
 					<<arouse 'vaginal' -5 >>
-					<<gs 'cum_call' '' $boy>>
-					<<gs 'cum_call' 'anus' $boy>>
+					<<gs 'cum_call' '' $sex.npcId>>
+					<<gs 'cum_call' 'anus' $sex.npcId>>
 					<<arousalEnd>>
 					<<actCLA 'Become acquainted'>>
 						<<gt 'parkkafe' 'klof 1'>>

sugarcube/src/autogenerated/unsorted/Serge_Shulgin.tw

@@ -332,7 +332,7 @@
 				<<arouse 'anal' 5 `['sub','rough']`>>
 				<<actCLA 'Continue'>>
 					<<set $time.minutes += 5>>
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<video "locations/pavlovsk/resident/apartment/shulginhome/smroom/event/cum#.mp4" 1 6>>
 					Suddenly Sergey pulls out of you, and pushes you off him to the side.
 					"I don't want to get anyone pregnant, so the only way I cum after having sex is on a woman''s face. Better safe than sorry", he grins.
@@ -370,7 +370,7 @@
 				<<arouse 'vaginal' 5 `['sub','rough']`>>
 				<<actCLA 'Continue'>>
 					<<set $time.minutes += 5>>
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<video "locations/pavlovsk/resident/apartment/shulginhome/smroom/event/cum#.mp4" 1 6>>
 					When he's about to cum, you quickly drop to your knees before him and take the full length of his cock down your throat, trying to please Sergey to the best of your abilities.
 					<p>Sergey laughs and strokes your $pc.hairColor hair gently, amazed by how eager you suddenly are. After he lets you suck him for a little while, he suddenly pulls out and his dick erupts over your face, shooting hot ropes of semen all over you.</p>
@@ -425,7 +425,7 @@
 					<<arouse 'vaginal' 5 `['sub','rough']`>>
 					<<actCLA 'Continue'>>
 						<<set $time.minutes += 5>>
-						<<gs 'cum_call' 'face' $boy 1>>
+						<<gs 'cum_call' 'face' $sex.npcId 1>>
 						<<video "locations/pavlovsk/resident/apartment/shulginhome/smroom/event/cum#.mp4" 1 6>>
 						<p>Wow, that felt so good! You had no idea Sergey could be such a gentleman.</p>
 						When Sergey is also close to orgasming, you quickly get off him and lick his cock slowly, tasting yourself on his dick. Mmmm, delicious as always...
@@ -483,7 +483,7 @@
 						<<arouse 'vaginal' 5 `['sub']`>>
 						<<actCLA 'Continue'>>
 							<<set $time.minutes += 5>>
-							<<gs 'cum_call' 'face' $boy 1>>
+							<<gs 'cum_call' 'face' $sex.npcId 1>>
 							<<video "locations/pavlovsk/resident/apartment/shulginhome/smroom/event/cum#.mp4" 1 7>>
 							You quickly stand up and kneel down next to the bed, aiming his cock at your face. Mere seconds later he erupts, shooting several ropes of his hot sperm all over your face. You smile happily at Sergey and try to catch it inside your mouth, licking some of the remnants off the head of his dick when he's finally done.
 							<<arousalEnd>>
@@ -531,7 +531,7 @@
 				<<arouse 'vaginal' 5 `['sub','rough']`>>
 				<<actCLA 'Continue'>>
 					<<set $time.minutes += 5>>
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<video "locations/pavlovsk/resident/apartment/shulginhome/smroom/event/cum#.mp4" 1 6>>
 					"Uncle Sergey... please... more..." you moan weakly, unable to help yourself.
 					<p>Sergey laughs and shakes his head: "Some other day, slut. I'm too close to last longer now, come here!"</p>
@@ -572,7 +572,7 @@
 				<<arouse 'vaginal' 5 `['sub','rough']`>>
 				<<actCLA 'Continue'>>
 					<<set $time.minutes += 5>>
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<video "locations/pavlovsk/resident/apartment/shulginhome/smroom/event/cum#.mp4" 1 7>>
 					<p>After a few more minutes of rough sex, Sergey stands up and grabs a fistful of your $pc.hairColor hair, guiding you to the ground before him. Despite still being slightly out of breath, you automatically close your lips around his cock and suck him off enthusiastically, like any good little slut would.</p>
 					"Look at me", Sergey orders. When you do, he smirks and lets go of your hair, and lets you bob your head up and down. That defeated look in your eyes, the way you obediently closed your lips around his cock without him even having to tell you to... he has you exactly where he wants you. It's not easy to keep looking him in the eye and suck him off at the same time, but you do your best.

sugarcube/src/autogenerated/unsorted/Serge_kuh.tw

@@ -262,8 +262,8 @@
 										<p>He then begins to fuck you so hard that you have to hold onto the table, making the table creak and groan while it moves over the kitchen floor. It feels fantastic, and you eagerly raise your hips up to meet his thrusts half-way. Sergey's moans grow louder and he grunts in your ear: "Where do you want me to finish, $pc.name_nick?"</p>
 										<<arouse 'vaginal' 10 `['sub','rough']`>>
 										<<actCLA 'In your mouth'>>
-											<<gs 'cum_call' 'face' $boy 1 '' '' 5>>
-											<<gs 'cum_call' 'mouth' $boy 1 '' '' 35>>
+											<<gs 'cum_call' 'face' $sex.npcId 1 '' '' 5>>
+											<<gs 'cum_call' 'mouth' $sex.npcId 1 '' '' 35>>
 											<<set $pc.pcs_hairbsh = 0>>
 											<<image "locations/pavlovsk/resident/apartment/shulginhome/kuh/event/alko9.jpg">>
 											<p>"In my mouth, uncle Sergey!" you tell him.</p>
@@ -274,7 +274,7 @@
 											<<arouse 'hj' 5 `['sub']`>>
 											<<actCLA 'Chat with Sergey afterwards'>>
 												<<set $time.minutes += 5>>
-												<<gs 'cum_call' 'clothes' $boy 1 '' '' 15>>
+												<<gs 'cum_call' 'clothes' $sex.npcId 1 '' '' 15>>
 												<<image "locations/pavlovsk/resident/apartment/shulginhome/kuh/event/alko10.jpg">>
 												Sergey sighs and sits down on a chair, still catching his breath. You notice you're feeling a bit weak in your knees as well, and sit down on another chair next to him.
 												<p>You wearily look at the small puddle of sperm on your clothes and sigh: "Wow, I don't think I've ever had a load that big before!"</p>
@@ -452,10 +452,10 @@
 							<p>You bob your head up and down obediently, vaguely trying to wrap your head around how he managed to turn the tables on you so easily. Weren't you teasing him? Nevertheless: with this juicy cock between your lips, you're not complaining!</p>
 							<<arouse 'bj' 5 `['dom','deepthroat']`>>
 							<<actCLA 'Continue'>>
-								<<gs 'cum_call' 'mouth' $boy 1 '' '' 20>>
+								<<gs 'cum_call' 'mouth' $sex.npcId 1 '' '' 20>>
 								<<set $pc.horny += 5>>
 								<<set $pc.pcs_hairbsh = 0>>
-								<<gs 'cum_call' 'breasts' $boy 1 '' '' 20>>
+								<<gs 'cum_call' 'breasts' $sex.npcId 1 '' '' 20>>
 								<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex5-8.jpg'`>>
 								<p>Sergey grins and leans back, satisfied that you'll please him the way he wants you to. There's no need to tell you what to do, you know perfectly well what he wants!</p>
 								Without any warning, you suddenly feel him orgasming inside your mouth. You hold still and flick your tongue over the head of his cock, not letting any of his load escape.
@@ -553,7 +553,7 @@
 										<<set $orgasm_txt = '"Ahhh, uncle Sergey! Please! I`m... I`m cumming!" you scream. At the same time, your whole body begins to tremble as you orgasm violently on his cock, while you were not even touching your pussy at all. Wow, this is intense!'>>
 										<<arouse 'anal' 5 `['sub','rough']`>>
 										<<actCLA 'Continue'>>
-											<<gs 'cum_call' 'anus' $boy 1>>
+											<<gs 'cum_call' 'anus' $sex.npcId 1>>
 											<<set $pc.pcs_hairbsh = 0>>
 											<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex6-11.jpg'`>>
 											<p>Mere seconds after you orgasm, Sergey grunts and you feel his cock pulsing inside you, pumping hot ropes of cum into your intestines. He's gasping for breath by now, exhausted by the intense fucking he just gave you. "That was... amazing... $pc.name_nick!" he stumbles.</p>
@@ -809,9 +809,9 @@
 							You're crying out loudly by now, no longer caring if anyone can hear you. Sergey continues ''encouraging'' you for another few minutes, and your buttocks feel like they're on fire by the time he's done with you.
 							<<arouse 'vaginal' 5 `['sub','rough']`>>
 							<<actCLA 'Continue'>>
-								<<gs 'cum_call' 'clothes' $boy 1 '' '' 20>>
-								<<gs 'cum_call' 'face' $boy 1 '' '' 10>>
-								<<gs 'cum_call' 'mouth' $boy 1 '' '' 10>>
+								<<gs 'cum_call' 'clothes' $sex.npcId 1 '' '' 20>>
+								<<gs 'cum_call' 'face' $sex.npcId 1 '' '' 10>>
+								<<gs 'cum_call' 'mouth' $sex.npcId 1 '' '' 10>>
 								<<set $pc.pcs_hairbsh = 0>>
 								<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex2-8.jpg'`>>
 								<p>When Sergey is about to cum, he pulls out of you and grunts: "On your knees, now!"</p>
@@ -903,7 +903,7 @@
 							<<arouse 'clit_finger' 5 `['sub']`>>
 							<<set $time.minutes -= 5>>
 							<<actCLA 'Continue'>>
-								<<gs 'cum_call' 'stomach' $boy 1>>
+								<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 								<<set $pc.pcs_hairbsh = 0>>
 								<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex5-8.jpg'`>>
 								<p>A few minutes later, Sergey grabs your $pc.hairColor $curly in his fist and guides you to the ground, his cock never leaving your ass. You meekly let him guide you, this feels way too good to object! You plunged several fingers in your vagina by now, and are fingerbanging yourself to an orgasm while Sergey has his fun with your backside.</p>
@@ -1104,9 +1104,9 @@
 									You happily do as he says, and slowly lower yourself onto his cock after you climb on top of him. You have full control over the situation like this, and ride him eagerly. Sometimes increasing the pace and fucking him enthusiastically, sometimes slowing down to catch your breath and tease him at the same time.
 									<<arouse 'vaginal' 5 `['sub']`>>
 									<<actCLA 'Continue'>>
-										<<gs 'cum_call' 'mouth' $boy 1 '' '' 30>>
-										<<gs 'cum_call' 'face' $boy 1 '' '' 5>>
-										<<gs 'cum_call' 'clothes' $boy 1 '' '' 5>>
+										<<gs 'cum_call' 'mouth' $sex.npcId 1 '' '' 30>>
+										<<gs 'cum_call' 'face' $sex.npcId 1 '' '' 5>>
+										<<gs 'cum_call' 'clothes' $sex.npcId 1 '' '' 5>>
 										<<set $pc.pcs_hairbsh = 0>>
 										<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex1-10.jpg'`>>
 										<p>After you ride him for a few more minutes, Sergey suddenly wraps his arms around you in a bear grip and stands up, holding you up in the air for a second while you're still skewered on his dick. He then puts you on the ground and tells you: "Get down on your knees, $pc.name_nick. I want you to take my load on your face."</p>
@@ -1178,8 +1178,8 @@
 								<<arouse 'vaginal' 5 `['sub','rough']`>>
 								<<actCLA 'Continue'>>
 									<<set $pc.pcs_hairbsh = 0>>
-									<<gs 'cum_call' 'stomach' $boy 1 '' '' 20>>
-									<<gs 'cum_call' 'breasts' $boy 1 '' '' 20>>
+									<<gs 'cum_call' 'stomach' $sex.npcId 1 '' '' 20>>
+									<<gs 'cum_call' 'breasts' $sex.npcId 1 '' '' 20>>
 									<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex4-9.jpg'`>>
 									<p>Sergey doesn't want to get you pregnant, and pulls out right before he orgasms. He shoots his thick jets of cum all over your stomach and labia, some of it even landing on your tits. He came so much! You smear it out with a satisfied smile on your face, your head still feeling a bit hazy from the intense fucking you just received.</p>
 									<<arousalEnd>>
@@ -1364,7 +1364,7 @@
 				<<actCLA 'Continue'>>
 					<<set $pc.horny += 10>>
 					<<set $time.minutes += 5>>
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<set $pc.pcs_hairbsh = 0>>
 					<<video "locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/end1.mp4">>
 					Then, before you know it, it's over. With a loud groan, Sergey shoots his load all over your face, leaving you looking like a complete mess.
@@ -1438,7 +1438,7 @@
 			<<set $time.minutes -= 5>>
 			<<actCLA 'Continue'>>
 				<<set $pc.mood = 100>>
-				<<gs 'cum_call' 'anus' $boy 1>>
+				<<gs 'cum_call' 'anus' $sex.npcId 1>>
 				<<set $pc.pcs_hairbsh = 0>>
 				<<video "locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/ra#.mp4" 6 8>>
 				Feeling his cock in your ass, you can't resist the urge to masturbate. Sergey''s rough pounding makes it difficult for you to hold yourself in place and masturbate at the same time, but with some difficulty you manage and let your fingers dart over your clit. Your pussy and clit feel very slippery, probably because of your saliva from the extensive deepthroating earlier.
@@ -1496,7 +1496,7 @@
 			<p>You're quite sensitive in this position. When you're in complete control of riding a man's penis, you can orgasm without ever touching your clitoris! Meanwhile Sergey's hands caress you all over your body, they're everywhere!</p>
 			<<arouse 'vaginal' 10 `['sub','rough']`>>
 			<<actCLA 'Further'>>
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<set $pc.mood = 100>>
 				<<set $pc.pcs_hairbsh = 0>>
 				<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/sex1-4.jpg'`>>
@@ -1546,7 +1546,7 @@
 					<<set $time.minutes += 10>>
 					<<set $pc.mood = 100>>
 					<<gs 'cum_manage'>>
-					<<gs 'cum_call' '' $boy 1>>
+					<<gs 'cum_call' '' $sex.npcId 1>>
 					<<set $pc.pcs_hairbsh = 0>>
 					<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/sex2-5.jpg'`>>
 					Your mouth is wide open, producing lewd moans and cries while Sergey pleases you.
@@ -1627,7 +1627,7 @@
 						<<arouse 'anal' 10 `['sub','rough']`>>
 						<<actCLA 'Continue'>>
 							<<set $pc.mood = 100>>
-							<<gs 'cum_call' '' $boy 1>>
+							<<gs 'cum_call' '' $sex.npcId 1>>
 							<<set $pc.pcs_hairbsh = 0>>
 							<<image `'locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/sex3-7.jpg'`>>
 							<p>"Uncle Sergey, please... fuck me?" you mutter. Why is he making you beg? Doesn't he want this just as much?</p>

sugarcube/src/autogenerated/unsorted/StasSex.tw

@@ -13,12 +13,12 @@
 			<<image "characters/city/stas/sex/sex.jpg">>
 			During the kissing, he manages to get all your clothes off, as well as his own. He pushes your legs up till your knees are pulled up against your chest. He rubs the tip of his dick against your pussy, which is already wet with desire. You moan and try to lift yourself up to take him inside of you, but he keeps teasing you by just rubbing the tip against your pussy.
 			<<gs 'shortgs' 'undress'>>
-			<<run $npcs.inc($boy,'sex',1)>>
+			<<run $npcs.inc($sex.npcId,'sex',1)>>
 			<p>You feel like you almost can't take the teasing anymore when he fully pushes himself inside of you, his dickcm $dick_girth dick filling your pussy up. He gently fucks you, slowly working himself deeper into you while he continues to kiss you and kneed your breasts. You moan in deep pleasure as the two of you make love.</p>
 			<<gs 'dinsex' 'vaginal_sex' 15 'sub'>>
 			<<set $orgasm_or = 'yes'>>
 			<<set $orgasm_txt = '$boydesc groans, and you feel a jet of sperm spurt inside of your body, followed by several more.'>>
-			<<gs 'cum_call' '' $boy 1>>
+			<<gs 'cum_call' '' $sex.npcId 1>>
 			<<gs 'cuminsidereact' $boydesc>>
 			<<actCLA 'Breathe'>>
 				<<set $time.minutes += 5>>

sugarcube/src/autogenerated/unsorted/Terminal.tw

@@ -58,7 +58,7 @@ A large shipping center with many on and off load truck ports.
 				<<gs 'npcgeneratec' 0 'warehouseman' `rand(18,45)`>>
 
 				<<arouse 'bj' 5 `['unknown']`>>
-				<<gs 'cum_call' 'mouth_swallow' $boy>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 				<<image "characters/city/mikhail/sex/trfatherqw_6.jpg">>
 				If they know where your father is, why not, it's not like you haven''t sucked plenty of cock before.
 				The first man invited you into the cabin of his truck, he gets comfortable and pulls out his dick.
@@ -70,8 +70,8 @@ A large shipping center with many on and off load truck ports.
 					<<gs 'npcgeneratec' 0 'warehouseman' `rand(18,45)`>>
 
 					<<arouse 'bj' 5 `['unknown']`>>
-					<<gs 'cum_call' 'mouth_swallow' $boy '' '' 20000 20>>
-					<<gs 'cum_call' 'face' $boy '' '' 20000 20>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId '' '' 20000 20>>
+					<<gs 'cum_call' 'face' $sex.npcId '' '' 20000 20>>
 					<<image "characters/city/mikhail/sex/trfatherqw_7.jpg">>
 					He climbs in almost at once, at least you didn''t have long to wait.
 					You quickly suck his dick as well, he doesn''t even last as long as the last guy. Unlike the previous guy, he pulls your head off his dick just before he cums and shoots his sperm all over your face instead.
@@ -116,26 +116,26 @@ A large shipping center with many on and off load truck ports.
 					<<gs 'npcgeneratec' 0 'warehouseman' `rand(18,45)`>>
 
 					<<arouse 'bj' 5 `['gangbang']`>>
-					<<gs 'cum_call' 'mouth_swallow' $boy>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 					<<gs 'npcgeneratec' 0 'warehouseman' `rand(18,45)`>>
 
 					<<arouse 'bj' 5 `['gangbang']`>>
-					<<gs 'cum_call' 'face' $boy>>
+					<<gs 'cum_call' 'face' $sex.npcId>>
 					<<gs 'npcgeneratec' 0 'warehouseman' `rand(18,45)`>>
 
 					<<arouse 'anal' 5 `['gangbang']`>>
-					<<gs 'cum_call' 'anal' $boy>>
+					<<gs 'cum_call' 'anal' $sex.npcId>>
 					<<gs 'npcgeneratec' 0 'warehouseman' `rand(18,45)`>>
 
-					<<gs 'cum_call' 'vagina' $boy>>
+					<<gs 'cum_call' 'vagina' $sex.npcId>>
 					<<gs 'npcgeneratec' 0 'warehouseman' `rand(18,45)`>>
 
 					<<arouse 'vaginal' 5 `['gangbang']`>>
-					<<gs 'cum_call' 'breasts' $boy>>
+					<<gs 'cum_call' 'breasts' $sex.npcId>>
 					<<gs 'npcgeneratec' 0 'warehouseman' `rand(18,45)`>>
 
 					<<arouse 'anal' 5 `['gangbang']`>>
-					<<gs 'cum_call' 'butt' $boy>>
+					<<gs 'cum_call' 'butt' $sex.npcId>>
 					<<arousalEnd>>
 					<<image "characters/city/mikhail/sex/trfatherqw_12.jpg">>
 					You are barely aware of what they are doing, they quickly strip you naked. Soon you feel a dick being pushed inside or your pussy and ass at the same time.

sugarcube/src/autogenerated/unsorted/Voltrenersex.tw

@@ -147,7 +147,7 @@
 				<<if getvar("$trenerSex") >= 10 and $pc.pcs_throat > 15>>
 					<<actCLA 'Swallow'>>
 						<!-- Boy A69 -->
-						<<gs 'cum_call' 'mouth_swallow' $boy>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 						<<video "locations/pavlovsk/community/gym/volley/sex/voitrensex6.mp4">>
 						He begins pumping his dick into your mouth roughly, then with a final grunt you feel the splash of hot sperm splattering inside of your mouth. Several more spurts fill your mouth up, and you quickly swallow it all.
 						<<actCLA 'Masturbate'>>
@@ -177,7 +177,7 @@
 				<<if getvar("$trenerSex") >= 6>>
 					<<actCLA 'Cum in mouth'>>
 						<!-- Boy A69 -->
-						<<gs 'cum_call' 'mouth_swallow' $boy>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 						<<video "locations/pavlovsk/community/gym/volley/sex/voitrensex10.mp4">>
 						Your actions have an effect. The coach actively moves his hips, thrusting his cock deeper. Without warning, he begins cumming, shooting thick hot spurts of sperm into your mouth. He keeps his dick inside until his final bit of sperm dribbles out, then he pulls it out, watching as you swallow his cum.
 						<<actCLA 'Masturbate'>>
@@ -192,7 +192,7 @@
 				<<if getvar("$trenerSex") >= 3>>
 					<<actCLA 'Stick out your tongue'>>
 						<!-- Boy A69 -->
-						<<gs 'cum_call' 'mouth_swallow' $boy>>
+						<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 						<<video "locations/pavlovsk/community/gym/volley/sex/voitrensex7.mp4">>
 						Feeling his cock surge in your mouth, you understand that he is about to cum. Pulling his dick out of your mouth, you stick out your tongue. He wastes no time jerking himself off, shooting most of his cum into your mouth, though some of it splatters on your lips or rains down on your breasts. You keep your cum coated tongue out until there are no more spurts of sperm. Only then do you close your mouth and swallow his load.
 						<<actCLA 'Masturbate'>>
@@ -406,7 +406,7 @@
 		<<image "characters/pavlovsk/school/teacher/mikhail/sex/bj_1.jpg">>
 		You squat in front of the coach and stroke his crotch, feeling his cock stand up. You reach into his sweatpants, caressing his balls with one hand while the other grabs his throbbing hard cock. You pull it free from his sweatpants and lean toward him, wrapping your lips around the head, before giving him a blowjob he'll never forget.
 		<!-- Boy A69 -->
-		<<gs 'cum_call' 'mouth_swallow' $boy>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 		Coach groans as he fills your mouth with warm sperm. You swallow it all down then open your mouth, sticking out your tongue to show that you had swallowed every drop.
 		<<if getvar("$volleysostav") == 0>>
 			<<set $volleysostav = 1>>
@@ -475,8 +475,8 @@
 													<<arouse 'bj' 10 `['deepthroat']`>>
 													<<actCLA 'Swallow'>>
 														<<arouse 'bj' 5 `['deepthroat']`>>
-														<<gs 'cum_call' 'mouth_swallow' $boy 1>>
-														<<gs 'cum_call' 'face' $boy 1>>
+														<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
+														<<gs 'cum_call' 'face' $sex.npcId 1>>
 														<<set $pc.mood += 20>>
 														<<set $trenerSex += 1>>
 														<<video "locations/pavlovsk/community/gym/volley/sex/voltrenermasaj12.mp4">>
@@ -540,7 +540,7 @@
 								He suddenly pulls out, and at once you feel streams of hot sperm landing on your ass. With a sigh of satisfaction, he puts his dick away as he waits, leaving you to clean the cum off.
 								<<arouse 'anal' 5 >>
 								<<arousalEnd>>
-								<<gs 'cum_call' 'butt' $boy 1>>
+								<<gs 'cum_call' 'butt' $sex.npcId 1>>
 								<<actCLA 'Go with coach'>>
 									<<set $Discoclose = 1>>
 									<!-- !closing disco on this day not to forget  stat-->

sugarcube/src/autogenerated/unsorted/WorkHosp.tw

@@ -135,7 +135,7 @@
 			<<set $picrand = 11>>
 			<<set $sexpartkno = 1>>
 			<<gs 'WorkHosp' 'randdoc'>>
-			<<setinit $boy[1] = $boy>>
+			<<setinit $sex.npcId[1] = $sex.npcId>>
 			<<setinit $boydesc[1] = $boydesc>>
 			<<if getvar("$docfuck["+$randdoc+"]") == 1>>
 				<<setn $guy += 1>>
@@ -193,7 +193,7 @@
 		<<actCLA 'Play with them' undefined `{willpower:['sex','self']}`>>
 				<<set $sexpartkno = 1>>
 				<<gs 'WorkHosp' 'randdoc'>>
-				<<setinit $boy[1] = $boy>>
+				<<setinit $sex.npcId[1] = $sex.npcId>>
 				<<setinit $boydesc[1] = $boydesc>>
 				<<if getvar("$docfuck["+$randdoc+"]") == 1>>
 					<<setn $guy += 1>>

sugarcube/src/autogenerated/unsorted/alex.tw

@@ -8,7 +8,7 @@
 Arriving at Alexey''s apartment, he offers you various alcoholic beverages, and the two of you sit down at a table in the hall to talk to each other.
 After a while of talking and drinking you feel a bit drunk, and Alexey asks you to come closer.
 <<actCLA 'Get on your knees and take it in your mouth'>>
-	<<run $npcs.inc($boy,'sex',1)>>
+	<<run $npcs.inc($sex.npcId,'sex',1)>>
 	<<set $alexeySex += 1>>
 	<<image `'shared/sex/blowjob/bj'+rand(29,41)+'.jpg'`>>
 	Kneeling before him, you unbutton his pants and take a firm grasp of his erect cock.

sugarcube/src/autogenerated/unsorted/andreihunter.tw

@@ -5,7 +5,7 @@
 <<set $menu_off = 1>>
 <!-- Boy A172 -->
 <<set $harakBoy = 2>>
-<<set $boyage = $npcs.get($boy,'dob')>>
+<<set $boyage = $npcs.get($sex.npcId,'dob')>>
 <<set $boyage = ($boyage - $boyage % 10000) / 10000>>
 <<set $boyage = $time.year - $boyage>>
 <<if getvar("$huntersAndreiLove") > 0 and getvar("$huntersAndreiQw") < 10>>

sugarcube/src/autogenerated/unsorted/andrey.tw

@@ -379,7 +379,7 @@
 
 	<</if>>
 	<!-- Boy A101 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<set $young_shop_miss = 0>>
 	<<set $young_shop_salary = 1>>
 	<<set $young_shop_bonus = 2>>

sugarcube/src/autogenerated/unsorted/bed.tw

@@ -315,10 +315,10 @@
 			<<actCLA 'Get up'>>
 				 				<<set $orgasm += 1>>
 				<<gs 'npcgeneratec' 0 'Rapist' `rand(18,40)`>>
-				<<setinit $boy[0] = $npclastgenerated>>
+				<<setinit $sex.npcId[0] = $npclastgenerated>>
 				<<setinit $boydesc[0] = $npcs.get($npclastgenerated,'usedname')>>
 				<<gs 'npcgeneratec' 0 'Rapist' `rand(18,40)`>>
-				<<setinit $boy[1] = $npclastgenerated>>
+				<<setinit $sex.npcId[1] = $npclastgenerated>>
 				<<setinit $boydesc[1] = $npcs.get($npclastgenerated,'usedname')>>
 				<<image "locations/city/residential/apartment/sex/g2.jpg">>
 				You stand up and bend over as one of them stands behind you and stuffs his dick into your pussy.

sugarcube/src/autogenerated/unsorted/bedr.tw

@@ -153,7 +153,7 @@
 					<<set $menu_off = 1>>
 					<<set $husbanstrapon = 2>>
 					<<gs 'boyStat' $HusID>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<image "characters/city/husband/sex/h1.jpg">>
 					<p>You pull out the plug and replace with it with a dildo. $husName doesn't even budge as you slowly move the dildo in and out, trying not to wake him up. You notice his cock starts to get rock hard, and he starts to moan softly in his sleep. His dick starts to throb, like he's going to cum. You take his dick in your mouth and don't need to suck on it for long. You swallow his cum before carefully putting his underpants back on.</p>
 					<<arouse 'bj' 20 >>
@@ -171,7 +171,7 @@
 					<<set $time.minutes += 20>>
 					<<set $husbanstrapon = 3>>
 					<<gs 'boyStat' $HusID>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<set $pc.horny += 30>>
 					<<image "characters/city/husband/sex/h2.jpg">>
 					<p>You put on the strapon and pull out the butt plug. You gently move the shaft of the strap-on inside his ass and $husName moves, but doesn't wake up. You continue to slowly move it in and out, trying not to wake him. You notice his cock is getting rock hard and he starts to moan softly in his sleep. Hoping that he won't wake up, you increase your speed and push the entire length of the strap-on into his ass as you start to stroke his dick. Realizing he's not far from cumming, you pull out and finish him by giving him a blowjob. He cums in your mouth and you swallow before carefully putting his underpants back on.</p>

sugarcube/src/autogenerated/unsorted/bedr2x.tw

@@ -146,7 +146,7 @@ Against the wall is a table with a <<link "mirror">><<gt 'mirror' 'start'>><</li
 					<<set $menu_off = 1>>
 					<<set $husbanstrapon = 2>>
 					<<gs 'boyStat' $HusID>>
-					<<gs 'cum_call' 'mouth_swallow' $boy>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 					<<image "characters/city/husband/sex/h1.jpg">>
 					<p>You pull out the plug and stick the dildo up his ass instead, $husName did not move. You began to slowly move the dildo trying not to wake him. After a bit his dick begins to get hard in front of your face, and $husName moaned softly, but didn't wake up. You start to really work the dildo in his ass, stroking it deep in his ass, before too long his cock started to throb. You wrap your lips around his cock, you barely even started to suck his dick when suddenly your mouth is filled with a jet of sperm, you swallow it all and carefully cleaned his penis, then you pulled his pants back up.</p>
 					<<arouse 'bj' 20 >>
@@ -164,7 +164,7 @@ Against the wall is a table with a <<link "mirror">><<gt 'mirror' 'start'>><</li
 					<<set $time.minutes += 20>>
 					<<set $husbanstrapon = 3>>
 					<<gs 'boyStat' $HusID>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<set $pc.horny += 30>>
 					<<image "characters/city/husband/sex/h2.jpg">>
 					<p>You put on the strapon and pull out the butt plug. You gently move the shaft of the strap-on inside his ass and $husName moves, but doesn't wake up. You continue to slowly move it in and out, trying not to wake him. You notice his cock is getting rock hard and he starts to moan softly in his sleep. Hoping that he won't wake up, you increase your speed and push the entire length of the strap-on into his ass as you start to stroke his dick. Realizing he's not far from cumming, you pull out and finish him by giving him a blowjob. He cums in your mouth and you swallow before carefully putting his underpants back on.</p>

sugarcube/src/autogenerated/unsorted/billiard.tw

@@ -177,7 +177,7 @@ Quite a large billiard room, there are plenty of tables in the main hall, but th
 		<</actCLA>>
 	<<elseif getvar("$billwin") <= 10 and getvar("$billvar") == 2>>
 		You lose, open those legs.
-		<<set $boy to null>>
+		<<set $sex.npcId to null>>
 		<<gs 'npcgeneratec' 0 'Billiard Player' `rand(18,40)`>>
 		
 		<<gs 'npcgeneratec' 0 'Billiard Player' `rand(18,40)`>>

sugarcube/src/autogenerated/unsorted/bordel.tw

@@ -233,7 +233,7 @@
 
 			<</if>>
 			<<set $guy += 3>>
-			<<set $boy to null>>
+			<<set $sex.npcId to null>>
 			<<gs 'npcgeneratec' 0 'Bordel Client' `rand(18,40)`>>
 			
 			<<gs 'npcgeneratec' 0 'Bordel Client' `rand(18,40)`>>

sugarcube/src/autogenerated/unsorted/bouling.tw

@@ -22,10 +22,10 @@
 			<<set $boulingnav += rand(0,3)>>
 			<<set $boulrand = rand(0,9)>>
 			<<gs 'npcgeneratec' 0 'Bowling Player' `rand(18,40)`>>
-			<<setinit $boy[0] = $npclastgenerated>>
+			<<setinit $sex.npcId[0] = $npclastgenerated>>
 			<<setinit $boydesc[0] = $npcs.get($npclastgenerated,'usedname')>>
 			<<gs 'npcgeneratec' 0 'Bowling Player' `rand(18,40)`>>
-			<<setinit $boy[1] = $npclastgenerated>>
+			<<setinit $sex.npcId[1] = $npclastgenerated>>
 			<<setinit $boydesc[1] = $npcs.get($npclastgenerated,'usedname')>>
 			<<actCLA 'Leave'>>
 				<<gt 'bouling'>>

sugarcube/src/autogenerated/unsorted/boy_updater.tw

@@ -2,75 +2,75 @@
 <<set $here = 'boy_updater'>>
 <<set $ARGS = $location_var[$here]>>
 <<if $location_var[$here][0] == 'home_update'>>
-	<<if $npcs.get($boy,'residence') == ''>>
-		<<if $npcs.get($boy,'residence') == 1>>
-			<<run $npcs.set($boy,'finance',0)>>
-			<<run $npcs.set($boy,'residence','pav_res')>>
-		<<elseif $npcs.get($boy,'residence') == 2>>
-			<<run $npcs.set($boy,'finance',0)>>
-			<<run $npcs.set($boy,'residence','student_dorms')>>
-		<<elseif $npcs.get($boy,'residence') == 2>>
-			<<run $npcs.set($boy,'finance',rand(1,2))>>
-			<<run $npcs.set($boy,'residence','city_res')>>
-		<<elseif $npcs.get($boy,'residence') == 2>>
-			<<run $npcs.set($boy,'finance',2)>>
-			<<run $npcs.set($boy,'residence','city_center')>>
+	<<if $npcs.get($sex.npcId,'residence') == ''>>
+		<<if $npcs.get($sex.npcId,'residence') == 1>>
+			<<run $npcs.set($sex.npcId,'finance',0)>>
+			<<run $npcs.set($sex.npcId,'residence','pav_res')>>
+		<<elseif $npcs.get($sex.npcId,'residence') == 2>>
+			<<run $npcs.set($sex.npcId,'finance',0)>>
+			<<run $npcs.set($sex.npcId,'residence','student_dorms')>>
+		<<elseif $npcs.get($sex.npcId,'residence') == 2>>
+			<<run $npcs.set($sex.npcId,'finance',rand(1,2))>>
+			<<run $npcs.set($sex.npcId,'residence','city_res')>>
+		<<elseif $npcs.get($sex.npcId,'residence') == 2>>
+			<<run $npcs.set($sex.npcId,'finance',2)>>
+			<<run $npcs.set($sex.npcId,'residence','city_center')>>
 		<</if>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'fav_body_part'>>
-	<<if $npcs.get($boy,'fav_body_part') == ''>>
+	<<if $npcs.get($sex.npcId,'fav_body_part') == ''>>
 		<<if rand(1,4) == 1>>
-			<<run $npcs.set($boy,'fav_body_part','pussy')>>
+			<<run $npcs.set($sex.npcId,'fav_body_part','pussy')>>
 		<<elseif rand(1,3) == 1>>
-			<<run $npcs.set($boy,'fav_body_part','tits')>>
+			<<run $npcs.set($sex.npcId,'fav_body_part','tits')>>
 		<<elseif rand(1,2) == 2>>
-			<<run $npcs.set($boy,'fav_body_part','ass')>>
+			<<run $npcs.set($sex.npcId,'fav_body_part','ass')>>
 		<<else>>
-			<<run $npcs.set($boy,'fav_body_part','thighs')>>
+			<<run $npcs.set($sex.npcId,'fav_body_part','thighs')>>
 		<</if>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'dick_update'>>
-	<<if $npcs.get($boy,'dick_desc') == ''>>
-		<<if $npcs.get($boy,'dick') < 10>>
-			<<if $npcs.get($boy,'thdick') == 'skinny' or $npcs.get($boy,'thdick') == 'slim'>>
-				<<run $npcs.set($boy,'dick_desc','tiny')>>
-			<<elseif $npcs.get($boy,'thdick') == 'well proportioned' or $npcs.get($boy,'thdick') == 'thicker than average'>>
-				<<run $npcs.set($boy,'dick_desc','short')>>
-			<<elseif $npcs.get($boy,'thdick') == 'thick' or $npcs.get($boy,'thdick') == 'massive' or $npcs.get($boy,'thdick') == 'monstrous'>>
-				<<run $npcs.set($boy,'dick_desc','chode')>>
+	<<if $npcs.get($sex.npcId,'dick_desc') == ''>>
+		<<if $npcs.get($sex.npcId,'dick') < 10>>
+			<<if $npcs.get($sex.npcId,'thdick') == 'skinny' or $npcs.get($sex.npcId,'thdick') == 'slim'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','tiny')>>
+			<<elseif $npcs.get($sex.npcId,'thdick') == 'well proportioned' or $npcs.get($sex.npcId,'thdick') == 'thicker than average'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','short')>>
+			<<elseif $npcs.get($sex.npcId,'thdick') == 'thick' or $npcs.get($sex.npcId,'thdick') == 'massive' or $npcs.get($sex.npcId,'thdick') == 'monstrous'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','chode')>>
 			<</if>>
-		<<elseif $npcs.get($boy,'dick') < 16>>
-			<<if $npcs.get($boy,'thdick') == 'skinny' or $npcs.get($boy,'thdick') == 'slim'>>
-				<<run $npcs.set($boy,'dick_desc','skinny')>>
-			<<elseif $npcs.get($boy,'thdick') == 'well proportioned' or $npcs.get($boy,'thdick') == 'thicker than average'>>
-				<<run $npcs.set($boy,'dick_desc','normal')>>
-			<<elseif $npcs.get($boy,'thdick') == 'thick' or $npcs.get($boy,'thdick') == 'massive' or $npcs.get($boy,'thdick') == 'monstrous'>>
-				<<run $npcs.set($boy,'dick_desc','thick')>>
+		<<elseif $npcs.get($sex.npcId,'dick') < 16>>
+			<<if $npcs.get($sex.npcId,'thdick') == 'skinny' or $npcs.get($sex.npcId,'thdick') == 'slim'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','skinny')>>
+			<<elseif $npcs.get($sex.npcId,'thdick') == 'well proportioned' or $npcs.get($sex.npcId,'thdick') == 'thicker than average'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','normal')>>
+			<<elseif $npcs.get($sex.npcId,'thdick') == 'thick' or $npcs.get($sex.npcId,'thdick') == 'massive' or $npcs.get($sex.npcId,'thdick') == 'monstrous'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','thick')>>
 			<</if>>
-		<<elseif $npcs.get($boy,'dick') < 20>>
-			<<if $npcs.get($boy,'thdick') == 'skinny' or $npcs.get($boy,'thdick') == 'slim'>>
-				<<run $npcs.set($boy,'dick_desc','long')>>
-			<<elseif $npcs.get($boy,'thdick') == 'well proportioned' or $npcs.get($boy,'thdick') == 'thicker than average'>>
-				<<run $npcs.set($boy,'dick_desc','huge')>>
-			<<elseif $npcs.get($boy,'thdick') == 'thick' or $npcs.get($boy,'thdick') == 'massive' or $npcs.get($boy,'thdick') == 'monstrous'>>
-				<<run $npcs.set($boy,'dick_desc','enormous')>>
+		<<elseif $npcs.get($sex.npcId,'dick') < 20>>
+			<<if $npcs.get($sex.npcId,'thdick') == 'skinny' or $npcs.get($sex.npcId,'thdick') == 'slim'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','long')>>
+			<<elseif $npcs.get($sex.npcId,'thdick') == 'well proportioned' or $npcs.get($sex.npcId,'thdick') == 'thicker than average'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','huge')>>
+			<<elseif $npcs.get($sex.npcId,'thdick') == 'thick' or $npcs.get($sex.npcId,'thdick') == 'massive' or $npcs.get($sex.npcId,'thdick') == 'monstrous'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','enormous')>>
 			<</if>>
 		<<else>>
-			<<if $npcs.get($boy,'thdick') == 'skinny' or $npcs.get($boy,'thdick') == 'slim'>>
-				<<run $npcs.set($boy,'dick_desc','lengthy')>>
-			<<elseif $npcs.get($boy,'thdick') == 'well proportioned' or $npcs.get($boy,'thdick') == 'thicker than average'>>
-				<<run $npcs.set($boy,'dick_desc','gigantic')>>
-			<<elseif $npcs.get($boy,'thdick') == 'thick' or $npcs.get($boy,'thdick') == 'massive' or $npcs.get($boy,'thdick') == 'monstrous'>>
-				<<run $npcs.set($boy,'dick_desc','monster')>>
+			<<if $npcs.get($sex.npcId,'thdick') == 'skinny' or $npcs.get($sex.npcId,'thdick') == 'slim'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','lengthy')>>
+			<<elseif $npcs.get($sex.npcId,'thdick') == 'well proportioned' or $npcs.get($sex.npcId,'thdick') == 'thicker than average'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','gigantic')>>
+			<<elseif $npcs.get($sex.npcId,'thdick') == 'thick' or $npcs.get($sex.npcId,'thdick') == 'massive' or $npcs.get($sex.npcId,'thdick') == 'monstrous'>>
+				<<run $npcs.set($sex.npcId,'dick_desc','monster')>>
 			<</if>>
 		<</if>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'stamina_update'>>
-	<<if $npcs.get($boy,'sex_stamina') == 0>>
-		<<run $npcs.set($boy,'sex_stamina',rand(1,10))>>
+	<<if $npcs.get($sex.npcId,'sex_stamina') == 0>>
+		<<run $npcs.set($sex.npcId,'sex_stamina',rand(1,10))>>
 
 	<</if>>
 <</if>>

sugarcube/src/autogenerated/unsorted/cardgame_durak.tw

@@ -296,7 +296,7 @@
 		<<set $card_game_texta = 'I want a boob job from you.'>>
 
 	<</if>>
-	<<if $boy == 'A11'>>
+	<<if $sex.npcId == 'A11'>>
 		<<image "characters/pavlovsk/school/boy/vasya/vasya.jpg">>
 		<p>+func('gopsex','hide','Shulga_var_name')+' ponders for a second, and says: "$card_game_texta"</p>
 		<p>"Are you out of your mind!? There's absolutely no way I'm doing that!", you shout, deeply offended by his suggestion.</p>
@@ -305,7 +305,7 @@
 		<p>+func('gopsex','hide','Shulga_var_name')+' thinks long and hard, and carefully suggests: "$pc.name_nick, how about you perform a little dance for us? You know... shake your boobs, show off your body a little?"</p>
 		You bite your lip while you think for a moment, and then say: "Fine. I'm naked, so it's not like you haven''t seen it all already anyway. I'll do it."
 	<</if>>
-	<<if $boy == 'A10'>>
+	<<if $sex.npcId == 'A10'>>
 		<<image "characters/pavlovsk/school/boy/dan/dan.jpg">>
 		<p>Dan says what he wants: "$pc.name_nick, $card_game_texta"</p>
 		<p>"Are you out of your mind!? There's absolutely no way I'm doing that!", you shout, deeply offended by his suggestion.</p>
@@ -314,7 +314,7 @@
 		<p>Dan shrugs and says: "$pc.name_nick, how about we put up some music, and you shake your tits and perform a nice little dance for the three of us then?"</p>
 		You bite your lip while you think for a moment, and then say: "Fine. I'm naked, so it's not like you haven''t seen it all already anyway. I'll do it."
 	<</if>>
-	<<if $boy == 'A9'>>
+	<<if $sex.npcId == 'A9'>>
 		<<image "characters/pavlovsk/school/boy/vitek/vitek.jpg">>
 		<p>Vitek confidently says: "$card_game_texta"</p>
 		<p>"Are you out of your mind!? There's absolutely no way I'm doing that!", you shout, deeply offended by his suggestion.</p>
@@ -389,12 +389,12 @@
 						You gasp loudly once you can breathe again, and sob and retch for a while... with Dan still fucking you all the same. You can tell Vitek feels bad for pushing you too hard, and you give him a grateful look when he lets go of your head and lets you take over again. You carefully lick and kiss the head of his penis for a moment, as your way of thanking him.
 						<<actCLA 'Continue'>>
 							<<set $time.minutes += 5>>
-							<<gs 'cum_call' 'face' $boy[2] 1 '' '' 30>>
-							<<gs 'cum_call' 'hair' $boy[2] 1 '' '' 10>>
-							<<gs 'cum_call' 'face' $boy[1] 1 '' '' 10>>
-							<<gs 'cum_call' 'hair' $boy[1] 1 '' '' 30>>
-							<<gs 'cum_call' 'face' $boy[3] 1 '' '' 30>>
-							<<gs 'cum_call' 'breasts' $boy[3] 1 '' '' 10>>
+							<<gs 'cum_call' 'face' $sex.npcId[2] 1 '' '' 30>>
+							<<gs 'cum_call' 'hair' $sex.npcId[2] 1 '' '' 10>>
+							<<gs 'cum_call' 'face' $sex.npcId[1] 1 '' '' 10>>
+							<<gs 'cum_call' 'hair' $sex.npcId[1] 1 '' '' 30>>
+							<<gs 'cum_call' 'face' $sex.npcId[3] 1 '' '' 30>>
+							<<gs 'cum_call' 'breasts' $sex.npcId[3] 1 '' '' 10>>
 							<<arousalEnd>>
 							<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/sex/gsex/ev1_7.jpg">>
 							A little while later the guys tell you to get down on your knees, and surround you. They jerk themselves off, and shoot their hot cum all over your face and in your hair.
@@ -413,13 +413,13 @@
 <!-- !when years lost cards (turnip fame['pav_slut'] >= 150), rough sex-->
 <<if $location_var[$here][0] == 'card_game_rough_sex'>>
 	<<arouse 'bj' 5 `['deepthroat','sub']`>>
-	<<run $npcs.inc($boy,'sex',1)>>
+	<<run $npcs.inc($sex.npcId,'sex',1)>>
 	<<video "locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/sexrough/bj#.mp4" 1 10>>
 	<p>$boydesc unceremoniously moves up to you, and thrusts his erect dick into your mouth without saying a word.</p>
 	"This is for you, slut", he hisses as he grabs your hair in his hands, and begins to thrust his hips against your face, fucking your throat roughly.
 	<<actCLA 'Continue'>>
 		<<arouse 'anal' 10 >>
-		<<gs 'cum_call' 'anus' $boy 1>>
+		<<gs 'cum_call' 'anus' $sex.npcId 1>>
 		<<video "locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/sexrough/sex1_#.mp4" 1 10>>
 		<p>"I want your ass next, bitch", $boydesc says. "Get on your hands and knees, and offer yourself to me."</p>
 		You hesitantly do as he says, spreading your buttocks with your hands once you lower yourself to the ground.
@@ -440,15 +440,15 @@
 		<p>Then $boydesc shoots his load inside your ass, and says with a grin: "Who's next? If we want her to be a good little butt slut for us in the future, she's going to need more training! Stretch that hole, guys!"</p>
 		<<actCLA 'Continue'>>
 			<<set $gang += 1>>
-			<<gs 'boyStat' $boy 'c'>>
-			<<if $boy == 'A9'>>
+			<<gs 'boyStat' $sex.npcId 'c'>>
+			<<if $sex.npcId == 'A9'>>
 				<<gs 'boyStat' 'A10' 'a' else gs 'boyStat' 'A9' 'a'>>
 
 			<</if>>
 			<<arouse 'anal' 8 `['dick1','gangbang']`>>
 			<<gs 'cum_call' 'anus' $boy1 1>>
 			<<run $npcs.inc($boy1,'sex',1)>>
-			<<if $boy == 'A11'>>
+			<<if $sex.npcId == 'A11'>>
 				<<gs 'boyStat' 'A10' 'b' else gs 'boyStat' 'A11' 'b'>>
 
 			<</if>>
@@ -483,15 +483,15 @@
 <</if>>
 <<if $location_var[$here][0] == 'card_game_casual_sex'>>
 	<<set $time.minutes += 5>>
-	<<if $boy == 'A11'>>
+	<<if $sex.npcId == 'A11'>>
 		<<image "characters/pavlovsk/school/boy/vasya/vasya.jpg">>
 
 	<</if>>
-	<<if $boy == 'A10'>>
+	<<if $sex.npcId == 'A10'>>
 		<<image "characters/pavlovsk/school/boy/dan/dan.jpg">>
 
 	<</if>>
-	<<if $boy == 'A9'>>
+	<<if $sex.npcId == 'A9'>>
 		<<image "characters/pavlovsk/school/boy/vitek/vitek.jpg">>
 
 	<</if>>
@@ -602,7 +602,7 @@
 	<p>You leave the apartment with the guys, who are clearly excited to see this plan of yours play out. "Let's go find a nice girl for $loss_npc_name, guys!" you shout happily.</p>
 	<<actCLA 'Continue'>>
 		<<arouse 'bj' 10 >>
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<p>After a few minutes, you find someone. "Alright, $loss_npc_name, come here", you whisper to him as you drag him out of view.</p>
 		You quickly drop to your knees and take his cock in your mouth, giving him a skilful blowjob. The other guys are actually a bit jealous when they see you on your knees before your friend, and pull out their phones to record you:
 		<<video "locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/street_event/bj#.mp4" 1 2>>
@@ -623,13 +623,13 @@
 <!-- !When the years won, make a wish (turnip fame['pav_slut'] >= 150), lick-->
 <<if $location_var[$here][0] == 'card_game_gg_lick'>>
 	<<set $time.minutes += 1>>
-	<<run $npcs.inc($boy,'sex',1)>>
-	<<if $boy == 'A11'>>
+	<<run $npcs.inc($sex.npcId,'sex',1)>>
+	<<if $sex.npcId == 'A11'>>
 		<<$loss_npc_img>>
 		<p>You grin: "I'm actually feeling rather horny. Be a dear and lick my pussy for me, would you?"</p>
 		<p>Vasily grins eagerly and says: "What, really? I thought you were going to make me do something I didn't want to do!"</p>
 		He eagerly drops to his knees and begins to lick your wet snatch, being egged on by his friends.
-	<<elseif $boy == 'A10'>>
+	<<elseif $sex.npcId == 'A10'>>
 		<<$loss_npc_img>>
 		You look at Dan commandingly, and tell him: "Dan, lick my pussy. Now."
 		Dan is not particularly eager, but he lost. And rules are rules. He obediently puts his tongue against your pussy, and reluctantly begins to eat you out.
@@ -660,12 +660,12 @@
 <!-- !When the years won, make a wish (turnip fame['pav_slut'] >= 150), sex-->
 <<if $location_var[$here][0] == 'card_game_gg_sex'>>
 	<<set $time.minutes += 1>>
-	<<run $npcs.inc($boy,'sex',1)>>
-	<<if $boy == 'A11'>>
+	<<run $npcs.inc($sex.npcId,'sex',1)>>
+	<<if $sex.npcId == 'A11'>>
 		<<$loss_npc_img>>
 		<p>You smile at Vasily and say: "Vasily, dear... it's been a while since a real man fucked my ass. Perhaps you could help me with that?"</p>
 		<p>Vasily's eyes light up, he was expecting you to pick something humiliating. Instead, he gets to fuck you!? He immediately grabs you by the arm and drags you go the couch, before you can change your mind.</p>
-	<<elseif $boy == 'A10'>>
+	<<elseif $sex.npcId == 'A10'>>
 		<<$loss_npc_img>>
 		<p>"Hey Dan, when is the last time you fucked a girl in the ass?" you prompt.</p>
 		"Uhhh..." Dan replies, not sure what to say.

sugarcube/src/autogenerated/unsorted/cfnm.tw

@@ -126,7 +126,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'blow3'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<set $fotoCFNMblowjobCum += 1>>
 	<<image "locations/city/redlight/stripclub/sex/swallow.jpg">>
 	The stripper pulls his dick from between your lips and begins stroking it quickly in front of your face. You await your prize humbly on your knees, mouth open. Finally, viscous jets of sperm begin squirting into your mouth and you attempt to catch every strand. After the stripper is done, you lick the tart cum from your lips before cleaning his cock obediently. The shame and excitement builds within you as you hear the spectators whooping and catcalling you.

sugarcube/src/autogenerated/unsorted/cum_call.tw

@@ -29,7 +29,7 @@ gs 'cum_call', 'anus', 'Kolka', 1 - for a known partner
 gs 'cum_call', 'anus' - for an unknown partner named "unknown", or
 gs 'cum_call', 'anus', 'plumber' - for an unknown partner named "plumber"} -->
 <<if $location_var[$here][0] != 'precum'>>
-	<<set $cumboy = $boy>>
+	<<set $cumboy = $sex.npcId>>
 	<<if $location_var[$here][5] != 0>>
 		<<set $sexvolume = $ARGS[5]>>
 	<</if>>
@@ -125,7 +125,7 @@ gs 'cum_call', 'anus', 'plumber' - for an unknown partner named "plumber"} -->
 	<</if>>
 	<!-- !{'boy <<$boydesc>> loc <<spafinloc>> contra <<sexcontra>> vol <<sexvolume>> ppt <<sexspecpot>> know <<sexpartkno>> unaware <<sexunaware>> cumboy <<$cumboy>>'} -->
 	<<gs 'cum_manage'>>
-	<<set $boy = $cumboy>>
+	<<set $sex.npcId = $cumboy>>
 	<<set $sexcontra = 0>>
 <<else>>
 	<!-- !This is to check for pregnancy and stds from precum. It is added for readability when it is used in the code.-->

sugarcube/src/autogenerated/unsorted/dimaEv.tw

@@ -123,7 +123,7 @@
 		<<arouse 'bj' 15 `['sub']`>>
 		<<if getvar("$dimadalrand") == 0>>
 			<<actCLA 'Further'>>
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<set $dimasexday = $time.daystart>>
 				<<video "characters/pavlovsk/school/boy/dimka/sex/bjcum.mp4">>
 				<p>Your sense of time seems altered, minutes?, hours?, it doesn't seem to be important, you just keep sucking his cock as it is the only thing in your little world. Suddenly, Dimka's cock spurts cum in your mouth and you continue sucking without care, adding spit to the mess. Finally, Dimka ceases to ejaculate and you instinctively swallow his cum.</p>
@@ -150,7 +150,7 @@
 			<</actCLA>>
 		<<elseif getvar("$dimadalrand") == 2>>
 			<<actCLA 'Further'>>
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<if $pc.pcs_throat < 16>>
 					<<setn $pc.pcs_throat += 1>>
 
@@ -391,7 +391,7 @@
 		<<image "characters/pavlovsk/school/boy/dimka/sex/ogag.jpg">>
 		<p>Your mouth is being held widely open by the ring and Dimka seems a little blurry due to your eyes watering. It tastes like the ring in your mouth was dipped in lemon juice and your saliva begins streaming from your mouth. Dimka takes a moment to admire you then he takes out his iron hard dickcm $dick_girth cock and shoves it into your mouth.</p>
 		<<actCLA 'Further'>>
-			<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+			<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 			<<if $pc.pcs_makeup != 1>>
 				<<set $pc.pcs_makeup = 0>>
 
@@ -412,7 +412,7 @@
 		<<set $maxdradrug = 2>>
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if $pc.pcs_makeup != 1>>
 		<<set $pc.pcs_makeup = 0>>
 
@@ -582,7 +582,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'dimkaabuse9'>>
 	<<set $bja += 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<set $dimaFilm = 1>>
 	<!-- Boy A1 -->
 	<<image "characters/pavlovsk/school/boy/dimka/sex/filming.jpg">>
@@ -606,7 +606,7 @@
 		<p>Your mouth is held wide open by the ring-gag, Dimka apparently coated the ring with lemon juice, causing saliva to flow from your mouth, and there is no way to stop it.</p>
 		<<arouse 'foreplay' 5 `['sub','humiliation']`>>
 		<<actCLA 'Further'>>
-			<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+			<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 			<<image "characters/pavlovsk/school/boy/dimka/sex/gagbj.jpg">>
 			<p>Dimka slips his dickcm $dick_girth dick through the ring in your mouth and rams it down your throat. You're choking a bit, Dimka then drives his dick as far down your throat as it will go. Drool flows from your mouth, tears from your eyes and snot from your nose. Dimka furiously drives his penis in your mouth, causing your throat to feel like it is burning.</p>
 			<p>Finally, he groans and with his cock balls deep in your mouth, he begins to cum in your throat. You almost faint from suffocation. Finally Dimka pulls his dick out of your mouth, then he takes the ring-gag out of your mouth and uncuff your hands.</p>

sugarcube/src/autogenerated/unsorted/dinSex.tw

@@ -456,7 +456,7 @@
 		<<set $analplugout to null>>
 	<</if>>
 <</if>>
-<!-- !! this procedure calls 'cum_call','anus',$boy,1-->
+<!-- !! this procedure calls 'cum_call','anus',$sex.npcId,1-->
 <!-- !! use gs 'dinSex','boy_wants_anal'[,'lubri'] together with gs 'dinsex','analsex'-->
 <<if $location_var[$here][0] == 'analsex'>>
 	<!-- FAILED TO CONVERT
@@ -497,9 +497,9 @@
 		<p>You savor $xyr cock moving inside you, lightly moaning in rhythm.</p>
 	<</if>>
 	<p>After some time $boydesc groans and you feel $xyr cock pulsing inside you and a pleasant warmth filling your ass.</p>
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 <</if>>
-<!-- !! this procedure calls 'cum_call','',$boy,1-->
+<!-- !! this procedure calls 'cum_call','',$sex.npcId,1-->
 <!-- !! use gs 'dinsex','sexcum'-->
 <<if $location_var[$here][0] == 'sexcum'>>
 	<<set $pc.frost = 0>>
@@ -520,16 +520,16 @@
 
 			<</if>>
 			<<gs 'cuminsidereact' $boydesc>>
-			<<gs 'cum_call' '' $boy 1>>
+			<<gs 'cum_call' '' $sex.npcId 1>>
 		<<else>>
 			<!-- !!Out-->
 			<<if getvar("$pose") == 0>>
 				<<set $spafinloc = 14>>
 				<p>$boydesc groans and after pulling out $xyr dick, $xe came on your stomach.</p>
-				<<gs 'cum_call' 'stomach' $boy 1>>
+				<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 			<<elseif getvar("$pose") == 1>>
 				<p>$boydesc groans and after pulling out $xyr dick, $xe came on your ass.</p>
-				<<gs 'cum_call' 'butt' $boy 1>>
+				<<gs 'cum_call' 'butt' $sex.npcId 1>>
 			<</if>>
 		<</if>>
 	<<else>>
@@ -541,7 +541,7 @@
 			<p>Pulling out of you and looking at $xyr dick, $boydesc said "Fuck! The condom is missing."</p>
 		<</if>>
 		<<set $eff_contra = $sexcontra>>
-		<<gs 'cum_call' '' $boy 1 $sexcontra>>
+		<<gs 'cum_call' '' $sex.npcId 1 $sexcontra>>
 		<<gs 'cuminsidereact' $boydesc $eff_contra>>
 		<<set $protect = 0>>
 	<</if>>

sugarcube/src/autogenerated/unsorted/dina.tw

@@ -174,12 +174,12 @@
 	<<if getvar("$fertegg") > 0>>
 		<<if $pc.thinkpreg == 0 and $pc.knowpreg == 0 and getvar("$sparrppt["+$sparrtemp+"]") > 0>>
 			<<if getvar("$cumarrkno["+$cumarrtemp+"]") == 1>>
-				<<if arrcomp('$cumfthname',$boy) == -1>>
+				<<if arrcomp('$cumfthname',$sex.npcId) == -1>>
 					<<set $i = arrsize('$cumfthname')>>
-					<<setinit $cumfthname[$i] = $boy>>
+					<<setinit $cumfthname[$i] = $sex.npcId>>
 					<<setinit $cumtime[$i] = 1>>
 				<<else>>
-					<<set $i = arrpos('$cumfthname', $boy)>>
+					<<set $i = arrpos('$cumfthname', $sex.npcId)>>
 					<<setinit $cumtime[$i] += 1>>
 				<</if>>
 			<<elseif getvar("$cumarrkno["+$cumarrtemp+"]") == 0>>

sugarcube/src/autogenerated/unsorted/dinnpc.tw

@@ -42,9 +42,9 @@
 				<<actCLA 'Catch your breath'>>
 					<<set $time.minutes += 5>>
 					<!-- Boy A1 -->
-					<<gs 'cum_call' 'face' $boy 1 '' '' 20>>
-					<<gs 'cum_call' 'hair' $boy 1 '' '' 10>>
-					<<gs 'cum_call' 'clothes' $boy 1 '' '' 10>>
+					<<gs 'cum_call' 'face' $sex.npcId 1 '' '' 20>>
+					<<gs 'cum_call' 'hair' $sex.npcId 1 '' '' 10>>
+					<<gs 'cum_call' 'clothes' $sex.npcId 1 '' '' 10>>
 					<<set $dimasexday = $time.daystart>>
 					<<image "characters/pavlovsk/school/boy/dimka/sex/cocksucker4.jpg">>
 					You fall back onto your haunches, panting, your face completely covered in snot, tears and drool, all but oblivious to what Dimka is doing until a jet of sperm erupts from his cock and hits your face, then another, and another. Your whole face is covered with a layer of mucus, a bizarre mix of four body fluids, and yet all you care about is catching your breath before Dimka has any other ideas. You seem to be in luck, though, because after he wipes his cock on your hair, he tucks it back into his pants.

sugarcube/src/autogenerated/unsorted/dinsexFX.tw

@@ -25,7 +25,7 @@
 <</widget>>
 :: vagstart2_macro[widget]
 <<widget 'vagstart2'>>
-	<!-- !need $boy, dick and silavag-->
+	<!-- !need $sex.npcId, dick and silavag-->
 	<<set $pc.frost = 0>>
 	<<set $pc.horny += 10>>
 	<<set $time.minutes += 10>>

sugarcube/src/autogenerated/unsorted/eugeneev1.tw

@@ -17,7 +17,7 @@
 			<!-- Boy A89 -->
 			<<set $LCEugenefirst = 1>>
 			<<run $npcs.set('A89','QW',2)>>
-			<<run $npcs.inc($boy,'sex',1)>>
+			<<run $npcs.inc($sex.npcId,'sex',1)>>
 			<<image "characters/city/eugene/sex/firsttimebj1.jpg">>
 			You smile as you walk over to her, and she bites her lip as you drop to your knees and start sucking her cock. You feel it rapidly growing and stiffening in your mouth as you suck on it, and it's soon rock hard and completely filling your mouth.
 			<<arouse 'bj' 2 >>

sugarcube/src/autogenerated/unsorted/event.tw

@@ -54,7 +54,7 @@
 	<p>You get on your knees, unbutton his pants, and dramatically immerse yourself in sucking his member, looking up as his face relaxs. After a few minutes the $loverdesc[$lover_number] tenses in anticipation of orgasm</p>
 	<<arouse 'bj' 5 `['sub']`>>
 	<<actCLA 'Continue sucking.'>>
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<image "shared/sex/cum/mouth/cum30.jpg">>
 		<p>A jet of hot sperm hits you in the mouth. You begin to swallow cum, and $loverdesc[$lover_number] continues to cum in your mouth. Finally, the flow of hot pungent liquid stops.</p>
 		<<actCLA 'Leave'>>
@@ -287,7 +287,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'dima12'>>
 	<<set $pc.pcs_throat += 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<image "characters/city/dmitry/sex/dima8.jpg">>
 	You feel his cock stiffen and begin to fire warm sperm down your throat. He finishes with a contented sigh, then, in a vicious tone he orders you, "Lick by balls to a shine, otherwise no breakfast for you."
 	<<arouse 'bj' 10 `['sub','deepthroat','rough','bound']`>>
@@ -317,7 +317,7 @@
 	 	<<image "characters/city/dmitry/sex/dima9.jpg">>
 	You remember having seen this done in a porno, and try to emulate. Your tongue and lips lick and kiss every millimeter, moistening the tender skin. Then a smooth transition to his cock which you swallow whole, he immediately pushes against your head and rapidly fucks your throat again, without releasing, until his cock starts convulse
 	<<arouse 'bj' 10 `['sub','group','deepthroat','rough','bound']`>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<actCLA 'Swallow'>>
 		<<gt 'event' 'dima15'>>
 	<</actCLA>>
@@ -608,7 +608,7 @@
 	<<set $pc.pcs_throat += 1>>
 	<<gs 'npcgeneratec' 0 'gloryhole stranger' `rand(19,45)`>>
 
-	<<gs 'cum_call' 'mouth_swallow' $boy>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 	<<run $pc.sexStatInc('gloryhole','aware',1)>>
 	<<image "locations/city/residential/street/sex/15933_markdavisdonnaannika_447.jpg">>
 	When you're downstairs, the girl moves you into a dark room with a round hole in one wall. Almost immediately, a cock appears from the hole.
@@ -631,7 +631,7 @@
 	<<warn 'JUMP MARKER ENCOUNTERED: :gloryhole1'>>
 	<<gs 'npcgeneratec' 0 'stranger' `rand(19,45)`>>
 
-	<<gs 'cum_call' 'mouth_swallow' $boy>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 	<<run $pc.sexStatInc('gloryhole','aware',1)>>
 	<<set $dimagh_counter += 1>>
 	<<if getvar("$dimagh_counter") <= 8>>
@@ -669,7 +669,7 @@
 	<<warn 'JUMP MARKER ENCOUNTERED: :gloryhole2'>>
 	<<gs 'npcgeneratec' 0 'stranger' `rand(19,45)`>>
 
-	<<gs 'cum_call' 'mouth_swallow' $boy>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 	<<run $pc.sexStatInc('gloryhole','aware',1)>>
 	<<set $dimagh_counter += 1>>
 	<<if getvar("$dimagh_counter") <= 8>>
@@ -723,7 +723,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'dima51'>>
 	<<set $pc.pcs_throat += 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<set $spafinloc = 11>>
 	<<gs 'cum_manage'>>
 	<<image "locations/city/residential/street/sex/10022_paristommy_088.jpg">>
@@ -738,11 +738,11 @@
 	<<set $pc.pcs_throat += 2>>
 	<<gs 'npcgeneratec' 0 'stranger' `rand(19,45)`>>
 
-	<<gs 'cum_call' 'mouth_swallow' $boy>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 	<<gs 'npcgeneratec' 0 'stranger' `rand(19,45)`>>
 
-	<<gs 'cum_call' 'face' $boy 0 '' '' 20>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 0 '' '' 20>>
+	<<gs 'cum_call' 'face' $sex.npcId 0 '' '' 20>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 0 '' '' 20>>
 	<<set $finances.cash = 0>>
 	<<image "locations/city/residential/street/sex/10022_paristommy_308.jpg">>
 	Enraged by your refusal, the man pushes you, grabs your stuff, and throws it into the river. You manage to salvage your clothes, but the your money is lost.

sugarcube/src/autogenerated/unsorted/fbDormD.tw

@@ -235,7 +235,7 @@
 <<widget 'd_fbd_mass'>>
 	<<actCLA 'Drink the booze'>>
 		<<set $menu_off = 1>>
-		<<set $boy += 2>>
+		<<set $sex.npcId += 2>>
 		<<set $gang += 1>>
 		<<set $parkfuckboy += 1>>
 		<<set $fbdormtimes += 1>>
@@ -343,7 +343,7 @@
 					<<set $pose = 1>>
 					<<gs 'npcgeneratec' 0 '$boydesc's friend' `rand(19,45)`>>
 					<<gs 'boyStat' $npclastgenerated 'b'>>
-					<<gs 'boyStat' $boy 'a'>>
+					<<gs 'boyStat' $sex.npcId 'a'>>
 					<<set $dp += 1>>
 					<<image "locations/pavlovsk/park/sex/fbdrdp.jpg">>
 					<p>Teasingly slowly you lower your body, feeling $boydesc's dick sinking further and further into you. You lean forward and kiss him, and suddenly $boydesc stops moving his hips. When you try to ask him why, you suddenly feel something warm and hard press against your sphincter. Damn, they're both going to fuck you at the same time!? You were not expecting this...</p>

sugarcube/src/autogenerated/unsorted/furisex.tw

@@ -117,7 +117,7 @@
 	<<set $furibj += 1>>
 	<<set $furiswallow += 1>>
 	<<gs 'dinSex' 'std_trigger_oral'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 	<<if getvar("$furibj") >= 5>>
 		<<video "locations/highway/sex/bj (1).mp4">>
 	<<else>>

sugarcube/src/autogenerated/unsorted/gdktoilet_mens.tw

@@ -356,7 +356,7 @@
 						<<actCLA 'Climax again'>>
 							<<set $pc.mood += 15>>
 							<<set $time.minutes += 5>>
-							<<gs 'cum_call' 'face' $boy>>
+							<<gs 'cum_call' 'face' $sex.npcId>>
 							<<image "locations/pavlovsk/community/bathroom/mens/sex/mensmast4.jpg">>
 							<<set $orgasm_or = 'custom'>>
 							<<set $orgasm_txt = 'You continue to rub your clit more and more when all of a sudden you explode into another orgasm. The man tells you he`s about to cum and you stop sucking his dick. The second you stop sucking he cums around your mouth.'>>

sugarcube/src/autogenerated/unsorted/gopnew.tw

@@ -706,7 +706,7 @@
 			<p>"What are you waiting for, whore?" he grunts, when he's finished. "Clean me up with your tongue!"</p>
 			<<actCLA 'Lick his cock with your tongue'>>
 				<<set $time.minutes += 3>>
-				<<gs 'cum_call' 'mouth_swallow' $boy>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 				<<image "locations/city/residential/street/sex/rapebjcum2.jpg">>
 				You close your eyes as you close your lips around the head of his cock again, not wanting to look him in the eye while you swallow his load and lick him clean.
 				<p>"Vasan pulls his cock away when he's bored of it, and says: "Listen up, whore. You just got yourself into a heap of trouble. As an apology, you will bring me 2,000 <b>₽</b> every day for as long as I want. I will fuck you whenever I want as well, got that?"</p>
@@ -988,7 +988,7 @@
 		Several powerful jets of sperm land in your mouth, and you keep sucking until you're sure he's finished.
 		<p>You show him the load you caught in your mouth, earning yourself a satisfied grin from $boydesc.</p>
 		<<actCLA 'Swallow his load'>>
-			<<gs 'cum_call' 'mouth_swallow' $boy>>
+			<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 			<p>You swallow $boydesc's sperm diligently after which he wipes his dick on your lips, making you lick the last remains off. Once he's satisfied, he pulls his pants up again and returns to his friends.</p>
 			<<arousalEnd>>
 			<<actCLA 'Leave'>>
@@ -996,7 +996,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Spit it out'>>
-			<<gs 'cum_call' 'mouth' $boy>>
+			<<gs 'cum_call' 'mouth' $sex.npcId>>
 			<p>You wait for $boydesc to turn his back on you, and discreetly spit the semen onto the ground. He doesn't seem to care what you do with it, he's already walking away from you.</p>
 			<<arousalEnd>>
 			<<actCLA 'Leave'>>

sugarcube/src/autogenerated/unsorted/gopsex.tw

@@ -974,7 +974,7 @@
 	<!-- !Cum in mouth-->
 	<<if $location_var[$here][1] == 'shgopsex_swallow'>>
 		<<set $time.minutes += '+rand(1,3)+'>>
-		<<gs 'cum_call' 'mouth' $boy 1>>
+		<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 		<<image "pc/body/cum/swallow/swallow#.jpg" 1 19>>
 		<<gs 'gopsex' 'hide' 'text_sex_cumm'>>
 		<<actCLA 'Leave'>>
@@ -984,7 +984,7 @@
 	<!-- !Cum on face-->
 	<<if $location_var[$here][1] == 'shgopsex_cumface'>>
 		<<set $time.minutes += '+rand(1,3)+'>>
-		<<gs 'cum_call' 'face' $boy 1>>
+		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<<if $pc.hairColor < 4>>
 			<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/<<$pc.hairColor>>/'+rand(1,19)+'.jpg"></center>
 
@@ -1001,7 +1001,7 @@
 	<!-- !Cum on body-->
 	<<if $location_var[$here][1] == 'shgopsex_cumbelly'>>
 		<<set $time.minutes += '+rand(1,3)+'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 		<<image "pc/body/cum/cumbelly/cumbelly#.jpg" 1 13>>
 		<<gs 'gopsex' 'hide' 'text_sex_cumbody'>>
 		<<actCLA 'Leave'>>
@@ -1011,7 +1011,7 @@
 	<!-- !Cum in pussy-->
 	<<if $location_var[$here][1] == 'shgopsex_cumvag'>>
 		<<set $time.minutes += '+rand(1,3)+'>>
-		<<gs 'cum_call' '' $boy 1>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
 		<<image "pc/body/cum/creampie/cumpussy#.jpg" 1 17>>
 		<<gs 'gopsex' 'hide' 'text_sex_cumvag'>>
 		<<actCLA 'Leave'>>
@@ -1021,7 +1021,7 @@
 	<!-- !ending in the ass-->
 	<<if $location_var[$here][1] == 'shgopsex_cumanal'>>
 		<<set $time.minutes += '+rand(1,3)+'>>
-		<<gs 'cum_call' 'anus' $boy 1>>
+		<<gs 'cum_call' 'anus' $sex.npcId 1>>
 		<<image "pc/body/cum/cumanal/cumanal#.jpg" 1 11>>
 		<<gs 'gopsex' 'hide' 'text_sex_cumass'>>
 		<<actCLA 'Leave'>>
@@ -1201,11 +1201,11 @@
 		<<set $time.minutes += '+rand(2,5)+'>>
 		<<set $O = func('gopsex','hide','rndorder3')>>
 		<<gs 'boyStat' 'AO mod 12'>>
-		<<gs 'cum_call' 'face' $boy 1>>
+		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<<gs 'boyStat' 'A(O/12) mod 12'>>
-		<<gs 'cum_call' 'face' $boy 1>>
+		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<<gs 'boyStat' 'AO/144'>>
-		<<gs 'cum_call' 'hair' $boy 1>>
+		<<gs 'cum_call' 'hair' $sex.npcId 1>>
 		<<set $O to null>>
 		<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/group/cum/cumface#.jpg" 1 17>>
 		<p>The '+func('gopsex','hide','gop_text_npcr')+' spray their cum all over your face</p>
@@ -1220,11 +1220,11 @@
 		<<set $time.minutes += '+rand(2,5)+'>>
 		<<set $O = func('gopsex','hide','rndorder3')>>
 		<<gs 'boyStat' 'AO mod 12'>>
-		<<gs 'cum_call' 'mouth' $boy 1>>
+		<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 		<<gs 'boyStat' 'A(O/12) mod 12'>>
-		<<gs 'cum_call' 'mouth' $boy 1>>
+		<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 		<<gs 'boyStat' 'AO/144'>>
-		<<gs 'cum_call' 'face' $boy 1>>
+		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<<set $O to null>>
 		<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/group/cum/swallow#.jpg" 1 12>>
 		<p>One by one the '+func('gopsex','hide','gop_text_npcr')+' cum their semen into your mouth and you swallow it all.</p>
@@ -1239,11 +1239,11 @@
 		<<set $time.minutes += '+rand(2,5)+'>>
 		<<set $O = func('gopsex','hide','rndorder3')>>
 		<<gs 'boyStat' 'AO mod 12'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 		<<gs 'boyStat' 'A(O/12) mod 12'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 		<<gs 'boyStat' 'AO/144'>>
-		<<gs 'cum_call' 'breasts' $boy 1>>
+		<<gs 'cum_call' 'breasts' $sex.npcId 1>>
 		<<set $O to null>>
 		<<arousalEnd>>
 		<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/group/cum/cumbody#.jpg" 1 15>>
@@ -1258,11 +1258,11 @@
 		<<set $time.minutes += '+rand(2,5)+'>>
 		<<set $O = func('gopsex','hide','rndorder3')>>
 		<<gs 'boyStat' 'AO mod 12'>>
-		<<gs 'cum_call' 'labia' $boy 1>>
+		<<gs 'cum_call' 'labia' $sex.npcId 1>>
 		<<gs 'boyStat' 'A(O/12) mod 12'>>
-		<<gs 'cum_call' 'labia' $boy 1>>
+		<<gs 'cum_call' 'labia' $sex.npcId 1>>
 		<<gs 'boyStat' 'AO/144'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 		<<set $O to null>>
 		<<arousalEnd>>
 		<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/group/cum/cumvag#.jpg" 1 4>>
@@ -1277,11 +1277,11 @@
 		<<set $time.minutes += '+rand(2,5)+'>>
 		<<set $O = func('gopsex','hide','rndorder3')>>
 		<<gs 'boyStat' 'AO mod 12'>>
-		<<gs 'cum_call' 'anus' $boy 1>>
+		<<gs 'cum_call' 'anus' $sex.npcId 1>>
 		<<gs 'boyStat' 'A(O/12) mod 12'>>
-		<<gs 'cum_call' 'butt' $boy 1>>
+		<<gs 'cum_call' 'butt' $sex.npcId 1>>
 		<<gs 'boyStat' 'AO/144'>>
-		<<gs 'cum_call' 'butt' $boy 1>>
+		<<gs 'cum_call' 'butt' $sex.npcId 1>>
 		<<set $O to null>>
 		<<arousalEnd>>
 		<<image "pc/body/cum/cumass/cumass#.jpg" 1 19>>

sugarcube/src/autogenerated/unsorted/gopskver.tw

@@ -589,7 +589,7 @@
 		<<arouse 'bj' 5 `['group']`>>
 		<!-- Boy A9 -->
 		<<arouse 'bj' 5 `['group']`>>
-		<<gs 'cum_call' 'mouth_swallow' $boy>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 		<<gs 'willpower' 'self' 'anal' 'easy'>>
 		<<if getvar("$BjBeerQW") == 1>>
 			<<actCLA 'Serve the others'>>
@@ -610,7 +610,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'BjBeerPas'>>
 	<<set $time.minutes += 30>>
-	<<gs 'cum_call' 'mouth_swallow' $boy>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId>>
 	<<run $pc.sexStatInc('bj','aware',1)>>
 	<<set $BjBeerActiv = 0>>
 	<<image "locations/pavlovsk/park/sex/gop/bjbeer4.jpg">>
@@ -659,12 +659,12 @@
 	<p>Luckily the guys don't last long, and finish fairly quickly. They both pull out and drop their loads on your face, and wipe their dicks on your $pc.hairColor $curly hair before finally letting go of your head.</p>
 	<!-- Boy A11 -->
 	<<arouse 'bj' 5 `['group']`>>
-	<<gs 'cum_call' 'face' $boy>>
-	<<gs 'cum_call' 'hair' $boy '' '' 500>>
+	<<gs 'cum_call' 'face' $sex.npcId>>
+	<<gs 'cum_call' 'hair' $sex.npcId '' '' 500>>
 	<!-- Boy A10 -->
 	<<arouse 'bj' 5 `['group']`>>
-	<<gs 'cum_call' 'face' $boy>>
-	<<gs 'cum_call' 'hair' $boy '' '' 500>>
+	<<gs 'cum_call' 'face' $sex.npcId>>
+	<<gs 'cum_call' 'hair' $sex.npcId '' '' 500>>
 	<<actCLA 'Try to clean yourself up a little'>>
 		<<gt 'gopskver' 'BjBeerFace'>>
 	<</actCLA>>
@@ -1014,7 +1014,7 @@
 		You meekly nod and lower yourself onto your haunches before Dan, while he eagerly unbuttons his pants and pulls out his erect penis. You tentatively lick the engorged head, coaxing a moan out of him: "That's it baby, now take it in your mouth."
 		You nod and part your lips, slowly guiding his cock into your mouth. Dan puts his hand behind your head and gets a firm grip on your hair, but to your surprise he doesn''t make you take more of his cock in. You're still in control of the pace, and gently bob your mouth up and down on his cock while he gently strokes your hair, even though he doesn''t release his grip on your hair. After a few minutes, you can feel his body grow more tense, and seconds later you feel a warm and viscous liquid spurt into your mouth. You can't spit it out with him still holding your hair like this, so you have no choice but to swallow the tangy fluid.
 		<<arouse 'bj' 3 >>
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<p>When Dan is finally finished, he lets go of your hair and lets you get up. He tucks his cock back into his pants while you wipe your mouth with the back of your hand, feeling that some of his semen ended up on your chin. The taste of his cum still in your mouth is very noticeable too. Dan nods happily: "Not bad, $pc.name_nick. Your technique is still a bit lacking, but we'll work on that next time."</p>
 		Indicating that he's done with you now, he wishes you a good night and leaves.
 		<<actCLA 'Go home'>>
@@ -1052,7 +1052,7 @@
 		Dan groans: "Go on, slut. You better not miss a drop."
 		<<gs 'dinsex' 'bj_swallow_random'>>
 		<<arouse 'bj' 5 >>
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<actCLA 'Suck Vasily`s cock'>>
 			<!-- Boy A10 -->
 			<<if $npcs.get('A11','Sex') == 0>>
@@ -1068,7 +1068,7 @@
 					<<run $npcs.set('A9','Sex',1)>> <<setn $guy += 1>>
 
 				<</if>>
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<arouse 'bj' 5 `['sub']`>>
 				<<image "locations/pavlovsk/park/sex/gop/bjgop3.jpg">>
 				<<gs 'dinSex' 'bj_random'>>

sugarcube/src/autogenerated/unsorted/grigory.tw

@@ -142,7 +142,7 @@
 					Withdrawing, you can feel some of his cum, mingled with your virgin blood, drip from your freshly used pussy. He gives your ass a playful slap, then reaches for his clothes.
 					With his clothes in hand, he stops to look at you, "I want nothing more than to stay here with you, but I need to get back to work," Grigory says, you can still hear that he's still short of breath, "See you later Kishka."
 					Without another word, he exits the barn. After he is gone, you can't help but think about how happy he looked before leaving.
-					<<gs 'cum_call' '' $boy>>
+					<<gs 'cum_call' '' $sex.npcId>>
 					<<arouse 'vaginal' 10 >>
 					<<arousalEnd>>
 					<<actCLA 'Continue'>>
@@ -159,7 +159,7 @@
 			Withdrawing, you can feel some of his cum drip from your freshly used pussy. He gives your ass a playful slap, then reaches for his clothes.
 			"I need to get back to work," Grigory says, you can still hear that he's still short of breath, "See you later little lady."
 			Without another word, he exits the barn.
-			<<gs 'cum_call' '' $boy>>
+			<<gs 'cum_call' '' $sex.npcId>>
 			<<arouse 'vaginal' 10 >>
 			<<arousalEnd>>
 			<<actCLA 'Continue'>>
@@ -177,7 +177,7 @@
 			Withdrawing, you can feel some of his cum drip from your freshly used pussy. He gives your ass a playful slap, then reaches for his clothes.
 			"I need to get back to work," Grigory says, you can still hear that he's still short of breath, "See you later little lady."
 			Without another word, he exits the barn.
-			<<gs 'cum_call' '' $boy>>
+			<<gs 'cum_call' '' $sex.npcId>>
 			<<arouse 'vaginal' 10 >>
 			<<arousalEnd>>
 			<<actCLA 'Continue'>>
@@ -409,7 +409,7 @@
 			<p>Breathing heavily, Mitka gets off of you and says, "Nice fuck!"</p>
 			<<run $npcs.inc('A63','QW',1)>>
 			<!-- Boy A63 -->
-			<<run $npcs.inc($boy,'sex',1)>>
+			<<run $npcs.inc($sex.npcId,'sex',1)>>
 			<<arouse 'vaginal' 10 `['sub']`>>
 			<<arousalEnd>>
 			<<actCLA 'Leave'>>

sugarcube/src/autogenerated/unsorted/hookup_morning.tw

@@ -2,13 +2,13 @@
 <<set $here = 'hookup_morning'>>
 <<set $ARGS = $location_var[$here]>>
 <<if $location_var[$here][0] == 'morning'>>
-	<<if $npcs.get($boy,'earlyriser') == 1>>
+	<<if $npcs.get($sex.npcId,'earlyriser') == 1>>
 		<<if $time.dayStage == 1>>
 			<<image "shared/romance/misc/wake_dark.jpg">>
 		<<elseif $time.dayStage == 2>>
 			<<image "shared/romance/misc/wake_light.jpg">>
 		<</if>>
-	<<elseif $npcs.get($boy,'latesleeper') == 1>>
+	<<elseif $npcs.get($sex.npcId,'latesleeper') == 1>>
 		<<video "shared/romance/misc/wakeup4.mp4">>
 	<<else>>
 		<<video "shared/romance/misc/wakeup1.mp4">>
@@ -63,15 +63,15 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'yawn_wake'>>
-	<!-- !!{	if npc_earlyriser[$boy] = 1:
+	<!-- !!{	if npc_earlyriser[$sex.npcId] = 1:
 	'<<image `'shared/romance/misc/wake_shock1.jpg'`>>'
 	'You yawn softly before awaking with a start when you realize the bed is empty. The guy you were with last night already seems to have gotten out of bed.'
-	elseif npc_latesleeper[$boy] = 1:
+	elseif npc_latesleeper[$sex.npcId] = 1:
 	'<<video "shared/romance/misc/wakeup4.mp4">>'
 	'You yawn softly and slowly realize that you're still tangled in the sheets with the guy from last night.'
 	else} -->
-	<<=$npcs.get($boy,'apt_bedroom')>>
-	<p>Turning over, you see <<=$npcs.get($boy,'firstname')>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.</p>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+	<p>Turning over, you see <<=$npcs.get($sex.npcId,'firstname')>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.</p>
 	<p>"Mornin'," he mumbles. "You just wake up too?"</p>
 	"Yeah," you mumble back.
 	<!-- !!	end-->
@@ -108,9 +108,9 @@
 
 		<</if>>
 		<<if getvar("$hookup['continuation']") == 0>>
-			<p>"Hey, where're you going?" <<=$npcs.get($boy,'firstname')>> says, turning over and squinting at you with sleepy eyes. "What's the rush?"</p>
+			<p>"Hey, where're you going?" <<=$npcs.get($sex.npcId,'firstname')>> says, turning over and squinting at you with sleepy eyes. "What's the rush?"</p>
 			<<actCLA 'I need to be somewhere!'>>
-				<p>"I'm gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($boy,'firstname')>> and your night together behind you.</p>
+				<p>"I'm gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
 				<<actCLA 'Leave'>>
 					<<gs 'hookup_after' 'exit'>>
 				<</actCLA>>
@@ -118,9 +118,9 @@
 			<<actCLA 'I`m gonna be late for school!'>>
 				<<if $q.school.func('isWearingSchoolUniform')>>
 					<!-- !! you were wearing your school uniform last night-->
-					<p>"I need to go! I'm going to be late for school!" you huff out. You quickly check your uniform one last time, making sure everything's in place. It's a bit wrinkled from laying in a pile all night, but it'll do in a pinch. Not even saying goodbye, you rush out the door, leaving <<=$npcs.get($boy,'firstname')>> and your night together behind you.</p>
+					<p>"I need to go! I'm going to be late for school!" you huff out. You quickly check your uniform one last time, making sure everything's in place. It's a bit wrinkled from laying in a pile all night, but it'll do in a pinch. Not even saying goodbye, you rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
 				<<else>>
-					<p>"I need to go! I'm going to be late for school!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($boy,'firstname')>> and your night together behind you.</p>
+					<p>"I need to go! I'm going to be late for school!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
 				<</if>>
 				<<actCLA 'Leave'>>
 					<<gs 'hookup_after' 'exit'>>
@@ -141,20 +141,20 @@
 		<</if>>
 		<<if getvar("$hookup['continuation']") > 0>>
 			<<actCLA 'I don`t have time for this!'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<p>"I really don't have time for this right now! Gotta go!"</p>
 				<<if $q.school.func('isWearingSchoolUniform')>>
 					<!-- !! you were wearing your school uniform last night-->
-					<p>You quickly check your uniform one last time, making sure everything's in place. It's a bit wrinkled from laying in a pile all night, but it'll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<=$npcs.get($boy,'firstname')>> and your night together behind you.</p>
+					<p>You quickly check your uniform one last time, making sure everything's in place. It's a bit wrinkled from laying in a pile all night, but it'll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
 				<<else>>
-					<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($boy,'firstname')>> and your night together behind you.</p>
+					<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
 				<</if>>
 				<<actCLA 'Leave'>>
 					<<gt 'hookup_after' 'exit'>>
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA '<i>Sure!Callme!</i>'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<p>"Uhh, sure!"</p>
 				<p><i>Found it!</i> You grab your bag from where it slipped under the bed. Standing back up, you pull a pen from it and frantically scribble your number down on a piece of paper you found while you were looking around.</p>
 				<<if getvar("$hookup['continuation']") == 1>>
@@ -173,22 +173,22 @@
 	<<set $time.minutes += rand(1,5)>>
 	<p>What happened last night...? You blink blearily, looking around, trying to get your bearings. You're in someone else's room that isn't your own.</p>
 	<p>That's right! You hooked up with a guy last night and accidentally fell asleep in his bed...</p>
-	<!-- !!	if npc_earlyriser[$boy] = 1:-->
+	<!-- !!	if npc_earlyriser[$sex.npcId] = 1:-->
 	<<actCLA '... <i>his</i> bed...?'>>
 		<<video "shared/romance/misc/wakeup2.mp4">>
 		Wait... If you fell asleep in his bed, then...
-		<p>Turning over, you see <<=$npcs.get($boy,'firstname')>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.</p>
+		<p>Turning over, you see <<=$npcs.get($sex.npcId,'firstname')>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.</p>
 		<p>"Mornin'," he mumbles. "You just wake up too?"</p>
 		"Yeah," you mumble back.
 		<<gs 'hookup_morning' 'wakeup'>>
 	<</actCLA>>
-	<!-- !!{	elseif npc_latesleeper[$boy] = 1:
+	<!-- !!{	elseif npc_latesleeper[$sex.npcId] = 1:
 	act'What was his name?':
 	cla & *clr
-	<<=$npcs.get($boy,'apt_bedroom')>>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	'You struggle to remember his name as you stare at the back of the still-sleeping man''s head beside you. It was... it was...'
 	*nl
-	'<<<<=$npcs.get($boy,'firstname')>>>>!'
+	'<<<<=$npcs.get($sex.npcId,'firstname')>>>>!'
 	*nl
 	'Right!'
 	gs'hookup_morning','late_wakeup'
@@ -263,7 +263,7 @@
 	<</actCLA>>
 	<<actCLA 'It`s just sex'>>
 		<<video "shared/sex/after/wakeup_shock2.mp4">>
-		<p><i>It's just sex,</i> you try to rationalize. <i>It's not like I'm falling in love with <<=$npcs.get($boy,'firstname')>> or anything. It's not cheating. It's just sex..</i>.</p>
+		<p><i>It's just sex,</i> you try to rationalize. <i>It's not like I'm falling in love with <<=$npcs.get($sex.npcId,'firstname')>> or anything. It's not cheating. It's just sex..</i>.</p>
 		<<gs 'hookup_morning' 'guilt2'>>
 	<</actCLA>>
 	<<actCLA 'You`re a whore'>>
@@ -280,20 +280,20 @@
 <</if>>
 <<if $location_var[$here][0] == 'guilt2'>>
 	<<video "shared/sex/after/wakeup_shock2.mp4">>
-	<!-- !!{	if npc_earlyriser[$boy] = 1:
+	<!-- !!{	if npc_earlyriser[$sex.npcId] = 1:
 	!! for later: create option for him to burst in with breakfast in bed
-	if npc_apt_type[$boy] = 2:
+	if npc_apt_type[$sex.npcId] = 2:
 	'The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.'
-	elseif npc_apt_type[$boy] = 3:
+	elseif npc_apt_type[$sex.npcId] = 3:
 	'The bed next to you is empty but you can hear water running through the wall. He must be in the shower.'
 	else
 	'The bed next to you is empty. The man you were with last night, nowhere to be found.'
 	end
-	elseif npc_latesleeper[$boy] = 1:
-	'<<<<=$npcs.get($boy,'firstname')>>>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
+	elseif npc_latesleeper[$sex.npcId] = 1:
+	'<<<<=$npcs.get($sex.npcId,'firstname')>>>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
 	else} -->
-	<p><<=$npcs.get($boy,'firstname')>> stirs next to you.</p>
-	<<if $npcs.get($boy,'selfish') != 1 and $npcs.get($boy,'abusive') != 1 and rand(1,3) == 3>>
+	<p><<=$npcs.get($sex.npcId,'firstname')>> stirs next to you.</p>
+	<<if $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1 and rand(1,3) == 3>>
 		<p>"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What's up? Something wrong?"</p>
 		<<actCLA 'It`s nothing'>>
 			"It's nothing," you mumble, trying to keep a straight face while you shove down your shameful feelings.
@@ -324,28 +324,28 @@
 	<</if>>
 	<i><<<<=$npcs.get(''A29'','nickname')>>>>''s gonna kill me!</i>
 	<<actCLA 'Get dressed!'>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<<if getvar("$npc_earlyriser") == 1>>
-			<p>You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<=$npcs.get($boy,'firstname')>>? Was that his name?) isn't in the room but you can hear water running. He must be in the shower.</p>
+			<p>You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<=$npcs.get($sex.npcId,'firstname')>>? Was that his name?) isn't in the room but you can hear water running. He must be in the shower.</p>
 			<<if getvar("$cum_loc['face']") > 0>>
 				<p>There's no time for that anywa- Wait, what's this crusty stuff on your ski- <i>FUCK!</i> You fell asleep with his cum on your face! <<=$npcs.get('A29','nickname')>> is going to <i>strangle</i> you if you don't clean this up before you get home!</p>
 			<</if>>
 			<<actCLA 'Rush out'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<p>No time to say goodbye! You finish getting dressed, quickly give yourself a once over and grab your stuff before heading out the door, accidentally slamming it behind you in your rush.</p>
 				<<actCLA 'Leave'>>
 					<<gs 'hookup_after' 'exit'>>
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Leave your number for hooking up'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				No time to say goodbye, but you don't want to just dip out without anything. You finish getting dressed and find a scrap of paper, scribbling out a messy note:
 					<i>Hey,</i>
 				<p>	<i>I had a lot of fun last night but I really gotta go! Gimme a call if you wanna hook up again!</i></p>
 				<i>(xxx) xxx-xx-xx - <<$pc.name_nick>> <3</i>
 				Hastily signing it, you grab your stuff and rush out the door, accidentally slamming it behind you along the way.
-				<<if $npcs.get($boy,'goal') == 1>>
-					<<gs 'lover' 'add fuckbuddy' $boy>>
+				<<if $npcs.get($sex.npcId,'goal') == 1>>
+					<<gs 'lover' 'add fuckbuddy' $sex.npcId>>
 
 				<</if>>
 				<<actCLA 'Leave'>>
@@ -353,14 +353,14 @@
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Leave your number for dating'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				No time to say goodbye, but you don't want to just dip out without anything. You finish getting dressed and find a scrap of paper, scribbling out a messy note:
 					<i>Hey,</i>
 				<p>	<i>I had a lot of fun last night but I really gotta go! I'd really love to see you again sometime! Call me? Maybe we can go on a date?</i></p>
 				<i>(xxx) xxx-xx-xx - <<$pc.name_nick>> <3</i>
 				Hastily signing it, you grab your stuff and rush out the door, accidentally slamming it behind you along the way.
-				<<if $npcs.get($boy,'goal') > 1>>
-					<<gs 'lover' 'add fuckbuddy' $boy>>
+				<<if $npcs.get($sex.npcId,'goal') > 1>>
+					<<gs 'lover' 'add fuckbuddy' $sex.npcId>>
 
 				<</if>>
 				<<actCLA 'Leave'>>
@@ -368,26 +368,26 @@
 				<</actCLA>>
 			<</actCLA>>
 		<<elseif getvar("$npc_latesleeper") == 1>>
-			<p>You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<=$npcs.get($boy,'firstname')>>? Was that his name?) is still completely knocked out in his bed, your wild movements apparently not disturbing his sleep at all.</p>
+			<p>You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<=$npcs.get($sex.npcId,'firstname')>>? Was that his name?) is still completely knocked out in his bed, your wild movements apparently not disturbing his sleep at all.</p>
 			<<if getvar("$cum_loc['face']") > 0>>
 				<p>Where the hell is your- Wait, what's this crusty stuff on your ski- <i>FUCK!</i> You fell asleep with his cum on your face! <<=$npcs.get('A29','nickname')>> is going to <i>strangle</i> you if you don't clean this up before you get home!</p>
 			<</if>>
 			<<actCLA 'Rush out'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<p>You definitely don't feel like waking him up and besides, there's no time to say goodbye! You finish getting dressed, quickly give yourself a once over and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.</p>
 				<<actCLA 'Leave'>>
 					<<gs 'hookup_after' 'exit'>>
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Leave your number for hooking up'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				You definitely don't feel like waking him up, but you don't want to just dip out without anything. You finish getting dressed and find a scrap of paper, scribbling out a messy note:
 					<i>Hey,</i>
 				<p>	<i>I had a lot of fun last night but I really gotta go! Gimme a call if you wanna hook up again!</i></p>
 				<i>(xxx) xxx-xx-xx - <<$pc.name_nick>> <3</i>
 				Hastily signing it, you leave it on his nightstand and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.
-				<<if $npcs.get($boy,'goal') == 1>>
-					<<gs 'lover' 'add fuckbuddy' $boy>>
+				<<if $npcs.get($sex.npcId,'goal') == 1>>
+					<<gs 'lover' 'add fuckbuddy' $sex.npcId>>
 
 				<</if>>
 				<<actCLA 'Leave'>>
@@ -395,14 +395,14 @@
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Leave your number for dating'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				No time to say goodbye, but you don't want to just dip out without anything. You finish getting dressed and find a scrap of paper, scribbling out a messy note:
 					<i>Hey,</i>
 				<p>	<i>I had a lot of fun last night but I really gotta go! I'd really love to see you again sometime! Call me? Maybe we can go on a date?</i></p>
 				<i>(xxx) xxx-xx-xx - <<$pc.name_nick>> <3</i>
 				Hastily signing it, you leave it on his nightstand and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.
-				<<if $npcs.get($boy,'goal') > 1>>
-					<<gs 'lover' 'add fuckbuddy' $boy>>
+				<<if $npcs.get($sex.npcId,'goal') > 1>>
+					<<gs 'lover' 'add fuckbuddy' $sex.npcId>>
 
 				<</if>>
 				<<actCLA 'Leave'>>
@@ -410,7 +410,7 @@
 				<</actCLA>>
 			<</actCLA>>
 		<<else>>
-			<p>You frantically haul yourself out of bed and start grabbing clothing off the floor. The guy you slept with last night (<<=$npcs.get($boy,'firstname')>>? Was that his name?) starts awake, rapidly blinking in confusion at the noise you're making.</p>
+			<p>You frantically haul yourself out of bed and start grabbing clothing off the floor. The guy you slept with last night (<<=$npcs.get($sex.npcId,'firstname')>>? Was that his name?) starts awake, rapidly blinking in confusion at the noise you're making.</p>
 			<p>"Hey, what's going on?" he asks.</p>
 			<p>"I didn't mean to stay here last night!" you explain hastily, tugging your clothes on. "My <<=$npcs.get('A29','nickname')>> is gonna <i>kill</i> me for not coming home!"</p>
 			<<if getvar("$cum_loc['face']") > 0>>
@@ -423,21 +423,21 @@
 			<</if>>
 			<<if getvar("$hookup['continuation']") == 0>>
 				<<actCLA 'Rush out'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					You finish getting dressed as quickly as possible and give yourself a once over before grabbing your stuff and rushing out the door, accidentally slamming it behind you.
 					<<actCLA 'Leave'>>
 						<<gs 'hookup_after' 'exit'>>
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Ask to hook up again later'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"Listen," you say, still panickedly looking for your bag. "I'm in a rush now but I still want to see you again. We could hook up again? Like we did last night?"</p>
-					<<if $npcs.get($boy,'goal') == 1>>
+					<<if $npcs.get($sex.npcId,'goal') == 1>>
 						<p>"What, like fuck buddies?"</p>
 						"Yeah, just like that," you say, finally finding it under the bed somehow.
 						"Sure, I'll sleep with you again if you're offering."
 						<p>"Great!" You pull out a pen and frantically scribble your number down on a piece of paper you found while you were looking around. "Text me when you want to hook up!" you shout over your shoulder as you run out the door.</p>
-						<<gs 'lover' 'add fuckbuddy' $boy>>
+						<<gs 'lover' 'add fuckbuddy' $sex.npcId>>
 					<<elseif rand(1,3) == 1>>
 						"Nah, this was a one time thing. I never fuck the same girl twice."
 						<p>Despite the desperation of your situation, his comment gives you pause for a moment and you turn to give him a look. "Seriously?"</p>
@@ -453,13 +453,13 @@
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Ask to go on a date'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"Listen," you say, still panickedly looking for your bag. "I'm in a rush now but I still want to see you again. We could go on a date or something?"</p>
-					<<if $npcs.get($boy,'goal') > 1>>
+					<<if $npcs.get($sex.npcId,'goal') > 1>>
 						"Yeah, I think I''d like that," he smiles at you.
 						<p>"Great!" Despite the desperation of your situation, you can't help but smile at his words when you finally find your bag hiding underneath his bed. How did it get down there anyways?! You pull out a pen and frantically scribble your number down on a piece of paper you found earlier and rush towards the door.</p>
 						<p>"Call me sometime!" you shout over your shoulder as you slam it behind you.</p>
-						<<gs 'lover' 'add fuckbuddy' $boy>>
+						<<gs 'lover' 'add fuckbuddy' $sex.npcId>>
 					<<elseif rand(1,3) == 1>>
 						"Nah, this was a one time thing. I never fuck the same girl twice."
 						<p>Despite the desperation of your situation, his comment gives you pause for a moment and you turn to give him a look. "Seriously?"</p>
@@ -475,29 +475,29 @@
 					<</actCLA>>
 				<</actCLA>>
 			<<else>>
-				<<if $npcs.get($boy,'goal') == 1>>
+				<<if $npcs.get($sex.npcId,'goal') == 1>>
 					<!-- !! FWB/Booty calls?-->
 					"I had a good time last night," he says, seeming to ignore your panic.
 					<p>"Yeah?" you reply absentmindedly, looking for your bag.</p>
 					"I''d love to hook up with you again sometime."
 					<p>"What, just like fuck buddies or something?" you say, kneeling on the floor looking under the furniture.</p>
 					"Yeah."
-				<<elseif $npcs.get($boy,'goal') > 1>>
+				<<elseif $npcs.get($sex.npcId,'goal') > 1>>
 					<!-- !! Ask to start dating-->
 					"I know you're in a rush but I just wanted to let you know I had a really good time last night."
 					<p>"Yeah?" you reply absentmindedly, looking for your bag.</p>
 					<p>"Could I see you again sometime? Take you out on a date or something?"</p>
 				<</if>>
 				<<actCLA 'I don`t have time for this!'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"Sorry, I really don't have time for this right now and honestly, I'm just not interested," you say, finally finding your bag beneath the bed and yanking it out. "Gotta go!"</p>
-					<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($boy,'firstname')>> and your night together behind you.</p>
+					<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'hookup_after' 'exit'>>
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA '<i>Sure!Callme!</i>'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"Uhh, sure!"</p>
 					<p><i>Found it!</i> You grab your bag from where it slipped under the bed. Standing back up, you pull a pen from it and frantically scribble your number down on a piece of paper you found while you were looking around.</p>
 					<<if getvar("$hookup['continuation']") == 1>>
@@ -518,17 +518,17 @@
 	<<if getvar("$hookup['sleep_accident']") == 0>>
 		You wake up, blearily blinking and slightly confused, trying to get your bearings. You're in someone else''s room that isn''t your own.
 	<</if>>
-	<<if $npcs.get($boy,'caretaker') == 1 and $npcs.get($boy,'apt_type') != 1>>
+	<<if $npcs.get($sex.npcId,'caretaker') == 1 and $npcs.get($sex.npcId,'apt_type') != 1>>
 		<<gs 'hookup_morning' 'coffee_for_you'>>
 	<<else>>
 		<<if getvar("$hookup['sleep_accident']") == 1>>
-			<p>Turning over, you look for the the guy you were with last night (<<=$npcs.get($boy,'firstname')>>? Was that his name?) only to find that you're alone in the bed, no one else with you.</p>
+			<p>Turning over, you look for the the guy you were with last night (<<=$npcs.get($sex.npcId,'firstname')>>? Was that his name?) only to find that you're alone in the bed, no one else with you.</p>
 		<</if>>
-		<<if $npcs.get($boy,'apt_type') == 1>>
+		<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 			<p>It's a... dorm room...?</p>
-		<<elseif $npcs.get($boy,'apt_type') == 2>>
+		<<elseif $npcs.get($sex.npcId,'apt_type') == 2>>
 			He's in the shower
-		<<elseif $npcs.get($boy,'apt_type') == 3>>
+		<<elseif $npcs.get($sex.npcId,'apt_type') == 3>>
 			He's in the shower and you can hear it through the wall
 		<<else>>
 			You're alone
@@ -540,12 +540,12 @@
 	<!-- !! breakfast in bed-->
 	<<setinit $hookup['b_i_b'] = 1>>
 	Turning over, you look around and realize that you're alone in the bed.
-	<<if $npcs.get($boy,'apt_type') == 2>>
-		<p>You blink, driving away the last blurs of sleep, and when your vision clears, you realize <<=$npcs.get($boy,'firstname')>> is standing in the corner, next to a small stove. He smiles at you over his shoulder.</p>
+	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
+		<p>You blink, driving away the last blurs of sleep, and when your vision clears, you realize <<=$npcs.get($sex.npcId,'firstname')>> is standing in the corner, next to a small stove. He smiles at you over his shoulder.</p>
 		"You're awake. I made us some coffee, here."
 		He walks over to you in bed holding a steaming mug.
 	<<else>>
-		<p>You start when the door opens and <<=$npcs.get($boy,'firstname')>> walks in holding a mug.</p>
+		<p>You start when the door opens and <<=$npcs.get($sex.npcId,'firstname')>> walks in holding a mug.</p>
 		"Sorry about that," he grins. "You were still sleeping so I didn''t want to wake you up. I made coffee."
 	<</if>>
 	<<actCLA 'I prefer tea (bitchy)'>>
@@ -634,7 +634,7 @@ gt'hookup_morning','fuck'
 end
 end
 end
-if npc_apt_type[$boy] > 2:
+if npc_apt_type[$sex.npcId] > 2:
 !!		act'Put your underwear on':
 !!		act'Go explore his place':gt'hookup_morning','explore'
 act'Find the kitchen':
@@ -650,10 +650,10 @@ end} -->
 		<<gt 'hookup_morning' 'have_to_go'>>
 	<</actCLA>>
 	<<actCLA 'I need coffee'>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<<setinit $hookup['coffee'] = 1>>
 		"I could really use a cup of coffee," you say.
-		<<if $npcs.get($boy,'apt_type') > 2>>
+		<<if $npcs.get($sex.npcId,'apt_type') > 2>>
 			<!-- !! if not a studio or a dorm-->
 			"Me too. I have some in the kitchen if you wanna come with."
 			<<actCLA 'Sure'>>
@@ -662,13 +662,13 @@ end} -->
 				<p>You climb out of bed, not bothering to get dressed as you follow him. You already spent the night naked with him, what's a cup of coffee longer?</p>
 				Along the way, you can't help but peek into the other rooms as you pass by.
 				<<gs 'hookup_morning' 'spare_explore'>>
-				<p>After your snooping, you quickly continue onward into the kitchen where <<=$npcs.get($boy,'firstname')>> is already filling the pot with water.</p>
+				<p>After your snooping, you quickly continue onward into the kitchen where <<=$npcs.get($sex.npcId,'firstname')>> is already filling the pot with water.</p>
 				<<actCLA 'Wait'>>
 					<<gt 'hookup_morning' 'coffee'>>
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA 'I`ll catch up (get dressed first)'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"Sounds good, but I'll catch up. I think I''d like to avoid any accidents with hot drinks and bare skin," you smirk.
 				"Yeah that's a good idea," he agrees. Reaching down, he pulls on a pair of shorts before stepping out of the room. "Just come out whenever you're ready."
 				"I will," you reply as the door clicks shut behind him.
@@ -676,7 +676,7 @@ end} -->
 					<<video "pc/activities/misc/dress_1.mp4">>
 					<<gs 'clothing' 'wear_last_worn'>>
 					<<gs 'underwear' 'wear'>>
-					<p>Grabbing your own clothes, you pull them on, smoothing out the wrinkles as best you can from where they were strewn across the floor last night before leaving to join <<=$npcs.get($boy,'firstname')>> in the kitchen.</p>
+					<p>Grabbing your own clothes, you pull them on, smoothing out the wrinkles as best you can from where they were strewn across the floor last night before leaving to join <<=$npcs.get($sex.npcId,'firstname')>> in the kitchen.</p>
 					<<actCLA 'Continue'>>
 						<<gt 'hookup_morning' 'coffee'>>
 					<</actCLA>>
@@ -688,8 +688,8 @@ end} -->
 		<<else>>
 			"Me too. Let me just get the pot going." Getting up from the bed, he steps across his tiny room to his little kitchen and starts rifling through cupboards, pulling out various coffee paraphernalia.
 			<<actCLA 'Wait in bed'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
-				<p>You cuddle up in the sheets, savoring their warmth and waiting while the coffee brews. A few minutes later, <<=$npcs.get($boy,'firstname')>> pours two cups, bringing one over to you.</p>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+				<p>You cuddle up in the sheets, savoring their warmth and waiting while the coffee brews. A few minutes later, <<=$npcs.get($sex.npcId,'firstname')>> pours two cups, bringing one over to you.</p>
 				"Here you go."
 				"Thanks," you smile, taking the cup from him and bringing it to your lips.
 				<<actCLA 'Focus on the coffee'>>
@@ -714,7 +714,7 @@ end} -->
 					<<image "pc/activities/drinking/coffee_bed1.jpg">>
 					You make small talk while drinking coffee.
 					<<actCLA 'Time to get going'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"That was great," you sigh. "But I should get going."
 						Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.
 						<<actCLA 'Get dressed'>>
@@ -729,17 +729,17 @@ end} -->
 				<<set $time.minutes += 1>>
 				<<video "pc/activities/misc/dress_1.mp4">>
 				While the coffee brews, you haul yourself out of bed and pick up your clothes from where you threw them last night. You frown, noticing they're a bit wrinkled, but it's not like you cared much about hanging it up last night or anything like that. Whatever, nothing you can do about it now.
-				<p>By the time you've pulled them on, the coffee is done and <<=$npcs.get($boy,'firstname')>> pours two cups, handing one to you.</p>
+				<p>By the time you've pulled them on, the coffee is done and <<=$npcs.get($sex.npcId,'firstname')>> pours two cups, handing one to you.</p>
 				"Thanks," you smile, taking it gratefully.
 				<<actCLA 'Drink'>>
 					<<set $time.minutes += 2>>
 					<<gt 'beverage' 'coffee'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					It's cheap stuff, but caffeine is caffeine and you drink it greedily, savoring every gulp. Within a couple minutes, the mug is empty.
 					<<actCLA 'Time to get going'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
 						<<actCLA 'Gather your things'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
@@ -749,10 +749,10 @@ end} -->
 				<<actCLA 'Make small talk'>>
 					<<set $time.minutes += 2>>
 					<<gt 'beverage' 'coffee'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					You make small talk while drinking coffee.
 					<<actCLA 'Time to get going'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"That was great," you sigh. "But I should get going."
 						Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.
 						<<actCLA 'Gather your things'>>
@@ -775,9 +775,9 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'late_wakeup'>>
 	<<actCLA 'Continue'>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
-		<p><<=$npcs.get($boy,'firstname')>> doesn't stir in the slightest as you arise.</p>
-		<<if $npcs.get($boy,'apt_type') >= 3>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't stir in the slightest as you arise.</p>
+		<<if $npcs.get($sex.npcId,'apt_type') >= 3>>
 			<<actCLA 'Explore his apartment'>>
 				<<gt 'hookup_morning' 'explore'>>
 			<</actCLA>>
@@ -789,7 +789,7 @@ end} -->
 <<if $location_var[$here][0] == 'late_sneakout'>>
 	<<actCLA 'Sneak out of bed'>>
 		<<video "shared/romance/misc/sneakout2.mp4">>
-		<p>Carefully, you untangle yourself from <<=$npcs.get($boy,'firstname')>> and the sheets and stealthily clamber out of bed.</p>
+		<p>Carefully, you untangle yourself from <<=$npcs.get($sex.npcId,'firstname')>> and the sheets and stealthily clamber out of bed.</p>
 		<<actCLA 'Get dressed'>>
 			<<gs 'clothing' 'wear_last_worn'>>
 			<<gs 'underwear' 'wear'>>
@@ -805,7 +805,7 @@ end} -->
 			<<actCLA 'Leave your number (fuckbuddy)'>>
 				<<setinit $hookup['fuckbuddy'] = rand(0,1)>>
 				<<video "shared/romance/misc/depart1.mp4">>
-				<p>All your clothes on and possessions gathered, you take a look back at <<=$npcs.get($boy,'firstname')>>, smiling to yourself. You had a pretty good time last night. Maybe you could hook up with him again like this. You might even become fuckbuddies.</p>
+				<p>All your clothes on and possessions gathered, you take a look back at <<=$npcs.get($sex.npcId,'firstname')>>, smiling to yourself. You had a pretty good time last night. Maybe you could hook up with him again like this. You might even become fuckbuddies.</p>
 				You fumble around for a minute to find a piece of paper and a pen and write down your number on it.
 				<i>Text me if you want to hook up later</i>
 				<p>	<i>- $pc.name_nick</i></p>
@@ -825,11 +825,11 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'shower'>>
 	<<setinit $hookup['morning_shower'] = 1>>
-	<<=$npcs.get($boy,'apt_bathroom')>>
-	<<if $npcs.get($boy,'apt_type') > 2>>
+	<<=$npcs.get($sex.npcId,'apt_bathroom')>>
+	<<if $npcs.get($sex.npcId,'apt_type') > 2>>
 		<p>"Actually, do you mind if I borrow your shower?"</p>
 		"Yeah, go ahead. You can catch up when you're done."
-		<p>"Thanks," you smile gratefully as he leaves the room. Hauling yourself out of the bed, you duck out the door yourself, finding <<=$npcs.get($boy,'firstname')>>'s bathroom in the hallway and hop in the shower.</p>
+		<p>"Thanks," you smile gratefully as he leaves the room. Hauling yourself out of the bed, you duck out the door yourself, finding <<=$npcs.get($sex.npcId,'firstname')>>'s bathroom in the hallway and hop in the shower.</p>
 	<<else>>
 		<p>"Mind if I borrow your shower?" you ask, glancing towards the bathroom door of his small apartment.</p>
 		"Yeah, go ahead."
@@ -839,10 +839,10 @@ end} -->
 		<<video "shared/home/bathroom/dush.mp4">>
 		<<set $time.minutes += 10>>
 		<<run $inventory.inc('shampoo',1)>>
-		<p>You twist the faucet and hot water comes rushing out, sighing in pleasure as it pours over your skin. <i>That feels so nice...</i> After enjoying it for a little while, you borrow <<=$npcs.get($boy,'firstname')>>'s shampoo and start scrubbing your hair, washing it out shortly after.</p>
+		<p>You twist the faucet and hot water comes rushing out, sighing in pleasure as it pours over your skin. <i>That feels so nice...</i> After enjoying it for a little while, you borrow <<=$npcs.get($sex.npcId,'firstname')>>'s shampoo and start scrubbing your hair, washing it out shortly after.</p>
 		<<gs 'cleanBody'>>
 		Figuring you've used enough of his water, you turn off the tap and step out.
-		<<if getvar("$hookup['coffee']") == 1 and $npcs.get($boy,'apt_type') > 2>>
+		<<if getvar("$hookup['coffee']") == 1 and $npcs.get($sex.npcId,'apt_type') > 2>>
 			<<actCLA 'Go to the kitchen'>>
 				<<gt 'hookup_morning' 'coffee'>>
 			<</actCLA>>
@@ -850,7 +850,7 @@ end} -->
 				<<video "pc/activities/misc/dress_1.mp4">>
 				<<gs 'clothing' 'wear_last_worn'>>
 				<<gs 'underwear' 'wear'>>
-				<p>Heading back to <<=$npcs.get($boy,'firstname')>>'s room, you pick up your clothes off the floor and tug them on over your wet hair before leaving again to join him in the kitchen.</p>
+				<p>Heading back to <<=$npcs.get($sex.npcId,'firstname')>>'s room, you pick up your clothes off the floor and tug them on over your wet hair before leaving again to join him in the kitchen.</p>
 				<<actCLA 'Go to the kitchen'>>
 					<<gt 'hookup_morning' 'coffee'>>
 				<</actCLA>>
@@ -864,21 +864,21 @@ end} -->
 				<<gs 'clothing' 'wear_last_worn'>>
 				<<gs 'underwear' 'wear'>>
 				Stepping out of the bathroom, you're immediately hit by the smell of cooked food.
-				<p>"Coffee's done," <<=$npcs.get($boy,'firstname')>> says, gesturing to his side where the pot is filled black liquid. "Help yourself when you're ready. I thought I'd fry up some eggs while you were in there."</p>
+				<p>"Coffee's done," <<=$npcs.get($sex.npcId,'firstname')>> says, gesturing to his side where the pot is filled black liquid. "Help yourself when you're ready. I thought I'd fry up some eggs while you were in there."</p>
 				"Thanks," you say, beginning to pick up your clothes. "I'm just going to get dressed first. Don't want any accidents."
 				"Yeah sure. Help yourself when you're ready."
 				You tug your clothes on, frowning at the wrinkles on them. Well, that's going to happen when you throw your clothes on the ground rushing to get into somebody''s pants.
 				<<actCLA 'Just coffee'>>
 					<<set $time.minutes += 2>>
 					<<gt 'beverage' 'coffee'>>
-					<<=$npcs.get($boy,'apt_bedroom')>>
+					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					You grab a mug and fill it up, drinking greedily. It's cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.
 					<p>"No breakfast for you?"</p>
 					"Coffee is all I need," you smile back.
 					<<actCLA 'Time to get going'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
 						<<actCLA 'Gather your things'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
@@ -889,18 +889,18 @@ end} -->
 				<</actCLA>>
 			<</actCLA>>
 		<<elseif getvar("$hookup['b_i_b']") == 1>>
-			<<actCLA 'Join $npcs.get('+$boy,'firstname')+' for breakfast'>>
+			<<actCLA 'Join $npcs.get('+$sex.npcId,'firstname')+' for breakfast'>>
 				<<gt 'hookup_morning' 'breakfast'>>
 			<</actCLA>>
 			<<actCLA 'Get dressed'>>
 				<<video "pc/activities/misc/dress_1.mp4">>
 				<<gs 'clothing' 'wear_last_worn'>>
 				<<gs 'underwear' 'wear'>>
-				<<if $npcs.get($boy,'apt_type') > 2>>
-					<p>Feeling refreshed, you leave the bathroom and head back to <<=$npcs.get($boy,'firstname')>>'s room to tug on your clothes.</p>
-					<<actCLA 'Skip out on $npcs.get('+$boy,'firstname')+''>>
+				<<if $npcs.get($sex.npcId,'apt_type') > 2>>
+					<p>Feeling refreshed, you leave the bathroom and head back to <<=$npcs.get($sex.npcId,'firstname')>>'s room to tug on your clothes.</p>
+					<<actCLA 'Skip out on $npcs.get('+$sex.npcId,'firstname')+''>>
 						<<video "shared/romance/misc/depart1.mp4">>
-						<p>While you're at it, you grab the rest of your things and head straight for the door. You pass by the kitchen on the way and <<=$npcs.get($boy,'firstname')>> watches you with confusion.</p>
+						<p>While you're at it, you grab the rest of your things and head straight for the door. You pass by the kitchen on the way and <<=$npcs.get($sex.npcId,'firstname')>> watches you with confusion.</p>
 						<p>"Hey! Where're you going? You're not staying for breakfast?"</p>
 						"Sorry, I really can't stay."
 						<p>"Wait but-"</p>
@@ -919,7 +919,7 @@ end} -->
 					"The best," you grin back, heading straight for your clothes and tugging them on.
 					<p>"So, gonna join me for breakfast then?"</p>
 					<<actCLA 'Nope, gotta go (skip out)'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"Nope, gotta go."
 						<p>"You sure? I-"</p>
 						<p>"Nah, I'm good." Grabbing the rest of your things, you pop open the door and waggle your fingers at him. "Toodles!" and shut the door behind you.</p>
@@ -931,12 +931,12 @@ end} -->
 					<<actCLA 'Just coffee'>>
 						<<set $time.minutes += 2>>
 						<<gt 'beverage' 'coffee'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"Just coffee for me," you smile. Grabbing a mug, you fill it up with coffee and enjoy a long sip. It's cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.
 						<<actCLA 'Time to get going'>>
-							<<=$npcs.get($boy,'apt_bedroom')>>
+							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"That was great," you sigh. "But I should get going."
-							<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and turn around to grab your stuff.</p>
+							<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
 							<<actCLA 'Gather your things'>>
 								<<gt 'hookup_morning' 'morning_leave'>>
 							<</actCLA>>
@@ -949,8 +949,8 @@ end} -->
 			<</actCLA>>
 		<<else>>
 			<<actCLA 'Dry off'>>
-				<<=$npcs.get($boy,'apt_bedroom')>>
-				<p>You step out of the bathroom and see <<=$npcs.get($boy,'firstname')>> still laying in bed.</p>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+				<p>You step out of the bathroom and see <<=$npcs.get($sex.npcId,'firstname')>> still laying in bed.</p>
 				"Love that view," he smirks, shamelessly ogling your moist naked body.
 				"Thanks, I really needed that," you smile back. "I should really get going though."
 				<<actCLA 'Get dressed'>>
@@ -968,7 +968,7 @@ if hookup['hangover'] = 1:
 act'I need coffee':
 cla & *nl
 '"I desperately need coffee," you wince, rubbing your brow as if will somehow make your blindingly painful headache go away.'
-'"Me too." <<<<=$npcs.get($boy,'firstname')>>>> says, seemingly in the same state.'
+'"Me too." <<<<=$npcs.get($sex.npcId,'firstname')>>>> says, seemingly in the same state.'
 end
 act'Can I use your shower?':
 end
@@ -980,7 +980,7 @@ if hookup['im_hungover'] = 0:
 act'I'm so hungover':
 cla & *clr
 hookup['im_hungover'] = 1
-<<=$npcs.get($boy,'apt_bedroom')>>
+<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 '"I'm so hungover right now," you groan.'
 '"Same..."'
 end
@@ -991,34 +991,34 @@ end} -->
 	<<if $wardrobe.pantyworntype != 'none'>>
 		<!-- !! IMAGE HERE-->
 		<<video "shared/romance/misc/nude_walk1.mp4">>
-		<p>You skip through <<=$npcs.get($boy,'firstname')>>'s apartment, peeking into all the different rooms.</p>
+		<p>You skip through <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, peeking into all the different rooms.</p>
 	<<else>>
 		<!-- !! IMAGE HERE-->
 	<</if>>
 	<<gs 'hookup_morning' 'spare_explore'>>
-	<<if $npcs.get($boy,'apt_type') == 3>>
+	<<if $npcs.get($sex.npcId,'apt_type') == 3>>
 		End up in the kitchen
-	<<elseif $npcs.get($boy,'apt_type') == 4>>
+	<<elseif $npcs.get($sex.npcId,'apt_type') == 4>>
 		Peek into a bunch of rooms, get naked surprised by roommates.
-	<<elseif $npcs.get($boy,'apt_type') == 5>>
+	<<elseif $npcs.get($sex.npcId,'apt_type') == 5>>
 		Peek into a bunch of rooms, end up in the kitchen.
-	<<elseif $npcs.get($boy,'apt_type') == 6>>
+	<<elseif $npcs.get($sex.npcId,'apt_type') == 6>>
 		Peek into a bunch of rooms, they're very high quality.
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'spare_explore'>>
 	<!-- !!links for popups broken and in need of fixing at some time-->
-	<<if $npcs.get($boy,'apt_spare') == 1>>
-		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($boy,'firstname')>>'s body, instead of what the room looked like. Inside another room, you find a desk with a monitor and a keyboard on top.</p>
-		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($boy,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($boy,'firstname')>>>>''s body, instead of what the room looked like. Inside another room, you find <<link "a desk with a monitor and a keyboard on top.">><<gs 'shortgs' 'img msg' '<<=$npcs.get($boy,'apt_spare')>>'>><</link>>'-->
+	<<if $npcs.get($sex.npcId,'apt_spare') == 1>>
+		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($sex.npcId,'firstname')>>'s body, instead of what the room looked like. Inside another room, you find a desk with a monitor and a keyboard on top.</p>
+		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s body, instead of what the room looked like. Inside another room, you find <<link "a desk with a monitor and a keyboard on top.">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_spare')>>'>><</link>>'-->
 		<p><i>Bit of a gamer huh?</i> you think to yourself, strutting past.</p>
-	<<elseif $npcs.get($boy,'apt_spare') == 2>>
-		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($boy,'firstname')>>'s body, instead of what the room looked like. Inside another room, you find a room filled with various exercise equipment.</p>
-		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($boy,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($boy,'firstname')>>>>''s body, instead of what the room looked like. Inside another room, you find <<link "a room filled with various exercise equipment.">><<gs 'shortgs' 'img msg' '<<=$npcs.get($boy,'apt_spare')>>'>><</link>>'-->
+	<<elseif $npcs.get($sex.npcId,'apt_spare') == 2>>
+		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($sex.npcId,'firstname')>>'s body, instead of what the room looked like. Inside another room, you find a room filled with various exercise equipment.</p>
+		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s body, instead of what the room looked like. Inside another room, you find <<link "a room filled with various exercise equipment.">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_spare')>>'>><</link>>'-->
 		<p><i>Likes to work out huh?</i> you think to yourself, strutting past.</p>
 	<<else>>
-		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($boy,'firstname')>>'s body, instead of what the room looked like.</p>
-		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($boy,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($boy,'firstname')>>>>''s body, instead of what the room looked like.'-->
+		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($sex.npcId,'firstname')>>'s body, instead of what the room looked like.</p>
+		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s body, instead of what the room looked like.'-->
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'kitchen'>>
@@ -1026,22 +1026,22 @@ end} -->
 		<<if getvar("$hookup['hangover']") == 1>>
 		<<else>>
 		<</if>>
-		<<if $npcs.get($boy,'apt_type') == 1>>
+		<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 			<!-- !! studio apartment-->
-			<p><<=$npcs.get($boy,'firstname')>> wakes up</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> wakes up</p>
 		<<else>>
-			<p><<=$npcs.get($boy,'firstname')>> comes out</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> comes out</p>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Get a glass of water'>>
 		<<if getvar("$hookup['hangover']") == 1>>
 		<<else>>
 		<</if>>
-		<<if $npcs.get($boy,'apt_type') == 1>>
+		<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 			<!-- !! studio apartment-->
-			<p><<=$npcs.get($boy,'firstname')>> wakes up</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> wakes up</p>
 		<<else>>
-			<p><<=$npcs.get($boy,'firstname')>> comes out</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> comes out</p>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Cook breakfast'>>
@@ -1050,18 +1050,18 @@ end} -->
 		<<else>>
 			You cook breakfast normally.
 		<</if>>
-		<<if $npcs.get($boy,'apt_type') == 4 and getvar("$hookup['explore']") != 1>>
-			<p><<=$npcs.get($boy,'firstname')>>'s roommates come out</p>
+		<<if $npcs.get($sex.npcId,'apt_type') == 4 and getvar("$hookup['explore']") != 1>>
+			<p><<=$npcs.get($sex.npcId,'firstname')>>'s roommates come out</p>
 			<<actCLA 'Shriek'>>
 			<</actCLA>>
 			<<actCLA 'Act casual'>>
 			<</actCLA>>
 		<<else>>
-			<<if $npcs.get($boy,'apt_type') == 1>>
+			<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 				<!-- !! studio apartment-->
-				<p><<=$npcs.get($boy,'firstname')>> wakes up</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> wakes up</p>
 			<<else>>
-				<p><<=$npcs.get($boy,'firstname')>> comes out</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> comes out</p>
 			<</if>>
 			"Made us breakfast"
 			<<actCLA 'Eat together'>>
@@ -1087,18 +1087,18 @@ end} -->
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'coffee'>>
-	<<if $npcs.get($boy,'apt_type') > 2>>
+	<<if $npcs.get($sex.npcId,'apt_type') > 2>>
 		<!-- !! not a studio or dorm-->
 		$npc_apt_kitchen
 		<<if getvar("$hookup['morning_shower']") == 1>>
 			As you wander towards the kitchen, you sniff the air, detecting something more than just coffee.
 			"That smells nice," you say, entering the room.
 			<<if $wardrobe.clothingworntype == 'nude'>>
-				<p>"Yeah," <<=$npcs.get($boy,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eg-"</p>
+				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eg-"</p>
 				He stops mid sentence when he sees you standing there naked, hair still wet from the shower. You smirk at his stare.
 				"Thanks."
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($boy,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eggs in the meantime. Coffee's already done if you want to pour yourself a cup."</p>
+				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eggs in the meantime. Coffee's already done if you want to pour yourself a cup."</p>
 				"Thanks."
 			<</if>>
 			<<actCLA 'Just have coffee'>>
@@ -1116,11 +1116,11 @@ end} -->
 					<<if $wardrobe.clothingworntype == 'nude'>>
 						<<image "shared/romance/misc/nude_kitchen1.jpg">>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and head back to his room to get dressed.</p>
+						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and head back to his room to get dressed.</p>
 					<<else>>
 						$npc_apt_kitchen
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
 					<</if>>
 					<<actCLA 'Gather your things'>>
 						<<gt 'hookup_morning' 'morning_leave'>>
@@ -1133,7 +1133,7 @@ end} -->
 		<<else>>
 			<<set $time.minutes += 5>>
 			<<if $wardrobe.clothingworntype == 'nude'>>
-				<p>You follow <<=$npcs.get($boy,'firstname')>> to the kitchen and sit down at his table, waiting patiently while he pulls coffee paraphernalia from his cupboards and begins brewing. A few minutes later, he hands you a steaming cup of joe, which you gratefully accept.</p>
+				<p>You follow <<=$npcs.get($sex.npcId,'firstname')>> to the kitchen and sit down at his table, waiting patiently while he pulls coffee paraphernalia from his cupboards and begins brewing. A few minutes later, he hands you a steaming cup of joe, which you gratefully accept.</p>
 			<<else>>
 				You step into the kitchen and are immediately hit by the wonderful smell of coffee.
 				"Hey, you're just in time. Pot just finished brewing." He pours a cup and hands it to you, which you gratefully accept.
@@ -1150,13 +1150,13 @@ end} -->
 				<<actCLA 'Time to get going'>>
 					<<if $wardrobe.clothingworntype == 'nude'>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and head back to his room to get dressed.</p>
+						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and head back to his room to get dressed.</p>
 						<<actCLA 'Get dressed'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
 					<<else>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
 						<<actCLA 'Gather your things'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
@@ -1177,13 +1177,13 @@ end} -->
 				<<actCLA 'Time to get going'>>
 					<<if $wardrobe.clothingworntype == 'nude'>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and head back to his room to get dressed.</p>
+						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and head back to his room to get dressed.</p>
 						<<actCLA 'Get dressed'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
 					<<else>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
 						<<actCLA 'Gather your things'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
@@ -1197,7 +1197,7 @@ end} -->
 		<<if getvar("$hookup['morning_shower']") == 1 and $wardrobe.clothingworntype == 'nude'>>
 			Stepping out of the bathroom, you're immediately hit by the smell of cooked food.
 			"That smells nice," you say, stepping out into the room.
-			<p>"Yeah," <<=$npcs.get($boy,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eggs."</p>
+			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eggs."</p>
 			Ignoring your clothes and the eggs, you head straight to the coffee pot, grabbing a mug and filling it to the brim.
 			<<actCLA 'Just coffee'>>
 				<<set $time.minutes += 2>>
@@ -1209,7 +1209,7 @@ end} -->
 				<<actCLA 'Time to get going'>>
 					$npc_apt_kitchen
 					"That was great," you sigh. "But I should get going."
-					<p>You put the empty mug in <<=$npcs.get($boy,'firstname')>>'s sink and turn around to grab your stuff.</p>
+					<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
 					<<actCLA 'Gather your things'>>
 						<<gt 'hookup_morning' 'morning_leave'>>
 					<</actCLA>>
@@ -1228,15 +1228,15 @@ end} -->
 		$npc_apt_kitchen
 		<p>The two of you enjoy your eggs and coffee together. The coffee is cheap, the eggs are alright, but the company is pleasant as you chit-chat about nothing. Soon enough, your cups are empty and your plates are clean.</p>
 		<<actCLA 'I should go'>>
-			<p>"Well, I should probably get going," you say, standing up and putting your dishes in the sink. You head back to <<=$npcs.get($boy,'firstname')>>'s bedroom, with him following along behind.</p>
+			<p>"Well, I should probably get going," you say, standing up and putting your dishes in the sink. You head back to <<=$npcs.get($sex.npcId,'firstname')>>'s bedroom, with him following along behind.</p>
 			<<actCLA 'Get dressed'>>
 				<<gt 'hookup_morning' 'morning_leave'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<else>>
-		<<if $npcs.get($boy,'apt_type') == 1>>
+		<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 			$npc_apt_kitchen
-		<<elseif $npcs.get($boy,'apt_type') == 2>>
+		<<elseif $npcs.get($sex.npcId,'apt_type') == 2>>
 			$npc_apt_kitchen
 		<<else>>
 			$npc_apt_kitchen
@@ -1256,7 +1256,7 @@ end} -->
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'have_to_go'>>
-	<<=$npcs.get($boy,'apt_bedroom')>>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	"I have to go," you say suddenly, pulling yourself out of bed.
 	<<actCLA 'Grab your clothes'>>
 		<<gt 'hookup_morning' 'morning_leave'>>
@@ -1270,7 +1270,7 @@ end} -->
 	<<video "pc/activities/misc/dress_1.mp4">>
 	<<gs 'hookup_after' 'dress_loop'>>
 	<<if getvar("$hookup['continuation']") > 0>>
-		<p>"I had a great time last night," <<=$npcs.get($boy,'firstname')>> says, while you're $hookup['dress_describe'].</p>
+		<p>"I had a great time last night," <<=$npcs.get($sex.npcId,'firstname')>> says, while you're $hookup['dress_describe'].</p>
 		<<gs 'hookup_morning' 'continuation_reponse1'>>
 	<</if>>
 	<<gs 'hookup_morning' 'later_nude'>>
@@ -1315,8 +1315,8 @@ end} -->
 				"Whatever, your loss," he shrugs.
 				<p>"Pfft-! Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything's in place and wave goodbye as you head towards the door.</p>
 			<<elseif getvar("$hookup['continuation']") == 2>>
-				<p>"Oh. Uhh, well..." <<=$npcs.get($boy,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you finish getting dressed in front of him.</p>
-				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($boy,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+				<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you finish getting dressed in front of him.</p>
+				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 			<</if>>
 			<<gs 'hookup_after' 'dress'>>
 		<<else>>
@@ -1324,9 +1324,9 @@ end} -->
 			<<if getvar("$hookup['continuation']") == 1>>
 				"Whatever, your loss," he shrugs.
 				<p>"Pfft-! Yeah, sure," you snigger back, turning towards the door. "Still, maybe we'll run into each other again or something. See you."</p>
-				<p>With a half-hearted goodbye, you open the door and leave <<=$npcs.get($boy,'firstname')>>'s apartment.</p>
+				<p>With a half-hearted goodbye, you open the door and leave <<=$npcs.get($sex.npcId,'firstname')>>'s apartment.</p>
 			<<elseif getvar("$hookup['continuation']") == 2>>
-				<p>"Oh. Uhh, well..." <<=$npcs.get($boy,'firstname')>> trails off and you're left in an extremely uncomfortable silence.</p>
+				<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence.</p>
 				<i>Well this is awkward...</i> you think to yourself as you turn towards the door.
 				"I guess I'll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.
 			<</if>>
@@ -1336,7 +1336,7 @@ end} -->
 		<</actCLA>>
 	<</actCLA>>
 	<<actCLA 'Sure'>>
-		<<=$npcs.get($boy,'apt_hall')>>
+		<<=$npcs.get($sex.npcId,'apt_hall')>>
 		<<if $wardrobe.clothingworntype == 'nude'>>
 			<<if getvar("$hookup['continuation']") == 1>>
 				<<setinit $hookup['fuckbuddy'] = 1>>
@@ -1359,7 +1359,7 @@ end} -->
 			<</if>>
 			<<gs 'hookup_after' 'dress'>>
 		<<else>>
-			<<=$npcs.get($boy,'apt_hall')>>
+			<<=$npcs.get($sex.npcId,'apt_hall')>>
 			<<if getvar("$hookup['continuation']") == 1>>
 				<!-- !! npc_QW = 1-->
 				"Sure, sounds fun," you smile.
@@ -1386,16 +1386,16 @@ end} -->
 	<</actCLA>>
 	<<if getvar("$hookup['continuation']") == 2>>
 		<<actCLA 'I`m not up for anything serious'>>
-			<<=$npcs.get($boy,'apt_hall')>>
+			<<=$npcs.get($sex.npcId,'apt_hall')>>
 			"I'm not looking for anything serious right now."
 			<<actCLA 'Sorry'>>
 				"Sorry..."
 				<<if $wardrobe.clothingworntype == 'nude'>>
 					<<gs 'hookup_after' 'dress'>>
-					<p>"Oh. Uhh, well, it's fine I guess..." <<=$npcs.get($boy,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-					<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($boy,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+					<p>"Oh. Uhh, well, it's fine I guess..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+					<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 				<<else>>
-					<p>"Oh. Uhh, well, it's fine I guess..." <<=$npcs.get($boy,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+					<p>"Oh. Uhh, well, it's fine I guess..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
 					<i>Well this is awkward...</i> you think to yourself as you turn towards the door.
 					"I guess I'll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.
 				<</if>>
@@ -1407,26 +1407,26 @@ end} -->
 				"If it's just a hookup," you continue. "or something like last night, I wouldn''t mind getting together for some fun, but I'm just not interested in dating anybody."
 				<<if rand(1,10) > 7>>
 					<<setinit $hookup['fuckbuddy'] = 1>>
-					<p>"Well... If it means I can see you again, then sure I guess." <<=$npcs.get($boy,'firstname')>> doesn't really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.</p>
+					<p>"Well... If it means I can see you again, then sure I guess." <<=$npcs.get($sex.npcId,'firstname')>> doesn't really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.</p>
 					<p>"So uhh, yeah... Call me sometime?"</p>
-					<p>"If I need some relief," you say with a shrug. You wave an awkward goodbye, you head out the door and out of <<=$npcs.get($boy,'firstname')>>'s apartment.</p>
+					<p>"If I need some relief," you say with a shrug. You wave an awkward goodbye, you head out the door and out of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'hookup_after' 'exit'>>
 					<</actCLA>>
 				<<else>>
 					"No," he shakes his head. "I don't want to get led on by you if you're only interested in a fuck and not anything real. Guess this is just a one night stand."
 					<<actCLA 'Taken aback'>>
-						<<=$npcs.get($boy,'apt_hall')>>
+						<<=$npcs.get($sex.npcId,'apt_hall')>>
 						<p>You blink in surprise, recoiling slightly at his words. That response really wasn't what you saw coming. After all, what guy just gives up free access to sex?</p>
-						<p>"Uhh well, uhh... Alright... Guess I won't see you later then..." you respond awkwardly. After giving yourself a once over, you give <<=$npcs.get($boy,'firstname')>> a strained smile and wave goodbye, quickly striding towards out the door.</p>
+						<p>"Uhh well, uhh... Alright... Guess I won't see you later then..." you respond awkwardly. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards out the door.</p>
 						<<actCLA 'Leave'>>
 							<<gt 'hookup_after' 'exit'>>
 						<</actCLA>>
 					<</actCLA>>
 					<<actCLA 'It`s to be expected'>>
-						<<=$npcs.get($boy,'apt_hall')>>
+						<<=$npcs.get($sex.npcId,'apt_hall')>>
 						You nod to yourself, admittedly a little bit wistfully. It's to be expected from a guy like him. But if he wants something more, you just can't give it to him. You're only after pleasure, you don't want to get tangled up in a relationship.
-						<p>"Well, guess I won't see you around then so... Bye?" You wave <<=$npcs.get($boy,'firstname')>> goodbye and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.</p>
+						<p>"Well, guess I won't see you around then so... Bye?" You wave <<=$npcs.get($sex.npcId,'firstname')>> goodbye and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.</p>
 						<<actCLA 'Leave'>>
 							<<gt 'hookup_after' 'exit'>>
 						<</actCLA>>
@@ -1498,7 +1498,7 @@ end} -->
 			<p>You pause for a moment, $hookup['reaction1'], giving him a look. "Seriously?"</p>
 			<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 			<p><i>Free access to pussy and you're just gonna turn it down. Whatever...</i> you think to yourself as you $hookup['reaction2'].</p>
-			<p>Once you're done, you grab your things and leave. <<=$npcs.get($boy,'firstname')>> doesn't say a word as you close the door behind you.</p>
+			<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
 			<</actCLA>>
@@ -1542,7 +1542,7 @@ end} -->
 			<p>You pause for a moment, $hookup['reaction1'], giving him a look. "Seriously?"</p>
 			<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 			<i>Wow... You can really pick em, huh <<$pc.name_nick>>...</i> you think to yourself as you <<$hookup[''reaction2'']>>. <i>Ugh. Whatever...</i>
-			<p>Once you're done, you grab your things and leave. <<=$npcs.get($boy,'firstname')>> doesn't say a word as you close the door behind you.</p>
+			<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
 			<</actCLA>>
@@ -1614,7 +1614,7 @@ end} -->
 			<p>You pause for a moment, $hookup['reaction1'], giving him a look. "Seriously?"</p>
 			<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 			<i>Wow... You can really pick em, huh <<$pc.name_nick>>...</i> you think to yourself as you <<$hookup[''reaction2'']>>. <i>Ugh. Whatever...</i>
-			<p>Once you're done, you grab your things and leave. <<=$npcs.get($boy,'firstname')>> doesn't say a word as you close the door behind you.</p>
+			<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
 			<</actCLA>>

sugarcube/src/autogenerated/unsorted/hookup_rape.tw

@@ -4,11 +4,11 @@
 <<if $location_var[$here][0] == 'skip_condom'>>
 	<<setinit $birth_control['condom_stealth'] = $time.daystart>>
 	<<video "shared/sex/cum/vagcreampie/doggy3.mp4">>
-	<p><<=$npcs.get($boy,'firstname')>> suddenly stops and you feel something spurt inside you. Your eyes go wide with shock.</p>
+	<p><<=$npcs.get($sex.npcId,'firstname')>> suddenly stops and you feel something spurt inside you. Your eyes go wide with shock.</p>
 	<i>Wait... is that...?</i>
 	<<actCLA 'Continue'>>
 		<<video "shared/sex/cum/vagcreampie/doggy1.mp4">>
-		<p>You wait a few heartbeats and <<=$npcs.get($boy,'firstname')>> pulls out of you. Immediately, you feel something thick spurt from your pussy.</p>
+		<p>You wait a few heartbeats and <<=$npcs.get($sex.npcId,'firstname')>> pulls out of you. Immediately, you feel something thick spurt from your pussy.</p>
 		<<gs 'hookup_rape' 'skip_condom_react'>>
 	<</actCLA>>
 <</if>>
@@ -17,10 +17,10 @@
 		<<image "shared/sex/cum/cum111.jpg">>
 		<p>"What the fuck!" you scream. Jumping up, you look down between your legs in horror and wipe your hand across your pussy, confirming your suspicions. Cum coats your fingers and continues to dribble from your snatch, running down your legs.</p>
 		<p>"What the fuck!" you shout again. "You said you put on a condom!"</p>
-		<p><<=$npcs.get($boy,'firstname')>> doesn't look the least bit apologetic and in fact shrugs smugly with a smile on his face.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't look the least bit apologetic and in fact shrugs smugly with a smile on his face.</p>
 		"I lied."
 		<<actCLA 'Grab your stuff!'>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"Holy shit!" You grab your things in a frenzy throwing on clothes as fast as you can. "What the fuck is wrong with you! I can't believe you just-!"</p>
 			Your mind is whipped up into such an emotional state, you can't finish sentences correctly. The revelation of what he just did is so offensive, so outrageous, that you can't even process it. The moment your clothes are fully on, you stomp out the door, slamming it behind you.
 			<<actCLA 'Leave'>>

sugarcube/src/autogenerated/unsorted/hookup_talk.tw

@@ -46,7 +46,7 @@
 			Cum still glazing your face, the two of you lay back on the bed, sitting in the afterglow.
 		<<elseif $hookup['cum_choice'] == 'stomach'>>
 			<!-- !! stomach-->
-			<p><<=$npcs.get($boy,'firstname')>>'s cum still resting on your stomach, the two of you lay back on the bed, sitting in the afterglow.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>>'s cum still resting on your stomach, the two of you lay back on the bed, sitting in the afterglow.</p>
 		<<else>>
 			Laying back on the bed, the two of you rest in the afterglow together.
 		<</if>>
@@ -56,11 +56,11 @@
 	hookup['pillow_talk'] = 2
 	'<<image `'shared/sex/after/pillow_talk2.jpg'`>>'
 	'You both lay back on the bed, breathing heavily, and turn to face each other.'
-	'"That was fucking great," <<<<=$npcs.get($boy,'firstname')>>>> pants, leaning over to snake his hand down and play with your pussy.'
+	'"That was fucking great," <<<<=$npcs.get($sex.npcId,'firstname')>>>> pants, leaning over to snake his hand down and play with your pussy.'
 	act'That <i>was</i> great':
 	cla & *nl
 	'"Mmmm!" You close your eyes, enjoying the sensation of his fingers on your clit. "That <i>was</i> great," you agree.'
-	if npc_generous[$boy] = 1:
+	if npc_generous[$sex.npcId] = 1:
 	if hookup['no_cum'] = 1:
 	'"Sorry you didn''t get to cum," he says apologetically.'
 	act'Trying to make up for it now?':
@@ -117,7 +117,7 @@
 	end
 	else
 	'"Anyone ever tell you what a fuckable pussy you've got?"'
-	'<<<<=$npcs.get($boy,'firstname')>>>> emphasizes his words by jamming his fingers inside you and schlicking your just-fucked pussy a few times.'
+	'<<<<=$npcs.get($sex.npcId,'firstname')>>>> emphasizes his words by jamming his fingers inside you and schlicking your just-fucked pussy a few times.'
 	act'Not lately':
 	cla & *nl
 	'"Not lately," you giggle, involuntarily squeezing your legs together from his fingering, "but I appreciate the compliment anyways."'
@@ -143,7 +143,7 @@
 	act'Stop it! I'm still sensitive!':
 	cla & *nl
 	'"Stop it!" you gasp, your legs snapping shut around his hand. "I'm still sensitive from when I came!"'
-	'<<<<=$npcs.get($boy,'firstname')>>>> grins back at you and rubs your clit a little more despite your protests, making you squirm, but he pulls away right after.'
+	'<<<<=$npcs.get($sex.npcId,'firstname')>>>> grins back at you and rubs your clit a little more despite your protests, making you squirm, but he pulls away right after.'
 	gs'hookup_after','pre'
 	end
 	end
@@ -205,7 +205,7 @@
 		<<actCLA 'That was nice'>>
 			<<setinit $hookup['sex_review'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>Looking over at <<=$npcs.get($boy,'firstname')>>, you give him a soft smile.</p>
+			<p>Looking over at <<=$npcs.get($sex.npcId,'firstname')>>, you give him a soft smile.</p>
 			"That was really nice," you say sweetly.
 			<<gs 'hookup_talk' 'did_you_come'>>
 		<</actCLA>>
@@ -218,7 +218,7 @@
 		<<actCLA 'I haven`t been fucked like that since grade school'>>
 			<<setinit $hookup['sex_review'] = 1>>
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
-			<p>"I haven't been fucked like that since grade school," you sigh. <<=$npcs.get($boy,'firstname')>> turns and gives you a puzzled look.</p>
+			<p>"I haven't been fucked like that since grade school," you sigh. <<=$npcs.get($sex.npcId,'firstname')>> turns and gives you a puzzled look.</p>
 			<p>"Grade school? What's that? You mean like secondary school?"</p>
 			"I don't actually know," you admit sheepishly. "It's just a line from an old movie. I guess I was just trying to be funny."
 			<p>"Uhh, okay... So... you're saying...?"</p>
@@ -230,7 +230,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'did_you_come'>>
-	<<if $npcs.get($boy,'generous') == 1>>
+	<<if $npcs.get($sex.npcId,'generous') == 1>>
 		<p>"Yeah," he agrees, panting. "Did you...?"</p>
 		He glances at your pussy and you guess he's asking if you came.
 		<<if $hookup['orgasm_count'] < $orgasm>>
@@ -284,15 +284,15 @@
 			<<image "shared/sex/after/pillow_talk3.jpg">>
 			"Well that sucked," you pout, staring straight ahead at the far wall.
 			<<setinit $hookup['sex_review'] = 1>>
-			<<if $npcs.get($boy,'generous') == 1>>
-				<p><<=$npcs.get($boy,'firstname')>> sits up all of a sudden. "Shit. You didn't get to cum."</p>
+			<<if $npcs.get($sex.npcId,'generous') == 1>>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> sits up all of a sudden. "Shit. You didn't get to cum."</p>
 				<<if getvar("$hookup['no_cum']") == 1>>
 					"I got pretty close," you continue. "But <i>somebody</i> came first..."
 					<p>"Well... how about I finish you off?"</p>
 					<p>You turn to look at him. "Meaning?"</p>
-					<p>"I could go down on you. Get you off." <<=$npcs.get($boy,'firstname')>> moves closer to you, lightly tracing his finger up and down your thigh.</p>
+					<p>"I could go down on you. Get you off." <<=$npcs.get($sex.npcId,'firstname')>> moves closer to you, lightly tracing his finger up and down your thigh.</p>
 					<<actCLA 'No, it`s fine'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"No, it's fine," you sigh. "I'm sorry. I'm just being fussy."
 						"Well... if you're sure," he says, looking surprisingly disappointed while he pulls away again.
 						<<gt 'hookup_after' 'pre'>>
@@ -301,7 +301,7 @@
 						<<actCLA 'If you`re offering...'>>
 							<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 							"Well... if you're seriously offering..."
-							<p><<=$npcs.get($boy,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
 							<<actCLA 'Get eaten out'>>
 								<<gt 'hookup' 'lick_pussy'>>
 							<</actCLA>>
@@ -332,7 +332,7 @@
 							<<actCLA 'If you`re offering...'>>
 								<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 								"Well... if you're seriously offering..."
-								<p><<=$npcs.get($boy,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
+								<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
 								<<actCLA 'Get eaten out'>>
 									<<gt 'hookup' 'lick_pussy'>>
 								<</actCLA>>
@@ -364,7 +364,7 @@
 							<<actCLA 'If you`re offering...'>>
 								<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 								"Well... if you're seriously offering..."
-								<p><<=$npcs.get($boy,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
+								<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
 								<<actCLA 'Get eaten out'>>
 									<<gt 'hookup' 'lick_pussy'>>
 								<</actCLA>>
@@ -384,15 +384,15 @@
 							<<gs 'hookup_after' 'pre'>>
 						<</actCLA>>
 						<<actCLA 'A cunt?!'>>
-							<<=$npcs.get($boy,'apt_bedroom')>>
+							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							<p>"Who the fuck are you calling cunt?!" you hiss. "I just let you fuck mine! You could at least show some remorse that you didn't get me off!"</p>
 							<p>"Oh fuck you!"</p>
 							<p>"You just did! That's the problem! You're a lousy fucking lay!"</p>
 							<p>"That's it! Get the fuck out!"</p>
 							<p>"Gladly!"</p>
 							<<actCLA 'Gather your things and leave'>>
-								<<=$npcs.get($boy,'apt_bedroom')>>
-								<p>You've had enough of <<=$npcs.get($boy,'firstname')>>'s shit. You grab your clothes and tug them on as fast as you can, before picking up the rest of your things and stomping your way out the door, slamming it behind you.</p>
+								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+								<p>You've had enough of <<=$npcs.get($sex.npcId,'firstname')>>'s shit. You grab your clothes and tug them on as fast as you can, before picking up the rest of your things and stomping your way out the door, slamming it behind you.</p>
 								<i>Fuck! What a prick!</i>
 								<<actCLA 'Leave'>>
 									<<gt 'hookup_after' 'exit'>>
@@ -422,7 +422,7 @@
 					<<gs 'hookup_talk' 'pleasure_argue'>>
 				<</actCLA>>
 			<<else>>
-				<p><<=$npcs.get($boy,'firstname')>> stiffens at your comment, but decides not to respond, quietly withdrawing while you pout in silence.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> stiffens at your comment, but decides not to respond, quietly withdrawing while you pout in silence.</p>
 				<<gs 'hookup_after' 'pre'>>
 			<</if>>
 		<</actCLA>>
@@ -433,7 +433,7 @@
 		<p>"So your partner's pleasure doesn't mean anything to you?!" you hiss at him.</p>
 		<p>"Doesn't seem to matter to you either!" he spits back.</p>
 		<<actCLA 'Apologize'>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			You take a deep breath and try to calm down.
 			"I'm sorry," you apologize. "I shouldn''t be so hung up on this. We only just met, I shouldn''t expect you to be the perfect sex partner."
 			Your apology seems to calm him down a bit and he relents as well.
@@ -442,7 +442,7 @@
 			<<gs 'hookup_after' 'pre'>>
 		<</actCLA>>
 		<<actCLA 'Gather your things and leave'>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			His response leaves you boiling with anger. Tonight clearly isn''t going to get any better so you decide to just grab your things and go.
 			You grab your clothes and tug them on as fast as you can, before picking up the rest of your things and stomping your way out the door, slamming it behind you.
 			<i>Fuck! What a prick!</i>
@@ -455,7 +455,7 @@
 <<if $location_var[$here][0] == 'review_better_than_boyfriend'>>
 	<<if getvar("$pcs_lovers") > 0>>
 		<<actCLA 'You`re better than my boyfriend'>>
-			<<run $npcs.set($boy,'know_cheat',1)>>
+			<<run $npcs.set($sex.npcId,'know_cheat',1)>>
 			<<if getvar("$hookup['cigarette']") == 3 or getvar("$hookup['cigarette']") == 5>>
 				<<image "shared/sex/after/bed_smoke3.jpg">>
 			<<elseif getvar("$hookup['cigarette']") == 1 or getvar("$hookup['cigarette']") == 4>>
@@ -464,14 +464,14 @@
 				<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			<</if>>
 			"That was great," you sigh contentedly. "You're even better than my boyfriend."
-			<<if $npcs.get($boy,'girlfriend') == 1>>
-				<p>"You're not bad yourself," <<=$npcs.get($boy,'firstname')>> says. "My girlfriend never makes me come like that."</p>
-			<<elseif $npcs.get($boy,'goal') == 1 and rand(0,1) == 1>>
+			<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
+				<p>"You're not bad yourself," <<=$npcs.get($sex.npcId,'firstname')>> says. "My girlfriend never makes me come like that."</p>
+			<<elseif $npcs.get($sex.npcId,'goal') == 1 and rand(0,1) == 1>>
 				"I bet I'm bigger than him too," he says, grinning arrogantly.
 			<<else>>
-				<p>"Boyfriend...?" <<=$npcs.get($boy,'firstname')>> asks hesitantly.</p>
+				<p>"Boyfriend...?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly.</p>
 				<p>"You didn't think that one dick is enough for a girl like me, did you?" you ask back, giving him a smile that's anything but innocent. "But don't be jealous. Like I said, you're better."</p>
-				<p>You give <<=$npcs.get($boy,'firstname')>> a wink, but he doesn't look any more comfortable.</p>
+				<p>You give <<=$npcs.get($sex.npcId,'firstname')>> a wink, but he doesn't look any more comfortable.</p>
 			<</if>>
 			<<gs 'hookup_talk' '$hookup['topic']'>>
 		<</actCLA>>
@@ -495,9 +495,9 @@
 				<!-- !! felt amazing-->
 				"Also, you were totally right," you say with a wide grin. "It <i>was</i> better without the condom."
 			<<else>>
-				<p>"By the way," you smile at <<=$npcs.get($boy,'firstname')>>. "You were right. It <i>was</i> better without the condom."</p>
+				<p>"By the way," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "You were right. It <i>was</i> better without the condom."</p>
 			<</if>>
-			<<if $npcs.get($boy,'selfish') == 1>>
+			<<if $npcs.get($sex.npcId,'selfish') == 1>>
 				<<if $hookup['cum_choice'] == 'creampie'>>
 					"Oh yeah. Busting a nut inside is the best."
 					<<actCLA 'Worry'>>
@@ -532,7 +532,7 @@
 					<<else>>
 						"Your pussy felt amazing."
 						"So did your dick," you murmur back.
-						<p>"Is it okay that I... you know...?" <<=$npcs.get($boy,'firstname')>> eyes your pussy, his cum still leaking from it.</p>
+						<p>"Is it okay that I... you know...?" <<=$npcs.get($sex.npcId,'firstname')>> eyes your pussy, his cum still leaking from it.</p>
 					<</if>>
 					<<actCLA 'I`ll be fine'>>
 						"I'll be fine," you say reassuringly. "One creampie isn''t gonna kill me."
@@ -557,13 +557,13 @@
 							<<elseif getvar("$birth_control['think_safe']") == 1>>
 								"It's fine. I'm on the pill," you reassure him. "I just wanted to be extra safe. No harm done."
 							<</if>>
-							<p><<=$npcs.get($boy,'firstname')>> seems to relax, relieved that you're not upset.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
 							<<gs 'hookup_talk' '$hookup['topic']'>>
 						<</actCLA>>
 					<<else>>
 						<<actCLA 'I`m on birth control (lie)'>>
 							"It's fine. I'm on birth control," you lie through your teeth.
-							<p><<=$npcs.get($boy,'firstname')>> seems to relax, relieved that you're not upset.</p>
+							<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
 							<i>I wonder if his baby is going to be swimming around inside me after this...</i>
 							<<gs 'hookup_talk' '$hookup['topic']'>>
 						<</actCLA>>
@@ -596,7 +596,7 @@
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			"When you came inside me... it felt <i>so</i> good..."
 			<<if getvar("$hookup['condom']") > 1>>
-				<p>"I thought you didn't want me to cum inside you?" <<=$npcs.get($boy,'firstname')>> asks, smiling at you.</p>
+				<p>"I thought you didn't want me to cum inside you?" <<=$npcs.get($sex.npcId,'firstname')>> asks, smiling at you.</p>
 				<<if getvar("$hookup['creampie_force']") == 1>>
 					"I changed my mind," you smirk mischeviously.
 				<<elseif getvar("$hookup['creampie_ask']") == 1>>
@@ -614,7 +614,7 @@
 		<<actCLA 'That was my first creampie (blush)'>>
 			<<setinit $hookup['first_creampie'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>"You know," you start to say, your face heating up as you look into <<=$npcs.get($boy,'firstname')>>'s eyes. "That was, uh... the first time anyone's come inside me."</p>
+			<p>"You know," you start to say, your face heating up as you look into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "That was, uh... the first time anyone's come inside me."</p>
 			<p>"Really?" he asks and you feel your cheeks burns even hotter.</p>
 			<<actCLA ''>>
 			<</actCLA>>
@@ -634,7 +634,7 @@
 				<p>"You got some kind of creampie fetish huh?"</p>
 				"Maybe..."
 			<<else>>
-				<p>"That's fucking hot," <<=$npcs.get($boy,'firstname')>> he grins back, staring at your pussy and watching the fruit of his labor.</p>
+				<p>"That's fucking hot," <<=$npcs.get($sex.npcId,'firstname')>> he grins back, staring at your pussy and watching the fruit of his labor.</p>
 			<</if>>
 			<<gs 'hookup_talk' '$hookup['topic']'>>
 		<</actCLA>>
@@ -707,14 +707,14 @@
 	<<if getvar("$birth_control['think_safe']") == 0 and $hookup['cum_choice'] == 'creampie' and getvar("$hookup['hope_not_pregnant']") == 0 and getvar("$hookup['condom']") != 1>>
 		<<actCLA 'I hope I don`t get pregnant'>>
 			<<setinit $hookup['hope_not_pregnant'] = 1>>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<!-- !! add option for creampie force-->
 			<<if getvar("$hookup['felt_good_creampie']") > 0>>
 				"Still," you say, staring into the ceiling. "I really hope I don't get pregnant."
 			<<else>>
 				"Man," you say, staring into the ceiling. "I really hope I don't get pregnant."
 			<</if>>
-			<p><<=$npcs.get($boy,'firstname')>> pauses. "You'll get the morning after pill from the pharmacy tomorrow, right?"</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> pauses. "You'll get the morning after pill from the pharmacy tomorrow, right?"</p>
 			<<actCLA 'I will'>>
 				"I will, this kind of thing just stresses me out."
 				"Well, just make sure you do it and there''s nothing to stress out about."
@@ -734,10 +734,10 @@
 			<<if $finances.cash < 740>>
 				<<actCLA 'If I can afford it'>>
 					"If I can afford it..." you gulp.
-					<p><<=$npcs.get($boy,'firstname')>> stops.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> stops.</p>
 					<p>"You don't have 750<b>₽</b>???"</p>
 					"No..."
-					<<if $npcs.get($boy,'childfree') == 1>>
+					<<if $npcs.get($sex.npcId,'childfree') == 1>>
 						<<set $finances.cash += 750>>
 						"Fucking hell," he shakes his head and reaches over the side of the bed. He pulls out his wallet and grabs a wad of cash and tosses it at you, your eyes going wide.
 						<p>"Woah! I wasn't-! I just-!"</p>
@@ -755,7 +755,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'creampie_surprise_cum_react1'>>
 	<<actCLA '... not what I expected'>>
-		<p>"... not what I expected," you finish, flattly. <<=$npcs.get($boy,'firstname')>> looks at you confused.</p>
+		<p>"... not what I expected," you finish, flattly. <<=$npcs.get($sex.npcId,'firstname')>> looks at you confused.</p>
 		<p>"You're... you're not mad?" he asks.</p>
 		You reach between your legs, fingering the fluid coming out of you and holding it up in front of your eyes. Vaguely white, sticky, the strands of cum hang thick between your fingers as you stare at it.
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react_options1'>>
@@ -763,18 +763,18 @@
 	<<actCLA '... incredible'>>
 		<<setinit $hookup['furious'] = 2>>
 		<p>"... <i>incredible</i>," you gush, taking a shuddering breath as shivers run through you. "I could feel it when you came inside me! I felt your cock move and then all this warm stuff was filling me up and I-! It was amazing!"</p>
-		<p><<=$npcs.get($boy,'firstname')>> seems taken aback by your reaction, hesitantly asking, "So... you're not mad?"</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> seems taken aback by your reaction, hesitantly asking, "So... you're not mad?"</p>
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react_options1'>>
 	<</actCLA>>
 	<<actCLA '... so fucking hot'>>
 		<<setinit $hookup['furious'] = 2>>
 		"... <i>so fucking hot</i>," you moan, taking a shuddering breath as shivers run through you. "I could <i>feel</i> your cum inside me. Shooting right into my cervix, filling up my womb. The heat, the sensation, I just felt <i>full</i>. It was so fucking good, you have no idea. I actually feel bad that guys can't experience this," you say, unable to help but grin.
-		<p><<=$npcs.get($boy,'firstname')>> seems taken aback by your reaction, hesitantly asking, "So... you're not mad?"</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> seems taken aback by your reaction, hesitantly asking, "So... you're not mad?"</p>
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react_options1'>>
 	<</actCLA>>
 	<<actCLA 'I forgive you'>>
 		"I forgive you," you say, giving him a smile and gently caressing his arm. "Like you said, it was an accident. I'm not going to break your balls off for that. Besides, you did a pretty good job of making me come."
-		<p>Your smile widens into a full blown grin and <<=$npcs.get($boy,'firstname')>> can't help but return it.</p>
+		<p>Your smile widens into a full blown grin and <<=$npcs.get($sex.npcId,'firstname')>> can't help but return it.</p>
 		<<gs 'hookup_after' 'pre'>>
 	<</actCLA>>
 <</if>>
@@ -782,10 +782,10 @@
 	<<actCLA 'I didn`t expect that'>>
 		<!-- !!	hookup['felt_good_creampie'] = 2-->
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>"I can't believe I just came like that," you say, looking over at <<=$npcs.get($boy,'firstname')>> in disbelief of what just happened. "The last thing I remember... you were fucking me, and then I felt something warm spreading inside me... and then I just... <i>came</i>..."</p>
-		<p>"Maybe you have some kind of creampie fetish you didn't know about," <<=$npcs.get($boy,'firstname')>> says back, looking amused.</p>
+		<p>"I can't believe I just came like that," you say, looking over at <<=$npcs.get($sex.npcId,'firstname')>> in disbelief of what just happened. "The last thing I remember... you were fucking me, and then I felt something warm spreading inside me... and then I just... <i>came</i>..."</p>
+		<p>"Maybe you have some kind of creampie fetish you didn't know about," <<=$npcs.get($sex.npcId,'firstname')>> says back, looking amused.</p>
 		<<actCLA 'Gulp'>>
-			<p>You swallow hard, throat suddenly feeling dry. The thought of being creampied like that again has your face feeling hot and you have to look away from <<=$npcs.get($boy,'firstname')>>.</p>
+			<p>You swallow hard, throat suddenly feeling dry. The thought of being creampied like that again has your face feeling hot and you have to look away from <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 			He might have hit the nail on the head a little too hard there.
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -793,13 +793,13 @@
 		<<actCLA 'I don`t think so'>>
 			You shake your head at his hypothesis.
 			"I don't think so. This doesn''t usually happen to me. It must just be coincidence."
-			<p>"Or maybe I have a magic dick," <<=$npcs.get($boy,'firstname')>> grins. You can't help but laugh back.</p>
+			<p>"Or maybe I have a magic dick," <<=$npcs.get($sex.npcId,'firstname')>> grins. You can't help but laugh back.</p>
 			<p>"Or maybe that! Haha!"</p>
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
 		<</actCLA>>
 		<<actCLA 'Maybe'>>
-			<p>Your face suddenly flushes with heat at the thought and you know it's just turned bright red. <<=$npcs.get($boy,'firstname')>>'s smile grows a little wider.</p>
+			<p>Your face suddenly flushes with heat at the thought and you know it's just turned bright red. <<=$npcs.get($sex.npcId,'firstname')>>'s smile grows a little wider.</p>
 			"Maybe," you say hoarsely. "I might have to do a little self discovery on that..."
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -811,7 +811,7 @@
 		<<else>>
 			"I forgive you by the way," you say, rolling your eyes. "For coming inside me without asking."
 		<</if>>
-		<<if $npcs.get($boy,'smoker') > 0>>
+		<<if $npcs.get($sex.npcId,'smoker') > 0>>
 			"Of course you do," he says, reaching over to his nightstand and grabbing a cigarette. "The way you came, your pussy was practically begging for it."
 		<<else>>
 			"Of course you do," he says, grinning at you. "The way you came, your pussy was practically begging for it."
@@ -834,12 +834,12 @@
 	<<actCLA 'You`re an asshole'>>
 		<<image "shared/sex/after/annoyed1.jpg">>
 		<!-- !!		if hookup['condom'] = 3:-->
-		<p>Now that you've come down from your orgasmic high, it hits you how irritated you are with <<=$npcs.get($boy,'firstname')>> that he just came inside you like that.</p>
-		<<if $npcs.get($boy,'smoker') > 0>>
+		<p>Now that you've come down from your orgasmic high, it hits you how irritated you are with <<=$npcs.get($sex.npcId,'firstname')>> that he just came inside you like that.</p>
+		<<if $npcs.get($sex.npcId,'smoker') > 0>>
 			<p>"You're a fucking asshole, you know that?" you say, glaring at him as he reaches over to his nightstand to grab a cigarette.</p>
 			"An asshole who''s fantastic in bed," he replies, grinning at you from around the fag as he lights it. "Don't think I didn''t feel you coming on my cock too. Your pussy was practically begging for it."
 		<<else>>
-			<p>"You're a fucking asshole, you know that?" you say, glaring at <<=$npcs.get($boy,'firstname')>>.</p>
+			<p>"You're a fucking asshole, you know that?" you say, glaring at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
 			He just looks back at you, a smug grin on his face. "An asshole who''s great in bed. Don't think I didn''t feel you coming on my cock too. Your pussy was practically begging for it.
 		<</if>>
 		You huff in disgust and turn your head away from him. <i>Asshole...</i> you curse again internally.
@@ -873,8 +873,8 @@
 		<<else>>
 			"Maybe I should be," you say. "After all, you <i>did</i> just blow your load inside me without even asking me..."
 		<</if>>
-		<p>You lay back on the bed, looking up at <<=$npcs.get($boy,'firstname')>>, feeling his cum continue to trickle out of your pussy. <<=$npcs.get($boy,'firstname')>> gulps.</p>
-		<p>But no," you say. "I'm not mad. You didn't mean to, and I think you'd know I was lying if I said it didn't feel good. I won't hold it against you." You let your face light up with a smile and <<=$npcs.get($boy,'firstname')>> breathes a sigh of relief, letting himself smile as well.</p>
+		<p>You lay back on the bed, looking up at <<=$npcs.get($sex.npcId,'firstname')>>, feeling his cum continue to trickle out of your pussy. <<=$npcs.get($sex.npcId,'firstname')>> gulps.</p>
+		<p>But no," you say. "I'm not mad. You didn't mean to, and I think you'd know I was lying if I said it didn't feel good. I won't hold it against you." You let your face light up with a smile and <<=$npcs.get($sex.npcId,'firstname')>> breathes a sigh of relief, letting himself smile as well.</p>
 		<<gs 'hookup_after' 'pre'>>
 	<</actCLA>>
 <</if>>
@@ -888,8 +888,8 @@
 		<<else>>
 			"Well, I am a <i>little</i> mad," you say, letting a hard edge creep into your voice. "After all, you did just blow your load into me without even having the common fucking decency of asking."
 		<</if>>
-		<p>You lay back on the bed, looking up at <<=$npcs.get($boy,'firstname')>>, feeling his cum continue to trickle out of your pussy. <<=$npcs.get($boy,'firstname')>> gulps.</p>
-		<p>But..." you say. "It felt really good too. If you hadn't made me come, then I'd probably be beating the shit out of you right now. But you did, so you get off easy this time," You give <<=$npcs.get($boy,'firstname')>> a gentle punch on the arm and let your face light up with a smile. <<=$npcs.get($boy,'firstname')>> breathes a sigh of relief, letting himself smile as well.</p>
+		<p>You lay back on the bed, looking up at <<=$npcs.get($sex.npcId,'firstname')>>, feeling his cum continue to trickle out of your pussy. <<=$npcs.get($sex.npcId,'firstname')>> gulps.</p>
+		<p>But..." you say. "It felt really good too. If you hadn't made me come, then I'd probably be beating the shit out of you right now. But you did, so you get off easy this time," You give <<=$npcs.get($sex.npcId,'firstname')>> a gentle punch on the arm and let your face light up with a smile. <<=$npcs.get($sex.npcId,'firstname')>> breathes a sigh of relief, letting himself smile as well.</p>
 		<<gs 'hookup_after' 'pre'>>
 	<</actCLA>>
 <</if>>
@@ -911,7 +911,7 @@
 	<<actCLA 'I`m furious'>>
 		<<image "shared/sex/after/annoyed1.jpg">>
 		<p>"Mad?" you scoff. "I'm fucking furious!"</p>
-		<p><<=$npcs.get($boy,'firstname')>> cringes back as you glare at him with all the anger you can muster.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> cringes back as you glare at him with all the anger you can muster.</p>
 		<<if getvar("$hookup['condom']") == 2>>
 			<p>"First," you say, jabbing your finger at him in accusation. "I ask you to use a condom. Then you talk me into skipping it, saying 'oh, it'll be okay, it's just this one time' and like a moron, I listened to you. And <i>then</i> you fucking come inside me anyways!" By the time you're finished with your rant, you're practically shouting.</p>
 		<<elseif getvar("$hookup['condom']") == 3>>
@@ -925,10 +925,10 @@
 <</if>>
 <<if $location_var[$here][0] == 'have_to_ask1'>>
 	<<actCLA 'You have to ask (not mad)'>>
-		<<run $npcs.set($boy,'need_ask_creampie',1)>>
+		<<run $npcs.set($sex.npcId,'need_ask_creampie',1)>>
 		<<video "shared/sex/after/pillow_talk3.mp4">>
 		<p>"I don't mind when a guy comes inside me. But," you smile, holding up a finger. "You have. To. Ask!"</p>
-		<p>You punctuate your mild chastisement with a gentle tap on his nose. All <<=$npcs.get($boy,'firstname')>> can do is grin back at you.</p>
+		<p>You punctuate your mild chastisement with a gentle tap on his nose. All <<=$npcs.get($sex.npcId,'firstname')>> can do is grin back at you.</p>
 		<<gs 'hookup_after' 'pre'>>
 	<</actCLA>>
 <</if>>
@@ -952,18 +952,18 @@
 	<<if getvar("$siga") > 0>>
 		<<actCLA 'I need a cigarette'>>
 			<<image "shared/sex/after/bed_smoke0.jpg">>
-			<p>"I think I need a cigarette," you say, smirking at <<=$npcs.get($boy,'firstname')>>. You reach down to your purse and pull out a fag and a lighter, sparking it and inhaling deeply.</p>
+			<p>"I think I need a cigarette," you say, smirking at <<=$npcs.get($sex.npcId,'firstname')>>. You reach down to your purse and pull out a fag and a lighter, sparking it and inhaling deeply.</p>
 			<<actCLA 'Continue'>>
 				<<gs 'drugs' 'smoke'>>
-				<<if $npcs.get($boy,'smoker') > 0>>
+				<<if $npcs.get($sex.npcId,'smoker') > 0>>
 					<<image "shared/sex/after/bed_smoke3.jpg">>
 				<<else>>
 					<<image "shared/sex/after/bed_smoke1.jpg">>
 				<</if>>
 				Smoke fills your lungs and you sigh, letting out the breath and feeling your entire body relax into bliss. Something about ending a good fuck with a smoke just <i>completes</i> the experience.
-				<<if $npcs.get($boy,'smoker') > 0>>
+				<<if $npcs.get($sex.npcId,'smoker') > 0>>
 					<<setinit $hookup['cigarette'] = 5>>
-					<p>You look over and see <<=$npcs.get($boy,'firstname')>> following your lead, reaching over to his nightstand and lighting up a cigarette for himself as well.</p>
+					<p>You look over and see <<=$npcs.get($sex.npcId,'firstname')>> following your lead, reaching over to his nightstand and lighting up a cigarette for himself as well.</p>
 				<<else>>
 					<<setinit $hookup['cigarette'] = 4>>
 				<</if>>
@@ -977,7 +977,7 @@
 	<<setinit $hookup['talk'] += 1>>
 	<<setinit $hookup['get_out'] = 2>>
 	<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
-	<p>"So that's what sex is like..." you murmur to yourself, but <<=$npcs.get($boy,'firstname')>> looks over anyways.</p>
+	<p>"So that's what sex is like..." you murmur to yourself, but <<=$npcs.get($sex.npcId,'firstname')>> looks over anyways.</p>
 	<<setinit $hookup['virgin_talk'] = 1>>
 	<<setinit $hookup['sex_review'] = 1>>
 	<p>"How did you like it?" he asks. "How was your first time?"</p>
@@ -989,21 +989,21 @@
 			"It gets better. You were probably too tight because you were a virgin."
 			<<actCLA 'Really?'>>
 				<p>"Really?" you ask, voice heavy with sketicism.</p>
-				<p>"Yeah, really," <<=$npcs.get($boy,'firstname')>> laughs back. "Some girls I know said their first time hurt. But those same girls love it now."</p>
+				<p>"Yeah, really," <<=$npcs.get($sex.npcId,'firstname')>> laughs back. "Some girls I know said their first time hurt. But those same girls love it now."</p>
 				"Wish you could''ve warned me."
 				"If it's any consolation, your pussy felt great."
 				"It's not," you harumph, crossing your arms and he laughs again.
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 			<<actCLA 'I hope so'>>
-				<p>"I hope so," you groan, throwing your head back as <<=$npcs.get($boy,'firstname')>> laughs.</p>
+				<p>"I hope so," you groan, throwing your head back as <<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
 				"If it's any consolation, your pussy felt great."
 				"It's not," you harumph, crossing your arms and he laughs again.
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 			<<actCLA 'How would you know?'>>
 				<p>"How would you know?" you ask, giving him a dirty look. "Have you ever taken a cock inside you?"</p>
-				<p><<=$npcs.get($boy,'firstname')>> laughs in reply but holds his hands up in surrender.</p>
+				<p><<=$npcs.get($sex.npcId,'firstname')>> laughs in reply but holds his hands up in surrender.</p>
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -1024,7 +1024,7 @@
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"It was... I don't know..." you admit. "I didn''t actually feel much. It hurt when you tore through my hymen, but after that it was just sort of... there... inside me."
 			<p>"It wasn't bad!" you rush to reassure him. "But... it wasn't... what I expected I guess? I don't really know how this is supposed to feel," you mumble sheepishly.</p>
-			<<if $npcs.get($boy,'generous') == 1>>
+			<<if $npcs.get($sex.npcId,'generous') == 1>>
 				"Well, maybe it'll be better in the future. But I'm sorry I couldn''t make your first time special."
 				You blush at how sweet he's being, but you don't say anything else and leave it there.
 			<<else>>
@@ -1040,8 +1040,8 @@
 			<<setinit $hookup['virgin_enjoyment_share'] = 2>>
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			<p>"It was... nice," you say, giving a genuine smile. "Felt really good. I just felt... <i>full</i>. Like my insides were getting massaged. But better!"</p>
-			<<if $npcs.get($boy,'generous') == 1>>
-				<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($boy,'firstname')>> smiles back, leaning in to kiss you.</p>
+			<<if $npcs.get($sex.npcId,'generous') == 1>>
+				<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
 				<<gs 'hookup_talk' 'kiss_turn_head'>>
 				<<actCLA 'Kiss him back'>>
 					You smile and let him press his lips against yours, leaning in to steal another one when he pulls away.
@@ -1049,7 +1049,7 @@
 					<<gs 'hookup_talk' 'sex_talk'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($boy,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 				<<actCLA 'Thought: "Really?!"'>>
 					<i>Fuck, really?!</i> you think to yourself. <i>This isn''t how it always feels?</i>
 					<<gs 'hookup_talk' 'sex_talk'>>
@@ -1064,8 +1064,8 @@
 			<<setinit $hookup['virgin_enjoyment_share'] = 3>>
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			<p>"It was amazing!" you gush with a shameless grin. "It was like I've been missing something this entire time. And you being inside me made me feel <i>full</i>. I can't believe I waited this long to have sex! I need to be careful or I could get addicted to this!"</p>
-			<<if $npcs.get($boy,'generous') == 1>>
-				<p>Perhaps spurred by your words, <<=$npcs.get($boy,'firstname')>> quickly moves in to kiss you.</p>
+			<<if $npcs.get($sex.npcId,'generous') == 1>>
+				<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
 				<<gs 'hookup_talk' 'kiss_turn_head'>>
 				<<actCLA 'Kiss him back'>>
 					You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. It's not as good as the sex you just experienced, but it feels <i>damn</i> nice. You even lean in to steal another kiss when he pulls away.
@@ -1075,7 +1075,7 @@
 					<<gs 'hookup_talk' 'sex_talk'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($boy,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 				<<actCLA 'Thought: "Really?!"'>>
 					<i>Fuck, really?!</i> you think to yourself. <i>This isn''t how it always feels? Shit!</i>
 					<<gs 'hookup_talk' 'sex_talk'>>
@@ -1101,7 +1101,7 @@ gs'hookup_talk','first_cum_lie'
 <<if $location_var[$here][0] == 'nice_lie1'>>
 	<<actCLA 'It was nice (lie)'>>
 		<<setinit $hookup['virgin_enjoyment_share'] = 3>>
-		<<setinit $first_time_nice_lie1[$boy] = 1>>
+		<<setinit $first_time_nice_lie1[$sex.npcId] = 1>>
 		<!-- !! this variable is so that if you end up dating, you can confess down the line that you lied about your first time feeling good-->
 		<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 		<<if getvar("$hookup['virgin_enjoyment']") == -1>>
@@ -1109,8 +1109,8 @@ gs'hookup_talk','first_cum_lie'
 		<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
 			"It was... nice," you say, giving a forced smile. Actually, it didn''t feel like very much at all. All you really felt was a weird pressure moving inside you. Didn''t feel bad, but it didn''t feel good either. But you don't want to hurt his feelings so you just lie instead. "Felt really good."
 		<</if>>
-		<<if $npcs.get($boy,'generous') == 1>>
-			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($boy,'firstname')>> smiles back, leaning in to kiss you.</p>
+		<<if $npcs.get($sex.npcId,'generous') == 1>>
+			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
 			<<gs 'hookup_talk' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him press his lips against yours, leaning in to steal another one when he pulls away. Unlike the experience you just had, this <i>does</i> feel nice.
@@ -1122,7 +1122,7 @@ gs'hookup_talk','first_cum_lie'
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Yeah," <<=$npcs.get($boy,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 			<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1135,7 +1135,7 @@ gs'hookup_talk','first_cum_lie'
 <<if $location_var[$here][0] == 'nice_lie2'>>
 	<<actCLA 'It was nice (lie)'>>
 		<<setinit $hookup['virgin_enjoyment_share'] = 3>>
-		<<setinit $first_time_nice_lie1[$boy] = 1>>
+		<<setinit $first_time_nice_lie1[$sex.npcId] = 1>>
 		<!-- !! this variable is so that if you end up dating, you can confess down the line that you lied about your first time feeling good-->
 		<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 		<<if getvar("$hookup['virgin_enjoyment']") == -1>>
@@ -1143,11 +1143,11 @@ gs'hookup_talk','first_cum_lie'
 		<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
 			"It was... nice," you say, giving a forced smile, boredly ignoring his hand between your legs. Actually, it didn''t feel like very much at all. All you really felt was a weird pressure moving inside you. Didn''t feel bad, but it didn''t feel good either. But you don't want to hurt his feelings so you just lie instead. "Felt really good."
 		<</if>>
-		<<if $npcs.get($boy,'generous') == 1>>
-			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($boy,'firstname')>> smiles back, leaning in to kiss you.</p>
+		<<if $npcs.get($sex.npcId,'generous') == 1>>
+			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
 			<<gs 'hookup_talk' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
-				<p>You smile and let <<=$npcs.get($boy,'firstname')>> press his lips against yours, gasping into his mouth when you feel his fingers thumb over your clit again before pulling away. Unlike the experience you just had, this <i>does</i> feel nice.</p>
+				<p>You smile and let <<=$npcs.get($sex.npcId,'firstname')>> press his lips against yours, gasping into his mouth when you feel his fingers thumb over your clit again before pulling away. Unlike the experience you just had, this <i>does</i> feel nice.</p>
 				<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1156,7 +1156,7 @@ gs'hookup_talk','first_cum_lie'
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Yeah," <<=$npcs.get($boy,'firstname')>> grins, giving your clit a hard rub before pulling away. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins, giving your clit a hard rub before pulling away. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 			<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1169,7 +1169,7 @@ gs'hookup_talk','first_cum_lie'
 <<if $location_var[$here][0] == 'amazing_lie1'>>
 	<<actCLA 'It was amazing (lie)'>>
 		<!-- !! this variable is so that if you end up dating, you can confess down the line that you lied about your first time feeling good-->
-		<<setinit $first_time_nice_amazing[$boy] = 1>>
+		<<setinit $first_time_nice_amazing[$sex.npcId] = 1>>
 		<<setinit $hookup['virgin_enjoyment_share'] = 3>>
 		<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 		<<if getvar("$hookup['virgin_enjoyment']") == -1>>
@@ -1177,8 +1177,8 @@ gs'hookup_talk','first_cum_lie'
 		<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
 			<p>"It was amazing!" you say, giving a fake smile. Actually, it didn't feel like very much at all. All you really felt was a weird pressure moving inside you. Didn't feel bad, but it didn't feel good either. But you don't want to hurt his feelings so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<</if>>
-		<<if $npcs.get($boy,'generous') == 1>>
-			<p>Perhaps spurred by your words, <<=$npcs.get($boy,'firstname')>> quickly moves in to kiss you.</p>
+		<<if $npcs.get($sex.npcId,'generous') == 1>>
+			<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
 			<<gs 'hookup_talk' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. Unlike the experience you just had, this <i>does</i> feel nice. You even lean in to steal another kiss when he pulls away.
@@ -1186,12 +1186,12 @@ gs'hookup_talk','first_cum_lie'
 				<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
-					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($boy,'firstname')>> is sweet.</p>
+					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($sex.npcId,'firstname')>> is sweet.</p>
 				<</if>>
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Better hope you don't," <<=$npcs.get($boy,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
+			<p>"Better hope you don't," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
 			<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1205,15 +1205,15 @@ gs'hookup_talk','first_cum_lie'
 	<<actCLA 'It was amazing (lie)'>>
 		<<setinit $hookup['virgin_enjoyment_share'] = 3>>
 		<!-- !! this variable is so that if you end up dating, you can confess down the line that you lied about your first time feeling good-->
-		<<setinit $first_time_nice_amazing[$boy] = 1>>
+		<<setinit $first_time_nice_amazing[$sex.npcId] = 1>>
 		<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 		<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 			<p>"It was amazing!" you say, giving a forced grin, trying to ignore the hand between your legs. Actually, it hurt like hell! But you don't want to spoil the mood so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
 			<p>"It was amazing!" you say, giving a forced grin, boredly ignoring hand between your legs. Actually, it didn't feel like very much at all. All you really felt was a weird pressure moving inside you. Didn't feel bad, but it didn't feel good either. But you don't want to hurt his feelings so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<</if>>
-		<<if $npcs.get($boy,'generous') == 1>>
-			<p>Perhaps spurred by your words, <<=$npcs.get($boy,'firstname')>> quickly moves in to kiss you.</p>
+		<<if $npcs.get($sex.npcId,'generous') == 1>>
+			<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
 			<<gs 'hookup_talk' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. Then you feel his fingers give your clit another good rub, making you moan directly into his mouth. Unlike the experience you just had, this <i>does</i> feel nice. You bite your lip, letting the pleasure roll through you.
@@ -1221,12 +1221,12 @@ gs'hookup_talk','first_cum_lie'
 				<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
-					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($boy,'firstname')>> is sweet.</p>
+					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($sex.npcId,'firstname')>> is sweet.</p>
 				<</if>>
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Better hope you don't," <<=$npcs.get($boy,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
+			<p>"Better hope you don't," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
 			<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1245,10 +1245,10 @@ gs'hookup_talk','first_cum_lie'
 			"This might not mean much to you, but it does to me... I've... never had an orgasm before."
 			Your words seem to make him wake up and he stares at you.
 			"You're my first one," you smile.
-			<<if $npcs.get($boy,'generous') == 1>>
+			<<if $npcs.get($sex.npcId,'generous') == 1>>
 				"... you don't know how happy that makes me," he smiles back.
 				Your smile breaks into a giggle, and a rush of euphoria flies through you, almost as good as the orgasm you just experienced.
-			<<elseif $npcs.get($boy,'selfish') == 1>>
+			<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
 				"Guess you've just never been with a real man before," he grins.
 				<<if getvar("$hookup['virgin']") == 1>>
 					"Well it <i>is</i> my first time," you smirk.
@@ -1285,7 +1285,7 @@ gs'hookup_talk','first_cum_lie'
 			"I've never had an orgasm before."
 			Your blatant lie seems to make him wake up and he stares at you.
 			"You're my first one," you smile.
-			<<if $npcs.get($boy,'generous') == 1>>
+			<<if $npcs.get($sex.npcId,'generous') == 1>>
 				"... you don't know how happy that makes me," he smiles back.
 				<<if $pc.sexStat('first_orgasm_lie') < 3>>
 					Your smile breaks into a giggle as a rush of euphoria flies through you, almost as good as the orgasm you just experienced. You're not sure why you're lying about this, but the pleasure you feel from the response seems more than enough to justify it.
@@ -1294,7 +1294,7 @@ gs'hookup_talk','first_cum_lie'
 				<<else>>
 					Your smile breaks into a giggle as a rush of euphoria flies through you. One more lie on a stack of countless lies, but it never ceases to give you pleasure. You don't know what it is about these lies that you love so much, but you don't care, and just telling it and getting a genuine reaction sends another wave of warmth spreading from between your legs.
 				<</if>>
-			<<elseif $npcs.get($boy,'selfish') == 1>>
+			<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
 				"Guess you've just never been with a real man before," he grins.
 				"I guess not," you grin back, and a rush of euphoria flies through you, almost as good as the orgasm you just experienced.
 				<<if $pc.sexStat('first_orgasm_lie') < 3>>
@@ -1325,8 +1325,8 @@ gs'hookup_talk','first_cum_lie'
 			<<setinit $hookup['smalltalk1'] = 1>>
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			<p>"So, do you always fuck girls you meet on the street?" you ask wryly.</p>
-			<<if $npcs.get($boy,'smoker') > 0>>
-				<<if $npcs.get($boy,'aggressive') == 1>>
+			<<if $npcs.get($sex.npcId,'smoker') > 0>>
+				<<if $npcs.get($sex.npcId,'aggressive') == 1>>
 					"Not every girl. Just the hot ones," he grins while blowing smoke out through his nose.
 				<<else>>
 					<p></p>
@@ -1356,26 +1356,26 @@ gs'hookup_talk','first_cum_lie'
 		<<else>>
 			<p>"So, got a girlfriend or anything like that?" you ask.</p>
 		<</if>>
-		<<if $npcs.get($boy,'smoker') > 0>>
-			<<if $npcs.get($boy,'girlfriend') == 1>>
-				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
-				<<if $npcs.get($boy,'fidelity') == 4>>
-					<p><<=$npcs.get($boy,'firstname')>> stiffens at your question. "Yeah..." he mumbles, taking a drag on his cigarette as well, not looking at you as he does.</p>
+		<<if $npcs.get($sex.npcId,'smoker') > 0>>
+			<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
+				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
+				<<if $npcs.get($sex.npcId,'fidelity') == 4>>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> stiffens at your question. "Yeah..." he mumbles, taking a drag on his cigarette as well, not looking at you as he does.</p>
 					<<gs 'hookup_talk' 'girlfriend2'>>
-				<<elseif $npcs.get($boy,'fidelity') == 5>>
-					<p>"Yeah..." <<=$npcs.get($boy,'firstname')>> says, thumbing his cigarette, watching the ash fall off the end of it. He takes a deep breath and sighs. "I shouldn't be cheating on her like this."</p>
-				<<elseif $npcs.get($boy,'fidelity') == 6>>
+				<<elseif $npcs.get($sex.npcId,'fidelity') == 5>>
+					<p>"Yeah..." <<=$npcs.get($sex.npcId,'firstname')>> says, thumbing his cigarette, watching the ash fall off the end of it. He takes a deep breath and sighs. "I shouldn't be cheating on her like this."</p>
+				<<elseif $npcs.get($sex.npcId,'fidelity') == 6>>
 					<<gs 'hookup_talk' 'girlfriend2'>>
 				<</if>>
-			<<elseif $npcs.get($boy,'goal') == 1 and rand(0,1) == 1>>
+			<<elseif $npcs.get($sex.npcId,'goal') == 1 and rand(0,1) == 1>>
 				<p>"Nah," he says, releasing a breath of smoke as he does. "Just a few fuck buddies around the way. One or two of them have boyfriends though. What about you?"</p>
 				<<if getvar("$pcs_lovers") > 0>>
 					<<actCLA 'I have a boyfriend'>>
-						<<run $npcs.set($boy,'know_cheat',1)>>
+						<<run $npcs.set($sex.npcId,'know_cheat',1)>>
 					<</actCLA>>
 					<<if getvar("$pcs_lovers") > 1>>
 						<<actCLA 'I have a few'>>
-							<<run $npcs.set($boy,'know_cheat',1)>>
+							<<run $npcs.set($sex.npcId,'know_cheat',1)>>
 						<</actCLA>>
 					<</if>>
 				<<else>>
@@ -1389,7 +1389,7 @@ gs'hookup_talk','first_cum_lie'
 <<if $location_var[$here][0] == 'girlfriend2'>>
 	<<actCLA 'Is she as good as I am?'>>
 		<p>"Yeah? Is she as good in bed as I am?" you grin shamelessly.</p>
-		<<if $npcs.get($boy,'fidelity') != 6>>
+		<<if $npcs.get($sex.npcId,'fidelity') != 6>>
 			They respond solemnly.
 		<<else>>
 			<<if rand(0,1) == 1>>
@@ -1400,7 +1400,7 @@ gs'hookup_talk','first_cum_lie'
 					<<gs 'hookup_talk' 'small_talk1'>>
 				<</actCLA>>
 				<<actCLA 'Good for you (annoyed)'>>
-					<p>"Well good for you," you huff, steaming in irritation. You're not sure if you pissed at <<=$npcs.get($boy,'firstname')>> for saying it or jealous of this girl who's boyfriend you just cheated with.</p>
+					<p>"Well good for you," you huff, steaming in irritation. You're not sure if you pissed at <<=$npcs.get($sex.npcId,'firstname')>> for saying it or jealous of this girl who's boyfriend you just cheated with.</p>
 					<<gs 'hookup_talk' 'small_talk1'>>
 				<</actCLA>>
 			<<else>>

sugarcube/src/autogenerated/unsorted/hookup_virgin.tw

@@ -3,15 +3,15 @@
 <<set $ARGS = $location_var[$here]>>
 <<if $location_var[$here][0] == 'start'>>
 	<<setinit $hookup['virgin'] = 1>>
-	<<=$npcs.get($boy,'apt_bedroom')>>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<if $hookup['position'] == 'miss'>>
-		<p>"Wait!" you yelp, closing up your legs halfway. <<=$npcs.get($boy,'firstname')>> freezes up, body over yours, his cock resting against your pussy.</p>
+		<p>"Wait!" you yelp, closing up your legs halfway. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, body over yours, his cock resting against your pussy.</p>
 		"I... I'm a virgin..."
 		"Oh." He slumps backwards, not sure where you're going with this.
 		<<gs 'hookup_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously, spreading your legs again.</p>
-			<p><<=$npcs.get($boy,'firstname')>> nods and gently pushes cock into your pussy.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and gently pushes cock into your pussy.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 			<</actCLA>>
@@ -19,13 +19,13 @@
 		<<gs 'hookup_virgin' 'virgin_condom3'>>
 		<<gs 'hookup_virgin' 'virgin_condom4'>>
 	<<elseif $hookup['position'] == 'doggy'>>
-		<p>"Wait!" you yelp. <<=$npcs.get($boy,'firstname')>> freezes up, hands on your ass, and you can feel his cock pressing right against your pussy lips.</p>
+		<p>"Wait!" you yelp. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, hands on your ass, and you can feel his cock pressing right against your pussy lips.</p>
 		Sitting up and looking over your shoulder to face him, you stammer out, "I... I'm a virgin..."
 		"Oh." He slumps backwards, not sure where you're going with this.
 		<<gs 'hookup_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously.</p>
-			<p><<=$npcs.get($boy,'firstname')>> nods and you turn back around and hold your breath, feeling him gently push his cock into your pussy.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and you turn back around and hold your breath, feeling him gently push his cock into your pussy.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 			<</actCLA>>
@@ -33,13 +33,13 @@
 		<<gs 'hookup_virgin' 'virgin_condom3'>>
 		<<gs 'hookup_virgin' 'virgin_condom4'>>
 	<<elseif $hookup['position'] == 'cowgirl'>>
-		<p>"Wait!" you yelp. <<=$npcs.get($boy,'firstname')>> freezes up, putting his hands up, .</p>
+		<p>"Wait!" you yelp. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, putting his hands up, .</p>
 		Still resting your thighs on top of his, you stammer out, "I... I'm a virgin..."
 		"Oh." He relaxes back onto the bed underneath you, not sure where you're going with this.
 		<<gs 'hookup_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously.</p>
-			<p><<=$npcs.get($boy,'firstname')>> nods and you raise your hips again, biting your lip in apprehension as you slowly lower yourself down onto his cock.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and you raise your hips again, biting your lip in apprehension as you slowly lower yourself down onto his cock.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'hookup_virgin' 'cowgirl_virg_norm1'>>
 			<</actCLA>>
@@ -50,9 +50,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'virginity_take'>>
 	<<actCLA 'Ask him to take your virginity'>>
-		<h2><<<<=$npcs.get($boy,'firstname')>>>>''s Bedroom</h2>
-		<<=$npcs.get($boy,'apt_bedroom')>>
-		<p>In your post orgasmic high, you find yourself staring at <<=$npcs.get($boy,'firstname')>>'s cock. You're so wet right now and looking at his erection makes you realize just how badly you want to be <i>filled.</i></p>
+		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+		<p>In your post orgasmic high, you find yourself staring at <<=$npcs.get($sex.npcId,'firstname')>>'s cock. You're so wet right now and looking at his erection makes you realize just how badly you want to be <i>filled.</i></p>
 		<p>"Like what you see?" You glance up and realize he's noticed your stare.</p>
 		"I want you to fuck me," you whisper.
 		<p>"What happened to saving yourself for marriage?"</p>
@@ -71,8 +71,8 @@
 			<</if>>
 		<</if>>
 		<<actCLA 'Just get to fucking already!'>>
-			<h2><<<<=$npcs.get($boy,'firstname')>>>>''s Bedroom</h2>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$hookup['condom_conscious']") == 1>>
 				<<setinit $hookup['condom'] = 1>>
 				Laying back on the bed, you beckon him toward you when he suddenly stops to reach for a condom from his nightstand. You rub your legs together impatiently as he seems to take forever to open the packaging and roll it on. Just when you think he's ready, he reaches to apply lube and you almost scream in frustration.
@@ -114,8 +114,8 @@
 <<if $location_var[$here][0] == 'virginity_take2'>>
 	<<actCLA 'Ask him to take your virginity'>>
 		<<video "shared/sex/kuni/pussylick4.mp4">>
-		<p>You look down at <<=$npcs.get($boy,'firstname')>>, his face buried between your legs. You're so wet right now but his tongue isn't enough. You <i>ache</i> to be filled.</p>
-		<p>"<<=$npcs.get($boy,'firstname')>>," you whisper tapping his head. He looks up at you with glistening lips. "I want you to fuck me."</p>
+		<p>You look down at <<=$npcs.get($sex.npcId,'firstname')>>, his face buried between your legs. You're so wet right now but his tongue isn't enough. You <i>ache</i> to be filled.</p>
+		<p>"<<=$npcs.get($sex.npcId,'firstname')>>," you whisper tapping his head. He looks up at you with glistening lips. "I want you to fuck me."</p>
 		<p>"What happened to saving yourself for marriage?"</p>
 		<i>"I can't wait that long."</i>
 		<<gs 'willpower' 'misc' 'self'>>
@@ -132,8 +132,8 @@
 			<</if>>
 		<</if>>
 		<<actCLA 'Just get to fucking already!'>>
-			<h2><<<<=$npcs.get($boy,'firstname')>>>>''s Bedroom</h2>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$hookup['condom_conscious']") == 1>>
 				<<setinit $hookup['condom'] = 1>>
 				Laying back on the bed, you beckon him toward you when he suddenly stops to reach for a condom from his nightstand. You rub your legs together impatiently as he seems to take forever to open the packaging and roll it on. Just when you think he's ready, he reaches to apply lube and you almost scream in frustration.
@@ -174,9 +174,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'not_ready'>>
 	<<actCLA 'I'm just not sure if I'm ready'>>
-		<<=$npcs.get($boy,'apt_bedroom')>>
+		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"I'm just not sure if I'm ready," you stammer.
-		<<if $npcs.get($boy,'generous') == 1>>
+		<<if $npcs.get($sex.npcId,'generous') == 1>>
 			"Well... we don't have to if you're not ready. We can just stop right here."
 			<<actCLA 'If that`s really okay'>>
 				<<if getvar("$hookup['bj_cum']") > 0>>
@@ -188,7 +188,7 @@
 					<p>"Are you sure?" you ask. "I feel kind of bad now... we got this far and all..."</p>
 					"Yeah of course. It's your body, your choice."
 					"If it's really okay then..."
-					<p>"Although..." <<=$npcs.get($boy,'firstname')>> seems hesitant to say something. "Maybe you could at least blow me before we call it quits?"</p>
+					<p>"Although..." <<=$npcs.get($sex.npcId,'firstname')>> seems hesitant to say something. "Maybe you could at least blow me before we call it quits?"</p>
 					<<actCLA 'Sure'>>
 						"Yeah," you smile. "That sounds fair."
 						You wiggle down the bed and lean down to get between his legs.
@@ -200,8 +200,8 @@
 			<</actCLA>>
 			<<gs 'hookup_virgin' 'want_to'>>
 			<<gs 'hookup_virgin' 'bj_instead'>>
-		<<elseif $npcs.get($boy,'selfish') == 1>>
-			<p>"Seriously? We get right here and you're going to call it quits?" <<=$npcs.get($boy,'firstname')>> seems furious.</p>
+		<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
+			<p>"Seriously? We get right here and you're going to call it quits?" <<=$npcs.get($sex.npcId,'firstname')>> seems furious.</p>
 			<<actCLA 'I`m just scared!'>>
 				<p>"I'm jus-" you try to protest before he interrupts, shouting at you.</p>
 				<i><b>"Are you fucking kidding me?!"</b></i>
@@ -213,7 +213,7 @@
 					<p>"But-!"</p>
 					<p>"<i>Get out!</i>"</p>
 					<<actCLA 'Gather your things and leave'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						After seeing his explosive anger, you don't want to stick around any longer than you have to. You throw your clothes on as fast as you can, grab your things, and run out the door.
 						<<actCLA 'Escape'>>
 							<<gt 'hookup_after' 'exit'>>
@@ -225,7 +225,7 @@
 			<<gs 'hookup_virgin' 'bj_instead'>>
 		<<else>>
 			"Uhh... well..."
-			<p><<=$npcs.get($boy,'firstname')>> looks down at himself, almost as if contemplating what to do with his solidly erect dick.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> looks down at himself, almost as if contemplating what to do with his solidly erect dick.</p>
 			<p>"Soooo... you <i>don't</i> want to have sex...?</p>
 			<<gs 'hookup_virgin' 'want_to'>>
 			<<gs 'hookup_virgin' 'bj_instead'>>
@@ -237,9 +237,9 @@
 		<<if $hookup['position'] == 'miss'>>
 			<<image "shared/sex/foreplay/miss1.jpg">>
 			"No, no," you shake your head. "I want to. I was just getting cold feet."
-			<p>You spread your legs wider, tugging on <<=$npcs.get($boy,'firstname')>>'s cock, beckoning him in.</p>
+			<p>You spread your legs wider, tugging on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, beckoning him in.</p>
 			<<actCLA 'Lose your virginity'>>
-				<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+				<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 					<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 				<<else>>
 					<<gt 'hookup_virgin' 'miss_virg_hard1'>>
@@ -250,7 +250,7 @@
 			"No, no," you shake your head. "I want to. I was just getting cold feet."
 			You adjust your knees, spreading your legs a little wider and squaring your shoulders to look forward.
 			<<actCLA 'Lose your virginity'>>
-				<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+				<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 					<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 				<<else>>
 					<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
@@ -271,7 +271,7 @@
 	<<if getvar("$hookup['bj_cum']") == 0>>
 		<<actCLA 'Can I just blow you'>>
 			<p>"Can I just blow you instead?"</p>
-			<<if $npcs.get($boy,'selfish') == 1>>
+			<<if $npcs.get($sex.npcId,'selfish') == 1>>
 				<<if rand(0,1) == 1>>
 					"Ugh fine, but it better be good." He grabs you roughly by the head and shoves you down towards his crotch.
 					<<actCLA 'Blow him'>>
@@ -280,7 +280,7 @@
 				<<else>>
 					<p>"No, it's fuck or nothing! So what's it gonna be?"</p>
 					<<actCLA 'Don`t give in'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"... nothing then."
 						<p><i><b>"Are you fucking kidding me?!"</b></i> he screams.</p>
 						You recoil from him in fear.
@@ -291,7 +291,7 @@
 							<p>"But-!"</p>
 							<p>"<i>Get out!</i>"</p>
 							<<actCLA 'Gather your things and leave'>>
-								<<=$npcs.get($boy,'apt_bedroom')>>
+								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								After seeing his explosive anger, you don't want to stick around any longer than you have to. You throw your clothes on as fast as you can, grab your things, and run out the door.
 								<<actCLA 'Escape'>>
 									<<gt 'hookup_after' 'exit'>>
@@ -303,13 +303,13 @@
 						<<setinit $hookup['orgasm'] = $orgasm>>
 						<<if $hookup['position'] == 'miss'>>
 							<<image "shared/sex/foreplay/miss1.jpg">>
-							<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<=$npcs.get($boy,'firstname')>> to eagerly push his cock inside you.</p>
+							<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<=$npcs.get($sex.npcId,'firstname')>> to eagerly push his cock inside you.</p>
 							<<actCLA 'Lose your virginity'>>
 								<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 							<</actCLA>>
 						<<elseif $hookup['position'] == 'doggy'>>
 							<<image "shared/sex/foreplay/doggy1.jpg">>
-							<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<=$npcs.get($boy,'firstname')>> push his cock inside you.</p>
+							<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<=$npcs.get($sex.npcId,'firstname')>> push his cock inside you.</p>
 							<<actCLA 'Lose your virginity'>>
 								<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
 							<</actCLA>>
@@ -335,7 +335,7 @@
 	<<else>>
 		<<actCLA 'Can I just blow you again instead?'>>
 			<p>"Can I just blow you again instead?"</p>
-			<<if $npcs.get($boy,'selfish') == 1>>
+			<<if $npcs.get($sex.npcId,'selfish') == 1>>
 				<<if rand(0,1) == 1>>
 					<p>"Ugh <i>again?</i>"</p>
 					"... yes," you respond meekly.
@@ -348,7 +348,7 @@
 					"... yes," you respond meekly.
 					<p>"No, it's fuck or nothing! So what's it gonna be?"</p>
 					<<actCLA 'Don`t give in'>>
-						<<=$npcs.get($boy,'apt_bedroom')>>
+						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"... nothing then."
 						<p><i><b>"Are you fucking kidding me?!"</b></i> he screams.</p>
 						You recoil from him in fear.
@@ -359,7 +359,7 @@
 							<p>"But-!"</p>
 							<p>"<i>Get out!</i>"</p>
 							<<actCLA 'Gather your things and leave'>>
-								<<=$npcs.get($boy,'apt_bedroom')>>
+								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								After seeing his explosive anger, you don't want to stick around any longer than you have to. You throw your clothes on as fast as you can, grab your things, and run out the door.
 								<<actCLA 'Escape'>>
 									<<gt 'hookup_after' 'exit'>>
@@ -370,13 +370,13 @@
 					<<actCLA 'Give in'>>
 						<<if $hookup['position'] == 'miss'>>
 							<<image "shared/sex/foreplay/miss1.jpg">>
-							<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<=$npcs.get($boy,'firstname')>> to eagerly push his cock inside you.</p>
+							<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<=$npcs.get($sex.npcId,'firstname')>> to eagerly push his cock inside you.</p>
 							<<actCLA 'Lose your virginity'>>
 								<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 							<</actCLA>>
 						<<elseif $hookup['position'] == 'doggy'>>
 							<<image "shared/sex/foreplay/doggy1.jpg">>
-							<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<=$npcs.get($boy,'firstname')>> push his cock inside you.</p>
+							<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<=$npcs.get($sex.npcId,'firstname')>> push his cock inside you.</p>
 							<<actCLA 'Lose your virginity'>>
 								<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
 							<</actCLA>>
@@ -400,16 +400,16 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'virgin_condom1'>>
-	<h2><<<<=$npcs.get($boy,'firstname')>>>>''s Bedroom</h2>
-	<<=$npcs.get($boy,'apt_bedroom')>>
-	<p><<=$npcs.get($boy,'firstname')>> climbs on top of you and just as he's preparing to enter you, you freeze up and say, "Wait!" His body also goes tense at the panic in your voice.</p>
+	<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
+	<p><<=$npcs.get($sex.npcId,'firstname')>> climbs on top of you and just as he's preparing to enter you, you freeze up and say, "Wait!" His body also goes tense at the panic in your voice.</p>
 	<p>"Could you put on a condom first?" you ask.</p>
 	<<if rand(1,10) >= 7>>
 		<p>"Come on... You really want to use a condom for your first time?"</p>
 		<<actCLA 'Can`t take chances'>>
 			<<setinit $hookup['condom'] = 1>>
 			<p>"Yes," you respond. "I can't take any chances. Please?"</p>
-			<p><<=$npcs.get($boy,'firstname')>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<if rand(0,1) == 1>>
 					<<gt 'hookup_virgin' 'miss_virg_norm1'>>
@@ -439,7 +439,7 @@
 	<<image "shared/sex/misc/condom_put.jpg">>
 	<<set $prezikcount -= 1>>
 	<<setinit $hookup['condom'] = 1>>
-	<p>You hurriedly lean over the side of the bed and reach down to your purse, groping around inside it. You manage to grab hold of a condom and tear the open the packaging and impatiently roll it onto <<=$npcs.get($boy,'firstname')>>'s cock for him.</p>
+	<p>You hurriedly lean over the side of the bed and reach down to your purse, groping around inside it. You manage to grab hold of a condom and tear the open the packaging and impatiently roll it onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock for him.</p>
 	<p>"Okay!" you grin. "Now let's fuck!"</p>
 	He grins back at you, pushing you down onto the bed and climbing on top of you.
 	<<actCLA 'Lose your virginity'>>
@@ -454,23 +454,23 @@
 	<<if getvar("$hookup['condom']") < 1>>
 		<<actCLA 'Ask him to use a condom (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
-			<h2><<<<=$npcs.get($boy,'firstname')>>>>''s Bedroom</h2>
-			<<=$npcs.get($boy,'apt_bedroom')>>
+			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"I changed my mind, can you use a condom? Please?"</p>
 			<<if rand(1,10) >= 7>>
 				<p>"Come on... You really want to use a condom for your first time?"</p>
 				<<actCLA 'Can`t take chances'>>
 					<p>"Yes," you respond. "I can't take any chances. Please?"</p>
-					<p><<=$npcs.get($boy,'firstname')>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.</p>
 					<<actCLA 'Lose your virginity'>>
 						<<if $hookup['position'] == 'miss'>>
-							<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 								<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 							<<else>>
 								<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 							<</if>>
 						<<elseif $hookup['position'] == 'doggy'>>
-							<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 								<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 							<<else>>
 								<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
@@ -485,13 +485,13 @@
 					"Maybe..." you start. "... it'll be okay this one time... this... first time..."
 					<<actCLA 'Lose your virginity'>>
 						<<if $hookup['position'] == 'miss'>>
-							<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 								<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 							<<else>>
 								<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 							<</if>>
 						<<elseif $hookup['position'] == 'doggy'>>
-							<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 								<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 							<<else>>
 								<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
@@ -506,13 +506,13 @@
 				He nods, reaching over to his nightstand and retrieving one, rolling the rubber onto his cock. Looking at you for approval, you nod and he begins to press himself inside you.
 				<<actCLA 'Lose your virginity'>>
 					<<if $hookup['position'] == 'miss'>>
-						<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+						<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 							<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 						<<else>>
 							<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 						<</if>>
 					<<elseif $hookup['position'] == 'doggy'>>
-						<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+						<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 							<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 						<<else>>
 							<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
@@ -530,25 +530,25 @@
 		<<actCLA 'Put a condom on him (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<if rand(1,10) >= 7>>
-				<h2><<<<=$npcs.get($boy,'firstname')>>>>''s Bedroom</h2>
-				<<=$npcs.get($boy,'apt_bedroom')>>
+				<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				Reaching over the side of the bed, you scrabble through your purse until you find the condom you're looking for, holding it up in front of you.
 				<p>"Let's use a condom, okay?"</p>
 				<p>"Come on... You really want to use a condom for your first time?"</p>
 				<<actCLA 'Can`t take chances'>>
 					<<image "shared/sex/misc/condom_put.jpg">>
 					<p>"Yes," you respond. "I can't take any chances. Please?"</p>
-					<p><<=$npcs.get($boy,'firstname')>> sighs. "Okay, fine."</p>
+					<p><<=$npcs.get($sex.npcId,'firstname')>> sighs. "Okay, fine."</p>
 					You sigh in relief, tearing open the packaging and clumsily rolling the rubber onto his cock.
 					<<actCLA 'Lose your virginity'>>
 						<<if $hookup['position'] == 'miss'>>
-							<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 								<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 							<<else>>
 								<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 							<</if>>
 						<<elseif $hookup['position'] == 'doggy'>>
-							<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 								<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 							<<else>>
 								<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
@@ -563,13 +563,13 @@
 					"Maybe..." you start. "... it'll be okay this one time... this... first time..."
 					<<actCLA 'Lose your virginity'>>
 						<<if $hookup['position'] == 'miss'>>
-							<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 								<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 							<<else>>
 								<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 							<</if>>
 						<<elseif $hookup['position'] == 'doggy'>>
-							<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 								<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 							<<else>>
 								<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
@@ -587,13 +587,13 @@
 				He nods, and you sigh in relief, tearing open the packaging and clumsily rolling the rubber onto his cock.
 				<<actCLA 'Lose your virginity'>>
 					<<if $hookup['position'] == 'miss'>>
-						<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+						<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 							<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 						<<else>>
 							<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 						<</if>>
 					<<elseif $hookup['position'] == 'doggy'>>
-						<<if rand(0,1) == 1 or $npcs.get($boy,'generous') == 1>>
+						<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 							<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 						<<else>>
 							<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
@@ -615,14 +615,14 @@
 		<<else>>
 			<<image "shared/sex/vag/miss/blood1.jpg">>
 		<</if>>
-		<p><<=$npcs.get($boy,'firstname')>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn't stop though, and keeps pushing until you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren't really sure.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn't stop though, and keeps pushing until you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren't really sure.</p>
 		<p>"You okay?"</p>
 		<p>"Mhmm." You just nod, not feeling able to say anything else in the moment. He continues to push inside until you feel his hips touching your ass. He's all the way inside you. Having a penis inside you is a decidedly strange experience, leaving you feeling "full" and stretched to the limit. He gives you a minute to adjust when you feel something seep out of your pussy. It takes you a few seconds before you suddenly you realize; it's blood. He did just pop your cherry after all...</p>
 		"I'm gonna start moving now," he says. You nod again, indicating for him to continue.
 		<<actCLA 'Continue'>>
 			<<setinit $hookup['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/miss/slow2.mp4">>
-			<p><<=$npcs.get($boy,'firstname')>> slowly pulls out of you before pushing himself back inside. He pulls out a little bit faster, but still gently before pushing back in at the same pace. After a couple minutes, he's built into a steady rhythm of fucking you, and you...</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> slowly pulls out of you before pushing himself back inside. He pulls out a little bit faster, but still gently before pushing back in at the same pace. After a couple minutes, he's built into a steady rhythm of fucking you, and you...</p>
 			<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<<else>>
@@ -631,19 +631,19 @@
 		<<else>>
 			<<image "shared/sex/vag/miss/blood1.jpg">>
 		<</if>>
-		<p><<=$npcs.get($boy,'firstname')>> presses his cock against the entrance of your pussy before plunging it all the way in. It fills you up, stretching your walls and tearing straight through your maidenhood, causing you to gasp. Whether in excitement or pain, you aren't really sure.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> presses his cock against the entrance of your pussy before plunging it all the way in. It fills you up, stretching your walls and tearing straight through your maidenhood, causing you to gasp. Whether in excitement or pain, you aren't really sure.</p>
 		Oblivious to the loss of your virginity, he doesn''t stop, working up to a steady rhythm right away while you continue to wince in pain.
 		<<actCLA 'Continue'>>
 			<<setinit $hookup['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/miss/slow2.mp4">>
-			<p><<=$npcs.get($boy,'firstname')>> continues to fuck you and you...</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> continues to fuck you and you...</p>
 			<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'miss_virg_norm2'>>
 	<<video "shared/sex/vag/miss/slow2.mp4">>
-	<p>As <<=$npcs.get($boy,'firstname')>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
+	<p>As <<=$npcs.get($sex.npcId,'firstname')>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
 	Now that you aren''t worried about being literally fucked to death, you feel like you can focus on the sensations of your first time and you...
 	<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 <</if>>
@@ -656,16 +656,16 @@
 	<<else>>
 		<<image "shared/sex/vag/miss/blood1.jpg">>
 	<</if>>
-	<p>You half gasp half shriek as <<=$npcs.get($boy,'firstname')>> slams his cock inside you, tearing straight through your hymen in one thrust and your eyes water at the intense stab of pain.</p>
+	<p>You half gasp half shriek as <<=$npcs.get($sex.npcId,'firstname')>> slams his cock inside you, tearing straight through your hymen in one thrust and your eyes water at the intense stab of pain.</p>
 	<<if getvar("$hookup['virgin']") == 1>>
-		<p>Clearly, <<=$npcs.get($boy,'firstname')>> doesn't care at all that you're a virgin and decided to christen you first time by fucking you <i>hard</i>.</p>
+		<p>Clearly, <<=$npcs.get($sex.npcId,'firstname')>> doesn't care at all that you're a virgin and decided to christen you first time by fucking you <i>hard</i>.</p>
 	<<else>>
-		<p>Completely oblivious to the loss of your virginity, <<=$npcs.get($boy,'firstname')>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
+		<p>Completely oblivious to the loss of your virginity, <<=$npcs.get($sex.npcId,'firstname')>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<video "shared/sex/vag/miss/hard2.mp4">>
 		<i>"Ahh! Ahh!! AH! AHH!!"</i>
-		<p>You can't help but scream with every thrust as <<=$npcs.get($boy,'firstname')>> fucks you roughly and with high intensity. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. The force of his thrusts bounce your breasts so violently they hurt. It feels like your pussy is being fucked into an open wound and you wonder if you're going to have internal bruises tomorrow morning.</p>
+		<p>You can't help but scream with every thrust as <<=$npcs.get($sex.npcId,'firstname')>> fucks you roughly and with high intensity. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. The force of his thrusts bounce your breasts so violently they hurt. It feels like your pussy is being fucked into an open wound and you wonder if you're going to have internal bruises tomorrow morning.</p>
 		<<actCLA 'Endure it'>>
 			<<set $orgasm_or = 'no'>>
 			<<setinit $hookup['pain'] = 1>>
@@ -675,8 +675,8 @@
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
-			<p>"Can we-! Slow down-! A little-?" you whimper under <<=$npcs.get($boy,'firstname')>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
-			<<if (rand(1,10) >= 7 or $npcs.get($boy,'selfish') == 1 or getvar("$npc_abusive") == 1) and $npcs.get($boy,'generous') != 1>>
+			<p>"Can we-! Slow down-! A little-?" you whimper under <<=$npcs.get($sex.npcId,'firstname')>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
+			<<if (rand(1,10) >= 7 or $npcs.get($sex.npcId,'selfish') == 1 or getvar("$npc_abusive") == 1) and $npcs.get($sex.npcId,'generous') != 1>>
 				<<set $orgasm_or = 'no'>>
 				<<arouse 'vaginal' `rand(8,16)` `['rough','no_orgasm_msg']`>>
 				<<setinit $hookup['pain'] = 1>>
@@ -698,18 +698,18 @@
 	<<setinit $hookup['position'] = 'doggy'>>
 	<<image "shared/sex/vag/doggy/blood1.jpg">>
 	<<if getvar("$hookup['virgin']") == 1>>
-		<p><<=$npcs.get($boy,'firstname')>> presses his cock against the entrance of your pussy before plunging it all the way in. It fills you up, stretching your walls and tearing straight through your maidenhood, causing you to gasp. Whether in excitement or pain, you aren't really sure.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> presses his cock against the entrance of your pussy before plunging it all the way in. It fills you up, stretching your walls and tearing straight through your maidenhood, causing you to gasp. Whether in excitement or pain, you aren't really sure.</p>
 		<p>"You okay?"</p>
 		<p>"Mhmm." You just nod, not feeling able to say anything else in the moment. He continues to push inside until you feel his hips touching your ass. He's all the way inside you. Having a penis inside you is a decidedly strange experience, leaving you feeling "full" and stretched to the limit. He gives you a minute to adjust when you feel something seep out of your pussy. It takes you a few seconds before you suddenly you realize; it's blood. He did just pop your cherry after all...</p>
 		"I'm gonna start moving," he says. You nod again, indicating for him to continue.
 		<<actCLA 'Continue'>>
 			<<setinit $hookup['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/doggy/slow2.mp4">>
-			<p><<=$npcs.get($boy,'firstname')>> slowly builds into a steady rhythm and as he continues to fuck you, you...</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> slowly builds into a steady rhythm and as he continues to fuck you, you...</p>
 			<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<<else>>
-		<p><<=$npcs.get($boy,'firstname')>> slowly presses his cock inside you. The walls of your pussy gradually stretch as he moves further inside and you gasp at the sensation until he reaches your hymen. Completely unaware of your virginity, he continues pushing.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> slowly presses his cock inside you. The walls of your pussy gradually stretch as he moves further inside and you gasp at the sensation until he reaches your hymen. Completely unaware of your virginity, he continues pushing.</p>
 		His cock tears through it and you feel a stab of pain, eliciting a pained cry from your mouth. Drawing back out again, he thrusts again, causing another whimper. But as he draws back out the next time he pauses.
 		<p>"What the- Is this blood? Hey... are you a virgin?"</p>
 		<<if getvar("$mesec") > 0>>
@@ -726,7 +726,7 @@
 			<<actCLA 'I`m on my peroid (lie)'>>
 				<p>"No! I'm not! I'm just... on my period." You're not entirely sure why you're lying about this, but you are nonetheless.</p>
 				<p>"But we can keep going, right?" you ask timidly.</p>
-				<p>"Oh. Yeah." <<=$npcs.get($boy,'firstname')>> begins fucking you agian, picking up to a steady rhythm.</p>
+				<p>"Oh. Yeah." <<=$npcs.get($sex.npcId,'firstname')>> begins fucking you agian, picking up to a steady rhythm.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'hookup_virgin' 'doggy_virg_norm1_1'>>
 				<</actCLA>>
@@ -736,7 +736,7 @@
 			<<setinit $hookup['virgin'] = 1>>
 			<p>"Ye- yes..." you mumble shyly.</p>
 			"You should have said something," he grins. "This is going to be fun..."
-			<p><<=$npcs.get($boy,'firstname')>> starts fucking you again, working up to a steady pace.</p>
+			<p><<=$npcs.get($sex.npcId,'firstname')>> starts fucking you again, working up to a steady pace.</p>
 			<<actCLA 'Continue'>>
 				<<gt 'hookup_virgin' 'doggy_virg_norm1_1'>>
 			<</actCLA>>
@@ -744,7 +744,7 @@
 		<<actCLA 'Not anymore'>>
 			<<setinit $hookup['virgin'] = 1>>
 			"Not anymore," you say, looking back at him over your shoulder with a pained smile.
-			<p>"You fucking minx," <<=$npcs.get($boy,'firstname')>> grins back, immediately thrusting back into you and building up a steady rhythm.</p>
+			<p>"You fucking minx," <<=$npcs.get($sex.npcId,'firstname')>> grins back, immediately thrusting back into you and building up a steady rhythm.</p>
 			<<actCLA 'Continue'>>
 				<<gt 'hookup_virgin' 'doggy_virg_norm1_1'>>
 			<</actCLA>>
@@ -754,12 +754,12 @@
 <<if $location_var[$here][0] == 'doggy_virg_norm1_1'>>
 	<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/doggy/med2.mp4">>
-	<p>The sound of flesh against flesh fills the room, <<=$npcs.get($boy,'firstname')>> cock rhythmically moving in and out of your bloody pussy, hips slapping against your ass. As he fucks you, you...</p>
+	<p>The sound of flesh against flesh fills the room, <<=$npcs.get($sex.npcId,'firstname')>> cock rhythmically moving in and out of your bloody pussy, hips slapping against your ass. As he fucks you, you...</p>
 	<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 <</if>>
 <<if $location_var[$here][0] == 'doggy_virg_norm2'>>
 	<<video "shared/sex/vag/doggy/med2.mp4">>
-	<p>As <<=$npcs.get($boy,'firstname')>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
+	<p>As <<=$npcs.get($sex.npcId,'firstname')>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
 	Now that you aren''t worried about being literally fucked to death, you feel like you can focus on the sensations of your first time and you...
 	<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 <</if>>
@@ -769,17 +769,17 @@
 	<<setinit $hookup['virgin_enjoyment'] = -1>>
 	<<image "shared/sex/vag/doggy/blood2.jpg">>
 	<<if getvar("$hookup['virgin']") == 1>>
-		<p>Without warning, <<=$npcs.get($boy,'firstname')>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. Your arms and legs buckle beneath you, but he keeps pushing forward anyways, leaving your belly flush with the bed and his cock stretching you beyond your limits.</p>
+		<p>Without warning, <<=$npcs.get($sex.npcId,'firstname')>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. Your arms and legs buckle beneath you, but he keeps pushing forward anyways, leaving your belly flush with the bed and his cock stretching you beyond your limits.</p>
 		He doesn''t give you even a moment to adjust and begins fucking you full force, absolutely <i>pounding</i> your pussy.
 	<<else>>
-		<p>Without warning, <<=$npcs.get($boy,'firstname')>> plunges his cock inside you full force. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. Your arms and legs buckle beneath you, but he keeps pushing forward anyways, leaving your belly flush with the bed and his cock stretching you beyond your limits.</p>
-		<p><<=$npcs.get($boy,'firstname')>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
+		<p>Without warning, <<=$npcs.get($sex.npcId,'firstname')>> plunges his cock inside you full force. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. Your arms and legs buckle beneath you, but he keeps pushing forward anyways, leaving your belly flush with the bed and his cock stretching you beyond your limits.</p>
+		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
 	<</if>>
 	<<actCLA 'Scream'>>
 		<!-- !!		gs 'pain', 2, 'breasts', 'stretch'-->
 		<<video "shared/sex/vag/doggy/laying_down1.mp4">>
 		<i>"Ahh! Ahh!! AH! AHH!!"</i>
-		<p>You're reduced to a screaming mess as <<=$npcs.get($boy,'firstname')>> fucks you roughly and without mercy or restraint. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. It's like your pussy is being torn in half and you wonder if you're going to piss blood after this. All you can do is squirm beneath <<=$npcs.get($boy,'firstname')>> as he pounds your virgin pussy over and over again.</p>
+		<p>You're reduced to a screaming mess as <<=$npcs.get($sex.npcId,'firstname')>> fucks you roughly and without mercy or restraint. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. It's like your pussy is being torn in half and you wonder if you're going to piss blood after this. All you can do is squirm beneath <<=$npcs.get($sex.npcId,'firstname')>> as he pounds your virgin pussy over and over again.</p>
 		<<actCLA 'Endure it'>>
 			<<set $orgasm_or = 'no'>>
 			<<setinit $hookup['pain'] = 1>>
@@ -789,8 +789,8 @@
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
-			<p>"Can we-! Slow down-! A little-?" you whimper under <<=$npcs.get($boy,'firstname')>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
-			<<if (rand(1,10) >= 7 or $npcs.get($boy,'selfish') == 1 or getvar("$npc_abusive") == 1) and $npcs.get($boy,'generous') != 1>>
+			<p>"Can we-! Slow down-! A little-?" you whimper under <<=$npcs.get($sex.npcId,'firstname')>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
+			<<if (rand(1,10) >= 7 or $npcs.get($sex.npcId,'selfish') == 1 or getvar("$npc_abusive") == 1) and $npcs.get($sex.npcId,'generous') != 1>>
 				<<setinit $hookup['pain'] = 1>>
 				<<set $orgasm_or = 'no'>>
 				<<arouse 'vaginal' `rand(8,16)` `['rough','no_orgasm_msg']`>>
@@ -813,19 +813,19 @@
 	<<video "shared/sex/vag/cowgirl/enter1.mp4">>
 	<<if getvar("$hookup['virgin']") == 1>>
 		<!-- !! to be written later-->
-		<p>Grabbing hold of <<=$npcs.get($boy,'firstname')>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight.</p>
-		<<if $npcs.get($boy,'generous') == 1>>
-			<p>"It's okay, take your time," <<=$npcs.get($boy,'firstname')>> assures you. "Hard to get it in, isn't it?"</p>
+		<p>Grabbing hold of <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight.</p>
+		<<if $npcs.get($sex.npcId,'generous') == 1>>
+			<p>"It's okay, take your time," <<=$npcs.get($sex.npcId,'firstname')>> assures you. "Hard to get it in, isn't it?"</p>
 			<p>"Y-yeah," you blush, embarrassed at your obvious lack of experience.</p>
 			Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen.
-			<p>"Ready?" <<=$npcs.get($boy,'firstname')>> asks gently.</p>
+			<p>"Ready?" <<=$npcs.get($sex.npcId,'firstname')>> asks gently.</p>
 			"Mhmm," you nod. With a deep breath, you lift yourself up slightly and bounce straight down, tearing through your virginity.
 			<<actCLA '<b>!!!!</b>'>>
 				<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 				<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-				<p>The pain of <<=$npcs.get($boy,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+				<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 				<p>"Fuck!" you involuntarily squeak. "Fuckfuckfuckfuckfuckfuckfuck! That hurts!"</p>
-				<p>"It's okay," <<=$npcs.get($boy,'firstname')>> says, assuring you, putting his hands on your hips. "Take it slow, alright?" You nod in response, taking deep breaths trying to adjust to feeling this... <i>thing</i> impaling you, filling you up, stretching you to your limits. Once you feel ready, you start to move.</p>
+				<p>"It's okay," <<=$npcs.get($sex.npcId,'firstname')>> says, assuring you, putting his hands on your hips. "Take it slow, alright?" You nod in response, taking deep breaths trying to adjust to feeling this... <i>thing</i> impaling you, filling you up, stretching you to your limits. Once you feel ready, you start to move.</p>
 				<<actCLA 'Start moving'>>
 					<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 					<<if getvar("$hookup['condom']") == 1>>
@@ -834,19 +834,19 @@
 						<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 					<</if>>
 					<p>Clenching your jaw, you slowly lift yourself up before sliding back down on his cock. And then again. And again. And again. Your legs feel slick with something running down your thighs, but it doesn't feel like your juices. In fact it's hard to feel aroused at all right now. Suddenly you realize; it's blood. You did just pop your cherry after all...</p>
-					<p>You soldier onwards, continuing to ride <<=$npcs.get($boy,'firstname')>>. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+					<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 					<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 				<</actCLA>>
 			<</actCLA>>
-		<<elseif $npcs.get($boy,'selfish') == 1>>
-			<p>"Come on, hurry up," <<=$npcs.get($boy,'firstname')>> complains loudly.</p>
+		<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
+			<p>"Come on, hurry up," <<=$npcs.get($sex.npcId,'firstname')>> complains loudly.</p>
 			<p>"I'm <i>trying!</i>" you yelp, blushing hard at your obvious lack of experience.</p>
 			Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen and you sit there for a moment, pausing.
-			<p>"Come on already!" <<=$npcs.get($boy,'firstname')>> doesn't wait for a response and thrusts his hips up, sending his cock tearing through your virginity.</p>
+			<p>"Come on already!" <<=$npcs.get($sex.npcId,'firstname')>> doesn't wait for a response and thrusts his hips up, sending his cock tearing through your virginity.</p>
 			<<actCLA '<b>!!!!</b>'>>
 				<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 				<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-				<p>The pain of <<=$npcs.get($boy,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+				<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 				<p>"<i><b>FUCK!</b></i>" you shout. "Cocksucker! Motherfuck! Piece of shit, <i>bastard!</i>"</p>
 				You continue to scream obscenities at him even as he grabs your hips.
 				"You were taking too long, decided to help you take the plunge," he grins, trying to guide you back up again.
@@ -857,22 +857,22 @@
 					<<else>>
 						<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 					<</if>>
-					<p>Deciding you're already this far, you let him, slowly lifting yourself up and sliding back down on his cock. And then again. And again. And again. A few minutes pass and you've worked yourself up to a steady rhythm, bouncing up and down on <<=$npcs.get($boy,'firstname')>>'s cock. And soon, you realize you...</p>
+					<p>Deciding you're already this far, you let him, slowly lifting yourself up and sliding back down on his cock. And then again. And again. And again. A few minutes pass and you've worked yourself up to a steady rhythm, bouncing up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock. And soon, you realize you...</p>
 					<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 				<</actCLA>>
 			<</actCLA>>
 		<<else>>
-			<p>"You okay up there?" <<=$npcs.get($boy,'firstname')>> asks, a quizzical look on his face.</p>
+			<p>"You okay up there?" <<=$npcs.get($sex.npcId,'firstname')>> asks, a quizzical look on his face.</p>
 			<p>"Y-yeah," you stammer. "I'm just having a hard time... getting it in..." You blush hard, embarrassed at your obvious lack of experience.</p>
 			Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen.
-			<p>"Whenever you're ready," <<=$npcs.get($boy,'firstname')>> grins.</p>
+			<p>"Whenever you're ready," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
 			You nod back at him and take a deep breath. You lift yourself up slightly, and then force yourself straight down, tearing through your virginity.
 			<<actCLA '<b>!!!!</b>'>>
 				<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 				<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-				<p>The pain of <<=$npcs.get($boy,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+				<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 				<p>"Fuck!" you involuntarily squeak. "Fuckfuckfuckfuckfuckfuckfuck! That hurts!"</p>
-				<p>"Keep moving, it'll get better," <<=$npcs.get($boy,'firstname')>> says, assuring you, putting his hands on your hips.</p>
+				<p>"Keep moving, it'll get better," <<=$npcs.get($sex.npcId,'firstname')>> says, assuring you, putting his hands on your hips.</p>
 				<<actCLA 'Keep moving'>>
 					<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 					<<if getvar("$hookup['condom']") == 1>>
@@ -881,19 +881,19 @@
 						<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 					<</if>>
 					<p>Clenching your jaw, you slowly lift yourself up before sliding back down on his cock. And then again. And again. And again. Your legs feel slick with something running down your thighs, but it doesn't feel like your juices. In fact it's hard to feel aroused at all right now. Suddenly you realize; it's blood. You did just pop your cherry after all...</p>
-					<p>You soldier onwards, continuing to ride <<=$npcs.get($boy,'firstname')>>. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+					<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 					<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 				<</actCLA>>
 			<</actCLA>>
 		<</if>>
 	<<else>>
-		<p>Grabbing hold of <<=$npcs.get($boy,'firstname')>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight. Embarrassingly, it takes several tries before you think you finally have the tip inside you. With that out of the way, you carefully lower yourself down, letting your walls stretch until you feel <<=$npcs.get($boy,'firstname')>>'s dick putting pressure on your hymen.</p>
+		<p>Grabbing hold of <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight. Embarrassingly, it takes several tries before you think you finally have the tip inside you. With that out of the way, you carefully lower yourself down, letting your walls stretch until you feel <<=$npcs.get($sex.npcId,'firstname')>>'s dick putting pressure on your hymen.</p>
 		<p>"You okay?" he asks.</p>
 		<p>"Yeah! Yeah!" you reply hurriedly. And with a deep breath, you bounce once, tearing straight through your virginity.</p>
 		<<actCLA '<b>!!!!</b>'>>
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-			<p>The pain of <<=$npcs.get($boy,'firstname')>>'s cock ripping through your hymen is enough to make you involuntarily squeak and your eyes water. You raise yourself up again and look down, horrified when you see blood leaking out of your pussy. <<=$npcs.get($boy,'firstname')>> has a similar expression of shock on his face as he looks up from beneath you.</p>
+			<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make you involuntarily squeak and your eyes water. You raise yourself up again and look down, horrified when you see blood leaking out of your pussy. <<=$npcs.get($sex.npcId,'firstname')>> has a similar expression of shock on his face as he looks up from beneath you.</p>
 			<p>"Hey... Are you a... virgin?"</p>
 			<<actCLA 'Yes... (shy)'>>
 				<<setinit $hookup['virgin'] = 1>>
@@ -906,7 +906,7 @@
 			<<actCLA 'Not anymore'>>
 				<<setinit $hookup['virgin'] = 1>>
 				"Not anymore," you say, looking down at him with watering eyes and a pained smile.
-				<p>"You fucking minx," <<=$npcs.get($boy,'firstname')>> grins back, putting his hands on your hips and guiding you back down again.</p>
+				<p>"You fucking minx," <<=$npcs.get($sex.npcId,'firstname')>> grins back, putting his hands on your hips and guiding you back down again.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'hookup_virgin' 'cowgirl_virg_norm2'>>
 				<</actCLA>>
@@ -922,7 +922,7 @@
 		<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 	<</if>>
 	Clenching your jaw, you slowly lift yourself up before sliding back down on his cock. And then again. And again. And again. Your legs are slick blood and despite the pain it seems to help with lubrication at least a small bit.
-	<p>You soldier onwards, continuing to ride <<=$npcs.get($boy,'firstname')>>, his hands guiding you the whole way. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+	<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>, his hands guiding you the whole way. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 	<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 <</if>>
 <<if $location_var[$here][0] == 'virgin_enjoyment'>>
@@ -934,7 +934,7 @@
 			<<set $orgasm_or = ''>>
 			<<set $pc.horny -= 50>>
 			... still find it really painful.
-			<p>Maybe it's just the after effect of being too rough with you before carrying over, but this <i>really fucking hurts!</i> Every time <<=$npcs.get($boy,'firstname')>> thrusts into you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+			<p>Maybe it's just the after effect of being too rough with you before carrying over, but this <i>really fucking hurts!</i> Every time <<=$npcs.get($sex.npcId,'firstname')>> thrusts into you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA '... aren`t really enjoying it'>>
@@ -944,7 +944,7 @@
 			<<set $orgasm_or = ''>>
 			<<set $time.minutes += rand(3,4)>>
 			... still don't really enjoy it...
-			<p>It hurt when <<=$npcs.get($boy,'firstname')>> first entered you and when he was just pounding on you with no regard for your comfort, but now that he's slowed down, it's just a sort of pressure you feel inside you. The sensation isn't painful but it you're not getting any pleasure from it either. After his previous speed, maybe your pussy just went numb...?</p>
+			<p>It hurt when <<=$npcs.get($sex.npcId,'firstname')>> first entered you and when he was just pounding on you with no regard for your comfort, but now that he's slowed down, it's just a sort of pressure you feel inside you. The sensation isn't painful but it you're not getting any pleasure from it either. After his previous speed, maybe your pussy just went numb...?</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA '... are starting to feel good'>>
@@ -953,7 +953,7 @@
 			... start to feel really good...
 			The pain of the previous form of fucking begins to fade and pleasure takes its place. Like an itch you've never been able to scratch or a "fullness" you've never experienced, you can feel his cock deep inside you and it feels <i>so good</i>, causing you to openly moan as he fucks you.
 			<<if $hookup['orgasm'] < $orgasm>>
-				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to cum. The pressure inside you building and building with each time <<=$npcs.get($boy,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you cum hard on <<=$npcs.get($boy,'firstname')>>'s dick.</p>
+				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to cum. The pressure inside you building and building with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you cum hard on <<=$npcs.get($sex.npcId,'firstname')>>'s dick.</p>
 			<<else>>
 				<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 			<</if>>
@@ -967,7 +967,7 @@
 			<<set $orgasm_or = ''>>
 			<<set $time.minutes += rand(3,4)>>
 			... find this really painful.
-			<p>Every time <<=$npcs.get($boy,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+			<p>Every time <<=$npcs.get($sex.npcId,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA '... aren`t really enjoying it'>>
@@ -976,7 +976,7 @@
 			<<arouse 'vaginal' `rand(4,8)` >>
 			<<set $orgasm_or = ''>>
 			... aren''t really enjoying it...
-			<p>It hurt when <<=$npcs.get($boy,'firstname')>> first entered you, but now that your pussy has adjusted but that pain has taken a back seat and become nothing more than a dull throb. But other than that, it's just a sort of pressure you feel inside you that comes and goes with the motions of his cock. The sensation isn't painful but it you're not getting any pleasure from it either. The experience is just sort of... bland.</p>
+			<p>It hurt when <<=$npcs.get($sex.npcId,'firstname')>> first entered you, but now that your pussy has adjusted but that pain has taken a back seat and become nothing more than a dull throb. But other than that, it's just a sort of pressure you feel inside you that comes and goes with the motions of his cock. The sensation isn't painful but it you're not getting any pleasure from it either. The experience is just sort of... bland.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA '... are starting to feel good'>>
@@ -985,7 +985,7 @@
 			... start to feel really good...
 			The initial pain you felt is still there, but now there''s something else that's going along with it. Like an itch you've never been able to scratch or a "fullness" you've never experienced, you can feel his cock deep inside you and it feels <i>so good</i>, causing you to openly moan.
 			<<if $hookup['orgasm'] < $orgasm>>
-				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to cum. The pressure inside you builds and builds with each time <<=$npcs.get($boy,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you go into spasms, cumming hard on <<=$npcs.get($boy,'firstname')>>'s dick.</p>
+				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to cum. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you go into spasms, cumming hard on <<=$npcs.get($sex.npcId,'firstname')>>'s dick.</p>
 			<<else>>
 				<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 			<</if>>

sugarcube/src/autogenerated/unsorted/hunterLoveSex.tw

@@ -1270,8 +1270,8 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cumface7'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'mouth' $boy 1>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'mouth' $sex.npcId 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cumf70.mp4">>
 	 * $pl
@@ -1411,7 +1411,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cumface6'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cumf60.mp4">>
 	 * $pl
@@ -1551,7 +1551,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cumface5'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cumf50.mp4">>
 	 * $pl
@@ -1691,7 +1691,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cumface4'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'stomach' $boy 1>>
+	<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cumf40.mp4">>
 	 * $pl
@@ -1971,14 +1971,14 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cumface2'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'mouth' $boy 1>>
+	<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cumf20.mp4">>
 	 * $pl
 	You feel his member start to throb in your mouth and taste the tartness of his cum as his load begins to flow onto your tongue.
 	<<actCLA 'Swallow'>>
 		<<set $time.minutes += 1>>
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<h2>Hut</h2>
 		<<video "locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_4_#.mp4" 13 14>>
 		 * $pl
@@ -2258,7 +2258,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cumface1'>>
 	<<set $time.minutes += 1>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cumf10.mp4">>
 	 * $pl
@@ -2528,7 +2528,7 @@
 			<<set $hunters_bj_times = 0>> <<set $dikos = 0>> <<gt $location>>
 		<</actCLA>>
 	<<else>>
-		<<gs 'cum_call' '' $boy 1>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
 		<h2>Hut</h2>
 		<<video "shared/sex/cum/cum111.jpg">>
 		<p>$boydesc groans and you feel a jet of sperm pour into you.</p>
@@ -2664,7 +2664,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cum10'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'stomach' $boy 1>>
+	<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cum110.mp4">>
 	 * $pl
@@ -2932,7 +2932,7 @@
 			<<set $hunters_bj_times = 0>> <<set $dikos = 0>> <<gt $location>>
 		<</actCLA>>
 	<<else>>
-		<<gs 'cum_call' '' $boy 1>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
 		<h2>Hut</h2>
 		<<image "shared/sex/cum/mouth/cum19.jpg">>
 		 * $pl
@@ -3203,7 +3203,7 @@
 			<<set $hunters_bj_times = 0>> <<set $dikos = 0>> <<gt $location>>
 		<</actCLA>>
 	<<else>>
-		<<gs 'cum_call' '' $boy 1>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
 		<h2>Hut</h2>
 		<<video "shared/sex/cum/cum81.mp4">>
 		<p>$boydesc groans and you feel a jet of sperm pour into you.</p>
@@ -3472,7 +3472,7 @@
 			<<set $hunters_bj_times = 0>> <<set $dikos = 0>> <<gt $location>>
 		<</actCLA>>
 	<<else>>
-		<<gs 'cum_call' '' $boy 1>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
 		<h2>Hut</h2>
 		<<video "shared/sex/cum/cum8.mp4">>
 		<p>$boydesc groans and you feel a jet of sperm pour into you.</p>
@@ -3741,7 +3741,7 @@
 			<<set $hunters_bj_times = 0>> <<set $dikos = 0>> <<gt $location>>
 		<</actCLA>>
 	<<else>>
-		<<gs 'cum_call' '' $boy 1>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
 		<h2>Hut</h2>
 		<<video "shared/sex/cum/cum7.mp4">>
 		<p>$boydesc groans and you feel a jet of sperm pour into you.</p>
@@ -4010,7 +4010,7 @@
 			<<set $hunters_bj_times = 0>> <<set $dikos = 0>> <<gt $location>>
 		<</actCLA>>
 	<<else>>
-		<<gs 'cum_call' '' $boy 1>>
+		<<gs 'cum_call' '' $sex.npcId 1>>
 		<h2>Hut</h2>
 		<<image "shared/sex/cum/cum6.jpg">>
 		<p>$boydesc groans and you feel a jet of sperm pour into you.</p>
@@ -4147,7 +4147,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cum5'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cum5.mp4">>
 	 * $pl
@@ -4283,7 +4283,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cum41'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'stomach' $boy 1>>
+	<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cum41.mp4">>
 	 * $pl
@@ -4418,7 +4418,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cum4'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<image "shared/sex/cum/cum4.jpg">>
 	 * $pl
@@ -4553,7 +4553,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cum3'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cum3.mp4">>
 	 * $pl
@@ -4696,7 +4696,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cum2'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'stomach' $boy 1>>
+	<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cum2.mp4">>
 	 * $pl
@@ -4835,7 +4835,7 @@
 <<if $location_var[$here][0] == 'din_hunters_sex_cum1'>>
 	<<set $time.minutes += 5>>
 	<<run $pc.sweatAdd(10)>>
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<h2>Hut</h2>
 	<<video "shared/sex/cum/cum1.mp4">>
 	 * $pl
@@ -9701,7 +9701,7 @@
 		<<set $hunters_bj_times = 0>>
 		<!-- Boy A173 -->
 		<<set $time.minutes += 5>>
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<h2>Hut</h2>
 		<<image "characters/shared/headshots_main/big173.jpg">>
 		<p>$boydesc hugs you and starts showering you with kisses. "$pc.name_nick, take off your clothes."</p>
@@ -9737,7 +9737,7 @@
 					<</if>>
 					<<if getvar("$huntersIgorQw") > 45>>
 						<<actCLA 'Part with a guy'>>
-							<<run $npcs.dec($boy,'sex',1)>>
+							<<run $npcs.dec($sex.npcId,'sex',1)>>
 							<<set $time.minutes += 5>>
 							<<if getvar("$huntersIgorLove") == 2>>
 								<<set $bfA = 0>>
@@ -9790,7 +9790,7 @@
 		<<set $hunters_bj_times = 0>>
 		<<set $boyonceA = 1>>
 		<!-- Boy A173 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<<set $ihls = rand(1,3)>>
 		<<if $pc.horny >= 60>>
 			<h2>Hut</h2>
@@ -9939,7 +9939,7 @@
 		<<set $hunters_bj_times = 0>>
 		<<set $boyonceA = 1>>
 		<!-- Boy A172 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<h2>Hut</h2>
 		<<image "characters/shared/headshots_main/big172.jpg">>
 		<p>$boydesc holds you in his arms and begins kissing you. "$pc.name_nick, take off your clothes."</p>
@@ -9959,7 +9959,7 @@
 				<<set $time.minutes += 5>>
 				<<set $huntersAndreiLove = 0>>
 				<<set $huntersAndreiQw -= 1>>
-				<<run $npcs.dec($boy,'sex',1)>>
+				<<run $npcs.dec($sex.npcId,'sex',1)>>
 				<h2>Hut</h2>
 				<<video "pc/reactions/embarrassed.mp4">>
 				<p>-Sorry $boydesc, I'd really like to, but I've never done it before.</p>
@@ -9977,7 +9977,7 @@
 		<<set $hunters_bj_times = 0>>
 		<<set $boyonceA = 1>>
 		<!-- Boy A172 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<<set $ihls = rand(1,3)>>
 		<<if $pc.horny >= 60>>
 			<h2>Hut</h2>
@@ -10126,7 +10126,7 @@
 		<<set $hunters_bj_times = 0>>
 		<<set $boyonceA = 1>>
 		<!-- Boy A174 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<h2>Hut</h2>
 		<<image "characters/shared/headshots_main/big174.jpg">>
 		<p>$boydesc holds you in his arms and kisses you deeply. "$pc.name_nick, take off your clothes."</p>
@@ -10164,7 +10164,7 @@
 					<<if getvar("$huntersSergeiQw") > 35>>
 						<<actCLA 'Part with a guy'>>
 							<<set $time.minutes += 5>>
-							<<run $npcs.dec($boy,'sex',1)>>
+							<<run $npcs.dec($sex.npcId,'sex',1)>>
 							<<set $huntersSergeiLove = 0>>
 							<<set $huntersSergeiQw -= 100>>
 							<h2>Hut</h2>
@@ -10212,7 +10212,7 @@
 		<<set $hunters_bj_times = 0>>
 		<<set $boyonceA = 1>>
 		<!-- Boy A174 -->
-		<<run $npcs.inc($boy,'sex',1)>>
+		<<run $npcs.inc($sex.npcId,'sex',1)>>
 		<<set $ihls = rand(1,3)>>
 		<<if $pc.horny >= 60>>
 			<h2>Hut</h2>

sugarcube/src/autogenerated/unsorted/hunter_favors.tw

@@ -342,7 +342,7 @@
 			<<set $hunter_collective_opinion -= 2>>
 			<<arouse 'bj' 5 `['sub','bound','deepthroat']`>>
 			<<arousalEnd>>
-			<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+			<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 			<<image "locations/gadukino/sex/hunter/bound_fucked_mouth2.jpg">>
 			You decide to make it some more fun for him. You start bobbing your head in rhythm with his pumping.
 			Whenever he is all the way down your throat, you swallow to massage his cock.

sugarcube/src/autogenerated/unsorted/hunter_interactions.tw

@@ -1496,7 +1496,7 @@
 	<<if getvar("$temp_sh") == 2>>
 		<<actCLA 'Keep sucking'>>
 			<<set $time.minutes += 1>>
-			<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+			<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 			<<set $huntersmokBJ = 0>>
 			<<image "locations/gadukino/sex/hunter/hantersmokcum.jpg">>
 			You notice Andrei''s thighs stiffen as he's edging... He lets out a grunt and shoots his spunk all over your face.
@@ -1637,11 +1637,11 @@
 			Meanwhile you involuntarily start moving your hips to match the rhythm of Igor pumping your pussy
 			<!-- Boy A174 -->
 			<<gs 'oral' 'start' 1>>
-			<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+			<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 			<<gs 'dinsex' 'bj_swallow_random'>>
 			<!-- Boy A173 -->
 			<<gs 'dinsex' 'vaginal_sex' 5>>
-			<<gs 'cum_call' 'vagina' $boy 1>>
+			<<gs 'cum_call' 'vagina' $sex.npcId 1>>
 			<<gs 'dinsex' 'sexcumsk'>>
 			<p>You feel $boydesc's cock twitch inside your pussy and realize he just came</p>
 			<<arouse 'bj' 3 `['sub','gangbang','deepthroat']`>>
@@ -1655,7 +1655,7 @@
 				<<arouse 'vaginal' 5 `['sub']`>>
 				<<arousalEnd>>
 				<p>After a few minutes of $boydesc vigorously fucking your pussy, you feel him cumming inside you</p>
-				<<gs 'cum_call' 'vagina' $boy 1>>
+				<<gs 'cum_call' 'vagina' $sex.npcId 1>>
 				<<actCLA 'The men finish up and leave you'>>
 					<<gt 'swamp_yard' 'start'>>
 				<</actCLA>>

sugarcube/src/autogenerated/unsorted/hunters.tw

@@ -95,9 +95,9 @@
 				-->
 				<<warn "CONVERSION ERROR e48a3fc1cc659ff7bd1cc7a3a6c8ba4e">>
 				<<set $gang += 1>>
-				<<setinit $npcs.get($boy[1,'sex')] += 1>>
-				<<setinit $npcs.get($boy[2,'sex')] += 1>>
-				<<setinit $npcs.get($boy[3,'sex')] += 1>>
+				<<setinit $npcs.get($sex.npcId[1,'sex')] += 1>>
+				<<setinit $npcs.get($sex.npcId[2,'sex')] += 1>>
+				<<setinit $npcs.get($sex.npcId[3,'sex')] += 1>>
 				<<image "locations/gadukino/hunters/hanters1.jpg">>
 				You make eye contact with the men while making a lewd reference. The men immediately drop everything and turn their attention to you...
 				<p>"We know you find us irresistible $pc.name_nick." Andrei said smiling.</p>
@@ -566,33 +566,33 @@
 			<!-- Boy A173 -->
 			<<arouse 'bj' 15 `['sub','gangbang']`>>
 			<<actCLA 'Continue sucking'>>
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<if $wardrobe.clothingworntype == 'nude'>>
-					<<gs 'cum_call' 'stomach' $boy 1>>
+					<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 
 				<</if>>
 				<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-					<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+					<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 
 				<</if>>
 				<!-- Boy A174 -->
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<if $wardrobe.clothingworntype == 'nude'>>
-					<<gs 'cum_call' 'stomach' $boy 1>>
+					<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 
 				<</if>>
 				<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-					<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+					<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 
 				<</if>>
 				<!-- Boy A172 -->
-				<<gs 'cum_call' 'face' $boy 1>>
+				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<if $wardrobe.clothingworntype == 'nude'>>
-					<<gs 'cum_call' 'stomach' $boy 1>>
+					<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 
 				<</if>>
 				<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-					<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+					<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 
 				<</if>>
 				<<set $huntersKnowSlut = 2>>
@@ -852,7 +852,7 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<p>You hear $boydesc groaning more intensely, indicating he's ready to cum. You look up at him, smiling with your eyes and speed up you head motion. You keep on pleasuring him until he finishes on your face. He walks away, blissfuly smiling.</p>
 	<<set $huntsexa = rand(1,5)>>
@@ -918,7 +918,7 @@
 
 	<</if>>
 	<<gs 'dinsex' 'dinrandswallow'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<p>You hear $boydesc groaning more intensely, indicating they're ready to cum. You look at them, smiling with your eyes and speed up you head motion. You keep on pleasuring them until they finish on your face. They walks away, blissfuly smiling.</p>
 	<<set $huntsexa = rand(1,4)>>
 	<<gs 'hunters' 'rng_2'>>
@@ -966,7 +966,7 @@
 	<<gs 'oral' 'start' 5 'gangbang'>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<p>$boydesc finishes in your mouth and walks away with a satisfied smiles on their faces, leaving you alone sitting on the blanket...</p>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<arouse 'bj' 2 `['sub']`>>
 	<<arousalEnd>>
 	<<actCLA 'Further'>>
@@ -986,7 +986,7 @@
 	<p>You get down on your knees. $boydesc grabs you by the head and tells you he wants you to lick his penis head...</p>
 	<<gs 'oral' 'start' 5 'gangbang'>>
 	<<gs 'dinsex' 'dinrandswallow'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<arouse 'bj' 2 `['sub']`>>
 	<p>You lick $boydesc's penis head until he finishes and walks away satisfied. He leaves you sitting alone on the blanket...</p>
 	<<arousalEnd>>
@@ -1015,7 +1015,7 @@
 	<<image "locations/gadukino/sex/hunter/hantersgrouporalend1.#.jpg" 0 1>>
 	<p>You get down on your knees. $boydesc grabs you by the head and tells you he wants you to lick his penis head...</p>
 	<<gs 'oral' 'start' 5 'gangbang'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<p>You lick $boydesc's penis head until he finishes and walks away satisfied. He leaves you sitting alone on the blanket...</p>
 	<<arouse 'bj' 2 `['sub']`>>
@@ -1061,7 +1061,7 @@
 
 	<</if>>
 	<<gs 'oral' 'start' 5 'gangbang'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<p>$boydesc cums in your mouth and walks away with a satisfied smile on their faces.</p>
 	<<arouse 'bj' 2 `['sub','gangbang']`>>
@@ -1097,8 +1097,8 @@
 	<</if>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<gs 'oral' 'start' 5 'gangbang'>>
-	<<gs 'cum_call' 'face' $boy 1 '' '' 20>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1 '' '' 20>>
+	<<gs 'cum_call' 'face' $sex.npcId 1 '' '' 20>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1 '' '' 20>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		<!-- Boy A173 -->
 
@@ -1107,9 +1107,9 @@
 		<!-- Boy A62 -->
 
 	<</if>>
-	<<gs 'cum_call' 'face' $boy 1 '' '' 20>>
+	<<gs 'cum_call' 'face' $sex.npcId 1 '' '' 20>>
 	<<gs 'dinsex' 'dinrandswallow'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1 '' '' 20>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1 '' '' 20>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		The men order you to swallow all of the sperm. You enthusiasticly open your mouth ready to recive their loads. The men started groaning loudly and began cumming, the quantity of sperm was so overwhelming that you were not able to swallow all of it and some of drips onto your face. You see the displeasure in Sergeis'' and Igors'' faces not being able to swallow it all...
 
@@ -1164,7 +1164,7 @@
 	<</if>>
 	<<gs 'oral' 'start' 5 'gangbang'>>
 	<<gs 'dinsex' 'dinrandswallow'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<p>$boydesc finish and walk away with a blissful smile on their face.</p>
 	<<arouse 'bj' 2 `['sub','gangbang']`>>
 	<<set $huntsexa = rand(1,5)>>
@@ -1215,7 +1215,7 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'oral' 'start' 5 'gangbang'>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<p>$boydesc groans loudly while cumming. He zips his pants and walks away.</p>
@@ -1252,7 +1252,7 @@
 		<!-- Boy A62 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'oral' 'start' 5 'gangbang'>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<p>$boydesc finish and walk away with a blissful smile on their face.</p>
@@ -1485,7 +1485,7 @@
 		<!-- Boy A61 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<p>$boydesc came in your mouth...</p>
 	<<arouse 'bj' 5 `['sub','gangbang']`>>
@@ -1593,8 +1593,8 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'face' $boy 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		<!-- Boy A174 -->
@@ -1604,8 +1604,8 @@
 		<!-- Boy A61 -->
 
 	<</if>>
-	<<gs 'cum_call' 'face' $boy 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		Andrei and Sergei reached climax pretty quickly finishing in your mouth. You tried to swallow it all but fail to hold it inside your mouth, trickling down your chin. Andrei and Sergei walk away satisfied, while you continue riding Igor...
@@ -1675,7 +1675,7 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		A satisfied Andrei steps aside, you continue fucking Igor, and sucking Sergei off...
@@ -1821,7 +1821,7 @@
 		<!-- Boy A62 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		Igor cums in your mouth and crashes next you, while Sergei keeps fucking you...
@@ -1891,8 +1891,8 @@
 		<!-- Boy A61 -->
 
 	<</if>>
-	<<gs 'cum_call' 'face' $boy 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		Sergei cums in your mouth. You're not able to swallow the load and the some part of it gets smeared over your face. Sergei steppes aside satisfied, you keep on fucking Igor, and sucking Andrei...
@@ -1987,7 +1987,7 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		Andrei cums and walks away, you continue to accustom your anus with Igors'' thrusts...
@@ -2181,7 +2181,7 @@
 		<!-- Boy A61 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		Sergei steps away satisfied, Andrei continues fucking while you keep masturbating Igor...
@@ -2432,7 +2432,7 @@
 		<!-- Boy A61 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		<p>Satisfied $boydesc steps away while Andrei and Igor continue to fuck you relentlessly... </p>
@@ -2541,7 +2541,7 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		A satisfied Andrei stepes aside, you continue pleasuring Sergei and Igor...
@@ -2687,7 +2687,7 @@
 		<!-- Boy A62 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		Igor cums, feeling satisfied he steps aside, Sergei keeps on fucking you...
@@ -2824,7 +2824,7 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<p>A satisfied $boydesc steps aside, the other guy keeps going on...</p>
 	<<arouse 'bj' 5 `['sub','gangbang']`>>
@@ -2962,7 +2962,7 @@
 		<!-- Boy A61 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		You feel Sergei''s cock throbbing inside your mouth, he starts grunting loudly and releases his spunk inside your mouth. Andrei now alone and warmed up tells you to...
@@ -3061,7 +3061,7 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<if getvar("$huntersexnude") == 1 or getvar("$forest_huntersex") == 3>>
 		A satisfied Andrei cums and moves away while Sergei continues to pound you wondering if he should...
@@ -3205,7 +3205,7 @@
 <<if $location_var[$here][0] == 'huntersgroupOis'>>
 	<<set $time.minutes += 5>>
 	<<set $pose = 1>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<<image "locations/gadukino/sex/hunter/hantersgroupo1.#.jpg" 0 1>>
 	You're on your knees masturbating their throbbing cocks right in front of your face. You see them grimace, they're edging and are ready to cover your pretty little face with spunk. The men cum all over your face, satisfied they leave you by the bedspread...
 	<<arousalEnd>>
@@ -3225,9 +3225,9 @@
 <<if $location_var[$here][0] == 'huntersgroupOia'>>
 	<<set $time.minutes += 5>>
 	<<set $pose = 1>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-		<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+		<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 
 	<</if>>
 	<<image "locations/gadukino/sex/hunter/hantersgroupo1.#.jpg" 0 1>>
@@ -3249,11 +3249,11 @@
 <<if $location_var[$here][0] == 'huntersgroupOsa'>>
 	<<set $time.minutes += 5>>
 	<<set $pose = 1>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-		<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+		<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 	<<else>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<</if>>
 	<<image "locations/gadukino/sex/hunter/hantersgroupo1.#.jpg" 0 1>>
 	The men order you on your knees, they've had enough and want to finish. You can see on their faces that they're at the edge and you'll soon feel their warm sperm all over the face. The sperm flowes down your chin, dripping down on your chest. The men leave you behind on a blanket covered in their spunk.
@@ -3288,7 +3288,7 @@
 	<<image "locations/gadukino/sex/hunter/hantersgroupa1.#.jpg" 0 4>>
 	<p>$boydesc tells you to go ass up face down. Without any hesitation he starts pounding your anus relentlessly...</p>
 	<p>You hear $boydesc grunting from behind, his cock getting stiffer and stiffer. He should be reaching his limit soon you think to yourself. All of a sudden you hear a loud moan and you feel something warm inside your ass...</p>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
 	<<set $huntsexa = rand(1,4)>>
 	<<gs 'hunters' 'rng_7'>>
@@ -3310,7 +3310,7 @@
 	<<image "locations/gadukino/sex/hunter/hantersgroupaend1.jpg">>
 	<p>$boydesc starts ravaging your anus, determinedly not slowing down...</p>
 	<p>You hear $boydesc grunting from behind, his cock getting stiffer and stiffer. He should be reaching his limit soon you think to yourself. All of a sudden you hear a loud moan and you feel something warm inside your ass...</p>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
 	<<arousalEnd>>
 	<<if getvar("$forest_huntersex") == 0>>
@@ -3343,7 +3343,7 @@
 	<<image "locations/gadukino/sex/hunter/hantersgroupaaend2.jpg">>
 	<p>$boydesc whispers that he'll enjoy this and starts pummeling your anus. You let out a whimper, clearly enjoying yourself...</p>
 	<p>You hear $boydesc grunting from behind, his cock getting stiffer and stiffer. He should be reaching his limit soon you think to yourself. All of a sudden you hear a loud moan and you feel something warm inside your ass...</p>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
 	<<arousalEnd>>
 	<<if getvar("$forest_huntersex") == 0>>
@@ -3396,7 +3396,7 @@
 	<<image "locations/gadukino/sex/hunter/hantersgroupaend1.jpg">>
 	<p>Without any lube $boydesc shoves his cock in your anus making you scream out with pain...</p>
 	<p>You hear $boydesc grunting from behind, his cock getting stiffer and stiffer. It should be over soon you think to yourself. All of a sudden you hear a loud moan and you feel something warm inside your ass...</p>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
 	<<arousalEnd>>
 	<<if getvar("$forest_huntersex") == 0>>
@@ -3429,7 +3429,7 @@
 	<<image "locations/gadukino/sex/hunter/hantersgroupaend2.jpg">>
 	<p>While on all fours $boydesc comes in from behind and starts fucking you...</p>
 	<p>You hear $boydesc grunting from behind, his cock getting stiffer and stiffer. He should be reaching his limit soon you think to yourself. All of a sudden you hear a loud moan and you feel something warm all over your back...</p>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
 	<<arousalEnd>>
 	<<if getvar("$forest_huntersex") == 0>>
@@ -3482,7 +3482,7 @@
 	<<image "locations/gadukino/sex/hunter/hantersgroupaend1.jpg">>
 	<p>$boydesc orders you on all fours, he steps behind you loudly proclaiming you're going to get a real pounding now. With a sly look he guides his unlubed penis inside your anus, telling you he wants to strech it out...</p>
 	<p>You hear $boydesc grunting from behind, his cock getting stiffer and stiffer. It should be over soon you think to yourself. All of a sudden you hear a loud moan and you feel something warm inside your ass...</p>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
 	<<arousalEnd>>
 	<<if getvar("$forest_huntersex") == 0>>
@@ -3515,7 +3515,7 @@
 	<<image "locations/gadukino/sex/hunter/hantersgroupaend2.jpg">>
 	<p>$boydesc starts fucking you in the ass, both of you are enjoying yourselves...</p>
 	<p>You hear $boydesc grunting from behind, his cock getting stiffer and stiffer. He should be reaching his limit soon you think to yourself. All of a sudden you hear a loud moan and you feel something warm all over your back...</p>
-	<<gs 'cum_call' 'butt' $boy 1>>
+	<<gs 'cum_call' 'butt' $sex.npcId 1>>
 	<<arouse 'anal' 5 `['sub']`>>
 	<<arousalEnd>>
 	<<if getvar("$forest_huntersex") == 0>>
@@ -3699,13 +3699,13 @@
 		<!-- Boy A61 -->
 
 	<</if>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<<if $wardrobe.clothingworntype == 'nude'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 
 	<</if>>
 	<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-		<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+		<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 
 	<</if>>
 	<<image "locations/gadukino/sex/hunter/hantersgroupoend1.#.jpg" 0 2>>
@@ -3741,13 +3741,13 @@
 		<!-- Boy A63 -->
 
 	<</if>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<<if $wardrobe.clothingworntype == 'nude'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 
 	<</if>>
 	<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-		<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+		<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 
 	<</if>>
 	<<image "locations/gadukino/sex/hunter/hantersgroupoend1.#.jpg" 0 2>>
@@ -3780,13 +3780,13 @@
 		<!-- Boy A62 -->
 
 	<</if>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<<if $wardrobe.clothingworntype == 'nude'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 
 	<</if>>
 	<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-		<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+		<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 
 	<</if>>
 	<<image "locations/gadukino/sex/hunter/hantersgroupoend1.#.jpg" 0 2>>
@@ -3850,8 +3850,8 @@
 	<<actCLA 'Jerk him off'>>
 		<<set $protect = 0>>
 		<<set $huntsex = 0>>
-		<<gs 'cum_call' 'face' $boy 1>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'face' $sex.npcId 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 		<<image "locations/gadukino/sex/hunter/hanterslutend2.#.jpg" 1 2>>
 		<<gs 'dinsex' 'dinrandswallow'>>
 		<p>The quantity of sperm was so overwhelming that you were not able to swallow all of it and some of it runs down the chin, dripping down, staining your chest and stomach. $boydesc used his pants to clean the cock and went about his business, leaving you alone to freshen up.</p>

sugarcube/src/autogenerated/unsorted/huntersex.tw

@@ -27,9 +27,9 @@
 	-->
 	<<warn "CONVERSION ERROR e48a3fc1cc659ff7bd1cc7a3a6c8ba4e">>
 	<<set $gang += 1>>
-	<<setinit $npcs.get($boy[1,'sex')] += 1>>
-	<<setinit $npcs.get($boy[2,'sex')] += 1>>
-	<<setinit $npcs.get($boy[3,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[1,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[2,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[3,'sex')] += 1>>
 	<<set $time.minutes += 5>>
 	<<gs 'shortgs' 'smoker'>>
 	<<set $pc.mood = 100>>
@@ -119,12 +119,12 @@
 													They all begin to masturbate in front of your face, and you prepare yourself for the amount of cum that is about to cover you...
 													<<actCLA 'Wait patiently'>>
 														<<set $time.minutes += 1>>
-														<<gs 'cum_call' 'face' $boy[1] 1 '' '' 20>>
-														<<gs 'cum_call' 'face' $boy[2] 1 '' '' 20>>
-														<<gs 'cum_call' 'face' $boy[3] 1 '' '' 20>>
-														<<gs 'cum_call' 'stomach' $boy[2] 1 '' '' 20>>
-														<<gs 'cum_call' 'mouth_swallow' $boy[1] 1 '' '' 20>>
-														<<gs 'cum_call' 'breasts' $boy[3] 1 '' '' 20>>
+														<<gs 'cum_call' 'face' $sex.npcId[1] 1 '' '' 20>>
+														<<gs 'cum_call' 'face' $sex.npcId[2] 1 '' '' 20>>
+														<<gs 'cum_call' 'face' $sex.npcId[3] 1 '' '' 20>>
+														<<gs 'cum_call' 'stomach' $sex.npcId[2] 1 '' '' 20>>
+														<<gs 'cum_call' 'mouth_swallow' $sex.npcId[1] 1 '' '' 20>>
+														<<gs 'cum_call' 'breasts' $sex.npcId[3] 1 '' '' 20>>
 														<<image "locations/gadukino/sex/dance/dancesexoi6.jpg">>
 														Finally, the guys started to cum. Jets of sperm struck your face, some got in your mouth and dripped onto your breast and stomach as well...
 														<<actCLA 'Pass out'>>
@@ -229,9 +229,9 @@
 	-->
 	<<warn "CONVERSION ERROR e48a3fc1cc659ff7bd1cc7a3a6c8ba4e">>
 	<<set $gang += 1>>
-	<<setinit $npcs.get($boy[1,'sex')] += 1>>
-	<<setinit $npcs.get($boy[2,'sex')] += 1>>
-	<<setinit $npcs.get($boy[3,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[1,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[2,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[3,'sex')] += 1>>
 	<<set $time.minutes += 5>>
 	<<gs 'shortgs' 'smoker'>>
 	<<set $pc.mood = 100>>
@@ -298,9 +298,9 @@
 	-->
 	<<warn "CONVERSION ERROR e48a3fc1cc659ff7bd1cc7a3a6c8ba4e">>
 	<<set $gang += 1>>
-	<<setinit $npcs.get($boy[1,'sex')] += 1>>
-	<<setinit $npcs.get($boy[2,'sex')] += 1>>
-	<<setinit $npcs.get($boy[3,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[1,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[2,'sex')] += 1>>
+	<<setinit $npcs.get($sex.npcId[3,'sex')] += 1>>
 	<<set $gang += 1>>
 	<<set $dirty_dickA = 0>>
 	<<set $dirty_dickB = 0>>
@@ -466,7 +466,7 @@
 <<if $location_var[$here][0] == 'doubleloveOralCum12_1'>>
 	<<image "locations/gadukino/sex/hunter/doubleloveoralcum12.1.jpg">>
 	You kneel in front of guys and begin sucking their dicks, taking turns and paying attention to each one...
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") == 1 or getvar("$temphunt") == 3>>
 		<!-- Boy A174 -->
 
@@ -509,7 +509,7 @@
 <<if $location_var[$here][0] == 'doubleloveOralCum12_2'>>
 	<<image "locations/gadukino/sex/hunter/doubleloveoralcum12.2.jpg">>
 	You kneel in front of guys and begin sucking their dicks, taking turns and paying attention to each one...
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") <= 2>>
 		<!-- Boy A172 -->
 
@@ -600,7 +600,7 @@
 <<if $location_var[$here][0] == 'doubleloveDogCum112_1'>>
 	<<image "locations/gadukino/sex/hunter/doublelovedogcum112_1.jpg">>
 	You bend over in between the boys and suck one cock, while the second penetrates you from behind...
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<if getvar("$temphunt") == 1 or getvar("$temphunt") == 3>>
 		<!-- Boy A174 -->
 
@@ -649,7 +649,7 @@
 <<if $location_var[$here][0] == 'doubleloveDogCum112_2'>>
 	<<image "locations/gadukino/sex/hunter/doublelovedogcum112_2.jpg">>
 	You bend over in between the boys and suck one cock, while the second penetrates you from behind...
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") <= 2>>
 		<!-- Boy A172 --> <<setn $boyAsexa += 1>>
 
@@ -743,7 +743,7 @@
 <<if $location_var[$here][0] == 'doubleloveDogCum212_1'>>
 	<<image "locations/gadukino/sex/hunter/doublelovedogcum212_1.jpg">>
 	You bend over in between the boys and suck one cock, while the second penetrates you from behind...
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<if getvar("$temphunt") <= 2>>
 		<!-- Boy A172 -->
 
@@ -789,7 +789,7 @@
 <<if $location_var[$here][0] == 'doubleloveDogCum212_2'>>
 	<<image "locations/gadukino/sex/hunter/doublelovedogcum212_2.jpg">>
 	You bend over in between the boys and suck one cock, while the second penetrates you from behind...
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") == 1 or getvar("$temphunt") == 3>>
 		<!-- Boy A174 --> <<setn $boyBsexa += 1>>
 
@@ -880,7 +880,7 @@
 <<if $location_var[$here][0] == 'doubleloveSideCum12_1'>>
 	<<image "locations/gadukino/sex/hunter/doublelovesidecum12_1.jpg">>
 	You lie on your side with a member in front of your face, and the other one penetrating you from behind...
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<if getvar("$temphunt") <= 2>>
 		<!-- Boy A172 -->
 
@@ -927,7 +927,7 @@
 	<<set $lubonus += 1>>
 	<<image "locations/gadukino/sex/hunter/doublelovesidecum12_2.jpg">>
 	You lie on your side with a member in front of your face, and the other one penetrating you from behind...
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") == 1 or getvar("$temphunt") == 3>>
 		<!-- Boy A174 --> <<setn $boyBsexa += 1>>
 
@@ -1029,7 +1029,7 @@
 	<<set $lubonus += 1>>
 	<<image "locations/gadukino/sex/hunter/doublelovecowcum112_1.jpg">>
 	One of the guys lays on the ground and you mount him. The second puts his cock in your mouth...
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<if getvar("$temphunt") == 1 or getvar("$temphunt") == 3>>
 		<!-- Boy A174 -->
 
@@ -1079,7 +1079,7 @@
 	<<set $lubonus += 1>>
 	<<image "locations/gadukino/sex/hunter/doublelovecowcum112_2.jpg">>
 	One of the guys lays on the ground and you mount him. The second puts his cock in your mouth...
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") <= 2>>
 		<!-- Boy A172 --> <<setn $boyAsexa += 1>>
 
@@ -1176,7 +1176,7 @@
 <<if $location_var[$here][0] == 'doubleloveCowCum212_1'>>
 	<<image "locations/gadukino/sex/hunter/doublelovecowcum212_1.jpg">>
 	One of the guys lays on the ground and you mount him. The second puts his cock in your mouth...
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<if getvar("$temphunt") == 1 or getvar("$temphunt") == 3>>
 		<!-- Boy A174 -->
 
@@ -1225,7 +1225,7 @@
 <<if $location_var[$here][0] == 'doubleloveCowCum212_2'>>
 	<<image "locations/gadukino/sex/hunter/doublelovecowcum212_2.jpg">>
 	One of the guys lays on the ground and you mount him. The second puts his cock in your mouth...
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") <= 2>>
 		<!-- Boy A172 --> <<setn $boyAsexa += 1>>
 
@@ -1316,7 +1316,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'doubleloveSideCum2'>>
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<if getvar("$temphunt") == 1 or getvar("$temphunt") == 3>>
 		<!-- Boy A174 -->
 
@@ -1381,7 +1381,7 @@
 	<<gs 'huntersex' 'rng_3'>>
 <</if>>
 <<if $location_var[$here][0] == 'doubleloveCowCum1'>>
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<if getvar("$temphunt") <= 2>>
 		<!-- Boy A172 -->
 
@@ -1456,7 +1456,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'doubleloveOralCum1'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") <= 2>>
 		<!-- Boy A172 -->
 
@@ -1534,7 +1534,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'doubleloveOralCum2'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if getvar("$temphunt") == 1 or getvar("$temphunt") == 3>>
 		<!-- Boy A174 -->
 
@@ -1576,15 +1576,15 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'doubleloveOralCum12'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
-	<<gs 'cum_call' 'face' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
 	<<set $lubonus = 0>>
 	<<if $wardrobe.clothingworntype == 'nude'>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 
 	<</if>>
 	<<if ($wardrobe.clothingworntype != 'nude' and $wardrobe.PCloswimwear == 0)>>
-		<<gs 'cum_call' 'clothes_hidden' $boy 1>>
+		<<gs 'cum_call' 'clothes_hidden' $sex.npcId 1>>
 
 	<</if>>
 	<<image "locations/gadukino/sex/hunter/doubleloveoralcum12.#.jpg" 1 3>>
@@ -1644,7 +1644,7 @@
 <<if $location_var[$here][0] == 'sluthomeOralCum1'>>
 	<<image "locations/gadukino/sex/hunter/sluthomeoralcum1.jpg">>
 	Without warning, the guy begins to cum.
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'oral' 'start'>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<$textsexhunter3>>
@@ -1666,7 +1666,7 @@
 <<if $location_var[$here][0] == 'sluthomeOralCum2'>>
 	<<image "locations/gadukino/sex/hunter/sluthomeoralcum2.jpg">>
 	Without warning, the guy begins to cum.
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'oral' 'start'>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<$textsexhunter3>>
@@ -1706,7 +1706,7 @@
 <<if $location_var[$here][0] == 'sluthomeOralCum3'>>
 	<<image "locations/gadukino/sex/hunter/sluthomeoralcum3.jpg">>
 	<p>$boydesc pushes his whole weight against your head, forcing you to swallow more of his dick cm dick.</p>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<if $dick > $pc.pcs_throat>>
 		Immediately your gag reflex kicks in you feel tears forming in your eyes.
 
@@ -1738,9 +1738,9 @@
 	<<gs 'huntersex' 'rng_7'>>
 <</if>>
 <<if $location_var[$here][0] == 'sluthomeOralCum4'>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
-	<<gs 'cum_call' 'face' $boy 1>>
-	<<gs 'cum_call' 'stomach' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
+	<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 	<<image "locations/gadukino/sex/hunter/sluthomeoralcum4.#.jpg" 1 3>>
 	<p>You are on your knees in front of the guy with your mouth open. $boydesc fiercely rubs his dick member in front of your face...</p>
 	<p>Soon a jet of sperm hits you in the mouth, then a second and a third. The sperm fills your mouth and runs down your chin, dripping down onto your breasts and stomach. $boydesc has you clean his dick before putting it back in his pants and going about their business, leaving you alone to freshen up.</p>
@@ -1777,7 +1777,7 @@
 <<if $location_var[$here][0] == 'sluthomeAnalDogCum1'>>
 	<<image "locations/gadukino/sex/hunter/sluthomeAnalDogCum1.jpg">>
 	You feel his pace quicken and you are sure he is about to cum.
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
 	<<$textsexhunter3>>
 	<<arouse 'anal' 5 `['sub']`>>
@@ -1803,7 +1803,7 @@
 <<if $location_var[$here][0] == 'sluthomeAnalDogCum2'>>
 	<<image "locations/gadukino/sex/hunter/sluthomeAnalDogCum2.jpg">>
 	You feel his pace quicken and you are sure he is about to cum.
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
 	<<$textsexhunter3>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
@@ -1827,7 +1827,7 @@
 	<<gs 'huntersex' 'rng_7'>>
 <</if>>
 <<if $location_var[$here][0] == 'sluthomeAnalCowCum1'>>
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<image "locations/gadukino/sex/hunter/sluthomeAnalCowCum1.jpg">>
 	You feel his pace quicken and you are sure he is about to cum.
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
@@ -1876,7 +1876,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'sluthomeAnalCowCum2'>>
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<image "locations/gadukino/sex/hunter/sluthomeAnalCowCum2.jpg">>
 	You feel his pace quicken and you are sure he is about to cum.
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
@@ -1904,7 +1904,7 @@
 <<if $location_var[$here][0] == 'sluthomeAnalSideCum1'>>
 	<<image "locations/gadukino/sex/hunter/sluthomeAnalSideCum1.jpg">>
 	You feel his pace quicken and you are sure he is about to cum.
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
 	<<$textsexhunter3>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
@@ -1948,7 +1948,7 @@
 <<if $location_var[$here][0] == 'sluthomeAnalSideCum2'>>
 	<<image "locations/gadukino/sex/hunter/sluthomeAnalSideCum2.jpg">>
 	You feel his pace quicken and you are sure he is about to cum.
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
 	<<$textsexhunter3>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
@@ -2054,10 +2054,10 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A174 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<!-- Boy A173 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Sergei and Igor get up and walk away.
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2088,7 +2088,7 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A174 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Sergei gets up and walks away.
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2178,7 +2178,7 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A172 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Andrei gets up and walks away.
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2209,10 +2209,10 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A172 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<!-- Boy A173 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Sergei and Igor had finished and walked away.
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2284,10 +2284,10 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A174 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<!-- Boy A172 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Andrei and Sergei get up and walk away.
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2359,7 +2359,7 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A172 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Andrey gets up and walks away.
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2419,7 +2419,7 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A173 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Igor gets up and walks away.
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2453,10 +2453,10 @@
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<<gs 'dinsex' 'sexcum'>>
 	<!-- Boy A173 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<!-- Boy A174 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Everyone is exhausted and immediately fell asleep.
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2578,7 +2578,7 @@
 	<<gs 'dinSex' 'boy_wants_anal' $boydesc2 'lubri'>>
 	<<arouse 'bj' 10 `['gangbang','deepthroat']`>>
 	<<gs 'dinSex2' 'doublepenetration' 10 'sub' 'gangbang'>>
-	<<gs 'cum_call' 'anus' $boy 1>>
+	<<gs 'cum_call' 'anus' $sex.npcId 1>>
 	<<gs 'huntersex' 'rng_11'>>
 <</if>>
 <<if $location_var[$here][0] == 'huntersgrAiOsa'>>
@@ -2635,10 +2635,10 @@
 	<<set $dirty_dickC += 1>>
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
 	<!-- Boy A172 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<!-- Boy A174 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Andrei and Sergei get up and walk away.
 	<<arouse 'anal' 5 `['sub','group']`>>
@@ -2665,9 +2665,9 @@
 	<<actCLA 'Wait patiently'>>
 		<<set $time.minutes += 1>>
 		<<set $pose = 0>>
-		<<gs 'cum_call' 'face' $boy 1>>
-		<<gs 'cum_call' 'stomach' $boy 1>>
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'face' $sex.npcId 1>>
+		<<gs 'cum_call' 'stomach' $sex.npcId 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<image "locations/gadukino/sex/dance/hantersgro3cum1.#.jpg" 1 6>>
 		Finally all the guys start to cum. Jets of sperm cover your face, hit you in the mouth and drip all over your body too...
 		<<if getvar("$huntersexnude") == 0>>
@@ -2790,7 +2790,7 @@
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<<gs 'dinsex' 'sexcum'>>
 	<!-- Boy A173 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	<<arouse 'vaginal' 5 `['sub','group']`>>
 	<<arouse 'bj' 5 `['sub','group']`>>
@@ -2838,7 +2838,7 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A172 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Andrei gets up and walks away.
 	<<arouse 'vaginal' 5 `['sub','group']`>>
@@ -2874,7 +2874,7 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A173 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Igor gets up and walks away, but you continue with Sergei.
 	<<arouse 'vaginal' 5 `['sub','group']`>>
@@ -2932,8 +2932,8 @@
 	<</if>>
 	<<gs 'dinsex' 'vaginal_sex' 10>>
 	<!-- Boy A174 -->
-	<<gs 'cum_call' 'face' $boy 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Sergei gets up and walks away, but you continue with Andrei.
 	<<arouse 'vaginal' 5 `['sub','group']`>>
@@ -3015,8 +3015,8 @@
 	<<set $dirty_dickC += 1>>
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
 	<!-- Boy A174 -->
-	<<gs 'cum_call' 'face' $boy 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Sergei gets up and walks away, but you continue with Igor.
 	<<arouse 'anal' 5 `['sub','group']`>>
@@ -3086,7 +3086,7 @@
 	<<set $dirty_dickB += 1>>
 	<<gs 'dinSex' 'boy_wants_anal' '' 'lubri'>> <<gs 'dinsex' 'analsex'>>
 	<!-- Boy A173 -->
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<gs 'dinsex' 'dinrandswallow'>>
 	Igor gets up and walks away, but you continue with Andrei and Sergei.
 	<<arouse 'anal' 5 `['sub','group']`>>
@@ -3148,8 +3148,8 @@
 <<if $location_var[$here][0] == 'huntersgrO2'>>
 	<<set $time.minutes += 1>>
 	<<set $pose = 0>>
-	<<gs 'cum_call' 'face' $boy 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'face' $sex.npcId 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<set $pc.body_write += 1>>
 	<<image "locations/gadukino/sex/dance/hantersgro2cum1.#.jpg" 1 2>>
 	Sergei and Igor put you on your back and begin to cum on you. A jet of sperm hit in your mouth and face and another hit your breasts and stomach. For fun, the guys wrote on your body to commemorate the event...
@@ -3206,7 +3206,7 @@
 	Sergei quickened his pace and you feel him cum deep inside of you.
 	Sergei gets up and walks away.
 	<!-- Boy A174 -->
-	<<run $npcs.inc($boy,'sex',1)>>
+	<<run $npcs.inc($sex.npcId,'sex',1)>>
 	<<arouse 'anal' 5 `['sub','rough']`>>
 	<<actCLA 'Pass out'>>
 		<<gt 'huntersex' 'huntersGrEnd'>>
@@ -3214,8 +3214,8 @@
 <</if>>
 <<if $location_var[$here][0] == 'huntersgrO1'>>
 	<<set $time.minutes += 1>>
-	<<gs 'cum_call' 'face' $boy 1 '' '' 20>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1 '' '' 20>>
+	<<gs 'cum_call' 'face' $sex.npcId 1 '' '' 20>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1 '' '' 20>>
 	<<set $pc.body_write += 1>>
 	<<image "locations/gadukino/sex/dance/hantersgro1cum.jpg">>
 	Andrei put you on your back and then shot his cum all over you. Jets of sperm hit in your mouth, and on your face and hair.

sugarcube/src/autogenerated/unsorted/husbSex.tw

@@ -223,7 +223,7 @@
 	<<gs 'oral' 'start'>>
 	<<actCLA 'Continue to suck'>>
 		 		<<gs 'boyStat' $HusID>>
-		<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<set $husband += 1>>
 		<<image "shared/sex/cum/mouth/cum30.jpg">>
 		<p>A jet of hot sperm hits you in the mouth. You begin to swallow his sperm as $husName continues to cum in your mouth. Finally, the flow of hot, pungent tasting liquid stops.</p>

sugarcube/src/autogenerated/unsorted/igorev.tw

@@ -197,12 +197,12 @@ qwday	igor_qwday
 				<<set $Igorsex += 1>>
 				<<image "characters/pavlovsk/school/boy/igor/sex/home/suckdick.jpg">>
 				You grab his small rock hard cock and suck it like a "Lollipop". Igor groans, and you feel your mouth getting hit by a huge jet of sperm.
-				<<gs 'cum_call' 'mouth' $boy 1>>
+				<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 				<<arouse 'bj' 10 >>
 				<<actCLA 'Swallow his sperm'>>
 					<<image "pc/body/cum/swallow/swallow7.jpg">>
 					<p>You continue sucking his erupted cock and swallow the cum as soon as it reaches your mouth. The stream of sperm is never ending so instead of swallowing everything you let it flow out onto the cock. Finally the flow dies down and you let go of the limp cock out of your mouth. Your $pc_desc['lips'] lips is wet from all the semen.</p>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<arouse 'bj' 10 >>
 					<<actCLA 'Continue'>>
 						<<gt 'igorEv' 'din_igor_end'>>
@@ -211,7 +211,7 @@ qwday	igor_qwday
 				<<actCLA 'Remove his cock from your mouth'>>
 					<<image "pc/body/cum/cumface/cumface2.jpg">>
 					You remove the cock from your mouth as a continuous jet of semen shoots out of the tip, hitting you on the face. Some of the splatter get into your eyes, making you blink in panic. You sit still as jet after jet of cum shots forth and splashes across your face.
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<arousalEnd>>
 					<<actCLA 'Continue'>>
 						<<gt 'igorEv' 'din_igor_end'>>
@@ -227,7 +227,7 @@ qwday	igor_qwday
 				<p>"Can I cum inside you?" Igor asks.</p>
 				Before you can answer you feel Igor ejaculating inside you.
 				He's clearly upset over this but you tell him it's okay and that you don't mind him finishing inside you...
-				<<gs 'cum_call' 'anus' $boy 1>>
+				<<gs 'cum_call' 'anus' $sex.npcId 1>>
 				<<arouse 'anal' 15 >>
 				<<arousalEnd>>
 				<<actCLA 'Continue'>>
@@ -245,7 +245,7 @@ qwday	igor_qwday
 					You see him making faces, he's clearly done for.
 					He manages to pull out just in time just in the last second, cumming on your pussy lips.
 					"You were lucky there. I would have killed you if you had gotten me pregnant." you tell him...
-					<<gs 'cum_call' 'labia' $boy 1>>
+					<<gs 'cum_call' 'labia' $sex.npcId 1>>
 					<<arouse 'vaginal' 15 >>
 					<<arousalEnd>>
 					<<actCLA 'Continue'>>

sugarcube/src/autogenerated/unsorted/igorhunter.tw

@@ -80,7 +80,7 @@
 				You move closer to him and begin kissing him again. Igor gently kisses you back.
 				<center><b>Be aware! Igor is not in the Boyfriend system yet!</b></center>
 				<!-- !stopboy = 0-->
-				<!-- !!		$lover[$lover_number] = $boy-->
+				<!-- !!		$lover[$lover_number] = $sex.npcId-->
 				<!-- !!		$loverbody[$lover_number] = $boybody-->
 				<!-- !!		$loverbod[$lover_number] = $boybod-->
 				<!-- !!		$loverface[$lover_number] = $boyface-->

sugarcube/src/autogenerated/unsorted/kafeM.tw

@@ -123,7 +123,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bj'>>
 	 	<<set $bja += 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<setinit $loverrelation[$lover_number] += 2>>
 	<<gs 'brosok'>>
 	<<image "characters/city/boyfriend/sex/event/cafe/kafe1.jpg">>

sugarcube/src/autogenerated/unsorted/kafesvid.tw

@@ -233,7 +233,7 @@
 			<p>$telsob continues to chat with you paying no attention to the man: "That's a good girl, $pc.name_nick. Doesn't it feel great knowing you can please a total stranger with so little effort?" With that the man grunts loudly, signaling he is about to cum. "Are you just going to let him finish on the table? It would be a shame if we came all the way to the cafe, and you passed up the most tasty treat."</p>
 			<<arouse 'hj' 5 `['sub']`>>
 			<<actCLA 'Take him in your mouth'>>
-				<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+				<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 				<<image "characters/city/boyfriend/sex/event/16.jpg">>
 				<p>You drop to your knees, as $telsob grabs his cock. "Now, I want you to be a good girl, and swallow all of this for me," she says, as she strokes him in front of your mouth. Seconds later warm jets of sperm enter your mouth. $telsob keeps working the man roughly, squeezing every last drop out of him, and into your mouth. "Very good $pc.name_nick, now swallow", she says. You do. Then she sits back down chitchatting with you like nothing happened.</p>
 				<!-- ! WD: missing exit-->
@@ -320,7 +320,7 @@
 								<<actCLA 'In your mouth'>>
 									<<set $spafinloc = 11>>
 									<<gs 'cum_manage'>>
-									<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+									<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 									<<image "characters/city/boyfriend/sex/event/22.jpg">>
 									<p>As soon you drop to your knees, $telsob furiously jerks his cock, aiming it at your mouth. The man groans loudly, and erupts all over the place. A lot of his cum finds your mouth, but it also runs down your chin and chest. Looking up, you see $telsob looking at you like a proud parent.</p>
 									<<actCLA 'Kiss $telsob'>>
@@ -384,7 +384,7 @@
 						<<actCLA 'In your mouth'>>
 							<<set $spafinloc = 11>>
 							<<gs 'cum_manage'>>
-							<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+							<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 							<<image "characters/city/boyfriend/sex/event/22.jpg">>
 							<p>As soon you drop to your knees, $telsob furiously jerks his cock, aiming it at your mouth. The man groans loudly, and erupts all over the place. A lot of his cum finds your mouth, but it also runs down your chin and chest. Looking up, you see $telsob looking at you like a proud parent.</p>
 							<<actCLA 'Kiss $telsob'>>

sugarcube/src/autogenerated/unsorted/katalkinSex.tw

@@ -2,7 +2,7 @@
 <<set $here = 'katalkinSex'>>
 <<set $ARGS = $location_var[$here]>>
 <!-- Boy A70 -->
-<<run $npcs.inc($boy,'sex',1)>>
+<<run $npcs.inc($sex.npcId,'sex',1)>>
 <<if $location_var[$here][0] == 'sex'>>
 	<<set $schtraf = 0>>
 	<<set $pc.horny += 10>>
@@ -54,7 +54,7 @@
 			<<if rand(0, 1) == 0>>
 				<<actCLA 'Swallow his cum'>>
 					<<set $KatalkinSwallow += 1>>
-					<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+					<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 					<<image "characters/pavlovsk/resident/katalkin/sex/swallow.jpg">>
 					<<gs 'dinsex' 'bj_swallow_random'>>
 					<<arousalEnd>>
@@ -64,7 +64,7 @@
 				<</actCLA>>
 				<<actCLA 'Take his load on your face'>>
 					$Katalkin
-					<<gs 'cum_call' 'face' $boy 1>>
+					<<gs 'cum_call' 'face' $sex.npcId 1>>
 					<<image "characters/pavlovsk/resident/katalkin/sex/facial.jpg">>
 					<p>When he is about to orgasm, you release his cock from your mouth and give it a few quick jerks with your fingers as you aim it over your face, closing your eyes in anticipation. Soon enough you feel his warm load splattering all over your face... and wow, it's a lot! You lick your lips to have a taste. It tastes somewhat bitter, but not necessarily unpleasant.</p>
 					<<arousalEnd>>
@@ -91,7 +91,7 @@
 		Captain Katalkin enjoys the feeling of your anus squeezing around his cock for a few seconds more, before he slowly pulls his cock out. A trickle of sperm slowly comes dribbling out of your stretched asshole. When you try to get up, he stops you and pushes you back down against the table. He tells you: "In a minute, girl. Show me your used hole first."
 		You obey and pull your ass cheeks to the sides, showing him your glazed asshole while the cum slowly dribbles down over your pussy lips. He admires his work for a few more seconds and then slaps your ass, indicating that you can get up now.
 		<<arouse 'anal' 3 `['sub']`>>
-		<<gs 'cum_call' 'anus' $boy 1>>
+		<<gs 'cum_call' 'anus' $sex.npcId 1>>
 		<<arousalEnd>>
 		<<actCLA 'Brush up'>>
 			<<set $time.minutes += 1>> <<gt 'katalkin'>>

sugarcube/src/autogenerated/unsorted/katja_city_sex.tw

@@ -513,7 +513,7 @@
 															"We will have to use your bathroom," you tell him and he just waves his hand in its direction.
 															<<arouse 'kiss' 3 `['lesbian']`>>
 															<<arousalEnd>>
-															<<gs 'cum_call' 'face' $boy 1>>
+															<<gs 'cum_call' 'face' $sex.npcId 1>>
 															<<actCLA 'Get cleaned up'>>
 																<<set $time.minutes += 7>>
 																<<gs 'cum_cleanup'>>
@@ -691,7 +691,7 @@
 											"We will have to use your bathroom," you tell him and he just waves his hand in the direction of it.
 											<<arouse 'kiss' 3 `['lesbian']`>>
 											<<arousalEnd>>
-											<<gs 'cum_call' 'face' $boy 1>>
+											<<gs 'cum_call' 'face' $sex.npcId 1>>
 											<<actCLA 'Get cleaned up'>>
 												<<set $time.minutes += 7>>
 												<<gs 'cum_cleanup'>>

sugarcube/src/autogenerated/unsorted/kinoM.tw

@@ -99,7 +99,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bj'>>
 	 	<<set $bja += 1>>
-	<<gs 'cum_call' 'mouth_swallow' $boy 1>>
+	<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 	<<setinit $loverrelation[$lover_number] += 2>>
 	<<gs 'brosok'>>
 	<<image "characters/city/boyfriend/sex/event/cinema/sinema1.jpg">>