Ticket #4085: sharing-v2.patch

binaries/data/mods/public/simulation/ai/common-api/entity.js

@@ -623 +623 @@
     decaying: function() { return this._entity.decaying !== undefined ? this._entity.decaying : undefined; },
     capturePoints: function() {return this._entity.capturePoints !== undefined ? this._entity.capturePoints : undefined; },
 
+    "isSharedDropsite": function() { return this._entity.sharedDropsite === true; },
+
     /**
      * Returns the current training queue state, of the form
      * [ { "id": 0, "template": "...", "count": 1, "progress": 0.5, "metadata": ... }, ... ]

binaries/data/mods/public/simulation/ai/common-api/gamestate.js

@@ -595 +595 @@
 m.GameState.prototype.getOwnDropsites = function(resource)
 {
     if (resource !== undefined)
-        return this.updatingCollection("dropsite-" + resource, m.Filters.isDropsite(resource), this.getOwnEntities());
-    return this.updatingCollection("dropsite-all", m.Filters.isDropsite(), this.getOwnEntities());
+        return this.updatingCollection("ownDropsite-" + resource, m.Filters.isDropsite(resource), this.getOwnEntities());
+    return this.updatingCollection("ownDropsite-all", m.Filters.isDropsite(), this.getOwnEntities());
 };
 
+m.GameState.prototype.getAnyDropsites = function(resource)
+{
+    if (resource !== undefined)
+        return this.updatingGlobalCollection("anyDropsite-" + resource, m.Filters.isDropsite(resource), this.getEntities());
+    return this.updatingGlobalCollection("anyDropsite-all", m.Filters.isDropsite(), this.getEntities());
+};
+
 m.GameState.prototype.getResourceSupplies = function(resource)
 {
     return this.updatingGlobalCollection("resource-" + resource, m.Filters.byResource(resource), this.getEntities());

binaries/data/mods/public/simulation/ai/petra/entityExtend.js

@@ -99 +99 @@
     let closestDropsite;
     let distmin = Math.min();
     let access = gameState.ai.accessibility.getAccessValue(ent.position());
-    gameState.getOwnDropsites(resource).forEach(function(dropsite) {
-        if (!dropsite.position() || dropsite.getMetadata(PlayerID, "access") !== access)
-            return;
+    let hasSharedDropsites = gameState.playerData.hasSharedDropsites;
+    let dropsiteCollection = hasSharedDropsites ? gameState.getAnyDropsites(resource) : gameState.getOwnDropsites(resource);
+    for (let dropsite of dropsiteCollection.values())
+    {
+        if (!dropsite.position())
+            continue;
+        let owner = dropsite.owner();
+        // owner !== PlayerID can only happen when hasSharedDropsites === true, so no need to test it again
+        if (owner !== PlayerID && (!dropsite.isSharedDropsite() || !gameState.isPlayerMutualAlly(owner)))
+            continue;
+        let dropsiteAccess = dropsite.getMetadata(PlayerID, "access");
+        if (!dropsiteAccess)
+        {
+            dropsiteAccess = gameState.ai.accessibility.getAccessValue(dropsite.position());
+            dropsite.setMetadata(PlayerID, "access", dropsiteAccess);
+        }
+        if (dropsiteAccess !== access)
+            continue;
         let dist = API3.SquareVectorDistance(ent.position(), dropsite.position());
         if (dist > distmin)
-            return;
+            continue;
         distmin = dist;
         closestDropsite = dropsite;
-    });
+    }
 
     if (!closestDropsite)
         return false;

binaries/data/mods/public/simulation/ai/petra/worker.js

@@ -541 +541 @@
     let foodDropsites = gameState.getOwnDropsites("food");
     let entPosition = position ? position : this.ent.position();
     let access = gameState.ai.accessibility.getAccessValue(entPosition);
+    let hasSharedDropsites = gameState.playerData.hasSharedDropsites;
+    let foodDropsites = (hasSharedDropsites ? gameState.getAnyDropsites("food") : gameState.getOwnDropsites("food")).toEntityArray();
 
     let nearestDropsiteDist = function(supply) {
         let distMin = 1000000;
         let pos = supply.position();
-        foodDropsites.forEach(function (dropsite) {
-            if (!dropsite.position() || dropsite.getMetadata(PlayerID, "access") !== access)
-                return;
-            let dist = API3.SquareVectorDistance(pos, dropsite.position());
-            if (dist < distMin)
-                distMin = dist;
-        });
+        for (let dropsite of foodDropsites)
+        {
+            if (!dropsite.position())
+                continue;
+            let owner = dropsite.owner();
+            // owner !== PlayerID can only happen when hasSharedDropsites === true, so no need to test it again
+            if (owner !== PlayerID && (!dropsite.isSharedDropsite() || !gameState.isPlayerMutualAlly(owner)))
+                continue;
+            let dropsiteAccess = dropsite.getMetadata(PlayerID, "access");
+            if (!dropsiteAccess)
+            {
+                dropsiteAccess = gameState.ai.accessibility.getAccessValue(dropsite.position());
+                dropsite.setMetadata(PlayerID, "access", dropsiteAccess);
+            }
+            if (dropsiteAccess !== access)
+                continue;
+            distMin = Math.min(distMin, API3.SquareVectorDistance(pos, dropsite.position()));
+        }
         return distMin;
     };
 
@@ -636 +649 @@
 
     let entPosition = this.ent.position();
     let fisherSea = this.ent.getMetadata(PlayerID, "sea");
-    let docks = gameState.getOwnEntitiesByClass("Dock", true).filter(API3.Filters.isBuilt());
+    let hasSharedDropsites = gameState.playerData.hasSharedDropsites;
+    let fishDropsites = (hasSharedDropsites ? gameState.getAnyDropsites("food") : gameState.getOwnDropsites("food")).filter(API3.Filters.byClass("Dock")).toEntityArray();
 
     let nearestDropsiteDist = function(supply) {
         let distMin = 1000000;
         let pos = supply.position();
-        docks.forEach(function (dock) {
-            if (!dock.position() || dock.getMetadata(PlayerID, "sea") !== fisherSea)
-                return;
-            let dist = API3.SquareVectorDistance(pos, dock.position());
-            if (dist < distMin)
-                distMin = dist;
-        });
+        for (let dropsite of fishDropsites)
+        {
+            if (!dropsite.position())
+                continue;
+            let owner = dropsite.owner();
+            // owner !== PlayerID can only happen when hasSharedDropsites === true, so no need to test it again
+            if (owner !== PlayerID && (!dropsite.isSharedDropsite() || !gameState.isPlayerMutualAlly(owner)))
+                continue;
+            let dropsiteSea = dropsite.getMetadata(PlayerID, "sea");
+            if (!dropsiteSea)
+            {
+                dropsiteSea = gameState.ai.accessibility.getAccessValue(dropsite.position(), true);
+                dropsite.setMetadata(PlayerID, "sea", dropsiteSea);
+            }
+            if (dropsiteSea !== fisherSea)
+                continue;
+            distMin = Math.min(distMin, API3.SquareVectorDistance(pos, dropsite.position()));
+        }
         return distMin;
     };
 

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

@@ -193 +193 @@
     this.changes.foundationBuilders = msg.to;
 };
 
+AIProxy.prototype.OnDropsiteSharingChanged = function(msg)
+{
+    if (!this.NotifyChange())
+        return;
+    this.changes.sharedDropsite = msg.shared;
+};
+
 AIProxy.prototype.OnTerritoryDecayChanged = function(msg)
 {
     if (!this.NotifyChange())
@@ -286 +293 @@
         ret.resourceCarrying = cmpResourceGatherer.GetCarryingStatus();
     }
 
+    let cmpResourceDropsite = Engine.QueryInterface(this.entity, IID_ResourceDropsite);
+    if (cmpResourceDropsite)
+    {
+        // Updated by OnDropsiteSharingChanged
+        ret.sharedDropsite = cmpResourceDropsite.IsShared();
+    }
+
     let cmpGarrisonHolder = Engine.QueryInterface(this.entity, IID_GarrisonHolder);
     if (cmpGarrisonHolder)
     {

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

@@ -52 +52 @@
 
 ResourceDropsite.prototype.SetSharing = function(value)
 {
-    if (this.sharable)
-        this.shared = value;
+    if (!this.sharable)
+        return;
+    this.shared = value;
+    Engine.PostMessage(this.entity, MT_DropsiteSharingChanged, { "shared": this.shared });
 };
 
 Engine.RegisterComponentType(IID_ResourceDropsite, "ResourceDropsite", ResourceDropsite);

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

@@ -1 +1 @@
 Engine.RegisterInterface("ResourceDropsite");
+
+// Message of the form { "shared": true },
+Engine.RegisterMessageType("DropsiteSharingChanged");