diff --git a/binaries/data/mods/public/gui/session_new/selection_details.js b/binaries/data/mods/public/gui/session_new/selection_details.js index 30fa6c46da..55caa56acf 100644 --- a/binaries/data/mods/public/gui/session_new/selection_details.js +++ b/binaries/data/mods/public/gui/session_new/selection_details.js @@ -36,7 +36,7 @@ function selectionLayoutSingle() getGUIObjectByName("selectionDetailsArmour").hidden = false; getGUIObjectByName("selectionDetailsMainText").sprite = ""; - getGUIObjectByName("selectionDetailsSpecific").sprite = "wheatWindowTitle"; + getGUIObjectByName("selectionDetailsSpecific").sprite = ""; } // Fills out information that most entities have @@ -48,10 +48,14 @@ function displayGeneralInfo(playerState, entState, template) var iconTooltip = ""; // 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 - 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; iconTooltip += "[font=\"serif-bold-16\"]" + name + "[/font]"; diff --git a/binaries/data/mods/public/gui/session_new/session.js b/binaries/data/mods/public/gui/session_new/session.js index ed9f709a79..f85e5fcb2b 100644 --- a/binaries/data/mods/public/gui/session_new/session.js +++ b/binaries/data/mods/public/gui/session_new/session.js @@ -201,6 +201,53 @@ function damageTypesToText(dmg) 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) { var eliteStatus = false; diff --git a/binaries/data/mods/public/gui/session_new/session.xml b/binaries/data/mods/public/gui/session_new/session.xml index 9efae7a1e3..e9deb760e3 100644 --- a/binaries/data/mods/public/gui/session_new/session.xml +++ b/binaries/data/mods/public/gui/session_new/session.xml @@ -315,6 +315,7 @@ +