[Changed] Change condom auto use at gloryholes to manually

locations/gloryhole.qsrc

@@ -190,7 +190,8 @@ if $ARGS[0] = 'hole':
 								gs 'willpower', 'bj', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'gloryhole', 'rape'
+								!gt 'gloryhole', 'rape'
+								gt $loc, $loc_arg
 							end
 						else
 							act 'Take his money and Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -349,7 +350,126 @@ if $ARGS[0] = 'ghsex':
 	gs 'arousal', 'hj', 5, 'unknown', 'sub'
 	gs 'stat'
 	if stat['anal'] > 0: act 'Ass':gt 'gloryhole', 'anal'
-	if stat['vaginal'] > 0: act 'Pussy':gt 'gloryhole', 'pussy2'
+	if stat['vaginal'] > 0: 
+		if prezik > 0: act "Use a condom": gt 'gloryhole', 'condom'
+
+		gs 'willpower', 'sex', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Pussy (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'self'
+				sexcontra = 0
+				gt 'gloryhole', 'pussy'
+			end
+		else:
+			act 'Pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
+end
+
+if $ARGS[0] = 'condom':
+	*clr & cla
+	gs 'stat'
+	'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/condom_on.mp4"></video></center>'
+	dynamic $prezik
+	protect = 1
+	if preziktype = 2:
+		sexcontra = 7
+		'You take one of your sabotaged condoms and put it on the stranger.'
+	else
+		sexcontra = 3
+		'You take a condom and put it on the stranger''s dick.'
+	end
+	act 'Continue': gt 'gloryhole', 'pussy'
+end
+
+if $ARGS[0] = 'pussy':
+	*clr & cla
+	gs 'stat'
+
+	temp = rand(1,5)
+	if rand(0,2) > 0:
+		'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/sex<<temp>>.mp4"></video></center>'
+	else:
+		if protect = 1:
+			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/vagcon<<temp>>.mp4"></video></center>'
+		else:
+			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/vag<<temp>>.mp4"></video></center>'
+		end
+	end
+	
+	'You turn around and back up to the hole, you use one hand to guide his dick into your pussy. The <<npc_dick[$npclastgenerated]>>cm long <<$npc_thdick[$npclastgenerated]>> cock slides easily into your wet pussy, causing you to moan in pleasure as you move your hips back and forth. You start humping his dick with fast movements, taking the full length of him balls deep into you, which causes him to moan loudly. After several minutes, you hear him on the other side of the wall yell out, "I''m gonna cum."'
+	gs 'arousal', 'vaginal', 10, 'unknown', 'sub'
+	gs 'stat'
+	if protect ! 1:
+		gs 'dinSex', 'std_trigger'
+		act 'Allow him to cum inside':
+			*clr & cla
+			gs 'cum_call', 'vaginal', 'an unknown guy from the gloryhole'
+			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/ghcreampie.mp4"></video></center>'
+			'Instead of pulling away, you moan "Inside me, please," and push yourself hard against the opening in the wall. You feel his hot sperm fill your pussy in spurt after spurt. When you finally pull yourself off him, you can feel the sperm leaking out of your pussy.'
+			gs 'cuminsidereact', 'an unknown guy from the gloryhole'
+			gs 'arousal', 'vaginal', 10, 'unknown', 'sub'
+			minut -= 9
+			gs 'arousal', 'end'
+			gs 'stat'
+
+			act 'Get dressed': gt 'gloryhole', 'start'
+		end
+		gs 'willpower', 'cum_inside', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Quickly turn around and get on your knees (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'cum_inside', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				act 'Let him cum in your mouth':
+					*clr & cla
+					gs 'cum_call', 'mouth_swallow', 'an unknown guy from the gloryhole'
+					'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/ghswallow.mp4"></video></center>'
+					'Once down on your knees you take his dick into your mouth and start sucking him. You are looking forward to him filling your mouth up with his tasty sperm. Moments later hot spurts of cum fill your mouth, you savor the taste of it in your mouth, before you swallow it all down.'
+					gs 'arousal', 'bj', 10, 'unknown', 'sub'
+					minut -= 9
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Get dressed': gt 'gloryhole', 'start'
+				end
+				gs 'willpower', 'swallow', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Let him cum on your face (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'swallow', 'resist'
+						gs 'willpower', 'pay', 'resist'
+						facial += 1
+						gs 'cum_call', 'face', 'an unknown guy from the gloryhole'
+						gs 'arousal', 'hj', 10, 'unknown', 'sub'
+						minut -= 9
+						gs 'arousal', 'end'
+						gs 'stat'
+						'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/ghfacial.mp4"></video></center>'
+						'You put your face near his dick and start jerking him off, shortly later, hot spurts of cum start flying and covering your face.'
+
+						act 'Get dressed': gt 'gloryhole', 'start'
+					end
+				else
+					act 'Let him cum on your face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+			end
+		else
+			act 'Quickly turn around and get on your knees (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	else
+		if sexcontra = 4:
+			'You pull off of <<$boydesc>> and look at his dick and think, "Oh shit! The condom burst."'
+		elseif sexcontra = 5:
+			'You pull off of <<$boydesc>> and look at his dick and think, "Oh shit! The condom is missing!"'
+		else
+			'<<$boydesc>> groaned and you realized that he came in the condom.'
+		end
+		sexcontra = 0
+		protect = 0
+
+		act 'Get dressed': gt 'gloryhole', 'start'
+	end
 end
 
 if $ARGS[0] = 'anal':
@@ -365,8 +485,11 @@ if $ARGS[0] = 'anal':
 		*clr & cla
 		gs 'stat'
 		temp = rand(1,5)
-		'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/anal<<temp>>.mp4"></video></center>'
-
+		if rand(0,2) > 0:
+			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/sex<<temp>>.mp4"></video></center>'
+		else:
+			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/anal<<temp>>.mp4"></video></center>'
+		end
 		if pcs_ass < 10:
 			'The pain doesn''t fade and instead it starts to hurt worse after a while and the pleasure starts to fade. You fuck his dick with your ass, at first taking him deeper and deeper, as you get faster and faster. As the pleasure fades and the pain gets worse you slow down and don''t take him as deep. You start to rub your clit to help with the sensation of pleasure. You consider stopping as the pain gets worse, but you can tell by the throbbing of his dick and ragged breathing he is about to cum and decided to keep it up so he can finish.'
 		elseif pcs_ass < 20:
@@ -460,113 +583,7 @@ if $ARGS[0] = 'anal':
 	end
 end
 
-if $ARGS[0] = 'pussy':
-	if prezik > 0:
-		dynamic $prezik
-		protect = 1
-		if preziktype = 2:
-			sexcontra = 7
-			'You take one of your sabotaged condoms and put it on the stranger.'
-		else
-			sexcontra = 3
-			'You take a condom and put it on the stranger''s dick.'
-		end
-	else
-		sexcontra = 0
-	end
-end
-
-if $ARGS[0] = 'pussy2':
-	*clr & cla
-	gs 'stat'
-	gs 'gloryhole', 'pussy'
-
-	temp = rand(1,5)
-	if rand(0,2) > 0:
-		'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/sex<<temp>>.mp4"></video></center>'
-	else:
-		if protect = 1:
-			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/vag<<temp>>.mp4"></video></center>'
-		else:
-			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/vagcon<<temp>>.mp4"></video></center>'
-		end
-	end
-	
-	'You turn around and back up to the hole, you use one hand to guide his dick into your pussy. The <<npc_dick[$npclastgenerated]>>cm long <<$npc_thdick[$npclastgenerated]>> cock slides easily into your wet pussy, causing you to moan in pleasure as you move your hips back and forth. You start humping his dick with fast movements, taking the full length of him balls deep into you, which causes him to moan loudly. After several minutes, you hear him on the other side of the wall yell out, "I''m gonna cum."'
-	gs 'arousal', 'vaginal', 10, 'unknown', 'sub'
-	gs 'stat'
-	if protect ! 1:
-		act 'Allow him to cum inside':
-			*clr & cla
-			gs 'cum_call', 'vaginal', 'an unknown guy from the gloryhole'
-			'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/ghcreampie.mp4"></video></center>'
-			'Instead of pulling away, you moan "Inside me, please," and push yourself hard against the opening in the wall. You feel his hot sperm fill your pussy in spurt after spurt. When you finally pull yourself off him, you can feel the sperm leaking out of your pussy.'
-			gs 'cuminsidereact', 'an unknown guy from the gloryhole'
-			gs 'arousal', 'vaginal', 10, 'unknown', 'sub'
-			minut -= 9
-			gs 'arousal', 'end'
-			gs 'stat'
-
-			act 'Get dressed': gt 'gloryhole', 'start'
-		end
-		gs 'willpower', 'cum_inside', 'resist'
-		if will_cost <= pcs_willpwr:
-			act 'Quickly turn around and get on your knees (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'cum_inside', 'resist'
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				act 'Let him cum in your mouth':
-					*clr & cla
-					gs 'cum_call', 'mouth_swallow', 'an unknown guy from the gloryhole'
-					'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/ghswallow.mp4"></video></center>'
-					'Once down on your knees you take his dick into your mouth and start sucking him. You are looking forward to him filling your mouth up with his tasty sperm. Moments later hot spurts of cum fill your mouth, you savor the taste of it in your mouth, before you swallow it all down.'
-					gs 'arousal', 'bj', 10, 'unknown', 'sub'
-					minut -= 9
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Get dressed': gt 'gloryhole', 'start'
-				end
-				gs 'willpower', 'swallow', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'Let him cum on your face (<<will_cost>> Willpower)':
-						*clr & cla
-						gs 'willpower', 'swallow', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						facial += 1
-						gs 'cum_call', 'face', 'an unknown guy from the gloryhole'
-						gs 'arousal', 'hj', 10, 'unknown', 'sub'
-						minut -= 9
-						gs 'arousal', 'end'
-						gs 'stat'
-						'<center><video autoplay loop src="images/locations/shared/gloryhole/sex/ghfacial.mp4"></video></center>'
-						'You put your face near his dick and start jerking him off, shortly later, hot spurts of cum start flying and covering your face.'
-
-						act 'Get dressed': gt 'gloryhole', 'start'
-					end
-				else
-					act 'Let him cum on your face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-			end
-		else
-			act 'Quickly turn around and get on your knees (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-	else
-		if sexcontra = 4:
-			'You pull off of <<$boydesc>> and look at his dick and think, "Oh shit! The condom burst."'
-		elseif sexcontra = 5:
-			'You pull off of <<$boydesc>> and look at his dick and think, "Oh shit! The condom is missing!"'
-		else
-			'<<$boydesc>> groaned and you realized that he came in the condom.'
-		end
-		sexcontra = 0
-		protect = 0
-
-		act 'Get dressed': gt 'gloryhole', 'start'
-	end
-end
-
-if $ARGS[0] = 'rape':
+!{if $ARGS[0] = 'rape':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
@@ -613,6 +630,6 @@ if $ARGS[0] = 'rape':
 		'You run from the community center and don''t stop until you are back in the residential area'
 		act 'Catch your breath': minut += 5 & gt 'pav_residential'
 	end
-end
+end}
 
 --- gloryhole ---------------------------------