Kaynağa Gözat

[fixed] added menu_off checks

Lusticon 4 ay önce
ebeveyn
işleme
9f5ee0c720
1 değiştirilmiş dosya ile 5 ekleme ve 5 silme
  1. 5 5
      locations/stat_display.qsrc

+ 5 - 5
locations/stat_display.qsrc

@@ -1001,7 +1001,7 @@ if cheatStatusIcons = 0:
 	$stat_hotcat_msg = 'People would rate your appearance as a <<hotcat>> out of 10.<br><img src="<<func(''$face_image'')>>">'
 	$statusIconBarTab += '<td><a href="exec:msg $stat_hotcat_msg"><img title="You are a <<hotcat>> out of 10." height = <<set_siconht>> src="images/system/icons/status/appearance.png"></a></td>'
 
-	if pcs_makeup = 1 and mc_inventory['travel_mirror'] > 0 and mc_inventory['travel_makeup'] > 0:
+	if pcs_makeup = 1 and mc_inventory['travel_mirror'] > 0 and mc_inventory['travel_makeup'] > 0 and menu_off = 0:
 		$statusIconBarTab += '<td><a href="exec: minut += 3 & gs ''exp_gain'', ''makupskl'', rand(1,3) & pcs_makeup = 2 & mc_inventory[''travel_makeup''] -= 1 & gs ''stat''"><img title="<<$pcs_makeup_tooltip>> Click to put on light makeup." height = <<set_siconht>> src="images/system/icons/status/makeup_'+pcs_makeup+'.png"></a></td>'
 	elseif pcs_makeup < 5:
 		$statusIconBarTab += '<td><a href="exec:msg $pcs_makeup_msg"><img title="<<$pcs_makeup_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/makeup_'+pcs_makeup+'.png"></a></td>'
@@ -1009,11 +1009,11 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec:msg $pcs_makeup_msg"><img title="<<$pcs_makeup_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/makeup_4.png"></a></td>'
 	end
 
-	if pcs_hairbsh <> 1 and mc_inventory['comb'] > 0:
-		$statusIconBarTab += '<td><a href="exec: minut += max(1, pcs_hairlng/20) & pcs_hairbsh = 1 & gs ''stat''"><img title="Your hair is <<$pcs_hairbsh>>. Click to brush it." height = <<set_siconht>> src="images/system/icons/status/hair_0.png"></a></td>'
+	$stat_brush_msg = 'Your hair is <<$pcs_hairbsh>>.'
+	if pcs_hairbsh <> 1 and mc_inventory['comb'] > 0 and menu_off = 0:
+		$statusIconBarTab += '<td><a href="exec: minut += max(1, pcs_hairlng/20) & pcs_hairbsh = 1 & gs ''stat''"><img title="<<stat_brush_msg<br>>>Click to brush it." height = <<set_siconht>> src="images/system/icons/status/hair_0.png"></a></td>'
 	else
-		$stat_brush_msg = 'Your hair is <<$pcs_hairbsh>>.'
-		$statusIconBarTab += '<td><a href="exec:msg $stat_brush_msg"><img title="<<$stat_brush_msg>>" height = <<set_siconht>> src="images/system/icons/status/hair_'+pcs_hairbsh+'.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_brush_msg"><img title="<<$stat_brush_msg>>" height = <<set_siconht>> src="images/system/icons/status/hair_'+max(0, pcs_hairbsh)+'.png"></a></td>'
 	end
 
 	if pcs_lipbalm > 0: