Merge remote-tracking branch 'Anya/master'

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/city_lake.qsrc

@@ -972,10 +972,12 @@ if $ARGS[0] = 'stasValera4':
 	gs 'stat'
 	act 'Get fucked':
 		gs 'boyStat', 'A47'
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<rand(7,9)>>.jpg"></center>'
 		'Valera watches as Stasik spreads your legs and lines his dick up with your pussy. He slowly pushes into you, making you moan softly.'
 		gs 'dinsex','vaginal_sex',10
 		act 'Don''t forget Valera':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<rand(1,6)>>.jpg"></center>'
 			'Stasik starts fucking you as Valera kneels in front of you and slides his dick into your mouth.'
 			gs 'boyStat', 'A48'
@@ -984,6 +986,7 @@ if $ARGS[0] = 'stasValera4':
 			pose = 1
 			gs 'dinsex','sexcum'
 			act 'Finish Valera off':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<rand(1,4)>>.jpg"></center>'
 				'Valera groans and his cock twitches in your mouth as his cum spurts into your throat. You obediently swallow all of it.'
 				gs 'boyStat', 'A48'
@@ -1090,8 +1093,7 @@ if $ARGS[0] = 'vlake1':
 		act 'Relax and enjoy it':
 			*clr & cla
 			guy += 4
-			gs 'arousal', 'bj', 10, 'group'
-			minut -= 5
+			gs 'arousal', 'bj', 5, 'group'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake3.jpg"></center>'
 			'You lie back and enjoy what''s happening before one of the men suddenly pulls his dick out and holds it to your face. You grin and start licking it as the others get excited and pull their dicks out as well. You get up on your knees in the middle of the group, trying to please all of them at once.'
@@ -1099,8 +1101,7 @@ if $ARGS[0] = 'vlake1':
 			act 'Continue':
 				*clr & cla
 				gs 'arousal', 'bj', 10, 'group'
-				gs 'arousal', 'vaginal_finger', 10, 'group'
-				minut -= 10
+				gs 'arousal', 'vaginal_finger', -10, 'group'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake4.jpg"></center>'
 				'One of the men leans toward your pussy and begins to lick it before trying to shove his fingers inside.'
@@ -1112,8 +1113,7 @@ if $ARGS[0] = 'vlake1':
 					gs 'npcgeneratec', 0, 'Stranger at the lake', rand(18,45)
 					gs 'boyStat', $npclastgenerated
 					gs 'arousal', 'bj', 10, 'group'
-					gs 'arousal', 'vaginal', 10, 'group'
-					minut -= 10
+					gs 'arousal', 'vaginal', -10, 'group'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake7.jpg"></center>'
 					'You relax and enjoy the sensation. Noticing your reaction, the man removes his fingers and pushes his dick inside you. You continue giving the others blowjobs and jerking them off.'
@@ -1121,9 +1121,8 @@ if $ARGS[0] = 'vlake1':
 					act 'Double penetration':
 						*clr & cla
 						gs 'arousal', 'bj', 10, 'group'
-						gs 'arousal', 'vaginal', 10, 'group'
-						gs 'arousal', 'anal', 10, 'group'
-						minut -= 20
+						gs 'arousal', 'vaginal', -10, 'group'
+						gs 'arousal', 'anal', -10, 'group'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake8.jpg"></center>'
 						'"There''s room for two..." you say teasingly and don''t even have time to react before a dick is being pushed into your ass. The group pass you around and take turns fucking both your holes and letting you suck and jerk their dicks before it becomes apparant that they''re all close to finishing.'
@@ -1214,8 +1213,7 @@ if $ARGS[0] = 'vlake2':
 		act 'Kneel':
 			*clr & cla
 			guy += 2
-			gs 'arousal', 'bj', 10
-			minut -= 5
+			gs 'arousal', 'bj', 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake3.jpg"></center>'
 			'You get up on your knees and remove your bikini as they pull their cocks out. You take them in your hands and begin sucking both in turn.'
@@ -1223,8 +1221,7 @@ if $ARGS[0] = 'vlake2':
 			act 'Continue':
 				*clr & cla
 				gs 'arousal', 'vaginal', 5
-				gs 'arousal', 'bj', 5
-				minut -= 5
+				gs 'arousal', 'bj', -5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake4.jpg"></center>'
 				'One of the men lies down and you continue to suck him while lifting your ass into the air. The second man enjoys the view before sliding his dick into your wet pussy.'
@@ -1232,8 +1229,7 @@ if $ARGS[0] = 'vlake2':
 				act 'Double penetration':
 					*clr & cla
 					gs 'arousal', 'anal', 5
-					gs 'arousal', 'vaginal', 5
-					minut -= 5
+					gs 'arousal', 'vaginal', -5
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake5.jpg"></center>'
 					'"I want you both!" you moan loudly as you straddle one of the men. The second moves in behind and pushes his cock into your ass.'
@@ -1316,40 +1312,39 @@ if $ARGS[0] = 'andrey1':
 		act 'Open your mouth':
 			*clr & cla
 			gs 'boyStat', 'A46'
-			gs 'arousal', 'bj', 5
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey2.jpg"></center>'
 			'You run your tongue along his shaft before taking him into your mouth as deep as you can. Andrew starts fucking your mouth when you suddenly hear a noise coming from some nearby bushes. You look up and see a young man spying on you, his hand buried in his pants.'
 			'Andrew also notices the Peeping Tom and turns your head so that the voyeur can watch him fuck your mouth. You defiantly continue to suck Andrew''s cock, periodically holding his full length in your mouth and gagging as you lick his testicles.'
 			'Andrew then pulls out of your mouth and pushes you onto your back. In one swift motion, he plunges his dick deep into your puusy. You cringe in pain, but Andrew ignores you and begins roughly thrusting in and out of you.'
 			'After a few minutes of monotonous movements, you are enveloped in sweet bliss when Andrew''s fingers stimulate your anus. You ride the waves of incredible pleasure and through narrowed eyelids, you see the young Peeping Tom, speechless as he watches in fascinated wonder.'
 
+						gs 'arousal', 'bj', 5
+			gs 'stat'
 			act 'Call him over':
 				*clr & cla
 				guy += 1
+				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey3.jpg"></center>'
+				'You beckon him over and the shy young man slowly walks up to you. "Well, what are you waiting for? Undress and get inside her already!" Andrew shouts as he turns you over and spreads your buttocks with his hands. The young man moves in behind and pushes his dick into your ass. You moan loudly as the two cocks thrust in and out of you until the young man pulls out and finishes on your ass. Andrew then gets up and cums in your mouth.'
+
 				gs 'cum_call', 'mouth', 'A46', 1
 				gs 'npcgeneratec', 0, 'a voyeur at the beach', rand(18,45)
 				gs 'boyStat', $npclastgenerated
 				gs 'cum_call', 'butt', 'a voyeur at the beach'
-				gs 'arousal', 'bj', 5
+				gs 'arousal', 'bj', -5
 				gs 'arousal', 'anal', 5
-				minut -= 5
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey3.jpg"></center>'
-				'You beckon him over and the shy young man slowly walks up to you. "Well, what are you waiting for? Undress and get inside her already!" Andrew shouts as he turns you over and spreads your buttocks with his hands. The young man moves in behind and pushes his dick into your ass. You moan loudly as the two cocks thrust in and out of you until the young man pulls out and finishes on your ass. Andrew then gets up and cums in your mouth.'
-
 				act 'Get up':gt 'city_lake', 'start'
 			end
 
 			act 'Faster':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey4.jpg"></center>'
+				'"Faster! Deeper! Stronger!" you enthusiastically scream. He answers with an inarticulate growl through his ragged breathing. You look back and notice that the peeping man has run away. Andrew then pulls out and cums in your mouth.'
+
 				gs 'cum_call', 'mouth', 'A46', 1
 				gs 'arousal', 'bj', 5
 				gs 'arousal', 'end'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey4.jpg"></center>'
-				'"Faster! Deeper! Stronger!" you enthusiastically scream. He answers with an inarticulate growl through his ragged breathing. You look back and notice that the peeping man has run away. Andrew then pulls out and cums in your mouth.'
-
 				act 'Get up':gt 'city_lake', 'start'
 			end
 		end
@@ -1359,8 +1354,8 @@ end
 if $ARGS[0] = 'kater1':
 	*clr & cla
 	menu_off = 1
-	gs 'stat'
 	pcs_hydra += 20
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater1.jpg"></center>'
 	'While riding on the jet ski, you make a turn that''s too steep and are thrown into the water. You swallow a lot of water and begin to sink, but are suddenly pulled out of the water by a man in a boat. Once you''re aboard, he ties the jet ski to the boat and sets off. After coughing up water, you catch your breath and start to feel better. The guy stops the boat and walks up to you.'
 	'"How are you beautiful? I just saved your life, so how about you show me some gratitude?" he asks while slowly fondling your pussy.'
@@ -1387,42 +1382,48 @@ if $ARGS[0] = 'kater1':
 
 		act 'Give him a blowjob':
 			*clr & cla
-			gs 'arousal', 'bj', 5
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater3.jpg"></center>'
 			'You sit the guy down and start licking his cock before opening your lips and taking it into your mouth. You start passionately sucking and in only a few minutes, you sense that he''s about to cum.'
 
+			gs 'arousal', 'bj', 5
+			gs 'stat'
 			act 'Continue':gt 'city_lake', 'kater1cum'
 
 			act 'Get fucked':
 				*clr & cla
-				gs 'arousal', 'vaginal', 5
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater4.jpg"></center>'
 				'The guy bends you over and slides his dick into your pussy before he starts roughly fucking you.'
 
+				gs 'arousal', 'vaginal', 5
+				gs 'stat'
 				act 'Change position':
 					*clr & cla
-					gs 'arousal', 'vaginal', 5
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater5.jpg"></center>'
 					'When he gets tired, you push him onto his back and jump on top of him, riding him cowgirl.'
 
+					gs 'arousal', 'vaginal', 5
+					gs 'stat'
 					act 'Change position':
 						*clr & cla
-						gs 'arousal', 'vaginal', 5
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater6.jpg"></center>'
 						'His dick still deep inside you, you spin around and keep riding him. After a few minutes, you grow weak with pleasure and fall off of him.'
 
+						gs 'arousal', 'vaginal', 5
+						gs 'stat'
 						act 'Continue':
 							*clr & cla
-							gs 'arousal', 'vaginal', 5
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater7.jpg"></center>'
 							'The guy turns you onto your side and re-enters your pussy, continuing the rhythm from before.'
 
+							gs 'arousal', 'vaginal', 5
+							gs 'stat'
 							act 'Change position':
 								*clr & cla
-								gs 'arousal', 'bj', 5
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater8.jpg"></center>'
 								'He stands up and pulls you up before lifting one of your legs and forcefully penetrating you. Tired but feeling very satisfied, you hang onto him as he fucks you, waiting for him to finish. After a few more thrusts, he pulls out and lets you fall to your knees before sliding his dick into your mouth, giving you a good taste of your juices.'
 
+								gs 'arousal', 'bj', 5
+								gs 'stat'
 								act 'Suck his dick':gt 'city_lake', 'kater1cum'
 							end
 						end
@@ -1435,7 +1436,6 @@ end
 
 if $ARGS[0] = 'kater1cum':
 	*clr & cla
-	gs 'stat'
 	gs 'cum_call', 'mouth_swallow', 'a rescuer at the lake'
 	gs 'cum_call', 'face', 'a rescuer at the lake'
 	gs 'cum_call', 'breasts', 'a rescuer at the lake'
@@ -1479,36 +1479,35 @@ if $ARGS[0] = 'kater2':
 	act 'Approach them':
 		*clr & cla
 		guy += 2
-		gs 'arousal', 'vaginal', 5, 'group'
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater2/kater2.jpg"></center>'
 		'You grin as you strip out of your swimsuit, walk over to the guys and, without saying a word, jump on one of them and start kissing him passionately as you feel his cock grow hard and press against your ass. You take it in your hand and guide it into your pussy, moaning as it slides into you.'
 
+		gs 'arousal', 'vaginal', 5, 'group'
+		gs 'stat'
 		act 'Change position':
 			*clr & cla
-			gs 'arousal', 'anal', 5, 'group'
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater2/kater3.jpg"></center>'
 			'The guy pulls out of you and turns you around before lifting you up and spreading your legs. He pushes his dick against your anus and you moan when it pops into your ass. He then starts fucking you, making you moan even more.'
 			'"Want it deeper?" he asks with a laugh.'
 
+			gs 'arousal', 'anal', 5, 'group'
+			gs 'stat'
 			act 'Yes':
 				*clr & cla
-				gs 'arousal', 'bj', 5
-				gs 'arousal', 'anal', 5
-				minut -= 5
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater2/kater4.jpg"></center>'
 				'"Yes! Fuck me harder and deeper!" you shout.'
 				'"Well then, hold on!" he replies as he places you down on all fours before he moves in behind you and shoves his cock so deep into your ass that his balls slap against your pussy. The second guy, who up until this point has just been watching, slaps you in the face with his cock. You take it in your hand and start sucking it.'
 
+				gs 'arousal', 'bj', -5
+				gs 'arousal', 'anal', 5
+				gs 'stat'
 				act 'Take both of them':
 					*clr & cla
-					gs 'arousal', 'vaginal', 5
-					gs 'arousal', 'anal', 5
-					minut -= 5
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater2/kater5.jpg"></center>'
 					'"Fuck me in both holes!" you shout and the two men laugh in marvel at your lust. Feeling very encouraged, they quickly penetrate both your ass and your pussy and satrt vigorously pounding your holes. The pleasure quickly overwhelms you and you scream out in orgasm.'
 					$orgasm_or = 'yes'
+					gs 'arousal', 'vaginal', -5
+					gs 'arousal', 'anal', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -1519,7 +1518,7 @@ if $ARGS[0] = 'kater2':
 
 						act 'Turn to one':
 							*clr & cla
-							gs 'cum_call', 'mouth', 'a rescuer at the lake'
+							gs 'cum_call', 'mouth_swallow', 'a rescuer at the lake'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater2/kater7.jpg"></center>'
 							'One of the guys groans and you turn to him with your mouth open. His cum shoots into your mouth and you enthusiastically swallow it.'
@@ -1569,46 +1568,44 @@ if $ARGS[0] = 'kater3':
 	act 'Spread your legs':
 		*clr & cla
 		guy += 2
-		gs 'arousal', 'vaginal_finger', 5
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/2.jpg"></center>'
 		'You open your legs, making it clear that you are ready to thank your savior. He smiles and slides his fingers into your pussy as his tongue begins to tease your clitoris.'
+		gs 'arousal', 'vaginal_finger', 5
+		gs 'stat'
 		act 'Give blowjob':
 			*clr & cla
-			gs 'arousal', 'vaginal', 5, 'group'
-			gs 'arousal', 'bj', 5, 'group'
-			minut -= 5
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/4.jpg"></center>'
 			'You sit the guy down and start licking his cock before opening your lips and taking it into your mouth. You start passionately sucking until you see a second boat approaching. Your saviour obviously knows him and waves him aboard. He quickly jumps over into the boat and walks up to you. After checking you out, he pulls his cock out and slides it into your pussy.'
 
+			gs 'arousal', 'vaginal', 5, 'group'
+			gs 'arousal', 'bj', -5, 'group'
+			gs 'stat'
+			
 			act 'Further':
 				*clr & cla
-				gs 'arousal', 'vaginal', 5, 'group'
-				gs 'arousal', 'anal', 5, 'group'
-				minut -= 5
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/6.jpg"></center>'
 				'You climb on top of one of them, taking his cock into your pussy as the other penetrates your ass.'
 
+				gs 'arousal', 'vaginal', -5, 'group'
+				gs 'arousal', 'anal', 5, 'group'
+				gs 'stat'
 				act 'Change position':
 					*clr & cla
-					gs 'arousal', 'vaginal', 5, 'group'
-					gs 'arousal', 'anal', 5, 'group'
-					minut -= 5
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/8.jpg"></center>'
 					'The two guys move around in various positions as they take turns fucking both your holes.'
 
+					gs 'arousal', 'vaginal', 5, 'group'
+					gs 'arousal', 'anal', -5, 'group'
+					gs 'stat'
 					act 'Finish':
 						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/11.jpg"></center>'
+						'They both pull out and you kneel down to let them both cum in your mouth.'
+
 						gs 'cum_call', 'mouth', 'a rescuer at the lake'
 						gs 'cum_call', 'mouth', 'a rescuer at the lake'
 						gs 'arousal', 'end'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/11.jpg"></center>'
-						'They both pull out and you kneel down to let them both cum in your mouth.'
-
 						act 'Leave':gt 'city_lake', 'start'
 					end
 				end
@@ -1641,12 +1638,11 @@ if $ARGS[0] = 'horse1':
 
 		act 'Move on':
 			*clr & cla
-			gs 'arousal', 'foreplay', 5
-			minut -= 3
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse3.jpg"></center>'
 			'One of the men then suddenly grabs you and begins to paw at you as the other hugs you from behind and reaches into your panties.'
 
+			gs 'arousal', 'foreplay', 5
+			gs 'stat'
 			gs 'willpower', 'group', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Push them away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_lake', 'start'
@@ -1657,48 +1653,44 @@ if $ARGS[0] = 'horse1':
 			act 'Go with it':
 				*clr & cla
 				guy += 2
-				gs 'arousal', 'bj', 10, 'group'
-				minut -= 5
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse4.jpg"></center>'
 				'You pull their cocks out of their pants, squat down and begin to suck them in turn.'
 
+				gs 'arousal', 'bj', 5, 'group'
+				gs 'stat'
 				act 'Fuck them':
 					*clr & cla
-					gs 'arousal', 'vaginal', 5, 'group'
-					gs 'arousal', 'bj', 5, 'group'
-					minut -= 5
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse5.jpg"></center>'
 					'One of the men lies down and you continue to suck him as the other moves in behind and slides his cock into your pussy.'
 
+					gs 'arousal', 'vaginal', 5, 'group'
+					gs 'arousal', 'bj', -5, 'group'
+					gs 'stat'
 					act 'Change position':
 						*clr & cla
-						gs 'arousal', 'vaginal', 5, 'group'
-						gs 'arousal', 'bj', 5, 'group'
-						minut -= 5
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse6.jpg"></center>'
 						'You straddle one of the men and the other moves up and starts teasing you with his cock, letting you suck it before pulling away from you.'
 
+						gs 'arousal', 'vaginal', 5, 'group'
+						gs 'arousal', 'bj', -5, 'group'
+						gs 'stat'
 						act 'Change position':
 							*clr & cla
-							gs 'arousal', 'vaginal', 5, 'group'
-							gs 'arousal', 'bj', 5, 'group'
-							minut -= 5
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse7.jpg"></center>'
 							'You climb off the guy you were riding and get on all fours. The two of them then spitroast you as one fucks your pussy and the other pushes his dick into your mouth. You suck the dick in your mouth as you buck your hips, taking the cock as deep into your pussy as you can. A few minutes of this go by before you have a small but satisfying orgasm. You sense that the guys are close as well.'
 							$orgasm_or = 'yes'
+							gs 'arousal', 'vaginal', 5, 'group'
+							gs 'arousal', 'bj', -5, 'group'
 							gs 'arousal', 'end'
 							gs 'stat'
 
 							act 'Pull out':
 								*clr & cla
-								gs 'cum_call', 'mouth_swallow', 'Quad rider'
-								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse8.jpg"></center>'
 								'You remove the dick from your mouth and begin stroking it. A few seconds, a stream of cum splashes onto your tongue.'
 
+								gs 'cum_call', 'mouth_swallow', 'Quad rider'
+								gs 'stat'
 								act 'Suck the other guy':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse9.jpg"></center>'
@@ -1708,12 +1700,11 @@ if $ARGS[0] = 'horse1':
 
 									act 'Finish':
 										*clr & cla
-										gs 'cum_call', 'face', 'Quad rider'
-										
-										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse10.jpg"></center>'
 										'You remove the dick from your mouth and begin stroking it. A few seconds, a stream of cum splatters across your face.'
 
+										gs 'cum_call', 'face', 'Quad rider'
+										gs 'stat'
 										act 'Leave':gt 'city_lake', 'start'
 									end
 								end
@@ -1728,11 +1719,11 @@ end
 
 if $ARGS[0] = 'horse1bj':
 	*clr & cla
-	gs 'cum_call', 'mouth_swallow', 'Quad rider'
-	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse11.jpg"></center>'
 	'Cum pours into your mouth and you swallow it all before licking and sucking his cock clean.'
 
+	gs 'cum_call', 'mouth_swallow', 'Quad rider'
+	gs 'stat'
 	act 'Leave':gt 'city_lake', 'start'
 end
 
@@ -1765,37 +1756,33 @@ if $ARGS[0] = 'horse2':
 		act 'Tease them':
 			*clr & cla
 			guy += 2
-			gs 'arousal', 'bj', 10, 'group'
-			minut -= 5
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse3.jpg"></center>'
 			'You slowly rub their groins through their pants. The men look at each other and freeze as you kneel down, pull out their cocks and start stroking and sucking them.'
 
+			gs 'arousal', 'bj', 5, 'group'
+			gs 'stat'
 			act 'Lie back':
 				*clr & cla
-				gs 'arousal', 'anal', 5, 'group'
-				gs 'arousal', 'bj', 5, 'group'
-				minut -= 5
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse4.jpg"></center>'
 				'You lie on your back and one of the men grabs your ankles and spreads your legs wide enough to slide his dick into your ass. You squeal softly and the second kneels next to your head and tries to shove his dick into your mouth.'
 
+				gs 'arousal', 'anal', 5, 'group'
+				gs 'arousal', 'bj', -5, 'group'
+				gs 'stat'
 				act 'Suck him':
 					*clr & cla
-					gs 'arousal', 'bj', 10, 'group'
-					minut -= 5
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse5.jpg"></center>'
 					'You take his dick into your mouth and suck it as the other man fucks your ass.'
 
+					gs 'arousal', 'bj', 5, 'group'
+					gs 'stat'
 					act 'Change position':
 						*clr & cla
-						gs 'arousal', 'bj', 5, 'group'
-						gs 'arousal', 'anal', 5, 'group'
-						minut -= 5
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse6.jpg"></center>'
 						'The man you''re sucking pulls out and lies down. You straddle him as the other man moves in behind to penetrate your ass. The two men fuck you strongly and your whole body trembles as you orgasm. The two men sound like they''re close as well.'
 						$orgasm_or = 'yes'
+						gs 'arousal', 'bj', -5, 'group'
+						gs 'arousal', 'anal', 5, 'group'
 						gs 'stat'
 
 						act 'Change position':
@@ -1986,8 +1973,6 @@ if $ARGS[0] = 'Andrei_intro':
 			anreiday = daystart
 			guy += 1
 			gs 'boyStat', 'A46'
-			gs 'arousal', 'anal', 10
-			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/characters/city/andrew/sex/andreia.jpg"></center>'
 			'You try to break out of his grasp, but your feeble struggling makes him even more excited and you feel his now rock hard cock firmly press into your tender thigh.'
@@ -1995,6 +1980,8 @@ if $ARGS[0] = 'Andrei_intro':
 			'He forcefully spreads your ass and a wheeze escapes from your throat as his giant cock painfully enters your backdoor.'
 			'You grit your teeth in pain as he starts fucking your ass. However, his fingers start rubbing your clit and you start moaning softly.'
 
+			gs 'arousal', 'anal', 10
+			gs 'stat'
 			act 'More':
 				*clr & cla
 				gs 'cum_call', 'anus', 'A46'

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/gdksport.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 	if week <= 5 and hour >= 16 and hour < 18 and fedorKozlovQW >= 20:
 		'You can see <a href="exec: gt ''FedorMisc'', ''Fedor Workout''">Fedor</a> on his phone next to some punching bags.'
 	end
-	
+
 	if (temper < 15 or sunWeather ! 1) and hour > 8 and hour < 12 and week = 6 and bbpickupDay + 14 <= daystart and fbpickupDay ! daystart:
 		*nl
 		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''bbgamein'', ''start''">basketball court</a>.'
@@ -312,7 +312,7 @@ if $ARGS[0] = 'vball2':
 		if pcs_inhib < 40:inhib_exp += rand(0,1)
 	end
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	if alko < 2:
 		'At the beginning of the workout you ran a few laps around the gym. After some sprints, you did abdominal exercises. Afterwards, you practiced volleying and serving the ball.'
 	else
@@ -329,7 +329,7 @@ if $ARGS[0] = 'vball3':
 	menu_off = 1
 	gsAboVolley -= 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'On Fridays they hold intramural competitions. Scouts for professional teams sometime come to see who the stronger and more talented players are.'
 
 	if alko < 2:
@@ -365,7 +365,7 @@ if $ARGS[0] = 'vball4':
 	npc_rel['A69'] += 1
 	if pcs_inhib < 40:inhib_exp += rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'Number of games <<volsesongame>>, Win - <<volsesonwin>>, lesions - <<volsesonloss>>.'
 	'At the beginning of the workout you ran a few laps around the room. Afterwards the coach has you do push-ups and crunches. Then you practiced receiving and setting up plays and serving the ball. At the end of the workout you had a practice game.'
 	act 'Leave': gt 'gdksport', 'start'
@@ -396,9 +396,7 @@ end
 if $ARGS[0] = 'vball5':
 	*clr & cla
 	menu_off = 1
-!	gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'The tournament starts at 19:00. Your bus departs at 18:00. You gather your things together with the rest of the team and get on a bus that takes you to the out of town match.'
 	act 'Leave': gt 'gdksport', 'start'
 	act 'Get on bus and go to play':
@@ -723,9 +721,6 @@ if $ARGS[0] = 'ShowerWithIvan':
 					act 'Continue':
 						*clr & cla
 						if pcs_throat < dick:pcs_throat += 1
-						spafinloc = 12
-						gs 'cum_manage'
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum49.jpg"></center>'
 						'Bent over, expecting to feel his <<dick>>cm <<$dick_girth>> cock against your pussy at any moment, you are momentarily surprised when you feel it pressed up against your asshole.'
 						'Thinking he is unaware you speak up. "Wrong hole Ivan!" Ivan just snorts in response. "Yeah I know." He then pushes the head of his <<dick>>cm <<$dick_girth>> cock into your ass. You moan in a mixture of pain and pleasure.'
@@ -736,9 +731,11 @@ if $ARGS[0] = 'ShowerWithIvan':
 						'Apparently sensing your growing discomfort, he makes one more powerful thrust with a grunt then pulls out of your ass. He pulls you around and pushes you back down to your knees before he slides his cock back in your mouth. You try to ignore the taste of his cock, considering just where it just was.'
 						'You do you best to suck him off quickly and within moments, he is shooting his sperm into your mouth. Once he is done, he goes back to showering, quickly finishing up and starting to get dressed. He watches you as you get dressed. "That was great <<$pcs_nickname>>, we should do that again sometime." Without waiting for a reply, he leaves the room.'
 						gs 'arousal', 'anal', 5, 'sub', 'rough'
-						gs 'arousal', 'clit_finger', 5
-						minut -= 5
+						gs 'arousal', 'clit_finger', -5
 						gs 'arousal', 'end'
+						gs 'cum_call', 'mouth', 'A3', 1
+						cumspclnt = 1
+						gs 'cum_cleanup'
 						gs 'stat'
 						act 'Get out of the shower': gt 'gdksport', 'start'
 					end
@@ -746,8 +743,6 @@ if $ARGS[0] = 'ShowerWithIvan':
 					act 'Turn around and bend over':
 						*clr & cla
 						lubonus = 2
-						spafinloc = 3
-						gs 'Cum_Manage'
 						if pcs_ass + lubonus + 2 < dick:
 							if pcs_makeup > 1:pcs_makeup = 0
 							pcs_horny -= 20
@@ -765,8 +760,7 @@ if $ARGS[0] = 'ShowerWithIvan':
 						'One of your hands rubs your clit while the other one stays against the wall to brace yourself. He has amazing stamina in a seemingly endless supply. For a while, you buck your hips back against him, fucking him as much as he is fucking you, but no matter how much you love him fucking your ass, after a while you feel your ass beginning to get sore.'
 
 						gs 'arousal', 'anal', 5, 'sub', 'rough'
-						gs 'arousal', 'clit_finger', 5
-						minut -= 5
+						gs 'arousal', 'clit_finger', -5
 						gs 'stat'
 
 						if VoltrenerVoyeur = 3:
@@ -779,12 +773,14 @@ if $ARGS[0] = 'ShowerWithIvan':
 							if pcs_horny >= 100:
 								if stat['anal'] >= 10 and orgasm > 0:
 									pcs_mood += 20
-									$orgasm_or = 'custom'
 									$orgasm_txt = 'Your whole body contracts and then you cry out in orgasm.'
+									$orgasm_or = 'custom'
+									gs 'arousal', 'anal', -5, 'sub', 'rough'
 								end
 							end
 							'Your moans of pleasure start to turn into grunts of pain. Apparently sensing your growing discomfort, he makes one more powerful thrust with a grunt. His body spasms against yours as you feel him cumming in your ass. Once he is done he pulls out of you and goes back to showering, quickly finishing up and starting to get dressed.'
 							'He watches you as you get dressed. "That was great <<$pcs_nickname>>, we should do that again sometime." Without waiting for a reply, he leaves the room.'
+							gs 'cum_call', 'anus', 'A3', 1
 							cumspclnt = 1
 							gs 'cum_cleanup'
 							gs 'arousal', 'end'
@@ -845,9 +841,8 @@ if $ARGS[0] = 'Ivan_bored':
 		'He guides your head to his <<dick>>cm <<$dick_girth>> cock. Using one of your hands you grab his dick and start to stroke the shaft while you open your mouth and take his dick into your mouth. You wrap your lips tightly around his shaft and start sucking him, while using your tongue to tease the head. You alternate your hand from stroking him and fondling his balls.'
 		'He moans and grabs your hair, you can feel he is restraining himself from forcing your head down and jamming his dick down your throat. After a couple of minutes, he growls a bit and stands up, pulling you up as well. Without explaining he turns you around so quickly you almost stumble, only his strong hands on you keep you from falling into the stall wall. He roughly bends you over, using one hand to guide his cock while the other grabs your butt cheek to spread it open.'
 		gs 'arousal', 'kiss', 5, 'sub'
-		gs 'arousal', 'hj', 5, 'dom'
-		gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
-		minut -= 5
+		gs 'arousal', 'hj', -5, 'dom'
+		gs 'arousal', 'bj', -5, 'sub', 'deepthroat'
 		gs 'stat'
 		act 'Let him':
 			*clr & cla
@@ -870,17 +865,16 @@ if $ARGS[0] = 'Ivan_bored':
 			'He rubs the tip of his dick against your asshole for a couple of moments and then you feel a sharp pain as he pushes it in. With only your saliva as lubrication, it doesn''t slide in as easily. You bite your lip and cry out a little in pain. He relaxes a little and rubs your back as he takes it slow, giving you time to stretch and adjust to his cock invading your ass.'
 			'He slowly strokes his <<dick>>cm <<$dick_girth>> cock in your ass, with each stroke pushing it just a little deeper in your ass. Once he is about half way in your moans turn from pain to pleasure, while one of your hands starts rubbing your clit. You start moaning louder and panting, your pussy is now soaking wet. After a couple of minutes the pleasure is building up inside of your body so much you no longer even need to stimulate your clitorous any longer. "Fuck <<$pcs_nickname>>, you not only have the hottest ass of any girls in school, but the tightest one I have ever fucked." Ivan says as he can tell you''re getting into it, grabbing your hips with both hands. He drives himself balls deep into your ass, eliciting a squeak of pain from you, but sensation of pain is quickly overwhelmed by pleasure.'
 			'Holding onto your hips with both hands, he holds you steady and keeps you from pulling away, as he jack hammers his <<dick>>cm <<$dick_girth>> cock balls deep in your ass. You moan in pain and pleasure, mostly pleasure, the sounds of your moans, almost drowned out the sounds of his skin slapping against yours, his balls slapping against your wet pussy. You place your hands against the stall wall to keep him from driving your head into it, from his powerful and violent thrusts. As he abuses your poor little asshole, you find yourself loving every second of it.'
-			*nl
-			'You have an intense orgasm that leaves your legs shaking and barely able to keep standing. You are almost to the point where you are unable to take it anymore, either from the intense pleasure or the growing burning sensation in your ass. Either way the matter is moot, as Ivan drives himself once more balls deep into your ass, but this time holds himself there. You feel his cock twitching as he shoots hot sperm deep in your ass, spurt after spurt filling you up with his semen in what seems an almost unending stream. Finally he takes a shuddering breath and pulls out of you, leaving you to almost collapse with out his support.'
-			'You both start to get dressed, him faster than you, as your still unsteady on your feet, from your shaky legs. Once he is done getting dressed he helps you gather the rest of your clothes from where he tossed them aside. As you are seeing to the final adjustments of your clothes he goes to the bathroom door and looks out both ways down the hall, motioning you over just as the class bell rings. Oh well, at least you have a good excuse to be a little late, you think to yourself with a smile.'
-			'As you start to go out the door, he stops you and squeezes your ass with his strong hand and says. "That was great <<$pcs_nickname>>, you are coolest chick in school, not to mention the hottest. Maybe we can do this again sometime soon, or maybe I will come see you in the shower at the community center some night, maybe even tonight." He grins and winks at you, giving your ass a hard slap, as he rushes off to class. You only have time to nod in agreement to his idea of doing this again, you bite your lip as you watch him go. You have mixed feelings about this, Ivan is a great guy and a lot of fun, but you know he doesn''t want a girlfriend. He just wants to be friends with benefits, but is that enough for you? You don''t have time to think on it more as you hurry to class.'
-
+			$orgasm_txt = 'You have an intense orgasm that leaves your legs shaking and barely able to keep standing. You are almost to the point where you are unable to take it anymore, either from the intense pleasure or the growing burning sensation in your ass. Either way the matter is moot, as Ivan drives himself once more balls deep into your ass, but this time holds himself there. You feel his cock twitching as he shoots hot sperm deep in your ass, spurt after spurt filling you up with his semen in what seems an almost unending stream. Finally he takes a shuddering breath and pulls out of you, leaving you to almost collapse with out his support.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'anal', 5, 'sub', 'rough'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue': gt 'gschool_lessons', 'short_break'
+			*nl
+			'You both start to get dressed, him faster than you, as your still unsteady on your feet from your shaky legs. Once he is done he helps you gather the rest of your clothes from where he tossed them. As you are seeing to the final adjustments he goes to the bathroom door and looks out both ways down the hall, motioning you over just as the class bell rings. Oh well, at least you have a good excuse to be a little late, you think to yourself with a smile.'
+			'As you start to go out the door, he stops you and squeezes your ass with his strong hand and says. "That was great <<$pcs_nickname>>, you are coolest chick in school, not to mention the hottest. Maybe we can do this again sometime soon, or maybe I will come see you in the shower at the community center some night, maybe even tonight." He grins and winks at you, giving your ass a hard slap, as he rushes off to class. You only have time to nod in agreement to his idea of doing this again, biting your lip as you watch him go. You have mixed feelings about this, Ivan is a great guy and a lot of fun, but you know he doesn''t want a girlfriend. He just wants to be friends with benefits, but is that enough for you? You don''t have time to think on it more as you hurry to class.'
 
+			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
 
 	end
@@ -917,7 +911,7 @@ if $ARGS[0] = 'Fedor First Date':
 
 			act 'Agree':
 				*clr & cla
-				npc_rel['A5'] += 20
+				gs 'npc_relationship', 'modify', 'A5', 20
 				fedorKozlovQW = 10
 				minut += 15
 				gs 'stat'
@@ -931,7 +925,11 @@ if $ARGS[0] = 'Fedor First Date':
 				*clr & cla
 				if fedorkozbreak = 0:fedorKozlovQW = 0
 				if fedorkozbreak = 1:fedorKozlovQW = -1
-				npc_rel['A5'] = 70
+				if npc_rel['A5'] > 70:
+					gs 'npc_relationship', 'set', 'A5', 70
+				else
+					gs 'npc_relationship', 'modify', 'A5', 'loathe'
+				end
 				minut += 15
 				gs 'stat'
 				'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
@@ -949,7 +947,11 @@ if $ARGS[0] = 'Fedor First Date':
 	
 	act 'Refuse':
 		*clr & cla
-		npc_rel['A5'] = 70
+		if npc_rel['A5'] > 70:
+			gs 'npc_relationship', 'set', 'A5', 70
+		else
+			gs 'npc_relationship', 'modify', 'A5', 'loathe'
+		end
 		gs 'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor ">><<"[Fedor]">><<" Kozlov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'

locations/gopskver.qsrc

@@ -24,11 +24,11 @@ if $ARGS[0] = '':
 	if kotovLoveQW > 0:
 		if hour < 20:
 			if $prevloc = 'gkafe':
-				'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
+				'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and asks you to join them.'
 			elseif $prevloc = 'pav_train_hall':
-				'Vitek Kotov sees you entering the train station and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
+				'Vitek Kotov sees you entering the train station and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and asks you to join them.'
 			else
-				'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends in the park, and offers you to join them.'
+				'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and asks you to join them.'
 			end
 
 			act 'Decline and leave':
@@ -45,7 +45,7 @@ if $ARGS[0] = '':
 				gs 'drugs', 'alcohol', 'beer'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
-				'The guys pour out a beer for you, and you enjoy a nice cold beer in their company.'
+				'The guys pour one for you, and you enjoy a nice cold beer in their company.'
 
 				act 'Continue':
 					if $prevloc = 'gkafe':
@@ -61,14 +61,16 @@ if $ARGS[0] = '':
 						'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
 						act 'Go to the disco with the boys':minut += 15 & gt 'pav_disco'
 					else
-						'It''s evening, and the boys are getting ready to go to Vasily'' Home. You could call it a night and leave them alone, or tag along.'
+						'It''s evening, and the boys are getting ready to go to Vasily''s Home. You could call it a night and leave them alone, or tag along.'
 						act 'Go with the boys':minut += 15 & gt 'shulgahall'
 					end
 				end
 				exit
 			end
 
-			if alko > 3:
+			act 'Give Vitek a sly wink':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
 				'Vitek comes over to you and quietly asks: "Hey baby... do you want to keep drinking with the boys, or do you want to go to my house with me?"'
 
 				act 'Go with Vitek':
@@ -80,6 +82,20 @@ if $ARGS[0] = '':
 
 					act 'Continue':gt 'kotovSex'
 				end
+				
+				act 'Say no':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
+					'Sorry, babe. I didn''t mean to tease, but have to get going.'
+					
+					act 'Continue':
+						if $prevloc = 'gkafe':
+							gt 'gkafe'
+						else
+							gt 'pav_park', 'start'
+						end
+					end
+				end
 			end
 		elseif hour >= 20:
 			*nl
@@ -211,6 +227,7 @@ if $ARGS[0] = '':
 					*clr & cla
 
 					if sgopgang = 0:sgopgang = 1
+					!! Not sure about this older code I don't know how to add it so it does a pre-cum check (Alaratt)
 					if npc_Sex['A9'] = 0: npc_Sex['A9'] = 1 & guy += 1
 					if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
 					if npc_Sex['A11'] = 0: npc_Sex['A11'] = 1 & guy += 1
@@ -218,27 +235,20 @@ if $ARGS[0] = '':
 					stat['vaginal'] += 3
 					gang += 1
 					pcs_vag += 3
-					gs 'boyStat', 'A11'
-					cumprecheck = 1
-					gs 'cum_manage'
-					gs 'boyStat', 'A11'
-					sexpartkno = 1
-					spafinloc = 14
-					gs 'cum_manage'
-					gs 'boyStat', 'A10'
-					sexpartkno = 1
-					spafinloc = 14
-					gs 'cum_manage'
-					gs 'boyStat', 'A9'
-					sexpartkno = 1
-					spafinloc = 14
-					gs 'cum_manage'
-					gs 'stat'
+
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/gopgang.jpg"></center>'
 					'At some point, you pass out. When you wake up you''re lying on your back, and you feel something moving inside your pussy. You carefully open your eyes, and between the blinking you see Vasily''s contorted face, hammering his hips against yours. Is he fucking you!?'
 					'A few seconds later, he pulls out and you feel several warm drops landing on your stomach. You lose consciousness again, and a little while later you wake up to find yourself getting fucked by Dan. He''s just about finished, and shoots his load onto your stomach as well. Vitek immediately replaces him, and roughly fucks you as if you''re little more than a few fuckholes to him. Then again, maybe that''s how they really see you.'
 					'He quickly adds his load to that of his friends, and you fade out of consciousness again with a soft groan. When you finally come to your senses you find yourself alone on the sofa, and just rest for a moment. The boys are sitting at the table in the room, drinking more beers. You should probably get going soon, before they decide they''re ready for another round.'
 
+					gs 'boyStat', 'A11'
+					gs 'cum_call', 'stomach', 'A11', 1
+					gs 'boyStat', 'A11'
+					gs 'cum_call', 'stomach', 'A10', 1
+					gs 'boyStat', 'A11'
+					gs 'cum_call', 'stomach', 'A9', 1
+					gs 'stat'
+					
 					act 'Leave':gt 'pav_residential'
 				end
 			end
@@ -333,7 +343,6 @@ if $ARGS[0] = '':
 
 						act '"Yes, that''s true"':
 							*clr & cla
-							gs 'stat'
 							'You have a slight blush on your face when you confess: yes, you do like giving blowjobs. Vasily has a cheeky smile when he continues: "And is it true that you let them finish inside your mouth?"'
 
 							act '"Yes, that''s true too"':
@@ -344,7 +353,6 @@ if $ARGS[0] = '':
 
 								act '"No way!"':
 									*clr & cla
-									gs 'stat'
 									'You indignantly reject Vasily''s proposal: "No way, Shulga! I can''t just do that for everyone who asks!"'
 									'Dan suddenly growls at you: "Shut up, whore. I''ve seen you suck cocks of just about anyone you meet, and swallow their loads to the last drop! They make videos when you''re not paying attention... and now suddenly we''re not good enough for you?"'
 									'You''re a bit afraid of his sudden outburst and try to explain yourself: "Dan please, you have to understand! I don''t just su-"'
@@ -352,7 +360,6 @@ if $ARGS[0] = '':
 
 									act 'Be a nice little slut':
 										*clr & cla
-										gs 'stat'
 										'You don''t want to anger Dan any further, and decide to back down. You softly say: "Relax, Dan... I''m sorry, I didn''t mean to insult you or your friends. I''ll do it."'
 										'Dan smirks at you: "I forgive you, slut... I guess you just didn''t know what to do yet, when someone asks you for your whore mouth. We''ll teach you what you need to know about your place in the world. Get down before me and start sucking!"'
 										gs 'gopskver', 'triple_blow'
@@ -383,7 +390,6 @@ if $ARGS[0] = '':
 
 								act '"Well, maybe... just don''t tell anyone!"':
 									*clr & cla
-									gs 'stat'
 									'Dan grins at you while he reaches for his pants: "Your secret is safe with us, baby. Now get down on your knees and take my cock in your mouth!"'
 									gs 'gopskver', 'triple_blow'
 								end
@@ -391,7 +397,6 @@ if $ARGS[0] = '':
 
 							act '"No, that''s a lie!"':
 								*clr & cla
-								gs 'stat'
 								'You spit on the ground, and pretend to be insulted: "No way, Vasily! That''s disgusting!"'
 
 								if swallow > 0:
@@ -402,14 +407,13 @@ if $ARGS[0] = '':
 									'Dan chuckles: "Maybe you can''t get a guy off with your mouth yet? Don''t worry <<$pcs_nickname>>, we will help you with your technique..."'
 								end
 
-								'Dan sharply says as he reaches for his pants and exposes his hard cock: "Enough talk! I think it''s time <<$pcs_nickname>> shows us what a good little slut she is. Take it in your mouth!"'
+								'Dan reaches for his pants and exposes his hard cock: "Enough talk! I think it''s time <<$pcs_nickname>> shows us what a good little slut she is. Take it in your mouth!"'
 								gs 'gopskver', 'triple_blow'
 							end
 						end
 
 						act '"No, that''s a lie!"':
 							*clr & cla
-							gs 'stat'
 							'You pretend to be insulted at the mere notion, but Dan gets angry: "<<$pcs_nickname>>, you''re a slut! I know it, you know it, the whole fucking town knows it! Don''t be a stuck up bitch and start sucking!"'
 							gs 'gopskver', 'triple_blow'
 						end

locations/igorev.qsrc

@@ -855,11 +855,11 @@ if $ARGS[0] = 'din_sisterkom_krossdress':
 													'You continue on sucking his small dick. It starts twitching, he''s close to erupt. You quickly deepthroat and swallow the cum that shoots into your mouth. Some of it sips out and flows from your mouth onto Igor. Finally the flow dies down and you release the now limp cock out of your mouth. Your <<$pc_desc[''lips'']>> lips are wet from semen. While you put all you might into handling Igor''s cum, Igor continues licking your now dripping pussy.'
 													'You lick up the remaining sperm from Igor''s cock and swallow it. You turn your head around seeing Igor still going strong. You are impressed by Igor''s stamina.'
 													'Suddenly you feel a bolt jolting in your pussy and you start screaming. You''re on the edge ready to cum. You tell Igor not to stop, suddenly you start to tremble, embracing the orgasm.'
-													gs 'arousal', 'bj', 15
+													gs 'arousal', 'bj', -15
 													$orgasm_or = 'yes'
 													gs 'arousal', 'cuni', 15
 													gs 'arousal', 'end'
-													minut -= 15
+													gs 'cum_call', 'mouth_swallow', 'A4', 1
 													gs 'stat'
 													act 'Finish':
 														*clr & cla

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/kompMFCoral.qsrc

@@ -63,7 +63,7 @@ if dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1
 					'You are terribly inexperienced at giving blowjobs.  Hesitantly you take your medium dildo into your mouth and do your best to put on an entertaining show.'
 					'You realize that with your inexperience you can''t really do much with this dildo that you couldn''t do with a smaller one.  Nonetheless your clients seem to appreciate the effort and your ambition and you get a few donations.'
 				end
-				if pcs_throat => 15 and pcs_throat < 25:
+				if pcs_throat >= 15 and pcs_throat < 25:
 					pcs_throat += 1
 					mfcclients = 0
 					webpopular += rand(hotcat/2 -2,hotcat/2)

locations/lakecafe.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'main':
 			if barrnd = 1:'You see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a> behind the bar polishing some glasses.'
 			if barrnd = 2:'When you walk into the diner, you see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a> picking up some dirty dishes and cleaning a table.'
 			if barrnd = 3:'You see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a> behind the bar skilfully making some drinks.'
-		elseif npc_QW['A89'] => 1:
+		elseif npc_QW['A89'] >= 1:
 			if barrnd = 1:'You see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a> behind the bar with that perpetual smile on her face. She''s currently polishing some glasses.'
 			if barrnd = 2:'You walk into the diner and see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a> with that perpetual smile on her face collecting dirty dishes from tables.'
 			if barrnd = 3:'You see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a> behind the bar with that perpetual smile on her face. She''s skilfully mixing some drinks.'

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/liam.qsrc

@@ -63,8 +63,6 @@ act 'Walk to the Commercial area (0:25)':minut += 25 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:30)':minut += 30 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:30)':minut += 30 & gt 'pav_industrial'
 
-act 'Wait':gs 'obj_din', 'wait'
-
 if pushkin_walk_day ! daystart:
 	act 'Take a walk (1:00)':
 		cla & *nl
@@ -78,5 +76,7 @@ if pushkin_walk_day ! daystart:
 	end
 end
 
+act 'Wait':gs 'obj_din', 'wait'
+
 --- liam ---------------------------------
 

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/nichTaras.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'abdIntro':
 		act 'Call for help':
 			'You scream for help as loud as you possibly can. Nothing happens. Did anybody hear you at all?'
 		end
-		if pcs_sleep <= 40:
+		if pcs_sleep <= 40 or cheatNoSleep ! 0:
 			act 'Try to sleep':
 				nichAbdStage = 20
 				gt 'nichTaras','abdIntro'
@@ -307,7 +307,7 @@ elseif $ARGS[0] = 'dungeon':
 		if $ARGS[2] = '':
 			'<center><img <<$set_imgh>> src="images/characters/city/taras/dungeonBed.jpg"></center>'
 			'You crawl over to the bed. Being tied up you have a hard time climbing on the mattress. It isn''t very comfortable but still better than the cold ground.'
-			if pcs_sleep < 80:
+			if pcs_sleep < 80 or cheatNoSleep ! 0:
 				act 'Sleep':
 					gt 'nichTaras','dungeon', 'bed', 'sleep'
 				end
@@ -337,7 +337,7 @@ elseif $ARGS[0] = 'dungeon':
 				minut += 240
 				pcs_sleep = min(100 , pcs_sleep + 60)
 				gs 'stat'
-				if pcs_sleep < 80:
+				if pcs_sleep < 80 or cheatNoSleep ! 0:
 					act 'Sleep':
 						gt 'nichTaras','dungeon', 'bed', 'sleep'
 					end
@@ -477,7 +477,7 @@ elseif $ARGS[0] = 'session':
 				minut += 60
 				gs 'stat'
 			end
-			if pcs_sleep < 80:
+			if pcs_sleep < 80 or cheatNoSleep ! 0:
 				act 'Sleep':
 					nichTarasSessionStage = 11
 					gt 'nichTaras','session'
@@ -546,7 +546,7 @@ elseif $ARGS[0] = 'session':
 						minut += 60
 						gs 'stat'
 					end
-					if pcs_sleep < 80:
+					if pcs_sleep < 80 or cheatNoSleep ! 0:
 						act 'Sleep':
 							nichTarasSessionStage = 21
 							gt 'nichTaras','session'
@@ -758,4 +758,5 @@ elseif $ARGS[0] = 'vanAbduct':
 	end
 end
 
---- nichTaras ---------------------------------
+--- nichTaras ---------------------------------
+

locations/pav_park.qsrc

@@ -288,7 +288,7 @@ if $ARGS[0] = 'start':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-	if (hour >= 20 or hour < 6) and pcs_sleep <= 40:
+	if (hour >= 20 or hour < 6) and pcs_sleep <= 40 or cheatNoSleep ! 0:
 		if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
 			!nowhere to live in town
 			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'

locations/pav_pharmacy.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = 'buy_condoms':
 				'She just laughs. "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the condoms. "We also have birth control pills if you prefer bareback."'
 			end
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
-			if momslut = 1:
+			if momslut >= 1:
 				'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
 				'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 				'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use them all at once!" She adds with a wink, you just take your purchase.'
@@ -219,7 +219,7 @@ if $ARGS[0] = 'buy_birth_control':
 				'She just laughs: "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the birth control pills. "We also have condoms if you are worried about STD''s. You can never tell who''s clean and who isn''t these days."'
 			end
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
-			if momslut = 1:
+			if momslut >= 1:
 				'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
 				'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 				'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
@@ -299,7 +299,7 @@ if $ARGS[0] = 'buy_preg_test':
 			'She looks a little shocked. "<<$pcs_nickname>> oh my god." Then she shakes her head. "If you are going to be sexual active you really need to use birth control or carry some condoms with you. But let me show you what we have in the way of tests." She takes you by the hand and takes you to the family planning counter that holds the pregnancy tests as well as birth control pills and condoms. "You should really buy some of each for protection against this and STD''s."'
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
 		end
-		if momslut = 1:
+		if momslut >= 1:
 			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
 			'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 			'Luda nods and hands over the package. "It''s our secret for now, though if that test is positive there''s nothing that will stop her from noticing when your belly starts to round out. Whether it is or it isn''t, I threw in a box of condoms so this doesn''t happen again, okay?"'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'buy_lube':
 			'"Trying to get around your mothers tests?" She laughs. "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the lube, "We also have birth control pills and condoms if you want them to fuck your pussy, instead of your butt."'
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
 		end
-		if momslut = 1:
+		if momslut >= 1:
 			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
 			'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 			'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
@@ -414,7 +414,7 @@ if $ARGS[0] = 'buy_morning_after':
 				'"Take this as soon as possible. It''s most effective the sooner you take it. And maybe you should also buy some birth control pills <<$pcs_nickname>> while you''re here? Then this just has to be a one time thing."'
 			end
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
-			if momslut = 1:
+			if momslut >= 1:
 				'Your aunt gives you a odd look. "You might be surprised dear."'
 				'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 				'Luda nods. "Well, even so, I''m sure she''d prefer hearing that you''re taking this than to find out you''re not. But I promise, this will be our little secret."'
@@ -467,7 +467,5 @@ if $ARGS[0] = 'buy_morning_after':
 	end
 end
 
-
-
 --- pav_pharmacy ---------------------------------
 

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', $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':
@@ -1377,7 +1377,7 @@ if $ARGS[0] = 'bandsex':
 			'You automatically get rid of your clothes before kneeling down in front of him and begin to suck the guy off eagerly, teasing him by licking his balls before you take his cock in your mouth again. The man orgasms in no time at all, and you swallow his load without giving it another thought.'
 			gs 'arousal', 'bj', 10
 			gs 'arousal', 'end'
-			gs 'cum_call', 'mouth', $boy
+			gs 'cum_call', 'mouth_swallow', $boy
 			gs 'stat'
 			'The guy still lies on the bed in post-orgasmic bliss while you put your clothes back on and resume your round, with only the tangy taste of his cum in your mouth as a reminder of what you just did.'
 		else
@@ -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
@@ -139,7 +139,7 @@ if $ARGS[0] = '1-1':
 			dynamic $showerdin
 			gs 'stat'
 			postmarriedQW = 2
-!!!!cum cleanup - you clean his (and anyone else''s cum that happens to be there) off you with a washcloth
+			!!cum cleanup - you clean his (and anyone else''s cum that happens to be there) off you with a washcloth
 			'"Relax, you did nothing wrong! She''s the one not taking care of you! Right?" you tell him. The man looks at you, still rather doubtful.'
 			'"Right!?" you repeat.'
 			'"I guess... but..." he mutters.'
@@ -297,7 +297,7 @@ if $ARGS[0] = '2-1':
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-8.jpg"></center>'
-!!!!precum check for Arsen fucking you
+			!!precum check for Arsen fucking you
 			cumprecheck = 1
 			gs 'cum_manage'
 			'The alcohol is really hitting you hard now, and the room feels a bit wobbly when Arsen pulls you on top of him. He guides his cock to your pussy and grunts in your ear: "Sit down on it. Go on."'
@@ -318,16 +318,16 @@ if $ARGS[0] = '2-1':
 				'"Remember, don''t cum inside her!" Jenya reminds Arsen. "If you''re cumming inside anyone, it should be me..."'
 				act 'Continue':
 					*clr & cla
-!!!!both cum on your face, but Jenya licks it off before you leave. No cum deposit needs to be tracked, if anything a ''clean face'' trigger
+					!!both cum on your face, but Jenya licks it off before you leave. No cum deposit needs to be tracked, if anything a ''clean face'' trigger
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-10.jpg"></center>'
 					'Arsen pulls out of you, and tells you to get on your knees.'
 					'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,10 +413,10 @@ if $ARGS[0] = '2-2':
 					act 'Let Arsen cum in your mouth':
 						*clr & cla
 						minut += 5
-						gs 'cum_call', 'mouth', $boy
+						gs 'cum_call', 'mouth_swallow', 'A163', 1
 						gs 'boyStat', 'A164'
-						gs 'cum_call', 'mouth', $boy
-	!!!!cum management: you have the loads of both Maksim and Arsen in your mouth and swallow them
+						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?'
 						'When Arsen pulls back, she grins proudly at you and locks her lips onto yours. Suddenly your mouth is even more filled with sperm! Jenya kept Maksim''s load in her mouth when he came, and just fed it to you...'
@@ -430,7 +430,7 @@ if $ARGS[0] = '2-2':
 							pcs_sleep += 15
 							pcs_health += 60
 							gs 'stat'
-	!!!!energy gain, equivalent of an hour of napping
+							!!energy gain, equivalent of an hour of napping
 							'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-17.jpg"></center>'
 							'A nap doesn''t sound so bad! "Now that you mention it, I could use a nap..." you tell her, and get comfortable in the bed.'
 							'Jenya embraces you and you both fall asleep. An hour later she wakes up again and begins to rub her body against yours. Her soft kisses on your neck give you goosebumps all over your body.'
@@ -464,7 +464,7 @@ if $ARGS[0] = '2-2':
 		act 'Agree to ride Arsen':
 			*clr & cla
 			minut += 5
-!!!!precum check for Arsen fucking you
+			!!precum check for Arsen fucking you
 			cumprecheck = 1
 			gs 'cum_manage'
 			gs 'pain', 1, 'asscheeks'
@@ -487,13 +487,13 @@ if $ARGS[0] = '2-2':
 				gs 'stat'
 				act 'Let Arsen cum in your mouth':
 					*clr & cla
-!!!!cum management: you have the loads of both Maksim and Arsen in your mouth and swallow them
+					!!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, 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', $boy
+					gs 'cum_call', 'mouth_swallow', 'A163', 1
 					gs 'boyStat', 'A164'
-					gs 'cum_call', 'mouth', $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..."'
@@ -506,7 +506,7 @@ if $ARGS[0] = '2-2':
 						pcs_sleep += 15
 						pcs_health += 60
 						gs 'stat'
-!!!!energy gain, equivalent of an hour of napping
+						!!energy gain, equivalent of an hour of napping
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-17.jpg"></center>'
 						'A nap doesn''t sound so bad! "Now that you mention it, I could use a nap..." you tell her, and get comfortable in the bed.'
 						'Jenya embraces you and you both fall asleep. An hour later she wakes up again and begins to rub her body against yours. Her soft kisses on your neck give you goosebumps all over your body.'
@@ -567,17 +567,15 @@ if $ARGS[0] = '3':
 		
 		act 'Please him with your mouth': gt 'post_events', '3-1'
 	end	
-	!if sub > 20:
-		act '"I like being told what to do."':
-			cla
-			postcuffs = 1
-			'"I like being told what to do."'
-			'"Do you, now?" the man grins evilly. "In that case, let''s make this a little bit more interesting. Close your eyes, turn around and put your hands behind your back."'
-			'You hear him rummaging in the nightstand drawer for a moment, and then feel the cold touch of metal on your wrists. He tells you: "Those are not coming off until you get me off. Start sucking."'
+	act '"I like being told what to do."':
+		cla
+		postcuffs = 1
+		'"I like being told what to do."'
+		'"Do you, now?" the man grins evilly. "In that case, let''s make this a little bit more interesting. Close your eyes, turn around and put your hands behind your back."'
+		'You hear him rummaging in the nightstand drawer for a moment, and then feel the cold touch of metal on your wrists. He tells you: "Those are not coming off until you get me off. Start sucking."'
 
-			act 'Please him with your mouth': gt 'post_events', '3-1'
-		end
-	!end	
+		act 'Please him with your mouth': gt 'post_events', '3-1'
+	end	
 end
 
 if $ARGS[0] = '3-1':
@@ -589,22 +587,22 @@ if $ARGS[0] = '3-1':
 	end
 	
 	if stat['bj'] >= 50:
-!!!!you swallow his load
+		!!you swallow his load
 		'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', $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..."'
 		
 		act 'Continue': gt 'post_events', '3-2'
 	elseif stat['bj'] > 15:
-!!!!you swallow his load
+		!!you swallow his load
 		'You have some experience giving blowjobs, but it''s difficult to do without being able to use your hands!'
 		'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', $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."'
 		
@@ -622,14 +620,14 @@ if $ARGS[0] = '3-1':
 			act 'Beg him to let you try again (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
-!!!!you swallow his load
+				!!you swallow his load
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-6.jpg"></center>'
 				'You shake your head no and beg him: "No, I can do it! Please let me try again! No need for that thing."'
 				'He looks at you intently for a second, but puts the gag away. "Alright then," he sighs. "I''ll give you one more chance. Get down on your knees in front of me."'
 				'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', $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."'
@@ -640,13 +638,13 @@ if $ARGS[0] = '3-1':
 		end
 		act 'Open your mouth obediently':
 			*clr & cla
-!!!!you swallow his load
+			!!you swallow his load
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-5.jpg"></center>'
 			'You let the man put the ring into your mouth, and wait obediently while he fastens it behind your head.'
 			'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', $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!"'
 
@@ -710,7 +708,6 @@ if $ARGS[0] = '4':
 		'Surely getting to look at your body while you jerk him off will get him off faster?'
 		'You wordlessly slip out of your clothes, and the man grins triumphantly at you: "That''s it, girl... way to go the extra mile!"'
 		'You ignore his comments, while his eyes rove your exposed body.'
-		!if pcs_dom > 25: Not sure what to do here, so Ill do rand for now
 		if rand(0,1) = 0:
 			'When he reaches out to touch you, you slap away his hand and sternly say: "No touching, that was not part of the deal. Try that again and I''m out of here."'
 			'He raises his hands apologetically and puts them behind his head, while you resume jerking him off. A few minutes later, his breathing becomes more shallow and you can tell he''s close to orgasming.'
@@ -720,13 +717,13 @@ if $ARGS[0] = '4':
 			'The man groans in frustration, and just when he was about to complain you remind him: "You made me touch your dick, and I did. Now sign so I can go."'
 			'He signs without saying a word, still a bit dazed on how you nearly made him cum and then completely ruined his orgasm. You wipe your hand on his bed sheets and put your clothes back on.'
 		else
-!!!!cum on face
+			!!cum on face
 			'You keep your bra on, to at least remain somewhat decent. Just when you want to put your hand back on his cock, he gets up from the bed and forces you down on your back, before straddling you.'
 			'"That''s better... keep stroking, girl!" he groans, while he pulls your bra aside. "You have nice tits, you shouldn''t be hiding them. Keep jerking me off! That''s it..."'
 			'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!'
@@ -760,7 +757,7 @@ if $ARGS[0] = '4':
 		gs 'stat'
 		act 'Don''t let him cum in your mouth':
 			*clr & cla
-!!!!cum on face
+			!!cum on face
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-8.jpg"></center>'
 			'You quickly take his cock out of your mouth when you realize he''s about to burst, but can''t prevent him from shooting his warm load all over your face. Luckily you managed to close your eyes on time!'
 			'"Thaaat''s a good girl..." he groans, definitely pleased with himself. "That''s a nice look for you! But I guess you hear that a lot, huh?" he laughs.'
@@ -770,8 +767,8 @@ if $ARGS[0] = '4':
 		end
 		act 'Make him cum in your mouth':
 			*clr & cla
-!!!!cum in mouth
-			gs 'cum_call', 'mouth', $boy
+			!!cum in mouth
+			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/road.qsrc

@@ -22,32 +22,32 @@ if $ARGS[0] = '':
 	'Smaller villages named Gadukino and Pushkin can be found along the way. Cars are driving by you at a high speed.'
 
 	if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> next to the road.'
-	if nroad = 0:act 'Walk to the City Industrial Region (0:15)':minut += 15 & gt 'city_industrial'
+	if nroad = 0: act 'Walk to the City Industrial Region (0:15)': minut += 15 & gt 'city_industrial'
 	if nroad = 10:
 		act 'Go to Gadukino (0:15)': minut += 15 & gt 'gadukino'
 		act 'Go to the train platform': gt 'train', 'village'
-		if npc_QW['A60'] > 15:act 'Look around for Mira': gt 'gadprostitutes', 'start'
+		if npc_QW['A60'] > 15: act 'Look around for Mira': gt 'gadprostitutes', 'start'
 	end
-	if nroad = 16:act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
+	if nroad = 16: act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
 	if nroad = 20:
 		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pav_train_hall'
 		act 'Walk to Pavlovsk Commercial area (0:15)': minut += 15 & gt 'pav_commercial'
 	end
-	if nroad < 20:act 'Walk towards Pavlovsk (0:20)':minut += 20 & nroad += 1 & gt $curloc
-	if nroad > 0:act 'Walk towards St. Petersburg (0:20)':minut += 20 & nroad -= 1 & gt $curloc
-	if nroad>0 and nroad<20:
-		act'Try hitchhiking towards Pavlovsk':
+	if nroad < 20: act 'Walk towards Pavlovsk (0:20)': minut += 20 & nroad += 1 & gt $curloc
+	if nroad > 0: act 'Walk towards St. Petersburg (0:20)': minut += 20 & nroad -= 1 & gt $curloc
+	if nroad > 0 and nroad < 20:
+		act 'Try hitchhiking towards Pavlovsk':
 			cls
-			minut+=15
-			gs'stat'
-			gorand=rand(1,100)
-			picrand = RAND(1,3)
-			if gorand<=60:
+			minut += 15
+			gs 'stat'
+			gorand = rand(1, 100)
+			picrand = RAND(1, 3)
+			if gorand <= 60:
 				'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 				'<center><img <<$set_imgh>> src="images/locations/highway/autostop (<<picrand>>).jpg" ></center>'
 				'You try to catch the attention of people driving towards Pavlovsk, but everyone just rushes by, ignoring you completely.'
-				act 'Continue':gt $curloc
-			elseif gorand>60:
+				act 'Continue': gt $curloc
+			elseif gorand > 60:
 				gs 'road', 'autostop_d'
 				if nroad < 10:
 					act 'Ask the driver to take you to Gadukino':
@@ -61,18 +61,18 @@ if $ARGS[0] = '':
 				end
 			end
 		end
-		act'Try hitchhiking towards St. Petersburg':
+		act 'Try hitchhiking towards St. Petersburg':
 			cls
-			minut+=15
-			gs'stat'
-			gorand=rand(1,100)
-			picrand = RAND(1,3)
-			if gorand<=60:
+			minut += 15
+			gs 'stat'
+			gorand = rand(1, 100)
+			picrand = RAND(1, 3)
+			if gorand <= 60:
 				'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 				'<center><img <<$set_imgh>> src="images/locations/highway/autostop (<<picrand>>).jpg" ></center>'
 				'You try to catch the attention of people driving towards St. Petersburg, but everyone just rushes by, ignoring you completely.'
 				act 'Continue':gt $curloc
-			elseif gorand>60:
+			elseif gorand > 60:
 				gs 'road', 'autostop_d'
 				if nroad > 10:
 					act 'Ask the driver to take you to Gadukino':
@@ -121,7 +121,7 @@ if $ARGS[0] = '':
 		!elseif gadriver_gang = 2:
 		!	'You can <a href="exec:gt ''gadprostitutes'', ''start''">prostitute</a> yourself around here.'
 		!end
-		if npc_QW['A60'] > 15:'Mira <a href="exec:gt ''gadprostitutes'', ''start''">prostitutes</a> herself around here.'
+		if npc_QW['A60'] > 15: 'Mira <a href="exec:gt ''gadprostitutes'', ''start''">prostitutes</a> herself around here.'
 	elseif nroad = 11:
 		''
 	elseif nroad = 12:
@@ -191,12 +191,11 @@ if $ARGS[0] = 'drive_sex1':
 	'Realizing you can''t spit it out anywhere, you have no option but to swallow his load while he keeps driving.'
 	
 	gs 'arousal', 'hj', 15, 'prostitution'
-	gs 'arousal', 'bj', 15, 'prostitution'
-	minut -= 15
+	gs 'arousal', 'bj', -15, 'prostitution'
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act'Continue': gt 'road', 'autospot_drive'
+	act 'Continue': gt 'road', 'autospot_drive'
 end
 
 if $ARGS[0] = 'drive_sex2':
@@ -210,17 +209,17 @@ if $ARGS[0] = 'drive_sex2':
 	spafinloc = 7
 	gs 'cum_manage'
 	if $road_textrand0 = 'Gadukino':
-		minut+=15
-		nroad=10
+		minut += 15
+		nroad = 10
 	elseif $road_textrand0 = 'Pavlovsk':
-		nroad=20
-		minut+=15
+		nroad = 20
+		minut += 15
 	elseif $road_textrand0 = 'St. Petersburg':
-		minut+=15
+		minut += 15
 		nroad=0
 	end
 	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
-	'<center><video autoplay loop src="images/locations/highway/sex/hj (1).mp4" width="800" height="448"></video></center>'
+	'<center><video autoplay loop src="images/locations/highway/sex/hj(1).mp4"></video></center>'
 	'When you get in the car, you immediately reach for his pants and take out his semi-erect cock. That''s what you promised him after all. You feel it slowly hardening between your fingers as the man drives off.'
 	if dick >= 14 and dick < 16: $raod_text_sex = 'a normal size'
 	if dick >= 16 and dick < 18: $raod_text_sex = 'a bit larger than average'
@@ -233,7 +232,7 @@ if $ARGS[0] = 'drive_sex2':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act'Continue': gt 'road', 'autospot_drive'
+	act 'Continue': gt 'road', 'autospot_drive'
 end
 
 if $ARGS[0] = 'autospot_drive':
@@ -252,7 +251,7 @@ if $ARGS[0] = 'autospot_drive':
 		minut += 15
 		nroad = 0
 	end
-	picrand = RAND(1,2)
+	picrand = RAND(1, 2)
 	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 	if truck_drive = 1:
 		'<center><img <<$set_imgh>> src="images/locations/highway/truck_drive (<<picrand>>).jpg" ></center>'
@@ -261,7 +260,7 @@ if $ARGS[0] = 'autospot_drive':
 	end
 	'You try to start a conversation once or twice, but the man doesn''t really seem to be interested in chatting while he drives. You give up and just look out the window, while he drives you to your destination.'
 	'Fifteen minutes later, you arrive, and the man pulls over. "Alright, we''re here. Take care, girl!"'
-	act'Get out of the car':gt $curloc
+	act 'Get out of the car': gt $curloc
 end
 
 if $ARGS[0] = 'autostpo_money':
@@ -290,14 +289,14 @@ if $ARGS[0] = 'autostpo_money':
 		'"I can take you there for free, but only if you do something for me in return," the guy smiles.'
 		'"Uhh... like what?" you ask him, even though you''re pretty sure you know where this is going.'
 		'The man laughs and shifts a bit in his seat. He says, "You''re a grown-up girl with a nice body! Surely you can think of something?"'
-		act'Offer a blowjob':
+		act 'Offer a blowjob':
 			cla
 			drive_sex[1] = 1
 			'You bite your lip for a second, quickly going through your options. Then you say, "I really do need this ride, sir! Would a blowjob be okay?"'
 			'The guy grins greedily and says, "Excellent, I knew we would find a way to help each other out! Get in."'
-			act'Get in the car':gt 'road', 'drive_sex1'
+			act 'Get in the car':gt 'road', 'drive_sex1'
 		end
-		act'Offer a handjob':
+		act 'Offer a handjob':
 			cla
 			drive_sex[2] = 1
 			'You bite your lip for a second, quickly going through your options. Then you say, "I really do need this ride, sir! Would a handjob be okay?"'
@@ -311,14 +310,14 @@ if $ARGS[0] = 'autostpo_money':
 		'He ponders for a second and then says, "<<$road_textrand4>>"'
 	end
 	if money > autostop_price*100:
-		act'Agree to pay him': gt 'road', 'autospot_drive'
+		act 'Agree to pay him': gt 'road', 'autospot_drive'
 	end
 	act'Decline his offer':
 		cla
 		'"I''m sorry, sir. I can''t afford that," you apologize and step away from the car. The man shrugs and drives off.'
 		act 'Continue':gt $curloc
 	end
-	act'Ask for a lower price':
+	act 'Ask for a lower price':
 		cla
 		textrand = RAND(1,3)
 		if textrand = 1:$road_textrand5 = 'Please, sir! I''m nearly broke... would you please do a girl a favour? I''d be so grateful!'
@@ -332,21 +331,21 @@ if $ARGS[0] = 'autostpo_money':
 			'"I can take you there for free, but only if you do something for me in return", the guy smiles.'
 			'"Uhh... like what?" you ask him, even though you''re pretty sure you know where this is going.'
 			'The man laughs and shifts a bit in his seat. He says, "You''re a grown-up girl with a nice body! Surely you can think of something?"'
-			act'Offer a blowjob':
+			act 'Offer a blowjob':
 				cla
 				drive_sex[1] = 1
 				'You bite your lip for a second, quickly going through your options. Then you say, "I really do need this ride, sir! Would a blowjob be okay?"'
 				'The guy grins greedily and says, "Excellent, I knew we would find a way to help each other out! Get in."'
-				act'Get in the car':gt 'road', 'drive_sex1'
+				act 'Get in the car':gt 'road', 'drive_sex1'
 			end
-			act'Offer a handjob':
+			act 'Offer a handjob':
 				cla
 				drive_sex[2] = 1
 				'You bite your lip for a second, quickly going through your options. Then you say, "I really do need this ride, sir! Would a handjob be okay?"'
 				'The guy gives you a slightly disappointed look and says, "What? Only a handjob?"'
 				'You really don''t want to go further than that! Your cheeks turn a deep red and you begin to stumble, "I''m sorry. I don''t normally do this..."'
 				'After some hesitation, he responds, "Oh, alright then. Getting a handjob from a cute girl such as yourself sounds like a fair deal. Get in."'
-				act'Get in the car':gt 'road', 'drive_sex2'
+				act 'Get in the car':gt 'road', 'drive_sex2'
 			end
 		else 
 			ivrand = RAND(1,2)
@@ -354,23 +353,23 @@ if $ARGS[0] = 'autostpo_money':
 			'The man sighs exasperatedly, but yields, "Okay, fine. I''ll make it <<ivrand*100>> <b>₽</b> less, because you seem like a nice girl and I want to help you out. I''ll take you there for <<autostop_price*100>> <b>₽</b>, but I can''t go any lower than that!"'
 			
 			if money > autostop_price*100:
-				act'Agree to pay him':
+				act 'Agree to pay him':
 					!trip
 					gt 'road', 'autospot_drive'
 				end
 			end
-			act'Decline his offer':
+			act 'Decline his offer':
 				cla
 				'"I''m sorry, sir. I still can''t afford that," you apologize and step away from the car. The man shrugs and drives off.'
 				act 'Continue':gt $curloc
 			end
-			act'Offer him a blowjob instead':
+			act 'Offer him a blowjob instead':
 				cla
 				drive_sex[1] = 1
 				'You bite your lip, as if you are ashamed of what you''re about to say next. In a weak voice, you offer, "I can''t pay you money, sir. But... I could give you a blowjob? Would that be okay?"'
 				'You lick your lips seductively and offer him a weak smile, hoping that maybe he''ll feel bad for you and just take you with him for free.'
 				'The man grins from ear to ear, and says, "You know what, girl? I was kinda hoping you''d say that. Get in."'
-				act'Get in the car':gt 'road', 'drive_sex1'
+				act 'Get in the car':gt 'road', 'drive_sex1'
 			end
 		end
 	end

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/sistersleep.qsrc

@@ -43,7 +43,6 @@ if $ARGS[0] = 'sister_sleep_1':
 		'You dare to touch your sleeping sister''s perfect ass.'
 		'Touching such a soft butt with your hand, you feel a shock run through your body. The feeling is weird, and you can''t seem to place it.'
 		'Her ass feels as good as it looks. You want to touch it more, but when her breathing changes, you panic a bit and pull away.'
-		act 'Move away': gt 'bedrPar'
 	elseif sisterLesb = 3:
 		'You dare to touch your sleeping sister''s perfect ass.'
 		'Touching such a soft butt with your hand, you feel a shock run through your body. The feeling is weird, and you can''t seem to place it.'
@@ -78,7 +77,7 @@ if $ARGS[0] = 'sister_sleep_2':
 	act 'Act innocent':
 		*clr & cla
 		minut += 1
-		npc_rel['A33'] -= 10
+		gs 'npc_relationship', 'modify', 'A33', -10
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_20.jpg"></center>'
 		'You decide to do nothing and quietly move away from your sleepy sister. Maybe she will forget it all in the morning...'
 		'As you step away from her bed, she calls to you.'
@@ -122,7 +121,7 @@ if $ARGS[0] = 'sister_sleep_2_kiss':
 		gs 'stat'
 		act 'Keep fingering her':
 			*clr & cla
-			sisterLesb = 5
+			if sisterLesb < 5: sisterLesb = 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les4.jpg"></center>'
 			'You slip another finger in her, now fingering her deeply with two fingers while your thumb rubs her clit. Anya lies all the way back and starts to moan louder, so you lean forward and start kissing and sucking on her nipple as you keep finger banging her soaking wet pussy. Suddenly, her pussy gently convulses, and she orgasms. Anya looks at you with a sleepy but pleased look on her face and smiles.'
 			'"Well, aren''t you just the sweetest little sister? Now go to sleep," she says as she grabs her panties, slides them back on and rolls over, nuzzling into her pillow and falling asleep. You are a little upset not to receive your own release, but you are satisfied for now.'
@@ -132,7 +131,7 @@ if $ARGS[0] = 'sister_sleep_2_kiss':
 			act 'Move away': gt 'bedrPar'
 		end
 	end
-	if sisterLesb => 5:
+	if sisterLesb >= 5:
 		act 'Tell her you want to have sex':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les1.jpg"></center>'
@@ -170,7 +169,7 @@ if $ARGS[0] = 'sister_sleep_3':
 		'You push her legs apart, and you can see her pussy is wet. "If it is so wrong, why are you so wet?"'
 		'"I... I was having a... dream is all," she explains.'
 	else
-		'"Did it feel wrong last time? I think you enjoyed it enough to cum! Tell me you didn''t enjoy it," you ask her as you pull her panties down. She only half heartedly resists you.'
+		'"Did it feel wrong last time? I think you enjoyed it enough to cum! Tell me you didn''t enjoy it," you say as you pull her panties down. She only half heartedly resists you.'
 		'"It doesn''t matter. You can enjoy things that are wrong, but it doesn''t make them any less wrong!" she says, still not really putting up much of a fight.'
 		'You push her legs apart, and you can see her pussy is wet. "If it is so wrong, why are you so wet?"'
 		'"I... shut up," she says with a blush, knowing why she is wet and knowing you know why as well.'
@@ -206,17 +205,18 @@ if $ARGS[0] = 'sister_sleep_3':
 				else
 					'You get up and strip down and lie down near her head. This time, without even needing to prod her, she rolls over and places her face between your legs and starts licking at your pussy and clit.'
 				end
-				gs 'arousal', 'cuni', 5, 'incest', 'lesbian'
 				$orgasm_txt = '"Aaaaaaaaaaaa!!!" You catch a wave of pure bliss as you violently cum.'
 				$orgasm_or = 'yes'
+				gs 'arousal', 'cuni', 5, 'incest', 'lesbian'
 				gs 'stat'
 				act '69':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les7.jpg"></center>'
 					'Obviously still wanting more, Anya gets up and moves. She climbs on top of you and places her pussy above your face. You start licking her again as she positions her face over your pussy and starts licking it again as well. The two of you lie there lapping at each other''s pussies in complete bliss until Anya''s body starts to convulse and she has an orgasm right on your face. She grinds her pussy against you, riding out her orgasm.'
-					gs 'arousal', 'cuni_give', 5, 'lesbian', 'incest'
+
 					$orgasm_txt = '"Aaaaaaaaahhh!!!" You catch a wave of pure bliss as you violently cum.'
 					$orgasm_or = 'yes'
+					gs 'arousal', 'cuni_give', -5, 'lesbian', 'incest'
 					gs 'arousal', 'cuni', 5, 'lesbian', 'incest'
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -245,23 +245,21 @@ if $ARGS[0] = 'sister_sleep_3':
 							!! Flagged for skill check (instead of willpower check, which has been removed)
 							act 'Convince her otherwise':
 								*clr & cla
-								girl += 1
 								sisterLesb = 7
-								npc_rel['A33'] += 5
-								$orgasm_or = 'no'
+								gs 'npc_relationship', 'modify', 'A33', 'adore'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les8.jpg"></center>'
 								'"Anya, you don''t have to be a lesbian to enjoy a special release that only another woman knows how to give you," you say as you begin lightly caressing her thigh.'
 								'"What if we agreed that we''ll help each other out only when we REALLLLYYYYY need it, but depend on our boyfriends most of the time, hmmm?" Her breathing gets faster as your fingertips glide to the center of her legs.'
 								*nl
 								'"Well... when you put it that way. I''m still not a lesbian, but helping each other out when we... REALLLLYYYYY... need... mmmmmhhmmmm... help might be okay... mmmmm..." she sighs as she leans in and kisses you.'
-								*nl
-								'Once you break the kiss, she adds, "OK, but seriously. No more waking me up like this. We can... when we really need it, just tell the other one OK?" You nod and agree to not wake her up anymore. Besides, her being into it from the start would be better anyways. She rolls over and tries to go to sleep. "Night," she tells you. You tell her good night as well and then go leave her to sleep.'
-								gs 'arousal', 'kiss', 3, 'incest'
-								gs 'arousal', 'forplay', 3, 'incest'
-								gs 'arousal', 'vaginal_finger', 3, 'incest'
 								$orgasm_txt = 'You both start feeling the heat and lie down, kissing, touching and licking each other into orgasm.'
 								$orgasm_or = 'yes'
-								gs 'arousal', 'cuni', 3, 'incest'
+								gs 'arousal', 'kiss', 10, 'incest', 'lesbian'
+								gs 'arousal', 'vaginal_finger', -10, 'incest', 'lesbian'
+								gs 'arousal', 'cuni', -10, 'incest', 'lesbian'
+								*nl
+								'Once you break the kiss, she adds, "OK, but seriously. No more waking me up like this. We can... when we really need it, just tell the other one OK?" You nod and agree to not wake her up anymore. Besides, her being into it from the start would be better anyways. She rolls over and tries to go to sleep. "Night," she tells you. You tell her good night as well and then go leave her to sleep.'
+
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Move away': gt 'bedrPar'
@@ -291,7 +289,7 @@ end
 
 if $ARGS[0] = 'sister_lesbian':
 	*clr & cla
-	npc_rel['A33'] += 1
+	gs 'npc_relationship', 'modify', 'A33', 'like'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les1.jpg"></center>'
 	'The two of you start kissing and fondling each other as you slowly undress each other. Anya lies back on the bed as you do. Your hands roam each other''s bodies as you undress each other and passionately keep kissing.'
 	gs 'arousal', 'foreplay', 3, 'incest', 'lesbian'
@@ -339,10 +337,10 @@ if $ARGS[0] = 'sister_lesbian_cuni':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les7.jpg"></center>'
 			'After several minutes of her eating you out, she apparently isn''t content with just that. While still licking your pussy, she slowly spins her body around and climbs on top of you until her pussy is directly above your face. You start licking her as the two of you enter a sixty-nine. Several minutes pass until she cries out and her whole body quivers as an orgasm shoots through it. Her juices flow out of her pussy, coating your face.'
-			gs 'arousal', 'cuni_give', 5, 'lesbian', 'incest'
-			gs 'arousal', 'cuni', -5, 'lesbian', 'incest'
 			$orgasm_txt = 'With her orgasming above you and your face getting covered in her juices, you feel your own orgasm wrack your body. You cry out as the waves of pleasure rock your body, until it slowly fades.'
 			$orgasm_or = 'yes'
+			gs 'arousal', 'cuni_give', 5, 'lesbian', 'incest'
+			gs 'arousal', 'cuni', -5, 'lesbian', 'incest'
 			gs 'stat'
 			act 'Aftermath':
 				*clr & cla
@@ -360,7 +358,7 @@ end
 
 if $ARGS[0] = 'sister_strapon':
 	*clr & cla
-	npc_rel['A33'] += 1
+	gs 'npc_relationship', 'modify', 'A33', 'like'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/strap1.jpg"></center>'
 	if sisterQW['strapon'] = 0:
 		'The two of you start kissing and fondling each other, but when you start to try to remove her clothes, she stops you. "What? What''s wrong?" you ask her.'
@@ -373,7 +371,7 @@ if $ARGS[0] = 'sister_strapon':
 	gs 'stat'
 	act 'Refuse':
 		*clr & cla
-		npc_rel['A33'] -= 3
+		gs 'npc_relationship', 'modify', 'A33', 'dislike'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
 		'You shake your head. "No way, I don''t want to get fucked, I just want to make love to you."'
 		'She frowns and drops the strapon back in the drawer. "Well I don''t want to do that. I have told you before I am not into girls."'
@@ -434,7 +432,6 @@ end
 
 if $ARGS[0] = 'sister_strapon_vaginal':
 	*clr & cla
-	pcs_vag += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/strap4.jpg"></center>'
 	'You straddle your sister and slowly lower yourself down until you feel the tip of the dildo pressing against your slit. You reach between your legs, line up the dildo and lower yourself until you feel it part your lips and start to slide inside of you, causing you to moan softly. You lower yourself down further and start to slowly fuck the dildo, your sister taking off her top as you do. You take the whole thing inside you. It''s sightly longer and thicker than average and fills you up completely.'
 	*nl
@@ -452,7 +449,7 @@ if $ARGS[0] = 'sister_strapon_vaginal':
 		act 'Get butt fucked': gt 'sistersleep', 'sister_strapon_anal'
 		act 'Refuse':
 			*clr & cla
-			npc_rel['A33'] -= 1
+			gs 'npc_relationship', 'modify', 'A33', 'dislike'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les8.jpg"></center>'
 			'You shake your head. "No way, I don''t want to get fucked in the butt."'
 			'She frowns and backs away, pulling the strapon out of you. "OK suit yourself, but I am too tired to do this anymore." She starts taking the harness off, and feeling a bit disappointed, you help her remove it. Once done, she cleans it up and drops it back in her nightstand.'
@@ -478,11 +475,10 @@ if $ARGS[0] = 'sister_strapon_anal':
 	gs 'stat'
 	act 'Pleasure yourself':
 		*clr & cla
-		pcs_ass += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/strap7.jpg"></center>'
 		'With Anya lifting your leg as she thrusts the dildo deep into your ass, you start roughly rubbing your clit.'
 		'"Aaahh... Yeah... Mmmhmmm... Fuck me... Yeah, fuck me good!" you cry out as it starts to feel really good.'
-		$orgasm_txt = 'You spasm and have an intense orgasm with the dildo in your ass, and as you recover, Anya moves from under you to stand in front of you, the strap-on held to your lips.'
+		$orgasm_txt = 'You spasm and have an intense orgasm with the dildo in your ass, your sister holding onto you to keep you from flopping off during your orgasm.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'anal_strap', 5, 'incest', 'lesbian'
 		gs 'stat'

locations/street_event.qsrc

@@ -1729,12 +1729,12 @@ if $ARGS[0] = 'divorce_party':
 								'Overwhelmed by your lust, you rub your legs together, itching to touch yourself. You look around the room and are relieved to see Alla had the same idea as you as she''s sitting down with her legs spread, playing with herself while watching her friends. Without hesitation, you slide your own hand between your legs and shiver as your fingers glide along your slick folds, spreading them to find your clit. You follow the same pace as Eva and Marta, when they slowly kiss along his length, flicking the tips of their tongue along his glans, you take your time with long, hard strokes against your clit. As soon as you see he''s had enough of their teasing and forces Marta to deepthroat him fast and hard, fucking her mouth while Eva watches, you begin fingering yourself frantically. You''re edging closer and closer, but you get an amazing idea when you see him throw his head back and groan loudly.'
 									act 'Sit on his face':
 									*clr & cla
-									minut += 15
 									'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/d6.jpg"></center>'
 									'"Want to put that mouth to better use?" you tease with a smile as you present your dripping wet pussy to Yefim. Licking his lips, he pulls you over and helps you straddle his face. He grips your thighs and holds you in place as his tongue delves between your swollen pussy lips. You tremble and gasp, his tongue expertly flicking and massaging your clit when he isn''t playing with your labia. You grind your hips down as the pleasure builds, crying out as you cum on his tongue. Your pussy clenches, and your body tenses as you ride out the bliss.'
+									$orgasm_or = 'yes'
+									gs 'arousal', 'cuni', 15
 									*nl
 									'"Alright, that''s enough," you hear Marta say. She watches you slide off his face with a smirk, taking a moment to admire how wet his lips are with your juices before turning her attention to Eva. "I don''t think he can hold out much longer, so why don''t we end this with a <i>bang</i>!" You don''t know when Alla finished, but she''s here pulling Eva aside to undress her. When they''re done, Yefim switches spots with Eva, with her now on her back. "Now keep those legs spread, babe," Marta says as Yefim positions himself between her legs.'
-									$orgasm_or = 'yes'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Enjoy the show':

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/torgcentr.qsrc

@@ -11,6 +11,8 @@ $menu_loc = 'torgcentr'
 $menu_arg = ''
 menu_off = 0
 
+act 'Leave': minut += 5 & gt 'city_center'
+
 if hour >= 8 and hour <= 20:
 	*p '<center><a href="exec: minut += 3 & gt ''shop_pussycats'', ''start''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a>'
 !! Pussy-Kats - Youth clothing shop
@@ -66,15 +68,12 @@ if hour >= 8 and hour <= 20:
 	*p '<a href="exec: minut += 3 & gt ''shop_photography'',''start''"><img src="images/locations/city/citycenter/mall/photoshop.png"></a>'
 !! Photography store
 
-	act 'Leave': minut += 5 & gt 'city_center'
 	act 'Go to the supermarket': gt 'shop', 'start'
 	act 'Go bowling': gt 'bouling'
 	act 'Play pool': gt 'billiard'
 	act 'Go to the cinema': gt 'kino'
 else
 	'The shopping center is closed and security are guiding everyone out so they can lock up.'
-	
-	act 'Leave': minut += 5 & gt 'city_center'
 end
 
 !!{Old menu
@@ -121,5 +120,6 @@ end
 
 act 'Leave': minut += 5 & gt 'city_center'
 }
+
 --- torgcentr ---------------------------------
 

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/treeCircle.qsrc

@@ -98,4 +98,5 @@ if pcs_inhib >= 30 and pcs_horny > 60:
 	end
 end
 
---- treeCircle ---------------------------------
+--- treeCircle ---------------------------------
+

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