[fixed] stat['mast'] was not being counted, is now done in 'arousal' and the few instances where it was done manually have been removed

locations/Komp.qsrc

@@ -208,7 +208,6 @@ if $ARGS[0] = 'masturbate':
 
 		if divanmastr = 0:
 			divanmastr = 1
-			stat['mast'] += 1
 			if pcs_inhib < 30:inhib_exp += rand(1,3)
 		end
 

locations/arousal.qsrc

@@ -840,6 +840,7 @@ if $ARGS[0] = 'end':
 	if stim['hidden_futa'] = 1: hidden_futa += 1
 	if stim['prostitution'] = 1: slutty += 1
 	if stim['hidden_prostitution'] = 1: hidden_slutty += 1
+	if stim['masturbate'] = 1: stat['mast'] += 1
 	
 	killvar 'anal_slip'
 	killvar 'ar_anal_lube'

locations/divan.qsrc

@@ -11,7 +11,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		if divanmastr = 0:
 			divanmastr = 1
-			stat['mast'] += 1
 			if pcs_inhib < 30:inhib_exp += rand(1,3)
 		end
 
@@ -22,6 +21,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		$orgasm_or = 'yes'
 		gs 'arousal', 'clit_finger', 15, 'masturbate'
+		gs 'arousal', 'end'
 		gs 'stat'
 
 		gs 'stat'

locations/gschool_boys_bathroom.qsrc

@@ -1218,11 +1218,10 @@ end
 
 if $ARGS[0] = 'masturbateb4':
 	*clr & cla
-	stat['mast'] += 1
 	if pcs_inhib < 40: inhib_exp += rand(1,3)
 	orgasm += 1
 	pcs_horny = 0
-	gs 'arousal', 'mast', 10
+	gs 'arousal', 'clit_finger', 10, 'masturbate'
 	gs 'arousal', 'end'
 	gs 'stat'
 	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'

locations/gschool_girls_bathroom.qsrc

@@ -510,7 +510,6 @@ if $ARGS[0] = 'company2':
 	end
 	act 'Masturbate':
 		*clr & cla
-		stat['mast'] += 1
 		if pcs_inhib < 40:inhib_exp += rand(1,3)
 		orgasm += 1
 		pcs_horny = 0
@@ -520,9 +519,12 @@ if $ARGS[0] = 'company2':
 		'Listening to <<$rand_girl>> getting her ass violated, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
 		*nl		
 		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder, and even play with your asshole a little bit, encouraged by the girl''s audible pleasure.'
+		$orgasm_or = 'no'
+		gs 'arousal', 'vaginal_finger', -10, 'masturbate'
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
-		gs 'arousal', 'mast', 10
+		gs 'arousal', 'vaginal_finger', -10, 'masturbate'
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'

locations/gschool_lessonsev3.qsrc

@@ -127,11 +127,13 @@ if $ARGS[0] = 'literature':
 				end
 				act 'Spread your legs':
 					*clr & cla
-					stat['mast'] += 1
-					orgasm += 1
+					$orgasm_or = 'yes'
+					gs 'arousal', 'vaginal_finger', 5, 'no_orgasm_msg'
+					gs 'arousal', 'end'
 					gs 'fame', 'pav', 'sex', 1
 					pcs_horny = 0
 					npc_rel['A157'] += 1
+					gs 'stat'
 					if $pantyworntype ! 'none':
 						'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/literature/events/heavy_petting.mp4"></video></center>'
 						'You spread your legs for him, and without hesitation, Roman''s hand dips between your legs, his fingers trailing along your inner thigh until he''s pressing against your pussy through your panties. You shiver with anticipation as he teasingly traces a finger along the outline of your lips. Slowly, he begins massaging circles around your clit, and in the heat of the moment, you let out a soft moan that catches the attention of the girl sitting a few feet away. Quickly, you drape your arm over your lap and lean forward to obscure her view. You give her a reassuring smile and hope she''ll leave it at that, but she continues to stare, convinced that something is happening.'

locations/model_krystal.qsrc

@@ -821,7 +821,6 @@ if $ARGS[0] = 'krystalshower':
 					gs 'stat'
 					act 'Continue':
 						cla & *clr
-						stat['mast'] += 1
 						if exhibitionist_lvl < 2:
 							pcs_mood += 15
 							'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'

locations/pav_hotelWork.qsrc

@@ -469,10 +469,9 @@ if $ARGS[0] = 'maid':
 							
 							act 'Start touching yourself':
 								*clr & cla
-								pcs_horny = 0
-								stat['mast'] += 1
-								orgasm += 1
-								pcs_mood += 15
+								gs 'arousal', 'vaginal_finger', 10, 'masturbate'
+								gs 'arousal', 'end'
+								gs 'stat'
 								gs 'arousal', 'end'
 								gs 'stat'
 								

locations/selfplay.qsrc

@@ -6,7 +6,6 @@ $d_self_ass_fingering = {
 
 if $ARGS[0] = 'start':
 	if mastrOnce = 0:
-		stat['mast'] += 1
 		mastrOnce = 1
 		org_temp = orgasm
 		if pcs_inhib < 30:inhib_exp += rand(1,3)

locations/sitr.qsrc

@@ -83,10 +83,7 @@ gs 'events', 'read'
 if dildo > 0 and pcs_horny >= 50:
 	act 'Masturbate':
 		*clr & cla
-		minut += 30
-		stat['mast'] += 1
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
-		pcs_vag += 1
 		if husband > 0 and husbandrink ! 10:
 			if week > 5 or week < 6 and hour > 16:
 				gt 'husbsex','husb_mastr_vtor'
@@ -98,7 +95,7 @@ if dildo > 0 and pcs_horny >= 50:
 				'Soon you''re twitching onto that dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths, and a smile grows along your face after cumming so hard there. 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 'sitr'
@@ -111,7 +108,7 @@ if dildo > 0 and pcs_horny >= 50:
 			'Soon you''re twitching onto that dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths, and a smile grows along your face after cumming so hard there. 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 'sitr'

locations/sitr2x.qsrc

@@ -77,11 +77,7 @@ if dildo > 0 and pcs_horny >= 50:
 	act 'Masturbate':
 		cla
 		*clr
-		minut += 30
-		stat['mast'] += 1
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
-		pcs_mood += 15
-		pcs_vag += 1
 
 		if husband > 0 and husbandrink ! 10:
 			if week > 5 or week < 6 and hour > 16:
@@ -91,6 +87,9 @@ if dildo > 0 and pcs_horny >= 50:
 				orgasm += 1
 				'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
 				'You put your dildo on the floor and start to ride it. It moves in and out, and you feel the pleasure running through your entire body with each thrust. You begin to moan, and a few minutes later, you climax and a wave of pleasure runs through your entire body.'
+				$orgasm_or = 'yes'
+				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
+				gs 'arousal', 'end'
 
 				act 'Breathe':gt 'sitr2x'
 			end
@@ -99,6 +98,9 @@ if dildo > 0 and pcs_horny >= 50:
 			orgasm += 1
 			'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
 				'You put your dildo on the floor and start to ride it. It moves in and out, and you feel the pleasure running through your entire body with each thrust. You begin to moan, and a few minutes later, you climax and a wave of pleasure runs through your entire body.'
+				$orgasm_or = 'yes'
+				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
+				gs 'arousal', 'end'
 
 			act 'Breathe':gt 'sitr2x'
 		end

locations/vann.qsrc

@@ -245,8 +245,9 @@ end
 if $ARGS[0] = 'v4':
     $location_type = 'event'
 	*clr & cla
-	minut += 10
-	stat['mast'] += 1
+	$orgasm_or = 'no'
+	gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
+
 	if pcs_inhib < 30:inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/bathroom/v9.jpg"></center>'
 	'You spray water from the faucet directly onto your pussy and let the jet of warm water caress you. Getting further into it, you push your fingers inside your pussy while the water takes care of your clit. You''re completely absorbed in your masturbation until you hear someone turn on the faucet in the sink. Opening your eyes, you see a guy standing at the sink, looking at you and grinning.'
@@ -260,6 +261,7 @@ if $ARGS[0] = 'v4':
 			pcs_horny = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/bathroom/v10.jpg"></center>'
 			'You scream so loud that you hurt your ears. The guy jumps and hurriedly retreats from the bathroom. You are once again left alone, but the excitement is gone, and you don''t really feel like masturbating anymore.'
+			gs 'arousal', 'end'
 
 			act 'Continue':gt 'vann', 'start'
 		end
@@ -280,6 +282,7 @@ if $ARGS[0] = 'v4':
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/bathroom/v10.jpg"></center>'
 				'"No, thank you." you reply.'
 				'"As you wish," he says and turns around, heading to the door. On the threshold, he turns. "You should lock the door in the future. Some guys are... more inclined to ''help you,''" he quips before walking away.'
+				gs 'arousal', 'end'
 
 				act 'Continue':gt 'vann', 'start'
 			end
@@ -292,6 +295,7 @@ if $ARGS[0] = 'v4':
 			picrand = 76
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/bathroom/v11.jpg"></center>'
 			'You nod, and he immediately strips off his clothes and climbs into the bath with you. He begins to rub your loofah, along with his free hand, over your body, caressing your chest before sliding down to your pussy. His fingers gently caress your pussy, and you shudder and cling to him, his erection grinding between your ass cheeks. He begins to slide up and down, and you lean forward, giving him room to maneuver. However, he doesn''t penetrate you, instead placing his hands on your shoulders and gently pushing you down. You understand what he wants and turn to face him. You lean down and suck on his balls before licking his shaft from base to tip.'
+			gs 'arousal', 'vaginal_finger', 10
 
 			act 'Give him a blowjob':gt 'sex', 'minet'
 		end