[fixed] apply make-up still used the old makeupsetting variable that is now used for the routines

locations/mirror.qsrc

@@ -122,89 +122,53 @@ if $ARGS[0] = 'start':
 
 	!! Added the makeup setting.
 
-	if pcs_makeup = 1 and kosmetica >= makeupSetting:
+	if pcs_makeup = 1 and kosmetica > 0:
 		act 'Apply makeup':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/mop.jpg"></center>'
-			*nl
 			'You consider for a moment which look you want to go for.'
 			*nl
-			if makeupSetting = 1:
-				cla
-				'Without thinking, you instantly apply a subtle amount of makeup to your face.'
-				minut += 3
-				makupskl_exp += rand(1,3)
-				kosmetica -= 1
-				pcs_makeup = 2
-				'<<$makeupLight>>'
-				act 'View results':gt 'mirror', 'start'
-			elseif makeupSetting = 2:
-				cla
-				'Without thinking, you instantly apply a moderate amount of makeup to your face.'
-				minut += 5
-				makupskl_exp += rand(1,3)
-				kosmetica -= 2
-				pcs_makeup = 3
-				'<<$makeupNatural>>'
-				act 'View results':gt 'mirror', 'start'
-			elseif makeupSetting = 3:
-				cla
-				'Without thinking, you instantly apply a heavy amount of makeup to your face.'
-				minut += 10
-				makupskl_exp += rand(1,3)
-				kosmetica -= 3
-				vidageday -= 1
-				pcs_makeup = 4
-				'<<$makeupHeavy>>'
-				act 'View results':gt 'mirror', 'start'
-			else
-				if kosmetica > 0:
-					act 'Light make-up':
-						cla
-						minut += 3
-						makupskl_exp += rand(1,3)
-						kosmetica -= 1
-						pcs_makeup = 2
-						'<<$makeupLight>>'
-						act 'View results':gt 'mirror', 'start'
-					end
-				end
-
-				if kosmetica > 1:
-					act 'Natural makeup':
-						cla
-						minut += 5
-						makupskl_exp += rand(1,3)
-						kosmetica -= 2
-						pcs_makeup = 3
-						'<<$makeupNatural>>'
-						act 'View results':gt 'mirror', 'start'
-					end
+			act 'Change your mind': gt 'mirror', 'start'
+			
+			if kosmetica > 0:
+				act 'Light make-up':
+					cla
+					minut += 3
+					makupskl_exp += rand(1,3)
+					kosmetica -= 1
+					pcs_makeup = 2
+					'<<$makeupLight>>'
+					act 'Continue': gt 'mirror', 'start'
 				end
+			end
 
-				if kosmetica > 2:
-					act 'Heavy makeup':
-						cla
-						minut += 10
-						makupskl_exp += rand(1,3)
-						kosmetica -= 3
-						vidageday -= 1
-						pcs_makeup = 4
-						'<<$makeupHeavy>>'
-						act 'View results':gt 'mirror', 'start'
-					end
+			if kosmetica > 1:
+				act 'Vibrant make-up':
+					cla
+					minut += 5
+					makupskl_exp += rand(1,3)
+					kosmetica -= 2
+					pcs_makeup = 3
+					'<<$makeupNatural>>'
+					act 'Continue': gt 'mirror', 'start'
 				end
+			end
 
-				act 'No makeup':
+			if kosmetica > 2:
+				act 'Thick make-up':
 					cla
-					minut += 2
-					'After looking in the mirror, you decide that you look fine and don''t need to put on any makeup, especially since you''ll likely be washing it off in a few hours.'
-					act 'View results':gt 'mirror', 'start'
+					minut += 10
+					makupskl_exp += rand(1,3)
+					kosmetica -= 3
+					vidageday -= 1
+					pcs_makeup = 4
+					'<<$makeupHeavy>>'
+					act 'Continue': gt 'mirror', 'start'
 				end
 			end
 		end
-	elseif kosmetica < makeupSetting:
-		'You don''t have enough makeup to apply your chosen option.'
+	elseif kosmetica <= 0:
+		'You don''t have any makeup to apply.'
 	end
 
 	if AutoLipBalm = 1:	gs 'mirror','applyLipbalm'