Ticket #3791: sharedDropsites-v3.patch

binaries/data/mods/public/gui/session/selection_panels.js

@@ -224 +224 @@
     },
     "setGraphics": function(data)
     {
-        data.icon.sprite = "stretched:session/icons/" + data.item.icon;
         data.button.enabled = controlsPlayer(data.unitEntState.player);
+        let grayscale = data.button.enabled ? "" : "grayscale:";
+        data.icon.sprite = "stretched:" + grayscale + "session/icons/" + data.item.icon;
     },
     "setPosition": function(data)
     {
@@ -280 +281 @@
     },
     "setGraphics": function(data)
     {
-        data.icon.sprite = "stretched:session/icons/" + data.item.icon;
-        data.button.enabled = data.item.count > 0;
+        data.button.enabled = data.item.count != undefined && data.item.count > 0;
+        let grayscale = data.button.enabled ? "" : "grayscale:";
+        data.icon.sprite = "stretched:" + grayscale + "session/icons/" + data.item.icon;
     },
     "setPosition": function(data)
     {

binaries/data/mods/public/gui/session/unit_actions.js

@@ -270 +270 @@
         },
         "getActionInfo": function(entState, targetState)
         {
-            if (!targetState.resourceDropsite)
+            if (!targetState.resourceDropsite || !targetState.resourceDropsite.sharable)
                 return false;
-            if (!playerCheck(entState, targetState, ["Player"]))
+            var playerState = GetSimState().players[entState.player];
+            if (playerState.hasSharedDropsites && targetState.resourceDropsite.shared)
+            {
+                if (!playerCheck(entState, targetState, ["Player", "MutualAlly"]))
+                    return false;
+            }
+            else if (!playerCheck(entState, targetState, ["Player"]))
                 return false;
             if (!entState.resourceCarrying || !entState.resourceCarrying.length)
                 return false;
@@ -872 +878 @@
         },
     },
     // Trading
-     "select-trading-goods": {
+    "select-trading-goods": {
         "getInfo": function(entState)
         {
             if (!hasClass(entState, "Market"))
@@ -887 +893 @@
             toggleTrade();
         },
     },
+    // Dropsite sharing
+    "share-dropsite": {
+        "getInfo": function(entState)
+        {
+            if (!entState.resourceDropsite || !entState.resourceDropsite.sharable)
+                return false;
+            let playerState = GetSimState().players[entState.player];
+            if (!playerState.isMutualAlly.some((e, i) => e && i != entState.player))
+                return false;
+            if (entState.resourceDropsite.shared)
+                return {
+                    "tooltip": translate("Press to prevent allies from using this dropsite"),
+                    "icon": "lock_unlocked.png"
+                };
+            return {
+                "tooltip": translate("Press to allow allies to use this dropsite"),
+                "icon": "lock_locked.png"
+            };
+        },
+        "execute": function(entState)
+        {
+            Engine.PostNetworkCommand({
+                "type": "set-dropsite-sharing",
+                "entities": [entState.id],
+                "shared": !entState.resourceDropsite.shared
+            });
+        },
+    }
 };
 
 var g_AllyEntityCommands =
@@ -923 +957 @@
             unloadAllByOwner();
         },
     },
+    // Dropsite sharing
+    "share-dropsite": {
+        "getInfo": function(entState)
+        {
+            if (!GetSimState().players[Engine.GetPlayerID()].hasSharedDropsites)
+                return false;
+            if (!entState.resourceDropsite || !entState.resourceDropsite.sharable)
+                return false;
+            if (entState.resourceDropsite.shared)
+                return {
+                    "tooltip": translate("You are allowed to use this dropsite"),
+                    "icon": "lock_unlocked.png"
+                };
+            return {
+                "tooltip": translate("The use of this dropsite is prohibited"),
+                "icon": "lock_locked.png"
+            };
+        },
+        "execute": function(entState)
+        {
+            // This command button is always disabled
+        },
+    }
 };
 
 function playerCheck(entState, targetState, validPlayers)

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

@@ -264 +264 @@
             });
         } */
     }
+
+    // Allows all allies to use this dropsite except if base anchor to be sure to keep
+    // a minimum of resources for this base
+    Engine.PostCommand(PlayerID, {
+        "type": "set-dropsite-sharing",
+        "entities": [dropsiteId],
+        "shared": dropsiteId !== this.anchorId
+    });
 };
 
 // completely remove the dropsite resources from our list.

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

@@ -106 +106 @@
             "teamsLocked": cmpPlayer.GetLockTeams(),
             "cheatsEnabled": cmpPlayer.GetCheatsEnabled(),
             "disabledTemplates": cmpPlayer.GetDisabledTemplates(),
+            "hasSharedDropsites": cmpPlayer.HasSharedDropsites(),
             "phase": phase,
             "isAlly": allies,
             "isMutualAlly": mutualAllies,
@@ -516 +517 @@
     let cmpResourceDropsite = Engine.QueryInterface(ent, IID_ResourceDropsite);
     if (cmpResourceDropsite)
         ret.resourceDropsite = {
-            "types": cmpResourceDropsite.GetTypes()
+            "types": cmpResourceDropsite.GetTypes(),
+            "sharable": cmpResourceDropsite.IsSharable(),
+            "shared": cmpResourceDropsite.IsShared()
         };
 
     let cmpPromotion = Engine.QueryInterface(ent, IID_Promotion);

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

@@ -3 +3 @@
 Player.prototype.Schema =
     "<element name='SharedLosTech' a:help='Allies will share los when this technology is researched. Leave empty to never share LOS.'>" +
         "<text/>" +
+    "</element>" +
+    "<element name='SharedDropsitesTech' a:help='Allies will share dropsites when this technology is researched. Leave empty to never share dropsites.'>" +
+        "<text/>" +
     "</element>";
 
 Player.prototype.Init = function()
@@ -31 +34 @@
     this.teamsLocked = false;
     this.state = "active"; // game state - one of "active", "defeated", "won"
     this.diplomacy = [];    // array of diplomatic stances for this player with respect to other players (including gaia and self)
+    this.sharedDropsites = false;
     this.formations = [];
     this.startCam = undefined;
     this.controlAllUnits = false;
@@ -507 +511 @@
     return (this.startCam !== undefined);
 };
 
+Player.prototype.HasSharedDropsites = function()
+{
+    return this.sharedDropsites;
+};
+
 Player.prototype.SetControlAllUnits = function(c)
 {
     this.controlAllUnits = c;
@@ -682 +691 @@
 {
     if (msg.tech == this.template.SharedLosTech)
         this.UpdateSharedLos();
+    else if (msg.tech == this.template.SharedDropsitesTech)
+        this.sharedDropsites = true;
 };
 
 Player.prototype.OnDiplomacyChanged = function()

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

@@ -12 +12 @@
                 "</choice>" +
             "</zeroOrMore>" +
         "</list>" +
+    "</element>" +
+    "<element name='Sharable' a:help='Allows allies to use this entity.'>" +
+        "<data type='boolean'/>" +
     "</element>";
 
-ResourceDropsite.prototype.Serialize = null;
+ResourceDropsite.prototype.Init = function()
+{
+    this.sharable = this.template.Sharable == "true";
+    this.shared = false;
+};
 
 /**
  * Returns the list of resource types accepted by this dropsite.
@@ -33 +40 @@
     return this.GetTypes().indexOf(type) != -1;
 };
 
+ResourceDropsite.prototype.IsSharable = function()
+{
+    return this.sharable;
+};
+
+ResourceDropsite.prototype.IsShared = function()
+{
+    return this.shared;
+};
+
+ResourceDropsite.prototype.SetSharing = function(value)
+{
+    if (this.sharable)
+        this.shared = value;
+};
+
 Engine.RegisterComponentType(IID_ResourceDropsite, "ResourceDropsite", ResourceDropsite);

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

@@ -4083 +4083 @@
     if (!cmpOwnership || cmpOwnership.GetOwner() == -1)
         return undefined;
 
-    // Find dropsites owned by this unit's player
-    var players = [cmpOwnership.GetOwner()];
+    // Find dropsites owned by this unit's player or allied ones if allowed
+    var owner = cmpOwnership.GetOwner();
+    var players = [owner];
+    var cmpPlayer = QueryOwnerInterface(this.entity);
+    if (cmpPlayer && cmpPlayer.HasSharedDropsites())
+    {
+        let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+        for (let i = 1; i < cmpPlayerManager.GetNumPlayers(); ++i)
+            if (i != owner && cmpPlayer.IsMutualAlly(i))
+                players.push(i);
+    }
 
     var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
     var nearby = cmpRangeManager.ExecuteQuery(this.entity, 0, -1, players, IID_ResourceDropsite);
@@ -4094 +4103 @@
     if (excludeLand)
         nearby = nearby.filter(e => Engine.QueryInterface(e, IID_Identity).HasClass("Naval"));
 
-    return nearby.find(ent => Engine.QueryInterface(ent, IID_ResourceDropsite).AcceptsType(genericType));
+    return nearby.find(ent => {
+        let cmpResourceDropsite = Engine.QueryInterface(ent, IID_ResourceDropsite);
+        if (!cmpResourceDropsite.AcceptsType(genericType))
+            return false;
+        let cmpOwnership = Engine.QueryInterface(ent, IID_Ownership);
+        return cmpOwnership.GetOwner() == owner || cmpResourceDropsite.IsShared();
+    });
 };
 
 /**
@@ -5769 +5784 @@
             return false;
     }
 
-    // Verify that the dropsite is owned by this entity's player
+    // Verify that the dropsite is owned by this entity's player (or an a mutual allied if allowed)
     var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
-    return cmpOwnership && IsOwnedByPlayer(cmpOwnership.GetOwner(), target);
+    var cmpPlayer = QueryOwnerInterface(this.entity);
+    if (cmpOwnership && IsOwnedByPlayer(cmpOwnership.GetOwner(), target))
+        return true;
+    return cmpPlayer && cmpPlayer.HasSharedDropsites() && cmpResourceDropsite.IsShared() &&
+           cmpOwnership && IsOwnedByMutualAllyOfPlayer(cmpOwnership.GetOwner(), target);
 };
 
 UnitAI.prototype.CanTrade = function(target)

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

@@ +1 @@
+{
+    "genericName": "Diaspora",
+    "description": "The extension of trade leads to the permanent establishment of storekeepers and their families in foreign countries, allowing them to exploit these countries wealth.",
+    "cost": { "food": 200, "wood": 200, "stone": 100, "metal": 100 },
+    "requirements": { "class": "Trader", "number": 3 },
+    "requirementsTooltip": "Requires 3 Traders",
+    "supersedes": "unlock_shared_los",
+    "icon": "diaspora.png",
+    "researchTime": 40,
+    "tooltip": "Player can use his allies dropsites.",
+    "modifications": [{ "value": "Player/sharedDropsites", "replace": true }],
+    "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

binaries/data/mods/public/simulation/helpers/Commands.js

@@ -685 +685 @@
         // Currently nothing. Triggers can read it anyway, and send this
         // message to any component you like.
     },
+
+    "set-dropsite-sharing": function(player, cmd, data)
+    {
+        for (let ent of data.entities)
+        {
+            let cmpResourceDropsite = Engine.QueryInterface(ent, IID_ResourceDropsite);
+            if (cmpResourceDropsite && cmpResourceDropsite.IsSharable())
+                cmpResourceDropsite.SetSharing(cmd.shared);
+        }
+    },
 };
 
 /**

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

@@ -55 +55 @@
   </Identity>
   <Player>
     <SharedLosTech>unlock_shared_los</SharedLosTech>
+    <SharedDropsitesTech>unlock_shared_dropsites</SharedDropsitesTech>
   </Player>
   <StatisticsTracker/>
   <TechnologyManager/>

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

@@ -2 +2 @@
 <Entity>
   <Player>
     <SharedLosTech/>
+    <SharedDropsitesTech/>
   </Player>
 </Entity>

binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml

@@ -47 +47 @@
   </RallyPointRenderer>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
+    <Sharable>true</Sharable>
   </ResourceDropsite>
   <VisualActor>
     <Actor>structures/britons/crannog.xml</Actor>

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

@@ -68 +68 @@
   <Identity>
     <GenericName>Civic Center</GenericName>
     <Tooltip>Build to acquire large tracts of territory. Train citizens. Garrison: 20.</Tooltip>
-    <Classes datatype="tokens">
-      Defensive
-      CivCentre
-    </Classes>
+    <Classes datatype="tokens">Defensive CivCentre</Classes>
     <VisibleClasses datatype="tokens">CivilCentre</VisibleClasses>
     <Icon>structures/civic_centre.png</Icon>
   </Identity>
@@ -97 +94 @@
   </ProductionQueue>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
+    <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
@@ -104 +102 @@
       <constructed>interface/complete/building/complete_civ_center.xml</constructed>
       <attack>attack/weapon/arrowfly.xml</attack>
       <death>attack/destruction/building_collapse_large.xml</death>
-      <alert0>interface/alarm/alarm_alert_0.xml</alert0>
-      <alert1>interface/alarm/alarm_alert_1.xml</alert1>
-      <alert2>interface/alarm/alarm_alert_2.xml</alert2>
+      <alert0>interface/alarm/alarm_alert_0.xml</alert0>
+      <alert1>interface/alarm/alarm_alert_1.xml</alert1>
+      <alert2>interface/alarm/alarm_alert_2.xml</alert2>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>

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

@@ -49 +49 @@
   <RallyPoint disable=""/>
   <ResourceDropsite>
     <Types>food</Types>
+    <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>

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

@@ -51 +51 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       unlock_shared_los
+      unlock_shared_dropsites
       trade_convoys_speed
       trade_convoys_armor
       trade_gain_01

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

@@ -23 +23 @@
   <Identity>
     <GenericName>Storehouse</GenericName>
     <Tooltip>Dropsite for wood, stone, and metal resources. Research gathering improvements for these resources.</Tooltip>
-    <Classes datatype="tokens">
-      DropsiteWood
-      DropsiteMetal
-      DropsiteStone
-      -ConquestCritical
-    </Classes>
+    <Classes datatype="tokens">DropsiteWood DropsiteMetal DropsiteStone -ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Village Storehouse</VisibleClasses>
     <Icon>structures/storehouse.png</Icon>
   </Identity>
@@ -62 +57 @@
   <RallyPoint disable=""/>
   <ResourceDropsite>
     <Types>wood stone metal</Types>
+    <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>

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

@@ -45 +45 @@
   </RallyPointRenderer>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
+    <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
@@ -71 +72 @@
       armor_ship_hullsheathing
     </Technologies>
   </ProductionQueue>
-  <Vision>
+   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>

binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml

@@ -44 +44 @@
   </Position>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
+    <Sharable>false</Sharable>
   </ResourceDropsite>
   <Selectable>
     <Overlay>