Преглед изворни кода

[fixed] Added a goto to stop repeat of same check that was creating a weird error and used a substitute for some long variable names in the default wear section

Kevin_Smarts пре 2 година
родитељ
комит
8fdd6744f9
1 измењених фајлова са 14 додато и 8 уклоњено
  1. 14 8
      locations/wardrobe.qsrc

+ 14 - 8
locations/wardrobe.qsrc

@@ -279,6 +279,8 @@ if $ARGS[0] = 'default':
 end
 
 if $ARGS[0] = 'default_template':
+	killvar '$temp1'
+	killvar 'temp2'
 	clothing_default_page = ARGS[1]
 	gs 'stat'
 	
@@ -427,11 +429,15 @@ if $ARGS[0] = 'default_entry_wear':
 	gs 'stat'
 	default_entry = ARGS[1]
 
-	gs 'clothing_attributes', $defclothingtype[default_entry], defclothingnumber[default_entry]
-	if ARRPOS('$CloLosTyp', $defclothingtype[default_entry]) ! -1 and ARRPOS('CloLosNum', defclothingnumber[default_entry]) ! -1:
+	$temp1 = $defclothingtype[default_entry]
+	temp2 = defclothingnumber[default_entry]
+
+	gs 'clothing_attributes', $temp1, temp2
+	if ARRPOS('$CloLosTyp', $temp1) ! -1 and ARRPOS('CloLosNum', temp2) ! -1:
 		msg '<center>You''ve lost part of this set, and are unable to wear all items.<br>Maybe you can find the missing clothes somewhere?</center>'
+		gt 'wardrobe', $wloc
 	else
-		gs 'clothing', 'wear', $defclothingtype[default_entry], defclothingnumber[default_entry]
+		gs 'clothing', 'wear', $temp1, temp2
 	end
 
 	if dyneval('RESULT = <<$defbratype[default_entry]>>_bras[<<defbranumber[default_entry]>>]') = 0:
@@ -478,19 +484,19 @@ if $ARGS[0] = 'default_entry_wear':
 	end
 
 	!! default school girl uniform is always allowed to be worn if still in school
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $defclothingtype[default_entry] = 'gm_school' and defclothingnumber[default_entry] = 6:
+	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $temp1 = 'gm_school' and temp2 = 6:
 		cls
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return': gt 'wardrobe', $wloc
 	!! do not own this clothing anymore
-	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>[<<defclothingnumber[default_entry]>>]') = 0 and defclothingnumber[default_entry] ! 0:
+	elseif dyneval('RESULT = <<$temp1>>[<<temp2>>]') = 0 and temp2 ! 0:
 		cls
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your <<$def_clothing_name[default_entry]>> outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
 		act 'Return': gt 'wardrobe', $wloc
 	!! strength of clothing is less than or equal to 0
-	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>_h[<<defclothingnumber[default_entry]>>]') <= 0:
+	elseif dyneval('RESULT = <<$temp1>>_h[<<temp2>>]') <= 0:
 		cls
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'Your <<$def_clothing_name[default_entry]>> outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
@@ -511,9 +517,9 @@ if $ARGS[0] = 'default_entry_wear':
 			act 'Return': gt 'wardrobe', $wloc
 		end
 	!! not exercise clothing, and not loose fitting
-	elseif $defclothingtype[default_entry] ! 'danilovich_outfits' and CloStyle ! 5:
+	elseif $temp1 ! 'danilovich_outfits' and CloStyle ! 5:
 		!! check for if the hipsize is too far from your hipsize
-		dynamic 'RESULT = <<$defclothingtype[default_entry]>>_b[<<defclothingnumber[default_entry]>>]'
+		dynamic 'RESULT = <<$temp1>>_b[<<temp2>>]'
 		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
 			cls
 			iif(RESULT < pcs_hips - 8,'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>','<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(1,4)>>.mp4"></video></center>')