Prechádzať zdrojové kódy

fix a few mirror bugs and fix typo in file name

rachels 3 rokov pred
rodič
commit
694835e75f
2 zmenil súbory, kde vykonal 16 pridanie a 23 odobranie
  1. 0 0
      locations/_attributes_misc_outfit.qsrc
  2. 16 23
      locations/mirror.qsrc

+ 0 - 0
locations/_attributes_misc_oufit.qsrc → locations/_attributes_misc_outfit.qsrc


+ 16 - 23
locations/mirror.qsrc

@@ -10,6 +10,10 @@ if $ARGS[0] = 'start':
 	if mirror_steam ! hour: mirror_steam = 100
 	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour: gt'mirror','steam'
 
+	$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.'
+	$makeupHeavy =   '<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>&nbsp;<br>You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
+
 	if newstylemirror = 1:
 		!########### buttons and desc ###########
 
@@ -89,7 +93,7 @@ if $ARGS[0] = 'start':
 
 				if kosmetica > 0:
 					act 'Light make-up':
-						cla
+						*clr & cla
 						minut += 3
 						makupskl_exp += rand(1,3)
 						kosmetica -= 1
@@ -101,7 +105,7 @@ if $ARGS[0] = 'start':
 
 				if kosmetica > 1:
 					act 'Vibrant make-up':
-						cla
+						*clr & cla
 						minut += 5
 						makupskl_exp += rand(1,3)
 						kosmetica -= 2
@@ -113,7 +117,7 @@ if $ARGS[0] = 'start':
 
 				if kosmetica > 2:
 					act 'Thick make-up':
-						cla
+						*clr & cla
 						minut += 10
 						makupskl_exp += rand(1,3)
 						kosmetica -= 3
@@ -205,11 +209,7 @@ if $ARGS[0] = 'start':
 	if falselashesplain > 0: *nl 'False lashes: <<falselashesplain>>' else *nl 'You have no false lashes left.'
 	if falselashesmink > 0: *pl ' | Mink lashes: <<falselashesmink>>' else *pl ' You have no mink lashes left.'
 	*nl
-	'<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>'
-	$makeupLight =   'You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
-	$makeupNatural = 'You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
-	$makeupHeavy =   'You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
-
+	
 	! WD: Cheat Unused ~ 'AutoHapri'
 	if pcs_hairbsh = 0 and AutoHapri = 1:
 		minut += 3
@@ -229,6 +229,7 @@ if $ARGS[0] = 'start':
 			'You have no make-up left.'
 		else
 			if pcs_makeup = 2:
+				*clr
 				*pl $makeupLight
 				minut -= 3
 				kosmetica -= 1
@@ -269,7 +270,7 @@ if $ARGS[0] = 'start':
 
 			if kosmetica > 0:
 				act 'Light make-up':
-					cla
+					*clr & cla
 					minut += 3
 					makupskl_exp += rand(1,3)
 					kosmetica -= 1
@@ -281,7 +282,7 @@ if $ARGS[0] = 'start':
 
 			if kosmetica > 1:
 				act 'Vibrant make-up':
-					cla
+					*clr & cla
 					minut += 5
 					makupskl_exp += rand(1,3)
 					kosmetica -= 2
@@ -293,7 +294,7 @@ if $ARGS[0] = 'start':
 
 			if kosmetica > 2:
 				act 'Thick make-up':
-					cla
+					*clr & cla
 					minut += 10
 					makupskl_exp += rand(1,3)
 					kosmetica -= 3
@@ -409,6 +410,7 @@ if $ARGS[0] = 'start':
 		''
 	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 &! --- start ---
@@ -585,36 +587,28 @@ if $ARGS[0] = 'works':
 	if kosmetica <= 0:
 		'You don''t have any makeup.'
 	elseif pcs_makeup = 1 and kosmetica >= $ARGS[1]:
-		*clr
-		'<center><img <<$set_imgh>> src="images/pc/activities/routine/1.jpg"></center>'
 		*nl
 		'You consider for a moment which look you want to go for.'
 		*nl
 		if $ARGS[1] = 1:
-			'<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>'
-			'Without thinking, you instantly apply a subtle amount of makeup to your face.'
+			'You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
 			minut += 3
 			makupskl_exp += rand(1,3)
 			kosmetica -= 1
 			pcs_makeup = 2
-			'<<$makeupLight>>'
 		elseif $ARGS[1]= 2:
-			'<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>'
-			'Without thinking, you instantly apply a moderate amount of makeup to your face.'
+			'You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 			minut += 5
 			makupskl_exp += rand(1,3)
 			kosmetica -= 2
 			pcs_makeup = 3
-			'<<$makeupNatural>>'
 		elseif $ARGS[1] = 3:
-			'<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>'
-			'Without thinking, you instantly apply a heavy amount of makeup to your face.'
+			'You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
 			minut += 10
 			makupskl_exp += rand(1,3)
 			kosmetica -= 3
 			vidageday -= 1
 			pcs_makeup = 4
-			'<<$makeupHeavy>>'
 		end
 	elseif kosmetica < $ARGS[1]:
 		'You don''t have enough makeup to apply your chosen option.'
@@ -622,7 +616,6 @@ if $ARGS[0] = 'works':
 	if pcs_hairbsh = 0:
 		minut += 3
 		pcs_hairbsh = 1
-		'<center><img <<$set_imgh>> src="images/pc/activities/routine/3.jpg"></center>'
 		'You brush your hair.'
 	end
 	if $ARGS[2] = 1:gs 'mirror','applyLipbalm'