[fixes] several new clothing shop teething problems

glife.qproj

@@ -119,7 +119,7 @@
 		<Location name="$attributes_fancy_burlesque"/>
 		<Location name="$attributes_dolls_outfits"/>
 		<Location name="$attributes_dolls_dress"/>
-		<Location name="$attributes_cats_oufits"/>
+		<Location name="$attributes_cats_outfits"/>
 		<Location name="$attributes_cats_dress"/>
 		<Location name="$attributes_bomba_goth_outfits"/>
 		<Location name="$attributes_bomba_goth_dress"/>
@@ -955,7 +955,7 @@
 		<Location name="FSroom"/>
 	</Folder>
 	<Folder name="Youth Shop">
-		<Location name="shop_pussycats"/>
+		<Location name="shop_pussykats"/>
 		<Location name="andrey"/>
 		<Location name="gopnew"/>
 		<Location name="goplust"/>

locations/liames.qsrc

@@ -40,8 +40,8 @@ else
 end
 
 if week < 7 and hour >= 9 and hour <= 17:
-	'The long standing alternative clothing shop "<a href="exec:gt ''shop_tsar_bomba'',''start''">`Tsar Bomba</a> is unmistakable amongst the tourist shops on the main square."'
-	'Clothing for younger women is catered for in, "<a href="exec:gt ''liamelkafe'',''start''">Flamingos</a>."'
+	'The long standing alternative clothing shop <a href="exec:gt ''shop_tsar_bomba'',''start''">Tsar Bomba</a> is unmistakable amongst the tourist shops on the main square.'
+	'Clothing for younger women is catered for in, <a href="exec:gt ''flamingos'',''start''">Flamingos</a>.'
 else
 	'Tsar Bomba is current closed, it is open Mon - Sat day 9:00 - 18:00'
 	'Flamingos is current closed, it is open Mon - Sat 9:00 - 18:00'

locations/shop_coco_carmen.qsrc

@@ -18,14 +18,65 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the coco': minut += 3 & gt 'pav_commercial'
 	
-	act 'View clothing': minut += 5 & gt 'shop_coco_carmen', 'clothes'
+	act 'View dresses': minut += 5 & gt 'shop_coco_carmen', 'dress'
+
+	act 'View other outfits': minut += 5 & gt 'shop_coco_carmen', 'outfits'
+end
+
+if $ARGS[0] = 'dress':
+	$loc_arg = 'dress'
+	$loc = 'shop_coco_carmen'
+	$menu_loc = 'shop_coco_carmen'
+	$menu_arg = 'dress'
+	menu_off = 0
+	*clr & cla
+	gs'stat'
+	'<center><b><font color="maroon">Viewing Coco Carmen dresses</font></b></center>'
+	*nl
+
+	gs 'clothing_QV', 'shop_header'
+
+	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
+
+	clothingfilter['qualitycheck'] = 7
+	:loopquality_dress
+		if Clothingstock > 11:
+			i = 1
+		else
+			i = 2
+		end
+
+		:loopcoco_dress
+			if coco[i] = 0:
+				gs 'clothing_attributes', 'coco', i
+				gs 'clothing_QV', 'shop_filter'
+
+				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
+				
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_dress''"><img src="images/pc/items/coco_dress/<<i>>.jpg" 	height="250" /></a>'
+				end
+			end
+			i += 2
+		if i <= 185:jump 'loopcoco_dress'
+	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
 end
 
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
+if $ARGS[0] = 'coco_dress':
+	cla
+	menu_off = 1
+	if coco[i] ! 0:
+		msg 'You already own this dress.'
+		gt 'shop_coco_carmen', 'dress'
+	end
+
+	gt 'clothing', 'view_clothing_item', 'shop', 'coco_dress',i, 20000
+end
+
+if $ARGS[0] = 'outfits':
+	$loc_arg = 'outfits'
 	$loc = 'shop_coco_carmen'
 	$menu_loc = 'shop_coco_carmen'
-	$menu_arg = 'clothes'
+	$menu_arg = 'outfits'
 	menu_off = 0
 	*clr & cla
 	gs'stat'
@@ -44,30 +95,30 @@ if $ARGS[0] = 'clothes':
 			i = 2
 		end
 
-		:loopcoco
+		:loopcoco_outfits
 			if coco[i] = 0:
-				gs 'clothing_attributes', 'coco', i
+				gs 'clothing_attributes', 'coco_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco''"><img src="images/pc/clothing/coco/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco''"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
-		if i <= 185:jump 'loopcoco'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+		if i <= 185:jump 'loopcoco_outfits'
+	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
 end
 
-if $ARGS[0] = 'coco':
+if $ARGS[0] = 'coco_outfits':
 	cla
 	menu_off = 1
 	if coco[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_coco_carmen', 'clothes'
+		msg 'You already own this outfit.'
+		gt 'shop_coco_carmen', 'outfits'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco',i, 20000
+	gt 'clothing', 'view_clothing_item', 'shop', 'coco_outfits',i, 20000
 
 end
 

locations/shop_dolls.qsrc

@@ -96,7 +96,7 @@ if $ARGS[0] = 'dress':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_dress''"><img src="images/pc/clothing/dolls_dress/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
@@ -150,7 +150,7 @@ if $ARGS[0] = 'clothing':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfit''"><img src="images/pc/clothing/dolls_outfit/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfit''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2

locations/shop_fancy_pancy.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'clothes':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/clothing/fancy_burlesque/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2

locations/shop_flamingos.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'dresses':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/clothing/flamingos_dress/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
@@ -102,7 +102,7 @@ if $ARGS[0] = 'clothes':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfit''"><img src="images/pc/clothing/flamingos_outfit/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfit''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2

locations/shop_pussykats.qsrc

@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'dress':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo''"><img <<$set_imgh>> src="images/pc/clothing/cats_dress/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo''"><img <<$set_imgh>> src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
@@ -1113,7 +1113,7 @@ if $ARGS[0] = 'clothes':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo''"><img <<$set_imgh>> src="images/pc/clothing/cats_outfit/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo''"><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3

locations/shop_skuas.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'clothes':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_skuas'', ''skuas''"><img src="images/pc/clothing/skuas/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_skuas'', ''skuas''"><img src="images/pc/items/skuas/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2

locations/shop_tsar_bomba.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'dresses':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/clothing/bomba_dresses/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/items/bomba/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
@@ -106,7 +106,7 @@ if $ARGS[0] = 'clothes':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outift''"><img src="images/pc/clothing/bomba_outfit/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outift''"><img src="images/pc/items/bomba/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2