[Refactor] Refactor masturbation code in gloryhole.qsrc

locations/gloryhole.qsrc

@@ -25,30 +25,9 @@ if $ARGS[0] = 'start':
 		if will_cost <= pcs_willpwr:				
 			act 'Caress Yourself (<<will_cost>> Willpower)':
 				if pcs_inhib < 40:inhib_exp += rand(1,3)
-				*clr & cla
 				gs 'willpower', 'mast', 'self'
 				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				picrand = rand(1,2)
-				if picrand = 1:
-					*clr & cla
-					gs 'stat'
-					'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/caress1.mp4"></video></center>'
-					'Feeling a bit turned on, you close the door to the stall and you behind to reach down your underwear and start rubbing your clit.'
-					$orgasm_or = 'no'
-					gs 'arousal', 'clit_finger', 4, 'masturbate'
-					gs 'stat'
-					act 'Continue': gs 'gloryhole', 'contmast'
-				else
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
-					'Feeling a bit turned on, you close the door to the stall and you sit down exposing your pussy and begin to run your clit.'
-					$orgasm_or = 'no'
-					gs 'arousal', 'clit_finger', 4, 'masturbate'
-					gs 'stat'
-					act 'Continue': gs 'gloryhole', 'contmast'
-				end
+				gt 'gloryhole', 'mast'
 			end
 		else
 			act 'Caress Yourself (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -57,55 +36,68 @@ if $ARGS[0] = 'start':
 	act 'Look at the Hole': gt 'gloryhole', 'hole'
 end
 
-if $ARGS[0] = 'contmast':
-	*clr & cla
-	pcs_mood += 5
-	menu_off = 1
-	if picrand = 1:
+if $ARGS[0] = 'mast':
+	if $ARGS[1] = '':
+		*clr & cla
+		gs 'stat'
 		'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/caress1.mp4"></video></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
-	end
-	if pcs_horny <= 60:
-		'You are starting to feel warm and you insert your finger in your pussy.'	
-	else
-		'You are starting to feel warm and you insert your finger in your pussy. You keep fingering your pussy and before long you are breathing heavily and start to moan.'
+		'Feeling a bit turned on, you close the door to the stall and you behind to reach down your underwear and start rubbing your clit.'
+		$orgasm_or = 'no'
+		gs 'arousal', 'clit_finger', 4, 'masturbate'
+		gs 'stat'
+		act 'Continue': gs 'gloryhole', 'mast', 'stage2'
 	end
-	$orgasm_or = 'no'
-	gs 'arousal', 'clit_finger', 4, 'masturbate'
-	gs 'stat'
-	gs 'willpower', 'mast', 'self'
-	if will_cost <= pcs_willpwr:
-		act 'Stop (<<will_cost>> Willpower)':
-			cla
-			minut += 1
-			gs 'willpower', 'mast', 'self'
-			gs 'willpower', 'pay', 'self'
-			gs 'arousal', 'end'
-			gs 'stat'
-			'You decide that you shouldn''t continue and stop yourself from finishing.'
-			act 'Leave': gt $loc, $loc_arg
+
+	if $ARGS[1] = 'stage2':
+		*clr & cla
+		pcs_mood += 5
+		menu_off = 1
+		if picrand = 1:
+			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/caress1.mp4"></video></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
 		end
-	else
-		act 'Stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
-	if pcs_horny >= 90:
-		act 'Climax':
-			*clr & cla
-			pcs_mood += 15
-			if pcs_inhib < 40: inhib_exp += rand(1,3)
-			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/orgasm.mp4"></video></center>'
-			$orgasm_or = 'custom'
-			$orgasm_txt = 'As your pussy gets wet you pulls your panties down and slip your fingers inside of yourself. You start finger fucking yourself, with in a few minutes a powerful orgasm rocks your body. Leaving you gasping and trembling as you recover.'
-			gs 'arousal', 'clit_finger', 2, 'masturbate'
-			gs 'arousal', 'end'
-			gs 'stat'
-			act 'Leave': gt $loc, $loc_arg
+		if pcs_horny <= 60:
+			'You are starting to feel warm and you insert your finger in your pussy.'	
+		else
+			'You are starting to feel warm and you insert your finger in your pussy. You keep fingering your pussy and before long you are breathing heavily and start to moan.'
+		end
+		$orgasm_or = 'no'
+		gs 'arousal', 'clit_finger', 4, 'masturbate'
+		gs 'stat'
+		gs 'willpower', 'mast', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Stop (<<will_cost>> Willpower)':
+				cla
+				minut += 1
+				gs 'willpower', 'mast', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'arousal', 'end'
+				gs 'stat'
+				'You decide that you shouldn''t continue and stop yourself from finishing.'
+				act 'Leave': gt $loc, $loc_arg
+			end
+		else
+			act 'Stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		if pcs_horny >= 90:
+			act 'Climax':
+				*clr & cla
+				pcs_mood += 15
+				if pcs_inhib < 40: inhib_exp += rand(1,3)
+				'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/orgasm.mp4"></video></center>'
+				$orgasm_or = 'custom'
+				$orgasm_txt = 'As your pussy gets wet you pulls your panties down and slip your fingers inside of yourself. You start finger fucking yourself, with in a few minutes a powerful orgasm rocks your body. Leaving you gasping and trembling as you recover.'
+				gs 'arousal', 'clit_finger', 2, 'masturbate'
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Leave': gt $loc, $loc_arg
+			end
+		else
+			act 'Continue': gt 'gloryhole', 'mast', 'stage2'
 		end
-	else
-		act 'Continue': gt 'gloryhole', 'contmast'
 	end
-end
+end	
 
 if $ARGS[0] = 'hole':
 	*clr & cla
@@ -314,7 +306,7 @@ if $ARGS[0] = 'blowjob':
 				gs 'cum_call', 'mouth_swallow', 'an unknown guy from the gloryhole'
 				gs 'arousal', 'end'
 				gs 'stat'
-				'You swallow it all down.'
+				'You gather a mouthful of sperm, and then swallow it. Their sperm has a sticky and sharp taste which makes you grimace.'
 				act 'Get up': gt 'gloryhole', 'start'
 			end