[fixed] Previous outfit and underwear to use unique variables when swimming so you should be put back in the correct clothes

locations/BelSex.qsrc

@@ -412,7 +412,11 @@ if $ARGS[0] = 'shower':
 				end
 			end
 
-			if PCloswimwear = 1: gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			if PCloswimwear = 1:
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			end
 
 			gs 'arousal', 'end'
 			gs 'stat'

locations/Katlake.qsrc

@@ -138,18 +138,10 @@ if $ARGS[0] = 'key':
 	'You reluctantly agree to let her take you to her home... after all, your health is important and she just saved you!'
 
 	act 'Go with Kat':
-		if $clothingworntype = 'nude':
-			gs 'clothing', 'wear_last_worn'
-			if PCloswimwear = 1:
-				gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-				gs 'underwear', 'wear'
-				gt 'kathouse0'
-			end
-		else
-			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-			gs 'underwear', 'wear'
-			gt 'kathouse0'
-		end
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']lothingworntype, normalclothingwornno
+		gt 'kathouse0'
 	end
 end
 

locations/LakeBoyZ.qsrc

@@ -93,16 +93,10 @@ $gL_boy_z = {
 								act 'Call it a day and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 							act 'Follow him to his house':
-								if $clothingworntype = 'nude':
-									gs 'clothing', 'wear_last_worn'
-									gs 'underwear', 'wear'
-									if PCloswimwear = 1:gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-									gt 'LBZhouse'
-								else
-									gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-									gs 'underwear', 'wear'
-									gt 'LBZhouse'
-								end
+								gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+								gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+								gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+								gt 'LBZhouse'
 							end
 						end
 					else
@@ -112,17 +106,15 @@ $gL_boy_z = {
 							*clr & cla
 							minut += 15
 							if $clothingworntype = 'nude':
-								gs 'clothing', 'wear_last_worn'
-								gs 'underwear', 'wear'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changenude.jpg"></center>'
-								if PCloswimwear = 1:
-									gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-									gs 'underwear', 'wear'
-								end
+								gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+								gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+								gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 							else
-								gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-								gs 'underwear', 'wear'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changebikini.jpg"></center>'
+								gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+								gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+								gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 							end
 							gs'stat'
 							'You quickly get changed into your regular clothes and go for a walk with <<$boydesc>>.'

locations/Nudelake.qsrc

@@ -18,8 +18,9 @@ if PCloswimwear = 1 or $clothingworntype = 'nude':
 		cla
 		*clr
 		minut+=5
-		gs 'clothing', 'wear_last_worn'
-		gs 'underwear', 'wear'
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/dress_nudebeach.jpg"></center>'
 		'You put your clothes back on.'
 		act'Continue':gt'Nudelake'
@@ -57,7 +58,12 @@ if temper >= 15 and month >= 5 and month <= 9:
 				cla
 				*clr
 				minut += 5
-				gs 'clothing', 'strip_all'
+				$lastwornclothingtype['swim'] = $clothingworntype
+				lastwornclothingnumber['swim'] = clothingwornnumber
+				$lastwornpantytype['swim'] = $pantyworntype
+				lastwornpantynumber['swim'] = pantywornnumber
+				$lastwornbratype['swim'] = $braworntype
+				lastwornbranumber['swim'] = braworntypenumber
 				if pcs_horny >= 80 and exhibitionist_lvl > 1:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'You strip off. A few passing men do a double-take and pause to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
@@ -95,8 +101,9 @@ end
 
 if $clothingworntype = 'nude':
 	act 'Get dressed':
-		if $clothingworntype = 'nude':gs 'clothing', 'wear_last_worn'
-		gs 'underwear', 'wear'
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 	end
 else
 	act 'Return to the main beach':gt 'city_lake', 'start'

locations/changingroom.qsrc

@@ -8,16 +8,13 @@ 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 and ARRSIZE('nerdvana_swimsuit') = 0 and ARRSIZE('nerdvana_bikinis') = 0:
 		'<center>You do not own any swimwear.</center>'
 	elseif $loc = 'fit' or $loc = 'bass' or temper >= 15:
-		if PCloswimwear = 0:
-			if $clothingworntype = 'nude':
-				if PCloswimwear = 0:
-					$normalclothingworntype = $lastwornclothingtype
-					normalclothingwornno = lastwornclothingnumber
-				end
-			else
-				$normalclothingworntype = $clothingworntype
-				normalclothingwornno = clothingwornnumber
-			end
+		if PCloswimwear = 0 and $clothingworntype ! 'nude':
+			$lastwornclothingtype['swim'] = $clothingworntype
+			lastwornclothingnumber['swim'] = clothingwornnumber
+			$lastwornpantytype['swim'] = $pantyworntype
+			lastwornpantynumber['swim'] = pantywornnumber
+			$lastwornbratype['swim'] = $braworntype
+			lastwornbranumber['swim'] = braworntypenumber
 		end
 
 		i = 1
@@ -88,8 +85,9 @@ if $ARGS[0] = 'view_swim_list':
 	
 	if PCloswimwear = 1:
 		act 'Put your regular clothes back on':
-			gs 'underwear', 'wear'
-			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			gt $loc, $loc_arg
 		end
 	end

locations/city_apt_building.qsrc

@@ -165,8 +165,9 @@ if $ARGS[0] = 'roof':
 	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into your clothes':
 			minut += 5
-			gs 'underwear', 'wear'
-			gs 'clothing', 'wear_last_worn'
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			gt 'city_apt_building','roof'
 		end
 	end
@@ -182,7 +183,16 @@ if $ARGS[0] = 'roof':
 				if pcs_sweat < 35: gs 'sweat', 'add', 5
 				menu_off = 1
 				pcs_mood += 5
-				gs 'clothing', 'strip_all'
+				if PCloswimwear = 0:
+					$lastwornclothingtype['swim'] = $clothingworntype
+					lastwornclothingnumber['swim'] = clothingwornnumber
+					$lastwornpantytype['swim'] = $pantyworntype
+					lastwornpantynumber['swim'] = pantywornnumber
+					$lastwornbratype['swim'] = $braworntype
+					lastwornbranumber['swim'] = braworntypenumber
+				else
+					gs 'clothing', 'strip_all'
+				end
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof/nude.jpg"></center>'
 				if krem = 0:

locations/city_lake.qsrc

@@ -987,8 +987,9 @@ if $ARGS[0] = 'stasValera4':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
 							if PCloswimwear = 1:
-								gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-								gs 'underwear', 'wear'
+								gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+								gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+								gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 								'You enter the changing booth and strip out of your swimwear before putting your regular clothes back on.'
 							end
 							'The three of you start to walk toward your home and you feel safe accompanied by them. They keep the conversation light and also enjoy plenty of flirtatious padding and groping. You reach the front entrance of your apartment eventually and bid them goodbye after some farewell kisses.'

locations/etoexhib.qsrc

@@ -1639,8 +1639,9 @@ if $ARGS[0] = 'pos53':
 	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
-			gs 'underwear', 'wear'
-			gs 'clothing', 'wear_last_worn'
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			gt 'etoexhib','pos53'
 		end
 	end

locations/gadriver.qsrc

@@ -214,9 +214,10 @@ if $ARGS[0] = 'gadbitch':
 			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
 			cla
 			minut += 5
-			gs 'underwear', 'wear'
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			if clothesAtLocation = 1: gs 'clothing', 'recover_lost_clothes', 'VillageRiver', 1
-				act 'Continue': gt 'gadriver', 'gadbitch'
+			act 'Continue': gt 'gadriver', 'gadbitch'
 		end
 	end
 
@@ -226,6 +227,12 @@ if $ARGS[0] = 'gadbitch':
 			act 'Strip naked':
 				cla
 				minut += 5
+				$lastwornclothingtype['swim'] = $clothingworntype
+				lastwornclothingnumber['swim'] = clothingwornnumber
+				$lastwornpantytype['swim'] = $pantyworntype
+				lastwornpantynumber['swim'] = pantywornnumber
+				$lastwornbratype['swim'] = $braworntype
+				lastwornbranumber['swim'] = braworntypenumber
 				gs 'clothing', 'strip_all', 'VillageRiver'
 				'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
 				act 'Continue': gt 'gadriver', 'gadbitch'
@@ -643,6 +650,12 @@ if $ARGS[0] = 'gadbitch':
 						act 'Strip naked':
 							cla
 							minut += 5
+							$lastwornclothingtype['swim'] = $clothingworntype
+							lastwornclothingnumber['swim'] = clothingwornnumber
+							$lastwornpantytype['swim'] = $pantyworntype
+							lastwornpantynumber['swim'] = pantywornnumber
+							$lastwornbratype['swim'] = $braworntype
+							lastwornbranumber['swim'] = braworntypenumber
 							gs 'clothing', 'strip_all', 'VillageRiver'
 							inhib_exp += rand(1,3)
 							'Without hesitation, you take off all your clothes and neatly fold them before putting them down in a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'

locations/pav_complexb2.qsrc

@@ -148,8 +148,9 @@ if $ARGS[0] = 'roof':
 	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into your clothes':
 			minut += 5
-			gs 'underwear', 'wear'
-			gs 'clothing', 'wear_last_worn'
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			gt 'pav_complexb2','roof'
 		end
 	end

locations/pav_complexb3.qsrc

@@ -151,8 +151,9 @@ if $ARGS[0] = 'roof':
 	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into your clothes':
 			minut += 5
-			gs 'underwear', 'wear'
-			gs 'clothing', 'wear_last_worn'
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			gt 'pav_complexb3','roof'
 		end
 	end

locations/pav_lake.qsrc

@@ -107,6 +107,14 @@ if month >= 5 and month <= 9:
 				minut += 5
 				sauna_stripped = 0
 				if pcs_inhib < 60: inhib_exp += rand(1,3)
+				if PCloSwimwear = 0:
+					$lastwornclothingtype['swim'] = $clothingworntype
+					lastwornclothingnumber['swim'] = clothingwornnumber
+					$lastwornpantytype['swim'] = $pantyworntype
+					lastwornpantynumber['swim'] = pantywornnumber
+					$lastwornbratype['swim'] = $braworntype
+					lastwornbranumber['swim'] = braworntypenumber
+				end
 				gs 'clothing', 'strip_all'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/strip.jpg"></center>'
 				'Without hesitation and despite the fact that other people are around, you strip from your clothes and neatly fold them before putting them down in a pile. Without your clothes holding you back, you can go for a swim in the lake or do some sunbathing.'
@@ -201,8 +209,9 @@ if month >= 5 and month <= 9:
 					act 'Suggest alternative payment (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			else
-				gs 'clothing', 'wear_last_worn'
-				gs 'underwear', 'wear'
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 				'You return to the place where you left your clothes, and put them back on.'
 				act'Continue':gt'pav_lake'
 			end
@@ -295,7 +304,11 @@ 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 PCloswimwear = 1:gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									if PCloswimwear = 1:
+										gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+										gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+										gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+									end
 									gt 'LakeBoyDy', 'ride'
 								end
 							else

locations/pav_lake_nude.qsrc

@@ -102,8 +102,9 @@ if month >= 5 and month <= 9:
 			*clr & cla
 			menu_off = 1
 			minut += 5
-			gs 'clothing', 'wear_last_worn'
-			gs 'underwear', 'wear'
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			nudelake = rand(1,10)
 			if nudelake <= 2 and home_owned[2] = 1:
 				minut += 5
@@ -330,6 +331,12 @@ if $ARGS[0] = 'sauna':
 			menu_off = 1
 			minut +=  5
 			sauna_stripped = 1
+			$lastwornclothingtype['swim'] = $clothingworntype
+			lastwornclothingnumber['swim'] = clothingwornnumber
+			$lastwornpantytype['swim'] = $pantyworntype
+			lastwornpantynumber['swim'] = pantywornnumber
+			$lastwornbratype['swim'] = $braworntype
+			lastwornbranumber['swim'] = braworntypenumber
 			gs 'clothing', 'strip_all'
 			gs 'stat'
 			'You strip out of your clothes, folding them neatly and placing them in one of the open shelves.'
@@ -340,8 +347,9 @@ if $ARGS[0] = 'sauna':
 			cla
 			menu_off = 1
 			minut += 5
-			gs 'clothing', 'wear_last_worn'
-			gs 'underwear', 'wear'
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			'You put your clothes back on.'
 			act 'Continue': gt 'pav_lake_nude', 'sauna'
 		end

locations/pod_ezd.qsrc

@@ -271,8 +271,9 @@ if $ARGS[0] = 'roof':
 	if PCloswimwear = 1 or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
-			gs 'underwear', 'wear'
-			gs 'clothing', 'wear_last_worn'
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 			gt 'pod_ezd','roof'
 		end
 	end