Merge remote-tracking branch 'Sicaa/master'

locations/VoltrenerSexShower.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = '0':
-	!cls
+	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower1.jpg"></center>'
 	'You hear a suspicious noise.'
 	act 'Investigate':
@@ -26,7 +26,7 @@ if $ARGS[0] = '0':
 end
 
 if $ARGS[0] = '1':
-	!cls
+	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower1.jpg"></center>'
 	'You hear a suspicious noise. Wiping the steam off the glass, you see the coach hiding quite poorly in the dark, spying on you as you shower.'
 	act 'Scream':
@@ -56,7 +56,7 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '2':
-	!cls
+	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower1.jpg"></center>'
 	'You hear a suspicious noise. Wiping the steam off the glass, you see coach there his cock in his hand, looking at your silhouette...'
 	act 'Flip him off':
@@ -93,7 +93,7 @@ if $ARGS[0] = '2':
 end
 
 if $ARGS[0] = '3':
-	!cls
+	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower10.jpg"></center>'
 	'Leaning against the glass and sticking out your ass, you moan from the pounding your ass is receiving. What the fuck is that moving the other side of the glass?'
 	act 'To get a better look':
@@ -139,7 +139,7 @@ if $ARGS[0] = '3':
 end
 
 if $ARGS[0] = '4':
-	!cls
+	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower10.jpg"></center>'
 	'Leaning against the glass and sticking out your ass, you moan from the pounding your ass is receiving. You can see movement through the glass...'
 	act 'To get a better look':
@@ -194,7 +194,7 @@ if $ARGS[0] = '4':
 end
 
 if $ARGS[0] = '5':
-	!cls
+	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower10.jpg"></center>'
 	'Leaning against the glass and sticking out your ass, you moan from the pounding your ass is receiving. You can see movement through the glass...'
 	act 'Get a better look':

locations/gdksport.qsrc

@@ -971,14 +971,12 @@ if $ARGS[0] = 'shower':
 		end
 	else
 		'You enter the women''s shower and turning the water on begin to lather your body with a washcloth. After you rinsed off the soap, you washed your hair with shampoo. Next you rinsed out the shampoo out of your hair and feel completely clean.'
-		if (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0:
-			if VoltrenerVoyeur = 0:
-				gs 'VoltrenerSexShower', '0'
-			elseif VoltrenerVoyeur = 1:
-				gs 'VoltrenerSexShower', '1'
-			elseif VoltrenerVoyeur = 2 and IvanShowerYes = 0:
-				gs 'VoltrenerSexShower', '2'
-			end
+		if (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0 and VoltrenerVoyeur = 0:
+			act 'Continue': gt 'VoltrenerSexShower', '0'
+		elseif (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0 and VoltrenerVoyeur = 1:
+			act 'Continue': gt 'VoltrenerSexShower', '1'
+		elseif (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0 and VoltrenerVoyeur = 2 and IvanShowerYes = 0:
+			act 'Continue': gt 'VoltrenerSexShower', '2'
 		else
 			'After your shower, you get dressed.'
 			act 'Get out of the shower':gt 'gdksport', 'start'
@@ -1075,11 +1073,11 @@ if $ARGS[0] = 'ShowerWithIvan':
 						gs 'stat'
 
 						if VoltrenerVoyeur = 3:
-							*nl & gs 'VoltrenerSexShower', '3'
+							act 'Continue': gt 'VoltrenerSexShower', '3'
 						elseif VoltrenerVoyeur = 4:
-							*nl & gs 'VoltrenerSexShower', '4'
+							act 'Continue': gt 'VoltrenerSexShower', '4'
 						elseif VoltrenerVoyeur = 5:
-							*nl & gs 'VoltrenerSexShower', '5'
+							act 'Continue': gt 'VoltrenerSexShower', '5'
 						else
 							if pcs_horny >= 100:
 								if stat['anal'] >= 10 and orgasm > 0: