Ver Fonte

[changed] removed some unnecessary white space, added necessary white space when the icons are not active

julzor há 4 anos atrás
pai
commit
0016d906e5
1 ficheiros alterados com 26 adições e 25 exclusões
  1. 26 25
      locations/stat_display.qsrc

+ 26 - 25
locations/stat_display.qsrc

@@ -622,6 +622,8 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 	$statusIconBarTab_4 += '</tr></table>'
 	$stat_msg += func('cleanHTML',$statusIconBarTab_4)
 	killvar '$statusIconBarTab_4'
+else
+	$stat_msg += '<br>'
 end
 
 !!-----------------Status Icons (End)------------------
@@ -644,57 +646,56 @@ end
 
 if enable_show_status = 0:
 	if ETOmenu = 1:
-		$stat_msg += '<BR><b><<$pcs_health>></b>'
-		$stat_msg += '<BR><b><<$pcs_willpwr>></b>'
-		if cheatNoEat = 0: $stat_msg += '<BR><b><<$pcs_energy>></b>'
-		if cheatNoDrink = 0: $stat_msg += '<BR><b><<$pcs_hydra>></b>'
-		if cheatNoSleep = 0: $stat_msg += '<BR><b><<$pcs_sleep>></b>'
+		$stat_extra_msg += '<BR><b><<$pcs_health>></b>'
+		$stat_extra_msg += '<BR><b><<$pcs_willpwr>></b>'
+		if cheatNoEat = 0: $stat_extra_msg += '<BR><b><<$pcs_energy>></b>'
+		if cheatNoDrink = 0: $stat_extra_msg += '<BR><b><<$pcs_hydra>></b>'
+		if cheatNoSleep = 0: $stat_extra_msg += '<BR><b><<$pcs_sleep>></b>'
 	elseif Enable_scalepic = 2:
 		$st_temp='rgb(<<(16777216 + fcolor) mod 256>>,<<(16777216 + fcolor)/256 mod 256>>,<<(16777216 + fcolor)/65536>>)'
-		$stat_msg += '<p><font color="<<$st_temp>>"><TABLE width="300" cellpadding="1" cellspacing="0"><TR><TD width="85%">'+FUNC('indiktab', '2', pcs_horny, pcs_horny)+'</TD><TD> Arousal</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '2', pain['total'], pain['total'])+'</TD><TD> Pain</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_health * 100 / healthmax, pcs_health)+'</TD><TD> Health</TD></TR>'
-		if MagikDostup = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD> Mana</TD></TR>'
-		$stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD> Willpower</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD> Stamina</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mood, pcs_mood)+'</TD><TD> Mood</TD></TR>'
-		if cheatNoEat = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_energy, pcs_energy)+'</TD><TD> Hunger</TD></TR>'
-		if cheatNoDrink = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_hydra, pcs_hydra)+'</TD><TD> Thirst</TD></TR>'
-		if cheatNoSleep = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sleep, pcs_sleep)+'</TD><TD> Sleep</TD></TR></TABLE></font></p>'
+		$stat_extra_msg += '<p><font color="<<$st_temp>>"><TABLE width="300" cellpadding="1" cellspacing="0"><TR><TD width="85%">'+FUNC('indiktab', '2', pcs_horny, pcs_horny)+'</TD><TD> Arousal</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '2', pain['total'], pain['total'])+'</TD><TD> Pain</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_health * 100 / healthmax, pcs_health)+'</TD><TD> Health</TD></TR>'
+		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD> Mana</TD></TR>'
+		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD> Willpower</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD> Stamina</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mood, pcs_mood)+'</TD><TD> Mood</TD></TR>'
+		if cheatNoEat = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_energy, pcs_energy)+'</TD><TD> Hunger</TD></TR>'
+		if cheatNoDrink = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_hydra, pcs_hydra)+'</TD><TD> Thirst</TD></TR>'
+		if cheatNoSleep = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sleep, pcs_sleep)+'</TD><TD> Sleep</TD></TR></TABLE></font></p>'
 	else
-		$stat_msg += '<BR>'
 		gs 'indik', '2', pcs_horny, pcs_horny
-		$stat_msg += '<BR><<$ind>> Arousal'
+		$stat_extra_msg += '<BR><<$ind>> Arousal'
 
 		gs 'indik', '2', pain['total'], pain['total'], pain['damage']
-		$stat_msg += '<BR><<$ind>> Pain'
+		$stat_extra_msg += '<BR><<$ind>> Pain'
 
 		gs 'indik', '1', pcs_health * 100 / healthmax, pcs_health
-		$stat_msg += '<BR><<$ind>> Health'
+		$stat_extra_msg += '<BR><<$ind>> Health'
 
 		if MagikDostup = 0:
 			gs 'indik', '1', pcs_mana * 100 / manamax, pcs_mana
-			$stat_msg += '<BR><<$ind>> Mana'
+			$stat_extra_msg += '<BR><<$ind>> Mana'
 		end
 
 		gs 'indik', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr
-		$stat_msg += '<BR><<$ind>> Willpower'
+		$stat_extra_msg += '<BR><<$ind>> Willpower'
 
 		gs 'indik', '1', pcs_stam * 100 / stammax, pcs_stam
-		$stat_msg += '<BR><<$ind>> Stamina'
+		$stat_extra_msg += '<BR><<$ind>> Stamina'
 
 		gs 'indik', '1', pcs_mood, pcs_mood
-		$stat_msg += '<BR><<$ind>> Mood'
+		$stat_extra_msg += '<BR><<$ind>> Mood'
 
 		if cheatNoEat = 0:
 			gs 'indik', '1', pcs_energy, pcs_energy
-			$stat_msg += '<BR><<$ind>> Hunger'
+			$stat_extra_msg += '<BR><<$ind>> Hunger'
 		end
 
 		if cheatNoDrink = 0:
 			gs 'indik', '1', pcs_hydra, pcs_hydra
-			$stat_msg += '<BR><<$ind>> Thirst'
+			$stat_extra_msg += '<BR><<$ind>> Thirst'
 		end
 
 		if cheatNoSleep = 0:
 			gs 'indik', '1', pcs_sleep, pcs_sleep
-			$stat_msg += '<BR><<$ind>> Sleep'
+			$stat_extra_msg += '<BR><<$ind>> Sleep'
 		end
 	end
 end
@@ -933,15 +934,15 @@ else
 end
 
 !all end, push back and clean up
-$stat_msg += '<br><br><<$stat_tool_msg>>'
-if $stat_extra_msg ! NULL : $stat_msg += '<<$stat_extra_msg>>'
+$stat_msg += '<br>'
+$stat_msg += func('cleanHTML',$stat_tool_msg)
+if $stat_extra_msg ! NULL : $stat_msg += func('cleanHTML',$stat_extra_msg)
 $stat_msg += '<br>'
 killvar 'stat_tool_msg'
 killvar 'stat_extra_msg'
 
 !!----------------Extra messages, End--------------------------
 
-
 if enable_extra_msg = 1:
 	if opPRE = 0: $stat_msg += '<BR><<$pcs_makeup>> and your hair is <<$pcs_hairbsh>>.' & !$stat_msg += '<BR>'