Browse Source

[Fixed] Fix gloryhole leave action to exit glory correctly

ADCSux 2 years ago
parent
commit
57efbd729c
1 changed files with 10 additions and 38 deletions
  1. 10 38
      locations/gloryhole.qsrc

+ 10 - 38
locations/gloryhole.qsrc

@@ -18,10 +18,7 @@ if $ARGS[0] = 'start':
 	act 'Get Up':
 		cla
 		'You decide not to look in the hole and leave.'
-		act 'Leave': 
-			if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-			if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-		end
+		act 'Leave': gt $loc, $loc_arg
 	end
 	if pcs_horny >=40:
 		gs 'willpower', 'mast', 'self'
@@ -87,10 +84,7 @@ if $ARGS[0] = 'contmast':
 			gs 'arousal', 'end'
 			gs 'stat'
 			'You decide that you shouldn''t continue and stop yourself from finishing.'
-			act 'Leave': 
-				if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-				if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-			end
+			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>'
@@ -106,10 +100,7 @@ if $ARGS[0] = 'contmast':
 			gs 'arousal', 'clit_finger', 2, 'masturbate'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave': 
-				if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-				if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-			end
+			act 'Leave': gt $loc, $loc_arg
 		end
 	else
 		act 'Continue': gt 'gloryhole', 'contmast'
@@ -139,10 +130,7 @@ if $ARGS[0] = 'hole':
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/eww.mp4"></video></center>'
 				'You shudder in disgust at the thought that some stranger''s dick was just practically in your mouth, you get up and quickly leave.'
-				act 'Leave': 
-					if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-					if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-				end
+				act 'Leave': gt $loc, $loc_arg
 			end
 
 			gs 'willpower', 'bj', 'self'
@@ -174,10 +162,7 @@ if $ARGS[0] = 'hole':
 		act 'Don''t do it':
 			cla
 			'You move away from the hole reconsidering what you were about to do and quickly leave the stall.'
-			act 'Leave': 
-				if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-				if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-			end
+			act 'Leave': gt $loc, $loc_arg
 		end
 		gs 'willpower', 'bj', 'self'
 		if will_cost <= pcs_willpwr:
@@ -220,8 +205,7 @@ if $ARGS[0] = 'hole':
 						end
 						act 'Give back the money and Leave': 
 							money -= 100
-							if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-							if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
+							gt $loc, $loc_arg
 						end
 						act 'Blow Him': gt 'gloryhole', 'blowjob'
 					end
@@ -237,10 +221,7 @@ if $ARGS[0] = 'hole':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/gloryhole/action/see_none.jpg"></center>'
 		'Looking through the hole, you can see a row of urinals on the other side. The hole must be to the men''s room next door. You don''t see any men currently in there.'
-		act 'Leave': 
-			if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-			if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-		end
+		act 'Leave': gt $loc, $loc_arg
 		act 'Wait':
 			cla
 			'You decide stay and wait for someone to come.'
@@ -259,10 +240,7 @@ if $ARGS[0] = 'virgin':
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/eww.mp4"></video></center>'
 		'You shudder in disgust at the thought that you were just touching some stranger''s dick. You get up and quickly leave.'
-		act 'Leave': 
-			if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-			if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-		end
+		act 'Leave': gt $loc, $loc_arg
 	end
 	act 'Grab it':
 		*clr & cla
@@ -280,10 +258,7 @@ if $ARGS[0] = 'virgin':
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/eww.mp4"></video></center>'
 				'You let go of him, wondering what possessed you to grab some stranger''s dick in the first place. You quickly leave the stall, you can hear the guy. "Hey why did you stop...? Hello? Are you still there? What the fuck!"'
-				act 'Quickly get out':
-					if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-					if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-				end
+				act 'Quickly get out': 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>'
@@ -420,10 +395,7 @@ if $ARGS[0] = 'anal':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/gloryhole/sex/analpain.jpg"></center>'
 				'The pain becomes too much and you can''t take it anymore, on the verge of tears you stop and pull your ass off his dick. You quickly get dressed and leave, you wonder if it was supposed to hurt that much. You can hear the guy yelling at you for having stopped before he finished.'
-				act 'Leave': 
-					if $loc = 'gdktoilet_womens': gt 'gdktoilet_womens', 'womens'
-					if $loc = 'clubtoilet_women': gt 'city_nightclubToilet', 'clubtoilet_women'
-				end
+				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>'