[fixed/added] Fixed a softlock in pav_pool which happend if you're nude without any swimwear left. Added remaining content surrounding (un)dressing in the pav pool locker room

locations/pav_pool.qsrc

@@ -109,6 +109,7 @@ if $ARGS[0] = 'lockerfemale':
 
 		if PCloswimwear = 1:
 			!! Locker events nude -> swimwear
+			gt 'pav_pool_events', 'locker_nude_to_swim'
 
 		elseif $clothingworntype ! 'nude' or $pantyworntype ! 'none':
 			!! Locker events nude -> normal clothing
@@ -123,6 +124,7 @@ if $ARGS[0] = 'lockerfemale':
 			gt 'pav_pool_events', 'locker_swim_to_nude'
 		elseif PCloswimwear ! 1:
 			!! Locker events swim -> clothing
+			gt 'pav_pool_events', 'locker_swim_to_clothed'
 		end
 
 	elseif $temp_curclothes = 'norm':
@@ -133,6 +135,7 @@ if $ARGS[0] = 'lockerfemale':
 			gt 'pav_pool_events', 'locker_clothed_to_nude'
 		elseif PCloswimwear = 1:
 			!! Locker events clothing -> swim
+			gt 'pav_pool_events', 'locker_clothed_to_swim'
 		end
 	end
 	!!-------------------------------------------------------------------!!
@@ -149,7 +152,7 @@ if $ARGS[0] = 'lockerfemale':
 	'The changing rooms are old and murky. They are uncomfortable, cramped and you always feel compelled to leave as quickly as possible. The small windows on one side don''t make you feel any better.'
 	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only if you''re wearing swimwear.'
 
-	if func('changingroom','count_swim_item') > 0:
+	if func('changingroom','count_swim_item') > 0 or $clothingworntype = 'nude':
 		act 'Change your clothes':
 			!!Remember current clothes for clothing change events
 			if $clothingworntype = 'nude' and $pantyworntype = 'none':

locations/pav_pool_events.qsrc

@@ -147,6 +147,7 @@ if $ARGS[0] = 'naked_mirror':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/nakedcover.jpg"></center>'
 	'You''re standing naked in front of the mirror when you hear a noise behind you.'
 	pcs_mood -= 2
+	gs 'stat'
 
 	temp_rand = rand(1,5)
 	if temp_rand = 1:
@@ -168,6 +169,7 @@ if $ARGS[0] = 'naked_locker':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/nakedcover.jpg"></center>'
 	'You''re standing naked in the changing room when you hear a noise behind you.'
 	pcs_mood -= 2
+	gs 'stat'
 
 	temp_rand = rand(1,5)
 	if temp_rand = 1:
@@ -185,22 +187,25 @@ if $ARGS[0] = 'naked_locker':
 	act 'Continue': gt 'pav_pool', 'lockerfemale', 1
 end
 
-if $ARGS[0] = 'locker_nude_to_clothed':
+
+if $ARGS[0] = 'locker_clothed_to_nude':
 	menu_off = 1
-	minut += 5
-	if rand(1, 100) < 90:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
-		'You change back into your clothes.'
-	else
+	minut += 3
+	gs 'stat'
+
+	if rand(0, 9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you change back into your clothes, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
-			'You''re certain that it sounded like that creepy store clerk''s camera, but as you don''t see anything, you tell yourself you''re just being paranoid and continue getting dressed.'
+			'As you take your clothes off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue stripping.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/spychange<<rand(1,2)>>.jpg"></center>'
-			'As you change back into your clothes, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
+			'As you take your clothes off, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
 		end
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
+		'You take your clothes off.'
 	end
 
 	act 'Continue': gt 'pav_pool', 'lockerfemale'
@@ -211,44 +216,148 @@ if $ARGS[0] = 'locker_swim_to_nude':
 	minut += 1
 	!!stage = 1
 	gs 'stat'
-	if rand(1,100) < 90:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
-		'You take your swimwear off.'
-	else
+
+	if rand(0, 9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
 			'As you take your swimwear off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue stripping.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
-
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/spychangebikini.jpg"></center>'
 			'As you take your swimwear off, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
 		end
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
+		'You take your swimwear off.'
 	end
 
 	act 'Continue': gt 'pav_pool', 'lockerfemale'
 end
 
-if $ARGS[0] = 'locker_clothed_to_nude':
-	if rand(1,100) < 90:
+if $ARGS[0] = 'locker_nude_to_clothed':
+	menu_off = 1
+	minut += 5
+	gs 'stat'
+
+	if rand(0, 9) = 0:
+		if pav_swimpool['storeclerkvisit'] >= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
+			'As you change back into your clothes, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'You''re certain that it sounded like that creepy store clerk''s camera, but as you don''t see anything, you tell yourself you''re just being paranoid and continue getting dressed.'
+			pav_swimpool['storeclerkhiddenphotos'] += 1
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/spychange<<rand(1,2)>>.jpg"></center>'
+			'As you change back into your clothes, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
+		end
+	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
-		'You take your clothes off.'
+		'You change back into your clothes.'
+	end
+
+	act 'Continue': gt 'pav_pool', 'lockerfemale'
+end
+
+
+if $ARGS[0] = 'locker_nude_to_swim':
+	menu_off = 1
+	minut += 2
+
+	if rand(0, 9)=0:
+		if pav_swimpool['storeclerkvisit'] >= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
+			'As you put your swimwear on, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and quickly continue dressing yourself.'
+			pav_swimpool['storeclerkhiddenphotos'] += 1
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/spychangebikini.jpg"></center>'
+			'As you put your swimwear on, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
+		end
 	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
+		'You put your swimwear on.'
+	end
+
+	act 'Continue': gt 'pav_pool', 'lockerfemale'
+end
+
+
+if $ARGS[0] = 'locker_clothed_to_swim':
+	menu_off = 1
+	minut += 5
+	gs 'stat'
+
+	temp_rand = rand(0, 9)
+	! Clothed to nude
+	if temp_rand = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
 			'As you take your clothes off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
-			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue stripping.'
+			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/spychange<<rand(1,2)>>.jpg"></center>'
-			'As you take your clothes off, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
+			'As you take your clothes off, you can''t shake the feeling that you''re being watched, you quickly change into your swimwear.'
+		end
+	! Nude to swim
+	elseif temp_rand = 1:
+		if pav_swimpool['storeclerkvisit'] >= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
+			'As you put your swimwear on, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and quickly continue dressing yourself.'
+			pav_swimpool['storeclerkhiddenphotos'] += 1
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/spychangebikini.jpg"></center>'
+			'As you put your swimwear on, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
+		'You take your clothes off and change into your swimwear.'
+	end
+
+	act 'Continue': gt 'pav_pool', 'lockerfemale'
+end
+
+
+if $ARGS[0] = 'locker_swim_to_clothed':
+	menu_off = 1
+	minut += 6
+	gs 'stat'
+
+	temp_rand = rand(0, 9)
+	! Swim to nude
+	if temp_rand = 0:
+		if pav_swimpool['storeclerkvisit'] >= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
+			'As you take your swimwear off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue getting dressed.'
+			pav_swimpool['storeclerkhiddenphotos'] += 1
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/spychangebikini.jpg"></center>'
+			'As you take your swimwear off, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
 		end
+
+	! Nude to clothed
+	elseif temp_rand = 1:
+		if pav_swimpool['storeclerkvisit'] >= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
+			'As you change back into your clothes, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'You''re certain that it sounded like that creepy store clerk''s camera, but as you don''t see anything, you tell yourself you''re just being paranoid and continue getting dressed.'
+			pav_swimpool['storeclerkhiddenphotos'] += 1
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/spychange<<rand(1,2)>>.jpg"></center>'
+			'As you change back into your clothes, you can''t shake the feeling that you''re being watched, but you don''t see anything.'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
+		'You take your swimwear off and change back into your clothes.'
 	end
 
 	act 'Continue': gt 'pav_pool', 'lockerfemale'
 end
 
+
+
 if $ARGS[0] = 'shower_late':
 	if rand(1,2) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/covershower.jpg"></center>'