Pārlūkot izejas kodu

[fixed] makeup routines: sometimes not clearing font color prefix

LinaHirata 7 mēneši atpakaļ
vecāks
revīzija
76b9a96742
1 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 3 2
      locations/mirror.qsrc

+ 3 - 2
locations/mirror.qsrc

@@ -485,6 +485,7 @@ if $ARGS[0] = 'routine_description':
 	*nl 'Make-up routine <<ARGS[1]>> is called <font color="#268bd2"><<$makeup[''routine_<<ARGS[1]>>_name'']>></font> and consists of:'
 	*nl
 	if makeup['routine_<<ARGS[1]>>_makeup'] > 0:
+		killvar '$temp_prefix' & killvar '$temp_postfix'
 		if $ARGS[2] = '' and pcs_makeup < makeup['routine_<<ARGS[1]>>_makeup'] + 1:
 			if mc_inventory['cosmetics'] >= min(makeup['routine_<<ARGS[1]>>_makeup'], 3):
 				$temp_prefix = '<font color="#E5C07B">'
@@ -505,8 +506,8 @@ if $ARGS[0] = 'routine_description':
 		end
 	end
 	if makeup['routine_<<ARGS[1]>>_lipbalm'] > 0:
+		killvar '$temp_prefix' & killvar '$temp_postfix'
 		if $ARGS[2] = '' and pcs_lipbalm < makeup['routine_<<ARGS[1]>>_lipbalm']:
-			killvar '$temp_prefix' & killvar '$temp_postfix'
 			if mc_inventory['lipbalm'] > 0:
 				$temp_prefix = '<font color="#E5C07B">'
 				$temp_postfix = ' - Not applied</font>'
@@ -518,8 +519,8 @@ if $ARGS[0] = 'routine_description':
 		' <<$temp_prefix>>Lipbalm<<$temp_postfix>>'
 	end
 	if makeup['routine_<<ARGS[1]>>_lashes'] > 0:
+		killvar '$temp_prefix' & killvar '$temp_postfix'
 		if $ARGS[2] = '' and lashextensionstyle <= 0 and pcs_lashes < makeup['routine_<<ARGS[1]>>_lashes'] + 2:
-			killvar '$temp_prefix' & killvar '$temp_postfix'
 			if (makeup['routine_<<ARGS[1]>>_lashes'] = 1 and mc_inventory['eyelash_fake'] >= 1) or (makeup['routine_<<ARGS[1]>>_lashes'] = 2 and mc_inventory['eyelash_mink'] >= 1):
 				$temp_prefix = '<font color="#E5C07B">'
 				$temp_postfix = ' - Not applied</font>'