Attack Predictions: greatly simplified WML and fixed misalignment when rows are hidden

This commit is contained in:
Charles Dang 2017-03-23 03:51:40 +11:00
parent 395a040faf
commit 9a288ab78c

View file

@ -16,12 +16,35 @@
[/row]
#enddef
#define _GUI_DATA_LABEL_ROW _ID_PREFIX _ID _LABEL
#define _GUI_DOUBLE_SPACER_ROW
[row]
grow_factor = 0
[column]
[spacer]
height = 15
[/spacer]
[/column]
[column]
[spacer]
height = 15
[/spacer]
[/column]
[/row]
#enddef
#define _GUI_DATA_ROW _ID_PREFIX _ID _LABEL
#arg _DEFINITON
"default_small"#endarg
#arg _GROW_FACTOR
0#endarg
[row]
grow_factor = {_GROW_FACTOR}
[column]
border = "left,right,top"
@ -34,17 +57,10 @@
label = {_LABEL}
linked_group = "labels"
use_markup = true
[/label]
[/column]
[/row]
#enddef
#define _GUI_DATA_VALUE_ROW _ID_PREFIX _ID
[row]
[column]
border = "left,right,top"
border_size = 5
@ -54,7 +70,6 @@
id = {_ID_PREFIX} + "_" + {_ID}
definition = "default_small"
linked_group = "labels"
use_markup = true
[/label]
[/column]
@ -62,67 +77,22 @@
[/row]
#enddef
#
# NOTE: every data row *must* have a corresponding value row. MUST!
#
#define _GUI_DATA_PANEL _ID_PREFIX
[grid]
{_GUI_DATA_ROW ({_ID_PREFIX}) "base_damage" ( _ "Base damage")}
{_GUI_DATA_ROW ({_ID_PREFIX}) "resis" ()}
{_GUI_DATA_ROW ({_ID_PREFIX}) "tod_modifier" ( _ "Time of day modifier")}
{_GUI_DATA_ROW ({_ID_PREFIX}) "leadership_modifier" ( _ "Leadership bonus")}
{_GUI_DATA_ROW ({_ID_PREFIX}) "slowed_modifier" ( _ "Slowed penalty") _GROW_FACTOR=1}
[row]
{_GUI_DOUBLE_SPACER_ROW}
[column]
grow_factor = 1
horizontal_alignment = "left"
vertical_grow = true
{_GUI_DATA_ROW ({_ID_PREFIX}) "total_damage" ("<b>" + _ "Total damage" + "</b>") _DEFINITON="default"}
[grid]
{_GUI_DATA_LABEL_ROW ({_ID_PREFIX}) "base_damage" ( _ "Base damage")}
{_GUI_DATA_LABEL_ROW ({_ID_PREFIX}) "resis" ()}
{_GUI_DATA_LABEL_ROW ({_ID_PREFIX}) "tod_modifier" ( _ "Time of day modifier")}
{_GUI_DATA_LABEL_ROW ({_ID_PREFIX}) "leadership_modifier" ( _ "Leadership bonus")}
{_GUI_DATA_LABEL_ROW ({_ID_PREFIX}) "slowed_modifier" ( _ "Slowed penalty")}
{_GUI_SPACER_ROW}
{_GUI_DATA_LABEL_ROW ({_ID_PREFIX}) "total_damage" ("<b>" + _ "Total damage" + "</b>") _DEFINITON="default"}
{_GUI_SPACER_ROW}
{_GUI_DATA_LABEL_ROW ({_ID_PREFIX}) "chance_to_hit" ( _ "Chance to hit")}
{_GUI_DATA_LABEL_ROW ({_ID_PREFIX}) "chance_unscathed" ( _ "Chance of being unscathed")}
[/grid]
[/column]
[column]
grow_factor = 0
horizontal_grow = true
vertical_grow = true
[grid]
{_GUI_DATA_VALUE_ROW ({_ID_PREFIX}) "base_damage"}
{_GUI_DATA_VALUE_ROW ({_ID_PREFIX}) "resis"}
{_GUI_DATA_VALUE_ROW ({_ID_PREFIX}) "tod_modifier"}
{_GUI_DATA_VALUE_ROW ({_ID_PREFIX}) "leadership_modifier"}
{_GUI_DATA_VALUE_ROW ({_ID_PREFIX}) "slowed_modifier"}
{_GUI_SPACER_ROW}
{_GUI_DATA_VALUE_ROW ({_ID_PREFIX}) "total_damage"}
{_GUI_SPACER_ROW}
{_GUI_DATA_VALUE_ROW ({_ID_PREFIX}) "chance_to_hit"}
{_GUI_DATA_VALUE_ROW ({_ID_PREFIX}) "chance_unscathed"}
[/grid]
[/column]
[/row]
{_GUI_DOUBLE_SPACER_ROW}
{_GUI_DATA_ROW ({_ID_PREFIX}) "chance_to_hit" ( _ "Chance to hit")}
{_GUI_DATA_ROW ({_ID_PREFIX}) "chance_unscathed" ( _ "Chance of being unscathed")}
[/grid]
#enddef
@ -192,6 +162,7 @@
[column]
horizontal_grow = true
vertical_grow = true
{_GUI_DATA_PANEL ({_ID_PREFIX})}
[/column]
@ -252,11 +223,6 @@
fixed_width = "true"
[/linked_group]
[linked_group]
id = "labels"
fixed_height = "true"
[/linked_group]
[tooltip]
id = "tooltip"
[/tooltip]
@ -349,8 +315,8 @@
[/window]
#undef _GUI_SPACER_ROW
#undef _GUI_DATA_LABEL_ROW
#undef _GUI_DATA_VALUE_ROW
#undef _GUI_DOUBLE_SPACER_ROW
#undef _GUI_DATA_ROW
#undef _GUI_DATA_COLUMN
#undef _GUI_DATA_PANEL
#undef _GUI_HP_GRAPH