Преглед на файлове

[fixed] More clothing bugs squished

KevinSmarts преди 3 години
родител
ревизия
42b3c85473
променени са 5 файла, в които са добавени 37 реда и са изтрити 34 реда
  1. 1 1
      locations/budgetclothes.qsrc
  2. 9 9
      locations/shop_coco_carmen.qsrc
  3. 23 20
      locations/shop_dolls.qsrc
  4. 1 1
      locations/shop_flamingos.qsrc
  5. 3 3
      locations/shop_tsar_bomba.qsrc

+ 1 - 1
locations/budgetclothes.qsrc

@@ -191,7 +191,7 @@ if $ARGS[0] = 'dresses':
 
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				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 ''budgetclothes'', ''gm_dress''"><img src="images/pc/clothing/gm/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 ''budgetclothes'', ''gm_dress''"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 				end
 			end
 			end
 			i += 3
 			i += 3

+ 9 - 9
locations/shop_coco_carmen.qsrc

@@ -47,24 +47,24 @@ if $ARGS[0] = 'dress':
 		end
 		end
 
 
 		:loopcoco_dress
 		:loopcoco_dress
-			if coco[i] = 0:
-				gs 'clothing_attributes', 'coco', i
+			if coco_dress[i] = 0:
+				gs 'clothing_attributes', 'coco_dress', i
 				gs 'clothing_QV', 'shop_filter'
 				gs 'clothing_QV', 'shop_filter'
 
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				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>'
+					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
 			end
 			end
 			i += 2
 			i += 2
-		if i <= 185:jump 'loopcoco_dress'
+		if i <= 100:jump 'loopcoco_dress'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
 end
 end
 
 
 if $ARGS[0] = 'coco_dress':
 if $ARGS[0] = 'coco_dress':
 	cla
 	cla
 	menu_off = 1
 	menu_off = 1
-	if coco[i] ! 0:
+	if coco_dress[i] ! 0:
 		msg 'You already own this dress.'
 		msg 'You already own this dress.'
 		gt 'shop_coco_carmen', 'dress'
 		gt 'shop_coco_carmen', 'dress'
 	end
 	end
@@ -96,24 +96,24 @@ if $ARGS[0] = 'outfits':
 		end
 		end
 
 
 		:loopcoco_outfits
 		:loopcoco_outfits
-			if coco[i] = 0:
+			if coco_outfits[i] = 0:
 				gs 'clothing_attributes', 'coco_outfits', i
 				gs 'clothing_attributes', 'coco_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 				gs 'clothing_QV', 'shop_filter'
 
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				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/items/coco/outfits/<<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_outfits''"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 				end
 			end
 			end
 			i += 2
 			i += 2
-		if i <= 185:jump 'loopcoco_outfits'
+		if i <= 90:jump 'loopcoco_outfits'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
 end
 end
 
 
 if $ARGS[0] = 'coco_outfits':
 if $ARGS[0] = 'coco_outfits':
 	cla
 	cla
 	menu_off = 1
 	menu_off = 1
-	if coco[i] ! 0:
+	if coco_outfits[i] ! 0:
 		msg 'You already own this outfit.'
 		msg 'You already own this outfit.'
 		gt 'shop_coco_carmen', 'outfits'
 		gt 'shop_coco_carmen', 'outfits'
 	end
 	end

+ 23 - 20
locations/shop_dolls.qsrc

@@ -30,22 +30,7 @@ if $ARGS[0] = 'start':
 		end
 		end
 	end
 	end
 
 
-	act 'Browse clothing':
-		*clr & cla
-		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/dollsshop.jpg"></center>'
-		''
-		'The store has a small front on a side street but one glance is all you need to tell this is not your average clothing store. Inside the store, shelves and racks of alternative clothes crammed into every available space - anybody setting out to find an inch of wall would have their work cut out for them. The checkout counter is near the entrance.'
-
-		act 'View dresses':gt 'shop_dolls', 'dress'
-		act 'View other outfits':gt 'shop_dolls', 'clothing'
-		act 'View shoes':gt 'shop_dolls', 'shoes'
-		act 'View purses':gt 'shop_dolls', 'purses'
-		!act 'Jewelery':gt 'shop_dolls', 'jewelry'
-		!act 'Piercings':gt 'shop_dolls', 'piecrings'
-
-		act 'Return': gt 'shop_dolls', 'start'
-	end
+	act 'Browse clothing': gt 'shop_dols', 'browse'
 !!here should be a list of clothing you can buy. shoes, jewelry, clothing, piecrings, etc. Just a list of things to buy and click it takes you to a page showing all the items for sale. Like how most shops are done.
 !!here should be a list of clothing you can buy. shoes, jewelry, clothing, piecrings, etc. Just a list of things to buy and click it takes you to a page showing all the items for sale. Like how most shops are done.
 
 
 	if doll_staff = 0:
 	if doll_staff = 0:
@@ -60,6 +45,24 @@ if $ARGS[0] = 'start':
 	act 'Leave': minut += 2 & gt 'city_island'
 	act 'Leave': minut += 2 & gt 'city_island'
 end
 end
 
 
+if $ARGS[0] = 'browse':
+	*clr & cla
+	'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/dollsshop.jpg"></center>'
+	''
+	'The store has a small front on a side street but one glance is all you need to tell this is not your average clothing store. Inside the store, shelves and racks of alternative clothes crammed into every available space - anybody setting out to find an inch of wall would have their work cut out for them. The checkout counter is near the entrance.'
+
+	act 'View dresses':gt 'shop_dolls', 'dress'
+	act 'View other outfits':gt 'shop_dolls', 'clothing'
+	act 'View shoes':gt 'shop_dolls', 'shoes'
+	act 'View purses':gt 'shop_dolls', 'purses'
+	!act 'Jewelery':gt 'shop_dolls', 'jewelry'
+	!act 'Piercings':gt 'shop_dolls', 'piecrings'
+
+	act 'Return': gt 'shop_dolls', 'start'
+end
+
+
 if $ARGS[0] = 'dress':
 if $ARGS[0] = 'dress':
 	$loc_arg = 'dress'
 	$loc_arg = 'dress'
 	$loc = 'shop_dolls'
 	$loc = 'shop_dolls'
@@ -76,7 +79,7 @@ if $ARGS[0] = 'dress':
 	act 'Return':
 	act 'Return':
 		cla
 		cla
 		minut += 5
 		minut += 5
-		gt 'shop_dolls', 'start'
+		gt 'shop_dolls', 'browse'
 	end
 	end
 
 
 	clothingfilter['qualitycheck'] = 7
 	clothingfilter['qualitycheck'] = 7
@@ -132,7 +135,7 @@ if $ARGS[0] = 'clothing':
 	act 'Return':
 	act 'Return':
 		cla
 		cla
 		minut += 5
 		minut += 5
-		gt 'shop_dolls', 'start'
+		gt 'shop_dolls', 'browse'
 	end
 	end
 
 
 	clothingfilter['qualitycheck'] = 7
 	clothingfilter['qualitycheck'] = 7
@@ -182,7 +185,7 @@ if $ARGS[0] = 'shoes':
 	act 'Return':
 	act 'Return':
 		cla
 		cla
 		minut += 5
 		minut += 5
-		gt 'shop_dolls', 'start'
+		gt 'shop_dolls', 'browse'
 	end
 	end
 
 
 	if Clothingstock > 11:
 	if Clothingstock > 11:
@@ -211,7 +214,7 @@ if $ARGS[0] = 'purses':
 	act 'Return':
 	act 'Return':
 		cla
 		cla
 		minut += 5
 		minut += 5
-		gt 'shop_dolls', 'start'
+		gt 'shop_dolls', 'browse'
 	end
 	end
 
 
 	i = 1
 	i = 1

+ 1 - 1
locations/shop_flamingos.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	*nl
 	*nl
 	'Flamingos is trendy and modern while still keeping the prices low enough for the large student population on the Island. It mimics the latest fashions for young adults but cuts costs on material and manufacturing. This suits the clients who are likely to grow bored of an outfit before it falls apart and that''s why its always busy.'
 	'Flamingos is trendy and modern while still keeping the prices low enough for the large student population on the Island. It mimics the latest fashions for young adults but cuts costs on material and manufacturing. This suits the clients who are likely to grow bored of an outfit before it falls apart and that''s why its always busy.'
 
 
-	act 'Leave the flamingos': minut += 3 & gt 'city_island'
+	act 'Leave the flamingos': minut += 3 & gt 'liames'
 	
 	
 	act 'View dresses': minut += 5 & gt 'shop_flamingos', 'dresses'
 	act 'View dresses': minut += 5 & gt 'shop_flamingos', 'dresses'
 
 

+ 3 - 3
locations/shop_tsar_bomba.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'dresses':
 		end
 		end
 
 
 		:loopbomba_dresses
 		:loopbomba_dresses
-			if dresses[i] = 0:
+			if bomba_dresses[i] = 0:
 				gs 'clothing_attributes', 'bomba_dresses', i
 				gs 'clothing_attributes', 'bomba_dresses', i
 				gs 'clothing_QV', 'shop_filter'
 				gs 'clothing_QV', 'shop_filter'
 
 
@@ -61,7 +61,7 @@ if $ARGS[0] = 'dresses':
 				end
 				end
 			end
 			end
 			i += 2
 			i += 2
-		if i <= 185:jump 'loopbomba_dresses'
+		if i <= 70:jump 'loopbomba_dresses'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dresses'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dresses'
 end
 end
 
 
@@ -110,7 +110,7 @@ if $ARGS[0] = 'clothes':
 				end
 				end
 			end
 			end
 			i += 2
 			i += 2
-		if i <= 185:jump 'loopbomba'
+		if i <= 50:jump 'loopbomba'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 end