[fixed] Swimwear checks all updated to new swimwear

locations/BelSex.qsrc

@@ -412,7 +412,7 @@ if $ARGS[0] = 'shower':
 				end
 			end
 
-			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			if PCloswimwear = 1: gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 
 			gs 'arousal', 'end'
 			gs 'stat'

locations/LakeBoyZ.qsrc

@@ -95,7 +95,7 @@ $gL_boy_z = {
 							act 'Follow him to his house':
 								if $clothingworntype = 'nude':
 									gs 'clothing', 'wear_last_worn'
-									if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									if PCloswimwear = 1:gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 									gt 'LBZhouse'
 								else
 									gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
@@ -112,7 +112,7 @@ $gL_boy_z = {
 							if $clothingworntype = 'nude':
 								gs 'clothing', 'wear_last_worn'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changenude.jpg"></center>'
-								if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+								if PCloswimwear = 1:gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 							else
 								gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changebikini.jpg"></center>'

locations/Nudelake.qsrc

@@ -11,7 +11,7 @@ $location_type = 'secluded'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudelake.jpg"></center>'
 'The nudist beach - clothing optional.'
 
-if $clothingworntype = 'swimwear' or $clothingworntype = 'nude' or $clothingworntype = 'beach':
+if PCloswimwear = 1 or $clothingworntype = 'nude':
 	act'Get dressed':
 		cla
 		*clr
@@ -25,7 +25,7 @@ if $clothingworntype = 'swimwear' or $clothingworntype = 'nude' or $clothingworn
 end
 
 if temper >= 15 and month >= 5 and month <= 9:
-	if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+	if func('changingroom','count_swim_item') > 0 and PCloswimwear = 0:
 		act'Change into your swimwear':
 			menu_off = 1
 			cla

locations/_short_description.qsrc

@@ -42,10 +42,16 @@ elseif $ARGS[0] = 'uniform':
 	end
 elseif $ARGS[0] = 'coat':
 	$RESULT = 'Coat number '
-elseif $ARGS[0] = 'swimwear':
-	$RESULT = 'Swimwear number '
-elseif $ARGS[0] = 'beach':
-	$RESULT = 'Slutty swimwear number '
+elseif $ARGS[0] = 'danilovich_swimsuit':
+	$RESULT = 'Danilovich swimwear number '
+elseif $ARGS[0] = 'scandalicious_bikinis':
+	$RESULT = 'Scandalicious bikini number '
+elseif $ARGS[0] = 'scandalicious_swimsuit':
+	$RESULT = 'Scandalicious swimsuit number '
+elseif $ARGS[0] = 'allure_swimsuit':
+	$RESULT = 'Allure swimsuit number '
+elseif $ARGS[0] = 'allure_bikinis':
+	$RESULT = 'Allure bikini number '
 elseif $ARGS[0] = 'fancy_burlesque':
 	$RESULT = 'Burlesque outfit number '
 elseif $ARGS[0] = 'dolls_dress':

locations/changingroom.qsrc

@@ -7,9 +7,9 @@ if $ARGS[0] = 'view_swim_list':
 	if ARRSIZE('danilovich_swimsuit') = 0 and ARRSIZE('scandalicious_swimsuit') = 0 and ARRSIZE('scandalicious_bikinis') = 0 and ARRSIZE('allure_swimsuit') = 0 and ARRSIZE('allure_bikinis') = 0:
 		'<center>You do not own any swimwear.</center>'
 	elseif $loc = 'fit' or $loc = 'bass' or temper >= 15:
-		if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+		if PCloswimwear = 0:
 			if $clothingworntype = 'nude':
-				if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+				if PCloswimwear = 0:
 					$normalclothingworntype = $lastwornclothingtype
 					normalclothingwornno = lastwornclothingnumber
 				end
@@ -47,7 +47,7 @@ if $ARGS[0] = 'view_swim_list':
 
 		i = 1
 		:loopallure_swimsuit
-			if allure_swimsuit[i] = 1 and allure_swimsuit_s[i] = 0 and ($clothingworntype ! 'allure_swimsuit' or clothingwornnumber ! i):*p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''allure_swimsuit'', <<i>>"><img <<$set_imgh>> src="images/pc/items/allure/swim/one/<<i>>.jpg" 	height="250" /></a>'
+			if allure_swimsuit[i] = 1 and allure_swimsuit_s[i] = 0 and ($clothingworntype ! 'allure_swimsuit' or clothingwornnumber ! i):*p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''allure_swimsuit'', <<i>>"><img <<$set_imgh>> src="images/pc/items/allure/one/<<i>>.jpg" 	height="250" /></a>'
 			i += 1
 		if i <= ARRSIZE('allure_swimsuit'):jump 'loopallure_swimsuit'
 
@@ -55,7 +55,7 @@ if $ARGS[0] = 'view_swim_list':
 
 		i = 1
 		:loopallure_bikinis
-			if allure_bikinis[i] = 1 and allure_bikinis_s[i] = 0 and ($clothingworntype ! 'allure_bikinis' or clothingwornnumber ! i):*p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''allure_bikinis'', <<i>>"><img <<$set_imgh>> src="images/pc/items/allure/swim/two/<<i>>.jpg" 	height="250" /></a>'
+			if allure_bikinis[i] = 1 and allure_bikinis_s[i] = 0 and ($clothingworntype ! 'allure_bikinis' or clothingwornnumber ! i):*p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''allure_bikinis'', <<i>>"><img <<$set_imgh>> src="images/pc/items/allure/two/<<i>>.jpg" 	height="250" /></a>'
 			i += 1
 		if i <= ARRSIZE('allure_bikinis'):jump 'loopallure_bikinis'
 
@@ -67,7 +67,7 @@ if $ARGS[0] = 'view_swim_list':
 
 	act 'Leave':gt $loc, $loc_arg
 	
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+	if PCloswimwear = 1:
 		act 'Put your regular clothes back on':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno

locations/city_lake.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake2.jpg"></center>'
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
-	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+	if $clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis':
 		'There is a winding <a href="exec:gt ''city_lake_path'',''start''">path</a> leading to the railway station in the city industrial region.'
 	else
 		'You can see the winding path to the railway station in the city industrial region, you should get properly dressed if you want to go there.'
@@ -53,10 +53,10 @@ if $ARGS[0] = 'start':
 		*nl
 	end
 
-	if npc_QW['A192'] = 3 and temper >= 15 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
+	if npc_QW['A192'] = 3 and temper >= 15 and ($clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis') and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
 
 	act 'Leave':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if $clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis':
 			cla
 			'You need to get dressed in regular clothing first.'
 			act'Return':gt 'city_lake','start'
@@ -67,10 +67,10 @@ if $ARGS[0] = 'start':
 	end
 
 	if hour >= 6 and hour <= 20:
-		'Nearby are various '+iif($clothingworntype = 'swimwear' or $clothingworntype = 'beach','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
+		'Nearby are various '+iif($clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
 		'You can go for a ride on a <a href="exec:gt ''city_lake'', ''horse''">horse</a> along the beach.'
 		'And a short walk from here there is even a '+iif(pcs_inhib >= 30 or (exhibitionist_lvl > 1 and pcs_horny > 60),'<a href="exec:gt ''Nudelake''">nudist beach</a>','nudist beach, but you are''t confident enough to go in that direction.')+''
-		if temper >= 15 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+		if temper >= 15 and ($clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis'):
 			'Also you can sunbathe or swim.'
 
 			act 'Walk on the beach':
@@ -987,7 +987,7 @@ if $ARGS[0] = 'stasValera4':
 						StasValeraKnow = 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
-						if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+						if $clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis':
 							gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 							'You go to the changing room and quickly get out of your swimwear and dress in your regular clothes.'
 						end

locations/clothing.qsrc

@@ -1008,6 +1008,7 @@ if $ARGS[0] = 'wear':
 
 	gs 'clothing', 'strip'
 
+	PCloswimwear = 0
 	$clothingworntype = $ARGS[1]
 	clothingwornnumber = ARGS[2]
 
@@ -1129,6 +1130,7 @@ if $ARGS[0] = 'wear':
 
 	if PCloPanties = 1: PXCloBottomShortness = 400
 
+	if $clothingworntype = 'danilovich_swimsuit' and $clothingworntype = 'scandalicious_swimsuit' and $clothingworntype = 'scandalicious_bikinis' and $clothingworntype = 'allure_swimsuit' and $clothingworntype = 'allure_bikinis': PCloswimwear = 1
 end
 
 if $ARGS[0] = 'wear_last_worn':

locations/clothing_attributes.qsrc

@@ -150,7 +150,7 @@ elseif $ARGS[0] = 'allure_bikinis':
 	*P FUNC('$attributes_allure_swim_two', $ARGS[0], ARGS[1])
 end
 
-if $ARGS[0] ! 'swimwear' and $ARGS[0] ! 'beach' and $ARGS[0] ! 'coat' and $ARGS[0] ! 'exercise':
+if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! 'scandalicious_swimwear' and $ARGS[0] ! 'danilovich_swimsuits' and $ARGS[0] ! 'coat' and $ARGS[0] ! 'exercise':
 	if CloSkirtShortness = 6:
 		CloInhibit = 35
 	elseif CloSkirtShortness = 5 or CloPantsShortness = 6:

locations/etoexhib.qsrc

@@ -1628,7 +1628,7 @@ if $ARGS[0] = 'pos53':
 	'The roof of your apartment building.'
 
 	act 'Go down to the attic':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'etoexhib','pos53'
 		else
@@ -1637,7 +1637,7 @@ if $ARGS[0] = 'pos53':
 		end
 	end
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -1646,10 +1646,10 @@ if $ARGS[0] = 'pos53':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+		if func('changingroom','count_swim_item') > 0 and PCloswimwear = 0:
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			act 'Sunbathe (1:00)':
 				cla
 				*clr

locations/fit.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'dressing room':
 	end
 
 	act 'Exit the locker room':
-        if $clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+        if $clothingworntype ! 'nude' and PCloswimwear = 0:
             if Fit['FMR'] = 0 and vidage <= 40 and hotcat >=6 and city_sport >=10:
                 gt 'fit', 'FMR'
             else
@@ -148,7 +148,7 @@ if $ARGS[0] = 'dressing room':
 		gt 'wardrobe', 'start'
 	end
 
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+	if PCloswimwear = 1:
 		act 'Use the pool': gt 'bass', 'start'
 	else
 		act 'Change into swimwear': gt 'changingroom', 'view_swim_list'

locations/gLakeNude.qsrc

@@ -132,11 +132,11 @@ if temper >= 15 and month >= 5 and month <= 9:
 		pcs_mood += 5
 		gs 'stat'
 
-		if ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips<=90:
+		if (PCloswimwear = 1) and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
-		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips >= 90 and pcs_hips<=110:
+		elseif (PCloswimwear = 1) and pcs_hips >= 90 and pcs_hips<=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
-		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips>=110:
+		elseif (PCloswimwear = 1) and pcs_hips>=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(1,2)
 		elseif $clothingworntype = 'nude':
@@ -150,7 +150,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 		act 'Continue':gt'gLakeNude'
 	end
 	
-	if hour >= 6 and hour <= 20 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude'):
+	if hour >= 6 and hour <= 20 and (PCloswimwear = 1 or $clothingworntype = 'nude'):
 		act 'Go swimming (30 minutes)':
 			menu_off = 1
 			*clr & cla
@@ -160,7 +160,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			pcs_mood += 5
 			! Seems appropriate. Potentially worth revisiting
 			if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
-			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+			if PCloswimwear = 1:
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
 			elseif $clothingworntype = 'nude':
 				inhib_exp += rand(1,3)
@@ -182,15 +182,15 @@ if temper >= 15 and month >= 5 and month <= 9:
 		end
 	end
 	
-	if sunWeather = 1 and hour >= 6 and hour <= 20  and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude'):
+	if sunWeather = 1 and hour >= 6 and hour <= 20  and (PCloswimwear = 1 or $clothingworntype = 'nude'):
 		act 'Go sunbathing (30 minutes)':
 			menu_off = 1
-			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+			if PCloswimwear = 1 or $clothingworntype = 'nude':
 				*clr & cla
 				minut = minut + 30
 				if pcs_sweat < 35 : gs 'sweat', 'add', 5
 				pcs_mood += 5
-				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+				if PCloswimwear = 1:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
@@ -350,7 +350,7 @@ if $ARGS[0] = 'sauna':
 		end
 	end
 	
-	if $clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+	if $clothingworntype = 'nude' or PCloswimwear = 1:
 		act 'Go to the womens section':
 			*clr & cla
 			menu_off = 1
@@ -382,7 +382,7 @@ if $ARGS[0] = 'sauna':
 					pcs_skin += rand(2,4)
 					pcs_willpwr += 3
 				end
-				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+				if PCloswimwear = 1:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 					if pcs_inhib < 40: inhib_exp += rand(0,1)
 				else
@@ -405,7 +405,7 @@ if $ARGS[0] = 'sauna':
 			'It appears to be empty at the moment.'
 			act 'Leave': gt 'gLakeNude', 'sauna'
 			gs 'willpower', 'exhib', 'self', 'hard'
-			if saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach': will_cost = 3
+			if saunarand < 4 or PCloswimwear = 1: will_cost = 3
 			if will_cost <= pcs_willpwr:
 				act 'Use the sauna (<<will_cost>> Willpower)':
 					*clr & cla
@@ -416,7 +416,7 @@ if $ARGS[0] = 'sauna':
 						pcs_skin += rand(2,4)
 						pcs_willpwr += 3
 					end
-					if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+					if PCloswimwear = 1:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 						if pcs_inhib < 40: inhib_exp += rand(0,1)
 					else
@@ -454,9 +454,9 @@ if $ARGS[0] = 'sauna':
 				end
 			end
 			gs 'willpower', 'exhib', 'self', 'easy'
-			if saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach': will_cost = 0
+			if saunarand < 4 or PCloswimwear = 1: will_cost = 0
 			if will_cost <= pcs_willpwr:
-				act iif(saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach', 'Use the sauna', 'Use the sauna (<<will_cost>> Willpower)'):
+				act iif(saunarand < 4 or PCloswimwear = 1, 'Use the sauna', 'Use the sauna (<<will_cost>> Willpower)'):
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					minut += 30
@@ -466,7 +466,7 @@ if $ARGS[0] = 'sauna':
 						pcs_skin += rand(2,4)
 						pcs_willpwr += 3
 					end
-					if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+					if PCloswimwear = 1:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 						if pcs_inhib < 40: inhib_exp += rand(0,1)
 					else
@@ -497,7 +497,7 @@ if $ARGS[0] = 'ice_plunge':
 		minut += 10
 		pcs_mood += 10
 		if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/icedipbikini.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(0,1)
 		else

locations/gadriver.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'gadbitch':
 
 	act 'Go back to the river (0:05)':
 		cla
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			cla
 			'You need to dress in regular clothes first.'
 			act'Return':gt'gadriver', 'gadbitch'
@@ -230,7 +230,7 @@ if $ARGS[0] = 'gadbitch':
 				act 'Continue': gt 'gadriver', 'gadbitch'
 			end
 		end
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			act 'Go for a swim':
 				cla
 				*clr
@@ -368,7 +368,7 @@ if $ARGS[0] = 'gadbitch':
 			end
 		end
 		if hour >= 8 and hour < 20 and sunWeather = 1:
-			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+			if PCloswimwear = 1 or $clothingworntype = 'nude':
 				act 'Sunbathe (1:00)':
 					if Mira_no = 0 and npc_rel['A60'] > 0 and MiraLoc ! 1 and rand(1,10) > 7 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15:
 						cla
@@ -503,7 +503,7 @@ if $ARGS[0] = 'gadbitch':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/horse_river.jpg"></center>'
 				'You see Desperado happily walking around in the river.'
 
-				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+				if PCloswimwear = 1 or $clothingworntype = 'nude':
 					act 'Wash Desperado':
 						*clr & cla
 
@@ -519,7 +519,7 @@ if $ARGS[0] = 'gadbitch':
 
 						if $clothingworntype = 'nude':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_nude.jpg"></center>'
-						elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+						elseif PCloswimwear = 1:
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_swim.jpg"></center>'
 						end
 						'You jump in the river and swim over to Desperado. You take your time, washing his beautiful chestnut coat.'
@@ -548,7 +548,7 @@ if $ARGS[0] = 'gadbitch':
 
 							if $clothingworntype = 'nude':
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_nude.jpg"></center>'
-							elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+							elseif PCloswimwear = 1:
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_swim.jpg"></center>'
 							end
 							'You invite Mira to wash Desperado with you; having nothing better to do she agrees.'
@@ -571,7 +571,7 @@ if $ARGS[0] = 'gadbitch':
 		end
 		if grandpaQW['chore_bathe_horse_prog'] = 2:
 			act 'Lead Desperado back home (0:30)':
-				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+				if PCloswimwear = 1:
 					cla
 					'You need to dress in regular clothes first.'
 					act'Return':gt'gadriver', 'gadbitch'
@@ -686,7 +686,7 @@ if $ARGS[0] = 'get_changed':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
 		*nl
 		'You put on our swimwear and neatly fold your clothes before putting them down in a pile, now you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			act 'Swim':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'

locations/glake.qsrc

@@ -12,7 +12,7 @@ $location_type = 'public_outdoors'
 gs'stat'
 
 ! --- meynold event --- !. edit to month 5~10
-if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach' and $clothingworntype ! 'nude' and temper >= 5 and sunWeather = 1 and month >= 5 and month <= 10 and hour < 20 and ((hour >= 10 and week >= 6) or (hour >= 14 and week < 6)) and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart: gt 'mey_vika_events', 'beach_event1'
+if PCloswimwear = 0 and $clothingworntype ! 'nude' and temper >= 5 and sunWeather = 1 and month >= 5 and month <= 10 and hour < 20 and ((hour >= 10 and week >= 6) or (hour >= 14 and week < 6)) and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart: gt 'mey_vika_events', 'beach_event1'
 
 '<center><H4>Lake</H4></center>'
 
@@ -72,7 +72,7 @@ act'Return to Pavlovsk':
 	if konki_cloth = 1:
 		'You need to remove your skates. How are you going to walk on the streets in those?'
 		act'Back':gt'glake'
-	elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+	elseif PCloswimwear = 1:
 		'You need to get dressed in regular clothing first.'
 		act'Return':gt'glake'
 	elseif $clothingworntype ! 'nude':
@@ -216,11 +216,11 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		pcs_mood += 5
 		gs'stat'
 
-		if ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips<=90:
+		if (PCloswimwear = 1) and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
-		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips >= 90 and pcs_hips<=110:
+		elseif (PCloswimwear = 1) and pcs_hips >= 90 and pcs_hips<=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
-		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips>=110:
+		elseif (PCloswimwear = 1) and pcs_hips>=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(1,2)
 		elseif $clothingworntype = 'nude':
@@ -234,7 +234,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		act 'Continue':gt'glake'
 	end
 	
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Go swim in the lake (30 minutes)':
 			*clr & cla
 			menu_off = 1
@@ -266,7 +266,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 				if pcs_sweat < 35 : gs 'sweat', 'add', 5
 				pcs_mood += 5
 				gs'stat'
-				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+				if PCloswimwear = 1:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
@@ -293,7 +293,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 							if $clothingworntype = 'nude':
 								act 'Get dressed and go with him':
 									gs 'clothing', 'wear_last_worn'
-									if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									if PCloswimwear = 1:gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 									gt 'LakeBoyDy', 'ride'
 								end
 							else

locations/katjaEv.qsrc

@@ -1032,7 +1032,7 @@ end
 
 if $ARGS[0] = 'kathanlakesw1':
 	*clr & cla
-	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+	if PCloswimwear = 0:
 		minut +=10
 		$loc = 'katjaEV'
 		$loc_arg = 'kathanlakesw1'
@@ -1053,7 +1053,7 @@ end
 
 if $ARGS[0] = 'kathanlakesw2':
 	*clr & cla
-	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+	if PCloswimwear = 0:
 		$loc = 'katjaEV'
 		$loc_arg = 'kathanlakesw2'
 		gs 'changingroom', 'view_swim_list'
@@ -1077,7 +1077,7 @@ end
 
 if $ARGS[0] = 'kathansaunasw1':
 	*clr & cla
-	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+	if PCloswimwear = 0:
 		$loc = 'katjaEV'
 		$loc_arg = 'kathansaunasw1'
 		gs 'changingroom', 'view_swim_list'
@@ -1090,7 +1090,7 @@ end
 
 if $ARGS[0] = 'kathansaunasw2':
 	*clr & cla
-	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+	if PCloswimwear = 0:
 		$loc = 'katjaEV'
 		$loc_arg = 'kathansaunasw2'
 		gs 'changingroom', 'view_swim_list'

locations/mey_home.qsrc

@@ -234,7 +234,7 @@ if $ARGS[0] = '3':
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act 'Return to the hallway':
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+		if ($clothingworntype = 'nude' or PCloswimwear = 1):
 			*clr
 			'<center><img <<$set_imgh>> src="'+'images/pc/clothing/'+iif($pantyworntype = 'none','0','tanga')+'.jpg'+'"></center>'
 			*nl

locations/mey_vika_events.qsrc

@@ -898,9 +898,9 @@ end
 
 if $ARGS[0] = 'beach_ender':
 	act 'Go':
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
+		if ($clothingworntype = 'nude' or PCloswimwear = 1): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 		! on vsjak the fireman still wears check whether gg
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'): gs 'zz_clothing', 'fix_emergency'
+		if ($clothingworntype = 'nude' or PCloswimwear = 1): gs 'zz_clothing', 'fix_emergency'
 		gt 'pav_residential'
 	end
 end

locations/miroslava.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						if npc_rel['A60'] < 15:npc_rel['A60'] += 1
 						MiraLoc = 0
 						mira_guest = 0
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+						if ($clothingworntype = 'nude' or PCloswimwear = 1):
 							gs 'underwear', 'wear'
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 						end
@@ -240,7 +240,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				meadow = 2
 				MiraLoc = 2
 				mira_guest = 0
-				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+				if ($clothingworntype = 'nude' or PCloswimwear = 1):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
 				end
@@ -261,7 +261,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						if npc_rel['A60'] < 50:npc_rel['A60'] += 1
 						MiraLoc = 2
 						mira_guest = 0
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+						if ($clothingworntype = 'nude' or PCloswimwear = 1):
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 							gs 'underwear', 'wear'
 						end
@@ -297,7 +297,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				npc_rel['A60'] += 1
 				MiraLoc = 5
 				mira_guest = 0
-				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+				if ($clothingworntype = 'nude' or PCloswimwear = 1):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
 				end
@@ -317,7 +317,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					minut += 5
 					if npc_rel['A60'] < 20:npc_rel['A60'] += 1
 					MiraLoc = 5
-					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+					if ($clothingworntype = 'nude' or PCloswimwear = 1):
 						gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 						gs 'underwear', 'wear'
 					end
@@ -353,7 +353,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						minut += 10
 						if npc_rel['A60'] < 50:npc_rel['A60'] += 1
 						mira_guest = 1
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+						if ($clothingworntype = 'nude' or PCloswimwear = 1):
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 							gs 'underwear', 'wear'
 						end
@@ -396,7 +396,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						minut += 2
 						if npc_rel['A60'] < 30:npc_rel['A60'] += 1
 						mira_guest = 0
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+						if ($clothingworntype = 'nude' or PCloswimwear = 1):
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 							gs 'underwear', 'wear'
 						end
@@ -439,7 +439,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						if npc_rel['A60'] < 30:npc_rel['A60'] += 1
 						mira_guest = 0
 						MiraLoc = 3
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+						if ($clothingworntype = 'nude' or PCloswimwear = 1):
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 							gs 'underwear', 'wear'
 						end
@@ -498,7 +498,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'You are tired of hanging around on the street and you decided to invite Mira to dinner.'
 
 					act'Go home':
-						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach'):
+						if ($clothingworntype ! 'nude' and PCloswimwear = 0):
 							minut += 15 & gt 'gadhouse', 'start'
 						else
 							*clr & cla
@@ -576,7 +576,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'"<<$pcs_nickname>>, it''s so boring here," Mira pouts, "I know! Let''s go to your place." Mira suggests brightly.'
 
 				act'Agree':
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach'):
+					if ($clothingworntype ! 'nude' and PCloswimwear = 0):
 						mira_go_blok = 1
 						mira_guest = 1
 						minut += 15
@@ -655,7 +655,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					mira_guest = 0
 					MiraLoc = 2
 					mira_go_blok = 1
-					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+					if ($clothingworntype = 'nude' or PCloswimwear = 1):
 						gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 						gs 'underwear', 'wear'
 					end
@@ -685,7 +685,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				mira_go_blok = 1
 				MiraLoc = 5
 				mira_guest = 0
-				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+				if ($clothingworntype = 'nude' or PCloswimwear = 1):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
 				end
@@ -748,7 +748,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					mira_guest = 0
 					MiraLoc = 1
 					mira_go_blok = 1
-					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+					if ($clothingworntype = 'nude' or PCloswimwear = 1):
 						gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 						gs 'underwear', 'wear'
 					end
@@ -778,7 +778,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				*clr & cla
 				minut += 2
 				mira_guest = 0
-				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+				if ($clothingworntype = 'nude' or PCloswimwear = 1):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
 				end
@@ -1146,8 +1146,8 @@ if $ARGS[0] = 'miraclothes':
 end
 
 if $ARGS[0] = 'mira_river':
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach'):'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivertalk.jpg"></center>'
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivertalkbikini.jpg"></center>'
+	if ($clothingworntype ! 'nude' and PCloswimwear = 0):'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivertalk.jpg"></center>'
+	if PCloswimwear = 1:'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivertalkbikini.jpg"></center>'
 	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivernudetalk.jpg"></center>'
 end
 

locations/pav_complexb2.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = 'roof':
 	'<center>The roof is fairly flat, with the roof access door in a raised part in the middle of the roof. Along one of the walls is another door to some type of storage or maintenances access. There is several ventilation stacks on the roof as well.</center>'
 
 	act 'Go down to the fifth floor':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude' or $clothingworntype = 'beach':
+		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'pav_complexb2','roof'
 		else
@@ -144,7 +144,7 @@ if $ARGS[0] = 'roof':
 			gt 'pav_complexb2','etaj_5'
 		end
 	end
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude' or $clothingworntype = 'beach':
+	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into your clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -153,10 +153,10 @@ if $ARGS[0] = 'roof':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+		if func('changingroom','count_swim_item') > 0 and PCloswimwear = 0:
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			act 'Sunbathe (1:00)':
 				cla
 				*clr

locations/pav_complexb3.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = 'roof':
 	'<center>The roof is fairly flat, with the roof access door in a raised part in the middle of the roof. Along one of the walls is another door to some type of storage or maintenances access. There is several ventilation stacks on the roof as well.</center>'
 
 	act 'Go down to the fifth floor':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'pav_complexb3','roof'
 		else
@@ -147,7 +147,7 @@ if $ARGS[0] = 'roof':
 			gt 'pav_complexb3','etaj_5'
 		end
 	end
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into your clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -156,10 +156,10 @@ if $ARGS[0] = 'roof':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+		if func('changingroom','count_swim_item') > 0 and PCloswimwear = 0:
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			act 'Sunbathe (1:00)':
 				cla
 				*clr

locations/pod_ezd.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] = 'roof':
 	'<center>The roof is fairly flat, with the roof access door in a raised part in the middle of the roof. Along one of the walls is another door to some type of storage or maintenances access. There is several ventilation stacks on the roof as well.</center>'
 
 	act 'Go down to the fifth floor':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'pod_ezd','roof'
 		else
@@ -267,7 +267,7 @@ if $ARGS[0] = 'roof':
 		end
 	end
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
+	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -276,10 +276,10 @@ if $ARGS[0] = 'roof':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+		if func('changingroom','count_swim_item') > 0 and PCloswimwear = 0:
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			act 'Sunbathe (1:00)':
 				*clr & cla
 				minut += 60

locations/portnoi.qsrc

@@ -160,16 +160,34 @@ selltot = 0
 	if i <= ARRSIZE('coat'):jump 'coatmet'
 
 	i = 1
-	:swimwearmet
-		if swimwear[i] = 1 and swimwear_s[i] = 2:dynamic($batch_sell, 'swimwear', i)
+	:danilovich_swimsuitmet
+		if danilovich_swimsuit[i] = 1 and danilovich_swimsuit_s[i] = 2:dynamic($batch_sell, 'danilovich_swimsuit', i)
 		i += 1
-	if i <= ARRSIZE('swimwear'):jump 'swimwearmet'
+	if i <= ARRSIZE('danilovich_swimsuit'):jump 'danilovich_swimsuitmet'
 
 	i = 1
-	:beachmet
-		if beach[i] = 1 and beach_s[i] = 2:dynamic($batch_sell, 'beach', i)
+	:scandalicious_bikinismet
+		if scandalicious_bikinis[i] = 1 and scandalicious_bikinis_s[i] = 2:dynamic($batch_sell, 'scandalicious_bikinis', i)
 		i += 1
-	if i <= ARRSIZE('beach'):jump 'beachmet'
+	if i <= ARRSIZE('scandalicious_bikinis'):jump 'scandalicious_bikinismet'
+
+	i = 1
+	:scandalicious_swimsuitmet
+		if scandalicious_swimsuit[i] = 1 and scandalicious_swimsuit_s[i] = 2:dynamic($batch_sell, 'scandalicious_swimsuit', i)
+		i += 1
+	if i <= ARRSIZE('scandalicious_swimsuit'):jump 'scandalicious_swimsuitmet'
+
+	i = 1
+	:allure_swimsuitmet
+		if allure_swimsuit[i] = 1 and allure_swimsuit_s[i] = 2:dynamic($batch_sell, 'allure_swimsuit', i)
+		i += 1
+	if i <= ARRSIZE('allure_swimsuit'):jump 'allure_swimsuitmet'
+
+	i = 1
+	:allure_bikinismet
+		if allure_bikinis[i] = 1 and allure_bikinis_s[i] = 2:dynamic($batch_sell, 'allure_bikinis', i)
+		i += 1
+	if i <= ARRSIZE('allure_bikinis'):jump 'allure_bikinismet'
 
 	i = 1
 	:fancy_burlesquemet

locations/portnoi2.qsrc

@@ -87,16 +87,34 @@ i = 1
 if i <= ARRSIZE('gm_uniform'):jump 'yuniformmet'
 
 i = 1
-:yswimwearmet
-	if swimwear[i] = 1 and ((swimwear_b[i] > pcs_hips + 8) or (swimwear_b[i] < pcs_hips - 8)):poshvalldrop += 1
+:ydanilovich_swimsuitmet
+	if danilovich_swimsuit[i] = 1 and ((danilovich_swimsuit_b[i] > pcs_hips + 8) or (danilovich_swimsuit_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('swimwear'):jump 'yswimwearmet'
+if i <= ARRSIZE('danilovich_swimsuit'):jump 'ydanilovich_swimsuitmet'
 
 i = 1
-:ybeachmet
-	if beach[i] = 1 and ((beach_b[i] > pcs_hips + 8) or (beach_b[i] < pcs_hips - 8)):poshvalldrop += 1
+:yallure_bikinismet
+	if allure_bikinis[i] = 1 and ((allure_bikinis_b[i] > pcs_hips + 8) or (allure_bikinis_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('beach'):jump 'ybeachmet'
+if i <= ARRSIZE('allure_bikinis'):jump 'yallure_bikinismet'
+
+i = 1
+:yallure_swimsuitmet
+	if allure_swimsuit[i] = 1 and ((allure_swimsuit_b[i] > pcs_hips + 8) or (allure_swimsuit_b[i] < pcs_hips - 8)):poshvalldrop += 1
+	i += 1
+if i <= ARRSIZE('allure_swimsuit'):jump 'yallure_swimsuitmet'
+
+i = 1
+:yscandalicious_swimsuitmet
+	if scandalicious_swimsuit[i] = 1 and ((scandalicious_swimsuit_b[i] > pcs_hips + 8) or (scandalicious_swimsuit_b[i] < pcs_hips - 8)):poshvalldrop += 1
+	i += 1
+if i <= ARRSIZE('scandalicious_swimsuit'):jump 'yscandalicious_swimsuitmet'
+
+i = 1
+:yscandalicious_bikinismet
+	if scandalicious_bikinis[i] = 1 and ((scandalicious_bikinis_b[i] > pcs_hips + 8) or (scandalicious_bikinis_b[i] < pcs_hips - 8)):poshvalldrop += 1
+	i += 1
+if i <= ARRSIZE('scandalicious_bikinis'):jump 'yscandalicious_bikinismet'
 
 i = 1
 :yfancy_burlesquemet
@@ -229,16 +247,34 @@ elseif money >= poshvalldrop:
 	if i <= ARRSIZE('gm_uniform'):jump 'xuniformmet'
 
 	i = 1
-	:xswimwearmet
-		if swimwear[i] = 1 and ((swimwear_b[i] > pcs_hips + 8) or (swimwear_b[i] < pcs_hips - 8)):swimwear_b[i] = pcs_hips
+	:xdanilovich_swimsuitmet
+		if danilovich_swimsuit[i] = 1 and ((danilovich_swimsuit_b[i] > pcs_hips + 8) or (danilovich_swimsuit_b[i] < pcs_hips - 8)):danilovich_swimsuit_b[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('danilovich_swimsuit'):jump 'xdanilovich_swimsuitmet'
+
+	i = 1
+	:xallure_bikinismet
+		if allure_bikinis[i] = 1 and ((allure_bikinis_b[i] > pcs_hips + 8) or (allure_bikinis_b[i] < pcs_hips - 8)):allure_bikinis_b[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('allure_bikinis'):jump 'xallure_bikinismet'
+
+	i = 1
+	:xallure_swimsuitmet
+		if allure_swimsuit[i] = 1 and ((allure_swimsuit_b[i] > pcs_hips + 8) or (allure_swimsuit_b[i] < pcs_hips - 8)):allure_swimsuit_b[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('allure_swimsuit'):jump 'xallure_swimsuitmet'
+
+	i = 1
+	:xscandalicious_swimsuitmet
+		if scandalicious_swimsuit[i] = 1 and ((scandalicious_swimsuit_b[i] > pcs_hips + 8) or (scandalicious_swimsuit_b[i] < pcs_hips - 8)):scandalicious_swimsuit_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('swimwear'):jump 'xswimwearmet'
+	if i <= ARRSIZE('scandalicious_swimsuit'):jump 'xscandalicious_swimsuitmet'
 
 	i = 1
-	:xbeachmet
-		if beach[i] = 1 and ((beach_b[i] > pcs_hips + 8) or (beach_b[i] < pcs_hips - 8)):beach_b[i] = pcs_hips
+	:xscandalicious_bikinismet
+		if scandalicious_bikinis[i] = 1 and ((scandalicious_bikinis_b[i] > pcs_hips + 8) or (scandalicious_bikinis_b[i] < pcs_hips - 8)):scandalicious_bikinis_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('beach'):jump 'xbeachmet'
+	if i <= ARRSIZE('scandalicious_bikinis'):jump 'xscandalicious_bikinismet'
 
 	i = 1
 	:xfancy_burlesquemet

locations/shop_allure.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0] = 'start':
 	$loc_arg = 'start'
     $location_type = 'public_indoors'
 	cls
+	CLOSE ALL
 	menu_off = 0
 	gs 'stat'
 	gs 'themes', 'indoors'

locations/stat_display.qsrc

@@ -323,7 +323,7 @@ $stat_bra_text = ''
 
 if $clothingworntype ! 'nude':
 	if CloThinness = 6:
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			$stat_bra_msg = 'Your breasts are clearly showing through your transparent swimsuit.'
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
@@ -337,7 +337,7 @@ if $clothingworntype ! 'nude':
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		end
 	elseif CloThinness = 5:
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			$stat_bra_msg = 'Your nipples are fully outlined through your swimsuit.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
@@ -360,7 +360,7 @@ if $clothingworntype ! 'nude':
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		end
 	elseif CloThinness = 4:
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			$stat_bra_msg = 'Your nipples are slightly poking through your swimsuit.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
@@ -399,7 +399,7 @@ end
 $stat_panty_msg = ''
 $stat_panty_text = ''
 
-if $pantyworntype = 'none' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+if $pantyworntype = 'none' and PCloswimwear = 0:
 	if PCloStyle = 4:
 		$stat_panty_msg = 'You are not wearing panties, but you are dressed as a hooker, so that''s hardly surprising.'
 		$stat_panty_text = '<BR><font color= #FF00FF><<$stat_panty_msg>></font>'
@@ -425,7 +425,7 @@ if $pantyworntype = 'none' and $clothingworntype ! 'swimwear' and $clothingwornt
 		$stat_panty_msg = 'You are not wearing '+iif($braworntype = 'none', 'any underwear.', 'panties.')
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
 	end
-elseif $pantyworntype = 'exhibitionist' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
+elseif $pantyworntype = 'exhibitionist' and PCloswimwear = 0:
 	if PCloStyle = 4:
 		$stat_panty_msg = 'You are wearing see-through panties, but you are dressed as a hooker, so that''s hardly surprising.'
 		$stat_panty_text = '<BR><font color= #FF00FF><<$stat_panty_msg>></font>'
@@ -515,7 +515,7 @@ elseif $clothingworntype = 'exercise':
 		$stat_clothes_tooltip = 'Normal gym outfit.'
 		$stat_clothes_style = 'exercise'
 	end
-elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+elseif PCloswimwear = 1:
 	if (PCloInhibit >= 50 or PCloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 		$stat_clothes_msg = 'You''re wearing an exhibitionist swimsuit a bimbo would wear.'

locations/swamphouse.qsrc

@@ -558,7 +558,7 @@ if $ARGS[0] = 'tub':
 		dynamic $enema
 	end
 
-	if hotwater = 1 and ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
+	if hotwater = 1 and ($clothingworntype = 'nude' or PCloswimwear = 1):
 		act 'Bathe in the tub (0:30)':
 			cla
 			*clr

locations/telefon.qsrc

@@ -1329,7 +1329,7 @@ end
 }
 if $ARGS[0] = 'Phone_selfie_image':
 	if $ARGS[2] = '':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+		if PCloswimwear = 1:
 			!!changing to and unmixed variable so the rng will work
 			if Enable_Android = 1:
 				dynamic 'temp_swim = <<selfieSwimtot[arrpos(''$selfieLoc'', $ARGS[1],1)]>>'