[Changed] The hunt for spafinloc

locations/Kwlake2.qsrc

@@ -12,15 +12,14 @@ act '"Nah, let''s keep walking"':gt 'Nudelake'
 act '"Alright!"':
 	cla
 	*clr
-	npc_rel['A219'] += 5
+	gs 'npc_relationship', 'modify', 'A219', 'adore'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kwlake2/kwlake2.jpg"></center>'
 	'You smile at Kat''s mysterious look and follow her lead, sitting down near him. Kat immediately pulls you in for a kiss, and slowly rubs your wet slit while the two of you make out.'
 	'The man watches the two of you intently, and you notice a bulge forming in his groin.'
 	'"Look at him!" Kat moans into your mouth between kisses. "Don''t you want him to fuck you, <<$pcs_nickname>>? Because I know I do..."'
 
-	gs 'arousal', 'kiss', 5, 'lesbian'
+	gs 'arousal', 'kiss', -5, 'lesbian'
 	gs 'arousal', 'vaginal_finger', 5, 'lesbian'
-	minut -= 5
 	gs 'stat'
 	
 	gs 'willpower', 'foreplay', 'resist', 'hard'
@@ -37,7 +36,9 @@ act '"Alright!"':
 	act 'Invite the man to join you':
 		cla
 		*clr
-		npc_rel['A219'] += 5
+		gs 'npcgeneratec', 0, 'Unknown guy', rand(18,45)
+		gs 'boyStat', $npclastgenerated
+		gs 'npc_relationship', 'modify', 'A219', 'adore'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kwlake2/kwlake3.jpg"></center>'
 		'When you nod, Kat smiles at you and whispers: "Ask him over, come on!"'
 		'She begins to lick your pussy in plain view of the man, while she keeps encouraging you to invite him.'
@@ -46,8 +47,7 @@ act '"Alright!"':
 		'Kat coos with delight, and rewards you by licking your snatch even more intently.'
 
 		gs 'arousal', 'cuni', 5, 'lesbian'
-		gs 'arousal', 'bj', 5
-		minut -= 5
+		gs 'arousal', 'bj', -5
 		gs 'stat'
 	
 		act 'Continue':
@@ -62,15 +62,12 @@ act '"Alright!"':
 			'You keep licking her cunt and lap up her juices, while this stranger pounds your pussy enthusiastically.'
 
 			gs 'arousal', 'cuni_give', 5, 'lesbian'
-			gs 'arousal', 'vaginal', 5, 'sub', 'rough'
-			minut -= 5
+			gs 'arousal', 'vaginal', -5, 'sub', 'rough'
 			gs 'stat'
 		
 			act 'Continue':
 				cla
 				*clr
-				spafinloc = 12
-				gs 'cum_manage'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kwlake2/kwlake5.jpg"></center>'
 				'When the man is close to his orgasm, he pulls his cock out of you and stands up. As he guides his dick to your mouth, Kat immediately takes his place between your legs and caresses your clit with her tongue.'
 				'You can barely hold yourself from smothering Kat as you ride her face, getting very close to your own orgasm as well. At that moment, the man demands your full attention again shoves his cock back into your mouth. Mere seconds later, he fills your mouth with his sperm while Kat licks you to an amazing orgasm.'
@@ -80,6 +77,7 @@ act '"Alright!"':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'cuni', 5, 'lesbian'
 				gs 'arousal', 'end'
+				gs 'cum_call', 'mouth_swallow', 'Unknown guy'
 				gs 'stat'
 		
 				act 'Finish your walk':gt 'Nudelake'

locations/MEastbed.qsrc

@@ -51,10 +51,7 @@ if $ARGS[0] = 'guestB':
 				*clr & cla
 				gs 'npcgeneratec', 0, 'Dominant man from the Club', rand(18,45)
 				gs 'boyStat', $npclastgenerated
-				sexpartkno = 1
-				sexvolume = 5
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth_swallow', 'Dominant man from the Club'
 				'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/snowball.jpg"></center>'
 				'Seeing you watching them, the couple beckons you over. You obey them and come over and kneel down next to the well dressed woman. She offers the cock to you and you dutifully suck it and soon the two of you are trading it back and forth.'
 				'The man begins to grunt getting close, when he does the woman takes the cock completely to herself no longer sharing, after another minute or so the man cums in her mouth.'

locations/MRear.qsrc

@@ -112,22 +112,20 @@ if $ARGS[0] = 'gEV3':
 	
 	gs 'arousal', 'foreplay', 10, 'sub', 'group'
 	gs 'stat'
-		
+
 	act 'Continue':gt 'MRear', 'gEV4'
 end
 
 if $ARGS[0] = 'gEV4':
 	*clr & cla
 	menu_off = 1
-	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/grup3.mp4"></video></center>'
 	'You let the man go from under you and lie on your back. All of the men surround you and you do all you can to please them with your mouth and hands.'
 	'Unseen hands rub your pussy and you start to feel the familiar sense of bliss, soon overtaken by a need to be filled.'
 	
 	gs 'arousal', 'bj', 10, 'sub', 'group'
-	gs 'arousal', 'hj', 10, 'sub', 'group'
+	gs 'arousal', 'hj', -10, 'sub', 'group'
 	gs 'arousal', 'vaginal_finger', 10, 'sub', 'group'
-	minut -= 10
 	gs 'stat'
 	
 	act 'Continue':gt 'MRear', 'gEV5'
@@ -163,8 +161,7 @@ end
 if $ARGS[0] = 'gEV7':
 	*clr & cla
 	menu_off = 1
-	spafinloc = 11
-	gs 'cum_manage'
+	gs 'cum_call', 'face', 'Old Man'
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/grup6.mp4"></video></center>'
 	'Experience tells you that they are close to finishing and you lie back and tell them to finish on your face.'
@@ -178,34 +175,22 @@ if $ARGS[0] = 'gEV8':
 	menu_off = 1
 	gs 'npcgeneratec', 0, 'Old Man', rand(55,75)
 	gs 'boyStat', $npclastgenerated
-	sexpartkno = 1
-	spafinloc = 11
-	gs 'cum_manage'
+	gs 'cum_call', 'face', 'Old Man'
 	gs 'npcgeneratec', 0, 'Old Man', rand(55,75)
 	gs 'boyStat', $npclastgenerated
-	sexpartkno = 1
-	spafinloc = 11
-	gs 'cum_manage'
+	gs 'cum_call', 'face', 'Old Man'
 	gs 'npcgeneratec', 0, 'Old Man', rand(55,75)
 	gs 'boyStat', $npclastgenerated
-	sexpartkno = 1
-	spafinloc = 11
-	gs 'cum_manage'
+	gs 'cum_call', 'face', 'Old Man'
 	gs 'npcgeneratec', 0, 'Old Man', rand(55,75)
 	gs 'boyStat', $npclastgenerated
-	sexpartkno = 1
-	spafinloc = 11
-	gs 'cum_manage'
+	gs 'cum_call', 'face', 'Old Man'
 	gs 'npcgeneratec', 0, 'Old Man', rand(55,75)
 	gs 'boyStat', $npclastgenerated
-	sexpartkno = 1
-	spafinloc = 11
-	gs 'cum_manage'
+	gs 'cum_call', 'face', 'Old Man'
 	gs 'npcgeneratec', 0, 'Old Man', rand(55,75)
 	gs 'boyStat', $npclastgenerated
-	sexpartkno = 1
-	spafinloc = 11
-	gs 'cum_manage'
+	gs 'cum_call', 'face', 'Old Man'
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/grup7.mp4"></video></center>'
 	'You remain in position lending a helping hand were needed and take another 6 cumshots to your face.'

locations/Military.qsrc

@@ -259,16 +259,13 @@ if $ARGS[0] = 'rape':
 				act 'Continue':
 					cla
 					*clr
-					sexpartkno = 1
-					spafinloc = 12
-					gs 'cum_manage'
 					pcs_makeup = 0
 					minut += 240
-					SUB += 5
 					'<center><img <<$set_imgh>> src="images/locations/city/shared/military/sex/rape5.jpg"></center>'
 					'You do not know how much time passed since you fainted, but when you regain your concoiusness he''s pulling out of you. He pulls you to your knees and stuck his dick in your mouth, saying only a word, "Suck". You dutifully start to suck him off with your ass is brutally raped and in pain, wondering whether to bite it off, but before you could give it a second thought your rapist suddenly comes in your mouth. After this you are immediately knocked out again with a blow to your head.'
 
 					gs 'arousal', 'end'
+					gs 'cum_call', 'mouth', 'rapist'
 					gs 'stat'
 					
 					act 'Continue':gt 'military', 'start'

locations/Vnlake2.qsrc

@@ -50,8 +50,7 @@ act 'Touch member':
 			act 'Take your seat':
 				cla
 				*clr
-				spafinloc = 4
-				gs 'cum_manage'
+				gs 'cum_call', 'butt', $boy1
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake5.jpg"></center>'
 				'You get up, turn around and sit your ass down on his member. The other man stands next to your face, and you eagerly take his cock in your mouth. Soon, you feel that your ass has been flooded with sperm and the dick in your mouth is twitching as the guy struggles to hold back.'
 				gs 'arousal', 'anal', 5, 'group'
@@ -63,8 +62,7 @@ act 'Touch member':
 					cla
 					*clr
 					gs 'boyStat', $boy1
-					spafinloc = 11
-					gs 'cum_manage'
+					gs 'cum_call', '', $boy1
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake6.jpg"></center>'
 					'You spit the dick out of your mouth, and the man splatters your face with his load.'
 					gs 'arousal', 'end'

locations/ender.qsrc

@@ -133,14 +133,6 @@ if $ARGS[0] = 'loss':
 		guy += 1
 		gs 'npcgeneratec', 0, 'rapist', rand(19,45)
 		gs 'boyStat', $npclastgenerated
-		cumprecheck = 1
-		gs 'cum_manage'
-		spafinloc = 1
-		sexvolume = 30
-		gs 'cum_manage'
-		spafinloc = 14
-		sexvolume = 10
-		gs 'cum_manage'
 		if pcs_mood > 20: pcs_mood -= 20
 		rape += 1
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
@@ -915,14 +907,6 @@ if $ARGS[0] = 'surrender':
 		guy += 1
 		gs 'npcgeneratec', 0, 'rapist', rand(19,45)
 		gs 'boyStat', $npclastgenerated
-		cumprecheck = 1
-		gs 'cum_manage'
-		spafinloc = 1
-		sexvolume = 30
-		gs 'cum_manage'
-		spafinloc = 14
-		sexvolume = 10
-		gs 'cum_manage'
 		if pcs_mood > 20: pcs_mood -= 20
 		rape += 1
 
@@ -944,6 +928,7 @@ if $ARGS[0] = 'surrender':
 
 		gs 'arousal', 'vaginal', 20, 'rough', 'rape'
 		gs 'arousal', 'end'
+		gs 'cum_call','', 'rapist'
 		gs 'stat'
 
 		act 'Cry': gt $loc, $loc_arg

locations/fathersex.qsrc

@@ -35,9 +35,7 @@ if $ARGS[0] = 'fatherblow3':
 	act 'He cums in your mouth':
 		*clr & cla
 		gs 'boyStat', 'A28'
-		sexpartkno = 1
-		spafinloc = 12
-		gs 'cum_manage'
+		gs 'cum_call', 'mouth_swallow', 'A28', 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim15.jpg"></center>'
 		'As he roughly fucks your throat, you can tell he''s getting close. Suddenly, he pulls his cock out. "<<$pcs_nickname>> baby, stick out your tongue" he orders, and mere seconds later you feel jets of cum hitting your face. Some land on your tongue, some end up in your mouth. You swallow it all willingly, licking your lips and gently sucking the tip of his cock for a while until he tells you to stop.'
 		gs 'arousal', 'end'
@@ -125,9 +123,7 @@ if $ARGS[0] = 'fathergotobedroom':
 			act 'Cum on my ass cheeks':
 				*clr & cla
 				gs 'boyStat', 'A28'
-				sexpartkno = 1
-				spafinloc = 4
-				gs 'cum_manage'
+				gs 'cum_call', 'butt', 'A28', 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim5.jpg"></center>'
 				'Respecting your wishes, your stepfather pulls his rod out of your sphincter and shoots his load on your ass cheeks, moaning loudly. After a few moments, he regains his composure and slaps your ass playfully. "That was fun <<$pcs_nickname>>, we should do it again some time."'
 				gs 'arousal', 'end'
@@ -137,9 +133,7 @@ if $ARGS[0] = 'fathergotobedroom':
 			act 'Cum all over my face':
 				*clr & cla
 				gs 'boyStat', 'A28'
-				sexpartkno = 1
-				spafinloc = 11
-				gs 'cum_manage'
+				gs 'cum_call', 'face', 'A28', 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim12.jpg"></center>'
 				'Your request only excites him even further. After a few furious thrusts he pulls out, pushes you on your back and begins to jerk off over your face. You feel the warm strands of cum landing on your face and you stick out your tongue to catch some of it. He takes a second to admire his artwork and then goes to clean himself up, leaving you alone in the room.'
 				gs 'arousal', 'end'
@@ -165,9 +159,7 @@ if $ARGS[0] = 'fathersex_act1':
 	fathercum = rand(1,2)
 	if fathercum = 1:
 		gs 'boyStat', 'A28'
-		sexpartkno = 1
-		spafinloc = 3
-		gs 'cum_manage'
+		gs 'cum_call', 'anus', 'A28', 1
 		'The thrusting of your stepfather becomes more erratic and intense and suddenly you feel him bucking against you, his cock throbbing heavily inside you. You feel a pleasant warmth spreading. When he moves away from you and crashes down next to you on the bed, he tells you what a great buttslut you are with a satisfied grin on his face.'
 		gs 'stat'
 		act 'Wink and get off the bed':gt $loc, $loc_arg
@@ -179,9 +171,7 @@ if $ARGS[0] = 'fathersex_act1':
 			act 'Daddy fill my ass!!!':
 				*clr & cla
 				gs 'boyStat', 'A28'
-				sexpartkno = 1
-				spafinloc = 3
-				gs 'cum_manage'
+				gs 'cum_call', 'anus', 'A28', 1
 				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampieA<<rand(1,2)>>.mp4" ></video></center>'
 				gs 'arousal', 'anal', 10, 'sub', 'incest'
 				gs 'stat'
@@ -205,9 +195,7 @@ if $ARGS[0] = 'fathersex_act1':
 							act 'Cum...':
 								*clr & cla
 								gs 'boyStat', 'A28'
-								sexpartkno = 1
-								spafinloc = 0
-								gs 'cum_manage'
+								gs 'cum_call', '', 'A28', 1
 								'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_cowgirl.mp4"></video></center>'
 								$orgasm_or = 'yes'
 								gs 'cuminsidereact'
@@ -217,11 +205,8 @@ if $ARGS[0] = 'fathersex_act1':
 								act 'More... Cum together':
 									*clr & cla
 									gs 'boyStat', 'A28'
-									sexpartkno = 1
-									spafinloc = 0
-									gs 'cum_manage'
+									gs 'cum_call', '', 'A28', 1
 									if pcs_horny >= 100:
-										gs 'cum_manage'
 										'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
 										'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
 										$orgasm_or = 'yes'
@@ -249,9 +234,7 @@ if $ARGS[0] = 'fathersex_act1':
 										end
 									else
 										gs 'boyStat', 'A28'
-										sexpartkno = 1
-										spafinloc = 0
-										gs 'cum_manage'
+										gs 'cum_call', '', 'A28', 1
 										'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
 										'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
 										$orgasm_or = 'yes'
@@ -274,9 +257,7 @@ if $ARGS[0] = 'fathersex_act1':
 												act 'daddy wants more':
 													*clr & cla
 													gs 'boyStat', 'A28'
-													sexpartkno = 1
-													spafinloc = 0
-													gs 'cum_manage'
+													gs 'cum_call', '', 'A28', 1
 													'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex6.mp4"></video></center>'
 													'Your dad presses you against the wall and starts pounding your pussy, thrusting his throbbing cock deep inside you.'
 													gs 'arousal', 'vaginal', 5, 'sub', 'rough'
@@ -296,9 +277,7 @@ if $ARGS[0] = 'fathersex_act1':
 															act 'Climax':
 																*clr & cla
 																gs 'boyStat', 'A28'
-																sexpartkno = 1
-																spafinloc = 0
-																gs 'cum_manage'
+																gs 'cum_call', '', 'A28', 1
 																'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/cumvaginal1.mp4"></video></center>'
 																'With his cock deep inside you and between his moans and cum pumping deep inside you. your dad looks at you and says... "i love you <<$pcs_nickname>>."'
 																$orgasm_or = 'yes'
@@ -345,9 +324,7 @@ if $ARGS[0] = 'fathersex_act1':
 							act 'Cum...':
 								*clr & cla
 								gs 'boyStat', 'A28'
-								sexpartkno = 1
-								spafinloc = 0
-								gs 'cum_manage'
+								gs 'cum_call', '', 'A28', 1
 								'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_cowgirl.mp4"></video></center>'
 								$orgasm_or = 'yes'
 								gs 'cuminsidereact'
@@ -357,11 +334,8 @@ if $ARGS[0] = 'fathersex_act1':
 								act 'More... Cum together':
 									*clr & cla
 									gs 'boyStat', 'A28'
-									sexpartkno = 1
-									spafinloc = 0
-									gs 'cum_manage'
+									gs 'cum_call', '', 'A28', 1
 									if pcs_horny >= 100:
-										gs 'cum_manage'
 										'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
 										'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
 										$orgasm_or = 'yes'
@@ -389,9 +363,7 @@ if $ARGS[0] = 'fathersex_act1':
 										end
 									else
 										gs 'boyStat', 'A28'
-										sexpartkno = 1
-										spafinloc = 0
-										gs 'cum_manage'
+										gs 'cum_call', '', 'A28', 1
 										'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
 										'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
 										$orgasm_or = 'yes'
@@ -414,9 +386,7 @@ if $ARGS[0] = 'fathersex_act1':
 												act 'daddy wants more':
 													*clr & cla
 													gs 'boyStat', 'A28'
-													sexpartkno = 1
-													spafinloc = 0
-													gs 'cum_manage'
+													gs 'cum_call', '', 'A28', 1
 													'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex6.mp4"></video></center>'
 													'Your dad presses you against the wall and starts pounding your pussy, thrusting his throbbing cock deep inside you.'
 													gs 'arousal', 'vaginal', 5, 'sub', 'rough'
@@ -436,9 +406,7 @@ if $ARGS[0] = 'fathersex_act1':
 															act 'Climax':
 																*clr & cla
 																gs 'boyStat', 'A28'
-																sexpartkno = 1
-																spafinloc = 0
-																gs 'cum_manage'
+																gs 'cum_call', '', 'A28', 1
 																'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/cumvaginal1.mp4"></video></center>'
 																'With his cock deep inside you and between his moans and cum pumping deep inside you. your dad looks at you and says... "i love you <<$pcs_nickname>>."'
 																$orgasm_or = 'yes'
@@ -484,9 +452,7 @@ if $ARGS[0] = 'fathersex_act1':
 							act 'Cum...':
 								*clr & cla
 								gs 'boyStat', 'A28'
-								sexpartkno = 1
-								spafinloc = 3
-								gs 'cum_manage'
+								gs 'cum_call', 'anus', 'A28', 1
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim5_2.jpg"></center>'
 								$orgasm_or = 'yes'
 								'You suddenly feel an intense warmth spreading inside you. Your stepfather pulls out his cock, and a slow trail of his cum slowly drips out of you.'
@@ -499,11 +465,8 @@ if $ARGS[0] = 'fathersex_act1':
 								act 'More... Pounding':
 									*clr & cla
 									gs 'boyStat', 'A28'
-									sexpartkno = 1
-									spafinloc = 3
-									gs 'cum_manage'
+									gs 'cum_call', 'anus', 'A28', 1
 									if pcs_horny >= 100:
-										gs 'cum_manage'
 										'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim5.mp4"></video></center>'
 										'For several minutes he pounds your ass. As your pleasure mounts, you feel yourself close to climax, clenching your sphincter around him to keep him deep inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
 										$orgasm_or = 'yes'
@@ -513,7 +476,6 @@ if $ARGS[0] = 'fathersex_act1':
 										act 'Stand up':gt $loc, $loc_arg
 										act 'Clean him up with your lips':
 											*clr & cla
-											gs 'stat'
 											'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
 											'Overcome with desire, you rub his cock against your lips, looking up at him as you tease his cock. "Let me clean that for you, Daddy" you say with a cute smile.'
 											gs 'arousal', 'bj', 2, 'sub'
@@ -530,9 +492,7 @@ if $ARGS[0] = 'fathersex_act1':
 										end
 									else
 										gs 'boyStat', 'A28'
-										sexpartkno = 1
-										spafinloc = 3
-										gs 'cum_manage'
+										gs 'cum_call', 'anus', 'A28', 1
 										'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim5.mp4"></video></center>'
 										'For several minutes he pounds your asshole. As your pleasure mounts, you feel yourself close to climax, clenching your sphincter around him to keep him deep inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
 										$orgasm_or = 'yes'
@@ -589,9 +549,7 @@ if $ARGS[0] = 'fathersex_act2':
 		fathercum = rand(1,2)
 		if fathercum = 1:
 			gs 'boyStat', 'A28'
-			sexpartkno = 1
-			spafinloc = 3
-			gs 'cum_manage'
+			gs 'cum_call', 'anus', 'A28', 1
 			'As your mind tries to process all the sensations, you suddenly feel an intense warmth spreading inside you. Your stepfather pulls out his cock, and a slow trail of his cum slowly drips out of you and onto the carpet. Apparently the feelings of your tight ass milking his cock were too much for him to be able to hold out any longer. You slightly regret not getting to orgasm yourself, but then realize your teasing is what got him into this riled up state in the first place, and can''t really blame him. You would feel awkward asking him to finish you off after he has already had his fun, and just suffer in silence. He gets back up on his feet and looks down at your sprawled position on the floor. Your legs are all wobbly when you try to stand up and he helps you, but then has another request in return: "Show me your asshole, <<$pcs_nickname>>."'
 			act 'You show him your used ass':
 				*clr & cla
@@ -607,9 +565,7 @@ if $ARGS[0] = 'fathersex_act2':
 			act 'Take his load on your face':
 				*clr & cla
 				gs 'boyStat', 'A28'
-				sexpartkno = 1
-				spafinloc = 11
-				gs 'cum_manage'
+				gs 'cum_call', 'face', 'A28', 1
 				pcs_horny = 0
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim7.jpg"></center>'
 				'You slide off of his cock and quickly grab it with your hand to finish him off. You place your other hand on your pussy and rub your clit furiously as you masturbate him. Right when you feel your own orgasm wash over you, jets of cum hit your face. After your orgasm, you fall down on the floor and need a bit to collect yourself. Your stepfather playfully squeezes your ass cheeks with a nod of approval and then goes to the bathroom to clean up, leaving you alone in the room.'

locations/kino.qsrc

@@ -95,12 +95,11 @@ if $ARGS[0] = 'sex':
 
 	act 'Keep sucking':
 		cla
-		spafinloc = 12
-		gs 'cum_manage'
 		'You continue suck until, your mouth is filled with his liquid warmth'
 		
 		gs 'arousal', 'cuni', 10, 'sub'
-		gs 'arousal', 'end'		
+		gs 'arousal', 'end'
+		gs 'cum_call', 'mouth', 'guy from the cinema'
 	    gs 'stat'
 
 		act 'Leave':gt 'kino'
@@ -109,7 +108,6 @@ if $ARGS[0] = 'sex':
 	act 'Tell him to fuck you':
 		cla
 		*clr
-		gs 'cum_manage'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/sex/kino4.jpg"></center>'
 		'Stopping before he pops, you get up on the chair and wiggle your ass invitingly.'
 		'"Oh, you''re going to get now", he boasts.'
@@ -117,6 +115,7 @@ if $ARGS[0] = 'sex':
 		
 		gs 'arousal', 'vaginal', 10, 'sub', 'exhibitionism'
 		gs 'arousal', 'end'
+		gs 'cum_call', '', 'guy from the cinema'
 		gs 'stat'
 		
 		act 'Leave unsatisfied':gt 'kino'
@@ -205,13 +204,11 @@ if $ARGS[0] = 'sex2':
 								
 								act 'Oh, Shit':
 									cls
-									spafinloc = 0
-									gs 'cum_manage'
-									gs'stat'
 									'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/sex/kinosex9.jpg"></center>'
 									'Somebody must''ve told an usher what was going on. "What the hell do you think you''re doing? I''m going to call the police," he says.'
 									'You hurriedly start gathering up your clothes, before he can act. Feeling a little thrill from being discovered like this, you make your escape.'
 									gs 'arousal', 'end'
+									gs 'cum_call', '', 'guy from the cinema'
 									gs 'stat'
 									
 									act 'Flee' :gt 'kino'
@@ -227,15 +224,12 @@ end
 
 if $ARGS[0] = 'kinoswallow':
 	cls
-	spafinloc = 12
-	swallow += 1
-	gs 'cum_manage'
-	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/sex/kinosex10.jpg"></center>'
 	'Still a little worried about being discovered, you make an effort to finish him off.'
 	'A short time later, your efforts are rewarded, when a warm bust of semen fills your mouth.'
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'arousal', 'end'
+	gs 'cum_call', 'mouth_swallow', 'guy from the cinema'
 	gs 'stat'
 	
 	act 'Leave':gt 'kino'

locations/kiosk.qsrc

@@ -68,8 +68,7 @@ if $ARGS[0] = 'start':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/cumface' + rand(1,23) + '.jpg"></center>'
 						'The man cums on your face.'
-						spafinloc = 11
-						gs 'cum_manage'
+						gs 'cum_call', 'face', 'stranger from the post office'
 
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -81,8 +80,7 @@ if $ARGS[0] = 'start':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/cumlip.jpg"></center>'
 						'The man cums inside your mouth.'
-						spafinloc = 12
-						gs 'cum_manage'
+						gs 'cum_call', 'mouth', 'stranger from the post office'
 
 						gs 'arousal', 'end'
 						gs 'stat'

locations/kisameQW.qsrc

@@ -25,10 +25,8 @@ if $ARGS[0] = 'start':
 			pcs_mood += 5
 			guy += 1
 			pcs_vag += 1
-			spafinloc = 0
 			sexpartkno = 1
 			gs 'boyStat', 'A40'
-			gs 'cum_manage'
 
 			if KisameSex = 0:KisameSex = 1 & guy += 1
 
@@ -40,6 +38,8 @@ if $ARGS[0] = 'start':
 
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 20, 'sub', 'rough'
+			gs 'arousal', 'end'
+			gs 'cum_call', '', 'A40', 1
 			gs 'stat'
 			
 			act 'Further':gt 'kisameQW', 'after'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'after':
 	'<center><img <<$set_imgh>> src="images/characters/city/kisame/kisamev.jpg"></center>'
 	'Lightening fast, Kisame transforms into a shark hybrid. He smiles and says, "Thank you baby." With these words he slaps you on the ass and goes to the men''s locker room.'
 
-	act 'Find a swimsuit and go to the locker room':gt 'bass', 'start'
+	act 'Find your swimsuit and go to the locker room':gt 'bass', 'start'
 end
 
 --- kisameQW ---------------------------------

locations/lesbimistress.qsrc

@@ -2095,8 +2095,7 @@ if $ARGS[0] = 'mistmeet':
 							*clr
 							mistmeets = 1
 							gs 'boyStat', 'A128'
-							cumprecheck = 1 & gs 'cum_manage'
-							spafinloc = 11 & gs 'cum_manage'
+							gs 'cum_call', 'mouth_swallow', 'A128'
 							money = 0
 							pose = 1
 							gs'stat'
@@ -2121,8 +2120,9 @@ if $ARGS[0] = 'mistmeet':
 							cla
 							*clr
 							mistmeets = 1
-							gs 'boyStat', 'A160' & spafinloc = 12 & gs 'cum_manage'
+							gs 'boyStat', 'A160'
 							money = 0
+							gs 'cum_call', 'mouth_swallow', 'A160'
 							gs'stat'
 							
 							'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/mistmeet6.jpg"></center>'

locations/masharoom.qsrc

@@ -438,6 +438,8 @@ if $ARGS[0] = '1':
 		act 'Call him':
 			cla
 			*clr
+			gs 'npcgeneratec', 0, 'Unknown peeper', rand(18,45)
+			gs 'boyStat', $npclastgenerated
 			'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r5.jpg"></center>'
 			'"Hey, you want to come have a lick?" you asked looking at the door. It was quiet for a few seconds, but soon the door creaked, it was a nerdy college boy, he stood on the verge of not knowing what to do.'
 			'"Well do you want to lick my pussy or would you rather stand there and just watch? As a bonus if you lick me really good, I will jerk you off." you said, looking at him with a satisfied smile.'
@@ -464,6 +466,7 @@ if $ARGS[0] = '1':
 
 					gs 'arousal', 'vaginal', 10, 'dom'
 					gs 'arousal', 'end'
+					gs 'cum_call', '', 'Unknown peeper'
 					gs 'stat'
 
 					act 'Finish':gt 'masharoom', 'start'
@@ -493,13 +496,12 @@ if $ARGS[0] = '1':
 				act 'Blow him':
 					cla
 					*clr
-					spafinloc = 12
-					gs 'cum_manage'
 					'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r10.jpg"></center>'
 					'You turn around, still straddling his face and bend over till you can take his cock in your mouth. You barely even have time to stroke his cock with your lips a couple of times when you feel his hot cum spurting into your mouth. You pull your head away and spit the cum out on his stomach and get off. "Get out!" He quickly grabs his pants and rushes out.'
 
 					gs 'arousal', 'bj', 10, 'dom'
 					gs 'arousal', 'end'
+					gs 'cum_call', 'mouth', 'Unknown peeper'
 					gs 'stat'
 
 					act 'Finish':gt 'masharoom', 'start'
@@ -514,6 +516,8 @@ if $ARGS[0] = '1':
 
 					gs 'arousal', 'vaginal', 10, 'dom'
 					gs 'arousal', 'end'
+					gs 'cum_call', 'labia', 'Unknown peeper'
+					gs 'cum_call', '', 'Unknown peeper'
 					gs 'stat'
 
 					act 'Finish':gt 'masharoom', 'start'
@@ -522,14 +526,12 @@ if $ARGS[0] = '1':
 				act 'Jerk him off':
 					cla
 					*clr
-					spafinloc = 12
-					gs 'cum_manage'
-					spafinloc = 11
 					'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r12.jpg"></center>'
 					'You get off him and take his cock in your hand and start to jerk him off, it only takes a couple of jerks and he is cumming all over your hand and himself. Wiping your hand off on him, you point at the door. "Get the fuck out." He quickly grabs his pants and runs out of the room.'
 
 					gs 'arousal', 'hj', 10, 'dom'
 					gs 'arousal', 'end'
+					gs 'cum_call', 'hands', 'Unknown peeper'
 					gs 'stat'
 
 					act 'Finish':gt 'masharoom', 'start'
@@ -547,14 +549,12 @@ if $ARGS[0] = '1':
 					act 'Further':
 						cla
 						*clr
-						spafinloc = 12
-                        gs 'cum_manage'
-						spafinloc = 11
-                        gs 'cum_manage'
 						'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r14.jpg"></center>'
 						'You tried to pull away from him, but it was too late his cock spurted semen jet quite powerful and sperm manages to hit you in the face around your mouth and he keeps cumming, it gets all over your breasts, face, hands and even on his own stomach. Once he stops cumming you point at the door. "Get the fuck out." He quickly grabs his pants and runs out of the room.'
 						
 						gs 'arousal', 'end'
+						gs 'cum_call', 'breasts', 'Unknown peeper'
+						gs 'cum_call', 'face', 'Unknown peeper'
 						gs 'stat'
 			
 						act 'Finish':gt 'masharoom', 'start'
@@ -570,7 +570,8 @@ if $ARGS[0] = '2':
 	*clr
 	guy += 1
 	menu_off = 1
-	gs 'stat'
+	gs 'npcgeneratec', 0, 'Unknown dom', rand(18,45)
+	gs 'boyStat', $npclastgenerated
 	'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r20.jpg"></center>'
 	'Trying another outfit with leather hand cuffs you click them into place and together and you hear them click. You thought they just snapped and unsnapped together but as you try and pull the fasteners apart they won''t unclick. You frantically began trying to break free so you didn''t notice the man walking in as you were trying to undo the cuffs, only when he clipped the leash on the collar you were wearing. At first you were happy, thinking Masha had returned, but as you turn around you see he has a hard look in his eye and holding a wooden paddle in his hand. "I see you got all dressed up and ready for me, now let''s play." He says in a menacing tone.'
 	'"Please help me take this off." showing him your cuffed hands as you beg him to take them off. "Shut up bitch, a slave should not speak without permission of the owner, get on your knees and open your mouth, quickly." he shouted.'
@@ -593,12 +594,11 @@ if $ARGS[0] = '2':
 
 		act 'Tolerate':
 			cla
-			spafinloc = 3
-			gs 'cum_manage'
 			'Not knowing what else to do, you do your best to tolerate his rough dry fucking of your ass. Since true to his word every time you said anything or resisted he just made it worse. So you silently cry as he dry fucks your ass, what little lubricant there was from his spit is long gone. He fucks you for a long time, so long that your sobs no longer have tears, you have long since used up all your tears, yet a small part of if you is loving it, despite all the pain. What felt like hours later he finally shots his load deep in your ass. You feel the hot spurts of his cum filling you up. "Next time do as you''re told you submissive bitch or it will be a lot worse, either I or someone else will teach you a lesson that will make you remember this fondly. I''ll make sure to tell the others your down here." He said with a laugh and then left, he didn''t even undo the cuffs. You limp over to the door and close it in case he was serious about sending down more men. It takes you a bit to finally get yourself lose.'
 
 			gs 'arousal', 'anal', 10, 'sub', 'bound', 'rough'
 			gs 'arousal', 'end'
+			gs 'cum_call', 'anus', 'Unknown dom'
 			gs 'stat'
 
 			act 'Finish':gt 'masharoom', 'start'
@@ -607,17 +607,13 @@ if $ARGS[0] = '2':
 		act 'Ask for release':
 			cla
 			*clr
-			spafinloc = 12
-			gs 'cum_manage'
-			spafinloc = 11
-			gs 'cum_manage'
-			spank += 1
-			swallow += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r22.jpg"></center>'
 			'"Please enough, let me go" you cried. "There''s no way you''ll understand your place, if you keep using that mouth to talk." With that he pulled out of your ass and relief flood you, hoping he is planning on releasing you, you hear him walking around. Then you feel a sharp pain on your ass, as he smacks you with the paddle hard again. You open your mouth to cry out, only to have his cock shoved in your mouth. You can taste your own ass still on his cock, he pulls the leash tight so you have no choice but to suck his dick. He fucks your mouth and throat, jamming his cock balls deep into your mouth and down your throat, making you gag. The whole while he keeps spanking your with the paddle, leaving your ass cherry red as tears stream down your face. Some time later he stops with his cock jammed down your throat and he cums directly into your throat, leaving you no choice but to swallow his load. "Next time do as you''re told you submissive bitch or it will be a lot worse, either I or someone else will teach you a lesson that will make you remember this fondly. I''ll make sure to tell the others your down here." He said with a laugh and then left, he didn''t even undo the cuffs. You limp over to the door and close it in case he was serious about sending down more men. It takes you a bit to finally get yourself lose.'
 
 			gs 'arousal', 'bj', 5, 'sub', 'rough', 'deepthroat'
 			gs 'arousal', 'end'
+			gs 'cum_call', 'face', 'Unknown dom'
+			gs 'cum_call', 'mouth_swallow', 'Unknown dom'
 			gs 'stat'
 
 			act 'Finish':gt 'masharoom', 'start'
@@ -627,14 +623,12 @@ if $ARGS[0] = '2':
 	act 'Submit':
 		cla
 		*clr
-		swallow += 1
-		spafinloc = 12
-		gs 'cum_manage'
 		'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r23.jpg"></center>'
 		'You obediently knelt and opened your mouth. He put a blindfold on you and soon you felt his cock pressed against your lips. You open your mouth and start sucking his dick. Several minutes later you feel his cock pulsing and then feel the hot jet of sperm shooting into your mouth. Several spurts of seman fills your mouth up, you immediately swallowed it and continued to suck his dick until you feel it start to go soft.'
 		'"Good bitch, that''s a good slave, and now lie on the couch, " he said.'
 
 		gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
+		gs 'cum_call', 'mouth_swallow', 'Unknown dom'
 		gs 'stat'
 
 		act 'Submit':
@@ -655,20 +649,17 @@ if $ARGS[0] = '2':
 
 				$orgasm_or = 'yes'
 				gs 'arousal', 'anal_finger', 5, 'sub'
-				gs 'arousal', 'anal', 5, 'sub', 'rough'
-				minut -= 5
+				gs 'arousal', 'anal', -5, 'sub', 'rough'
 				gs 'stat'
 
 				act 'Open mouth':
 					cla
 					*clr
-					spafinloc = 12
-					gs 'cum_manage'
-					swallow += 1
 					'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r26.jpg"></center>'
 					'You opened your mouth and the remnants of sperm poured into it. Not waiting for you to swallow he sticks his dick in your mouth and makes you suck him clean, his dick tastes like your ass, but you suck him clean. Once you are finished he undoes the cuffs, puts his pants on and walks out, closing the door behind him with out another word.'
 
 					gs 'arousal', 'end'
+					gs 'cum_call', 'mouth_swallow', 'Unknown dom'
 					gs 'stat'
 			
 					act 'Finish':gt 'masharoom', 'start'

locations/nichNicholas.qsrc

@@ -159,12 +159,11 @@ elseif $ARGS[0] = 'sex':
 	else
 		if $ARGS[1] = 'bj':
 			'He groans loudly, and you feel his hard cock erupting in your mouth. You swallow it obediently, figuring that is what he wants you to do.'
-			spafinloc = 12
+			gs 'cum_call', 'mouth_swallow', 'A52', 1
 		elseif $ARGS[1] = 'anal':
 			'He groans loudly, spraying his seed deep inside your ass.'
-			spafinloc = 3
+			gs 'cum_call', 'anus', 'A52', 1
 		end
-		gs 'cum_manage'
 		gs 'arousal', 'end'
 		gs 'stat'
 

locations/police.qsrc

@@ -29,11 +29,9 @@ if $ARGS[0] = '1':
 			cla & *clr
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
-			spafinloc = 3
-			gs 'cum_manage'
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/police/sex/a2.jpg"></center>'
 			'"I don''t know what you''re talking about", you declare with a stern face, even though it''s obvious you''re lying.'
-			'"Then you''re an idiot. Do you have any idea what happens with pretty girls like you in prison?" she says, and forces you to your knees. "Being some butch chick''s prison bitch, licking her pissy hole every day? If the guards don''t get a turn, too..."'
+			'"Then you''re an idiot. Do you have any idea what happens with pretty girls like you in prison?" she says, and forces you to your knees. "Being some butch chick''s prison bitch, licking her pussy hole every day? If the guards don''t get a turn, too..."'
 			'Without any warning, she grabs your hair and forces your face against her groin, rubbing your mouth against her pussy lips repeatedly.'
 			'When she sees you wince, she growls: "You think that''s bad, bitch? My pussy is clearly clean, and neatly groomed! What do you they''ll look like in prison? Hairy, dirty, haven''t been washed in weeks... if you think mine is bad, I washed it a few hours ago!"'
 			'You can''t object that the picture she''s painting sounds bad but then again, what would happen if you confess? The prospect of being raped by a dozen Gopniks and then left for dead in a ditch scares you even more!'
@@ -49,6 +47,8 @@ if $ARGS[0] = '1':
 			act 'Refuse':
 				cla
 				*clr
+				gs 'npcgeneratec', 0, 'Police Officer', rand(25,35)
+				gs 'boyStat', $npclastgenerated
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/police/sex/a3.jpg"></center>'
 				'When you refuse again, she angrily swoops all the items off the desk. "Take off your clothes, scum", she hisses as she unlocks your cuffs off and threatens to beat you with her baton.'
 				'Once you''re naked, she cuffs you again and orders you to lie down on the table, undressing as well. After taking her clothes off, she climbs on top of you and sits on your face, forcing you to lick her.'
@@ -64,10 +64,10 @@ if $ARGS[0] = '1':
 				'"Wait, I''m not done yet", the man says. The two of them force you back down on the desk and he thrusts his cock roughly inside you again, insulted by your comment on his size. He pounds his hips against yours furiously, and finally cums in your ass a few minutes later.'
 				'After he straightens his clothes, he undoes your handcuffs and lets you get dressed again. At that point the girl turns off the camera - it turns out that she let it run the whole time!'
 
-				gs 'arousal', 'cuni_give', 30, 'lesbian', 'rough', 'bound'
+				gs 'arousal', 'cuni_give', -30, 'lesbian', 'rough', 'bound'
 				gs 'arousal', 'anal', 30, 'rough'
-				minut -= 30
 				gs 'arousal', 'end'
+				gs 'cum_call', 'anus', 'Police Officer'
 				gs 'stat'
 			
 				act 'Be brought to a prison cell':gt 'kamera'

locations/post_deliveries.qsrc

@@ -1260,7 +1260,7 @@ if $ARGS[0] = 'bandsex':
 					'After a few minutes of uncomfortable throat fucking he finally shoots his load down your throat, and grins at you: "You''re even better than the last Postslut! I''m already looking forward to next week..."'
 					gs 'arousal', 'bj', 10, 'sub'
 					gs 'arousal', 'end'
-					gs 'cum_call', 'mouth_swallow', $boy
+					gs 'cum_call', 'mouth_swallow', 'A105'
 					gs 'stat'
 					'While you get dressed again, you overhear the two guys talking. One voice says: "Wha- she did what!? She refused to blow me, and only gave me a handjob! That bitch... is she still here?"'
 					act 'Leave quickly':
@@ -1288,7 +1288,7 @@ if $ARGS[0] = 'bandsex':
 			'You kneel down before him and begin to suck the head of his cock. Within the minute, you feel several jets of his bittery sperm landing in your mouth. He didn''t give you any warning, and you recoil a bit from the sudden sharp taste in your mouth.'
 			gs 'arousal', 'bj', 10, 'sub'
 			gs 'arousal', 'end'
-			gs 'cum_call', 'mouth', $boy
+			gs 'cum_call', 'mouth', 'A104'
 			gs 'stat'
 			'"Hah, you''re a natural!" he groans, slowly recovering from his orgasm. "Quick and efficient. Not bad! Could be better, but... we''ll work on that next time."'
 			'He waves you off, his attention focused on the TV now. As far as he''s concerned, you''re no longer there.'
@@ -1312,7 +1312,7 @@ if $ARGS[0] = 'bandsex':
 				'Finally he dumps his load all over your face, and he grins at you: "You''re even more eager than the last Postslut! We''re going to have a lot of fun with you..."'
 				gs 'arousal', 'bj', 10, 'sub'
 				gs 'arousal', 'end'
-				gs 'cum_call', 'face', $boy
+				gs 'cum_call', 'face', 'A105'
 				gs 'stat'
 				'While you get dressed again, you overhear the two guys talking. One of them says: "Wha... she did you too!? I told her she could leave! Maybe she enjoys this a lot more than we thought?"'
 				act 'Continue your round':
@@ -1388,12 +1388,10 @@ if $ARGS[0] = 'bandsex':
 				'You blow both of them in turns, jerking off the cock you don''t have in your mouth. You''ve spent enough time with the guys by now to know what they like, and both of them shoot their loads in no time at all.'
 				gs 'boyStat', 'A104'
 				gs 'arousal', 'bj', 5, 'dom'
-				gs 'arousal', 'end'
-				gs 'cum_call', 'mouth', $boy
+				gs 'cum_call', 'mouth', 'A104'
 				gs 'boyStat', 'A105'
 				gs 'arousal', 'bj', 5, 'dom'
-				gs 'arousal', 'end'
-				gs 'cum_call', 'mouth', $boy
+				gs 'cum_call', 'mouth', 'A105'
 				gs 'stat'
 				'"Already!?" you laugh, and the guys actually seem a bit disappointed in themselves.'
 				'You wink at them and smile: "That''s okay, I still had fun! Maybe you''ll last longer next time..."'
@@ -1404,15 +1402,17 @@ if $ARGS[0] = 'bandsex':
 				'The guy is actually a bit taken aback by how eager you are nowadays, and quietly lets you take his cock out of his pants.'
 				'You begin jerking and sucking him off immediately, trying to get him off as quick as possible so you can resume your round.'
 				'Sure enough, he doesn''t last long. "That''s it! There you go..." you smile sweetly at him, when you feel his sperm land on your face.'
+				gs 'npcgeneratec', 0, 'Post office guy', rand(18,45)
+				gs 'boyStat', $npclastgenerated
 				gs 'arousal', 'bj', 10
-				gs 'arousal', 'end'
-				gs 'cum_call', 'mouth', $boy
-				gs 'stat'
+				gs 'cum_call', 'mouth', 'Post office guy'
 				'You quickly wipe the sperm into your mouth using your fingers, and theatrically lick them clean one by one in front of him. All he can do is groan in response.'
 			end
 		end
 		'You quickly put your clothes back on, so you can resume your round as soon as possible. The sexual services the guys want from you barely take up any time any more, now that you''re getting to know their cocks better.'
 		'"Bye, boys! See you next time!" you grin at them.'
+		gs 'arousal', 'end'
+		gs 'stat'
 
 		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end

locations/post_events.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = '1-1':
 	gs 'stat'
 	act 'Take his load on your body':
 		*clr & cla
-		gs 'cum_call', 'breasts', $boy
+		gs 'cum_call', 'breasts', 'Nice man'
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent1-5.jpg"></center>'
 		'When he''s about to burst, you release his cock from your mouth and jerk him off, aiming the head at your boobs. Thick wads of his sperm cover your boobs, while you sit there grinning.'
 		gs 'arousal', 'hj', 2
@@ -324,10 +324,10 @@ if $ARGS[0] = '2-1':
 					'As Arsen guides his cock to your mouth, Jenya gets up from the bed and motions for Maksim to come closer. She takes the camera from him and grins: "Go on. You look like you''re about to pop too!"'
 					'It takes you a second to realize that there are two cocks in front of you instead of one, but you absent-mindedly close your fingers around them and suck the guys off in turns.'
 					gs 'arousal', 'bj', 5
-					gs 'cum_call', 'face', $boy
+					gs 'cum_call', 'face', 'A163', 1
 					gs 'boyStat', 'A164'
 					gs 'arousal', 'bj', 5
-					gs 'cum_call', 'face', $boy
+					gs 'cum_call', 'face', 'A164', 1
 					gs 'stat'
 					'Maksim gasps: "This... girl is amazing!" right when he hits his orgasm, and warm wads of his cum land on your face.'
 					'Arsen laughs: "Drunk sluts are the best! You''ve really outdone yourself this time, Jenya..."'
@@ -413,9 +413,9 @@ if $ARGS[0] = '2-2':
 					act 'Let Arsen cum in your mouth':
 						*clr & cla
 						minut += 5
-						gs 'cum_call', 'mouth_swallow', $boy
+						gs 'cum_call', 'mouth_swallow', 'A163', 1
 						gs 'boyStat', 'A164'
-						gs 'cum_call', 'mouth_swallow', $boy
+						gs 'cum_call', 'mouth_swallow', 'A164', 1
 						!!cum management: you have the loads of both Maksim and Arsen in your mouth and swallow them
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-16.jpg"></center>'
 						'"I''m going to cum!" Arsen groans, and you feel the first jets of his sperm landing on your tongue. Jenya immediately gets down next to you, and eagerly watches how her boyfriend shoots his load in your mouth. Arsen''s load isn''t very big, but that''s no surprise - how many times did Jenya make him cum already today?'
@@ -491,9 +491,9 @@ if $ARGS[0] = '2-2':
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-16.jpg"></center>'
 					'"I''m going to cum!" Arsen groans, mere seconds after you take his cock in your mouth. You feel the first jets of his sperm landing on your tongue. Jenya immediately gets down next to you, and eagerly watches how her boyfriend shoots his load in your mouth. Arsen''s load isn''t very big, but that''s no surprise - how many times did Jenya make him cum already today?'
 					gs 'arousal', 'bj', 5
-					gs 'cum_call', 'mouth_swallow', $boy
+					gs 'cum_call', 'mouth_swallow', 'A163', 1
 					gs 'boyStat', 'A164'
-					gs 'cum_call', 'mouth_swallow', $boy
+					gs 'cum_call', 'mouth_swallow', 'A163', 1
 					gs 'stat'
 					'When Arsen pulls back, she grins proudly at you and locks her lips on yours. Suddenly your mouth is filled with much more sperm! Jenya must''ve gotten Maksim off while you were busy, and kept his sperm in her mouth when he came...'
 					'After a passionate kiss, she orders you: "Show the load to the camera and swallow it, cutie! Enjoy your tasty treat..."'
@@ -591,7 +591,7 @@ if $ARGS[0] = '3-1':
 		'You''ve sucked cock many times before, and pull out every trick you know to best please him. He seems thoroughly impressed with your performance. Despite the thick head you manage to take his cock all the way down your throat too, which impresses him even more!'
 		'Finally, he grabs a firm hold of your head to keep it in place. Several splurts of his sperm land on your tongue, after which he finally lets you go.'
 		gs 'arousal', 'bj', 15, 'deepthroat', 'prostitution'
-		gs 'cum_call', 'mouth_swallow', $boy
+		gs 'cum_call', 'mouth_swallow', 'A108'
 		gs 'stat'
 		'"That was amazing!" he grins. "Even better than the last girl I had, and that was after months of training! You''re definitely paying me a visit more often..."'
 		
@@ -602,7 +602,7 @@ if $ARGS[0] = '3-1':
 		'You do the best you can, but struggle when he tries to push more of his length down your throat. The thick head makes it very difficult.'
 		'"Time''s up!" he grunts, and he grabs a firm hold of your head. He begins to fuck your mouth, roaring as he shoots his cum directly down your throat.'
 		gs 'arousal', 'bj', 15, 'sub', 'prostitution'
-		gs 'cum_call', 'mouth_swallow', $boy
+		gs 'cum_call', 'mouth_swallow', 'A108'
 		gs 'stat'
 		'"That... was decent," he says. "I''ve had better, but we can make a good cocksucker out of you yet."'
 		
@@ -627,7 +627,7 @@ if $ARGS[0] = '3-1':
 				'You do as he says and take the head of his cock back into your mouth, making sure to be careful with your teeth.'
 				'Luckily the man lets you control the pace. Occasionally you try to take a bit more of his shaft in your mouth, but you decide to play it safe and mostly just focus on the head, gently sucking on it and teasing it with your tongue.'
 				gs 'arousal', 'bj', 15, 'prostitution'
-				gs 'cum_call', 'mouth_swallow', $boy
+				gs 'cum_call', 'mouth_swallow', 'A108'
 				gs 'stat'
 				'"Look at me!" he groans, and a warm load of his tangy sperm fills your mouth seconds later. "That was better I guess, but rather half-hearted. Swallow," he orders you, while he strokes your hair with his hand. With him so obviously waiting for you to swallow his sperm, you decide to just do it without hesitation. He seemed unhappy enough with your performance already!'
 				'"You have a lot to learn, but... it''ll be worth it!" he sighs contently. "You could become a good little slut for me, with some training."'
@@ -644,7 +644,7 @@ if $ARGS[0] = '3-1':
 			'When he guides his erection back towards your wide open mouth, you realize how little control you have now. You cough and splutter several times when he shoves his cock inside your mouth further than you can handle. He usually backs off just enough to give you a moment to recover, and then continues to fuck your unexperienced throat.'
 			'You''ve come so far, though... you''re not stopping now! You make the most of it and feel relieved when you feel the man''s cum splurting down your throat a few minutes later.'
 			gs 'arousal', 'bj', 15, 'sub', 'bound', 'prostitution'
-			gs 'cum_call', 'mouth_swallow', $boy
+			gs 'cum_call', 'mouth_swallow', 'A108'
 			gs 'stat'
 			'"Don''t feel bad, you did good!" he pants, while he undoes the gag. "Not the blowjob itself, obviously. That was terrible. But you''re not afraid to get a little kinky, and continued to try and please me even when you were having a rough time. You''re exactly the kind of girl I''m looking for!"'
 
@@ -723,7 +723,7 @@ if $ARGS[0] = '4':
 			'Without realizing it, you had started moving your hand again. Except this time, his cock is pointed straight at your face!'
 			'"Yeah!" he grunts, and several ropes of his warm sperm land on the bottom of your chin. Only your reflexes saved you from having your entire face covered!'
 			gs 'arousal', 'hj', 5
-			gs 'cum_call', 'face', $boy
+			gs 'cum_call', 'face', 'Sleazy man'
 			gs 'stat'
 			'"Wow, you''re fun! And horribly naive..." the man pants, while he picks up the clipboard and puts his signature on the sheet. "There. I''ll be seeing you again!"'
 			'You try to ignore his triumphant grin while you put your clothes back on, after quickly cleaning yourself up with a tissue. At least the postmaster can''t give you any trouble now!'
@@ -768,7 +768,7 @@ if $ARGS[0] = '4':
 		act 'Make him cum in your mouth':
 			*clr & cla
 			!!cum in mouth
-			gs 'cum_call', 'mouth', $boy
+			gs 'cum_call', 'mouth', 'Sleazy man'
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-9.jpg"></center>'
 			'You don''t want his cum on your face, or on your clothes! How would you explain that?'
 			'Closing your lips tightly around the head, you flick your tongue over his cock a few times and feel his warm, tangy sperm spurt against the back of your mouth. The taste is really not that bad!'

locations/post_office.qsrc

@@ -108,8 +108,7 @@ if $ARGS[0] = 'start':
 							end
 							'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/<<$cum_face_image>>.jpg"></center>'
 							'The man cums on your face.'
-							spafinloc = 11
-							gs 'cum_manage'
+							gs 'cum_call', 'face', 'stranger'
 							gs 'arousal', 'end'
 							gs 'stat'
 
@@ -120,8 +119,7 @@ if $ARGS[0] = 'start':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/cumlip.jpg"></center>'
 							'The man cums inside your mouth.'
-							spafinloc = 12
-							gs 'cum_manage'
+							gs 'cum_call', 'mouth', 'stranger'
 							gs 'arousal', 'end'
 							gs 'stat'
 

locations/rex_party_firstTime.qsrc

@@ -153,8 +153,7 @@ if $ARGS[0] = 'anya_kit':
 
 					gs 'npcgeneratec', 0, 'Boy from Rex''s Party', 17
 					gs 'boyStat', $npclastgenerated, 'a'
-					spafinloc = 3
-					gs 'cum_manage'
+					gs 'cum_call', 'anus', 'Boy from Rex''s Party', 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_28.jpg"></center>'
 					*nl
 					'You frown upon seeing your sister being used like this, but maybe it would be better for her if you let them use you too so she wouldn''t be the sole object of their lust? "OK, who wants to fuck me first?" you say as you walk over and take your clothes off.'
@@ -272,33 +271,22 @@ if $ARGS[0] = 'two_boy':
 			'The guys start laughing, obviously having fun fucking you as they talk and joke to each other. "She looks a bit young. I think she might be Anya''s little sister."'
 			'"Fuck, I think you''re right. She''s a sweet little thing, but I don''t fuck schoolgirls. I''ll trade you."'
 			gs 'arousal', 'vaginal', 5, 'sub', 'group', 'unknown'
-			gs 'arousal', 'bj', 5, 'sub', 'group', 'unknown'
-			minut -= 5
+			gs 'arousal', 'bj', -5, 'sub', 'group', 'unknown'
 			gs 'stat'
 			act 'Switch':
 				*clr & cla
 				gs 'boyStat', $boy1[2]
-				cumprecheck = 1
-				gs 'cum_manage'
-				sexpartkno = 0
-				spafinloc = 11
-				gs 'cum_manage'
-				swallow += 1
+				gs 'cum_call', 'face', 'unknown guy'
 				gs 'boyStat', $boy1[1]
-				cumprecheck = 1
-				gs 'cum_manage'
-				sexpartkno = 0
-				spafinloc = 4
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth_swallow', 'unknown guy'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_17.jpg"></center>'
 				*nl
 				'The guys switch places and continue to rhythmically fuck you. After they have fucked you for a while, you somewhat come to your senses. "Oh yeah, wake up bitch! Suck and fuck us harder."'
 				'Still mostly out of it, you obey and begin to suck harder until he starts to cum. He pulls out of your mouth and splatters your entire face in his cum. The second guy cums quickly too, pulling out of your pussy and covering your ass with his cum.'
 				'After spending some time cleaning yourself up, you decide to go and find your sister.'
 				gs 'arousal', 'vaginal', 5, 'sub', 'group', 'unknown'
-				gs 'arousal', 'bj', 5, 'sub', 'group', 'unknown'
+				gs 'arousal', 'bj', -5, 'sub', 'group', 'unknown'
 				gs 'arousal', 'end'
-				minut -= 5
 				gs 'stat'
 				act 'Look For Anya': gt 'rex_party_firstTime', 'anya_find'
 			end

locations/rex_party_smallEvents.qsrc

@@ -55,106 +55,90 @@ if $ARGS[0] = 'sleep':
 		if i = 1:
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
-			sexunaware = 1
 			sloc = rand(0,6)
 			if sloc = 1:
-				spafinloc = 1
+				gs 'cum_call', 'labia', 'unconcious rapist', 2
 			elseif sloc = 2:
-				spafinloc = 4
+				gs 'cum_call', 'butt', 'unconcious rapist', 2
 			elseif sloc = 3:
-				spafinloc = 8
+				gs 'cum_call', 'back', 'unconcious rapist', 2
 			elseif sloc = 4:
-				spafinloc = 11
+				gs 'cum_call', 'face', 'unconcious rapist', 2
 			elseif sloc = 5:
-				spafinloc = 12
+				gs 'cum_call', 'mouth', 'unconcious rapist', 2
 			elseif sloc = 6:
-				spafinloc = 14
+				gs 'cum_call', 'stomach', 'unconcious rapist', 2
 			end
-			gs 'cum_manage'
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
-			sexunaware = 1
 			sloc = rand(0,6)
 			if sloc = 1:
-				spafinloc = 1
+				gs 'cum_call', 'labia', 'unconcious rapist', 2
 			elseif sloc = 2:
-				spafinloc = 4
+				gs 'cum_call', 'butt', 'unconcious rapist', 2
 			elseif sloc = 3:
-				spafinloc = 8
+				gs 'cum_call', 'back', 'unconcious rapist', 2
 			elseif sloc = 4:
-				spafinloc = 11
+				gs 'cum_call', 'face', 'unconcious rapist', 2
 			elseif sloc = 5:
-				spafinloc = 12
+				gs 'cum_call', 'mouth', 'unconcious rapist', 2
 			elseif sloc = 6:
-				spafinloc = 14
+				gs 'cum_call', 'stomach', 'unconcious rapist', 2
 			end
-			gs 'cum_manage'
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
 			sexunaware = 1
 			sloc = rand(0,6)
 			if sloc = 1:
-				spafinloc = 1
+				gs 'cum_call', 'labia', 'unconcious rapist', 2
 			elseif sloc = 2:
-				spafinloc = 4
+				gs 'cum_call', 'butt', 'unconcious rapist', 2
 			elseif sloc = 3:
-				spafinloc = 8
+				gs 'cum_call', 'back', 'unconcious rapist', 2
 			elseif sloc = 4:
-				spafinloc = 11
+				gs 'cum_call', 'face', 'unconcious rapist', 2
 			elseif sloc = 5:
-				spafinloc = 12
+				gs 'cum_call', 'mouth', 'unconcious rapist', 2
 			elseif sloc = 6:
-				spafinloc = 14
+				gs 'cum_call', 'stomach', 'unconcious rapist', 2
 			end
-			gs 'cum_manage'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_6_<<rand(1,9)>>.jpg"></center>'
 			'After everything that happened tonight, you feel exhausted and fall asleep. Your face and body are still smeared and coated in sperm, but you don''t care.'
 		elseif i = 2:
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
-			sexunaware = 1
-			spafinloc = 11
-			gs 'cum_manage'
+			gs 'cum_call', 'face', 'unconcious rapist', 2
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
-			sexunaware = 1
-			spafinloc = 11
-			gs 'cum_manage'
+			gs 'cum_call', 'face', 'unconcious rapist', 2
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
-			sexunaware = 1
-			spafinloc = 11
-			gs 'cum_manage'
+			gs 'cum_call', 'face', 'unconcious rapist', 2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_8_<<rand(1,5)>>.jpg"></center>'
 			'After everything that happened tonight, you feel exhausted and fall asleep. You have a dream about warm wet drops landing on your face and lips, like a warm summers rain. You sleepily like at the drops.'
 		elseif i = 3:
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
-			sexunaware = 1
 			if rand(0,1) = 0:
-				spafinloc = 3 & stat['hidden_anal'] += 1
+				gs 'cum_call', 'anus', 'unconcious rapist', 2
 			else
-				stat['hidden_vaginal'] += 1
+				gs 'cum_call', '', 'unconcious rapist', 2
 			end
-			gs 'cum_manage'
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
 			sexunaware = 1
 			if rand(0,1) = 0:
-				spafinloc = 3 & stat['hidden_anal'] += 1
+				gs 'cum_call', 'anus', 'unconcious rapist', 2
 			else
-				stat['hidden_vaginal'] += 1
+				gs 'cum_call', '', 'unconcious rapist', 2
 			end
-			gs 'cum_manage'
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
-			sexunaware = 1
 			if rand(0,1) = 0:
-				spafinloc = 3 & stat['hidden_anal'] += 1
+				gs 'cum_call', 'anus', 'unconcious rapist', 2
 			else
-				stat['hidden_vaginal'] += 1
+				gs 'cum_call', '', 'unconcious rapist', 2
 			end
-			gs 'cum_manage'
 			i = rand(1,2)
 			if i = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_9_<<rand(1,2)>>.jpg"></center>'
 			if i = 2:'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_9_3.mp4"></video></center>'

locations/seeporn.qsrc

@@ -37,32 +37,14 @@ act 'Watch it':
 				act 'Suck':
 					*clr & cla
 					gs 'boyStat', 'A58'
-					sexvolume = 35
-					spafinloc = 11
-					sexpartkno = 1
-					gs 'cum_manage'
-					sexvolume = 5
-					spafinloc = 7
-					sexpartkno = 1
-					gs 'cum_manage'
+					gs 'cum_call', 'face', 'A58', 1
+					gs 'cum_call', 'clothes', 'A58', 1
 					gs 'boyStat', 'A59'
-					sexvolume = 35
-					spafinloc = 11
-					sexpartkno = 1
-					gs 'cum_manage'
-					sexvolume = 5
-					spafinloc = 7
-					sexpartkno = 1
-					gs 'cum_manage'
+					gs 'cum_call', 'face', 'A59', 1
+					gs 'cum_call', 'clothes', 'A59', 1
 					gs 'boyStat', 'A34'
-					sexvolume = 35
-					spafinloc = 11
-					sexpartkno = 1
-					gs 'cum_manage'
-					sexvolume = 5
-					spafinloc = 7
-					sexpartkno = 1
-					gs 'cum_manage'
+					gs 'cum_call', 'face', 'A34', 1
+					gs 'cum_call', 'clothes', 'A34', 1
 					gs 'arousal', 'bj', 10, 'group', 'incest', 'sub'
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -137,13 +119,9 @@ act 'Watch it':
 					act 'Eew':
 						*clr & cla
 						gs 'boyStat', 'A59'
-						spafinloc = 7
-						sexpartkno = 1
-						gs 'cum_manage'
+						gs 'cum_call', 'clothes', 'A59', 1
 						gs 'boyStat', 'A58'
-						spafinloc = 7
-						sexpartkno = 1
-						gs 'cum_manage'
+						gs 'cum_call', 'clothes', 'A58', 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/seeporn/sex/seeporncumhj.jpg"></center>'
 						'You shout, "You assholes, all over my feet!" but the boys are blissfully sprawled on the couch. "Great handjob <<$pcs_nickname>>, such small, soft hands."'
@@ -159,17 +137,11 @@ act 'Watch it':
 					act '"Groo gaskers!"':
 						*clr & cla
 						gs 'boyStat', 'A59'
-						spafinloc = 7
-						sexpartkno = 1
-						gs 'cum_manage'
+						gs 'cum_call', 'clothes', 'A59', 1
 						gs 'boyStat', 'A58'
-						spafinloc = 7
-						sexpartkno = 1
-						gs 'cum_manage'
+						gs 'cum_call', 'clothes', 'A58', 1
 						gs 'boyStat', 'A34'
-						spafinloc = 11
-						sexpartkno = 1
-						gs 'cum_manage'
+						gs 'cum_call', 'face', 'A58', 1
 						
 
 						if brotherSex < 6:brotherSex = 6
@@ -224,13 +196,9 @@ act 'Watch it':
 					act 'Resent':
 						*clr & cla
 						gs 'boyStat', 'A59'
-						spafinloc = 7
-						sexpartkno = 1
-						gs 'cum_manage'
+						gs 'cum_call', 'clothes', 'A59', 1
 						gs 'boyStat', 'A58'
-						spafinloc = 7
-						sexpartkno = 1
-						gs 'cum_manage'
+						gs 'cum_call', 'clothes', 'A58', 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/seeporn/sex/seeporncumhj.jpg"></center>'
 						'You shout, "You assholes, all over my feet!" but the boys are blissfully sprawled on the couch. "Great handjob <<$pcs_nickname>>, such small, soft hands."'
@@ -351,32 +319,14 @@ if $ARGS[0] = 'SeePornPalevo':
 			act 'Suck':
 				*clr & cla
 				gs 'boyStat', 'A58'
-				sexvolume = 35
-				spafinloc = 11
-				sexpartkno = 1
-				gs 'cum_manage'
-				sexvolume = 5
-				spafinloc = 7
-				sexpartkno = 1
-				gs 'cum_manage'
+				gs 'cum_call', 'face', 'A58', 1
+				gs 'cum_call', 'clothes', 'A58', 1
 				gs 'boyStat', 'A59'
-				sexvolume = 35
-				spafinloc = 11
-				sexpartkno = 1
-				gs 'cum_manage'
-				sexvolume = 5
-				spafinloc = 7
-				sexpartkno = 1
-				gs 'cum_manage'
+				gs 'cum_call', 'face', 'A59', 1
+				gs 'cum_call', 'clothes', 'A58', 1
 				gs 'boyStat', 'A34'
-				sexvolume = 35
-				spafinloc = 11
-				sexpartkno = 1
-				gs 'cum_manage'
-				sexvolume = 5
-				spafinloc = 7
-				sexpartkno = 1
-				gs 'cum_manage'
+				gs 'cum_call', 'face', 'A34', 1
+				gs 'cum_call', 'clothes', 'A34', 1
 				pcs_horny += 10
 				if brotherSex < 6:brotherSex = 6
 				gs 'arousal', 'bj', 10, 'group', 'incest', 'sub'
@@ -425,23 +375,11 @@ if $ARGS[0] = 'SeePornPalevo':
 				act 'Close your eyes':
 					*clr & cla
 					gs 'boyStat', 'A58'
-					sexvolume = 35
-					spafinloc = 11
-					sexpartkno = 1
-					gs 'cum_manage'
-					sexvolume = 5
-					spafinloc = 7
-					sexpartkno = 1
-					gs 'cum_manage'
+					gs 'cum_call', 'face', 'A58', 1
+					gs 'cum_call', 'clothes', 'A58', 1
 					gs 'boyStat', 'A59'
-					sexvolume = 35
-					spafinloc = 11
-					sexpartkno = 1
-					gs 'cum_manage'
-					sexvolume = 5
-					spafinloc = 7
-					sexpartkno = 1
-					gs 'cum_manage'
+					gs 'cum_call', 'face', 'A59', 1
+					gs 'cum_call', 'clothes', 'A59', 1
 					gs 'arousal', 'end'
 
 					gs 'stat'

locations/sexdvanadva.qsrc

@@ -74,8 +74,7 @@ if $ARGS[0] = 'end':
 	minut += 10
 	gs 'npcgeneratec', 0, 'Random Guy', rand(18,45)
 	gs 'boyStat', $npclastgenerated
-	spafinloc = 12
-	gs 'cum_manage'
+	gs 'cum_call', 'mouth_swallow', 'Random Guy'
 	killvar 'sexvar'
 	killvar 'sexdvarand'
 

locations/shop.qsrc

@@ -85,25 +85,20 @@ if $shoplocation = 'main':
 
 						if rand(1, 2) = 1:
 							cla
-							oral += 1
-							pcs_throat += 1
-							spafinloc = 12
-							gs 'cum_manage'
-							swallow += 1
+							
 							'Dima takes you to his house and orders you to lie across the sofa. You get into position and he calls you a bitch before he starts fucking you in the mouth.'
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/gostdt2.jpg"></center>'
 							'Dima finally finishes in your mouth. You obediently swallow and lick the remnants of sperm off his cock.'
 							
 							gs 'arousal', 'bj', 10, 'sub', 'deepthroat', 'humiliation'
 							gs 'arousal', 'end'
+							gs 'cum_call', 'mouth_swallow', 'A169', 1
 							gs 'stat'
 							
 							act 'Leave': minut += 3 & gt 'city_residential'
 						else
 							cla
 							gs 'pain', 6, 'asscheeks', 'slap'
-							spafinloc = 4
-							gs 'cum_manage'
 							spank += 1
 							'Dima brings you to his house and begins to kiss and undress you in the hall. Once you''re naked, he takes you to the bathroom.'
 							'He unscrews the shower head and shoves the hose in your ass. You feel the rush of water quickly filling you before Dima sits you on the toilet. After the rough enema, he bends you over and inserts his dick into your ass.'
@@ -112,6 +107,7 @@ if $shoplocation = 'main':
 							
 							gs 'arousal', 'anal', 30, 'sub', 'rough', 'humiliation'
 							gs 'arousal', 'end'
+							gs 'cum_call', 'anus', 'A169', 1
 							gs 'stat'
 
 							act 'Leave': minut += 3 & gt 'city_residential'

locations/taxi.qsrc

@@ -179,33 +179,30 @@ if $ARGS[0] = 'vag1':
 end
 
 if $ARGS[0] = 'cum1':
-	spafinloc = 14
-	gs 'cum_manage'
 	'For several minutes, he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, then suddenly he pulls out and starts shooting spurts of cum all over your stomach. With a final moan and spurt, he stands up, leering down at you and his handy work as he pushes you back inside the taxi and slams the door shut.'
 	gs 'arousal', 'vaginal', 5, 'sub', 'unknown', 'rough'
 	gs 'arousal', 'end'
+	gs 'cum_call', 'stomach', 'Taxi Driver'
 	gs 'stat'
 	gs 'taxi', 'end'
 end
 
 if $ARGS[0] = 'cum3':
-	spafinloc = 0
-	gs 'cum_manage'
 	'For several minutes, he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, and you wrap your legs around him to pull him deeper inside. Suddenly, he moans and begins pumping his sperm deep inside you. '
 	gs 'cuminsidereact'
 	gs 'arousal', 'vaginal', 5, 'sub', 'unknown', 'rough'
 	gs 'arousal', 'end'
+	gs 'cum_call', '', 'Taxi Driver'
 	gs 'stat'
 	gs 'taxi', 'end'
 end
 
 if $ARGS[0] = 'cum2':
-	spafinloc = 0
-	gs 'cum_manage'
 	'For several minutes, he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, then suddenly he starts shooting spurts of cum deep inside you. After a final moan and spurt, he stands up, leering down at you as he pushes you back inside the taxi and slams the door shut.'
 	gs 'cuminsidereact'
 	gs 'arousal', 'vaginal', 5, 'sub', 'unknown', 'rough'
 	gs 'arousal', 'end'
+	gs 'cum_call', '', 'Taxi Driver'
 	gs 'stat'
 	gs 'taxi', 'end'
 end
@@ -224,9 +221,6 @@ if $ARGS[0] = 'bj':
 	cla
 	*clr
 	taxioffer = 1
-	spafinloc = 12
-	gs 'cum_manage'
-	gs 'stat'
 	'<center><video autoplay loop src="images/locations/shared/taxi/sex/bj0,'+rand(0,2)+'.mp4"></video></center>'
 	'He turns the taxi off and tells you to come up to the front seat. You get out and crawl into the passenger seat. He already has his <<dick>>cm <<$dick_girth>> cock out of his pants and is stroking it. He doesn''t say a word, just gives you a look. You scurry over at once and wrap your lips around his cock. You begin sucking his cock while your hand fondles his balls.'
 	'He moans and leans back to give you more room to work. Some time later, he grabs your hair with his hand and forces you head down, ramming his <<dick>>cm <<$dick_girth>> cock down your throat. "That''s a good little slut." This makes your eyes water, and you gag. He doesn''t seem to care, as this causes you to get almost uncontrollably slobbery.'
@@ -235,6 +229,7 @@ if $ARGS[0] = 'bj':
 	swallow += 1
 	gs 'arousal', 'bj', 5, 'sub', 'unknown', 'rough', 'deepthroat'
 	gs 'arousal', 'end'
+	gs 'cum_call', 'mouth_swallow', 'Taxi Driver'
 	gs 'stat'
 	act 'Choose destination':
 		cla
@@ -246,9 +241,6 @@ if $ARGS[0] = 'anal':
 	cla
 	*clr
 	taxioffer = 1
-	spafinloc = 3
-	gs 'cum_manage'
-	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/taxi/sex/taxi3,'+rand(0,5)+'.jpg"></center>'
 	'He turns off the taxi and gets out, walking around to the back door. He already has his cock out, rubbing some hand lotion on it for lubrication as he strokes it.'
 	'He half pulls you out of the taxi and pulls your clothes aside and your panties down just enough to completely bare your ass, which he gives a hard slap. He rubs the tip of his <<dick>>cm <<$dick_girth>> cock against your anus, while you start to rub your clit with your hand as you bite your lower lip, trying to prepare yourself mentally for what is about to come.'
@@ -258,6 +250,7 @@ if $ARGS[0] = 'anal':
 	pcs_acp_known += 1
 	gs 'arousal', 'anal', 5, 'sub', 'unknown', 'rough'
 	gs 'arousal', 'end'
+	gs 'cum_call', 'anus', 'Taxi Driver'
 	gs 'stat'
 	act 'Choose destination':
 		cla
@@ -302,17 +295,13 @@ if $ARGS[0] = 'trip':
 					act 'See how he reacts':
 						cls
 						if rand(1,100) > 75:
-							spafinloc = 0
-							gs 'cum_manage'
-							gs 'stat'
 							gs 'taxi', 'alleyvag'
 							gs 'arousal', 'vaginal', 5, 'sub', 'unknown', 'rough'
+							gs 'cum_call', '', 'Taxi Driver'
 						else
-							spafinloc = 3
-							gs 'cum_manage'
-							gs 'stat'
 							gs 'taxi', 'alleyanal'
 							gs 'arousal', 'anal', 5, 'sub', 'unknown', 'rough'
+							gs 'cum_call', 'anus', 'Taxi Driver'
 						end
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -326,17 +315,14 @@ if $ARGS[0] = 'trip':
 		act 'Accept the consequences of your actions':
 			cla
 			*clr
-			gs'stat'
 			if rand(1,100) > 50:
-				spafinloc = 0
-				gs 'cum_manage'
 				gs 'taxi', 'alleyvag'
 				gs 'arousal', 'vaginal', 5, 'sub', 'unknown', 'rough'
+				gs 'cum_call', '', 'Taxi Driver'
 			else
-				spafinloc = 3
-				gs 'cum_manage'
 				gs 'taxi', 'alleyanal'
 				gs 'arousal', 'anal', 5, 'sub', 'unknown', 'rough'
+				gs 'cum_call', 'anus', 'Taxi Driver'
 			end
 			gs 'arousal', 'end'
 			gs 'stat'

locations/train.qsrc

@@ -415,10 +415,6 @@ if $ARGS[0] = 'weed':
 						gs 'arousal', 'vaginal', 5, 'dom', 'unknown'
 						act 'Take his cum':
 							*clr & cla
-							spafinloc = 12
-							gs 'cum_manage'
-							spafinloc = 11
-							gs 'cum_manage'
 							'<center><h4>Pavlovsk Station</h4></center>'
 							'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weedcum.jpg" ></center>'
 							'You give him the fuck of a lifetime, feeling your orgasm approaching fast, so close, so very close... but he lifts you off and quickly stands up. "I''m about to cum!"'
@@ -429,6 +425,8 @@ if $ARGS[0] = 'weed':
 							*nl
 							'That''s when you hear the train coming. "The train''s here; we have to stop," he states with a hint of regret as he pulls his cock out of your mouth. Without another look at you, he quickly pulls up his pants and rushes over to the train as it comes to a stop. You hurriedly get dressed as well and then rush after him to get on the train. You make it just in time - the doors close almost as soon as you are in.'
 							gs 'arousal', 'end'
+							gs 'cum_call', 'face', 'Stoner'
+							gs 'cum_call', 'mouth_swallow', 'Stoner'
 							gs 'stat'
 							act 'Board the train to the city':
 								*clr & cla
@@ -601,18 +599,15 @@ if $ARGS[0] = 'oldman':
 
 				act 'Take his cum':
 					*clr & cla
-					spafinloc = 4
-					gs 'cum_manage'
-					spafinloc = 1
-					gs 'cum_manage'
-					spafinloc = 9
-					gs 'cum_manage'
 					'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/oldcum.jpg" ></center>'
 					'All of a sudden, he pulls out of your ass and, you feel his hot sperm splattering against your puckered hole, pussy lips and inner thighs. It''s not as much cum as you expected for somebody who didn''t have sex in years, but maybe he jerks off a lot? He gets up first, using your shoulder for support,  which holds you down until he is fully on his feet. Bearing it without clamor, you start wiping off the cum as he gets dressed; by the time you finally get off the ground yourself, he''s fully clothed, whistling and already walking off back the way you came with him.'
 					*nl
 					'You hurry up in getting yourself back in order, but by the time you have your bottoms back on and look up, he is almost out of the gully already, halfway back to the tracks! He seems <b>a lot</b> more spry than before, and you get the sneaking suspicion that you have been had in more ways than one.' 
 					'Cursing your gullibility and wincing at the ache in your pussy and ass, you finish dressing and head back to the platform - as unpleasant as this was, maybe you''ve learned your lesson at least.'
 					gs 'arousal', 'end'
+					gs 'cum_call', 'labia', 'Old guy'
+					gs 'cum_call', 'butt', 'Old guy'
+					gs 'cum_call', 'legs', 'Old guy'
 					gs 'stat'
 
 					act 'Return to the station': gt $loc, $loc_arg
@@ -680,8 +675,6 @@ if $ARGS[0] = 'fit':
 				act 'Take his cum':
 					*clr & cla
 					minut += 5
-					spafinloc = 12
-					gs 'cum_manage'
 					'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/fitcum.jpg" ></center>'
 					'His hard breathing turns into groans, and the next moment, he pulls out of you, letting go of your leg and body. You squat down in front of him, rubbing your clit and opening your mouth. Before he can even get his cock back into your mouth, the first jet of cum spurts across your lips; the following ones end up shooting into your now fully-opened mouth.'
 					*nl
@@ -689,6 +682,7 @@ if $ARGS[0] = 'fit':
 					*nl
 					'Naturally, he is the first to be back in order, but he waits until you are cleaned up and presentable again and then walks you back to the station. The walk back is anything but awkward. He flirts with you just like he did at the very start, and you are getting the sense that he might be genuinely interested in you. Or, at the very least, he''s not the kind of ass who just wants to fuck you and forget you.'
 					gs 'arousal', 'end'
+					gs 'cum_call', 'mouth_swallow', 'Fit guy'
 					gs 'stat'
 
 					act 'Return to the station': gt $loc, $loc_arg
@@ -767,8 +761,6 @@ if $ARGS[0] = 'young':
 
 					act 'Take his cum':
 						*clr & cla
-						spafinloc = 12
-						gs 'cum_manage'
 						'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/youngcum.jpg" ></center>'
 						'He lifts you off him and stands up beside you, jerking his cock. You know what he wants, and you don''t mind opening your mouth for him. Maybe two seconds later, the first jet of hot, sticky sperm flies into your mouth; most of those that follow hit their target too - only one or two miss and end up on your lips.' 
 						'When the torrent of semen has run dry, your lover pulls up his pants while you swallow his load, the salty reward for an incredible experience. He waits for you to get dressed and cleaned up, then he walks you back to the platform, flirting and chatting amicably with you along the way, right up until you''re inside the station and it''s time to part ways.'
@@ -776,6 +768,7 @@ if $ARGS[0] = 'young':
 						'"Yeah, I... I had a lot of fun with you," you say lamely and give him an awkward smile as you try to find the right words, "and I hope we run into each other again too. Who knows, maybe we''ll meet on the train again?"' 
 						'"I''d like that." He gives you a kiss on the cheek and a boyish grin that makes you feel weak in the knees, and walks away. You follow him with your eyes until he''s turned a corner, then sigh and, with a heavy heart, return to your day-to-day life.'
 						gs 'arousal', 'end'
+						gs 'cum_call', 'mouth_swallow', 'Well dress guy'
 						gs 'stat'
 
 						act 'Return to the station and catch the next train':
@@ -816,6 +809,8 @@ if $ARGS[0] = 'Gopnik':
 		*clr & cla
 		minut -= 30
 		gs 'fame', 'pav', 'sex', 5
+		gs 'npcgeneratec', 0, 'Gopnik', rand(18,25)
+		gs 'boyStat', $npclastgenerated
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/gopnik.jpg" ></center>'
 		'He is pretty cute, and you find yourself in the mood for a little tenderness, so you return his kiss and allow him to paw at your body. During the ride, you hear more than a few people comment on the two of you making out like this on the train; several seem to be of the opinion that this is not a proper place to show this level of affection. Instead of deterring you however, all that does is tickle your rebellious streak and make you feel even more brazen.'
 		*nl
@@ -898,10 +893,6 @@ if $ARGS[0] = 'Gopnik':
 
 						act 'Take his cum':
 							*clr & cla
-							spafinloc = 3
-							gs 'cum_manage'
-							spafinloc = 4
-							gs 'cum_manage'
 							'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/gopnikcum.jpg" ></center>'
 							'He suddenly groans; a first jet of sperm shoots into your bowels just as he pulls out, and you feel his hot sperm rain down all over your ass cheeks as he jerks himself off. When the stream dies down, he wipes off the last few drops at his tip on your butt before pulling his pants up; he then helpfully offers you a tissue.'
 							*nl
@@ -909,6 +900,8 @@ if $ARGS[0] = 'Gopnik':
 							'You can''t help but laugh at that; you just let him fuck you in every which way, and you didn''t even know his name! "<<$pcs_nickname>>, pleasure to meet you," you say in mock formality and even offer him your hand, "a real pleasure," you add with a suggestive smile. He feigns seriousness as he shakes the offered hand but cannot keep himself from grinning.'
 							'"It was nice meeting you as well, <<$pcs_nickname>>. Maybe I can call you sometime?", he asks hopefully.'
 							gs 'arousal', 'end'
+							gs 'cum_call', 'butt', 'Gopnik'
+							gs 'cum_call', 'anus', 'Gopnik'
 							gs 'stat'
 
 							act 'Give him your number':

locations/worksalon.qsrc

@@ -465,11 +465,11 @@ if $ARGS[0] = '3':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pashaanal.jpg"></center>'
 		pcs_ass += 1
-		spafinloc = 3
 		gs 'boyStat', 'A71'
 		'Bent over his desk waiting, you know what is about the happen and begin to rub your clit to make yourself wet. Moments later he walks in and takes off his pants. He walks right up behind you stroking his <<dick>>cm <<$dick_girth>> cock in his hand. He rubs the tip against your asshole a moment before pushing his <<dick>>cm <<$dick_girth>> cock into your ass. You cry out in pain. You don''t think he is using any lube at all. He struggles for a bit before he can finally force himself balls deep into you. He begins to fuck your ass hard, pounding into you, as you massage your clit, trying to distract yourself from the pain. Slapping your ass hard he says, "Yeah you like this, don''t you slut? All you little whore''s just love being fucked hard and rough." He pounds himself into you for some time before he grunts and you feel his sperm shooting deep inside your ass. He pulls out and starts putting his pants back on. Noticing you still bent over his desk, he says, "Get the fuck out of here and get back to work slut."'
 	
 		gs 'arousal', 'anal', 15, 'sub'
+		gs 'cum_call', 'anus', 'A71', 1
 		gs 'stat'
 	end
 	sexpartkno = 1