Merge remote-tracking branch 'upstream/master'

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

@@ -345,7 +345,7 @@ if $ARGS[0] = 'cum_surprise':
 		'As you''re riding him, getting lost in your own pleasure, you glance down and see him tense up before feeling his cum shoot into you. It oozes out of your pussy as you lift yourself up.'
 		'That''s when he realizes that he just came inside you. "Oh my god, I''m so sorry, <<$pcs_nickname>>! I didn''t mean to do that!"'
 		'You smile at him as you get off him. "It''s okay, don''t worry about it." He looks relieved, obviously thinking you''re on birth control.'
-		act 'Continue': gs 'artem_events', 'after_sex', 'cp'
+		act 'Continue': gs 'artem_sex', 'after_sex', 'cp'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/firstfacial.jpg"></center>'
 		'As you''re riding him, getting lost in your own pleasure, you glance down and see him tense up. "<<$pcs_nickname>>! I''m going to cum..." he warns you.'
@@ -892,7 +892,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				act 'Leave': gt 'pod_ezd', 'etaj_1'
 			end
 		end
-	elseif artemQW['rough_anal_nush'] = 2
+	elseif artemQW['rough_anal_nush'] = 2:
 		'"I must admit, I was expecting this to be lackluster at best, but you surprised me, Artem. You were better than I expected." She looks directly at you and bites her lower lip. "You trained your nerd pretty well. I might be tempted to try again one day."'
 		'You grin at her comment. "I told you he was a great lover."'
 		'She just laughs. "Maybe, he is a great ''lover''." She makes it sound like it''s a bad thing. "But he''s still not a great fuck, at least not yet."'

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

@@ -240,8 +240,8 @@ elseif pcs_condition['lack_of_sleep'] >= 10:
 	$stat_lack_of_sleep_msg = 'You are not getting enough sleep. This has a large negative effect on your ability to learn new things. You need to sleep more maybe have a full nights rest.'
 	$stat_lack_of_sleep_tooltip = 'You are not getting enough sleep.'
 elseif pcs_condition['lack_of_sleep'] >= 5:
-	$stat_lack_of_sleep_msg = 'You are not getting to little sleep. This is modestly inhibiting your ability to learn new things. You need to sleep more.'
-	$stat_lack_of_sleep_tooltip = 'You are not getting to little sleep.'
+	$stat_lack_of_sleep_msg = 'You are not getting enough sleep. This is modestly inhibiting your ability to learn new things. You need to sleep more.'
+	$stat_lack_of_sleep_tooltip = 'You are not getting enough sleep.'
 elseif pcs_condition['lack_of_sleep'] >= 2:
 	$stat_lack_of_sleep_msg = 'You are not sleeping as much as you should. This has a small effect on your ability to learn new things. You sleep more, or else you risk this getting worse.'
 	$stat_lack_of_sleep_tooltip = 'You are not sleeping as much as you should.'

locations/talent_agency.qsrc

@@ -183,7 +183,7 @@ if $ARGS[0] = 'SMTV_intro':
 	actresslife['SMTV_commercial'] = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'You enter the interview room, and someone is there waiting for you.'
-	'"Ahh! Hello! You must be Miss <<$actress[''lastname'']>>. I''m Artur Yanovich. But you can call me Mr. Yanovich," he says, holding out his hand.'
+	'"Ahh! Hello! You must be Miss <<$pcs_lastname>>. I''m Artur Yanovich. But you can call me Mr. Yanovich," he says, holding out his hand.'
 	act 'Shake his hand':
 		cla
 		'You shake his hand and smile. "I was told that I was supposed to come here to get ready for the shoot today?"'
@@ -217,14 +217,14 @@ if $ARGS[0] = 'SMTV_shy':
 	'He stares appreciatively at your nude body.'
 	if prcptn_lvl >= 30:'A hard bulge starts to form in the crotch of his trousers.'
 	*nl
-	'"You have a beautiful body Miss <<$actress[''lastname'']>>..."'
+	'"You have a beautiful body Miss <<$pcs_lastname>>..."'
 	'"Uhm... ah... Thank you Mr. Yanovich..." you stammer.'
 	'"Right then, let''s go!"'
 	act '"Wait! What are you-!"':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/front.jpg"></center>'
 		'He suddenly grabs you by the arm and leads you out of the room, leaving your clothes behind. He walks you straight through the populated lobby of the talent agency. You do your best to cover your face in embarrassment, but it''s hard with only one hand, and you blush furiously as Mr. Yanovich pulls you right out the front door and into the back seat of a car.'
-		'Once inside the car, he gets on a radio and says, "Alright, we''ve got Miss <<$actress[''lastname'']>> here, naked and ready in the car. Let''s move out."'
+		'Once inside the car, he gets on a radio and says, "Alright, we''ve got Miss <<$pcs_lastname>> here, naked and ready in the car. Let''s move out."'
 		act'"Move out?"':
 			minut += 30
 			*clr & cla
@@ -239,7 +239,7 @@ if $ARGS[0] = 'SMTV_shy':
 				*nl
 				'Mr. Yanovich stays in the car with you and very professionally and efficiently directs you on where the cameras will be, what pace you should walk at, where you should look, and when. His professional demeanor is actually quite calming to you, helping you to settle down and get ready for what''s about to come next.'
 				*nl
-				'"Alright <<$actress[''lastname'']>>. It''s time."'
+				'"Alright <<$pcs_lastname>>. It''s time."'
 				'Your heart starts to pound inside your chest as nervousness takes hold again. You''re going to have to walk down the street naked after all!'
 				act'Do it':
 					minut += 1
@@ -261,7 +261,7 @@ if $ARGS[0] = 'SMTV_shy':
 							'<center><video autoplay loop src="images/locations/city/citycenter/aurora/commercial_bts3.mp4"></video></center>'
 							'At last, you take the final step and make it past the checkpoint. Another aide is there, and you gratefully rush into the gloriously warm blanket she holds and wraps your naked body in.'
 							'Mr. Yanovich and others are huddled around a monitor, examining the footage.'
-							'"Amazing!" he exclaims. "A true one-take-wonder! Excellent work here Miss <<$actress[''lastname'']>>! Excellent work! That''s all we need from you today, we''ll take you back to Aurora and you can get changed back into your clothes.'
+							'"Amazing!" he exclaims. "A true one-take-wonder! Excellent work here Miss <<$pcs_lastname>>! Excellent work! That''s all we need from you today, we''ll take you back to Aurora and you can get changed back into your clothes.'
 							act 'Continue':
 								minut += 30
 								*clr & cla
@@ -276,7 +276,7 @@ if $ARGS[0] = 'SMTV_shy':
 									gs 'clothing', 'wear_last_worn'
 									actpayfin = ((4000 + (pcs_mdlng * 25) + (pcs_apprnc * 2) + (pcs_inhib * 3)) * 3)
 									'You change back into your clothes while Mr. Yanovich does something at the desk.'
-									'Just before you finish dressing, Mr. Yanovich says, "It was a pleasure working with you Miss <<$actress[''lastname'']>>. I hope I get another chance to do it again in the future!" He smiles warmly and leaves the room.'
+									'Just before you finish dressing, Mr. Yanovich says, "It was a pleasure working with you Miss <<$pcs_lastname>>. I hope I get another chance to do it again in the future!" He smiles warmly and leaves the room.'
 									*nl
 									'Looking over at the desk, you see a wad of cash lying there. You rush over, and when you finish counting, you realize that it''s <<actpayfin>> <b>₽</b>!'
 									'<i>Holy crap! Acting is some serious money!</i>'
@@ -303,14 +303,14 @@ if $ARGS[0] = 'SMTV_confident':
 	'He stares appreciatively at your nude body.'
 	if prcptn_lvl >= 30:'A hard bulge starts to form in the crotch of his trousers.'
 	*nl
-	'"You have a beautiful body Miss <<$actress[''lastname'']>>..."'
+	'"You have a beautiful body Miss <<$pcs_lastname>>..."'
 	'"Thank you very much Mr. Yanovich," you say unabashedly.'
 	'"Right then, let''s go!"'
 	act '"Leave"':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/front.jpg"></center>'
 		'He opens the door, and you follow him back through the lobby, leaving your clothes behind in the interview room. A few people whisper and glance at you as you walk past, but you don''t mind too much. Mr. Yanovich leads you right out the front door and into the back seat of a car.'
-		'Once inside the car, he gets on a radio and says, "Alright, we''ve got Miss <<$actress[''lastname'']>> here, naked and ready in the car. Let''s move out."'
+		'Once inside the car, he gets on a radio and says, "Alright, we''ve got Miss <<$pcs_lastname>> here, naked and ready in the car. Let''s move out."'
 		act'"Move out?"':
 			minut += 30
 			*clr & cla
@@ -325,7 +325,7 @@ if $ARGS[0] = 'SMTV_confident':
 				*nl
 				'Mr. Yanovich stays in the car with you and very professionally and efficiently directs you on where the cameras will be, what pace you should walk at, where you should look, and when. You listen diligently and get ready for what''s about to come next.'
 				*nl
-				'"Alright <<$actress[''lastname'']>>. It''s time."'
+				'"Alright <<$pcs_lastname>>. It''s time."'
 				act'Do it':
 					minut += 1
 					*clr & cla
@@ -346,7 +346,7 @@ if $ARGS[0] = 'SMTV_confident':
 							'<center><video autoplay loop src="images/locations/city/citycenter/aurora/commercial_bts3.mp4"></video></center>'
 							'At last, you take the final step and make it past the checkpoint. Another aide is there, and you step into the gloriously warm blanket she holds and wraps your naked body in.'
 							'Mr. Yanovich and others are huddled around a monitor, examining the footage.'
-							'"Amazing!" he exclaims. "A true one-take-wonder! Excellent work here Miss <<$actress[''lastname'']>>! Excellent work! That''s all we need from you today, we''ll take you back to Aurora, and you can get changed back into your clothes."'
+							'"Amazing!" he exclaims. "A true one-take-wonder! Excellent work here Miss <<$pcs_lastname>>! Excellent work! That''s all we need from you today, we''ll take you back to Aurora, and you can get changed back into your clothes."'
 							act 'Continue':
 								minut += 30
 								*clr & cla
@@ -361,7 +361,7 @@ if $ARGS[0] = 'SMTV_confident':
 									gs 'clothing', 'wear_last_worn'
 									actpayfin = (4000 + (pcs_mdlng * 25) + (pcs_apprnc * 2) + (pcs_inhib * 5)) * 3
 									'You change back into your clothes while Mr. Yanovich does something at the desk.'
-									'Just before you finish dressing, Mr. Yanovich says, "It was a pleasure working with you Miss <<$actress[''lastname'']>>. I hope I get another chance to do it again in the future!" He smiles warmly and leaves the room.'
+									'Just before you finish dressing, Mr. Yanovich says, "It was a pleasure working with you Miss <<$pcs_lastname>>. I hope I get another chance to do it again in the future!" He smiles warmly and leaves the room.'
 									*nl
 									'Looking over at the desk, you see a wad of cash lying there. You rush over, and when you finish counting, you realize that it''s <<actpayfin>> <b>₽</b>!'
 									'<i>Holy crap! Acting is some serious money!</i>'

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