Browse Source

[changed] first files to centralize clothing totals, have to post so I can merge something else

Kevin_Smarts 4 months ago
parent
commit
9142187371

+ 7 - 1
locations/budgetclothes.qsrc

@@ -102,6 +102,7 @@ if $ARGS[0] = 'clothes':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_outfits'
 
 	act 'Return':
 		cla
@@ -133,7 +134,7 @@ if $ARGS[0] = 'clothes':
 			end
 			i += 3
 
-		if i <= 200:jump 'loopgm_outfits'
+		if i <= total:jump 'loopgm_outfits'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -166,6 +167,7 @@ if $ARGS[0] = 'dresses':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_dress'
 
 	act 'Return':
 		cla
@@ -231,6 +233,7 @@ if $ARGS[0] = 'office':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_office'
 
 	act 'Return':
 		cla
@@ -288,6 +291,7 @@ if $ARGS[0] = 'gm_maid':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_maid'
 
 	act 'Return':
 		cla
@@ -340,6 +344,7 @@ if $ARGS[0] = 'gm_server':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_outfits'
 
 	act 'Return':
 		cla
@@ -392,6 +397,7 @@ if $ARGS[0] = 'school':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_school'
 
 	act 'Return':
 		cla

+ 26 - 0
locations/clothing.qsrc

@@ -1,6 +1,32 @@
 # clothing
 !!2021/05/06
 
+if $ARGS[0] = 'totals':
+	!!sets the number of items in clothing sets
+	if $ARGS[1] = 'gm_outfits':
+		total = 200
+	elseif $ARGS[1] = 'gm_dress':
+		total = 300
+	elseif $ARGS[1] = 'gm_office':
+		total = 40
+	elseif $ARGS[1] = 'gm_maid':
+		total = 40
+	elseif $ARGS[1] = 'gm_server':
+		total = 30
+	elseif $ARGS[1] = 'gm_school':
+		total = 62
+	elseif $ARGS[1] = 'allure_swimsuit':
+		total = 100
+	elseif $ARGS[1] = 'allure_bikinis':
+		total = 140
+	elseif $ARGS[1] = 'coco_dress':
+		total = 300
+	elseif $ARGS[1] = 'coco_outfits':
+		total = 160
+	end
+end
+
+
 menu_off = 1
 
 $clothing_list_line = {

+ 2 - 0
locations/shop_allure.qsrc

@@ -53,6 +53,7 @@ if $ARGS[0] = 'swim':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'allure_swimsuit'
 
 	act 'Return':
 		cla
@@ -104,6 +105,7 @@ if $ARGS[0] = 'bikinis':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'allure_bikinis'
 
 	act 'Return':
 		cla

+ 2 - 0
locations/shop_coco_carmen.qsrc

@@ -39,6 +39,7 @@ if $ARGS[0] = 'dress':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'coco_dress'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 
@@ -100,6 +101,7 @@ if $ARGS[0] = 'outfits':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'coco_outfits'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 

+ 5 - 2
locations/wardrobe.qsrc

@@ -884,7 +884,7 @@ end
 
 if $ARGS[0] = 'default_sport_options':
 	if default_sport_number = 0:
-		'We have no default sports clothing set, you can set this in your wardrobe.'
+		'You have no default sports clothing set, you can set this in your wardrobe.'
 	else
 		!! checks to see if player is wearing the default sports set using default_sport_number[2]
 		default_sport_number[2] = 0
@@ -898,8 +898,11 @@ if $ARGS[0] = 'default_sport_options':
 		if $currentpursetype = $defpursetype[default_sport_number] and currentpursenumber = defpursenumber[default_sport_number]: default_sport_number[2] += 1
 		if $coatworntype = $defcoattype[default_sport_number] and coatwornnumber = defcoatnumber[default_sport_number]: default_sport_number[2] += 1
 
+		!! check to see if sports outfit is worn out
+		if dyneval('RESULT = <<$defclothingtype[default_sport_number]>>_h[<<defclothingnumber[default_sport_number]>>]') = 0:
+			act '<font color="red">Put on your sports clothes - unavailable as outfit is worn out</font>':
 		!! check to see that player is not wearing default sports outfit
-		if default_sport_number[2] ! 5:
+		elseif default_sport_number[2] ! 5:
 			act'Put on your sports clothes':
 				$lastwornclothingtype['sport'] = $clothingworntype
 				lastwornclothingnumber['sport'] = clothingwornnumber