Ticket #2055: SharedLOSTechv6.patch

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

@@ -1 +1 @@
 function Player() {}
 
 Player.prototype.Schema =
-    "<a:component type='system'/><empty/>";
+    "<optional>" +
+        "<element name='SharedLosTech'>" +
+            "<text/>" +
+        "</element>" +
+    "</optional>";
 
 Player.prototype.Init = function()
 {
@@ -114 +118 @@
 
 Player.prototype.AddPopulation = function(num)
 {
-    this.popUsed += num;
+    this.popUsed += num;
 };
 
 Player.prototype.SetPopulationBonuses = function(num)
@@ -445 +449 @@
 
 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.template || !this.template.SharedLosTech)
+        return;
 
+    if (!cmpTechnologyManager.IsTechnologyResearched(this.template.SharedLosTech)) 
+    {
+        cmpRangeManager.SetSharedLos(this.playerID, [this.playerID]);
+        return;
+    }
+
+    let sharedLosPlayers = [];
+    for (let i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
+        if (this.IsMutualAlly(i) && cmpTechnologyManager.IsTechnologyResearched(this.template.SharedLosTech))
+            sharedLosPlayers.push(i);
+
+    cmpRangeManager.SetSharedLos(this.playerID, sharedLosPlayers);
 };
 
 Player.prototype.GetFormations = function()
@@ -788 +806 @@
     this.startingTechnologies = techs;
 };
 
-Engine.RegisterComponentType(IID_Player, "Player", Player);
+Engine.RegisterComponentType(IID_Player, "Player", Player);
+ No newline at end of file

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

@@ -373 +373 @@
     if (cmpPlayerEntityLimits)
         cmpPlayerEntityLimits.UpdateLimitsFromTech(tech);
 
+    // Update Shared LOS
+    if (tech == cmpPlayer.template.SharedLosTech)
+        cmpPlayer.UpdateSharedLos();
+
     // Call the related trigger event 
     var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
     cmpTrigger.CallEvent("ResearchFinished", {"player": playerID, "tech": tech});

binaries/data/mods/public/simulation/data/technologies/unlock_shared_los.json

@@ +1 @@
+{
+    "genericName": "Cartography",
+    "description": "By means of trading and travelling people explored beyond the boundaries of their lands and drew maps of it in order to share and memorize their discoveries.",
+    "cost": {"food": 100, "wood": 0, "stone": 0, "metal": 100},
+    "requirements": {"tech": "phase_village"},
+    "icon": "shared_los.png",
+    "researchTime": 40,
+    "tooltip": "Player sees what his allies see.",
+    "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
+ No newline at end of file

binaries/data/mods/public/simulation/templates/special/player.xml

@@ -48 +48 @@
       </CivilCentre>
     </LimitRemovers>
   </EntityLimits>
-  <Player/>
+  <Player>
+    <SharedLosTech>unlock_shared_los</SharedLosTech>
+  </Player>
   <StatisticsTracker/>
   <TechnologyManager/>
-</Entity>
+</Entity>
+ 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