Ticket #3213: rh-side_updated.patch

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

@@ -102 +102 @@
             hideRemaining("phase["+i+"]_struct["+s+"]_row[", r, "]");
             ++s;
         }
+        
         hideRemaining("phase["+i+"]_struct[", s, "]");
         ++i;
     }
+    
+    var t = 0;
+    for (let trainer of g_CivData[g_SelectedCiv].trainList)
+    {
+        let thisEle = Engine.GetGUIObjectByName("trainer["+t+"]");
+        if (thisEle === undefined)
+        {
+            error("\""+g_SelectedCiv+"\" has more unit trainers than can be supported by the current GUI layout");
+            break;
+        }
+
+        trainer = g_ParsedData.units[trainer];
+        Engine.GetGUIObjectByName("trainer["+t+"]_icon").sprite = "stretched:session/portraits/"+trainer.icon;
+        Engine.GetGUIObjectByName("trainer["+t+"]_icon").tooltip = assembleTooltip(trainer);
+        Engine.GetGUIObjectByName("trainer["+t+"]_name").caption = translate(trainer.name.specific);
+        thisEle.hidden = false;
+        
+        let p = 0;
+        for (let prod of trainer.trainer)
+        {
+            prod = g_ParsedData.units[prod];
+            if (!drawProdIcon(null, t, null, p, prod))
+                break;
+            p++;
+        }
+        hideRemaining("trainer["+t+"]_prod[", p, "]");
+
+        let size = thisEle.size;
+        size.right = size.left + ((p*24 < defWidth)?defWidth:p*24)+4;
+        thisEle.size = size;
+
+        let eleWidth = size.right - size.left;
+        let wid = p * 24 - 4;
+        let phaEle = Engine.GetGUIObjectByName("trainer["+t+"]_row");
+        size = phaEle.size;
+        size.left = (eleWidth - wid)/2;
+        phaEle.size = size;
+        ++t;
+    }
+    hideRemaining("trainer[", t, "]");
+    
+    if (t > 0)
+    {
+        Engine.GetGUIObjectByName("display_trainers").hidden = false;
+        var size = Engine.GetGUIObjectByName("display_tree").size;
+        size.right = -124;
+        Engine.GetGUIObjectByName("display_tree").size = size;
+    }
+    else
+    {
+        Engine.GetGUIObjectByName("display_trainers").hidden = true;
+        var size = Engine.GetGUIObjectByName("display_tree").size;
+        size.right = -4;
+        Engine.GetGUIObjectByName("display_tree").size = size;
+    }
 }
 
-function drawProdIcon(pha, s, r, p, prod)
+function drawProdIcon(pha = null, s, r, p, prod)
 {
     var prodEle = Engine.GetGUIObjectByName("phase["+pha+"]_struct["+s+"]_row["+r+"]_prod["+p+"]");
+    if (pha === null)
+        prodEle = Engine.GetGUIObjectByName("trainer["+s+"]_prod["+p+"]");
+
     if (prodEle === undefined)
     {
-        error("The structures of \""+g_SelectedCiv+"\" have more production icons in phase "+pha+" than can be supported by the current GUI layout");
+        error("The "+(pha === null ? "trainer units" : "structures")+" of \""+g_SelectedCiv+"\" have more production icons than can be supported by the current GUI layout");
         return false;
     }
 
@@ -236 +295 @@
     }
     hideRemaining("phase[", i, "]");
     hideRemaining("phase[", i, "]_bar");
+    
+    var t = 0;
+    var ele = Engine.GetGUIObjectByName("trainer["+t+"]");
+    g_DrawLimits.trainer = {
+        trainerQuant: 0,
+        prodQuant: 0
+    }
+    
+    var x = 4;
+    do
+    {
+        let p = 0;
+        let prodEle = Engine.GetGUIObjectByName("trainer["+t+"]_prod["+p+"]");
+        do
+        {
+            let prodsize = prodEle.size;
+            prodsize.left = (initIconSize.right+4) * p;
+            prodsize.right = (initIconSize.right+4) * (p+1) - 4;
+            prodEle.size = prodsize;
+
+            p++;
+            prodEle = Engine.GetGUIObjectByName("trainer["+t+"]_prod["+p+"]");
+        } while (prodEle !== undefined);
+        Engine.GetGUIObjectByName("trainer["+t+"]_row").size = "4 100%-24"+" 100%-4 100%";
+        g_DrawLimits.trainer.prodQuant = p;
+        
+        let size = ele.size;
+        size.top += x
+        size.bottom += x + 24;
+        x += size.bottom - size.top + 8;
+        ele.size = size;
+        
+        t++;
+        ele = Engine.GetGUIObjectByName("trainer["+t+"]");
+        
+    } while (ele !== undefined);
+    
+    g_DrawLimits.trainer.trainerQuant = t;
 }
 
 /**

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

@@ -54 +54 @@
 
     unit.gather = getGatherRates(templateName);
 
+    if (template.ProductionQueue)
+    {
+        unit.trainer = [];
+        for (let build of template.ProductionQueue.Entities._string.split(" "))
+        {
+            build = build.replace("{civ}", g_SelectedCiv);
+            unit.trainer.push(build);
+            if (g_Lists.units.indexOf(build) < 0)
+                g_Lists.units.push(build);
+        }
+    }
+
     if (template.Heal)
         unit.healer = {
             "Range": +template.Heal.Range || 0,

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

@@ -224 +224 @@
 
     // Determine the buildList for the civ (grouped by phase)
     var buildList = {};
+    var trainerList = [];
     for (let pha of g_ParsedData.phaseList)
         buildList[pha] = [];
     for (let structCode of g_Lists.structures)
@@ -234 +235 @@
         let myPhase = g_ParsedData.structures[structCode].phase;
         buildList[myPhase].push(structCode);
     }
+    for (let unitCode of g_Lists.units)
+        if (g_ParsedData.units[unitCode] && g_ParsedData.units[unitCode].trainer)
+            trainerList.push(unitCode);
 
     g_CivData[g_SelectedCiv].buildList = buildList;
+    g_CivData[g_SelectedCiv].trainList = trainerList;
 
     // Draw tree
     draw();

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

@@ -61 +61 @@
             size="104 52 100%-8 100%"
         />
 
-        <!-- Data display -->
-        <object size="0 54+64 100% 100%-54">
+        <!-- Structure Tree display -->
+        <object size="0 54+64 100%-124 100%-54" name="display_tree">
             <repeat count="4" var="n">
                 <object name="phase[n]_phase" type="image"/>
                 <object name="phase[n]_bar">
@@ -74 +74 @@
                 </object>
             </repeat>
 
-            <object type="image" style="TreeDisplay" size="48+16+8 0 100%-16 100%">
+            <object type="image" style="TreeDisplay" size="48+16+8 0 100%-12 100%">
                 <include file="gui/structree/rows.xml"/>
             </object>
+        </object>
 
+        <!-- Trainer Units display -->
+        <object size="100%-124 54+64 100%-16 100%-54" name="display_trainers">
+            <object
+                type="text"
+                font="sans-bold-14"
+                textcolor="white"
+                text_align="center"
+                text_valign="top"
+                size="0 0 100% 16"
+            >
+                <translatableAttribute id="caption">Trainer Units</translatableAttribute>
+            </object>
+            
+            <object type="image" style="TreeDisplay" size="0 24 100% 100%">
+                <repeat count="3" var="t">
+                    <object type="image" style="StructBox" name="trainer[t]">
+                        <object type="text" style="StructNameSpecific" name="trainer[t]_name"/>
+                        <object type="image" style="StructIcon" name="trainer[t]_icon"
+                            sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
+                        />
+                        <object name="trainer[t]_row">
+                            <repeat count="4" var="p">
+                                <object type="image" style="ProdBox" name="trainer[t]_prod[p]"/>
+                            </repeat>
+                        </object>
+                    </object>
+                </repeat>
+            </object>
         </object>
 
         <!-- Close dialog -->