Ticket #2055: SharedLOSTechv2.patch

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

@@ -35 +35 @@
     this.cheatsEnabled = false;
     this.cheatTimeMultiplier = 1;
     this.heroes = [];
+    this.sharedLos = false;
     this.resourceNames = {
         "food": markForTranslation("Food"),
         "wood": markForTranslation("Wood"),
@@ -114 +115 @@
 
 Player.prototype.AddPopulation = function(num)
 {
-    this.popUsed += num;
+    this.popUsed += num;
 };
 
 Player.prototype.SetPopulationBonuses = function(num)
@@ -445 +446 @@
 
 Player.prototype.UpdateSharedLos = function()
 {
-    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
     if (!cmpRangeManager)
         return;
 
-    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
     if (!cmpPlayerManager)
         return;
 
-    var sharedLos = [];
-    for (var i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
-        if (this.IsMutualAlly(i))
-            sharedLos.push(i);
+    let cmpTechnologyManager = Engine.QueryInterface(this.entity, IID_TechnologyManager);
+    if (!cmpTechnologyManager)
+        return;
 
-    cmpRangeManager.SetSharedLos(this.playerID, sharedLos);
+    if(!this.sharedLos) {
+        cmpRangeManager.SetSharedLos(this.playerID, [this.playerID]);
+        return;
+    }
+
+    let sharedLosPlayers = [];
+    for (let i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
+        if (this.IsMutualAlly(i) && this.sharedLos)
+            sharedLosPlayers.push(i);
+
+    cmpRangeManager.SetSharedLos(this.playerID, sharedLosPlayers);
 };
 
 Player.prototype.GetFormations = function()
@@ -788 +798 @@
     this.startingTechnologies = techs;
 };
 
-Engine.RegisterComponentType(IID_Player, "Player", Player);
+Player.prototype.OnValueModification = function(msg)
+{
+    if (msg.component != "Player")
+        return;
+
+    let oldSharedLos = this.sharedLos;
+    this.sharedLos = ApplyValueModificationsToPlayer("Player/sharedLos", this.sharedLos, this.entity);
+
+    if (oldSharedLos != this.sharedLos)
+        this.UpdateSharedLos();
+};
+
+Engine.RegisterComponentType(IID_Player, "Player", Player);
+ No newline at end of file

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

@@ -51 +51 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       speed_trader_01
+      unlock_shared_los
     </Technologies>
     <Entities datatype="tokens">
       units/{civ}_support_trader