Merge remote-tracking branch 'Felix/master'

locations/korr2x.qsrc

@@ -229,7 +229,7 @@ $drPP = {
 						act 'Roll over':
 							*clr & cla
 							minut += 10
-							sick - 2
+							sick -= 2
 							mc_inventory['antibiotics'] += 3
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp5.jpg"></center>'

locations/mirror.qsrc

@@ -1,14 +1,16 @@
 # mirror
 
-
 if $ARGS[0] = 'start':
 	menu_off = 1
 	*clr & cla
 	$mirrorloc = 'mirror'
 	gs 'stat' &! It should be here, because some of the strigs have to be initialized
 	!! first of all we have to check whether we can use the mirror
-	if mirror_steam ! hour: mirror_steam = 100
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' and mirror_steam = hour: gt'mirror','steam'
+	if mirror_steam = hour and ($loc = 'vanrPar' or $loc = 'vanr' or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr'):
+		gt 'mirror', 'steam'
+	else
+		mirror_steam = 100
+	end
 
 	$makeupLight =   '<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>&nbsp;<br>You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
 	$makeupNatural = '<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>&nbsp;<br>You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
@@ -26,7 +28,7 @@ if $ARGS[0] = 'start':
 			$serv['avatar']='<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 		end
 		! ----- hair
-		
+
 		if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
 
 		!!!!!!!! Maruda Hair Mod
@@ -85,15 +87,15 @@ if $ARGS[0] = 'start':
 			$serv['minklashes']='<a href="exec: cla & gs ''mirror'',''applyLashesmink'' & act ''View results'':gt ''mirror'', ''start''"><img src="images/system/icons/action/minklashes.png"></a>'
 		end
 		! ----- make up
-		if pcs_makeup = 1 and mc_inventory['cosmetics'] > 0:
-		$serv4="
+		if pcs_makeup = pcs_makeup['base'] and mc_inventory['cosmetics'] > 0:
+			$serv4="
 				*clr & cla
 				'<center><img <<$set_imgh>> src=""images/pc/activities/routine/1.jpg""></center>'
 				'You consider for a moment which look you want to go for.'
 				*nl
 				act 'Change your mind': gt 'mirror', 'start'
 
-				if mc_inventory['cosmetics'] > 0:
+				if pcs_makeup < 2 and mc_inventory['cosmetics'] > 0:
 					act 'Light make-up':
 						*clr & cla
 						minut += 3
@@ -105,7 +107,7 @@ if $ARGS[0] = 'start':
 					end
 				end
 
-				if mc_inventory['cosmetics'] > 1:
+				if pcs_makeup < 3 and mc_inventory['cosmetics'] > 1:
 					act 'Vibrant make-up':
 						*clr & cla
 						minut += 5
@@ -118,28 +120,33 @@ if $ARGS[0] = 'start':
 				end
 
 				if mc_inventory['cosmetics'] > 2:
-					act 'Thick make-up':
-						*clr & cla
-						minut += 10
-						gs 'exp_gain', 'makupskl', rand(1,3)
-						mc_inventory['cosmetics'] -= 3
-						vidageday -= 1
-						pcs_makeup = 4
-						'<<$makeupHeavy>>'
-						act 'Continue': gt 'mirror', 'start'
+					if pcs_makeup < 4:
+						act 'Thick make-up':
+							*clr & cla
+							minut += 10
+							gs 'exp_gain', 'makupskl', rand(1,3)
+							mc_inventory['cosmetics'] -= 3
+							vidageday -= 1
+							pcs_makeup = 4
+							'<<$makeupHeavy>>'
+							act 'Continue': gt 'mirror', 'start'
+						end
 					end
 
-					act 'Bimbo make-up':
-						*clr & cla
-						minut += 10
-						gs 'exp_gain', 'makupskl', rand(1,3)
-						mc_inventory['cosmetics'] -= 3
-						vidageday -= 1
-						pcs_makeup = 6
-						'<<$makeupBimbo>>'
-						act 'Continue': gt 'mirror', 'start'
+					if pcs_makeup < 6:
+						act 'Bimbo make-up':
+							*clr & cla
+							minut += 10
+							gs 'exp_gain', 'makupskl', rand(1,3)
+							mc_inventory['cosmetics'] -= 3
+							vidageday -= 1
+							pcs_makeup = 6
+							'<<$makeupBimbo>>'
+							act 'Continue': gt 'mirror', 'start'
+						end
 					end
-				end"
+				end
+			"
 			$serv['makeup']='<a href="exec: dynamic $serv4"><img src="images/system/icons/action/makeup.png"></a>'
 		end
 
@@ -156,9 +163,9 @@ if $ARGS[0] = 'start':
 		end
 		'<<$pcs_apprnc>>'
 		'<<$hair>>'
-		'<<$pcs_makeup>>. Your<<$pc_desc[''eye size'']>> eyes are <<$pc_desc[''eye colour'']>> <<$pc_desc[''eyelashes'']>>.'
+		'<<$pcs_makeup>>. Your ' + iif(pcs_eyesize > 1, '<<$pc_desc[''eye size'']>> ', '') + 'eyes are <<$pc_desc[''eye colour'']>> <<$pcs_lashes>>.'
 		if glass > 0: 'You are wearing <<$pc_descWordy[''vision'']>>.'
-		'You have <<$pcs_lipbalm>>  <<$pc_desc[''lip size'']>> lips.'
+		'You have <<$pcs_lipbalm>> <<$pc_desc[''lip size'']>> lips.'
 		'<<$skin>>'
 
 		!########## hair additional desc ##########
@@ -190,11 +197,12 @@ if $ARGS[0] = 'start':
 				'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
 			end
 		end
+		'<<$pcs_apprnc>>'
 		'<<$hair>>'
-		'<<$pcs_makeup>>. Your <<$pc_desc[''eye size'']>> eyes are <<$pc_desc[''eye colour'']>> <<$pcs_lashes>>.' + iif($pc_descWordy['vision'] = '','','<<$pc_descWordy[''vision'']>>.')
+		'<<$pcs_makeup>>. Your ' + iif(pcs_eyesize > 1, '<<$pc_desc[''eye size'']>> ', '') + 'eyes are <<$pc_desc[''eye colour'']>> <<$pcs_lashes>>.'
+		if glass > 0: 'You are wearing <<$pc_descWordy[''vision'']>>.'
 		'You have <<$pcs_lipbalm>> <<$pc_desc[''lip size'']>> lips.'
 		'<<$skin>>'
-		'<<$pcs_apprnc>>'
 
 		if curly > 0 and defcurly = 0: '<br>Your curly hair will last for another <<curly>> days.'
 		if straight > 0 and defcurly = 1: '<br>Your straightened hair will last for another <<straight>> days.'
@@ -203,7 +211,7 @@ if $ARGS[0] = 'start':
 			if dyefade > 0 and dyefade < 7: '<br>Your hair dye is beginning to fade and your roots are showing.'
 			if dyefade = 0: '<br>Your hair dye has faded and looks terrible.'
 		end
-		
+
 		if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
 
 		!!!!!!!! Maruda Hair Mod
@@ -236,70 +244,18 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if mc_inventory['cosmetics'] > 0: *nl 'Cosmetics: <<mc_inventory[''cosmetics'']>>' else *nl 'You have no makeup.'
+	if mc_inventory['cosmetics'] > 0: *nl 'Cosmetics: <<mc_inventory[''cosmetics'']>>' else *nl 'You have no cosmetics.'
 	if mc_inventory['lipbalm'] > 0: *pl ' | Lip gloss: <<mc_inventory[''lipbalm'']>>' else *pl ' You have no lip gloss left.'
 	if mc_inventory['eyelash_fake'] > 0: *nl 'False lashes: <<mc_inventory[''eyelash_fake'']>>' else *nl 'You have no false lashes left.'
 	if mc_inventory['eyelash_mink'] > 0: *pl ' | Mink lashes: <<mc_inventory[''eyelash_mink'']>>' else *pl ' You have no mink lashes left.'
-	*nl
-	
-	! WD: Cheat Unused ~ 'AutoHapri'
-	if pcs_hairbsh < 1 and AutoHapri = 1:
-		minut += 3
-		pcs_hairbsh = 1
-		'<center><img <<$set_imgh>> src="images/pc/activities/routine/3.jpg"></center>'
-		'You brush your hair.'
-	end
-
-	!! WD: Cheat Unused ~ 'AutoMakeup'
-	if pcs_makeup = 1 and mc_inventory['cosmetics'] > 0 and AutoMakeup = 1:
-		pcs_makeup = AutoMakeupType
-		gs 'exp_gain', 'makupskl', rand(1,3)
-		if mc_inventory['cosmetics'] < 3 and pcs_makeup = 4:pcs_makeup = 3
-		if mc_inventory['cosmetics'] < 2 and pcs_makeup = 3:pcs_makeup = 2
-		if mc_inventory['cosmetics'] < 1 and pcs_makeup ! 1:
-			pcs_makeup = 1
-			'You have no make-up left.'
-		else
-			if pcs_makeup = 2:
-				*clr
-				*pl $makeupLight
-				minut -= 3
-				mc_inventory['cosmetics'] -= 1
-			end
-
-			if pcs_makeup = 3:
-				*pl $makeupNatural
-				minut -= 5
-				mc_inventory['cosmetics'] -= 2
-			end
-
-			if pcs_makeup = 4:
-				*pl $makeupHeavy
-				minut -= 10
-				vidageday -= 1
-				mc_inventory['cosmetics'] -= 3
-			end
-
-			if pcs_makeup = 6:
-				*pl $makeupBimbo
-				minut -= 10
-				vidageday -= 1
-				mc_inventory['cosmetics'] -= 3
-			end
-		end
-	end
 
-	*nl
-	if mc_inventory['umbrella'] = 0: 'WARNING: Makeup will run in the rain unless you buy an umbrella.'
+	if mc_inventory['umbrella'] = 0: *nl 'WARNING: Makeup will get ruined by the rain unless you buy an umbrella.'
 
-	act 'Move away from the mirror':gt 'mirror','fin'
+	act 'Move away from the mirror': gt 'mirror','fin'
 
 	if pcs_hairbsh < 1: act 'Brush your hair': xgt 'mirror', 'brush'
 
-	! WD: Cheat Unused ~ 'AutoLipBalm'
-
-	!! Added the makeup setting.
-	if pcs_makeup = 1 and mc_inventory['cosmetics'] > 0:
+	if pcs_makeup = pcs_makeup['base'] and mc_inventory['cosmetics'] > 0:
 		act 'Apply makeup':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/activities/routine/1.jpg"></center>'
@@ -307,7 +263,7 @@ if $ARGS[0] = 'start':
 			*nl
 			act 'Change your mind': gt 'mirror', 'start'
 
-			if mc_inventory['cosmetics'] > 0:
+			if pcs_makeup < 2 and mc_inventory['cosmetics'] > 0:
 				act 'Light make-up':
 					*clr & cla
 					minut += 3
@@ -319,7 +275,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 
-			if mc_inventory['cosmetics'] > 1:
+			if pcs_makeup < 3 and mc_inventory['cosmetics'] > 1:
 				act 'Vibrant make-up':
 					*clr & cla
 					minut += 5
@@ -332,36 +288,37 @@ if $ARGS[0] = 'start':
 			end
 
 			if mc_inventory['cosmetics'] > 2:
-				act 'Thick make-up':
-					*clr & cla
-					minut += 10
-					gs 'exp_gain', 'makupskl', rand(1,3)
-					mc_inventory['cosmetics'] -= 3
-					vidageday -= 1
-					pcs_makeup = 4
-					'<<$makeupHeavy>>'
-					act 'Continue': gt 'mirror', 'start'
+				if pcs_makeup < 4:
+					act 'Thick make-up':
+						*clr & cla
+						minut += 10
+						gs 'exp_gain', 'makupskl', rand(1,3)
+						mc_inventory['cosmetics'] -= 3
+						vidageday -= 1
+						pcs_makeup = 4
+						'<<$makeupHeavy>>'
+						act 'Continue': gt 'mirror', 'start'
+					end
 				end
-			end
 
-			if mc_inventory['cosmetics'] > 2:
-				act 'Bimbo make-up':
-					*clr & cla
-					minut += 10
-					gs 'exp_gain', 'makupskl', rand(1,3)
-					mc_inventory['cosmetics'] -= 3
-					vidageday -= 1
-					pcs_makeup = 6
-					'<<$makeupBimbo>>'
-					act 'Continue': gt 'mirror', 'start'
+				if pcs_makeup < 6:
+					act 'Bimbo make-up':
+						*clr & cla
+						minut += 10
+						gs 'exp_gain', 'makupskl', rand(1,3)
+						mc_inventory['cosmetics'] -= 3
+						vidageday -= 1
+						pcs_makeup = 6
+						'<<$makeupBimbo>>'
+						act 'Continue': gt 'mirror', 'start'
+					end
 				end
 			end
 		end
 	elseif mc_inventory['cosmetics'] <= 0:
-		'You don''t have any makeup to apply.'
+		'You don''t have any cosmetics to apply.'
 	end
 
-	if AutoLipBalm = 1:	gs 'mirror','applyLipbalm'
 	if mc_inventory['lipbalm']  > 0 and pcs_lipbalm <= 0:
 		act 'Apply lip balm':
 			cla
@@ -386,201 +343,222 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-!	if (pcs_makeup <= 1 and mc_inventory['cosmetics'] > 0) or (lipbalm > 0 and pcs_lipbalm <= 0 and pcs_hairbsh = 0):
-!		act 'Do the works': gt 'mirror', 'works'
-!	end
-	act 'Manage your custom make-up routines': dynamic $createcustroutine
-	!!New makeup setting
-	!!This imforms the person what makeup they have pre selected
-	!! 0 - none, 1 - light, 2 - moderate, 3 - heavy
-
-!	'Select level for auto make-up: <a href="exec:makeupSetting = 0 & gt ''mirror'', ''start''">none</a>, <a href="exec:makeupSetting = 1 & gt ''mirror'', ''start''">light</a>, <a href="exec:makeupSetting = 2 & gt ''mirror'', ''start''">vibrant</a>, <a href="exec:makeupSetting = 3 & gt ''mirror'', ''start''">thick</a>, <a href="exec:makeupSetting = 4 & gt ''mirror'', ''start''">bimbo</a>.'
-!
-!	if makeupSetting = 0:
-!		'Currently you have no make-up set.'
-!	elseif makeupSetting = 1:
-!		'Currently the level you have set is for light make-up.'
-!	elseif makeupSetting = 2:
-!		'Currently the level you have set is for vibrant make-up.'
-!	elseif makeupSetting = 3:
-!		'Currently the level you have set is for thick make-up.'
-!	elseif makeupSetting = 4:
-!		'Currently the level you have set is for bimbo make-up.'
-!	end
-
-	if $routine1 ! '':
-		'Make-up routine 1 is called ''<<$routine1custname>>'' and consists of : '
-		if mid($routine1,1,1) = 0:'No make-up'
-		if mid($routine1,1,1) = 1:'Light make-up'
-		if mid($routine1,1,1) = 2:'Vibrant make-up'
-		if mid($routine1,1,1) = 3:'Thick make-up'
-		if mid($routine1,1,1) = 5:'Bimbo make-up'
-		if mid($routine1,2,1) = 0:'No Lipbalm'
-		if mid($routine1,2,1) = 1:'Lipbalm'
-		if mid($routine1,3,1) = 0:'No fake lashes'
-		if mid($routine1,3,1) = 1:'Normal fake lashes'
-		if mid($routine1,3,1) = 2:'Mink fake lashes'
-		''
-	end
+	act 'Manage your custom make-up routines': gs 'mirror', 'routine_manage'
 
-	if $routine2 ! '':
-		'Make-up routine 2 is called ''<<$routine2custname>>'' and consists of : '
-		if mid($routine2,1,1) = 0:'No make-up'
-		if mid($routine2,1,1) = 1:'Light make-up'
-		if mid($routine2,1,1) = 2:'Vibrant make-up'
-		if mid($routine2,1,1) = 3:'Thick make-up'
-		if mid($routine2,1,1) = 5:'Bimbo make-up'
-		if mid($routine2,2,1) = 0:'No Lipbalm'
-		if mid($routine2,2,1) = 1:'Lipbalm'
-		if mid($routine2,3,1) = 0:'No fake lashes'
-		if mid($routine2,3,1) = 1:'Normal fake lashes'
-		if mid($routine2,3,1) = 2:'Mink fake lashes'
-		''
+	if $makeup_routine['1'] ! '':
+		gs 'mirror', 'routine_description', 1
+		if func('mirror', 'routine_check', 1):
+			act 'Apply <<$makeup_routine[''1_name'']>>':
+				gt 'mirror', 'works', makeup_routine['1_makeup'], makeup_routine['1_lipbalm'], makeup_routine['1_lashes']
+			end
+		end
 	end
-
-	if $routine3 ! '':
-		'Make-up routine 3 is called ''<<$routine3custname>>'' and consists of : '
-		if mid($routine3,1,1) = 0:'No make-up'
-		if mid($routine3,1,1) = 1:'Light make-up'
-		if mid($routine3,1,1) = 2:'Vibrant make-up'
-		if mid($routine3,1,1) = 3:'Thick make-up'
-		if mid($routine3,1,1) = 5:'Bimbo make-up'
-		if mid($routine3,2,1) = 0:'No Lipbalm'
-		if mid($routine3,2,1) = 1:'Lipbalm'
-		if mid($routine3,3,1) = 0:'No fake lashes'
-		if mid($routine3,3,1) = 1:'Normal fake lashes'
-		if mid($routine3,3,1) = 2:'Mink fake lashes'
-		''
+	if $makeup_routine['2'] ! '':
+		gs 'mirror', 'routine_description', 2
+		if func('mirror', 'routine_check', 2):
+			act 'Apply <<$makeup_routine[''2_name'']>>':
+				gt 'mirror', 'works', makeup_routine['2_makeup'], makeup_routine['2_lipbalm'], makeup_routine['2_lashes']
+			end
+		end
 	end
-
-	if $routine4 ! '':
-		'Make-up routine 4 is called ''<<$routine4custname>>'' and consists of : '
-		if mid($routine4,1,1) = 0:'No make-up'
-		if mid($routine4,1,1) = 1:'Light make-up'
-		if mid($routine4,1,1) = 2:'Vibrant make-up'
-		if mid($routine4,1,1) = 3:'Thick make-up'
-		if mid($routine4,1,1) = 5:'Bimbo make-up'
-		if mid($routine4,2,1) = 0:'No Lipbalm'
-		if mid($routine4,2,1) = 1:'Lipbalm'
-		if mid($routine4,3,1) = 0:'No fake lashes'
-		if mid($routine4,3,1) = 1:'Normal fake lashes'
-		if mid($routine4,3,1) = 2:'Mink fake lashes'
-		''
+	if $makeup_routine['3'] ! '':
+		gs 'mirror', 'routine_description', 3
+		if func('mirror', 'routine_check', 3):
+			act 'Apply <<$makeup_routine[''3_name'']>>':
+				gt 'mirror', 'works', makeup_routine['3_makeup'], makeup_routine['3_lipbalm'], makeup_routine['3_lashes']
+			end
+		end
+	end
+	if $makeup_routine['4'] ! '':
+		gs 'mirror', 'routine_description', 4
+		if func('mirror', 'routine_check', 4):
+			act 'Apply <<$makeup_routine[''4_name'']>>':
+				gt 'mirror', 'works', makeup_routine['4_makeup'], makeup_routine['4_lipbalm'], makeup_routine['4_lashes']
+			end
+		end
 	end
 	gs 'stat'
 	killvar 'serv'
 
 	act '<<iif(newstylemirror,''Change to the old style mirror'',''Change to the new style mirror'')>>': newstylemirror = iif(newstylemirror,0,1) & gt 'mirror','start'
-end 
+end
 
 !! --- start ---
 
-
-$createcustroutine = {
-
+!! 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
 	'Select make-up level'
-	'<a href="exec:makeupSetting = 0 & dynamic $createcustroutine">none</a>, <a href="exec:makeupSetting = 1 & dynamic $createcustroutine">light</a>, <a href="exec:makeupSetting = 2 & dynamic $createcustroutine">vibrant</a>, <a href="exec:makeupSetting = 3 & dynamic $createcustroutine">thick</a>, <a href="exec:makeupSetting = 5 & dynamic $createcustroutine">bimbo</a>'
-	if makeupSetting = 0:
-		'Currently you have no make-up set.'
-	elseif makeupSetting = 1:
-		'Currently the level you have set is for light make-up.'
-	elseif makeupSetting = 2:
-		'Currently the level you have set is for vibrant make-up.'
-	elseif makeupSetting = 3:
-		'Currently the level you have set is for thick make-up.'
-	elseif makeupSetting = 5:
-		'Currently the level you have set is for bimbo make-up.'
-	end
+	*p iif(makeupSetting = 0,'none,', '<a href="exec:makeupSetting = 0 & gs ''mirror'', ''routine_manage''">none</a>,')
+	*p iif(makeupSetting = 1,' light,', ' <a href="exec:makeupSetting = 1 & gs ''mirror'', ''routine_manage''">light</a>,')
+	*p iif(makeupSetting = 2,' vibrant,', ' <a href="exec:makeupSetting = 2 & gs ''mirror'', ''routine_manage''">vibrant</a>,')
+	*p iif(makeupSetting = 3,' thick,', ' <a href="exec:makeupSetting = 3 & gs ''mirror'', ''routine_manage''">thick</a>,')
+	*pl iif(makeupSetting = 5,' bimbo', ' <a href="exec:makeupSetting = 5 & gs ''mirror'', ''routine_manage''">bimbo</a>')
 	*nl
 	'Choose if you will use lipbalm'
-	if cust_lipbalm  = 0:
-		'You currently have no lip balm selected: <a href="exec:cust_lipbalm  = 1 & dynamic $createcustroutine">Add Lipbalm to routine</a>'
-	else
-		'You currently have lip balm selected: <a href="exec:cust_lipbalm  = 0 & dynamic $createcustroutine">Remove Lipbalm to routine</a>'
-	end
+	*p iif(cust_lipbalm = 0,'no,', '<a href="exec:cust_lipbalm = 0 & gs ''mirror'', ''routine_manage''">no</a>,')
+	*pl iif(cust_lipbalm = 1,' yes', ' <a href="exec:cust_lipbalm = 1 & gs ''mirror'', ''routine_manage''">yes</a>')
 	*nl
-	'Cycle lash options'
-	if custlashes = 0:
-		'You currently have no lashes selected <a href="exec:custlashes = 1 & dynamic $createcustroutine">Add fake lashes</a>'	
-	elseif custlashes = 1:
-		'You currently have fake lashes selected <a href="exec:custlashes = 2 & dynamic $createcustroutine">Change to mink lashes</a>'	
-	else
-		'You currently have mink lashes selected <a href="exec:custlashes = 0 & dynamic $createcustroutine">Remove fake lashes</a>'	
-	end	
-	
+	'Choose lash options'
+	*p iif(custlashes = 0,'none,', '<a href="exec:custlashes = 0 & gs ''mirror'', ''routine_manage''">none</a>,')
+	*p iif(custlashes = 1,' fake,', ' <a href="exec:custlashes = 1 & gs ''mirror'', ''routine_manage''">fake</a>,')
+	*pl iif(custlashes = 2,' mink', ' <a href="exec:custlashes = 2 & gs ''mirror'', ''routine_manage''">mink</a>')
+
 	$routine = str(makeupSetting) + str(cust_lipbalm) + str(custlashes)
-	
-	act 'Exit':gt 'mirror','start'
-	
-	if $routine1 ! '':
-		act 'Remove <<$routine1custname>>':
-			killvar '$routine1'
-			killvar '$routine1custname'
-			dynamic $createcustroutine
+
+	act 'Exit': gt 'mirror','start'
+
+	temp_routine_index = 0
+	if $makeup_routine['1'] = '':
+		temp_routine_index = 1
+	elseif $makeup_routine['2'] = '':
+		temp_routine_index = 2
+	elseif $makeup_routine['3'] = '':
+		temp_routine_index = 3
+	elseif $makeup_routine['4'] = '':
+		temp_routine_index = 4
+	end
+	if temp_routine_index > 0:
+		act 'Save routine':
+			makeup_routine['<<temp_routine_index>>_makeup'] = makeupSetting
+			makeup_routine['<<temp_routine_index>>_lipbalm'] = cust_lipbalm
+			makeup_routine['<<temp_routine_index>>_lashes'] = custlashes
+			$makeup_routine['<<temp_routine_index>>'] = $routine
+			$makeup_routine['<<temp_routine_index>>_name'] = 'routine <<temp_routine_index>>'
+			gs 'mirror', 'routine_manage'
 		end
-			
-		act 'Rename <<$routine1custname>>':
-			$routine1custname = input ("Name the routine")
-			dynamic $createcustroutine
+	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'
+			gs 'mirror', 'routine_manage'
+		end
+		act 'Rename <<$makeup_routine[''1_name'']>>':
+			$makeup_routine['1_name'] = input ('Name the routine')
+			gs 'mirror', 'routine_manage'
 		end
 	end
-	if $routine2 ! '':
-		act 'Remove <<$routine2custname>>':
-			killvar '$routine2'
-			killvar '$routine2custname'
-			dynamic $createcustroutine
+	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'
+			gs 'mirror', 'routine_manage'
 		end
-			
-		act 'Rename <<$routine2custname>>':
-			$routine2custname = input ("Name the routine")
-			dynamic $createcustroutine
+		act 'Rename <<$makeup_routine[''2_name'']>>':
+			$makeup_routine['2_name'] = input ('Name the routine')
+			gs 'mirror', 'routine_manage'
 		end
 	end
-	if $routine3 ! '':
-		act 'Remove <<$routine3custname>>':
-			killvar '$routine3'
-			killvar '$routine3custname'
-			dynamic $createcustroutine
+	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'
+			gs 'mirror', 'routine_manage'
 		end
-			
-		act 'Rename <<$routine3custname>>':
-			$routine3custname = input ("Name the routine")
-			dynamic $createcustroutine
+		act 'Rename <<$makeup_routine[''3_name'']>>':
+			$makeup_routine['3_name'] = input ('Name the routine')
+			gs 'mirror', 'routine_manage'
 		end
 	end
-	if $routine4 ! '':
-		act 'Remove <<$routine4custname>>':
-			killvar '$routine4'
-			killvar '$routine4custname'
-			dynamic $createcustroutine
+	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'
+			gs 'mirror', 'routine_manage'
 		end
-		act 'Rename <<$routine4custname>>':
-			$routine4custname = input ("Name the routine")
-			dynamic $createcustroutine
+		act 'Rename <<$makeup_routine[''4_name'']>>':
+			$makeup_routine['4_name'] = input ('Name the routine')
+			gs 'mirror', 'routine_manage'
 		end
 	end
-	act 'Save routine':
-		if $routine1 = '':
-			$routine1 = $routine
-			$routine1custname = 'routine 1'
-			dynamic $createcustroutine
-		elseif $routine2 = '':
-			$routine2 = $routine 
-			$routine2custname = 'routine 2'
-			dynamic $createcustroutine
-		elseif $routine3 = '':
-			$routine3 = $routine 
-			$routine3custname = 'routine 3'
-			dynamic $createcustroutine
-		elseif $routine4 = '':
-			$routine4 = $routine
-			$routine4custname = 'routine 4'
-			dynamic $createcustroutine
-		else
-			'max 4 routines allowed, please remove one before adding a new one'
+end
+
+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 $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>'
+			else
+				$temp_prefix = '<font color="#dc322f">'
+				$temp_postfix = ' - Not enough to apply</font>'
+			end
+		end
+		if makeup_routine['<<ARGS[1]>>_makeup'] = 1:
+			' <<$temp_prefix>>Light make-up<<$temp_postfix>>'
+		elseif makeup_routine['<<ARGS[1]>>_makeup'] = 2:
+			' <<$temp_prefix>>Vibrant make-up<<$temp_postfix>>'
+		elseif makeup_routine['<<ARGS[1]>>_makeup'] = 3:
+			' <<$temp_prefix>>Thick make-up<<$temp_postfix>>'
+		elseif makeup_routine['<<ARGS[1]>>_makeup'] = 5:
+			' <<$temp_prefix>>Bimbo make-up<<$temp_postfix>>'
+		end
+	end
+	if makeup_routine['<<ARGS[1]>>_lipbalm'] > 0:
+		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>'
+			else
+				$temp_prefix = '<font color="#dc322f">'
+				$temp_postfix = ' - Not enough to apply</font>'
+			end
+		end
+		' <<$temp_prefix>>Lipbalm<<$temp_postfix>>'
+	end
+	if makeup_routine['<<ARGS[1]>>_lashes'] > 0:
+		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>'
+			else
+				$temp_prefix = '<font color="#dc322f">'
+				$temp_postfix = ' - Not enough to apply</font>'
+			end
+		end
+		if makeup_routine['<<ARGS[1]>>_lashes'] = 1:
+			' <<$temp_prefix>>False lashes<<$temp_postfix>>'
+		elseif makeup_routine['<<ARGS[1]>>_lashes'] = 2:
+			' <<$temp_prefix>>Mink false lashes<<$temp_postfix>>'
 		end
 	end
+	killvar '$temp_prefix' & killvar '$temp_postfix'
+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
+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':
@@ -600,35 +578,6 @@ if $ARGS[0] = 'steam':
 	act 'Move away from the mirror':gt 'mirror','fin'
 end
 
-if $routine1 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr' and mirror_steam = hour:
-
-	else
-		act 'Apply <<$routine1custname>>':gt 'mirror','works',mid($routine1,1,1),mid($routine1,2,1),mid($routine1,3,1)
-	end
-end
-if $routine2 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr' and mirror_steam = hour:
-
-	else
-		act 'Apply <<$routine2custname>>':gt 'mirror','works',mid($routine2,1,1),mid($routine2,2,1),mid($routine2,3,1)
-	end
-end
-if $routine3 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr' and mirror_steam = hour:
-
-	else
-		act 'Apply <<$routine3custname>>':gt 'mirror','works',mid($routine3,1,1),mid($routine3,2,1),mid($routine3,3,1)
-	end
-end
-if $routine4 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = 'city_house_res_bathr' and mirror_steam = hour:
-
-	else
-		act 'Apply <<$routine4custname>>':gt 'mirror','works',mid($routine4,1,1),mid($routine4,2,1),mid($routine4,3,1)
-	end
-end
-
 if $ARGS[0] = 'brush':
 	menu_off = 1
 	*clr & cla
@@ -645,9 +594,9 @@ if $ARGS[0] = 'brush':
 			$serv['back']='<a href="exec: gt ''mirror'',''start''"><img src="images/system/icons/action/back.png"></a>'
 		else
 			$serv['back']='<a href="exec: gt ''mirror'',''fin''"><img src="images/system/icons/action/back.png"></a>'
-        end
+		end
 		'<center><table align=center cellspacing=0 cellpadding=0><tr><td align=center colspan=15><center><<$serv["avatar"]>></center></td></tr><tr><td colspan=15><hr></td></tr><tr><td colspan=10></td><td><<$serv["back"]>></td><td colspan=4></td></tr></table></center>'
-        killvar('$serv')
+		killvar('$serv')
 	else
 		if player_avatar = 1:
 			'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
@@ -664,51 +613,57 @@ if $ARGS[0] = 'brush':
 end
 
 if $ARGS[0] = 'works':
-	cla
-	if mc_inventory['cosmetics'] <= 0:
-		'You don''t have any makeup.'
-	elseif pcs_makeup = 1 and (mc_inventory['cosmetics'] >= $ARGS[1]) or ($ARGS[1] = 5 and mc_inventory['cosmetics'] >= 3):
-		*nl
-		'You consider for a moment which look you want to go for.'
-		*nl
-		if $ARGS[1] = 1:
-			'You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
-			minut += 3
-			gs 'exp_gain', 'makupskl', rand(1,3)
-			mc_inventory['cosmetics'] -= 1
-			pcs_makeup = 2
-		elseif $ARGS[1]= 2:
-			'You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
-			minut += 5
-			gs 'exp_gain', 'makupskl', rand(1,3)
-			mc_inventory['cosmetics'] -= 2
-			pcs_makeup = 3
-		elseif $ARGS[1] = 3:
-			'You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
-			minut += 10
-			gs 'exp_gain', 'makupskl', rand(1,3)
-			mc_inventory['cosmetics'] -= 3
-			vidageday -= 1
-			pcs_makeup = 4
-		elseif $ARGS[1] = 5:
-			'You apply some bright, seductive makeup, thick enough to cover most imperfections, while drawing attention in a way only a bimbo can.'
-			minut += 10
-			gs 'exp_gain', 'makupskl', rand(1,3)
-			mc_inventory['cosmetics'] -= 3
-			vidageday -= 1
-			pcs_makeup = 6
-		end
-	elseif mc_inventory['cosmetics'] < $ARGS[1]:
-		'You don''t have enough makeup to apply your chosen option.'
+	'<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:
+			'You don''t have any cosmetics.'
+		elseif mc_inventory['cosmetics'] >= min(ARGS[1], 3):
+			*nl
+			if ARGS[1] = 1 and pcs_makeup < 2:
+				'You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
+				minut += 3
+				gs 'exp_gain', 'makupskl', rand(1,3)
+				mc_inventory['cosmetics'] -= 1
+				pcs_makeup = 2
+			elseif ARGS[1] = 2 and pcs_makeup < 3:
+				'You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
+				minut += 5
+				gs 'exp_gain', 'makupskl', rand(1,3)
+				mc_inventory['cosmetics'] -= 2
+				pcs_makeup = 3
+			elseif ARGS[1] = 3 and pcs_makeup < 4:
+				'You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
+				minut += 10
+				gs 'exp_gain', 'makupskl', rand(1,3)
+				mc_inventory['cosmetics'] -= 3
+				vidageday -= 1
+				pcs_makeup = 4
+			elseif ARGS[1] = 5 and pcs_makeup < 6:
+				'You apply some bright, seductive makeup, thick enough to cover most imperfections, while drawing attention in a way only a bimbo can.'
+				minut += 10
+				gs 'exp_gain', 'makupskl', rand(1,3)
+				mc_inventory['cosmetics'] -= 3
+				vidageday -= 1
+				pcs_makeup = 6
+			end
+		else
+			'You don''t have enough cosmetics to apply your chosen option.'
+		end
 	end
 	if pcs_hairbsh < 1:
 		minut += 3
 		pcs_hairbsh = 1
 		'You brush your hair.'
 	end
-	if $ARGS[2] = 1:gs 'mirror','applyLipbalm'
-	if $ARGS[3] = 2 and mc_inventory['eyelash_mink'] >= 1 and pcs_lashes < 4 and lashextensionstyle <= 0:gs 'mirror','applyLashesmink'
-	if $ARGS[3] = 1 and mc_inventory['eyelash_fake'] >= 1 and pcs_lashes < 3 and lashextensionstyle <= 0:gs 'mirror','applyLashesplain'
+	if ARGS[2] > 0: gs 'mirror', 'applyLipbalm'
+	if ARGS[3] > 0 and lashextensionstyle <= 0 and pcs_lashes < ARGS[3] + 2:
+		if ARGS[3] = 1 and mc_inventory['eyelash_fake'] >= 1:
+			gs 'mirror', 'applyLashesplain'
+		elseif ARGS[3] = 2 and mc_inventory['eyelash_mink'] >= 1:
+			gs 'mirror', 'applyLashesmink'
+		end
+	end
 	cla
 	act 'View results':gt 'mirror', 'start'
 end &! --- works ----
@@ -754,6 +709,7 @@ if $ARGS[0] = 'fin':
 	killvar '$makeupHeavy'
 	killvar '$routine'
 	killvar '$mirrorloc'
+	killvar 'temp_routine_index'
 	menu_off = 0
 	gt $locM, $locM_arg
 end &! --- fin ----
@@ -765,75 +721,76 @@ if $ARGS[0] = 'd_bag_mirror':
 	'<center><img <<$set_imgh>> src="/images/pc/items/mirror_compact.jpg"></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
-	'You have '+iif(mc_inventory['travel_makeup']  >0, '<b><<mc_inventory[''travel_makeup'']>></b>', 'no')+' cosmetic applications and '+iif(mc_inventory['makeup_wipes'] > 0, '<b><<mc_inventory[''makeup_wipes'']>></b>', 'no')+' tissues left in your purse.'
+	'You have '+iif(mc_inventory['travel_makeup'] > 0, '<b><<mc_inventory[''travel_makeup'']>></b>', 'no')+' cosmetic applications and '+iif(mc_inventory['makeup_wipes'] > 0, '<b><<mc_inventory[''makeup_wipes'']>></b>', 'no')+' tissues left in your purse.'
 	*nl
-	if pcs_hairbsh < 1: '<a href="exec: pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	if mc_inventory['makeup_wipes'] > 0 and pcs_makeup ! 1 and cosmetic_tattoo = 0: '<center><a href="exec: mc_inventory[''makeup_wipes''] -= 1 & pcs_makeup = 1 & gt ''mirror'', ''d_bag_mirror''"><b>Remove your makeup</b></a>'
-	if mc_inventory['travel_makeup']  >0 and pcs_makeup = 1:
-		'<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & mc_inventory[''travel_makeup''] -=  1 & gt ''mirror'', ''d_bag_mirror''"><b>Put on light makeup</b></a>'
-		!!Remove this coment and uncomment the next line to restore the ability to put on any typ of makeup
-		!!'<center><a href="exec: gt ''mirror'', ''kosmetitka_apply'' "><b>Put on makeup</b></a></center>'
-	elseif mc_inventory['makeup_wipes'] > 0 and pcs_makeup = 0 and ((makeupSetting = 1 and mc_inventory['travel_makeup']  >= 1) or (makeupSetting = 2 and mc_inventory['travel_makeup']  >= 2) or (makeupSetting = 3 and mc_inventory['travel_makeup']  >= 3) or (makeupSetting = 4 and mc_inventory['travel_makeup']  >= 3)):
-		'a href="exec: gt ''mirror'', ''kosmetitka_fix'' "><b>Fix your makeup</b></a>'
-	elseif (mc_inventory['travel_makeup'] =  0 or mc_inventory['makeup_wipes'] =  0) and pcs_makeup = 0:
-		'You need portable makeup and tissues to fix your makeup.'
+	
+	if pcs_hairbsh < 1 and mc_inventory['comb'] = 1:
+		'<a href="exec: pcs_hairbsh = 1 & gt ''mirror'', ''d_bag_mirror''"><b>Brush your hair</b></a>'
 	end
-	'</td></tr></table></center>'	
-	act 'Finish': gt 'din_bad', 'd_bag'
-end
 
-if $ARGS[0] = 'kosmetitka_apply':
-	*clr & cla
-	'<center><h1>Compact Mirror</h1></center>'
-	'<center><img <<$set_imgh>> src="/images/pc/items/mirror_compact.jpg"></center>'
-	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
-	'<td cellspacing="0" cellpadding="0" valign="top">'
-	gs 'stat'
-
-	if mc_inventory['travel_makeup']  >= 1: '<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & mc_inventory[''travel_makeup''] -=  1 & gt ''mirror'', ''d_bag_mirror''"><b>Light make-up</b></a>'
-	if mc_inventory['travel_makeup']  >= 2: '<a href="exec: minut += 5 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 3 & mc_inventory[''travel_makeup''] -=  2 & gt ''mirror'', ''d_bag_mirror''"><b>Natural make-up</b></a>'
-	if mc_inventory['travel_makeup']  >= 3: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 4 & mc_inventory[''travel_makeup''] -=  3 & gt ''mirror'', ''d_bag_mirror''"><b>Heavy make-up</b></a>'
-	if mc_inventory['travel_makeup']  >= 4: '<a href="exec: minut += 10 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 6 & mc_inventory[''travel_makeup''] -=  3 & gt ''mirror'', ''d_bag_mirror''"><b>Bimbo make-up</b></a>'
+	if pcs_makeup = 0:
+		if mc_inventory['makeup_wipes'] > 0:
+			'<a href="exec: mc_inventory[''makeup_wipes''] -= 1 & pcs_makeup = pcs_makeup[''base''] & gt ''mirror'', ''d_bag_mirror''"><b>Clear smeared cosmetics</b></a>'
+			if mc_inventory['travel_makeup'] >= min(makeupSetting, 3):
+				if pcs_makeup['base'] < makeupSetting + 1:
+					'<a href="exec: gt ''mirror'', ''kosmetitka_fix''"><b>Fix your makeup</b></a>'
+				end
+			else
+				'You need portable makeup and tissues to fix your makeup.'
+			end
+		else
+			'You need portable makeup and tissues to fix your makeup.'
+		end
+	else
+		if pcs_makeup = 1:
+			if mc_inventory['travel_makeup'] > 0:
+				'<a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & mc_inventory[''travel_makeup''] -= 1 & gt ''mirror'', ''d_bag_mirror''"><b>Put on light makeup</b></a>'
+			end
+		elseif pcs_makeup > pcs_makeup['base']:
+			if mc_inventory['makeup_wipes'] > 0:
+				'<a href="exec: mc_inventory[''makeup_wipes''] -= 1 & pcs_makeup = pcs_makeup[''base''] & gt ''mirror'', ''d_bag_mirror''"><b>Remove your makeup</b></a>'
+			end
+		end
+		if pcs_lipbalm <= 0 and mc_inventory['lipbalm'] > 0:
+			'<a href="exec: gs ''mirror'', ''applyLipbalm'' & gt ''mirror'', ''d_bag_mirror''"><b>Apply lip balm</b></a>'
+		end
+	end
 	'</td></tr></table></center>'
-	act 'Finish': gt 'mirror', 'd_bag_mirror'
+	act 'Finish': gt 'din_bad', 'd_bag'
 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><h1>Compact Mirror</h1></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)
 	if makeupSetting = 1:
-		minut += 3		
+		minut += 3
 		mc_inventory['travel_makeup'] -=  1
 		pcs_makeup = 2
-		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 		'<center>You carefully fix your makeup and restore the neutral and light tones that bring out your natural beauty.</center>'
 	elseif makeupSetting = 2:
 		minut += 5
 		mc_inventory['travel_makeup'] -=  2
 		pcs_makeup = 3
-		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
-		'<center>You carefully fix your makeup and restore the mildly vibrant tones and colors that cover your minor imperfections and enhance your best features.</center>'			
+		'<center>You carefully fix your makeup and restore the mildly vibrant tones and colors that cover your minor imperfections and enhance your best features.</center>'
 	elseif makeupSetting = 3:
 		minut += 10
 		mc_inventory['travel_makeup'] -=  3
 		vidageday -= 1
 		pcs_makeup = 4
-		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
-		'<center>You carefully fix your makeup and restore the deeper, richer shades, thick enough to cover most imperfections, while drawing attention to your eyes and lips.</center>'		
+		'<center>You carefully fix your makeup and restore the deeper, richer shades, thick enough to cover most imperfections, while drawing attention to your eyes and lips.</center>'
 	elseif makeupSetting = 4:
 		minut += 10
 		mc_inventory['travel_makeup'] -=  3
 		vidageday -= 1
 		pcs_makeup = 6
-		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 		'<center>You carefully fix your makeup and restore the bright, seductive shades, thick enough to cover most imperfections, while drawing attention in a way only a bimbo can.</center>'
 	end
 
 	gs 'stat'
-	
+
 	act 'Continue': gt 'mirror', 'd_bag_mirror'
 end
 

locations/spellList.qsrc

@@ -106,7 +106,7 @@ $spellDesc['makeup'] = 'Apply Makeup to yourself magically.'
 $spellTarget['makeup'] = 'self'
 $spellOptDesc['makeup'] = '$MakeupSet'
 $spellOptVal['makeup'] = '$MakeupSetVal'
-if $routine1+$routine2+$routine3+$routine4 = '':
+if $makeup_routine['1'] + $makeup_routine['2'] + $makeup_routine['3'] + $makeup_routine['4'] = '':
 	killvar '$MakeupSet'
 	killvar '$MakeupSetVal'
 	$MakeupSet[0] = 'No Makeup'
@@ -125,24 +125,24 @@ else
 	$MakeupSet[0] = 'No Makeup'
 	$MakeupSetVal[0] = '000'
 	i=1
-	if $routine1 ! '':
-		$MakeupSet[i] = $routine1custname
-		$MakeupSetVal[i] = $routine1
+	if $makeup_routine['1'] ! '':
+		$MakeupSet[i] = $makeup_routine['1_name']
+		$MakeupSetVal[i] = $makeup_routine['1']
 		i += 1
 	end
-	if $routine2 ! '':
-		$MakeupSet[i] = $routine2custname
-		$MakeupSetVal[i] = $routine2
+	if $makeup_routine['2'] ! '':
+		$MakeupSet[i] = $makeup_routine['2_name']
+		$MakeupSetVal[i] = $makeup_routine['2']
 		i += 1
 	end
-	if $routine3 ! '':
-		$MakeupSet[i] = $routine3custname
-		$MakeupSetVal[i] = $routine3
+	if $makeup_routine['3'] ! '':
+		$MakeupSet[i] = $makeup_routine['3_name']
+		$MakeupSetVal[i] = $makeup_routine['3']
 		i += 1
 	end
-	if $routine4 ! '':
-		$MakeupSet[i] = $routine4custname
-		$MakeupSetVal[i] = $routine4
+	if $makeup_routine['4'] ! '':
+		$MakeupSet[i] = $makeup_routine['4_name']
+		$MakeupSetVal[i] = $makeup_routine['4']
 		i += 1
 	end
 	killvar 'i'