Added rank icon
Removed displayed rank name (functions still available) Fixed error with color name This was SVN commit r7675.
This commit is contained in:
parent
9332a20998
commit
e23d4d232a
@ -36,7 +36,7 @@ function selectionLayoutSingle()
|
|||||||
getGUIObjectByName("selectionDetailsArmour").hidden = false;
|
getGUIObjectByName("selectionDetailsArmour").hidden = false;
|
||||||
|
|
||||||
getGUIObjectByName("selectionDetailsMainText").sprite = "";
|
getGUIObjectByName("selectionDetailsMainText").sprite = "";
|
||||||
getGUIObjectByName("selectionDetailsSpecific").sprite = "wheatWindowTitle";
|
getGUIObjectByName("selectionDetailsSpecific").sprite = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fills out information that most entities have
|
// Fills out information that most entities have
|
||||||
@ -48,10 +48,14 @@ function displayGeneralInfo(playerState, entState, template)
|
|||||||
var iconTooltip = "";
|
var iconTooltip = "";
|
||||||
|
|
||||||
// Is unit Elite?
|
// Is unit Elite?
|
||||||
var eliteStatus = isUnitElite(entState.template);
|
// var eliteStatus = isUnitElite(entState.template);
|
||||||
|
|
||||||
|
// Rank Icon
|
||||||
|
getGUIObjectByName("rankIconImage").sprite = "snIconSheetRank";
|
||||||
|
getGUIObjectByName("rankIconImage").cell_id = getRankCellId(entState.template);
|
||||||
|
|
||||||
// Specific Name
|
// Specific Name
|
||||||
var name = (eliteStatus? "Elite " + template.name.specific : template.name.specific);
|
var name = template.name.specific; // (eliteStatus? "Elite " + template.name.specific : template.name.specific);
|
||||||
getGUIObjectByName("selectionDetailsSpecific").caption = name;
|
getGUIObjectByName("selectionDetailsSpecific").caption = name;
|
||||||
iconTooltip += "[font=\"serif-bold-16\"]" + name + "[/font]";
|
iconTooltip += "[font=\"serif-bold-16\"]" + name + "[/font]";
|
||||||
|
|
||||||
|
@ -201,6 +201,53 @@ function damageTypesToText(dmg)
|
|||||||
return dmgArray.join(", ");
|
return dmgArray.join(", ");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
function isUnitElite(templateName)
|
||||||
|
{
|
||||||
|
var eliteStatus = false;
|
||||||
|
var firstWord = getTemplateFirstWord(templateName);
|
||||||
|
var endsWith = templateName.substring(templateName.length-2, templateName.length);
|
||||||
|
|
||||||
|
if (firstWord == "units" && endsWith == "_e")
|
||||||
|
eliteStatus = true;
|
||||||
|
|
||||||
|
return eliteStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function getRankTitle(templateName)
|
||||||
|
{
|
||||||
|
var firstWord = getTemplateFirstWord(templateName);
|
||||||
|
var endsWith = templateName.substring(templateName.length-2, templateName.length);
|
||||||
|
|
||||||
|
if (firstWord == "units")
|
||||||
|
{
|
||||||
|
if (endsWith == "_e")
|
||||||
|
return " Elite";
|
||||||
|
else if (endsWith == "_a")
|
||||||
|
return " Advanced";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
function getRankCellId(templateName)
|
||||||
|
{
|
||||||
|
var firstWord = getTemplateFirstWord(templateName);
|
||||||
|
var endsWith = templateName.substring(templateName.length-2, templateName.length);
|
||||||
|
|
||||||
|
if (firstWord == "units")
|
||||||
|
{
|
||||||
|
if (endsWith == "_e")
|
||||||
|
return 0;
|
||||||
|
else if (endsWith == "_a")
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
function isUnitElite(templateName)
|
function isUnitElite(templateName)
|
||||||
{
|
{
|
||||||
var eliteStatus = false;
|
var eliteStatus = false;
|
||||||
|
@ -315,6 +315,7 @@
|
|||||||
|
|
||||||
<!-- Details text -->
|
<!-- Details text -->
|
||||||
<object size="10 0 100%-10 56" name="selectionDetailsMainText" type="image" sprite="wheatWindowTitle">
|
<object size="10 0 100%-10 56" name="selectionDetailsMainText" type="image" sprite="wheatWindowTitle">
|
||||||
|
<object size="0 0 32 32" name="rankIconImage" type="image" cell_id="0" tooltip_style="snToolTip"/>
|
||||||
<object size="0 5 100% 30" name="selectionDetailsSpecific" type="text" style="largeBoldCenteredText" tooltip_style="snToolTip"/>
|
<object size="0 5 100% 30" name="selectionDetailsSpecific" type="text" style="largeBoldCenteredText" tooltip_style="snToolTip"/>
|
||||||
<object hidden="true" size="0 20 100% 40" name="selectionDetailsGeneric" type="text" font="serif-14"/>
|
<object hidden="true" size="0 20 100% 40" name="selectionDetailsGeneric" type="text" font="serif-14"/>
|
||||||
<object size="0 30 100% 50" name="selectionDetailsPlayer" type="text" style="centeredText" font="serif-bold-14" tooltip_style="snToolTip"/>
|
<object size="0 30 100% 50" name="selectionDetailsPlayer" type="text" style="centeredText" font="serif-bold-14" tooltip_style="snToolTip"/>
|
||||||
@ -349,11 +350,14 @@
|
|||||||
hidden="true"
|
hidden="true"
|
||||||
z="0"
|
z="0"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
<!--
|
||||||
<object name="bronzeSquares"
|
<object name="bronzeSquares"
|
||||||
type="image"
|
type="image"
|
||||||
sprite="bronzeCommandsSquares"
|
sprite="bronzeCommandsSquares"
|
||||||
size="56 10 414 100%"
|
size="56 10 414 100%"
|
||||||
/>
|
/>
|
||||||
|
-->
|
||||||
|
|
||||||
<object name="unitConstructionPanel"
|
<object name="unitConstructionPanel"
|
||||||
size="0 10 100% 33%"
|
size="0 10 100% 33%"
|
||||||
|
@ -34,7 +34,7 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c
|
|||||||
name = getFullName(template);
|
name = getFullName(template);
|
||||||
|
|
||||||
// Tooltip
|
// Tooltip
|
||||||
var tooltip = (isUnitElite(entType)? "Elite " + name : name ); // "Elite " is not formatted in bold, so may need custom versions of this later
|
var tooltip = name; //(isUnitElite(entType)? "Elite " + name : name );
|
||||||
|
|
||||||
if (guiName == "Selection")
|
if (guiName == "Selection")
|
||||||
{
|
{
|
||||||
|
@ -28,7 +28,7 @@ GuiInterface.prototype.GetSimulationState = function(player)
|
|||||||
var playerData = {
|
var playerData = {
|
||||||
"name": cmpPlayer.GetName(),
|
"name": cmpPlayer.GetName(),
|
||||||
"civ": cmpPlayer.GetCiv(),
|
"civ": cmpPlayer.GetCiv(),
|
||||||
"colour": cmpPlayer.GetColour(),
|
"color": cmpPlayer.GetColour(),
|
||||||
"popCount": cmpPlayer.GetPopulationCount(),
|
"popCount": cmpPlayer.GetPopulationCount(),
|
||||||
"popLimit": cmpPlayer.GetPopulationLimit(),
|
"popLimit": cmpPlayer.GetPopulationLimit(),
|
||||||
"resourceCounts": cmpPlayer.GetResourceCounts()
|
"resourceCounts": cmpPlayer.GetResourceCounts()
|
||||||
|
Loading…
Reference in New Issue
Block a user