Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/preCUST.qsrc

@@ -385,19 +385,19 @@ if $ARGS[0] = 'Done':
 	
 !!	Starting clothing set
 	if NTstart = 1:
-		cheap[161] = 1
-		cheapH[161] = 100
-		cheapB[161] = pcs_hips
+		gm_outfits[161] = 1
+		gm_outfitsH[161] = 100
+		gm_outfitsB[161] = pcs_hips
 		exercise[29] = 1
 		exerciseH[29] = 100
-		cheap[370] = 1
-		cheapH[370] = 100
-		cheapB[370] = pcs_hips
+		gm_dress[370] = 1
+		gm_dressH[370] = 100
+		gm_dressB[370] = pcs_hips
 		swimwear[3] = 1
 		swimwearH[3] = 60
 		swimwearB[3] = pcs_hips
 		sportsclothingnumber = 29
-		gs 'clothing', 'wear', 'cheap', 370
+		gs 'clothing', 'wear', 'gm_dress', 370
 	elseif goth_clothing = 1:
 		kats_panties[44] = 1
 		kats_bras[28] = 1
@@ -411,14 +411,14 @@ if $ARGS[0] = 'Done':
 		sgandm[43] = 1
 		shoewornnumber = 43
 		$shoeworntype = 'gandm'
-		average[70] = 1
-		averageH[70] = 100
-		averageB[70] = pcs_hips
-		cheap[60] = 1
-		cheapH[60] = 100
-		cheapB[60] = pcs_hips
+		bomba_outfits[16] = 1
+		bomba_outfitsH[16] = 100
+		bomba_outfitsB[16] = pcs_hips
+		bomba_outfits[37] = 1
+		bomba_outfitsH[37] = 100
+		bomba_outfitsB[37] = pcs_hips
 		sportsclothingnumber = 45
-		gs 'clothing', 'wear', 'average', 70
+		gs 'clothing', 'wear', 'bomba_outfits', 37
 	elseif $ARGS[1] = 'CSB':
 		cheap_panties[5] = 1
 		cheap_bras[12] = 1
@@ -432,138 +432,138 @@ if $ARGS[0] = 'Done':
 		sgandm[43] = 1
 		shoewornnumber = 43
 		$shoeworntype = 'gandm'
-		cheap[397] = 1
-		cheapH[397] = 100
-		cheapB[397] = pcs_hips
-		cheap[355] = 1
-		cheapH[355] = 100
-		cheapB[355] = pcs_hips
+		gm_outfits[7] = 1
+		gm_outfitsH[7] = 100
+		gm_outfitsB[7] = pcs_hips
+		gm_dress[12] = 1
+		gm_dressH[12] = 100
+		gm_dressB[12] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 355
+		gs 'clothing', 'wear', 'gm_dress', 12
 	elseif pcs_inhib < 5:
-		cheap[15] = 1
-		cheapH[15] = 100
-		cheapB[15] = pcs_hips
+		gm_outfits[7] = 1
+		gm_outfitsH[7] = 100
+		gm_outfitsB[7] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
-		cheap[36] = 1
-		cheapH[36] = 100
-		cheapB[36] = pcs_hips
+		gm_dress[12] = 1
+		gm_dressH[12] = 100
+		gm_dressB[12] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 15
+		gs 'clothing', 'wear', 'gm_dress', 12
 	elseif pcs_inhib < 10:
-		cheap[48] = 1
-		cheapH[48] = 100
-		cheapB[48] = pcs_hips
+		gm_outfits[15] = 1
+		gm_outfitsH[15] = 100
+		gm_outfitsB[15] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
-		cheap[83] = 1
-		cheapH[83] = 100
-		cheapB[83] = pcs_hips
+		gm_dress[4] = 1
+		gm_dressH[4] = 100
+		gm_dressB[4] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 48
+		gs 'clothing', 'wear', 'gm_dress', 4
 	elseif pcs_inhib < 15:
-		cheap[20] = 1
-		cheapH[20] = 100
-		cheapB[20] = pcs_hips
+		gm_outfits[58] = 1
+		gm_outfitsH[58] = 100
+		gm_outfitsB[58] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
-		cheap[70] = 1
-		cheapH[70] = 100
-		cheapB[70] = pcs_hips
+		gm_dress[7] = 1
+		gm_dressH[7] = 100
+		gm_dressB[7] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 20
+		gs 'clothing', 'wear', 'gm_dress', 7
 	elseif pcs_inhib < 20:
-		cheap[32] = 1
-		cheapH[32] = 100
-		cheapB[32] = pcs_hips
+		gm_outfits[55] = 1
+		gm_outfitsH[55] = 100
+		gm_outfitsB[55] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
-		cheap[62] = 1
-		cheapH[62] = 100
-		cheapB[62] = pcs_hips
+		gm_dress[7] = 1
+		gm_dressH[7] = 100
+		gm_dressB[7] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 32
+		gs 'clothing', 'wear', 'gm_dress', 7
 	elseif pcs_inhib < 25:
-		cheap[4] = 1
-		cheapH[4] = 100
-		cheapB[4] = pcs_hips
+		gm_outfits[58] = 1
+		gm_outfitsH[58] = 100
+		gm_outfitsB[58] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
-		cheap[41] = 1
-		cheapH[41] = 100
-		cheapB[41] = pcs_hips
+		gm_dress[39] = 1
+		gm_dressH[39] = 100
+		gm_dressB[39] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 41
+		gs 'clothing', 'wear', 'gm_dress', 39
 	elseif pcs_inhib < 30:
-		cheap[50] = 1
-		cheapH[50] = 100
-		cheapB[50] = pcs_hips
+		gm_outfits[91] = 1
+		gm_outfitsH[91] = 100
+		gm_outfitsB[91] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
-		cheap[81] = 1
-		cheapH[81] = 100
-		cheapB[81] = pcs_hips
+		gm_dress[57] = 1
+		gm_dressH[57] = 100
+		gm_dressB[57] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 50
+		gs 'clothing', 'wear', 'gm_dress', 57
 	elseif pcs_inhib < 35:
-		cheap[82] = 1
-		cheapH[82] = 100
-		cheapB[82] = pcs_hips
+		gm_outfits[95] = 1
+		gm_outfitsH[95] = 100
+		gm_outfitsB[95] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
-		cheap[43] = 1
-		cheapH[43] = 100
-		cheapB[43] = pcs_hips
+		gm_dress[63] = 1
+		gm_dressH[63] = 100
+		gm_dressB[63] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 43
+		gs 'clothing', 'wear', 'gm_dress', 63
 	elseif pcs_inhib < 40:
-		cheap[43] = 1
-		cheapH[43] = 100
-		cheapB[43] = pcs_hips
+		gm_outfits[124] = 1
+		gm_outfitsH[124] = 100
+		gm_outfitsB[124] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
-		cheap[73] = 1
-		cheapH[73] = 100
-		cheapB[73] = pcs_hips
+		gm_dress[89] = 1
+		gm_dressH[89] = 100
+		gm_dressB[89] = pcs_hips
 		sportsclothingnumber = 4
-		gs 'clothing', 'wear', 'cheap', 43
+		gs 'clothing', 'wear', 'gm_dress', 89
 	elseif pcs_inhib < 45:
-		cheap[226] = 1
-		cheapH[226] = 100
-		cheapB[226] = pcs_hips
+		gm_outfits[131] = 1
+		gm_outfitsH[131] = 100
+		gm_outfitsB[131] = pcs_hips
 		exercise[95] = 1
 		exerciseH[95] = 100
-		cheap[236] = 1
-		cheapH[236] = 100
-		cheapB[236] = pcs_hips
+		gm_dress[109] = 1
+		gm_dressH[109] = 100
+		gm_dressB[109] = pcs_hips
 		sportsclothingnumber = 95
-		gs 'clothing', 'wear', 'cheap', 226
+		gs 'clothing', 'wear', 'gm_dress', 109
 	elseif pcs_inhib < 50:
-		cheap[292] = 1
-		cheapH[292] = 100
-		cheapB[292] = pcs_hips
+		gm_outfits[145] = 1
+		gm_outfitsH[145] = 100
+		gm_outfitsB[145] = pcs_hips
 		exercise[94] = 1
 		exerciseH[94] = 100
-		cheap[148] = 1
-		cheapH[148] = 100
-		cheapB[148] = pcs_hips
+		gm_dress[123] = 1
+		gm_dressH[123] = 100
+		gm_dressB[123] = pcs_hips
 		sportsclothingnumber = 94
-		gs 'clothing', 'wear', 'cheap', 148
+		gs 'clothing', 'wear', 'gm_dress', 123
 	else
-		cheap[118] = 1
-		cheapH[118] = 100
-		cheapB[118] = pcs_hips
+		gm_outfits[149] = 1
+		gm_outfitsH[149] = 100
+		gm_outfitsB[149] = pcs_hips
 		exercise[58] = 1
 		exerciseH[58] = 100
-		cheap[136] = 1
-		cheapH[136] = 100
-		cheapB[136] = pcs_hips
+		gm_dress[149] = 1
+		gm_dressH[149] = 100
+		gm_dressB[149] = pcs_hips
 		swimwear[24] = 1
 		swimwearH[24] = 60
 		swimwearB[24] = pcs_hips
 		sportsclothingnumber = 58
-		gs 'clothing', 'wear', 'cheap', 118
+		gs 'clothing', 'wear', 'gm_dress', 149
 	end
 	if swim_start = 58:
 		swimwear[58] = 1
@@ -582,9 +582,9 @@ if $ARGS[0] = 'Done':
 !!setting default exercise outfit and setting coats
 	if school_clothing = 1:
 		killvar 'school_clothing'
-		alternative[55] = 1
-		alternativeH[55] = 120
-		alternativeB[55] = pcs_hips
+		bomba_outift[29] = 1
+		bomba_outiftH[29] = 120
+		bomba_outiftB[29] = pcs_hips
 		sportspantynumber = 44
 		sportsbranumber = 28
 		$sportsbratype = 'kats'
@@ -616,9 +616,9 @@ if $ARGS[0] = 'Done':
 			schoolH[63] = 120
 			schoolB[63] = pcs_hips
 		elseif school_clothing = 4:
-			alternative[19] = 1
-			alternativeH[19] = 120
-			alternativeB[19] = pcs_hips
+			dolls_dress[40] = 1
+			dolls_dressH[40] = 120
+			dolls_dressB[40] = pcs_hips
 		elseif school_clothing = 5:
 			school[25] = 1
 			schoolH[25] = 120