Should fix the regular clothes/shoe issues

locations/clothing_QV

@@ -233,12 +233,11 @@ if $ARGS[0] = 'sports':
 end
 
 if $ARGS[0] = 'gym':
-	$regularwornclothingtype = $clothingworntype
-	regularwornclothingnumber = clothingwornnumber
-	gt 'clothing_QV', 'gym2'
-end
+	if $regularwornclothingtype = '':
+		$regularwornclothingtype = $clothingworntype
+		regularwornclothingnumber = clothingwornnumber
+	end
 
-if $ARGS[0] = 'gym2':
 	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
@@ -254,18 +253,21 @@ if $ARGS[0] = 'gym2':
 
 	act 'Return': gt $loc, $metka
 
-	if $clothingworntype ! $regularwornclothingtype:
-		act 'Change back into your regular clothes':
-			$clothingworntype = $regularwornclothingtype
-			clothingwornnumber = regularwornclothingnumber
-			gt 'clothing_QV', 'gym2'
-		end
-	end
+	if $clothingworntype ! $regularwornclothingtype: gs 'clothing_QV', 'gym2'
 
 	if $clothingworntype ! 'nude':
 		act 'Strip':gt 'clothing_QV', 'strip'
 	end
+end
 
+if $ARGS[0] = 'gym2':
+	act 'Change back into your regular clothes':
+		$clothingworntype = $regularwornclothingtype
+		clothingwornnumber = regularwornclothingnumber
+		killvar '$regularwornclothingtype'
+		killvar 'regularwornclothingnumber'
+		gt 'clothing_QV', 'gym2'
+	end
 end
 
 if $ARGS[0] = 'cloak':

locations/fit

@@ -115,6 +115,9 @@ if $ARGS[0] = 'dressing room':
 		gt 'shoes', 'gym'
 	end
 
+	if $clothingworntype ! $regularwornclothingtype or $regularwornclothingtype ! '': gs 'clothing_QV', 'gym2'
+	if $shoeworntype ! $regularwornshoetype or $regularwornshoetype ! '': gs 'clothing_QV', 'gym2'
+
 	if abonement > 0 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and pcs_stam >= 40:
 		act 'Go to the gym':
 			cla

locations/gdksport

@@ -76,10 +76,10 @@ if $ARGS[0] = 'start':
 
 	act 'Change clothes in the locker room':gt 'clothing_QV', 'gym'
 
-	act 'Change your shoes':
-		cla
-		gt 'shoes', 'gym'
-	end
+	act 'Change your shoes':gt 'shoes', 'gym'
+
+	if $clothingworntype ! $regularwornclothingtype or $regularwornclothingtype ! '': gs 'clothing_QV', 'gym2'
+	if $shoeworntype ! $regularwornshoetype or $regularwornshoetype ! '': gs 'clothing_QV', 'gym2'
 
 	if albinaQWdance > 0 or gsAboDance > 0 or gsAboBeg > 0 or gsAboVolley > 0:
 		if $clothingworntype ! 'exercise':'You are not dressed in sports clothes.'

locations/shoes

@@ -144,28 +144,31 @@ if $ARGS[0] = 'view_shoe_list':
 end
 
 if $ARGS[0] = 'gym':
-	$regularwornshoetype = $shoeworntype
-	regularwornshoenumber = shoewornnumber
-	gt 'shoes', 'gym2'
-end
+	if $regularwornshoetype = '':
+		$regularwornshoetype = $shoeworntype
+		regularwornshoenumber = shoewornnumber
+	end
 
-if $ARGS[0] = 'gym2':
 	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
-	:loopstrainers
+	:loopstrainers2
 		if strainers[i] = 1 and strainersS[i] = 0:'<a href="exec:gt ''shoes'', ''view_shoe_item'', ''wardrobe'', ''trainers'', <<i>>"><img src="images/pc/shoes/trainers/<<i>>.jpg" 	height="250" /></a>'
 		i += 1
-	if i <= 29:jump 'loopstrainers'
+	if i <= 29:jump 'loopstrainers2'
 
 	act 'Return': gt $loc, $metka
 
-	if $shoeworntype ! $regularwornshoetype:
-		act 'Put your regular shoes back on':
-			$shoeworntype = $regularwornshoetype
-			shoewornnumber = regularwornshoenumber
-			gt 'shoes', 'gym2'
-		end
+	if $shoeworntype ! $regularwornshoetype: gs 'shoes', 'gym2'
+end
+
+if $ARGS[0] = 'gym2':
+	act 'Put your regular shoes back on':
+		$shoeworntype = $regularwornshoetype
+		shoewornnumber = regularwornshoenumber
+		killvar '$regularwornshoetype'
+		killvar 'regularwornshoenumber'
+		gt 'shoes', 'gym2'
 	end
 end