[changed] The remaining files updated to new masturbation arousal code

locations/Komp.qsrc

@@ -187,13 +187,13 @@ if $ARGS[0] = 'masturbate':
 	'You get comfortable in front of your computer and with one hand begin to fondle your breasts, while you click on a link to something really dirty.'
 	'You let go of the mouse and start rubbing your pussy, imagining you''re the woman in the video. The fantasy and your touching are getting you all hot and bothered.'
 
-	gs 'arousal', 'masturbate', 15
+	gs 'arousal', 'clit_finger', 15, 'masturbate'
 	gs 'stat'
 
 	if pcs_horny >= 100:
 		$orgasm_or = 'yes'
 		$orgasm_txt = 'Suddenly your muscles tighten and you cum powerfully, while you stifle your moans so your neighbours won''t find out. Afterwards, you have goosebumps all over your skin. That was just what you needed!'
-		gs 'arousal', 'masturbate', -1
+		gs 'arousal', 'clit_finger', -1, 'masturbate'
 		gs 'stat'
 	end
 

locations/Kwlake1.qsrc

@@ -56,7 +56,7 @@ act 'Fondle her':
 			'Kat answers the question for him, eagerly grabbing his cock and taking it into her mouth. Now that she''s ignoring you, you quickly decide to do the next best thing - and thrust the stone cock deep inside your welcoming snatch.'
 
 			gs 'arousal', 'cuni', 5, 'lesbian'
-			gs 'arousal', 'masturbate', 5
+			gs 'arousal', 'vaginal_dildo', 5
 			minut -= 5
 			gs 'stat'
 		

locations/LariskaSex.qsrc

@@ -56,8 +56,7 @@ if $ARGS[0] = 'lick1':
 	'You decide to step it up and and start licking her clit directly, before closing your lips around it and gently sucking. This sends her into a frenzy, moaning her way into pure bliss. As the orgasm breaks over her, her hips begin to jerk, her back arches, and her head swings around wildly.'
 	$orgasm_txt = 'You are so aroused by the sight of Lariska riding your tongue that your fingers manage to trigger a massive orgasm. Your hips start bucking, and your feet flail in the air, as you try and keep yourself focused enough to continue eating Lariska out.'
 	$orgasm_or = 'custom'
-	pcs_horny += 15
-	gs 'arousal', 'masturbate', -5, 'lesbian'
+	gs 'arousal', 'clit_finger', -5, 'lesbian'
 	gs 'arousal', 'cuni_give', 5, 'lesbian'
 	gs 'stat'
 	'Spent she crawls off of you and you snuggle, exchanging passionate kisses as your bodies come down from the euphoria you both just experienced.'

locations/MartinSex3.qsrc

@@ -186,7 +186,7 @@ if $ARGS[0] = 'MartinBlowjob':
 		! 'Your dedication pays off: Before long, his dick seems to swell and you can hear him say your name. Martin is about to cum.'
 		
 		! if $clothingworntype = 'nude' and $pantyworntype = 'none':
-			! gs 'arousal', 'masturbate', 4, 'dom'
+			! gs 'arousal', 'clit_finger', 4, 'dom', 'masturbate'
 			! minut -= 4
 		! end
 		! gs 'arousal', 'bj', 5, 'dom'
@@ -221,7 +221,7 @@ if $ARGS[0] = 'MartinBlowjob':
 				*nl
 				'One of your hands inadvertently makes its way down south, following the heat you feel in your groin, and finds your <<$pcdesc_genitals>> dripping wet. Being used by Martin, reduced to an object for him to satisfy himself with, is arousing in ways that even you yourself have trouble understanding.'
 				'But you don''t have to understand. All you have to do is leave your fingers to themselves and reap the rewards, moaning softly as you let your lover fuck your mouth.'
-			$orgasm_txt = 'This sense of complete obedience fans the flames your striptease has lighted. The familiar heat of lust spreads inside your belly, building up like a wave and then washing over you. You cum, your fingers busy on your clit, your moans muffled by Martin''s cock in your mouth.'
+				$orgasm_txt = 'This sense of complete obedience fans the flames your striptease has lighted. The familiar heat of lust spreads inside your belly, building up like a wave and then washing over you. You cum, your fingers busy on your clit, your moans muffled by Martin''s cock in your mouth.'
 			end
 		
 		else
@@ -255,12 +255,9 @@ if $ARGS[0] = 'MartinBlowjob':
 		*nl
 		'Your dedication pays off: Before long, his dick seems to swell and you can hear him say your name. Martin is about to cum.'
 		
-		if $clothingworntype = 'nude' and $pantyworntype = 'none':
-			gs 'arousal', 'masturbate', 4, 'sub'
-			minut -= 4
-		end
+		$orgasm_or = 'custom'
+		gs 'arousal', 'clit_finger', -4, 'masturbate', 'sub'
 		gs 'arousal', 'bj', 5, 'sub'
-		$orgasm_txt = ''
 		gs 'stat'
 		killvar 'MartinSexStop'
 	!end

locations/RimmaSexQW.qsrc

@@ -256,7 +256,7 @@ $rimmasexdi = {
 		'It doesn''t take you long to cum and when you do, your ass contracts so hard you are afraid you might hurt Rima. To your relief - and, by the looks of it, hers too - you don''t.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'anal_fist', 20, 'lesbian', 'sub'
-		gs 'arousal', 'masturbate', 20
+		gs 'arousal', 'clit_finger', 20
 		minut -= 20
 		gs 'stat'
 	elseif RimmaRandEvent = 10:

locations/Serge_kuh.qsrc

@@ -944,7 +944,7 @@ if $ARGS[0] = 'izdev9':
 							'Sergey increases the force of his thrusts and begins to fuck you rougher, and a loud moan escapes your mouth - not only from pain, but mixed with pleasure! You freeze for a moment, trying to wrap your head around how this could feel this good.'
 							'Sergey grins, interpreting your moan as a sign of submission, and begins to seriously pound your asshole now. Lost in your own little world, you can do little more than just keep rubbing your clit and rub yourself to your inevitable orgasm... if he keeps this up any longer, you''re going to explode!'
 							gs 'arousal', 'anal', 5, 'sub', 'rough'
-							gs 'arousal', 'masturbate', 5, 'sub'
+							gs 'arousal', 'clit_finger', 5, 'sub'
 							minut -= 5
 							gs 'stat'
 							act 'Continue':
@@ -1585,7 +1585,7 @@ if $ARGS[0] = 'izn2':
 				'You close your eyes and moan like a whore, much to Sergey''s delight. He rewards you by fucking your ass with long, firm thrusts regularly, while you finger yourself. Soon you can''t hold back any more and your vagina and anus rhythmically contract while you''re experiencing your third orgasm for this session. You groan wildly when you feel a warm liquid spread inside your ass; Sergey couldn''t take it any more either and came right inside your used ass.'
 				'Sergey sighs happily as he pulls out of you, and wipes his member on your ass cheeks before letting him self crash down onto the couch.'
 				$orgasm_or = 'yes'
-				gs 'arousal', 'masturbate', 10, 'sub'
+				gs 'arousal', 'clit_finger', 10, 'sub'
 				gs 'arousal', 'anal', 10, 'sub', 'rough'
 				minut -= 10
 				gs 'stat'

locations/VoltrenerSexShower.qsrc

@@ -89,8 +89,8 @@ if $ARGS[0] = '2':
 				pcs_mood = 100
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower9.mp4"></video></center>'
 				'You look at his cock as if spellbound... at the same time caressing your clit and struggling to suppress a groan. You see his hand stroking his member, the head appearing and disappearing. Shaking his balls... the coach groans, and his dick squirts straight at you. Sperm splashes on your body, destroying your resolve, and you shake in a powerful orgasm. Through the waves of orgasm you just barely manage to make out what the coach is saying: "That was fun, we should do it again sometime."'
-				$orgasm_or = 'yes'
-				gs 'arousal', 'masturbate', 10, 'exhibitionism'
+				$orgasm_or = 'custom'
+				gs 'arousal', 'clit_finger', 5, 'masturbate', 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Finish shower': gt 'gdksport', 'start'
@@ -202,7 +202,7 @@ if $ARGS[0] = '4':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower18.jpg"></center>'
 							$orgasm_or = 'custom'
 							$orgasm_txt = 'You are left almost in tears from the aching, overwhelming feelings of dissatisfaction. Covered in cum and thinking about how both these jerks just left you here in this state, you lie down on the bench beside the shower and furiously start rubbing your pussy, quickly bringing yourself to orgasm. Of course, it was nothing like it could have been, and after ''consoling'' yourself in this way, you promise yourself you will make at least one of them take care of you next time, maybe even both at once. That last thought starts getting your engine running yet again, and blushing from such vulgarity, you quickly wash your face and jump out of the shower.'
-							gs 'arousal', 'masturbate', 5
+							gs 'arousal', 'clit_finger', 5, 'masturbate'
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Wash your face':gt 'gdksport', 'start'

locations/Voltrenersex.qsrc

@@ -287,12 +287,12 @@ if $ARGS[0] = 'Defl':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex21.jpg"></center>'
 			'Coach drops to his knees and begins to lick your pussy. He then licks the clit, his tongue penetrating your vagina. As he takes your clit into his mouth and begins to suck, you think you are going crazy with pleasure. You grab his head with both hands and grind your crotch against his face.'
-			Act 'Surrender':
+			act 'Surrender':
 				cls
 				gs 'boyStat', 'A69'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex22.jpg"></center>'
 				'He pulls his head away and gets up. He slips his <<dick>>cm <<$dick_girth>> cock inside of you, causing you to cry out as he breaks your hymen.'
-				Act 'Further':
+				act 'Further':
 					cls
 					gs 'boyStat', 'A69'
 					sexpartkno = 1
@@ -304,6 +304,7 @@ if $ARGS[0] = 'Defl':
 					finrand = 0
 					act 'Recover':
 						cls
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex27.jpg"></center>'
 						'With a grunt, you feel his hot sperm shooting into you, filling you up. Pulling out of you, his cock is covered in blood and sperm. The coach began to talk about something... something about you not be a girl anymore, but you really don''t hear what he says. The pain of losing your virginity and the ecstasy of nearly having your first orgasm distract you. You finally notice your coach giving you an attentive and caring look as he helps you gather up your stuff. Once you are redressed, you leave his office, ready to see the world in a new way.'
 						act 'Leave':gt 'gdksport', 'start'
@@ -316,8 +317,6 @@ end
 
 if $ARGS[0] = 'Mast':
 *clr & cla
-gs 'arousal','masturbate', 10
-gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex11.jpg"></center>'
 'Looking your coach in the eyes, you remove the rest of your clothes and start to lick and suck on your fingers. The coach seems to understand your idea and sits down ready to watch the show.'
 	act 'Expose your pussy':
@@ -330,11 +329,15 @@ gs 'stat'
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex13.jpg"></center>'
 			'Getting more aroused at the idea of your coach watching you, you begin to caress your breasts, twisting the nipples gently with your fingers.'
+			gs 'arousal', 'foreplay', 5, 'masturbate'
+			gs 'stat'
 			act 'Caress your clitoris':
 				pcs_horny += 10
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex14.jpg"></center>'
 				'It is obvious your coach is enjoying the show. The bulge in his pants making no secret of it. You lower one hand to your wet crotch while the other continues to play with a nipple. When your hand touches your clit it seems as if an electric discharge passes through your body. You moan in passion and begin to frantically rub your clit.'
+				gs 'arousal', 'clit_finger', 5, 'masturbate'
+				gs 'stat'
 				act 'Caress your anus':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex15.jpg"></center>'
@@ -343,12 +346,19 @@ gs 'stat'
 						pcs_horny = 0
 						orgasm += 1
 						pcs_mood += 20
-						gs 'arousal','end'
 						gs 'stat'
 						cls
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex16.mp4"></video></center>'
-						'Unable to withstand this double pressure, your body convulses as you have an orgasm. Once the feeling passes, you look up at your coach as he says, "Yes <<$pcs_lastname>>, you look so hot."'
-						act 'Leave':gt 'gdksport', 'start'
+						'Unable to withstand this double pressure, your body convulses as you have an orgasm.'
+						gs 'arousal', 'anal_finger', 5, 'masturbate'
+						$orgasm_or = 'yes'
+						gs 'arousal', 'clit_finger', 5, 'masturbate'
+						gs 'stat'
+						'Once the feeling passes, you look up at your coach as he says, "Yes <<$pcs_lastname>>, you look so hot."'
+						act 'Leave':
+							gs 'arousal','end'
+							gt 'gdksport', 'start'
+						end
 					end
 					i = rand(1,4)
 					if i = 1:
@@ -358,10 +368,8 @@ gs 'stat'
 							'Through the mental fog of your orgasm, you look at coach. He has his dick in his hand as he approaches you and starts rubbing the head of it against your soaking wet pussy.'
 							act 'Pull his member inside':
 								cls
-								minut += 10
-								pcs_horny = 0
-								orgasm += 1
-								pcs_mood += 20
+								minut += 5
+								gs 'cum_call', 'labia', 'A69', 1
 								gs 'arousal','end'
 								gs 'stat'
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex18.mp4"></video></center>'

locations/WorkHosp.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'start':
 					'You begin to secretly masturbate whenever nobody is watching.'
 					$orgasm_or = 'yes'
 					$orgasm_txt = 'Gradually a pleasant warmth and sensation radiates from your needy sex, culminating in a powerful orgasm that sends waves of pleasure through your entire body.'
-					gs 'arousal', 'masturbate', 15
+					gs 'arousal', 'clit_finger', 15, 'masturbate'
 					gs 'stat'
 				end
 
@@ -168,7 +168,7 @@ if $ARGS[0] = '1':
 	if mastrrand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex9.jpg"></center>'
 		'As you masturbate, you totally abandon yourself to the pleasure of your coming orgasm. A doctor enters the room, but you are so absorbed in your own pleasure that you only notice him when his hand starts to guide your head to his erect cock.'
-		gs 'arousal', 'masturbate', 10
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 		gs 'stat'
 		
 		gs 'willpower', 'sex', 'resist'
@@ -194,7 +194,7 @@ if $ARGS[0] = '1':
 		picrand = rand(12, 13)
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex10.jpg"></center>'
 		'As you lose yourself in pleasure, two doctors come into the room. You are so distracted that you only notice them when they start to openly masturbate in front of you.'
-		gs 'arousal', 'masturbate', 10
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 		gs 'stat'
 					
 		act 'Leave':

locations/arousal.qsrc

@@ -747,7 +747,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 !!-------------------Orgasm-------------------
 !!This is intended to be hidden and the stats and calculations should not appear in game.
 
-	if orgasm_flag['vaginal'] = 1 or orgasm_flag['anal'] = 1 or orgasm_flag['clit'] = 1: orgasm_flag['trigger'] = 1
+	if orgasm_flag['vaginal'] = 1 or orgasm_flag['anal'] = 1 or orgasm_flag['clit'] = 1 or orgasm_flag['masturbate'] = 1: orgasm_flag['trigger'] = 1
 
 	if orgasm_flag['trigger'] ! 0: nymphosex_flag = 1
 	orgasm_buildup += stim['total']

locations/husbSex.qsrc

@@ -516,7 +516,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 		'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m21.jpg"></center>'
 		'You kneel down and enter use a dildo on your pussy'
 
-		gs 'arousal', 'masturbate', 10
+		gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 		gs 'stat'
 
 		if hour > 22 or hour < 7:
@@ -552,7 +552,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 					'"Is there anything else you want, dear?" You ask with a smile.'
 					'"Can I join you?" He asks a little sheepishly.'
 
-					gs 'arousal', 'masturbate', 10
+					gs 'arousal', 'anal_dildo', 5, 'masturbate'
 					gs 'stat'
 
 					act 'Of course':
@@ -564,6 +564,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 						'<<$husName>> takes out his member and begins to masturbate. This is not what you expected and at first you even feel a little sorry that he did not enter you, but then you start to masturbate again. You look at your husband, who masturbates looking at you, as you drive the dildo in your ass. Soon you feel yourself coming and you cry out in delight as you fall on the table, orgasming, the dildo still sticking out of your ass. <<$husName>> furiously masturbates looking at you stretched out on the table. You remov the dildo from your ass and start licking it in front of your husband''s eyes. Clearly excited from such a spectacle he soon starts cumming, spraying his sperm on the floor. You reach out to him sticking out your lips. A moment later he passionately kisses you.'
 
 						$orgasm_or = 'yes'
+						gs 'arousal', 'anal_dildo', 5, 'masturbate'
 						gs 'arousal', 'end'
 						gs 'stat'
 
@@ -577,7 +578,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 			'"Well, at least give me a show." He says.'
 			'"And how do I do that? Should i put it in the ass too?" You ask'
 
-			gs 'arousal', 'masturbate', 10
+			gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 			gs 'stat'
 
 			if izvratH = 0:
@@ -605,7 +606,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 					'"Is there anything else you want, dear?" You ask with a smile.'
 					'"I would like to join" He says, unbuttoning his pants and exposing his member to your face.'
 
-					gs 'arousal', 'masturbate', 10
+					gs 'arousal', 'anal_dildo', 10, 'masturbate'
 					gs 'stat'
 
 					act 'Use your mouth':
@@ -630,7 +631,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 			'"After all the fucking I give you, you''re still not satisfied? You horny bitch." He asks.'
 			'"I''m sorry dear, but I really need to let of steam, and you were busy" You answer, while continuing to masturbate.'
 
-			gs 'arousal', 'masturbate', 10
+			gs 'arousal', 'vaginal_dildo', 10
 			gs 'stat'
 
 			if izvratH = 0:

locations/katjaEv.qsrc

@@ -1873,7 +1873,7 @@ if $ARGS[0] = 'kathan9':
 						act 'Time for anal':
 							*clr & cla
 							gs 'arousal', 'anal', 5, 'sub', 'rough'
-							gs 'arousal', 'masturbate', 5
+							gs 'arousal', 'clit_finger', 5
 							if pcs_ass < dick:
 								pcs_horny += 10
 								if agape < 2:agape = 2

locations/kuhr.qsrc

@@ -125,7 +125,7 @@ if dildo > 0 and pcs_horny >= 50:
 				if hour = 7 or hour = 17:'<<$husName>> looks at you dumbfounded.'
 				if hour ! 7 or hour ! 17:'Just as you get into it, <<$husName>> walks into the room.'
 
-				gs 'arousal', 'masturbate', 15
+				gs 'arousal', 'vaginal_dildo', 15
 				gs 'stat'
 				
 				if harakHusb = 0:
@@ -138,6 +138,7 @@ if dildo > 0 and pcs_horny >= 50:
 						husband -= 1
 						'"I think I''ll step outside until you''re done." he says and leaves the apartment. You continue to satisfy yourself, but are a little disappointed that he didn''t ''help'' you.'
 						$orgasm_or = 'yes'
+						gs 'arousal', 'vaginal_dildo', 5, 'masturbate'
 						gs 'arousal', 'end'
 						gs 'stat'
 
@@ -154,7 +155,7 @@ if dildo > 0 and pcs_horny >= 50:
 							'"Is there anything else you want, dear?" you ask with a smile.'
 							'"Can I join you?" he asks, looking a little embarrassed.'
 
-							gs 'arousal', 'anal_dildo', 15
+							gs 'arousal', 'anal_dildo', 15, 'masturbate'
 							gs 'stat'
 							
 							act 'Yes':
@@ -166,6 +167,7 @@ if dildo > 0 and pcs_horny >= 50:
 								'With a final thrust of your dildo, you''re hit by an orgasm so strong that you fall onto the floor. You slide your dildo out of your ass and lick it clean while locking eyes with your husband. He finds this incredibly erotic and his cum starts splattering over the floor. You passionately make out in the aftermath of your orgasms.'
 								
 								$orgasm_or = 'yes'
+								gs 'arousal', 'anal_dildo', 15, 'masturbate'
 								gs 'arousal', 'end'
 								gs 'stat'
 								
@@ -186,6 +188,7 @@ if dildo > 0 and pcs_horny >= 50:
 						'"Anytime for such a lovely audience, but I need a quick break." you laugh as you take the dildo out of your pussy.'
 
 						$orgasm_or = 'yes'
+						gs 'arousal', 'vaginal_dildo', 5, 'masturbate'
 						gs 'stat'
 
 						act 'Finish':gt 'kuhr'
@@ -232,7 +235,7 @@ if dildo > 0 and pcs_horny >= 50:
 						husbizvradd += 1
 						'"Well then, open your mouth!" he orders as he pulls out his cock and pushes it into your mouth. He holds you by the hair and fucks your mouth while telling you to keep masturbating. After a few minutes, he stops. "Now take out that damn toy. Time for me to scratch your itch!"'
 
-						gs 'arousal', 'masturbate', 5 
+						gs 'arousal', 'vaginal_dildo', 5 
 						gs 'arousal', 'bj', 5, 'rough'
 						minut -= 5
 						gs 'stat'
@@ -273,7 +276,7 @@ if dildo > 0 and pcs_horny >= 50:
 				'Your juices drip down the length of the dildo, pooling on the floor beneath you. You take a few deep breaths and a satisfied smile grows on your face. That was just what you needed!'
 				
 				$orgasm_or = 'yes'
-				gs 'arousal', 'vaginal_dildo', 10
+				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 				gs 'arousal', 'end'
 				
 				act 'Breathe':gt 'kuhr'
@@ -286,7 +289,7 @@ if dildo > 0 and pcs_horny >= 50:
 			'Your juices drip down the length of the dildo, pooling on the floor beneath you. You take a few deep breaths and a satisfied smile grows on your face. That was just what you needed!'
 				
 			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal_dildo', 10
+			gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 			gs 'arousal', 'end'
 				
 			act 'Breathe':gt 'kuhr'

locations/kuhr2x.qsrc

@@ -115,7 +115,7 @@ if dildo > 0 and pcs_horny >= 50:
 				if hour = 7 or hour = 17:'<<$husName>> looks at you dumbfounded.'
 				if hour ! 7 or hour ! 17:'Just as you get into it, <<$husName>> walks into the room.'
 
-				gs 'arousal', 'masturbate', 15
+				gs 'arousal', 'vaginal_dildo', 15
 				gs 'stat'
 				
 				if harakHusb = 0:
@@ -128,10 +128,11 @@ if dildo > 0 and pcs_horny >= 50:
 						husband -= 1
 						'"I think I''ll step outside until you''re done." he says and leaves the apartment. You continue to satisfy yourself, but are a little disappointed that he didn''t ''help'' you.'
 						$orgasm_or = 'yes'
+						gs 'arousal', 'vaginal_dildo', 5, 'masturbate'
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Finish':gt 'kuhr2x'
+						act 'Finish':gt 'kuhr'
 					elseif izvratH = 1:
 						'"Well, I''m... I''m not sure..." he stutters.'
 						'"So, what do you want?" you ask in response.'
@@ -144,7 +145,7 @@ if dildo > 0 and pcs_horny >= 50:
 							'"Is there anything else you want, dear?" you ask with a smile.'
 							'"Can I join you?" he asks, looking a little embarrassed.'
 
-							gs 'arousal', 'anal_dildo', 15
+							gs 'arousal', 'anal_dildo', 15, 'masturbate'
 							gs 'stat'
 							
 							act 'Yes':
@@ -154,12 +155,13 @@ if dildo > 0 and pcs_horny >= 50:
 								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m13.jpg"></center>'
 								'<<$husName>> pulls his dick out and starts to masturbate in front of you. You''re surprised, having expected him to fuck you or ask for a blowjob instead. You sigh silently and continue to fuck your ass with the dildo as <<$husName>> watches and masturbates. You''re close to orgasm, and it sounds like <<$husName>> is too.'
 								'With a final thrust of your dildo, you''re hit by an orgasm so strong that you fall onto the floor. You slide your dildo out of your ass and lick it clean while locking eyes with your husband. He finds this incredibly erotic and his cum starts splattering over the floor. You passionately make out in the aftermath of your orgasms.'
-
+								
 								$orgasm_or = 'yes'
+								gs 'arousal', 'anal_dildo', 15, 'masturbate'
 								gs 'arousal', 'end'
 								gs 'stat'
 								
-								act 'Finish':gt 'kuhr2x'
+								act 'Finish':gt 'kuhr'
 							end
 						end
 					end
@@ -176,9 +178,10 @@ if dildo > 0 and pcs_horny >= 50:
 						'"Anytime for such a lovely audience, but I need a quick break." you laugh as you take the dildo out of your pussy.'
 
 						$orgasm_or = 'yes'
+						gs 'arousal', 'vaginal_dildo', 5, 'masturbate'
 						gs 'stat'
-						
-						act 'Finish':gt 'kuhr2x'
+
+						act 'Finish':gt 'kuhr'
 					elseif izvratH = 1:
 						husband += 1
 						'"And what are you going to show me now?" he asks.'
@@ -222,7 +225,7 @@ if dildo > 0 and pcs_horny >= 50:
 						husbizvradd += 1
 						'"Well then, open your mouth!" he orders as he pulls out his cock and pushes it into your mouth. He holds you by the hair and fucks your mouth while telling you to keep masturbating. After a few minutes, he stops. "Now take out that damn toy. Time for me to scratch your itch!"'
 
-						gs 'arousal', 'masturbate', 5 
+						gs 'arousal', 'vaginal_dildo', 5 
 						gs 'arousal', 'bj', 5, 'rough'
 						minut -= 5
 						gs 'stat'
@@ -256,18 +259,17 @@ if dildo > 0 and pcs_horny >= 50:
 					end
 				end
 			else
-				pcs_horny = 0
-				orgasm += 1
 				'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
 				'Unable to control yourself, you immediately reach for your dildo so you can take care of your lustful desires. You waste no time in attaching the suction base of the dildo to the floor before lowering yourself slowly onto it.'
 				'Shivers run down your spine as you feel the thick head spreading your lips and soon the whole length begins to slide deep inside your hole. A throaty moan overwhelms the room when the dildo bottoms out inside you.'
 				'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. Your ass is hammering against the floor with each thrust and it takes you just a few minutes to reach orgasm, your toes curling tightly as your entire body is overwhelmed in pleasure.'
 				'Your juices drip down the length of the dildo, pooling on the floor beneath you. You take a few deep breaths and a satisfied smile grows on your face. That was just what you needed!'
+				
 				$orgasm_or = 'yes'
+				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 				gs 'arousal', 'end'
-				gs 'stat'
-			
-				act 'Breathe':gt 'kuhr2x'
+				
+				act 'Breathe':gt 'kuhr'
 			end
 		else
 			'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
@@ -275,12 +277,12 @@ if dildo > 0 and pcs_horny >= 50:
 			'Shivers run down your spine as you feel the thick head spreading your lips and soon the whole length begins to slide deep inside your hole. A throaty moan overwhelms the room when the dildo bottoms out inside you.'
 			'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. Your ass is hammering against the floor with each thrust and it takes you just a few minutes to reach orgasm, your toes curling tightly as your entire body is overwhelmed in pleasure.'
 			'Your juices drip down the length of the dildo, pooling on the floor beneath you. You take a few deep breaths and a satisfied smile grows on your face. That was just what you needed!'
-
+				
 			$orgasm_or = 'yes'
+			gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 			gs 'arousal', 'end'
-			gs 'stat'
-			
-			act 'Breathe':gt 'kuhr2x'
+				
+			act 'Breathe':gt 'kuhr'
 		end
 	end
 end

locations/lesbimistress.qsrc

@@ -1325,14 +1325,17 @@ if $ARGS[0] = 'treat_1':
 		'Casting a quick glance around her kitchen, you grab a pan without a second thought. You drop to the ground and guide the handle to your pussy, slowly inserting it with a cute gasp.'
 		'While you slowly thrust the pan handle inside of you again and again, you make sure Mistress can hear your gasps and moans while you look at her intently.'
 		
-		gs 'arousal', 'masturbate', 20, 'sub'
-		gs 'stat'
-		
-		if pcs_horny >= 100:'Your world gets hazier as you become more intently focused on your imminent orgasm, only vaguely aware that Mistress is still watching you. When your orgasm hits you, you close your eyes and feel the electric shocks rip through your body, making you spasm on the kitchen floor. While you take a second to catch your breath, you hear a slow clap. It''s Mistress, with a wide grin on her face. That was quite the show you just put up!'
-		$orgasm_or = 'yes'
-		gs 'stat'
+		gs 'boyStat', 'd3'
+		gs 'arousal', 'vaginal_dildo', 10, 'sub', 'masturbate'
 		
-		'After the ten minutes are up, the kitchen timer dings. You reluctantly let the pan handle slide out of your pussy and get up from the floor, moving over to the oven to get your cookies out.'
+		if pcs_horny >= 100:
+			'Your world gets hazier as you become more intently focused on your imminent orgasm, only vaguely aware that Mistress is still watching you. When your orgasm hits you, you close your eyes and feel the electric shocks rip through your body, making you spasm on the kitchen floor. While you take a second to catch your breath, you hear a slow clap. It''s Mistress, with a wide grin on her face. That was quite the show you just put up!'
+			$orgasm_or = 'yes'
+			gs 'arousal', 'vaginal_dildo', -5, 'sub', 'masturbate'
+			'The kitchen timer dings, it seems that your ten minutes are up. You remove the pan handle from your pussy and get up from the floor, moving over to the oven to get your cookies out.'
+		else
+			'After the ten minutes are up, the kitchen timer dings. You reluctantly let the pan handle slide out of your pussy and get up from the floor, moving over to the oven to get your cookies out.'
+		end
 		'While they cool off, you have a little chat with Mistress. You both try a cookie and you''re happy with how they turned out; they taste pretty good! Mistress smiles at you benevolently, clearly in a better mood. You really lifted her spirits on a bad day.'
 		
 		gs 'arousal', 'end'

locations/masharoom.qsrc

@@ -420,7 +420,7 @@ if $ARGS[0] = '1':
 		'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/r4.jpg"></center>'
 		'You sit back and legs spread wide, so your crotch is visible from the door, running your hand into your panties, you start rubbing your clit. Soon your hear the sound of a zipper and heavy breathing coming from the door.'
 
-		gs 'arousal', 'masturbate', 10, 'exhibitionism'
+		gs 'arousal', 'clit_finger', 10, 'exhibitionism'
 		gs 'stat'
 
 		act 'Continue':
@@ -428,7 +428,7 @@ if $ARGS[0] = '1':
 			'You continue to massage your clitoris, fingering your pussy, and the realization that someone is watching you only strengthens your arousal leading to rapid orgasm. When you have finished, you hear a grunt and see a spurt of liquid, you can only assume is cum hit the floor.'
 
 			$orgasm_or = 'yes'
-			gs 'arousal', 'masturbate', 10, 'exhibitionism'
+			gs 'arousal', 'clit_finger', 10, 'exhibitionism', 'masturbate'
 			gs 'arousal', 'end'
 			gs 'stat'
 

locations/mitkabuh_group.qsrc

@@ -538,7 +538,8 @@ if $ARGS[0] = 'group_show':
 					gs 'cum_call','face',$boy[1],1
 					gs 'cum_call','mouth',$boy[1],1
 					gs 'cum_call','hair',$boy[1],1
-					gs 'arousal','masturbate',15,'exhibitionism', 'sub'
+					$orgasm_or = 'custom'
+					gs 'arousal', 'clit_finger', 15, 'exhibitionism', 'sub', 'masturbate'
 					gs 'arousal','end'
 					gs 'stat'
 					
@@ -555,7 +556,8 @@ if $ARGS[0] = 'group_show':
 					gs 'cum_call','legs',$boy[2],1
 					gs 'cum_call','butt',$boy[1],1
 					gs 'cum_call','legs',$boy[1],1
-					gs 'arousal','masturbate',15,'exhibitionism', 'sub'
+					$orgasm_or = 'custom'
+					gs 'arousal', 'clit_finger', 15, 'exhibitionism', 'sub', 'masturbate'
 					gs 'arousal','end'
 					gs 'stat'
 					

locations/movie_studio.qsrc

@@ -177,7 +177,7 @@ if $ARGS[0] = 'showers':
 					if pcs_horny >= 70:
 						if exhibitionist_lvl > 0:
 							gs 'exhibitionism', 2
-							gs 'arousal','masturbate', 10
+							gs 'arousal', 'clit_finger', 10, 'masturbate'
 							gs 'arousal', 'end'
 							pcs_mood += 15
 							$orgasm_or = 'yes'
@@ -185,7 +185,7 @@ if $ARGS[0] = 'showers':
 							act 'Dry off':gt 'movie_studio', 'showers'
 						else
 							pcs_mood += 15
-							gs 'arousal','masturbate', 10
+							gs 'arousal', 'clit_finger', 10, 'masturbate'
 							gs 'arousal', 'end'
 							$orgasm_or = 'yes'
 							$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you, biting hard on your lip to keep from crying out. As your orgasm winds down, you rinse off one more time and turn off the water.'
@@ -195,7 +195,7 @@ if $ARGS[0] = 'showers':
 						pcs_horny += 5
 						pcs_mood += 10
 						'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the studio''s showers. Though even more frustrated now, you think maybe it''s time to stop.'
-						gs 'arousal','masturbate', 10
+						gs 'arousal', 'clit_finger', 10, 'masturbate'
 						gs 'arousal', 'end'
 						act 'Dry off':gt 'movie_studio', 'showers'
 					end

locations/park_walkevents.qsrc

@@ -646,7 +646,7 @@ if $ARGS[0] = '6b':
 				'You look pleadingly at him as he grabs you by the throat and tells you to masturbate by yourself. You start of gently touching yourself, while he turns his back to you and begins searching for something.'
 				'You''re too afraid to stop as he glances at you from time to time and it doesn''t take long before you switch over to rubbing your clit as he returns with a rope.'
 
-				gs 'arousal', 'masturbate', 5, 'sub', 'humiliation'
+				gs 'arousal', 'clit_finger', 5, 'sub', 'humiliation'
 				gs 'stat'
 
 				act 'Keep going':
@@ -656,7 +656,7 @@ if $ARGS[0] = '6b':
 					'Worried, you continue playing with yourself while he ties you up, leaving only the hand you''re masturbating with free. You keep on petting yourself for a while, letting him watch, until he tells you to stop and ties your last arm. "Hope you''ve made yourself wet enough," he whispers.'
 					'He smiles as he grabs his fat cock and pushes it into you. You try to twitch and kick, but as you''re tied up you get nowhere. Without any hesitation he keeps thrusting himself into you as you continue trying to squirm.'
 
-					gs 'arousal', 'masturbate', 5, 'sub', 'humiliation'
+					gs 'arousal', 'clit_finger', 5, 'sub', 'humiliation'
 					gs 'arousal', 'vaginal', 5, 'sub', 'humiliation', 'rough', 'rape'
 					minut -= 5
 					gs 'stat'

locations/pav_church2.qsrc

@@ -832,13 +832,13 @@ if $ARGS[0] = 'mast':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/mast2.jpg"></center>'
 		'You start rubbing your clit as the priest watches and starts to pray, his eyes never leaving your pussy. The more you rub your pussy, the louder he prays.'
-		gs 'arousal', 'masturbate', 5, 'exhibitionism'
+		gs 'arousal', 'clit_finger', 5, 'exhibitionism', 'masturbate'
 		gs 'stat'
 		act 'Keep masturbating':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/mast3.jpg"></center>'
 			'You get into a rhythm and begin to moan as he continues praying. "Lord forgive her of her sins, cleanse her soul with your divine love." He continues to pray as you keep masturbating.'
-			gs 'arousal', 'masturbate', 5, 'exhibitionism'
+			gs 'arousal', 'clit_finger', 5, 'exhibitionism', 'masturbate'
 			gs 'stat'
 			act 'Orgasm':
 				*clr & cla
@@ -846,7 +846,7 @@ if $ARGS[0] = 'mast':
 				'You feel yourself getting close to orgasm. The Father can either tell or guessed. "Yes, you must purge this lust from your body. Let it all out before God!"'
 				$orgasm_or = 'yes'
 				$orgasm_txt = 'You cry out as you''re wracked by a powerful orgasm, your whole body shaking from the spasms.'
-				gs 'arousal', 'masturbate', 5, 'exhibitionism'
+				gs 'arousal', 'clit_finger', 5, 'exhibitionism', 'masturbate'
 				gs 'arousal', 'end'
 				gs 'stat'
 				killvar '$orgasm_txt'
@@ -948,19 +948,22 @@ if $ARGS[0] = 'sex':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/foreplay2.jpg"></center>'
 	'He stands up and gently pushes you against the wall before his hands start roaming over your body, slowly removing your clothes until your breasts are exposed and his hand is rubbing your clit. "We must purge the lust from your body and banish your sexual desires." You feel one of his fingers slide inside your wet pussy and he slowly fucks you with one finger before adding a second.'
+	$orgasm_or = 'no'
 	gs 'arousal', 'vaginal_finger', 5
 	gs 'stat'
 	act 'Open to purging':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/foreplay3.jpg"></center>'
 		'Once you''re nice and wet, he drops down to his knees and places his face between your legs as you lean back against the wall. He begins to eagerly lick at your clit and pussy, causing you to moan in pleasure. After several minutes he stops and stands back up. "Kneel my child."'
+		$orgasm_or = 'no'
 		gs 'arousal', 'cuni', 5
 		gs 'stat'
 		act 'Kneel':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/foreplay4.jpg"></center>'
 			'As you kneel down, he pulls his dick out of his pants. It''s already hard, but he strokes it several times as he says "Open your mouth my child."'
-			gs 'arousal', 'masturbate', 5
+			$orgasm_or = 'no'
+			gs 'arousal', 'clit_finger', 5
 			gs 'stat'
 			act 'Open your mouth':
 				*clr & cla
@@ -968,7 +971,6 @@ if $ARGS[0] = 'sex':
 				'You open your mouth and he slides his dick inside before you close your lips around his shaft. Slowly and steadily, you start to suck him off. He lets out a moan which turns into a moaning prayer. "Oh heavenly Father, forgive the sins of this child."'
 				'After a few minutes, he pulls out of your mouth. "Undress and lean forward, placing your hands on the ground."'
 				gs 'arousal', 'bj', 5
-				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Undress and bend over':
 					*clr & cla

locations/placer_sex.qsrc

@@ -920,7 +920,7 @@ if $args[0] = 'card_stript':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/placer_sex73.jpg"></center>'
 								'Damn, teasing the guys really has got you worked up. Since they have been such a nice and cute audience, you want to show them a little bit more.'
 								'Unable to control yourself any longer, your hand slips between your legs and you gently fondle yourself. An involuntary moan escapes from your lips when you run a finger over your clitoris, and rub it a few more times... it feels so good!'
-								gs 'arousal', 'masturbate', 5, 'unknown', 'sub', 'group'
+								gs 'arousal', 'clit_finger', 5, 'unknown', 'sub', 'group', 'masturbate'
 								gs 'stat'
 								act 'Continue':
 									*clr & cla
@@ -931,7 +931,7 @@ if $args[0] = 'card_stript':
 									'Just when you open your mouth to protest, he continues: "We won''t touch you or anything! I just thought... maybe you could use it in your show?"'
 									'You close your mouth again, and look at the vibrator in your hand. It''s a small and modest size. That could be fun, actually...'
 									'You nod slyly at <<$boydesc2>> and tell him to take his seat again, while you turn it on and softly rub it against your pussy.'
-									gs 'arousal', 'vaginal_vibe', 5, 'unknown', 'sub', 'group'
+									gs 'arousal', 'vaginal_vibe', 4, 'unknown', 'sub', 'group', 'masturbate'
 									gs 'stat'
 									act 'Continue':
 										minut += 30
@@ -942,7 +942,8 @@ if $args[0] = 'card_stript':
 										'The guys are back in their seats. They''ve both taken their cocks out, and are slowly stroking them while they watch you fuck yourself with the vibrator.'
 										'The vibrator makes you feel way too good to care about them though, and you focus on yourself. You turn the vibrator up to a nice speed, and slowly fuck your wet cunt with it. Every once in a while, you take it out and rub it over your pussy lips. Directly on your clit would be too much...'
 										'This feels way too good for you to stall the show out much longer. Within minutes you rub yourself just the right way, and you arc your back when a surge of pleasure courses through your body.'
-										$orgasm_or = 'yes'
+										$orgasm_or = 'custom'
+										gs 'arousal', 'vaginal_vibe', 1, 'unknown', 'sub', 'group', 'masturbate'
 										gs 'stat'
 										act 'Continue':
 											swallow+= 1

locations/podrsex.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'suck':
 		'You feel so horny in this situation, you''re very close to having a spontaneous orgasm with the guy''s cock still in your mouth. The other girl notices and gives you a sweet wink while she takes over, giving you some time to rub your clit furiously.'
 	
 		$orgasm_or = 'yes'
-		gs 'arousal', 'masturbate', 5
+		gs 'arousal', 'clit_finger', 5, 'masturbate'
 		gs 'stat'
 		
 	end

locations/ptu_dush.qsrc

@@ -41,14 +41,16 @@ if $ARGS[0] = 'pos2':
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			act 'Tease them':
 				cls
-				gs 'arousal', 'masturbate', 2
+				$orgasm_or = 'no'
+				gs 'arousal', 'clit_finger', 2
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_3.jpg"></center>'
 				'Feeling aroused that someone walked in on you try to keep quiet while your hand begins sliding down towards your clit. The nearer your hand approaches the more a warm feeling inside you rises.'
 				'You should stop but you''re not able to do that as your hand reach down, and you begin touching yourself. It doesn''t take long before you''re dripping wet. Knowing that you must keep quiet, you try your best to keep as silent as possible. You feel your body fill with warmth, you close your eyes in anticipation to...'	
 				act 'Continue':
 					cls
-					gs 'arousal', 'masturbate', 2
+					$orgasm_or = 'no'
+					gs 'arousal', 'clit_finger', 2
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_4.jpg"></center>'
 					'Not being able to keep yourself silent, you let out a small moan. Right away you regret not being able to keep quiet and as you open your eyes there are two guys standing in front of you, watching as your hand is still touching your clit.'

locations/qwBarEncounters.qsrc

@@ -312,7 +312,6 @@ if $ARGS[0] = '':
 				*clr
 				gs 'willpower', 'pay', 'resist'
 				'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/bargrind2.mp4"></video></center>'
-				gs 'boyStat', $npclastgenerated
 				!!sub/dom dialog needs fixing
 				!!'Maybe it''s the alcohol, ' + iif(sub>=20,'maybe you are','or maybe you are just') + ' really horny ' + iif(sub>=20,'or maybe you are just too submissive to refuse him ','') + '- whatever the case may be, you don''t really want the stranger to stop. Quite the opposite, in fact.'
 				'Maybe it''s the alcohol, or maybe you are just really horny - whatever the case may be, you don''t really want the stranger to stop. Quite the opposite, in fact.'
@@ -325,11 +324,10 @@ if $ARGS[0] = '':
 					cla
 					*clr
 					'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/bargrinds1.mp4"></video></center>'
-					gs 'boyStat', $npclastgenerated
 					'He works your clit with his fingers for a bit, clearly knowing what he''s doing and getting you hot and bothered before he pulls his hand free. He turns you around so your back is against the bar and then pushes down on your shoulders until you are squatted down in front of him and hidden from most views.'
 					'The strangers pulls out his cock and shoves it in your open mouth - you already knew what to expect and at this point, you are eager to suck his cock. He leans in close and starts fucking your mouth, and you are reveling in it, masturbating as he shoves his <<dick>>cm <<$dick_girth>> cock down your throat again and again. You don''t know if anybody''s watching and you are too drunk to feel anything but excitement at the prospect.'
 					gs 'arousal', 'bj', 5, 'sub', 'exhibitionism', 'deepthroat', 'rough'
-					gs 'arousal', 'masturbate', 5, 'sub', 'exhibitionism'
+					gs 'arousal', 'clit_finger', 5, 'sub', 'exhibitionism'
 					minut -= 5
 					gs 'stat'
 					$orgasm_txt = 'Your fingers on your needy cunt and the sensation of blowing a stranger in the middle of a bar prove too much to you, and you cum, shaking all over, your moans muffled by his <<$dick_girth>> cock.'
@@ -338,14 +336,11 @@ if $ARGS[0] = '':
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/bargrinds2.jpg"></center>'
-						gs 'boyStat', $npclastgenerated
 						'You are not quite sure for how long you are squatting there while he fucks your mouth, but at some point, he picks up the pace and starts to groan, then suddenly pulls his cock out of your mouth and the first hot jet of sperm hits your face, then another shoots into your mouth. Several more follow and cover your lips, chin and tongue with cum.'
 						'Once the last spurt is out, he wipes the tip of dick against your lips to get the last drops off cum off. Then he tucks his cock back in his pants, orders another drink for each of you and, before you''re even fully back on your feet, takes his drink and walks off.'
 						gs 'arousal', 'end'
-						spafinloc = 11
-						gs 'cum_manage'
-						spafinloc = 12
-						gs 'cum_manage'
+						gs 'cum_call', 'face', $boy, 0,'','',20
+						gs 'cum_call', 'mouth', $boy, 0,'','',20
 						gs 'fame', 'city', 'sex', 1
 						gs 'stat'
 

locations/rex_events.qsrc

@@ -727,8 +727,9 @@ if $ARGS[0] = 'sms':
 									pcs_mood = 100
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex15.jpg"></center>'
 									'You can''t hold back any longer and you start masturbating while looking at your phone, until you finally exploded with an earth-shattering orgasm.'
-									$orgasm_or = 'yes'
-									gs 'arousal', 'masturbate', 10
+									$orgasm_or = 'custom'
+									gs 'arousal', 'clit_finger', 10, 'masturbate'
+									gs 'arousal', 'end'
 									gs 'stat'
 									
 									act 'Answer':

locations/rex_party_events.qsrc

@@ -219,8 +219,10 @@ if $ARGS[0] = 'toilet_mast':
 	if i = 3:'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_1_<<i>>.mp4"></video></center>'
 	'With your arousal overpowering your senses, you can''t take it anymore. You pull your panties down and rigorously begin rubbing your clit. Once you are good and wet, you slide your fingers inside your pussy and start finger fucking yourself, switching back and forth between rubbing your clit and fucking your fingers until you bring yourself to an orgasm.'
 	
-	$orgasm_or = 'yes'
-	gs 'arousal', 'masturbate', 5
+	$orgasm_or = 'no'
+	gs 'arousal', 'vaginal_finger', 5, 'masturbate'
+	$orgasm_or = 'custom'
+	gs 'arousal', 'clit_finger', 5, 'masturbate'
 	gs 'arousal', 'end'
 	gs 'stat'
 	

locations/rex_party_girls_events.qsrc

@@ -721,7 +721,7 @@ if $ARGS[0] = 'bra':
 				'The boys take you to the bathroom and put you on your knees, unzipping their pants. Even in such a drunken state, you can still guess, what they want you to do.'
 				act 'Suck':
 					cls
-					gs 'arousal', 'vaginal', 5, 'group', 'gangbang'
+					gs 'arousal', 'hj', 5, 'group', 'gangbang'
 					gs 'arousal', 'bj', 5, 'group', 'gangbang'
 					guy += 3
 					gang += 1
@@ -730,25 +730,25 @@ if $ARGS[0] = 'bra':
 					'You try to service them both awkwardly, stroking them both while trying to lick the heads of their dick, in your drunken state you can''t keep up any kind of rhythm with your hands. One of the guys tells you to just use your mouth.'
 					act 'Remove hands':
 						cls
-						gs 'arousal', 'bj', 5, 'group', 'gangbang'
-						gs 'arousal', 'masturbate', -5
-						gs 'stat'
 						i = rand(1,2)
 						if i = 1: '<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_12_1.mp4"></video></center>'
 						if i = 2: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_12_3.jpg"></center>'
 						'You dutifully remove your hands and instinctively begin to fondle your pussy with your free hand. The guys take turns fucking your mouth, sliding their cocks until their balls are against you chin, making your gag and your eyes water, while the other masturbates. Soon you bring them both to the point where they are ready to come.'
+						gs 'arousal', 'bj', 5, 'group', 'gangbang'
+						gs 'arousal', 'clit_finger', -5, 'masturbate'
+						gs 'stat'
 						act 'Continue':
 							cls
-							facial += 1
-							spafinloc = 12
-							gs 'cum_manage'
-							spafinloc = 11
-							gs 'cum_manage'
-							spafinloc = 7
-							gs 'cum_manage'
+							gs 'cum_call', 'mouth', $boy, 1,'','',20
+							gs 'cum_call', 'face', $boy, 1,'','',20
+							gs 'npcgeneratec', 0, 'Boy from Rex''s Party', 17
+							gs 'boyStat', $npclastgenerated
+							gs 'cum_call', 'clothes', $boy, 1,'','',20
+							gs 'cum_call', 'hair', $boy, 1,'','',20
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_13.jpg"></center>'
 							'Still squatting and barely able to stay in this position they grab their hard dicks and masturbate them until you get splashed with their semen, spurts of cum cover your face and hair. The boys wipe off the last drop of cum from their limp dicks onto your face and cackle as they leave you alone in the room.'
+							gs 'arousal', 'end'
 							act 'Move away': gt 'rex_party_home', 'party_toilet'
 						end
 					end

locations/rolanbath.qsrc

@@ -188,7 +188,7 @@ if $ARGS[0] = 'start':
 					'You know Rolan isn''t in here.'
 					*nl
 					'You place the shower head onto your pussy and a powerful jet of warm water begins to caress you.'
-					gs 'arousal', 'masturbate', 10
+					gs 'arousal', 'clit_finger', 10, 'masturbate'
 					if hypnoAddict ! 0:
 						'You unconsciously avoid spraying water into your vagina.'
 					else
@@ -220,7 +220,7 @@ if $ARGS[0] = 'start':
 		dynamic $brit
 !!		dynamic $dryOff
 	end
-!!gs 'arousal', 'masturbate', 20
+!!gs 'arousal', 'clit_finger', 20, 'masturbate'
 !!bath
 	act 'Have a bath (0:30)':
 		cla
@@ -371,7 +371,7 @@ if $ARGS[0] = 'start':
 					'You know Rolan isn''t here.'
 					*nl
 					'You turn on the faucet, lift your legs and scoot your ass over to align your pussy with the jet of warm water.'
-					gs 'arousal', 'masturbate', 10
+					gs 'arousal', 'clit_finger', 10, 'masturbate'
 					act 'Rolanbathdryoff': gt $loc, 'start'
 				end
 			else
@@ -553,7 +553,7 @@ if $ARGS[0] = 'pervshower':
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></center>'
 				*nl
 				'You place the shower head onto your pussy and a powerful jet of warm water begins to caress you.'
-				gs 'arousal', 'masturbate', 10
+				gs 'arousal', 'clit_finger', 10, 'masturbate'
 				if hypnoAddict ! 0:
 					'You unconsciously avoid spraying water into your vagina.'
 				else

locations/selfplay.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'start':
 			end
 
 			$orgasm_txt = 'Suddenly, you rub your clit just right and your whole body starts to shiver in orgasm. The intensity of the orgasm nearly makes you scream, but you bite down on your lip and do your best to stifle down the moans so no one hears you.'
-			gs 'arousal', 'masturbate', 20
+			gs 'arousal', 'clit_finger', 20, 'masturbate'
 			minut -= 15
 			gs 'stat'
 
@@ -87,7 +87,7 @@ if $ARGS[0] = 'start':
 			!!if $loc = 'vanrPar':'<center><img <<$set_imgh>> src="images/shared/sex/mast/klitvann.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/mast/1.jpg"></center>'
 
-			gs 'arousal', 'masturbate', 5
+			gs 'arousal', 'anal_finger', 5, 'masturbate'
 			gs 'stat'
 
 			if pcs_ass >= 5:
@@ -112,7 +112,7 @@ if $ARGS[0] = 'start':
 
 					'<center><img <<$set_imgh>> src="images/shared/sex/mast/2.jpg"></center>'
 
-					gs 'arousal', 'masturbate', 5
+					gs 'arousal', 'anal_finger', 5, 'masturbate'
 					gs 'stat'
 
 					if pcs_ass >= 10:
@@ -165,7 +165,7 @@ if $ARGS[0] = 'start':
 							gs 'selfplay', 'sis_prov'
 							'<center><img <<$set_imgh>> src="images/shared/sex/mast/3.jpg"></center>'
 
-							gs 'arousal', 'masturbate', 5
+							gs 'arousal', 'anal_finger', 5, 'masturbate'
 							gs 'stat'
 
 							if pcs_ass >= 15:
@@ -219,7 +219,7 @@ if $ARGS[0] = 'start':
 
 									'<center><img <<$set_imgh>> src="images/shared/sex/mast/4.jpg"></center>'
 
-									gs 'arousal', 'masturbate', 5
+									gs 'arousal', 'anal_finger', 5, 'masturbate'
 									gs 'stat'
 
 									if pcs_ass >= 20:
@@ -274,7 +274,7 @@ if $ARGS[0] = 'start':
 
 											'<center><img <<$set_imgh>> src="images/shared/sex/mast/5.jpg"></center>'
 
-											gs 'arousal', 'masturbate', 5
+											gs 'arousal', 'anal_fist', 5, 'masturbate'
 											gs 'stat'
 
 											if pcs_ass >= 25:
@@ -880,8 +880,7 @@ if $ARGS[0] = 'glass_shower_suction_dildo_fuck':
 	end
 	*nl
 	if pcs_horny >= 90:$orgasm_or = 'yes'
-	gs'arousal','masturbate',-5
-	gs'arousal','vaginal_dildo',5
+	gs 'arousal', 'vaginal_dildo', 5, 'masturbate'
 	act'Keep masturbating':gt'selfplay','glass_shower_suction_dildo_fuck'
 	act'Finish masturbating and dry off':
 		dildo_timer = 0
@@ -977,7 +976,7 @@ if $ARGS[0] = 'fingering':
 				'Having your fingers in your pussy feels nice, but it doesn''t feel very tight. You feel like you can take more.'
 			end
 
-			gs 'arousal', 'masturbate', 2
+			gs 'arousal', 'vaginal_finger', 5, 'masturbate'
 			gs 'stat'
 			'<<$AnyaMsg>>'
 
@@ -1011,7 +1010,7 @@ if $ARGS[0] = 'fingering2':
 		if pcs_vag <= 12:'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
 		if pcs_vag > 12:'Your pussy is quite loose, and you have to work hard to get much enjoyment out of it.'
 
-		gs 'arousal', 'masturbate', 10
+		gs 'arousal', 'vaginal_finger', 10, 'masturbate'
 		gs 'stat'
 
 		'<<$AnyaMsg>>'
@@ -1054,7 +1053,7 @@ if $ARGS[0] = 'fingering3':
 		end
 		if pcs_vag < 15:vaginaTemp += 1
 
-		gs 'arousal', 'masturbate', 2
+		gs 'arousal', 'vaginal_finger', 2, 'masturbate'
 		gs 'stat'
 
 		'<<$AnyaMsg>>'
@@ -1077,7 +1076,7 @@ if $ARGS[0] = 'fingering3':
 				'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
 				'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
 
-				gs 'arousal', 'masturbate', 10
+				gs 'arousal', 'vaginal_finger', 10, 'masturbate'
 				gs 'stat'
 
 				if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'

locations/sexdvanadva.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'var':
 		'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvanadva/dp<<picrand>>.jpg"></center>'
 		'She has both men fucking her. It makes you feel a little envious as you watch, playing with yourself.'
 		
-		gs 'arousal', 'masturbate', 10, 'sub'
+		gs 'arousal', 'clit_finger', 10, 'sub', 'masturbate'
 	end
 
 	gs 'stat'

locations/sexorg.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'var':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/bowling/sex/vag<<picrand>>.jpg"></center>'
 		'You watch as one of the girls gets her pussy filled from behind by a big cock, listening to her loud moans and idly rubbing your own clit while you wait your turn.'
 
-		gs 'arousal', 'masturbate', 10
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 	elseif sexorgrand = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/bowling/sex/uvag<<picrand>>.jpg"></center>'
 		'You lie down on your back and almost instantly feel one of the guys'' cocks entering your moist cunt. His movements are fast and rough, and you''d cry out in ecstasy if it weren''t for the pussy you are busy licking.'
@@ -38,7 +38,7 @@ if $ARGS[0] = 'var':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/bowling/sex/anal<<picrand>>.jpg"></center>'
 		'You watch one of the girls - you don''t even know her name - not breaking eye contact with her as she lowers herself onto one of the guys, impaling her tight ass on his hard dick. "You''d love to take my place, wouldn''t you?" she asks sweetly, then cries out as her partner loses patience and starts fucking her from below. You don''t have to answer - the fingers you have buried in your pussy as you watch tell her everything she needs to know.'
 
-		gs 'arousal', 'masturbate', 10
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 	elseif sexorgrand = 4:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/bowling/sex/uanal<<picrand>>.jpg"></center>'
 		'You are not as well prepared as you thought you were, and it hurts a little as one of the guys pushes past your sphincter, but soon the pain is forgotten and replaced by a pleasant sense of fullness... and that''s before he starts really fucking you. You lean into the girl in front of you''s cunt and enjoy yourself.'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'var':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/bowling/sex/dp<<picrand>>.jpg"></center>'
 		'Her expression of bliss and loud utterances leave no doubt in your mind: having her ass and pussy filled at the same time has sent this girl straight to heaven, and while you watch on in jealousy, you have no other choice than to rub your clit and wait your turn.'
 
-		gs 'arousal', 'masturbate', 10
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 	end
 	
 	gs 'stat'

locations/sexshop.qsrc

@@ -482,16 +482,16 @@ if $ARGS[0] = 'pip':
 		act 'Watch porn':
 			cla
 			money -= 50
-			minut += 15
+			minut += 10
 			'You insert 50 <b>₽</b> into the terminal and the TV on the wall begins showing a pornographic film.'
 			'You sit in the chair and watch the porn, feeling yourself becoming a little excited.'
 
-			act 'The film ends':gt 'sexshop', 'pip'
+			act 'The film ends':minut += 5 & gt 'sexshop', 'pip'
 
 			act 'Masturbate':
 				cla
 				'You caress your pussy as you watch the film, enjoying the pleasant sensation between your legs.'
-				gs 'arousal', 'masturbate', 5
+				gs 'arousal', 'clit_finger', 5, 'masturbate'
 				gs 'arousal', 'end'
 				gs 'stat'	
 

locations/shoplifting.qsrc

@@ -166,7 +166,8 @@ if $ARGS[0] = 'show':
 		'The security guard is observing you satisfied, rubbing his cock throughout his pants. He''s clearly aroused, and you fear a bit what might come next, but you manage to keep focus as you know this will determine your fate.'
 		'"I wonder, are your panties soaked yet, girl?" he asks.'
 
-		gs 'arousal', 'foreplay', 3, 'sub', 'exhibition'
+		$orgasm = 'no'
+		gs 'arousal', 'clit_finger', 3, 'masturbate', 'sub', 'exhibition'
 		gs 'stat'
 
 		act 'Nod':
@@ -177,7 +178,7 @@ if $ARGS[0] = 'show':
 			'Pleased, he nods his head as he continues on, "Remove your clothing, I want to see them wet panties."'
 			'Once again, you comply and remove you clothing piece by piece as he carefully scans your body, "Good, now sit back down again and spread your legs, slide your panties down, I want to see that vulva exposed..."'
 
-			gs 'arousal', 'masturbate', 3, 'sub', 'exhibition'
+			gs 'arousal', 'foreplay', 3, 'sub', 'exhibition'
 			gs 'stat'
 
 			act 'Remove your panties':
@@ -188,7 +189,8 @@ if $ARGS[0] = 'show':
 				'He starts chuckling, "Good, I want you to hate me, this is making you feel humiliated. Use that frustration to begin touching yourself and pick up the pace this time."'
 				'You look madly at him as you use your fingers to rub on your exposed clit, picking up the pace. Just as you''re feeling excited, he tells you to slow down as he doesn''t want you to get too much pleasure out of this...'
 
-				gs 'arousal', 'masturbate', 3, 'sub', 'exhibition'
+				$orgasm = 'no'
+				gs 'arousal', 'clit_finger', 3, 'masturbate', 'sub', 'exhibition'
 				gs 'stat'
 
 				act 'Keep going':
@@ -199,7 +201,9 @@ if $ARGS[0] = 'show':
 					'Suddenly, an urge overcomes you, and without him commanding you, your other hand travels upward, stopping at your breast. You carefully begin to play with one of your nipples, gently rubbing it in a circular motion building up your arousal.'
 					'You don''t even care anymore if he approves or not. You''re too excited, and it''s getting the best of you as you begin picking up the pace again, moaning loudly by now.'
 					'"You little minx! Who told you to take the control?" he manages to say between his panting, "I''ll let you off this time as I love seeing you squirm, as you appease me... but use this instead" as he hands over a fake cock.'
-					gs 'arousal', 'masturbate', 3, 'sub', 'exhibition'
+					
+					$orgasm = 'no'
+					gs 'arousal', 'clit_finger', 3, 'masturbate', 'sub', 'exhibition'
 					gs 'stat'
 
 					act 'Continue on':
@@ -211,12 +215,13 @@ if $ARGS[0] = 'show':
 						'But to your dismay, the security guard is only focused on himself as he''s furiously stroking his cock...'
 						'You pick up the pace, not wanting to be outpaced by him, but just as you''re about to orgasm, the security guard seems to decide that it''s time for some payback, as he smugly commands you to stop touching yourself right away...'
 
-						gs 'arousal', 'vaginal_dildo', 3, 'sub', 'exhibition'
+						gs 'boyStat', 'd3'
+						$orgasm = 'no'
+						gs 'arousal', 'vaginal_dildo', 3, 'masturbate', 'sub', 'exhibition'
 						gs 'stat'
 
 						act 'Stop':
 							*clr & cla
-							$orgasm = 'yes'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/sex/show/show7.jpg"></center>'
 							'All of your body is screaming in agony as you obey and stop, your pulsating pussy deprived of an orgasm and your mind about to snap...'
@@ -225,6 +230,7 @@ if $ARGS[0] = 'show':
 							'It doesn''t take long before you hear loud panting and groaning as he finishes, but you''ve managed to faze him out as you''re approaching an orgasm once again, now furiously penetrating yourself. You want to make sure that you''re able to finish before he''s able to stop you.'
 							'His commanding tone and the build up has finally come to fruition as your legs stiffen, your pussy goes numb and you orgasm violently, trembling, barely able to sit still on the chair. The orgasm is so immense that you feel your ears ringing afterwards for a few minutes.'
 
+							$orgasm = 'custom'
 							gs 'arousal', 'vaginal_dildo', 3, 'sub', 'exhibition'
 							gs 'stat'
 

locations/shulga_room.qsrc

@@ -296,7 +296,7 @@ if $ARGS[0] = 'shulv_sexev2_sonya':
 
 		act 'Slide a hand between your legs':
 			*clr & cla
-			gs 'arousal','masturbate',5
+			gs 'arousal', 'clit_finger', 5, 'masturbate'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/ev2_3'+rand(1,2)+'.jpg"></center>'
 			'Gradually, Sonia''s moans grow even louder. Her cries reach a fevered pitch as she frantically thrust herself along the length of Vasily''s cock. She lets out one last desperate cry, and her body shakes with ecstasy. The only sounds escaping her lips now were a series of soft whimpers.'
@@ -304,7 +304,7 @@ if $ARGS[0] = 'shulv_sexev2_sonya':
 
 			act 'Grind your crotch against your hand':
 				*clr & cla
-				gs 'arousal','masturbate',5
+				gs 'arousal', 'clit_finger', 3, 'masturbate'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/ev2_4'+rand(1,2)+'.jpg"></center>'
 				'Vasily pulls himself from the still quivering Sonia, and walks around to face her. Crooking his finger under Sonia''s chin, he raises her chin until she is looking him in the eyes. Bringing his cock up to her cute disheveled face, he lets loose, spraying Sonia with enough cum that drips from her chin in large sticky streams. Sonia''s eyes beam up at him with delight apparently very proud of her work'
@@ -341,7 +341,7 @@ if $ARGS[0] = 'gang_sexev1_sonya':
 
 	act 'Slide a hand inside your panties.':
 		*clr & cla
-		gs 'arousal', 'masturbate', 5
+		gs 'arousal', 'clit_finger', 3, 'masturbate'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/group/ev1_2.jpg"></center>'
 		'When Dan was out of breath, Vitek sat down and motions for Sonia to hop onto his lap. Sonia eagerly accepted, guiding him into her dripping snatch she lets out a soft moan and begins to ride him in earnest. Moments later, Vasily walks up, and finally gets some attention from Sonia''s eager mouth.'
@@ -349,7 +349,7 @@ if $ARGS[0] = 'gang_sexev1_sonya':
 
 		act 'Slip a finger inside yourself':
 			*clr & cla
-			gs 'arousal', 'masturbate', 5
+			gs 'arousal', 'clit_finger', 3, 'masturbate'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/group/ev1_3.jpg"></center>'
 			'Vasily and Vitek swap places and continued to fuck Sonia.'
@@ -358,7 +358,7 @@ if $ARGS[0] = 'gang_sexev1_sonya':
 
 			act 'Work it':
 				*clr & cla
-				gs 'arousal', 'masturbate', 5
+				gs 'arousal', 'clit_finger', 3, 'masturbate'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/group/ev1_4.jpg"></center>'
 				'The guys finish playing with Sonia by covering her face in a hot sticky mess. Vitek gives her a playful smack on the ass sending her toward the door to go get cleaned up.'
@@ -666,7 +666,7 @@ end
 
 if $ARGS[0] = 'drunken_body_mast':
 	menu_off = 1
-	gs 'arousal','masturbate',5,'group','exhibitionism'
+	gs 'arousal', 'clit_finger', 3, 'masturbate','group','exhibitionism'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/mast'+rand(1,10)+'.jpg"></center>'
 	'A soft moan escapes your lips, as you work your fingers between your thighs.'

locations/sisterQW.qsrc

@@ -286,7 +286,7 @@ if $ARGS[0] = 'caress':
 	'You lick your finger before rhythmically caressing your swollen clit and caressing your breasts with your other hand. You are lost in the moment, oblivious to everything around you.'
 	'Your muscles contract, your breath shortens. Realizing you have hit your peak, you bite your lip to stifle your moans.'
 	$orgasm_or = 'yes'
-	gs 'arousal', 'masturbate', 5, 'exhibitionism'
+	gs 'arousal', 'clit_finger', 3, 'masturbate', 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Leave': gt 'korrPar'

locations/street_event.qsrc

@@ -1683,7 +1683,7 @@ if $ARGS[0] = 'divorce_party':
 							'"Don''t you want to have a little taste?" Yefim asks while stroking his dick teasingly. Eva doesn''t need any more convincing. She leans forward and runs her tongue along the underside of his shaft before her lips wrap around the tip. Bobbing her head, she swallows every inch of this stranger''s cock with ease as you and the others watch. "Hey babe, don''t get too carried away, we just started," Marta giggles as she gently pushes Yefim away from her friend, his cock coming free from Eva''s mouth with a wet pop. Marta leads him to the couch where she has him lie down before kneeling beside him and calling Eva over.'
 							act 'Watch':
 								*clr & cla
-								gs 'arousal', 'masturbate', 10
+								gs 'arousal', 'clit_finger', 10, 'masturbate'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/shared/divorcee/d5.jpg"></center>'
 								'The two of them wrap their lips around each side of Yefim''s throbbing cock, sliding up and down, nibbling and sucking on every veiny inch. You feel the heat between your legs growing as you watch one focus on the reddened tip while the other kisses a trail down to his balls. He throws his head back and lets out a grunt, one of his hands gripping the back of Eva''s head as she laps up the leaking precum.'

locations/tour_guide.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'riverbate':
 	'"You can cum on me, just keep it away from my face," you say sweetly. It does not take long before the first guy pops, shooting his cum onto your back. Several more erupt, and your back and butt get really warm.'
 	$orgasm_or = 'custom'
 	$orgasm_txt = 'All the sensations and sights of the guys cumming on you sets your own orgasm off, leaving you gasping for breath, and your legs shaking.'
-	gs 'arousal', 'masturbate', 3, 'exhibitionism'
+	gs 'arousal', 'clit_finger', 3, 'masturbate', 'exhibitionism'
 	pcs_horny += 25
 	gs 'stat'
 	'Once your body settles down, you slip back into the water and wipe the cum off. Most of the guys have pulled their shorts up and are back to splashing around in the water, though a few are still hanging out nearby, hoping you will let them do more.'

locations/treeCircle.qsrc

@@ -90,7 +90,7 @@ if pcs_inhib >= 30 and pcs_horny > 60:
 		*nl
 		'That''s better!'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'masturbate', 15
+		gs 'arousal', 'clit_finger', 15, 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		cla

locations/ugol.qsrc

@@ -32,7 +32,7 @@ if pcs_horny >= 90 and pcs_inhib > 30:
         'You begin to rub your clit, at first in slow soft circles, but as you quickly feel yourself building up to an orgasm, you start rubbing it with urgency, biting your lip to keep from crying out. A massive shudder runs through your body as you orgasm, your soft cries of ecstasy echoing in the corridor. Getting dressed and blushing slightly, you check once more to make sure you are alone. You hope no one heard you as you quickly leave.'
        
 		$orgasm_or = 'yes'
-		gs 'arousal', 'masturbate', 15
+		gs 'arousal', 'clit_finger', 15, 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 

locations/ugol1.qsrc

@@ -11,7 +11,7 @@ act 'Masturbate':
 	'You begin to rub your clit, at first in slow soft circles, but as you quickly feel yourself building up to an orgasm, you start rubbing it with urgency, biting your lip to keep from crying out. A massive shudder runs through your body as you orgasm, your soft cries muffled by your own hand over your mouth. Getting dressed and blushing slightly, you check once more to make sure you are alone. You hope no one heard you as you quickly leave.'
 
 	$orgasm_or = 'yes'
-	gs 'arousal', 'masturbate', 10
+	gs 'arousal', 'clit_finger', 10, 'masturbate'
 	gs 'arousal', 'end'
 	gs 'stat'
 	

locations/zsoft_gopskverGorSlut.qsrc

@@ -597,12 +597,13 @@ if $ARGS[0] = 'piss':
 						'He grins at you: "Before you can go, I want to see you shove this beer bottle into your pussy. Get on with it, slut...'
 						act 'Obey':
 							*clr & cla
-							gs 'arousal', 'masturbate', 4, 'exhibitionism', 'humiliation'
-							gs 'arousal', 'end'
 							gs'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/but.jpg"></center>'
 							'You sigh... you''re too exhausted to fight them. If this is what you have to do so they''ll let you go...'
 							'You take the bottle from his hand and slowly guide it towards your pussy, and begin to push it in. After a while they lose interest in you fucking yourself with the bottle and disperse, leaving you by yourself.'
+							gs 'boystat', 'd4'
+							gs 'arousal', 'vaginal_dildo', 4, 'masturbate', 'exhibitionism', 'humiliation'
+							gs 'arousal', 'end'
 							act 'Leave':gt 'pav_park', 'start'
 							act 'Return to your friends':gt'zsoft_gopskverGorSlut','2'
 						end
@@ -681,9 +682,6 @@ if $ARGS[0] = 'siski':
 	if pcs_horny >= 50:
 		act 'Masturbate in front of them':
 			*clr & cla
-			gs 'arousal', 'masturbate', 5, 'exhibitionism'
-			gs 'arousal', 'end'
-			gs'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/park/gop/mast'+rand(1,3)+'.mp4"></video></center>'
 			rnd_droch_text = RAND(0,3)
 			if rnd_droch_text = 0:$rnd_droch_text = 'Without hesitation, you pull your clothes to the side and rub your fingers over your wet cunt lips, and then theatrically suck on your finger to taste yourself. The guys are speechless, never thinking you would actually do it, and watch you intently.'
@@ -692,6 +690,9 @@ if $ARGS[0] = 'siski':
 			if rnd_droch_text = 3:$rnd_droch_text = 'You bite your lip as you gently massage your clitoris, fondling your tits with your available hand. The guys are looking at your show with wide eyes, unsure what they did to convince you to actually do this for them.'
 
 			'<<$rnd_droch_text>>'
+			gs 'arousal', 'clit_finger', 4, 'masturbate', 'exhibitionism'
+			gs 'arousal', 'end'
+			gs'stat'
 			act 'Cover up again':gt'zsoft_gopskverGorSlut','2'
 		end
 	end