Ticket #3894: marketVisibility.patch

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

@@ -129 +129 @@
     if (cmpResourceSupply)
         cmpMirage.CopyResourceSupply(cmpResourceSupply);
 
+    var cmpMarket = Engine.QueryInterface(this.entity, IID_Market);
+    if (cmpMarket)
+        cmpMirage.CopyMarket(cmpMarket);
+
     // Notify the GUI the entity has been replaced by a mirage, in case it is selected at this moment
     var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     cmpGuiInterface.AddMiragedEntity(player, this.entity, this.mirages[player]);

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

@@ -289 +289 @@
     if (cmpBuilder)
         ret.builder = true;
 
-    let cmpMarket = Engine.QueryInterface(ent, IID_Market);
+    let cmpMarket = QueryMiragedInterface(ent, IID_Market);
     if (cmpMarket)
         ret.market = {
             "land": cmpMarket.HasType("land"),

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

@@ -33 +33 @@
     return this.tradeType.has(type);
 };
 
+Market.prototype.GetType = function()
+{
+    return this.tradeType;
+};
+
 /**
  * Check if all traders with a route on this market can still trade
  */
@@ -59 +64 @@
         if (!cmpTrader)
             this.RemoveTrader(ent);
         else if (msg.to == -1)
-            cmpTrader.RemoveMarket(this.entity);
+        {
+            let cmpOwnership = Engine.QueryInterface(ent, IID_Ownership);
+            let cmpFogging = Engine.QueryInterface(this.entity, IID_Fogging);
+            if (cmpOwnership && cmpFogging && cmpFogging.IsMiraged(cmpOwnership.GetOwner()))
+                cmpTrader.SwitchMarket(this.entity, cmpFogging.GetMirage(cmpOwnership.GetOwner()));
+            else
+                cmpTrader.RemoveMarket(this.entity);
+        }
         else if (!cmpTrader.CanTrade(this.entity))
         {
             this.RemoveTrader(ent);

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

@@ -34 +34 @@
     this.killBeforeGather = null;
     this.maxGatherers = null;
     this.numGatherers = null;
+
+    this.marketType = null;
 };
 
+Mirage.prototype.GetParent = function()
+{
+    return this.parent;
+};
+
 Mirage.prototype.SetParent = function(ent)
 {
     this.parent = ent;
@@ -125 +132 @@
 Mirage.prototype.GetMaxGatherers = function() { return this.maxGatherers; };
 Mirage.prototype.GetNumGatherers = function() { return this.numGatherers; };
 
+// Market data
+
+Mirage.prototype.CopyMarket = function(cmpMarket)
+{
+    this.miragedIids.add(IID_Market);
+    this.marketType = cmpMarket.GetType();
+};
+
+Mirage.prototype.HasType = function(type) { return this.marketType.has(type); };
+
 // ============================
 
 Mirage.prototype.OnVisibilityChanged = function(msg)

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

@@ -45 +45 @@
         {
             var garrisonMultiplier = 1;
             var garrisonedTradersCount = 0;
-            for each (var entity in cmpGarrisonHolder.GetEntities())
+            for (var entity of cmpGarrisonHolder.GetEntities())
             {
                 var cmpGarrisonedUnitTrader = Engine.QueryInterface(entity, IID_Trader);
                 if (cmpGarrisonedUnitTrader)
@@ -156 +156 @@
 {
     var cmpTraderIdentity = Engine.QueryInterface(this.entity, IID_Identity);
     // Check that the target exists
-    var cmpTargetMarket = Engine.QueryInterface(target, IID_Market);
+    var cmpTargetMarket = QueryMiragedInterface(target, IID_Market);
     if (!cmpTargetMarket)
         return false;
     // Check that the target is not a foundation
@@ -248 +248 @@
 };
 
 /**
- * Called when this trader can no longer trade with the market
+ * The two following functions are called when this trader can no longer trade with the market:
+ * - if the market is destroyed and not visible, it is replaced by its mirage if it exists
+ * - otherwise the market is removed
  */
 Trader.prototype.RemoveMarket = function(market)
 {
@@ -257 +259 @@
         this.markets.splice(index, 1);
 };
 
+Trader.prototype.SwitchMarket = function(market, miragedMarket)
+{
+    if (miragedMarket == INVALID_ENTITY)
+    {
+        this.RemoveMarket(market);
+        return;
+    }
+    let index = this.markets.indexOf(market);
+    if (index != -1)
+        this.markets[index] = miragedMarket;
+};
+
 Trader.prototype.StopTrading = function()
 {
     for (let market of this.markets)

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

@@ -648 +648 @@
     "Order.Trade": function(msg) {
         // We must check if this trader has both markets in case it was a back-to-work order
         var cmpTrader = Engine.QueryInterface(this.entity, IID_Trader);
-        if (!cmpTrader || ! cmpTrader.HasBothMarkets())
+        if (!cmpTrader || !cmpTrader.HasBothMarkets())
         {
             this.FinishOrder();
             return;
@@ -5156 +5156 @@
         return;
     }
 
+    // Register the parent when dealing with mirages
+    if (target)
+    {
+        let cmpMirage = Engine.QueryInterface(target, IID_Mirage);
+        if (cmpMirage)
+        {
+            let parent = cmpMirage.GetParent();
+            if (parent && Engine.QueryInterface(parent, IID_Market))
+                target = parent;
+        }
+    }
+    if (source)
+    {
+        let cmpMirage = Engine.QueryInterface(source, IID_Mirage);
+        if (cmpMirage)
+        {
+            let parent = cmpMirage.GetParent();
+            if (parent && Engine.QueryInterface(parent, IID_Market))
+                source = parent;
+        }
+    }
+
     var marketsChanged = this.SetTargetMarket(target, source);
     if (!marketsChanged)
         return;