Merge remote-tracking branch 'Gwen/master'

locations/_attributes_uniform.qsrc

@@ -2,101 +2,93 @@
 !
 !Quality range should be 2 to 5
 if ARGS[1] = 1:
-	CloQuality = 4
+	CloQuality = 2
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle2 = 1
+	CloStyle2 = 2
 elseif ARGS[1] = 2:
-	CloQuality = 5
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 6
+	CloQuality = 2
+	CloThinness = 1
+	CloTopCut = 1
+	CloSkirtShortness = 2
 	CloDress = 1
-	CloBimbo = 1
-	CloStyle2 = 1
+	CloStyle2 = 2
 elseif ARGS[1] = 3:
-	CloQuality = 4
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 6
-	CloBimbo = 1
-	CloStyle2 = 1
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 2
+	CloStyle2 = 2
 elseif ARGS[1] = 4:
-	CloQuality = 4
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 6
+	CloQuality = 2
+	CloThinness = 1
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloDress = 1
-	CloBimbo = 1
-	CloStyle2 = 1
+	CloStyle2 = 2
 elseif ARGS[1] = 5:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 4
+	CloQuality = 3
+	CloThinness = 1
+	CloTopCut = 1
 	CloSkirtShortness = 5
-	CloDress = 1
-	CloStyle2 = 1
+	CloStyle2 = 2
 elseif ARGS[1] = 6:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 6
-	CloBimbo = 1
-	CloStyle2 = 1
-elseif ARGS[1] = 7:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 3
+	CloQuality = 3
+	CloThinness = 1
+	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloBimbo = 1
 	CloStyle2 = 2
-elseif ARGS[1] = 8:
+elseif ARGS[1] = 7:
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPantsShortness = 1
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 3
+	CloDress = 1
 	CloStyle2 = 2
+elseif ARGS[1] = 8:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 4
+	CloStyle2 = 2
+	CloBimbo = 1
 elseif ARGS[1] = 9:
-	CloQuality = 4
-	CloThinness = 4
+	CloQuality = 2
+	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 4
-	CloDress = 1
+	CloPantsShortness = 1
 	CloStyle2 = 2
 elseif ARGS[1] = 10:
-	CloQuality = 3
+	CloQuality = 2
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
 elseif ARGS[1] = 11:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 2
-	CloDress = 1
-	CloStyle2 = 1
+	CloPantsShortness = 1
+	CloStyle2 = 2
 elseif ARGS[1] = 12:
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 2
-	CloDress = 1
-	CloStyle2 = 1
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+	CloStyle2 = 2
 elseif ARGS[1] = 13:
-	CloQuality = 2
-	CloThinness = 3
+	CloQuality = 3
+	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
 elseif ARGS[1] = 14:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 4
-	CloDress = 1
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
 	CloStyle2 = 2
 elseif ARGS[1] = 15:
 	CloQuality = 3
@@ -106,235 +98,329 @@ elseif ARGS[1] = 15:
 	CloStyle2 = 2
 elseif ARGS[1] = 16:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
 elseif ARGS[1] = 17:
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
 elseif ARGS[1] = 18:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 5
-	CloDress = 1
-	CloBimbo = 1
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 1
 	CloStyle2 = 1
-elseif ARGS[1] = 19:
-	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 3
-	CloSkirtShortness = 5
 	CloDress = 1
-	CloBimbo = 1
-	CloStyle2 = 1
-elseif ARGS[1] = 20:
+elseif ARGS[1] = 19:
 	CloQuality = 4
-	CloThinness = 2
+	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloDress = 1
 	CloStyle2 = 1
-elseif ARGS[1] = 21:
+	CloDress = 1
+elseif ARGS[1] = 20:
 	CloQuality = 3
-	CloThinness = 2
+	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloStyle2 = 1
 	CloDress = 1
+elseif ARGS[1] = 21:
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 1
+	CloDress = 1
+	CloBimbo = 1
 elseif ARGS[1] = 22:
 	CloQuality = 3
-	CloThinness = 1
+	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloDress = 1
 	CloStyle2 = 1
+	CloDress = 1
 elseif ARGS[1] = 23:
 	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 2
-	CloDress = 1
+	CloThinness = 2
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 1
+	CloDress = 1
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 2
-	CloDress = 1
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 1
+	CloDress = 1
 elseif ARGS[1] = 25:
-	CloQuality = 5
-	CloThinness = 2
-	CloBra = 1
-	CloPantsShortness = 5
-	CloStyle2 = 3
-elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 2
-	CloBra = 1
-	CloPanties = 1
-	CloStyle2 = 3
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloStyle2 = 1
+	CloDress = 1
+elseif ARGS[1] = 26:
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloStyle2 = 1
+	CloDress = 1
+	CloBimbo = 1
 elseif ARGS[1] = 27:
-	CloQuality = 3
-	CloThinness = 2
-	CloBra = 1
-	CloPanties = 1
-	CloStyle2 = 3
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloStyle2 = 1
+	CloDress = 1
 elseif ARGS[1] = 28:
-	CloQuality = 2
-	CloThinness = 2
-	CloBra = 1
-	CloSkirtShortness = 6
-	CloStyle2 = 3
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 5
+	CloStyle2 = 1
+	CloDress = 1
+	CloOnePiece = 1
+	CloBimbo = 1
 elseif ARGS[1] = 29:
 	CloQuality = 4
-	CloThinness = 2
-	CloBra = 1
-	CloSkirtShortness = 6
-	CloStyle2 = 3
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 5
+	CloStyle2 = 1
+	CloDress = 1
+	CloOnePiece = 1
+	CloBimbo = 1
 elseif ARGS[1] = 30:
 	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 4
-	CloPantsShortness = 5
-	CloStyle2 = 3
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloStyle2 = 1
+	CloDress = 1
 elseif ARGS[1] = 31:
-	CloQuality = 5
-	CloThinness = 5
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 3
 	CloPanties = 1
-	CloStyle2 = 3
+	CloStyle2 = 1
+	CloOnePiece = 1
+	CloBimbo = 1
 elseif ARGS[1] = 32:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
-	CloPantsShortness = 5
-	CloStyle2 = 3
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle2 = 1
+	CloBimbo = 1
 elseif ARGS[1] = 33:
-	CloQuality = 5
-	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 3
-	CloDress = 1
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 1
+	CloBimbo = 1
 elseif ARGS[1] = 34:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 4
-	CloDress = 1
+	CloTopCut = 4
+	CloPanties = 1
 	CloStyle2 = 1
+	CloBimbo = 1
 elseif ARGS[1] = 35:
-	CloQuality = 4
-	CloThinness = 4
+	CloQuality = 3
+	CloThinness = 5
 	CloTopCut = 3
-	CloSkirtShortness = 4
-	CloDress = 1
-	CloStyle2 = 1
+	CloStyle2 = 3
+	CloPanties = 1
+	CloOnePiece = 1
 elseif ARGS[1] = 36:
 	CloQuality = 3
-	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 4
-	CloStyle2 = 1
+	CloThinness = 4
+	CloTopCut = 3
+	CloStyle2 = 3
+	CloPanties = 1
+	CloOnePiece = 1
 elseif ARGS[1] = 37:
-	CloQuality = 5
-	CloThinness = 5
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 3
-	CloSkirtShortness = 4
-	CloDress = 1
-	CloStyle2 = 1
+	CloStyle2 = 3
+	CloPanties = 1
+	CloOnePiece = 1
 elseif ARGS[1] = 38:
 	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 4
-	CloBra = 1
-	CloPanties = 1
-	CloStyle2 = 1
+	CloThinness = 4
+	CloTopCut = 3
+	CloStyle2 = 3
+	CloSkirtShortness = 6
+	CloDress = 1
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
-	CloDress = 1
+	CloTopCut = 3
 	CloStyle2 = 3
+	CloPantsShortness = 6
 elseif ARGS[1] = 40:
-	CloQuality = 3
-	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 3
-	CloDress = 1
-	CloStyle2 = 2
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloStyle2 = 3
+	CloPantsShortness = 6
 elseif ARGS[1] = 41:
 	CloQuality = 3
-	CloThinness = 6
-	CloTopCut = 2
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
 	CloSkirtShortness = 6
-	CloDress = 1
-	CloBimbo = 1
-	CloStyle2 = 1
 elseif ARGS[1] = 42:
-	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 3
-	CloSkirtShortness = 4
-	CloDress = 1
-	CloStyle2 = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloSkirtShortness = 5
 elseif ARGS[1] = 43:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 6
-	CloDress = 1
+	CloStyle2 = 3	
+	CloBra = 1
+	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle2 = 1
 elseif ARGS[1] = 44:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 3
-	CloSkirtShortness = 5
-	CloDress = 1
-	CloStyle2 = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloTopCut = 2
+	CloPanties = 1
 elseif ARGS[1] = 45:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 5
+	CloStyle2 = 3	
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloDress = 1
-	CloStyle2 = 1
 elseif ARGS[1] = 46:
 	CloQuality = 4
-	CloThinness = 1
-	CloTopCut = 1
-	CloSkirtShortness = 3
-	CloStyle2 = 2
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloBimbo = 1
 elseif ARGS[1] = 47:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 4
-	CloDress = 1
-	CloStyle2 = 2
+	CloQuality = 4
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+	CloBimbo = 1
 elseif ARGS[1] = 48:
 	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 4
-	CloDress = 1
-	CloStyle2 = 1
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
 elseif ARGS[1] = 49:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+	CloBimbo = 1
+elseif ARGS[1] = 50:
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+	CloBimbo = 1
+elseif ARGS[1] = 51:
+	CloQuality = 3
+	CloThinness = 6
+	CloStyle2 = 3	
+	CloTopCut = 4
 	CloDress = 1
+	CloPanties = 1
+	CloOnePiece = 1
+	CloBimbo = 1
+elseif ARGS[1] = 52:
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 53:
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 54:
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 55:
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 56:
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 57:
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+	CloBimbo = 1
+elseif ARGS[1] = 58:
+	CloQuality = 4
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 59:
+	CloQuality = 3
+	CloThinness = 5
+	CloStyle2 = 3	
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 60:
+	CloQuality = 5
+	CloThinness = 5
+	CloStyle2 = 1
 	CloStyle2 = 2
+	CloStyle2 = 3	
+	CloBra = 1
+	CloSkirtShortness = 5
+	CloBimbo = 1
 end
 
+
 --- $attributes_uniform ---------------------------------
 

locations/budgetclothes.qsrc

@@ -247,7 +247,7 @@ if $ARGS[0] = 'uniform':
 				end
 			end
 			i += 3
-		if i <= 49:jump 'loopuniform'
+		if i <= 60:jump 'loopuniform'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
 end
 

locations/sportShop.qsrc

@@ -29,18 +29,19 @@ if $ARGS[0] = 'start':
 		gt 'sportshop', 'clo'
 	end
 
-	act 'View sports panties':
+	act 'View sports bras':
 		cla
 		minut += 5
-		gt 'sportshop', 'panties'
+		gt 'sportshop', 'bras'
 	end
 
-	act 'View sports bras':
+	
+	act 'View sports panties':
 		cla
 		minut += 5
-		gt 'sportshop', 'bras'
+		gt 'sportshop', 'panties'
 	end
-
+	
 	act 'View exercise shoes':
 		minut += 5
 		gt 'sportshop', 'trainers'
@@ -142,7 +143,7 @@ if $ARGS[0] = 'clo':
 				end
 			end
 			i += 3
-		if i <= 145:jump 'loopexercise'
+		if i <= 260:jump 'loopexercise'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 

locations/succubus.qsrc

@@ -558,7 +558,7 @@ if $args[0] = 'sucwalkinginit':
 	:loopexercise
 		if exercise[i] = 1 and exerciseS[i] = 0 and exerciseH[i] > 0: $succlolistn[x] = 'exercise' & succlolisti[x] = i & x += 1
 		i += 1
-	if i <= 113:jump 'loopexercise'
+	if i <= 260:jump 'loopexercise'
 
 	i = 1
 	:loopformal
@@ -574,7 +574,7 @@ if $args[0] = 'sucwalkinginit':
 			$succlolistn[x] = 'uniform' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 49:jump 'loopuniform'
+	if i <= 60:jump 'loopuniform'
 	killvar 'i'
 	x -= 1