Ticket #4085: sharing.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)
+    let hasSharedDropsites = gameState.playerData.hasSharedDropsites;
+    let dropsiteCollection = hasSharedDropsites ? gameState.getAnyDropsites(resource) : gameState.getOwnDropsites(resource);
+    dropsiteCollection.forEach(function(dropsite) {
+        if (!dropsite.position())
             return;
+        if (hasSharedDropsites && !gameState.isPlayerMutualAlly(dropsite.owner()))
+            return;
+        let dropsiteAccess = dropsite.getMetadata(PlayerID, "access");
+        if (!dropsiteAccess)
+        {
+            dropsiteAccess = gameState.ai.accessibility.getAccessValue(dropsite.position());
+            dropsite.setMetadata(PlayerID, "access", dropsiteAccess);
+        }
+        if (dropsiteAccess !== access)
+            return;
         let dist = API3.SquareVectorDistance(ent.position(), dropsite.position());
         if (dist > distmin)
             return;

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");