1
0
Переглянути джерело

Fixed sorting bug in shops

astatine575 3 роки тому
батько
коміт
b8381bd4e1

+ 3 - 4
locations/NewCloShop.qsrc

@@ -149,12 +149,11 @@ if $ARGS[0] = 'dressingclothes':
 		gt 'NewCloShop', 'changingroom'
 	end
 
-	i = Clothingstock +1
-
-	if Clothingstock - 12 > 0:i -= 12
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		i = Clothingstock +1
+
+		if Clothingstock - 12 > 0:i -= 12
 
 		:loopexpensive2
 			if expensive[i] = 0:

+ 34 - 38
locations/budgetclothes.qsrc

@@ -109,19 +109,18 @@ if $ARGS[0] = 'clothes':
 		gt 'budgetclothes', 'start'
 	end
 
-	i = Clothingstock + 1
-
-	if Clothingstock - 18 > 0:
-		i -= 18
-	elseif Clothingstock - 12 > 0:
-		i -= 12
-	elseif Clothingstock - 6 > 0:
-		i -= 6
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
-	
+		i = Clothingstock + 1
+
+		if Clothingstock - 18 > 0:
+			i -= 18
+		elseif Clothingstock - 12 > 0:
+			i -= 12
+		elseif Clothingstock - 6 > 0:
+			i -= 6
+		end
+		
 		:loopcheap
 			if cheap[i] = 0:
 				gs 'clothing_attributes', 'cheap', i
@@ -172,17 +171,16 @@ if $ARGS[0] = 'office':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 3
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 1
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality2
-	
+		if Clothingstock > 15:
+			i = 3
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 1
+		end
+
 		:loopoffice
 			if office[i] = 0:
 				gs 'clothing_attributes', 'office', i
@@ -228,17 +226,16 @@ if $ARGS[0] = 'uniform':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality3
-	
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 3
+		end
+
 		:loopuniform
 			if uniform[i] = 0:
 				gs 'clothing_attributes', 'uniform', i
@@ -284,17 +281,16 @@ if $ARGS[0] = 'school':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality4
-	
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 3
+		end
+
 		:loopschool
 			if school[i] = 0:
 				gs 'clothing_attributes', 'school', i

+ 7 - 8
locations/dolls.qsrc

@@ -78,16 +78,15 @@ if $ARGS[0] = 'clothing':
 		gt 'dolls', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 3
-	else
-		i = 2
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 3
+		else
+			i = 2
+		end
 
 		:loopalt
 			if alternative[i] = 0:

+ 9 - 10
locations/exhibitionistshop.qsrc

@@ -59,18 +59,17 @@ if $ARGS[0] = 'clo':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	if Clothingstock >= 18:
-		i = 1
-	elseif Clothingstock >= 12:
-		i = 2
-	elseif Clothingstock >= 6:
-		i = 3
-	else
-		i = 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock >= 18:
+			i = 1
+		elseif Clothingstock >= 12:
+			i = 2
+		elseif Clothingstock >= 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopexhibit
 			if exhibit[i] = 0:

+ 5 - 6
locations/moncheri.qsrc

@@ -79,14 +79,13 @@ if $ARGS[0] = 'clothes':
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 11:
+			i = 1
+		else
+			i = 2
+		end
 
 		:loopformal
 			if formal[i] = 0:

+ 2 - 3
locations/pussykats_clothes.qsrc

@@ -16,13 +16,12 @@ if $ARGS[0] = 'start':
 		gt 'pussykats', 'start'
 	end
 
+	clothingfilter['qualitycheck'] = 7
+	:loopquality
 		i = Clothingstock + 1
 
 		if Clothingstock - 12 >= 0:i -= 12
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-
 		:loopaverage
 			if average[i] = 0:
 				gs 'clothing_attributes', 'average', i

+ 9 - 10
locations/scandalicious.qsrc

@@ -44,18 +44,17 @@ if $ARGS[0] = 'swim':
 		gt 'scandalicious', 'start'
 	end
 
-	if Clothingstock > 18:
-		i = 1
-	elseif Clothingstock > 12:
-		i = 2
-	elseif Clothingstock > 6:
-		i = 3
-	else
-		i = 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 18:
+			i = 1
+		elseif Clothingstock > 12:
+			i = 2
+		elseif Clothingstock > 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopbeach
 			if beach[i] = 0:

+ 13 - 14
locations/sexshop.qsrc

@@ -648,22 +648,21 @@ if $ARGS[0] = 'clo':
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	i = Clothingstock + 1
-
-	if Clothingstock > 20:
-		i -= 20
-	elseif Clothingstock > 16:
-		i -= 16
-	elseif Clothingstock > 12:
-		i -= 12
-	elseif Clothingstock > 8:
-		i -= 8
-	elseif Clothingstock > 4:
-		i -= 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		i = Clothingstock + 1
+
+		if Clothingstock > 20:
+			i -= 20
+		elseif Clothingstock > 16:
+			i -= 16
+		elseif Clothingstock > 12:
+			i -= 12
+		elseif Clothingstock > 8:
+			i -= 8
+		elseif Clothingstock > 4:
+			i -= 4
+		end
 
 		:loopfetish
 			if fetish[i] = 0:

+ 17 - 19
locations/sportShop.qsrc

@@ -121,16 +121,15 @@ if $ARGS[0] = 'clo':
 		gt 'sportshop', 'start'
 	end
 
-	if Clothingstock > 16:
-		i = 1
-	elseif Clothingstock > 8:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality2
+		if Clothingstock > 16:
+			i = 1
+		elseif Clothingstock > 8:
+			i = 2
+		else
+			i = 3
+		end
 
 		:loopexercise
 			if exercise[i] = 0:
@@ -186,19 +185,18 @@ if $ARGS[0] = 'swim':
 		gt 'sportshop', 'start'
 	end
 
-!!4 is in he supermarket, so skipped
-	if Clothingstock > 18:
-		i = 1
-	elseif Clothingstock > 12:
-		i = 2
-	elseif Clothingstock > 6:
-		i = 3
-	else
-		i = 8
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+	!!4 is in he supermarket, so skipped
+		if Clothingstock > 18:
+			i = 1
+		elseif Clothingstock > 12:
+			i = 2
+		elseif Clothingstock > 6:
+			i = 3
+		else
+			i = 8
+		end
 
 		:loopswim
 			if swimwear[i] = 0: