Browse Source

[fixed] Starting swimwear for Cool and jock starts was using way too high numbers in sports shop from old list before they were split and teh sports wear the volleyball start had was too risqué. Also had repeating starting school uniforms in the clothing list.

Kevin_Smarts 2 years ago
parent
commit
2a483dcfb6
3 changed files with 16 additions and 14 deletions
  1. 3 1
      locations/clothing.qsrc
  2. 11 11
      locations/preCUST.qsrc
  3. 2 2
      locations/preSYS.qsrc

+ 3 - 1
locations/clothing.qsrc

@@ -409,7 +409,9 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
+		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
+		end
 
 		i = 1
 		:loopschool

+ 11 - 11
locations/preCUST.qsrc

@@ -571,14 +571,14 @@ if $ARGS[0] = 'Done':
 		sportsclothingnumber = 15
 		gs 'clothing', 'wear', 'gm_dress', 149
 	end
-	if swim_start = 98:
-		danilovich_swimsuit[98] = 1
-		danilovich_swimsuit_h[98] = 60
-		danilovich_swimsuit_b[98] = pcs_hips
-	elseif swim_start = 69:
-		danilovich_swimsuit[69] = 1
-		danilovich_swimsuit_h[69] = 60
-		danilovich_swimsuit_b[69] = pcs_hips
+	if swim_start = 99:
+		allure_swimsuit[99] = 1
+		allure_swimsuit_h[99] = 60
+		allure_swimsuit_b[99] = pcs_hips
+	elseif swim_start = 1:
+		danilovich_swimsuit[1] = 1
+		danilovich_swimsuit_h[1] = 60
+		danilovich_swimsuit_b[1] = pcs_hips
 	end
 	
 !!setting default danilovich outfit and setting coats
@@ -640,9 +640,9 @@ if $ARGS[0] = 'Done':
 			gm_school[17] = 1
 			gm_school_h[17] = 120
 			gm_school_b[17] = pcs_hips
-			danilovich_outfits[4] = 1
-			danilovich_outfits_h[4] = 100			
-			sportsclothingnumber = 4
+			danilovich_outfits[65] = 1
+			danilovich_outfits_h[65] = 100			
+			sportsclothingnumber = 65
 			danilovich_shoe[17] = 1
 			danilovich_shoe[21] = 0
 		end

+ 2 - 2
locations/preSYS.qsrc

@@ -849,7 +849,7 @@ if $ARGS[0] = 'jock':
 	pcs_makupskl = 30
 	pcs_heels = 20
 	pcs_inhib = 20
-	swim_start = 69
+	swim_start = 1
 	pirsC = 1
 	PirsC1_owned = 1
 	$currentpursetype = 'fashionista'
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'cool':
 	pcs_danc = 10
 	pcs_persuas = 30
 	pcs_inhib = 20
-	swim_start = 98
+	swim_start = 99
 	kosmetica = 20
 	shampoo = 20
 	stanok = 20