Merge remote-tracking branch 'Felix/master'

locations/Cheatmenu_din.qsrc

@@ -2537,7 +2537,7 @@ $cheatmenu['status'] = {
 	end
 
 	if Enable_scalepic = 1:
-		'Scalebar is now as <b>Image</b>, you can switch to <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">Character</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''status''] & gs ''stat''">Table</a>'
+		'Scalebar is now as <b>Image</b>, you can switch to <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''status''] & gs ''stat''">Character</a> or <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">Table</a>'
 		if Enable_scalewidth > 0:
 			'Scalebar Width: <a href="exec:input(''Input Scalebar Width (default to 120)'') & dynamic $cheatmenu[''status''] & gs ''stat''"><<Enable_scalewidth-1>></a>, Set is currently <a href="exec:Enable_scalewidth = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">ON</a>'
 		else
@@ -2548,15 +2548,15 @@ $cheatmenu['status'] = {
 		else
 			'Scalebar Height: Lock is currently <a href="exec:Enable_scaleheight=1+input(''InputS calebar Height (default to 15)'') & dynamic $cheatmenu[''status''] & gs ''stat''">OFF</a>'
 		end
-	elseif Enable_scalepic = 0:
-		'Scalebar is now as <b>Character</b>, you can switch to <a href="exec:Enable_scalepic = 1 & dynamic $cheatmenu[''status''] & gs ''stat''">Image</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''status''] & gs ''stat''">Table</a>'
+	elseif Enable_scalepic = 2:
+		'Scalebar is now as <b>Character</b>, you can switch to <a href="exec:Enable_scalepic = 1 & dynamic $cheatmenu[''status''] & gs ''stat''">Image</a> or <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">Table</a>'
 		if cheatStatusBars = 1:
 			'Set status bar size: Currently Small - <a href="exec:cheatStatusBars = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">Set large</a>'
 		else
 			'Set status bar size: Currently Large - <a href="exec:cheatStatusBars = 1 & dynamic $cheatmenu[''status''] & gs ''stat''">Set small</a>'
 		end
-	elseif Enable_scalepic = 2:
-		'Scalebar is now as <b>Table</b>, you can switch to <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">Image</a> or <a href="exec:Enable_scalepic = 1 & dynamic $cheatmenu[''status''] & gs ''stat''">Character</a>'
+	elseif Enable_scalepic = 0:
+		'Scalebar is now as <b>Table</b>, you can switch to <a href="exec:Enable_scalepic = 1 & dynamic $cheatmenu[''status''] & gs ''stat''">Image</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''status''] & gs ''stat''">Character</a>'
 	end
 	if Enable_statfsize<0:Enable_statfsize=0
 	if Enable_statfsize > 0:

locations/indik.qsrc

@@ -30,7 +30,7 @@ if Enable_scalepic = 1:
 	killvar '_width'
 	killvar '_height'
 	killvar '$_color'
-else
+elseif Enable_scalepic = 2:
 	if cheatStatusBars = 1:
 		i = 2
 	else

locations/indiktab.qsrc

@@ -1,4 +1,7 @@
 # indiktab
+! ARGS[0] ... color
+!!  color palette selector
+
 ! ARGS[1] ... percentage
 !!  scales the bar from 0 to 100
 
@@ -8,6 +11,7 @@
 ! ARGS[3] ... phantom
 !!  ghost value, used for painkillers
 
+
 indiktab['bar_progress'] = min(max(ARGS[1], 0), 100)
 if Enable_statfsize > 0:
 	indiktab['label_width'] = len(str(ARGS[2])) * Enable_statfsize*2
@@ -22,7 +26,7 @@ else}
 $indiktab['bar_bg_color'] = $bcolor
 ! end
 
-if $ARGS[0] = '1':
+if ARGS[0] = 1:
 !{	if Enable_Android = 1:
 		if indiktab['bar_progress']  >= 65:
 			$indiktab['bar_color'] = 'green'
@@ -66,7 +70,7 @@ if $ARGS[0] = '1':
 	end
 	! end
 
-elseif $ARGS[0] = '2':
+elseif ARGS[0] = 2:
 !{	if Enable_Android = 1:
 		if indiktab['bar_progress']  >= 85:
 			$indiktab['bar_color'] = 'red'
@@ -134,18 +138,18 @@ elseif $ARGS[0] = '2':
 	! end
 end
 
-$result = '<TABLE  cellpadding="1" cellspacing="0" width="255"><TR>'
+$result = '<TABLE  cellpadding="1" cellspacing="0" width="200"><TR>'
 if indiktab['bar_progress'] >= ARGS[3]:
 	if indiktab['bar_progress'] = 100: $indiktab['bar_bg_color'] = $indiktab['bar_color']
 
 	if indiktab['bar_progress'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"' & !! bar
 		$result += 'align="right"><font color ="<<$indiktab[''bar_label'']>>"><<ARGS[2]>></font>&nbsp;</TD>' & !! label
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"></font></TD>' & !! background
+		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"></TD>' & !! background
 	else
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
 		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
-		$result += 'align="left">&nbsp;<font color ="<<$fcolor>>"><<ARGS[2]>></TD>' & !! label
+		$result += 'align="left">&nbsp;<font color ="<<$fcolor>>"><<ARGS[2]>></font></TD>' & !! label
 	end
 else
 	if indiktab['bar_progress'] + indiktab['bar_phantom'] = 100: $indiktab['bar_bg_color'] = $indiktab['phantom_color']
@@ -153,18 +157,18 @@ else
 	if indiktab['bar_progress'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"' & !! bar
 		$result += 'align="right"><font color ="<<$indiktab[''bar_label'']>>"><<ARGS[2]>></font>&nbsp;</TD>' & !! label
-		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"></font></TD>' & !! phantom
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></font></TD>' & !! background
+		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"></TD>' & !! phantom
+		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
 	elseif indiktab['bar_phantom'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
 		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"' & !! phantom
-		$result += 'align="left">&nbsp;<font color ="<<$indiktab[''phantom_label'']>>"><<ARGS[2]>></TD>' & !! label
+		$result += 'align="left">&nbsp;<font color ="<<$indiktab[''phantom_label'']>>"><<ARGS[2]>></font></TD>' & !! label
 		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
 	else
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
-		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"></font></TD>' & !! phantom
+		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"></TD>' & !! phantom
 		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
-		$result += 'align="left">&nbsp;<font color ="<<$fcolor>>"><<ARGS[2]>></TD>' & !! label
+		$result += 'align="left">&nbsp;<font color ="<<$fcolor>>"><<ARGS[2]>></font></TD>' & !! label
 	end
 end
 $result += '</TR></TABLE>'

locations/stat_display.qsrc

@@ -1508,18 +1508,18 @@ if enable_show_status = 0:
 		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:
-		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="300">'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '2', pcs_horny, pcs_horny)+'</TD><TD>&nbsp;Arousal</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '2', pain['total'], pain['total'], pain['damage'])+'</TD><TD>&nbsp;Pain</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_health * 100 / healthmax, pcs_health)+'</TD><TD>&nbsp;Health</TD></TR>'
-		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD>&nbsp;Mana</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD>&nbsp;Willpower</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD>&nbsp;Stamina</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_mood, pcs_mood)+'</TD><TD>&nbsp;Mood</TD></TR>'
-		if cheatNoEat = 0: $stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_energy, pcs_energy)+'</TD><TD>&nbsp;Hunger</TD></TR>'
-		if cheatNoDrink = 0: $stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_hydra, pcs_hydra)+'</TD><TD>&nbsp;Thirst</TD></TR>'
-		if cheatNoSleep = 0: $stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_sleep, pcs_sleep)+'</TD><TD>&nbsp;Sleep</TD></TR>'
+	elseif Enable_scalepic = 0:
+		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="200">'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 2, pcs_horny, pcs_horny)+'</TD><TD>&nbsp;Arousal</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 2, pain['total'], pain['total'], pain['damage'])+'</TD><TD>&nbsp;Pain</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_health * 100 / healthmax, pcs_health)+'</TD><TD>&nbsp;Health</TD></TR>'
+		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD>&nbsp;Mana</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD>&nbsp;Willpower</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD>&nbsp;Stamina</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_mood, pcs_mood)+'</TD><TD>&nbsp;Mood</TD></TR>'
+		if cheatNoEat = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_energy, pcs_energy)+'</TD><TD>&nbsp;Hunger</TD></TR>'
+		if cheatNoDrink = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_hydra, pcs_hydra)+'</TD><TD>&nbsp;Thirst</TD></TR>'
+		if cheatNoSleep = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_sleep, pcs_sleep)+'</TD><TD>&nbsp;Sleep</TD></TR>'
 		$stat_extra_msg += '</TABLE></font>'
 	else
 		gs 'indik', '2', pcs_horny, pcs_horny
@@ -1571,20 +1571,20 @@ else
 	$stat_tool_msg += '<a href="exec:Enable_showattr = 0 & gs ''$menu_obnovit''">▲Attributes</a>'
 	!skip if this is first message
 	if $stat_extra_msg ! '': $stat_extra_msg += '<br><a href="exec:Enable_showattr = 0 & gs ''$menu_obnovit''">▲Attributes:</a>'
-	if Enable_scalepic = 2:
-		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="300">'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD>&nbsp;Inhibition</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD>&nbsp;Strength</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD>&nbsp;Agility</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD>&nbsp;Endurance</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD>&nbsp;Intelligence</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD>&nbsp;Spirit</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_react, pcs_react)+'</TD><TD>&nbsp;Reaction</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD>&nbsp;Charisma</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD>&nbsp;Perception</TD></TR>'
-		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD>&nbsp;Magic</TD></TR>'
-		if succubusflag = 1: $stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', sucexcess, sucexcess)+'</TD><TD>&nbsp;Succubus Energy</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_apprnc / 2, pcs_apprnc)+'</TD><TD>&nbsp;Attractiveness</TD></TR>'
+	if Enable_scalepic = 0:
+		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="200">'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD>&nbsp;Inhibition</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_stren, pcs_stren)+'</TD><TD>&nbsp;Strength</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_agil, pcs_agil)+'</TD><TD>&nbsp;Agility</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_vital, pcs_vital)+'</TD><TD>&nbsp;Endurance</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_intel, pcs_intel)+'</TD><TD>&nbsp;Intelligence</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_sprt, pcs_sprt)+'</TD><TD>&nbsp;Spirit</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_react, pcs_react)+'</TD><TD>&nbsp;Reaction</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_chrsm, pcs_chrsm)+'</TD><TD>&nbsp;Charisma</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_prcptn, pcs_prcptn)+'</TD><TD>&nbsp;Perception</TD></TR>'
+		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_magik, pcs_magik)+'</TD><TD>&nbsp;Magic</TD></TR>'
+		if succubusflag = 1: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, sucexcess, sucexcess)+'</TD><TD>&nbsp;Succubus Energy</TD></TR>'
+		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_apprnc / 2, pcs_apprnc)+'</TD><TD>&nbsp;Attractiveness</TD></TR>'
 		$stat_extra_msg += '</TABLE></font>'
 	else
 		gs 'indik', '1', 100 - pcs_inhib, 100 - pcs_inhib