Ticket #1802: hero_button.4.patch

binaries/data/mods/public/gui/common/global.xml

@@ -26 +26 @@
             sprite="colour: 0 0 0 200"
             font="mono-stroke-10"
             textcolor="white"
-            size="5 35 80 55"
+            size="100%-80 70 100%-10 90"
             z="199"
         >
             <action on="Tick"><![CDATA[

binaries/data/mods/public/gui/session/session.js

@@ -369 +369 @@
     if (g_ShowAllStatusBars)
         recalculateStatusBarDisplay();
 
+    updateHero(simState);
     updateGroups();
     updateDebug(simState);
     updatePlayerDisplay(simState);
@@ -383 +384 @@
         global.music.setState(global.music.states[battleState]);
 }
 
+function updateHero(simState)
+{
+    var playerState = simState.players[Engine.GetPlayerID()];
+
+    if (playerState.heroes.length > 0)
+    {
+        var heroImage = getGUIObjectByName("unitHeroImage");
+        var heroState = Engine.GuiInterfaceCall("GetEntityState", playerState.heroes[0]);
+        var template = GetTemplateData(heroState.template);
+        heroImage.sprite = "stretched:session/portraits/" + template.icon;
+
+        var heroButton = getGUIObjectByName("unitHeroButton");
+        heroButton.onpress = (function(e) { return function() { g_Selection.reset(); g_Selection.addList([e]); } })(playerState.heroes[0]);
+        heroButton.ondoublepress = (function(e) { return function() { selectAndMoveTo(e) }; })(playerState.heroes[0]);
+        heroButton.hidden = false;
+        
+        // Setup tooltip
+
+        var name = "[font=\"serif-bold-16\"]" + template.name.specific + "[/font] ";
+        var health = "[font=\"serif-bold-13\"]Health:[/font] " + heroState.hitpoints + "/" + heroState.maxHitpoints;
+        
+        var type = "";
+        if (heroState.attack)
+            type = heroState.attack.type + " ";
+        var attack = "[font=\"serif-bold-13\"]" + type + "Attack:[/font] " + damageTypeDetails(heroState.attack);
+        // Show max attack range if ranged attack, also convert to tiles (4m per tile)
+        if (heroState.attack && heroState.attack.type == "Ranged")
+            attack += ", [font=\"serif-bold-13\"]Range:[/font] " + Math.round(heroState.attack.maxRange/4);
+
+        var armor = "[font=\"serif-bold-13\"]Armor:[/font] " + damageTypeDetails(heroState.armour);
+        var extra = template.tooltip;
+        
+        heroButton.tooltip = name + "\n" + health + "\n" + attack + "\n" + armor + "\n" + extra;
+    }
+    else
+    {   
+        var heroButton = getGUIObjectByName("unitHeroButton");
+        heroButton.hidden = true;
+    }
+
+};
+
 function updateGroups()
 {
     var guiName = "Group";

binaries/data/mods/public/gui/session/session.xml

@@ -666 +757 @@
     </object>
 
     <!-- ================================  ================================ -->
+    <!-- Hero Selection -->
+    <!-- ================================  ================================ -->
+    <object
+        name="unitHeroPanel"
+        size="0% 5% 0%+50 5%+50"
+    >
+        <object name="unitHeroButton" size="0 0 50 50" type="button" hidden="false" style="iconButton" 
+            tooltip_style="sessionToolTip" tooltip="Attack and Armor">
+            <object name="unitHeroImage" size="5 5 100%-5 100%-5" type="image" ghost="true"/>
+        </object>
+
+    </object>   
+    
+    <!-- ================================  ================================ -->
     <!-- Unit Selection Groups -->
     <!-- ================================  ================================ -->
     <objectIndex: binaries/data/mods/public/simulation/components/GuiInterface.js

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -79 +79 @@
             "popCount": cmpPlayer.GetPopulationCount(),
             "popLimit": cmpPlayer.GetPopulationLimit(),
             "popMax": cmpPlayer.GetMaxPopulation(),
+            "heroes": cmpPlayer.GetHeroes(),
             "resourceCounts": cmpPlayer.GetResourceCounts(),
             "trainingBlocked": cmpPlayer.IsTrainingBlocked(),
             "state": cmpPlayer.GetState(),

binaries/data/mods/public/simulation/components/Player.js

@@ -19 +19 @@
         "metal": 300,
         "stone": 300
     };
-
+    
     this.team = -1; // team number of the player, players on the same team will always have ally diplomatic status - also this is useful for team emblems, scoring, etc.
     this.teamsLocked = false;
     this.state = "active"; // game state - one of "active", "defeated", "won"
@@ -32 +32 @@
     this.isAI = false;
     this.cheatsEnabled = true;
     this.cheatTimeMultiplier = 1;
+    this.heroes = [];
 };
 
 Player.prototype.SetPlayerID = function(id)
@@ -109 +110 @@
     return Math.round(ApplyTechModificationsToPlayer("Player/MaxPopulation", this.maxPop, this.entity));
 };
 
+Player.prototype.GetHeroes = function()
+{
+    return this.heroes;
+};
+
 Player.prototype.IsTrainingBlocked = function()
 {
     return this.trainingBlocked;
@@ -446 +452 @@
 Player.prototype.OnGlobalOwnershipChanged = function(msg)
 {
     var isConquestCritical = false;
+    var cmpIdentity = Engine.QueryInterface(msg.entity, IID_Identity);
+    
     // Load class list only if we're going to need it
     if (msg.from == this.playerID || msg.to == this.playerID)
     {
-        var cmpIdentity = Engine.QueryInterface(msg.entity, IID_Identity);
         if (cmpIdentity)
         {
             isConquestCritical = cmpIdentity.HasClass("ConquestCritical");
@@ -465 +472 @@
             this.popUsed -= cost.GetPopCost();
             this.popBonuses -= cost.GetPopBonus();
         }
+        
+        if (cmpIdentity && cmpIdentity.HasClass("Hero"))
+        {
+            //Remove from Heroes list
+            var index = this.heroes.indexOf(msg.entity);
+            if (index >= 0)
+            {
+                this.heroes.splice(index, 1);
+            }
+            else
+            {
+                // Why is not the Hero in the list?
+            }
+        }
+        
     }
     if (msg.to == this.playerID)
     {
@@ -476 +498 @@
             this.popUsed += cost.GetPopCost();
             this.popBonuses += cost.GetPopBonus();
         }
+        
+        if (cmpIdentity && cmpIdentity.HasClass("Hero"))
+        {
+            this.heroes.push(msg.entity);
+        }
     }
 };