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

@@ -973,15 +973,16 @@ if $ARGS[0] = 'shower':
 		'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:
-				gt 'VoltrenerSexShower', '0'
+				gs 'VoltrenerSexShower', '0'
 			elseif VoltrenerVoyeur = 1:
-				gt 'VoltrenerSexShower', '1'
+				gs 'VoltrenerSexShower', '1'
 			elseif VoltrenerVoyeur = 2 and IvanShowerYes = 0:
-				gt 'VoltrenerSexShower', '2'
+				gs 'VoltrenerSexShower', '2'
 			end
-		end
+		else
 			'After your shower, you get dressed.'
-		act 'Get out of the shower':gt 'gdksport', 'start'
+			act 'Get out of the shower':gt 'gdksport', 'start'
+		end
 	end
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 end
@@ -1073,24 +1074,28 @@ if $ARGS[0] = 'ShowerWithIvan':
 						minut -= 5
 						gs 'stat'
 
-						if VoltrenerVoyeur = 3:gt 'VoltrenerSexShower', '3'
-						if VoltrenerVoyeur = 4:gt 'VoltrenerSexShower', '4'
-						if VoltrenerVoyeur = 5:gt 'VoltrenerSexShower', '5'
-
-						if pcs_horny >= 100:
-							if stat['anal'] >= 10 and orgasm > 0:
-								pcs_mood += 20
-								$orgasm_or = 'custom'
-								$orgasm_txt = 'Your whole body contracts and then you cry out in orgasm.'
+						if VoltrenerVoyeur = 3:
+							*nl & gs 'VoltrenerSexShower', '3'
+						elseif VoltrenerVoyeur = 4:
+							*nl & gs 'VoltrenerSexShower', '4'
+						elseif VoltrenerVoyeur = 5:
+							*nl & gs 'VoltrenerSexShower', '5'
+						else
+							if pcs_horny >= 100:
+								if stat['anal'] >= 10 and orgasm > 0:
+									pcs_mood += 20
+									$orgasm_or = 'custom'
+									$orgasm_txt = 'Your whole body contracts and then you cry out in orgasm.'
+								end
 							end
+							'Your moans of pleasure start to turn into grunts of pain. Apparently sensing your growing discomfort he makes one more powerful thrust with a grunt. His body spasms against yours as you feel him cumming in your ass. Once he is done he pulls out of your ass and goes back to showering, he quickly finishes up and starts to get dressed.'
+							'He watches you as you get dressed. "That was great <<$pcs_nickname>>, we should do that again sometime." Without waiting for a reply he leaves the shower.'
+							cumspclnt = 1
+							gs 'cum_cleanup'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Get out of the shower':gt 'gdksport', 'start'
 						end
-						'Your moans of pleasure start to turn into grunts of pain. Apparently sensing your growing discomfort he makes one more powerful thrust with a grunt. His body spasms against yours as you feel him cumming in your ass. Once he is done he pulls out of your ass and goes back to showering, he quickly finishes up and starts to get dressed.'
-						'He watches you as you get dressed. "That was great <<$pcs_nickname>>, we should do that again sometime." Without waiting for a reply he leaves the shower.'
-						cumspclnt = 1
-						gs 'cum_cleanup'
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Get out of the shower':gt 'gdksport', 'start'
 					end
 				end
 			end

locations/stat_display.qsrc

@@ -1065,6 +1065,8 @@ if $clothingworntype ! 'nude':
 	if CloThinness = 6:
 		if $clothingworntype = 'swimwear':
 			$stat_msg += '<BR><font color = #FF00FF>Your nipples are clearly showing through your transparent swimsuit.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #FF00FF>Your breasts are fully on display through your transparent bra and top.</font>'
 		elseif $braworntype ! 'none':
 			$stat_msg += '<BR><font color = #FF00FF>Your bra is clearly showing through your transparent top.</font>'
 		else
@@ -1073,12 +1075,16 @@ if $clothingworntype ! 'nude':
 	elseif CloThinness = 5:
 		if $clothingworntype = 'swimwear':
 			$stat_msg += '<BR><font color = #AB052A>Your nipples are noticeably poking through your swimsuit.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #AB052A>You are wearing such a thin bra that your nipples are noticably poking through the thin fabric of your top.</font>'
 		elseif $braworntype = 'none':
 			$stat_msg += '<BR><font color = #AB052A>You are not wearing a bra and your nipples are noticably poking through the thin fabric of your top.</font>'
 		end
 	elseif CloThinness = 4:
 		if $clothingworntype = 'swimwear':
 			$stat_msg += '<BR><font color = #AB052A>Your nipples are very slightly poking through your swimsuit.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #AB052A>You are wearing such a thin bra that your nipples are subtly outlined through your top.</font>'
 		elseif $braworntype = 'none':
 			$stat_msg += '<BR><font color = #AB052A>You are not wearing a bra and your nipples are being subtly outlined through your top.</font>'
 		end
@@ -1088,9 +1094,19 @@ if $clothingworntype ! 'nude':
 end
 
 if $clothingworntype = 'nude':
-	if $pantyworntype ! 'none':
+	if $pantyworntype = 'exhibitionist':
+		if $braworntype = 'none':
+			$stat_msg += '<BR><font color = #AB052A>You are only wearing your see-through panties and your boobs sway invitingly as you walk.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #AB052A>You are only wearing your see-through underwear.</font>'
+		else
+			$stat_msg += '<BR><font color = #AB052A>You are only wearing your see-through panties and bra.</font>'
+		end
+	elseif $pantyworntype ! 'none':
 		if $braworntype = 'none':
 			$stat_msg += '<BR><font color = #AB052A>You are only wearing your panties and your boobs sway invitingly as you walk.</font>'
+		elseif $braworntype = 'exhibitionist':
+			$stat_msg += '<BR><font color = #AB052A>You are only wearing your see-through bra and panties.</font>'
 		else
 			$stat_msg += '<BR><font color = #AB052A>You are only wearing your underwear.</font>'
 		end
@@ -1137,6 +1153,16 @@ elseif $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 			$stat_msg += '<BR><font color=#AB052A>You are not wearing panties.</font>'
 		end
 	end
+elseif $pantyworntype = 'exhibitionist' and $clothingworntype ! 'swimwear':
+	if PCloStyle = 4:
+		$stat_msg += '<BR><font color= #FF00FF>You are wearing see-through panties, but you are dressed as a hooker, so that''s hardly surprising.</font>'
+	elseif PCloSkirt > 3:
+		if pcs_inhib > 50:
+			$stat_msg += '<BR><font color=#0064FF>You feel liberated as your ass, clearly visible through your panties, flashes from under your short skirt.</font>'
+		else
+			$stat_msg += '<BR><b><font color="red">Your face is flushed with shame, you are wearing panties so thin, they leave your ass clearly visible, as it flashes from under your short skirt.</font></b>'
+		end
+	end
 elseif PCloBimbo = 1 and cheatBimbo = 0:
 	$stat_msg += '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 elseif $clothingworntype = 'cheap' and clothingwornnumber = '414':