mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-06-18 22:33:56 -07:00
Recenter GUI and update unit details section.
This was SVN commit r11976.
This commit is contained in:
WhiteTreePaladin
parent
5752863e6f
commit
b66d1716e7
8 changed files with 163 additions and 107 deletions
|
|
@ -0,0 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5fd98c524edcef2d0c78eed46e6008ccba6615db0911379650a8a5befb7c40ae
|
||||
size 517
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:48b4c706b970fe0cf58cd0978c430018b320900b794aa6c1bd4c2195b7b2c870
|
||||
size 863
|
||||
|
|
@ -19,6 +19,7 @@ function displaySingle(entState, template)
|
|||
var playerState = g_Players[entState.player];
|
||||
|
||||
var civName = g_CivData[playerState.civ].Name;
|
||||
var civEmblem = g_CivData[playerState.civ].Emblem;
|
||||
|
||||
var playerName = playerState.name;
|
||||
var playerColor = playerState.color.r + " " + playerState.color.g + " " + playerState.color.b + " 128";
|
||||
|
|
@ -51,14 +52,14 @@ function displaySingle(entState, template)
|
|||
|
||||
// TODO: Stamina
|
||||
var player = Engine.GetPlayerID();
|
||||
if (entState.stamina && (entState.player == player || g_DevSettings.controlAll))
|
||||
{
|
||||
getGUIObjectByName("staminaSection").hidden = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
getGUIObjectByName("staminaSection").hidden = true;
|
||||
}
|
||||
// if (entState.stamina && (entState.player == player || g_DevSettings.controlAll))
|
||||
// {
|
||||
// getGUIObjectByName("staminaSection").hidden = false;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// getGUIObjectByName("staminaSection").hidden = true;
|
||||
// }
|
||||
|
||||
// Experience
|
||||
if (entState.promotion)
|
||||
|
|
@ -134,15 +135,20 @@ function displaySingle(entState, template)
|
|||
|
||||
// Set Player details
|
||||
getGUIObjectByName("specific").caption = specificName;
|
||||
getGUIObjectByName("generic").caption = genericName;
|
||||
getGUIObjectByName("generic").caption = "(" + genericName + ")";
|
||||
getGUIObjectByName("player").caption = playerName;
|
||||
getGUIObjectByName("playerColorBackground").tooltip = civName;
|
||||
getGUIObjectByName("player").tooltip = civName;
|
||||
getGUIObjectByName("playerColorBackground").sprite = "colour: " + playerColor;
|
||||
getGUIObjectByName("iconBorderPlayerColor").sprite = "colour: " + playerColor;
|
||||
getGUIObjectByName("unitQueuePanelPlayerColor").sprite = "colour: " + playerColor;
|
||||
|
||||
// TODO: Set this to the current player, not the selected unit's player
|
||||
//getGUIObjectByName("civIcon").tooltip = civName;
|
||||
if ("Gaia" != civName)
|
||||
{
|
||||
getGUIObjectByName("playerCivIcon").sprite = "stretched:grayscale:" + civEmblem;
|
||||
}
|
||||
else
|
||||
{
|
||||
getGUIObjectByName("playerCivIcon").sprite = "";
|
||||
}
|
||||
|
||||
// Icon image
|
||||
if (template.icon)
|
||||
|
|
@ -156,8 +162,7 @@ function displaySingle(entState, template)
|
|||
}
|
||||
|
||||
// Attack and Armor
|
||||
getGUIObjectByName("attackStats").caption = damageTypeDetails(entState.attack);
|
||||
getGUIObjectByName("armorStats").caption = damageTypeDetails(entState.armour);
|
||||
getGUIObjectByName("attackAndArmorStats").tooltip = "Attack: " + damageTypeDetails(entState.attack) + "\nArmor: " + damageTypeDetails(entState.armour);
|
||||
|
||||
// Icon Tooltip
|
||||
var iconTooltip = "";
|
||||
|
|
|
|||
|
|
@ -93,7 +93,8 @@ function init(initData, hotloadData)
|
|||
g_CivData = loadCivData();
|
||||
g_CivData["gaia"] = { "Code": "gaia", "Name": "Gaia" };
|
||||
|
||||
getGUIObjectByName("civIcon").sprite = "stretched:"+g_CivData[g_Players[Engine.GetPlayerID()].civ].Emblem;
|
||||
getGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[Engine.GetPlayerID()].civ].Emblem;
|
||||
getGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[Engine.GetPlayerID()].civ].Name;
|
||||
initMenuPosition(); // set initial position
|
||||
|
||||
// If in Atlas editor, disable the exit button
|
||||
|
|
|
|||
|
|
@ -494,7 +494,7 @@
|
|||
<!-- START of BOTTOM PANEL -->
|
||||
<!-- ================================ ================================ -->
|
||||
|
||||
<object size="0 100%-180 100% 100%">
|
||||
<object size="50%-512 100%-180 50%+512 100%">
|
||||
|
||||
<!-- ================================ ================================ -->
|
||||
<!-- Minimap -->
|
||||
|
|
@ -533,9 +533,9 @@
|
|||
</object>
|
||||
|
||||
<!-- ================================ ================================ -->
|
||||
<!-- Supplemental Details Panel left of Selection Details-->
|
||||
<!-- Supplemental Details Panel (Left of Selection Details) -->
|
||||
<!-- ================================ ================================ -->
|
||||
<object size="100%-422 100%-170 100%-224 100%" name="supplementalSelectionDetails" type="image" sprite="supplementalDetailsPanel" z="20">
|
||||
<object size="50%-304 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="supplementalDetailsPanel" z="20">
|
||||
|
||||
<object name="unitFormationPanel"
|
||||
size="24 12 100% 100%"
|
||||
|
|
@ -605,40 +605,23 @@
|
|||
</object>
|
||||
|
||||
<!-- ================================ ================================ -->
|
||||
<!-- Selection Details Panel (Right ) -->
|
||||
<!-- Selection Details Panel (Middle) -->
|
||||
<!-- ================================ ================================ -->
|
||||
<object name="selectionDetails"
|
||||
type="image"
|
||||
sprite="selectionDetailsPanel"
|
||||
size="100%-228 100%-205 100% 100%"
|
||||
size="50%-114 100%-205 50%+114 100%"
|
||||
hidden="false"
|
||||
>
|
||||
<!-- Unit details for Single Unit -->
|
||||
<object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
|
||||
|
||||
<!-- Big unit icon -->
|
||||
<object z="30" size="-16 -10 88 94" type="image" name="iconBorderPlayerColor" sprite="playerColorBackground">
|
||||
<object size="0 0 100% 100%" type="image" name="iconBorder" tooltip_style="sessionToolTip">
|
||||
<object size="4 4 100%-4 100%-4" type="image" name="icon" ghost="true"/>
|
||||
<object size="100%-20 4 100%-4 20" name="rankIcon" type="image" sprite="" ghost="true"/>
|
||||
<object type="image" sprite="glassSquareIcon" ghost="true"/>
|
||||
|
||||
<!-- Experience bar -->
|
||||
<object size="3 100%-10 100%-3 100%-2" type="image" name="experience" tooltip="Experience" tooltip_style="sessionToolTip">
|
||||
<object type="image" sprite="experienceBackground" ghost="true"/>
|
||||
<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
|
||||
<object type="image" sprite="statsBarShader" ghost="true"/>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
|
||||
<!-- Stats Bars -->
|
||||
<object size= "88 2 100%-2 92" type="image" tooltip_style="sessionToolTip">
|
||||
<object size="0 0 100% 100%" type="image" sprite="detailsShader" ghost="true"/>
|
||||
<object size= "2 0 100%-2 98" type="image" sprite="topPanelShader" tooltip_style="sessionToolTip">
|
||||
|
||||
<!-- Health bar -->
|
||||
<object size="0 4 100% 28" name="healthSection">
|
||||
<object size="0 0 100% 16" name="healthLabel" type="text" style="StatsLabelTextLeft" ghost="true">Health:</object>
|
||||
<object size="88 8 100% 32" name="healthSection">
|
||||
<object size="0 0 100% 16" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">Health:</object>
|
||||
<object size="0 0 100% 16" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
|
||||
<object size="0 16 100% 24" name="health" type="image">
|
||||
<object type="image" sprite="healthBackground" ghost="true"/>
|
||||
|
|
@ -648,8 +631,8 @@
|
|||
</object>
|
||||
|
||||
<!-- Stamina bar -->
|
||||
<object size="0 28 100% 52" name="staminaSection">
|
||||
<object size="0 0 100% 16" name="staminaLabel" type="text" style="StatsLabelTextLeft" ghost="true">Stamina:</object>
|
||||
<object size="88 36 100% 60" name="staminaSection">
|
||||
<object size="0 0 100% 16" name="staminaLabel" type="text" style="StatsTextLeft" ghost="true">Stamina:</object>
|
||||
<object size="0 0 100% 16" name="staminaStats" type="text" style="StatsTextRight" ghost="true"/>
|
||||
<object size="0 16 100% 24" name="stamina" type="image">
|
||||
<object type="image" sprite="staminaBackground" ghost="true"/>
|
||||
|
|
@ -659,8 +642,8 @@
|
|||
</object>
|
||||
|
||||
<!-- Resource bar -->
|
||||
<object size="0 28 100% 52" name="resourceSection">
|
||||
<object size="0 0 100% 16" name="resourceLabel" type="text" style="StatsLabelTextLeft" ghost="true"/>
|
||||
<object size="88 36 100% 60" name="resourceSection">
|
||||
<object size="0 0 100% 16" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>
|
||||
<object size="0 0 100% 16" name="resourceStats" type="text" style="StatsTextRight" ghost="true"/>
|
||||
<object size="0 16 100% 24" name="resources" type="image">
|
||||
<object type="image" sprite="resourceBackground" ghost="true"/>
|
||||
|
|
@ -670,41 +653,51 @@
|
|||
</object>
|
||||
|
||||
<!-- Attack and Armor -->
|
||||
<object size="0 54 100%+2 86">
|
||||
<object size="0 0 100% 50%">
|
||||
<object size="0 0 100% 100%" type="text" style="StatsLabelTextLeft">Attack:</object>
|
||||
<object size="0 0 100% 100%" name="attackStats" type="text" style="StatsTextRight"/>
|
||||
</object>
|
||||
<object size="90 60 126 96" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip="Attack and Armor" tooltip_style="sessionToolTip"/>
|
||||
|
||||
<object size="0 50% 100% 100%">
|
||||
<object size="0 0 100% 100%" type="text" style="StatsLabelTextLeft">Armor:</object>
|
||||
<object size="0 0 100% 100%" name="armorStats" type="text" style="StatsTextRight"/>
|
||||
</object>
|
||||
<!-- Resource carrying icon/counter -->
|
||||
<object size="100%-72 60 100%-26 96" type="text" name="resourceCarryingText" style="StatsTextRight"/>
|
||||
<object size="100%-32 60 100%+4 96" type="image" name="resourceCarryingIcon"/>
|
||||
</object>
|
||||
|
||||
<!-- Big unit icon -->
|
||||
<object size="-6 -6 90 90" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
|
||||
<object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
|
||||
<object size="100%-20 4 100%-4 20" name="rankIcon" type="image" sprite="" ghost="true"/>
|
||||
|
||||
<!-- Experience bar -->
|
||||
<object size="1 100%-7 100%-1 100%-1" type="image" name="experience" tooltip="Experience" tooltip_style="sessionToolTip">
|
||||
<object type="image" sprite="experienceBackground" ghost="true"/>
|
||||
<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
|
||||
<object type="image" sprite="statsBarShader" ghost="true"/>
|
||||
</object>
|
||||
|
||||
</object>
|
||||
|
||||
<!-- Names -->
|
||||
<object size="2 88 100%-2 100%-40" name="statsArea" type="image">
|
||||
<object size="2 92 100%-2 100%-36" name="statsArea" type="image">
|
||||
|
||||
<!-- Resource carrying icon/counter -->
|
||||
<object size="100%-72 0 100%-26 36" type="text" name="resourceCarryingText" style="StatsTextRight"/>
|
||||
<object size="100%-32 0 100%+4 36" type="image" name="resourceCarryingIcon"/>
|
||||
<!-- These images are used to cut off the top and bottom of the civ icon -->
|
||||
<object z="30" size="0 5 100% 45" ghost="true" type="image" sprite="remove"/>
|
||||
<object z="30" size="0 100%-5 100% 100%+40" ghost="true" type="image" sprite="remove"/>
|
||||
|
||||
<!-- Specific Name -->
|
||||
<object size="0 0 100% 36" name="specific" type="text" style="SecondaryLabelTextLeft"/>
|
||||
<object z="30" size="0 5 100% 45" ghost="true">
|
||||
<!-- Specific Name -->
|
||||
<object size="0 0 100% 20" name="specific" ghost="true" type="text" style="PrimaryTextCentered"/>
|
||||
|
||||
<!-- Generic Name -->
|
||||
<object size="0 20 100% 36" name="generic" ghost="true" type="text" style="StatsTextCentered"/>
|
||||
</object>
|
||||
|
||||
<!-- Generic Name -->
|
||||
<object size="0 100%-46 100% 100%-26" type="image" sprite="detailsShader" ghost="true"/>
|
||||
<object size="0 100%-48 100% 100%-26" name="generic" type="text" style="StatsLabelTextLeft"/>
|
||||
|
||||
<!-- Player Name -->
|
||||
<object size="2 100%-26 100%-1 100%" name="playerColorBackground" type="image" sprite="playerColorBackground" tooltip_style="sessionToolTip">
|
||||
<object size="0 0 100% 100%" name="player" type="text" style="PrimaryLabelTextCentered"/>
|
||||
<!-- Player Name and Civ -->
|
||||
<object size="0 45 100% 100%">
|
||||
<object size="50%-64 -24 50%+64 112" name="playerCivIcon" ghost="true" type="image"/>
|
||||
<object size="0 0 100% 100%" name="playerColorBackground" ghost="true" type="image" sprite="playerColorBackground"/>
|
||||
<object size="0 0 100% 100%" type="image" ghost="true" sprite="playerColorShader"/>
|
||||
|
||||
<!-- Why is this being automatically ghosted? In the mean time, set ghost to false -->
|
||||
<object ghost="false" size="0 0 100% 100%-5" name="player" type="text" style="SecondaryTextCentered" tooltip_style="sessionToolTip"/>
|
||||
</object>
|
||||
</object>
|
||||
|
||||
<object size="2 100%-40 100%-2 100%-4" type="image" sprite="detailsShader" ghost="true"/>
|
||||
</object>
|
||||
|
||||
<!-- Unit details for Multiple Units -->
|
||||
|
|
@ -746,8 +739,6 @@
|
|||
<object type="image" sprite="statsBarShader" ghost="true"/>
|
||||
</object>
|
||||
</object>
|
||||
|
||||
<object size="2 100%-40 100%-2 100%-4" type="image" sprite="detailsShader" ghost="true"/>
|
||||
</object>
|
||||
|
||||
<!-- Unit Commands -->
|
||||
|
|
@ -755,26 +746,30 @@
|
|||
size="0 100%-36 100% 100%-4"
|
||||
type="image"
|
||||
z="30"
|
||||
|
||||
>
|
||||
<object size="0 0 100% 100%">
|
||||
<repeat count="6">
|
||||
<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
|
||||
<object name="unitCommandIcon[n]" ghost="true" type="image" size="0 0 100% 100%" style="commandIcon"/>
|
||||
<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
|
||||
</object>
|
||||
</repeat>
|
||||
<object z="20" size="4 0 100%-4 100%" ghost="true" type="image" sprite="bottomPanelShader"/>
|
||||
|
||||
<object size="0 0 100% 100%">
|
||||
<repeat count="6">
|
||||
<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
|
||||
<object name="unitCommandIcon[n]" ghost="true" type="image" size="0 0 100% 100%" style="commandIcon"/>
|
||||
<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
|
||||
</object>
|
||||
</repeat>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
|
||||
|
||||
</object> <!-- END OF SELECTION DETAILS -->
|
||||
|
||||
<!-- ================================ ================================ -->
|
||||
<!-- Commands Panel (Right of minimap)-->
|
||||
<!-- Commands Panel (Right of Selection Details) -->
|
||||
<!-- ================================ ================================ -->
|
||||
<object name="unitCommands"
|
||||
type="image"
|
||||
sprite="unitCommandsPanel"
|
||||
size="208 100%-170 602 100%"
|
||||
size="50%+110 100%-170 50%+512 100%"
|
||||
hidden="false"
|
||||
z="20"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -194,13 +194,11 @@
|
|||
texture_size="0 0 4 4"
|
||||
size="100%-4 100%-4 100% 100%"
|
||||
/>
|
||||
<image
|
||||
texture="global/border/line_corner_bottom_left.png"
|
||||
<image texture="global/border/line_corner_bottom_middle.png"
|
||||
texture_size="0 0 4 4"
|
||||
size="0 100%-4 4 100%"
|
||||
/>
|
||||
<image
|
||||
texture="global/border/line_corner_top_left.png"
|
||||
<image texture="global/border/line_corner_middle_right.png"
|
||||
texture_size="0 0 4 4"
|
||||
size="0 0 4 4"
|
||||
/>
|
||||
|
|
@ -489,6 +487,36 @@
|
|||
<!-- ================================ ================================ -->
|
||||
<!-- Shading -->
|
||||
<!-- ================================ ================================ -->
|
||||
|
||||
<sprite name="remove">
|
||||
<image backcolor="0 0 0 0" size="0 0 100% 100%"/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="topPanelShader">
|
||||
<image backcolor="0 0 0 72" size="0 5 100% 100%-5"/>
|
||||
|
||||
<image texture="session/panel_shader_edge.png"
|
||||
real_texture_placement="0 0 256 5"
|
||||
size="0 100%-5 100% 100%"
|
||||
/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="bottomPanelShader">
|
||||
<image texture="session/panel_shader_edge.png"
|
||||
real_texture_placement="0 0 256 5"
|
||||
size="0 0 100% 5"
|
||||
/>
|
||||
|
||||
<image backcolor="0 0 0 50" size="0 5 100% 100%"/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="playerColorShader">
|
||||
<image texture="session/panel_shader_edge.png"
|
||||
real_texture_placement="0 0 256 5"
|
||||
size="0 0 100% 100%"
|
||||
/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="glassSquareMap">
|
||||
<image backcolor="255 255 255 56" size="0 0 100% 1"/>
|
||||
<image backcolor="255 255 255 56" size="100%-1 1 100% 100%"/>
|
||||
|
|
@ -506,7 +534,7 @@
|
|||
<image backcolor="255 255 255 32" size="2 3 3 100%-3"/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="glassSquareIcon">
|
||||
<!-- <sprite name="glassSquareIcon">
|
||||
<image backcolor="255 255 255 128" size="0 0 100% 1"/>
|
||||
<image backcolor="255 255 255 44" size="100%-1 1 100% 100%"/>
|
||||
<image backcolor="255 255 255 44" size="0 100%-1 100% 100%"/>
|
||||
|
|
@ -521,10 +549,23 @@
|
|||
<image backcolor="255 255 255 16" size="100%-3 3 100%-2 100%-2"/>
|
||||
<image backcolor="255 255 255 16" size="2 100%-3 100%-2 100%-2"/>
|
||||
<image backcolor="255 255 255 64" size="2 3 3 100%-3"/>
|
||||
</sprite>-->
|
||||
|
||||
|
||||
<sprite name="iconBorder">
|
||||
<image backcolor="gold" size="0 0 100% 1"/>
|
||||
<image backcolor="gold" size="100%-1 1 100% 100%"/>
|
||||
<image backcolor="gold" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="gold" size="0 1 1 100%-1"/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="statsBarShader">
|
||||
<image backcolor="0 0 0 192" size="0 0 100% 1"/>
|
||||
<image texture="session/bar_lighting.png"
|
||||
real_texture_placement="0 0 150 7"
|
||||
size="0 0 100% 100%"
|
||||
/>
|
||||
|
||||
<!-- <image backcolor="0 0 0 192" size="0 0 100% 1"/>
|
||||
<image backcolor="0 0 0 192" size="100%-1 1 100% 100%-1"/>
|
||||
<image backcolor="0 0 0 192" size="0 100%-1 100% 100%"/>
|
||||
<image backcolor="0 0 0 192" size="0 1 1 100%-1"/>
|
||||
|
|
@ -537,7 +578,7 @@
|
|||
<image backcolor="0 0 0 64" size="0 2 100% 3"/>
|
||||
<image backcolor="0 0 0 64" size="100%-3 3 100%-2 100%-3"/>
|
||||
<image backcolor="0 0 0 64" size="0 100%-3 100% 100%-2"/>
|
||||
<image backcolor="0 0 0 64" size="2 3 3 100%-3"/>
|
||||
<image backcolor="0 0 0 64" size="2 3 3 100%-3"/>-->
|
||||
</sprite>
|
||||
|
||||
<sprite name="detailsShader">
|
||||
|
|
|
|||
|
|
@ -101,23 +101,39 @@
|
|||
text_valign="center"
|
||||
/>
|
||||
|
||||
<style name="StatsLabelTextLeft"
|
||||
font="serif-12"
|
||||
<style name="StatsTextLeft"
|
||||
font="serif-bold-12"
|
||||
textcolor="white"
|
||||
text_align="left"
|
||||
text_valign="center"
|
||||
ghost="true"
|
||||
/>
|
||||
|
||||
|
||||
<style name="StatsTextCentered"
|
||||
font="serif-bold-13"
|
||||
textcolor="white"
|
||||
text_align="center"
|
||||
text_valign="center"
|
||||
ghost="true"
|
||||
/>
|
||||
|
||||
<style name="StatsTextRight"
|
||||
font="serif-bold-stroke-14"
|
||||
textcolor="gold"
|
||||
font="serif-bold-13"
|
||||
textcolor="white"
|
||||
text_align="right"
|
||||
text_valign="center"
|
||||
ghost="true"
|
||||
/>
|
||||
|
||||
<style name="PrimaryLabelTextCentered"
|
||||
<style name="PrimaryTextCentered"
|
||||
font="serif-bold-stroke-14"
|
||||
textcolor="gold"
|
||||
text_align="center"
|
||||
text_valign="center"
|
||||
ghost="true"
|
||||
/>
|
||||
|
||||
<style name="SecondaryTextCentered"
|
||||
font="serif-bold-stroke-14"
|
||||
textcolor="white"
|
||||
text_align="center"
|
||||
|
|
@ -125,14 +141,6 @@
|
|||
ghost="true"
|
||||
/>
|
||||
|
||||
<style name="SecondaryLabelTextLeft"
|
||||
font="serif-bold-stroke-14"
|
||||
textcolor="gold"
|
||||
text_align="left"
|
||||
text_valign="center"
|
||||
ghost="true"
|
||||
/>
|
||||
|
||||
<style name="settingsText"
|
||||
font="serif-16"
|
||||
textcolor="white"
|
||||
|
|
|
|||
|
|
@ -143,11 +143,11 @@ function damageTypeDetails(dmg)
|
|||
if (dmg)
|
||||
{
|
||||
var dmgArray = [];
|
||||
if (dmg.hack) dmgArray.push(dmg.hack + "[font=\"sans-10\"][color=\"orange\"]H[/color][/font]");
|
||||
if (dmg.pierce) dmgArray.push(dmg.pierce + "[font=\"sans-10\"][color=\"orange\"]P[/color][/font]");
|
||||
if (dmg.crush) dmgArray.push(dmg.crush + "[font=\"sans-10\"][color=\"orange\"]C[/color][/font]");
|
||||
if (dmg.hack) dmgArray.push(dmg.hack + "[font=\"sans-10\"][color=\"orange\"] Hack[/color][/font]");
|
||||
if (dmg.pierce) dmgArray.push(dmg.pierce + "[font=\"sans-10\"][color=\"orange\"] Pierce[/color][/font]");
|
||||
if (dmg.crush) dmgArray.push(dmg.crush + "[font=\"sans-10\"][color=\"orange\"] Crush[/color][/font]");
|
||||
|
||||
return dmgArray.join("[font=\"serif-12\"], [/font]");
|
||||
return dmgArray.join(", ");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue