[changed] more `mirror` stuff

locations/mirror.qsrc

@@ -385,7 +385,8 @@ end
 
 !! --- start ---
 
-
+!! for now keeping this monstrosity here for reference
+! mid($routine4,1,1), mid($routine4,2,1), mid($routine4,3,1)
 if $ARGS[0] = 'routine_manage':
 	cls & cla
 	*nl
@@ -431,6 +432,7 @@ if $ARGS[0] = 'routine_manage':
 	end
 
 	if $makeup_routine['1'] ! '':
+		gs 'mirror', 'routine_description', 1, 'no_color'
 		act 'Remove <<$makeup_routine[''1_name'']>>':
 			gs 'shortgs', 'remove_array_element', 'makeup_routine', '1'
 			gs 'shortgs', 'remove_array_element', 'makeup_routine', '1_name'
@@ -442,6 +444,7 @@ if $ARGS[0] = 'routine_manage':
 		end
 	end
 	if $makeup_routine['2'] ! '':
+		gs 'mirror', 'routine_description', 2, 'no_color'
 		act 'Remove <<$makeup_routine[''2_name'']>>':
 			gs 'shortgs', 'remove_array_element', 'makeup_routine', '2'
 			gs 'shortgs', 'remove_array_element', 'makeup_routine', '2_name'
@@ -453,6 +456,7 @@ if $ARGS[0] = 'routine_manage':
 		end
 	end
 	if $makeup_routine['3'] ! '':
+		gs 'mirror', 'routine_description', 3, 'no_color'
 		act 'Remove <<$makeup_routine[''3_name'']>>':
 			gs 'shortgs', 'remove_array_element', 'makeup_routine', '3'
 			gs 'shortgs', 'remove_array_element', 'makeup_routine', '3_name'
@@ -464,6 +468,7 @@ if $ARGS[0] = 'routine_manage':
 		end
 	end
 	if $makeup_routine['4'] ! '':
+		gs 'mirror', 'routine_description', 4, 'no_color'
 		act 'Remove <<$makeup_routine[''4_name'']>>':
 			gs 'shortgs', 'remove_array_element', 'makeup_routine', '4'
 			gs 'shortgs', 'remove_array_element', 'makeup_routine', '4_name'
@@ -480,7 +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:
-		if pcs_makeup < makeup_routine['<<ARGS[1]>>_makeup'] + 1:
+		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">'
 				$temp_postfix = ' - Not applied</font>'
@@ -499,9 +504,9 @@ if $ARGS[0] = 'routine_description':
 			' <<$temp_prefix>>Bimbo make-up<<$temp_postfix>>'
 		end
 	end
-	killvar '$temp_prefix' & killvar '$temp_postfix'
 	if makeup_routine['<<ARGS[1]>>_lipbalm'] > 0:
-		if pcs_lipbalm < makeup_routine['<<ARGS[1]>>_lipbalm']:
+		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>'
@@ -512,9 +517,9 @@ if $ARGS[0] = 'routine_description':
 		end
 		' <<$temp_prefix>>Lipbalm<<$temp_postfix>>'
 	end
-	killvar '$temp_prefix' & killvar '$temp_postfix'
 	if makeup_routine['<<ARGS[1]>>_lashes'] > 0:
-		if lashextensionstyle <= 0 and pcs_lashes < makeup_routine['<<ARGS[1]>>_lashes'] + 2:
+		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>'
@@ -524,9 +529,9 @@ if $ARGS[0] = 'routine_description':
 			end
 		end
 		if makeup_routine['<<ARGS[1]>>_lashes'] = 1:
-			' <<$temp_prefix>>Normal fake lashes<<$temp_postfix>>'
+			' <<$temp_prefix>>False lashes<<$temp_postfix>>'
 		elseif makeup_routine['<<ARGS[1]>>_lashes'] = 2:
-			' <<$temp_prefix>>Mink fake lashes<<$temp_postfix>>'
+			' <<$temp_prefix>>Mink false lashes<<$temp_postfix>>'
 		end
 	end
 	killvar '$temp_prefix' & killvar '$temp_postfix'
@@ -534,27 +539,27 @@ end
 
 if $ARGS[0] = 'routine_check':
 	if (makeup_routine['<<ARGS[1]>>_makeup'] > 0 and pcs_makeup < makeup_routine['<<ARGS[1]>>_makeup'] + 1 and mc_inventory['cosmetics'] >= min(makeup_routine['<<ARGS[1]>>_makeup'], 3)) or (makeup_routine['<<ARGS[1]>>_lipbalm'] > 0 and pcs_lipbalm < makeup_routine['<<ARGS[1]>>_lipbalm'] and mc_inventory['lipbalm'] > 0) or (makeup_routine['<<ARGS[1]>>_lashes'] > 0 and lashextensionstyle <= 0 and pcs_lashes < makeup_routine['<<ARGS[1]>>_lashes'] + 2 and ((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))): result = 1
-! {
-makeup_routine['<<ARGS[1]>>_makeup'] > 0 and
-pcs_makeup < makeup_routine['<<ARGS[1]>>_makeup'] + 1 and
-mc_inventory['cosmetics'] >= min(makeup_routine['<<ARGS[1]>>_makeup'], 3)
-
-makeup_routine['<<ARGS[1]>>_lipbalm'] > 0 and
-pcs_lipbalm < makeup_routine['<<ARGS[1]>>_lipbalm'] and
-mc_inventory['lipbalm'] > 0
-
-makeup_routine['<<ARGS[1]>>_lashes'] > 0 and
-lashextensionstyle <= 0 and
-pcs_lashes < makeup_routine['<<ARGS[1]>>_lashes'] + 2 and
-((
-	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
-))
-}
 end
+! if $ARGS[0] = 'routine_check': {
+	makeup_routine['<<ARGS[1]>>_makeup'] > 0 and
+	pcs_makeup < makeup_routine['<<ARGS[1]>>_makeup'] + 1 and
+	mc_inventory['cosmetics'] >= min(makeup_routine['<<ARGS[1]>>_makeup'], 3)
+
+	makeup_routine['<<ARGS[1]>>_lipbalm'] > 0 and
+	pcs_lipbalm < makeup_routine['<<ARGS[1]>>_lipbalm'] and
+	mc_inventory['lipbalm'] > 0
+
+	makeup_routine['<<ARGS[1]>>_lashes'] > 0 and
+	lashextensionstyle <= 0 and
+	pcs_lashes < makeup_routine['<<ARGS[1]>>_lashes'] + 2 and
+	((
+		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
+	))
+}
 
 if $ARGS[0] = 'steam':
 	menu_off = 1
@@ -608,6 +613,7 @@ if $ARGS[0] = 'brush':
 end
 
 if $ARGS[0] = 'works':
+	'<center><img <<$set_imgh>> src="images/pc/activities/makeup_1.jpg"></center>'
 	if pcs_makeup = 0: pcs_makeup = pcs_makeup['base']
 	if ARGS[1] > 0 and pcs_makeup < ARGS[1] + 1:
 		if mc_inventory['cosmetics'] <= 0:
@@ -756,7 +762,6 @@ end
 if $ARGS[0] = 'kosmetitka_fix':
 	*clr & cla
 	'<center><h1>Compact Mirror</h1></center>'
-!	'<center><img <<$set_imgh>> src="/images/pc/items/mirror_compact.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 	mc_inventory['makeup_wipes'] -= 1
 	gs 'exp_gain', 'makupskl', rand(1,3)