1
0
Эх сурвалжийг харах

[changed] bit more changes to `mirror.qsrc`

LinaHirata 8 сар өмнө
parent
commit
b27ae0b361
1 өөрчлөгдсөн 30 нэмэгдсэн , 16 устгасан
  1. 30 16
      locations/mirror.qsrc

+ 30 - 16
locations/mirror.qsrc

@@ -717,20 +717,37 @@ if $ARGS[0] = 'd_bag_mirror':
 	'<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.'
 	*nl
-	if pcs_hairbsh < 1:
-		'<a href="exec: pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	end
-	if mc_inventory['makeup_wipes'] > 0 and pcs_makeup ! pcs_makeup['base']:
-		'<center><a href="exec: mc_inventory[''makeup_wipes''] -= 1 & pcs_makeup = pcs_makeup[''base''] & gt ''mirror'', ''d_bag_mirror''"><b>Remove your makeup</b></a>'
+	
+	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
-	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>'
-	elseif pcs_makeup = 0 and pcs_makeup['base'] < makeupSetting + 1:
-		if mc_inventory['makeup_wipes'] > 0 and mc_inventory['travel_makeup'] >= min(makeupSetting, 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):
+
+	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 'din_bad', 'd_bag'
@@ -739,34 +756,31 @@ 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/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)
 	if makeupSetting = 1:
 		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>'
 	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>'
 	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