Ticket #4193: 4193-loot-tooltip.patch

binaries/data/mods/public/globalscripts/Templates.js

@@ -244 +244 @@
             "rate": getEntityValue("Heal/Rate")
         };
 
+    if (template.Loot)
+    {
+        ret.loot = {};
+        if (template.Loot.xp)
+            ret.loot.xp = getEntityValue("Loot/xp");
+        if (template.Loot.food)
+            ret.loot.food = getEntityValue("Loot/food");
+
+        if (template.Loot.wood)
+            ret.loot.wood = getEntityValue("Loot/wood");
+
+        if (template.Loot.stone)
+            ret.loot.stone = getEntityValue("Loot/stone");
+
+        if (template.Loot.metal)
+            ret.loot.metal = getEntityValue("Loot/metal");
+    }
+
     if (template.Obstruction)
     {
         ret.obstruction = {

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

@@ -25 +25 @@
         sprite="stretched:session/icons/resources/time_small.png"
         size="16 16"
     />
+    <icon name="icon_xp"
+        sprite="stretched:session/icons/resources/xp_small.png"
+        size="16 16"
+    />
 </setup>

binaries/data/mods/public/gui/common/tooltips.js

@@ -575 +575 @@
     return headerFont(translate("Classes:")) + ' ' +
         bodyFont(template.visibleIdentityClasses.map(c => translate(c)).join(translate(", ")));
 }
+
+function getLootTooltip(template, trainNum, entity)
+{
+    if (template.loot)
+    {
+        let loots = [];
+        for (let type in template.loot)
+            loots.push(sprintf(translate("%(component)s %(loot)s"), {
+                "component": costIcon(type),
+                "loot": template.loot[type]
+        }));
+        
+        return headerFont("Loot: ") + loots;
+    }
+    return "";
+}

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

@@ +1 @@
+const lootTypes = ["xp", "food", "wood", "stone", "metal"];
+
 function layoutSelectionSingle()
 {
     Engine.GetGUIObjectByName("detailsAreaSingle").hidden = false;
@@ -291 +293 @@
         getBuildRateTooltip,
         getSpeedTooltip,
         getGarrisonTooltip,
-        getProjectilesTooltip
+        getProjectilesTooltip,
+        getLootTooltip
     ].map(func => func(entState)).filter(tip => tip).join("\n");
 
     let iconTooltips = [];
@@ -320 +323 @@
     let capturePoints = (new Array(g_MaxPlayers + 1)).fill(0);
     let playerID = 0;
     let totalResourcesCarried = {};
+    let totalTrade = {};
+    let totalLoot = {};
 
     for (let i = 0; i < selection.length; ++i)
     {
         let entState = GetEntityState(selection[i]);
+        let extEntState = GetExtendedEntityState(selection[i]);
         if (!entState)
             continue;
         playerID = entState.player; // trust that all selected entities have the same owner
@@ -338 +344 @@
             capturePoints = entState.capturePoints.map((v, i) => v + capturePoints[i]);
         }
 
+        if (extEntState.loot)
+        {
+            for (let i in lootTypes)
+            {
+                let type = lootTypes[i];
+                totalLoot[type] = (totalLoot[type] || 0) + extEntState.loot[type];
+            }
+        }
+
         if (entState.resourceCarrying && entState.resourceCarrying.length)
         {
             let carrying = entState.resourceCarrying[0];
             totalResourcesCarried[carrying.type] = (totalResourcesCarried[carrying.type] || 0) + carrying.amount;
         }
+
+        if (entState.trader && entState.trader.goods)
+        {
+            let totalGain = entState.trader.goods.amount.traderGain;
+            if (entState.trader.goods.amount.market1Gain)
+                totalGain += entState.trader.goods.amount.market1Gain;
+            if (entState.trader.goods.amount.market2Gain)
+                totalGain += entState.trader.goods.amount.market2Gain;
+
+            totalTrade[entState.trader.goods.type] = totalGain;
+        }
     }
 
+    for (let i in lootTypes)
+    {
+        let type = lootTypes[i];
+        totalLoot[type] += totalResourcesCarried[type] || 0;
+        totalLoot[type] += totalTrade[type] || 0;
+        if (totalLoot[type] == 0)
+            delete totalLoot[type];
+    }
+
     Engine.GetGUIObjectByName("healthMultiple").hidden = averageHealth <= 0;
     if (averageHealth > 0)
     {
@@ -394 +429 @@
 
     let numberOfUnits = Engine.GetGUIObjectByName("numberOfUnits");
     numberOfUnits.caption = selection.length;
-    numberOfUnits.tooltip = Object.keys(totalResourcesCarried).map(res =>
-        costIcon(res) + totalResourcesCarried[res]
+    numberOfUnits.tooltip = (Object.keys(totalLoot)).map(res =>
+        costIcon(res) + totalLoot[res]
     ).join(" ");
 
     // Unhide Details Area

binaries/data/mods/public/gui/structree/draw.js

@@ -14 +14 @@
     getProjectilesTooltip,
     getSpeedTooltip,
     getGatherTooltip,
-    getPopulationBonusTooltip
+    getPopulationBonusTooltip,
+    getLootTooltip
 ];
 
 /**

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

@@ -421 +421 @@
         "barterMarket": null,
         "buildingAI": null,
         "heal": null,
+        "loot": null,
         "obstruction": null,
         "turretParent":null,
         "promotion": null,
@@ -568 +569 @@
             "healableClasses": cmpHeal.GetHealableClasses(),
         };
 
+    let cmpLoot = Engine.QueryInterface(ent, IID_Loot);
+    if (cmpLoot)
+    {
+        let resources = cmpLoot.GetResources();
+        ret.loot = {
+            "xp": cmpLoot.GetXp(),
+            "food": resources.food,
+            "wood": resources.wood,
+            "stone": resources.stone,
+            "metal": resources.metal
+        };
+    }
+
     let cmpUnitMotion = Engine.QueryInterface(ent, IID_UnitMotion);
     if (cmpUnitMotion)
         ret.speed = {