Bug fixes and snagging

locations/_attrib_shoe_boutique

@@ -113,11 +113,11 @@ elseif ARGS[1] = 27:
 elseif ARGS[1] = 28:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 29:
 	ShoQuality = 5
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 30:
 	ShoQuality = 6
 	ShoHeels = 4
@@ -133,7 +133,7 @@ elseif ARGS[1] = 32:
 elseif ARGS[1] = 33:
 	ShoQuality = 5
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 34:
 	ShoQuality = 5
 	ShoHeels = 4

locations/_attrib_shoe_gandm

@@ -106,7 +106,7 @@ elseif ARGS[1] = 25:
 elseif ARGS[1] = 26:
 	ShoQuality = 2
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 27:
 	ShoQuality = 1
 	ShoHeels = 4
@@ -139,7 +139,7 @@ elseif ARGS[1] = 33:
 elseif ARGS[1] = 34:
 	ShoQuality = 2
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 35:
 	ShoQuality = 1
 	ShoHeels = 4
@@ -175,7 +175,7 @@ elseif ARGS[1] = 42:
 elseif ARGS[1] = 43:
 	ShoQuality = 1
 	ShoHeels = 1
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 44:
 	ShoQuality = 1
 	ShoHeels = 2
@@ -199,7 +199,7 @@ elseif ARGS[1] = 48:
 elseif ARGS[1] = 49:
 	ShoQuality = 2
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 50:
 	ShoQuality = 1
 	ShoHeels = 4
@@ -207,7 +207,7 @@ elseif ARGS[1] = 50:
 elseif ARGS[1] = 51:
 	ShoQuality = 2
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 end
 
 --- $attrib_shoe_gandm ---------------------------------

locations/budgetclothes

@@ -254,7 +254,7 @@ if $ARGS[0] = 'shoes':
 	if i <= 51:jump 'loopgandm_shoes'
 end
 
-if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'sgandm',i, 1500
+if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gandm',i, 1500
 
 if $ARGS[0] = 'trainers':
 	$metka = 'trainers'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'trainers':
 	if i <= 29:jump 'looptrainers_shoes'
 end
 
-if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'strainers',i, 2500
+if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'trainers',i, 2500
 
 if $ARGS[0] = 'coats':
 	$metka = $ARGS[0]

locations/sell_young_clothes

@@ -52,7 +52,7 @@ if $ARGS[0] = 'shoes':
 	if i <= 38:jump 'loopcats_shoes'
 end
 
-if $ARGS[0] = 'young_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'spussy',i, 2500
+if $ARGS[0] = 'young_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'pussy',i, 2500
 
 --- sell_young_clothes ---------------------------------
 

locations/sexshop

@@ -450,7 +450,7 @@ if $ARGS[0] = 'shoes':
 	if i <= 27:jump 'loopfetish_shoes'
 end
 
-if $ARGS[0] = 'fetish_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'sfetish',i, 3500
+if $ARGS[0] = 'fetish_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'fetish',i, 3500
 
 if $ARGS[0] = 'podval':
 	cla

locations/shoe_description2

@@ -17,34 +17,37 @@ elseif ShoQuality = 7:
    $description = 'This is a beautifully made '
 end
 
-if ShoHeels = 1:
-   $description += 'flat '
-elseif ShoHeels = 2:
-   $description += 'low heel '
-elseif ShoHeels = 3:
-   $description += 'mid heel '
-elseif ShoHeels = 4:
-   $description += 'high heel '
-elseif ShoHeels = 5:
-   $description += 'ultra high heel '
-elseif ShoHeels = 6:
-   $description += 'fetish heel '
-end
+if $ARGS[0] = 'trainers':
+	$description += 'training shoe.'
+else
+	if ShoHeels = 1:
+	   $description += 'flat '
+	elseif ShoHeels = 2:
+	   $description += 'low heel '
+	elseif ShoHeels = 3:
+	   $description += 'mid heel '
+	elseif ShoHeels = 4:
+	   $description += 'high heel '
+	elseif ShoHeels = 5:
+	   $description += 'ultra high heel '
+	elseif ShoHeels = 6:
+	   $description += 'fetish heel '
+	end
 
-if ShoCut = 1:
-   $description += 'shoe.'
-elseif ShoCut = 2:
-   $description += 'ankle boot.'
-elseif ShoCut = 3:
-   $description += 'calf high boot.'
-elseif ShoCut = 4:
-   $description += 'knee high boot.'
-elseif ShoCut = 5:
-   $description += 'thigh high boot.'
-elseif ShoCut = 6:
-   $description += 'groin high boot.'
+	if ShoCut = 1:
+	   $description += 'shoe.'
+	elseif ShoCut = 2:
+	   $description += 'ankle boot.'
+	elseif ShoCut = 3:
+	   $description += 'calf high boot.'
+	elseif ShoCut = 4:
+	   $description += 'knee high boot.'
+	elseif ShoCut = 5:
+	   $description += 'thigh high boot.'
+	elseif ShoCut = 6:
+	   $description += 'groin high boot.'
+	end
 end
 
-
 --- shoe_description2 ---------------------------------
 

locations/shoes

@@ -21,7 +21,7 @@ $shoe_list_line = {
 	killvar 'shoe_temp'
 	gs 'shoe_attributes', $ARGS[1], ARGS[2]
 
-	gs 'shoe_description2'
+	gs 'shoe_description2', $ARGS[2]
 	$RESULT += '<TD><<FUNC(''$shoe_description'', $ARGS[1])>> <<ARGS[2]>></TD><TD><<$description>></TD>'
 
 	if ShoStyle = 2:
@@ -36,10 +36,7 @@ $shoe_list_line = {
 		$RESULT += '<TD>No</TD>'
 	end
 	
-	$RESULT += '<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a>'
-
-	if $ARGS[0] ! 'sell':
-		$RESULT += ' <a href="exec:dynamic ''$<<$cloType>>shoetype = <<$ARGS[1]>>'' & dynamic ''<<$cloType>>shoenumber = <<ARGS[2]>>'' & gs ''shoes'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Wear</a></TD>'
+	$RESULT += '<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a></TD>'
 
 		$RESULT += '<TD>'
 		if cloc ! 1:$RESULT += ' <a href="exec:gt ''shoes'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Storage</a><BR>'
@@ -82,27 +79,35 @@ if $ARGS[0] = 'select':
 	*nl
 	*nl
 	'<center><table border=1><TH>Clothing type</TH><TH>Shoes worn</TH>'
-	'<TD><a href="exec:$cloType = ''cheap'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Cheap</a></TD><TD>' + FUNC('$shoe_description', $cheapshoetype) + ' <<cheapshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''average'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Average</a></TD><TD>' + FUNC('$shoe_description', $averageshoetype) + ' <<averageshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''expensive'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Expensive</a></TD><TD>' + FUNC('$shoe_description', $expensiveshoetype) + ' <<expensiveshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''formal'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Formal</a></TD><TD>' + FUNC('$shoe_description', $formalshoetype) + ' <<formalshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''office'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Office</a></TD><TD>' + FUNC('$shoe_description', $officeshoetype) + ' <<officeshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''school'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">School</a></TD><TD>' + FUNC('$shoe_description', $schoolshoetype) + ' <<schoolshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''exercise'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Exercise</a></TD><TD>' + FUNC('$shoe_description', $cheapshoetype) + ' <<cheapshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''fetish'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Fetish</a></TD><TD>' + FUNC('$shoe_description', $fetishshoetype) + ' <<fetishshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''exhibit'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Exhibitionist</a></TD><TD>' + FUNC('$shoe_description', $exhibitshoetype) + ' <<exhibitshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''uniform'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Uniform</a></TD><TD>' + FUNC('$shoe_description', $uniformshoetype) + ' <<uniformshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''burlesque'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Burlesque</a></TD><TD>' + FUNC('$shoe_description', $burlesqueshoetype) + ' <<burlesqueshoenumber>></TD>'
-	'<TD><a href="exec:$cloType = ''alternative'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Alternative</a></TD><TD>' + FUNC('$shoe_description', $alternativeshoetype) + ' <<alternativeshoenumber>></TD></center>'
+	*P '<TD><a href="exec:$cloType = ''cheap'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Cheap</a></TD><TD>' + FUNC('$shoe_description', $cheapshoetype) + ' <<cheapshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''average'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Average</a></TD><TD>' + FUNC('$shoe_description', $averageshoetype) + ' <<averageshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''expensive'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Expensive</a></TD><TD>' + FUNC('$shoe_description', $expensiveshoetype) + ' <<expensiveshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''formal'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Formal</a></TD><TD>' + FUNC('$shoe_description', $formalshoetype) + ' <<formalshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''office'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Office</a></TD><TD>' + FUNC('$shoe_description', $officeshoetype) + ' <<officeshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''school'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">School</a></TD><TD>' + FUNC('$shoe_description', $schoolshoetype) + ' <<schoolshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''exercise'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Exercise</a></TD><TD>' + FUNC('$shoe_description', $cheapshoetype) + ' <<cheapshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''fetish'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Fetish</a></TD><TD>' + FUNC('$shoe_description', $fetishshoetype) + ' <<fetishshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''exhibit'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Exhibitionist</a></TD><TD>' + FUNC('$shoe_description', $exhibitshoetype) + ' <<exhibitshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''uniform'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Uniform</a></TD><TD>' + FUNC('$shoe_description', $uniformshoetype) + ' <<uniformshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''burlesque'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Burlesque</a></TD><TD>' + FUNC('$shoe_description', $burlesqueshoetype) + ' <<burlesqueshoenumber>></TD>'
+	*P '<TD><a href="exec:$cloType = ''alternative'' & gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Alternative</a></TD><TD>' + FUNC('$shoe_description', $alternativeshoetype) + ' <<alternativeshoenumber>></TD></center>'
 	'</table>'
+
+	act 'Leave':
+		dynamic '$shoeworntype = $<<$cloType>>shoetype'
+		dynamic 'shoewornnumber = <<$cloType>>shoenumber'
+		if $clothingworntype = $cloType:gs 'shoes', 'wear', 'skip'
+		gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'view_shoe_list':
 	!! ARGS 0 - view_shoe_list
 	!! ARGS 1 - action type (wardrobe, sell, resize, store, unwanted)
 	!! ARGS 2 - brothel flag (brothel)
-	
-	act 'Leave':gt $loc, $metka
+
+
+	act 'Leave':gt 'shoe', 'select'
 
 	if $ARGS[1] ! 'sell' :
 		'<center><b>Selecting shoes to wear with <<$cloType>> outfit</b></center>'
@@ -183,9 +188,9 @@ if $ARGS[0] = 'view_shoe_item':
 	cla
 	'<center><img src="<<FUNC(''$shoe_image'', $ARGS[2], ARGS[3])>>"></center>'
 	gs 'shoe_attributes', $ARGS[2], ARGS[3]
-	FUNC('$shoe_description', $ARGS[1], ARGS[2]) + '<<ARGS[3]>>'
+	FUNC('$shoe_description', $ARGS[2]) + '<<ARGS[3]>>'
 	*nl
-	gs 'shoe_description2'
+	gs 'shoe_description2', $ARGS[2]
 
 	'<<$description>>'
 	*nl
@@ -214,15 +219,15 @@ if $ARGS[0] = 'view_shoe_item':
 					gt $loc, $metka
 				end
 			else
-				'You cannot afford this outfit.'
+				'You cannot afford these shoes.'
 			end
 		end
 	elseif $ARGS[1] = 'wardrobe':
 		act 'Leave in closet':gt 'shoes', 'view_shoe_list', $ARGS[1]
 
 		act 'Set as default for <<$cloType>> outfit':
-			dynamic '$<<$cloType>>shoetype = <<$ARGS[1]>>'
-			dynamic '<<$cloType>>shoenumber = <<ARGS[2]>>'
+			dynamic '$<<$cloType>>shoetype = <<$ARGS[2]>>'
+			dynamic '<<$cloType>>shoenumber = <<ARGS[3]>>'
 			gt 'shoes', 'view_shoe_list', $ARGS[1]
 		end
 	elseif $ARGS[1] = 'store' or $ARGS[1] = 'unwanted':
@@ -275,8 +280,10 @@ if $ARGS[0] = 'wear':
 	!! ARGS 2 - shoe index
 
 
-	$shoeworntype = $ARGS[1]
-	shoewornnumber = ARGS[2]
+	if $ARGS[1] ! 'skip':
+		$shoeworntype = $ARGS[1]
+		shoewornnumber = ARGS[2]
+	end
 	gs 'shoe_descriptions'
 
 	gs 'shoe_attributes', $ARGS[1], ARGS[2]