Ticket #3277: ticket3277.patch

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

@@ +1 @@
+function Market() {}
+
+Market.prototype.Schema =
+    "<empty/>";
+
+Market.prototype.Init = function()
+{
+    this.traders = [];  // list of traders with a route on this market
+};
+
+Market.prototype.GetTraders = function()
+{
+    return this.traders.slice();
+};
+
+Market.prototype.AddTrader = function(ent)
+{
+    if (this.traders.indexOf(ent) != -1)
+        return;
+    this.traders.push(ent); 
+};
+
+Market.prototype.RemoveTrader = function(ent)
+{
+    let index = this.traders.indexOf(ent);
+    if (index != -1)
+        this.traders.splice(index, 1);
+};
+
+/* Check if all traders with a route on this market can still trade */
+Market.prototype.OnOwnershipChanged = function(msg)
+{
+    for (let ent of this.traders)
+    {
+        let cmpTrader = Engine.QueryInterface(ent, IID_Trader);
+        if (!cmpTrader || (msg.to == -1 || !cmpTrader.CanTrade(this.entity)))
+        {
+            this.RemoveTrader(ent);
+            if (cmpTrader)
+                cmpTrader.RemoveMarket(this.entity);
+        }
+    }
+};
+
+Engine.RegisterComponentType(IID_Market, "Market", Market);

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

@@ -1 @@
-// See helpers/TraderGain.js for the CalculateTaderGain() function which works out how many 
-// resources a trader gets 
+// See helpers/TraderGain.js for the CalculateTaderGain() function which works out how many
+// resources a trader gets
 
 // Additional gain for ships for each garrisoned trader, in percents
 const GARRISONED_TRADER_ADDITION = 20;
@@ -61 +61 @@
                 gain.market2Gain = Math.round(garrisonMultiplier * gain.market2Gain);
         }
     }
-    
+
     return gain;
 };
 
@@ -69 +69 @@
 // Return true if at least one of markets was changed.
 Trader.prototype.SetTargetMarket = function(target, source)
 {
-    // Check that target is a market
-    var cmpTargetIdentity = Engine.QueryInterface(target, IID_Identity);
-    if (!cmpTargetIdentity)
+    var cmpTargetMarket = Engine.QueryInterface(target, IID_Market);
+    if (!cmpTargetMarket)
         return false;
-    if (!cmpTargetIdentity.HasClass("Market") && !cmpTargetIdentity.HasClass("NavalMarket"))
-        return false;
 
     if (source)
     {
         // Establish a trade route with both markets in one go.
-        cmpTargetIdentity = Engine.QueryInterface(source, IID_Identity);
-        if (!cmpTargetIdentity)
+        let cmpSourceMarket = Engine.QueryInterface(source, IID_Market);
+        if (!cmpSourceMarket)
             return false;
-        if (!cmpTargetIdentity.HasClass("Market") && !cmpTargetIdentity.HasClass("NavalMarket"))
-            return false;
         this.markets = [source];
+        cmpSourceMarket.AddTrader(this.entity);
     }
     if (this.markets.length >= 2)
     {
         // If we already have both markets - drop them
         // and use the target as first market
+        for (let market of this.markets)
+        {
+            let cmpMarket = Engine.QueryInterface(market, IID_Market);
+            if (cmpMarket)
+                cmpMarket.RemoveTrader(this.entity);
+        }
         this.index = 0;
         this.markets = [target];
+        cmpTargetMarket.AddTrader(this.entity);
     }
     else if (this.markets.length == 1)
     {
@@ -103 +106 @@
         {
             this.index = 0;
             this.markets.push(target);
+            cmpTargetMarket.AddTrader(this.entity);
             this.goods.amount = this.CalculateGain(this.markets[0], this.markets[1]);
         }
     }
@@ -112 +116 @@
         // set the target as first market
         this.index = 0;
         this.markets = [target];
+        cmpTargetMarket.AddTrader(this.entity);
     }
     // Drop carried goods if markets were changed
     this.goods.amount = null;
@@ -242 +247 @@
     return this.goods;
 };
 
+/* Called when this trader can no more trade with the market */
+Trader.prototype.RemoveMarket = function(market)
+{
+    let index = this.markets.indexOf(market);
+    if (index != -1)
+        this.markets.splice(index, 1);
+};
+
 Trader.prototype.StopTrading = function()
 {
+    for (let market of this.markets)
+    {
+        let cmpMarket = Engine.QueryInterface(market, IID_Market);
+        if (cmpMarket)
+            cmpMarket.RemoveTrader(this.entity);
+    }
     this.index = -1;
     this.markets = [];
     // Drop carried goods

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

@@ +1 @@
+Engine.RegisterInterface("Market");

binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml

@@ -32 +32 @@
     <stone>25</stone>
     <metal>25</metal>
   </Loot>
+  <Market/>
   <Obstruction>
     <Static width="30.0" depth="26.0"/>
   </Obstruction>

binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml

@@ -34 +34 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
+  <Market/>
   <Obstruction>
     <Static width="18.0" depth="18.0"/>
   </Obstruction>