Ticket #969: ai_buildrestrictions-09282011.patch

binaries/data/mods/public/simulation/ai/jubot/gamestate.js

@@ -43 +43 @@
         return new Resources(this.playerData.resourceCounts);
     },
 
-    getMap: function()
+    getPassabilityMap: function()
     {
-        return this.ai.map;
+        return this.ai.passabilityMap;
     },
 
     getPassabilityClassMask: function(name)
@@ -55 +55 @@
         return this.ai.passabilityClasses[name];
     },
 
+    getTerritoryMap: function()
+    {
+        return this.ai.territoryMap;
+    },
+
     getOwnEntities: (function()
     {
         return new EntityCollection(this.ai, this.ai._ownEntities);

binaries/data/mods/public/simulation/ai/jubot/plan-building.js

@@ -146 +146 @@
 
         var cellSize = 4; // size of each tile
 
-        // First, find all tiles that are far enough away from obstructions:
+        var template = gameState.getTemplate(this.type);
 
-        var map = gameState.getMap();
-
+        // Find all tiles in valid territory that are far enough away from obstructions:
+        var passabilityMap = gameState.getPassabilityMap();
+        var territoryMap = gameState.getTerritoryMap();
+        const TERRITORY_PLAYER_MASK = 0x7F;
         var obstructionMask = gameState.getPassabilityClassMask("foundationObstruction");
-        // Only accept valid land tiles (we don't handle docks yet)
-        obstructionMask |= gameState.getPassabilityClassMask("building-land");
 
-        var obstructionTiles = new Uint16Array(map.data.length);
-        for (var i = 0; i < map.data.length; ++i)
-            obstructionTiles[i] = (map.data[i] & obstructionMask) ? 0 : 65535;
+        if (passabilityMap.data.length != territoryMap.data.length)
+            error("passability and territory data are not matched!");
 
-//      Engine.DumpImage("tiles0.png", obstructionTiles, map.width, map.height, 64);
+        // See BuildRestrictions.js
+        switch(template.buildPlacementType())
+        {
+        case "shore":
+            obstructionMask |= gameState.getPassabilityClassMask("building-shore");
+            break;
+        case "land":
+        default:
+            obstructionMask |= gameState.getPassabilityClassMask("building-land");
+        }
 
-        this.expandInfluences(obstructionTiles, map.width, map.height);
+        var playerID = gameState.getPlayerID();
+        var buildOwn = template.hasBuildTerritory("own");
+        var buildAlly = template.hasBuildTerritory("ally");
+        var buildNeutral = template.hasBuildTerritory("neutral");
+        var buildEnemy = template.hasBuildTerritory("enemy");
 
+        var obstructionTiles = new Uint16Array(passabilityMap.data.length);
+        for (var i = 0; i < passabilityMap.data.length; ++i)
+        {
+            var tilePlayer = (territoryMap.data[i] & TERRITORY_PLAYER_MASK);
+            var validTerritory = (
+                (!buildOwn || tilePlayer == playerID) &&
+                (!buildAlly || gameState.isPlayerAlly(tilePlayer)) &&
+                (!buildEnemy || gameState.isPlayerEnemy(tilePlayer)) &&
+                (!buildNeutral || tilePlayer == 0)
+            );
+            obstructionTiles[i] = ((passabilityMap.data[i] & obstructionMask) || !validTerritory) ? 0 : 65535;
+        }
+
+//      Engine.DumpImage("tiles0.png", obstructionTiles, passabilityMap.width, passabilityMap.height, 64);
+
+        this.expandInfluences(obstructionTiles, passabilityMap.width, passabilityMap.height);
+
+        // TODO: handle distance restrictions for e.g. CivCentres
+        
         // Compute each tile's closeness to friendly structures:
 
-        var friendlyTiles = new Uint16Array(map.data.length);
+        var friendlyTiles = new Uint16Array(passabilityMap.data.length);
 
         gameState.getOwnEntities().forEach(function(ent) {
             if (ent.hasClass("Structure"))
@@ -176 +207 @@
                 var pos = ent.position();
                 var x = Math.round(pos[0] / cellSize);
                 var z = Math.round(pos[1] / cellSize);
-                self.addInfluence(friendlyTiles, map.width, map.height, x, z, infl);
+                self.addInfluence(friendlyTiles, passabilityMap.width, passabilityMap.height, x, z, infl);
             }
         });
 
@@ -190 +221 @@
 //              var pos = ent.position();
 //              var x = Math.round(pos[0] / cellSize);
 //              var z = Math.round(pos[1] / cellSize);
-//              self.subtractInfluence(friendlyTiles, map.width, map.height, x, z, infl);
+//              self.subtractInfluence(friendlyTiles, passabilityMap.width, passabilityMap.height, x, z, infl);
 //          }
 //      });
 
         
         // Find target building's approximate obstruction radius,
         // and expand by a bit to make sure we're not too close
-        var template = gameState.getTemplate(this.type);
         var radius = Math.ceil(template.obstructionRadius() / cellSize) + 1;
 
         // Find the best non-obstructed tile
         var bestIdx = 0;
         var bestVal = -1;
-        for (var i = 0; i < map.data.length; ++i)
+        for (var i = 0; i < passabilityMap.data.length; ++i)
         {
             if (obstructionTiles[i] > radius)
             {
@@ -220 +250 @@
                 }
             }
         }
-        var x = ((bestIdx % map.width) + 0.5) * cellSize;
-        var z = (Math.floor(bestIdx / map.width) + 0.5) * cellSize;
+        var x = ((bestIdx % passabilityMap.width) + 0.5) * cellSize;
+        var z = (Math.floor(bestIdx / passabilityMap.width) + 0.5) * cellSize;
 
-//      Engine.DumpImage("tiles1.png", obstructionTiles, map.width, map.height, 32);
-//      Engine.DumpImage("tiles2.png", friendlyTiles, map.width, map.height, 256);
+//      Engine.DumpImage("tiles1.png", obstructionTiles, passabilityMap.width, passabilityMap.height, 32);
+//      Engine.DumpImage("tiles2.png", friendlyTiles, passabilityMap.width, passabilityMap.height, 256);
 
+        // TODO: special dock placement requirements
+
         // Fixed angle to match fixed starting cam
         var angle = 0.75*Math.PI;
 

binaries/data/mods/public/simulation/ai/jubot/plan-buildingecon.js

@@ -148 +148 @@
 
         var cellSize = 4; // size of each tile
 
-        // First, find all tiles that are far enough away from obstructions:
+        var template = gameState.getTemplate(this.type);
 
-        var map = gameState.getMap();
-
+        // Find all tiles in valid territory that are far enough away from obstructions:
+        var passabilityMap = gameState.getPassabilityMap();
+        var territoryMap = gameState.getTerritoryMap();
+        const TERRITORY_PLAYER_MASK = 0x7F;
         var obstructionMask = gameState.getPassabilityClassMask("foundationObstruction");
-        // Only accept valid land tiles (we don't handle docks yet)
-        obstructionMask |= gameState.getPassabilityClassMask("building-land");
 
-        var obstructionTiles = new Uint16Array(map.data.length);
-        for (var i = 0; i < map.data.length; ++i)
-            obstructionTiles[i] = (map.data[i] & obstructionMask) ? 0 : 65535;
+        if (passabilityMap.data.length != territoryMap.data.length)
+            error("passability and territory data are not matched!");
 
-//      Engine.DumpImage("tiles0.png", obstructionTiles, map.width, map.height, 64);
+        // See BuildRestrictions.js
+        switch(template.buildPlacementType())
+        {
+        case "shore":
+            obstructionMask |= gameState.getPassabilityClassMask("building-shore");
+            break;
+        case "land":
+        default:
+            obstructionMask |= gameState.getPassabilityClassMask("building-land");
+        }
 
-        this.expandInfluences(obstructionTiles, map.width, map.height);
+        var playerID = gameState.getPlayerID();
+        var buildOwn = template.hasBuildTerritory("own");
+        var buildAlly = template.hasBuildTerritory("ally");
+        var buildNeutral = template.hasBuildTerritory("neutral");
+        var buildEnemy = template.hasBuildTerritory("enemy");
 
+        var obstructionTiles = new Uint16Array(passabilityMap.data.length);
+        for (var i = 0; i < passabilityMap.data.length; ++i)
+        {
+            var tilePlayer = (territoryMap.data[i] & TERRITORY_PLAYER_MASK);
+            var validTerritory = (
+                (!buildOwn || tilePlayer == playerID) &&
+                (!buildAlly || gameState.isPlayerAlly(tilePlayer)) &&
+                (!buildEnemy || gameState.isPlayerEnemy(tilePlayer)) &&
+                (!buildNeutral || tilePlayer == 0)
+            );
+            obstructionTiles[i] = ((passabilityMap.data[i] & obstructionMask) || !validTerritory) ? 0 : 65535;
+        }
+
+//      Engine.DumpImage("tiles0.png", obstructionTiles, passabilityMap.width, passabilityMap.height, 64);
+
+        this.expandInfluences(obstructionTiles, passabilityMap.width, passabilityMap.height);
+
+        // TODO: handle distance restrictions for e.g. CivCentres
+        
         // Compute each tile's closeness to friendly structures:
 
-        var friendlyTiles = new Uint16Array(map.data.length);
+        var friendlyTiles = new Uint16Array(passabilityMap.data.length);
         var infl = 100;
         var pos = this.resourceposition;
         var x = Math.round(pos[0] / cellSize);
         var z = Math.round(pos[1] / cellSize);
-        self.addInfluence(friendlyTiles, map.width, map.height, x, z, infl);
+        self.addInfluence(friendlyTiles, passabilityMap.width, passabilityMap.height, x, z, infl);
         
         //Look at making sure we're a long way from enemy civ centres as well.
 
@@ -184 +215 @@
         // Find the best non-obstructed tile
         var bestIdx = 0;
         var bestVal = -1;
-        for (var i = 0; i < map.data.length; ++i)
+        for (var i = 0; i < passabilityMap.data.length; ++i)
         {
             if (obstructionTiles[i] > radius)
             {
@@ -201 +232 @@
                 }
             }
         }
-        var x = ((bestIdx % map.width) + 0.5) * cellSize;
-        var z = (Math.floor(bestIdx / map.width) + 0.5) * cellSize;
+        var x = ((bestIdx % passabilityMap.width) + 0.5) * cellSize;
+        var z = (Math.floor(bestIdx / passabilityMap.width) + 0.5) * cellSize;
 
-//      Engine.DumpImage("tiles1.png", obstructionTiles, map.width, map.height, 32);
-//      Engine.DumpImage("tiles2.png", friendlyTiles, map.width, map.height, 256);
+//      Engine.DumpImage("tiles1.png", obstructionTiles, passabilityMap.width, passabilityMap.height, 32);
+//      Engine.DumpImage("tiles2.png", friendlyTiles, passabilityMap.width, passabilityMap.height, 256);
 
         // Fixed angle to match fixed starting cam
         var angle = 0.75*Math.PI;
@@ -225 +256 @@
 
         // First, find all tiles that are far enough away from obstructions:
 
-        var map = gameState.getMap();
+        var passabilityMap = gameState.getPassabilityMap();
 
         var obstructionMask = gameState.getPassabilityClassMask("foundationObstruction");
         // Only accept valid land tiles (we don't handle docks yet)
         obstructionMask |= gameState.getPassabilityClassMask("building-land");
 
-        var obstructionTiles = new Uint16Array(map.data.length);
-        for (var i = 0; i < map.data.length; ++i)
-            obstructionTiles[i] = (map.data[i] & obstructionMask) ? 0 : 65535;
+        var obstructionTiles = new Uint16Array(passabilityMap.data.length);
+        for (var i = 0; i < passabilityMap.data.length; ++i)
+            obstructionTiles[i] = (passabilityMap.data[i] & obstructionMask) ? 0 : 65535;
 
-//      Engine.DumpImage("tiles0.png", obstructionTiles, map.width, map.height, 64);
+//      Engine.DumpImage("tiles0.png", obstructionTiles, passabilityMap.width, passabilityMap.height, 64);
 
-        this.expandInfluences(obstructionTiles, map.width, map.height);
+        this.expandInfluences(obstructionTiles, passabilityMap.width, passabilityMap.height);
 
         // Compute each tile's closeness to friendly structures:
 
-        var friendlyTiles = new Uint16Array(map.data.length);
+        var friendlyTiles = new Uint16Array(passabilityMap.data.length);
 
         gameState.getOwnEntities().forEach(function(ent) {
             if (ent.hasClass("Structure"))
@@ -253 +284 @@
                 var pos = ent.position();
                 var x = Math.round(pos[0] / cellSize);
                 var z = Math.round(pos[1] / cellSize);
-                self.addInfluence(friendlyTiles, map.width, map.height, x, z, infl);
+                self.addInfluence(friendlyTiles, passabilityMap.width, passabilityMap.height, x, z, infl);
             }
         });
         
         //Look at making sure we're a long way from enemy civ centres as well.
     
-//      var enemyTiles = new Uint16Array(map.data.length);
+//      var enemyTiles = new Uint16Array(passabilityMap.data.length);
 //      
 //          var foetargets = gameState.entities.filter(function(ent) {
 //              return (ent.isEnemy());
@@ -271 +302 @@
 //              var pos = ent.position();
 //              var x = Math.round(pos[0] / cellSize);
 //              var z = Math.round(pos[1] / cellSize);
-//              self.addInfluence(enemyTiles, map.width, map.height, x, z, infl);
+//              self.addInfluence(enemyTiles, passabilityMap.width, passabilityMap.height, x, z, infl);
 //          }
 //      });
 
@@ -284 +315 @@
         // Find the best non-obstructed tile
         var bestIdx = 0;
         var bestVal = -1;
-        for (var i = 0; i < map.data.length; ++i)
+        for (var i = 0; i < passabilityMap.data.length; ++i)
         {
             if (obstructionTiles[i] > radius)
             {
@@ -301 +332 @@
                 }
             }
         }
-        var x = ((bestIdx % map.width) + 0.5) * cellSize;
-        var z = (Math.floor(bestIdx / map.width) + 0.5) * cellSize;
+        var x = ((bestIdx % passabilityMap.width) + 0.5) * cellSize;
+        var z = (Math.floor(bestIdx / passabilityMap.width) + 0.5) * cellSize;
 
-//      Engine.DumpImage("tiles1.png", obstructionTiles, map.width, map.height, 32);
-//      Engine.DumpImage("tiles2.png", friendlyTiles, map.width, map.height, 256);
+//      Engine.DumpImage("tiles1.png", obstructionTiles, passabilityMap.width, passabilityMap.height, 32);
+//      Engine.DumpImage("tiles2.png", friendlyTiles, passabilityMap.width, passabilityMap.height, 256);
 
         // Randomise the angle a little, to look less artificial
         //var angle = Math.PI + (Math.random()*2-1) * Math.PI/24;

binaries/data/mods/public/simulation/ai/testbot/gamestate.js

@@ -38 +38 @@
         return new Resources(this.playerData.resourceCounts);
     },
 
-    getMap: function()
+    getPassabilityMap: function()
     {
-        return this.ai.map;
+        return this.ai.passabilityMap;
     },
 
     getPassabilityClassMask: function(name)
@@ -50 +50 @@
         return this.ai.passabilityClasses[name];
     },
 
+    getTerritoryMap: function()
+    {
+        return this.ai.territoryMap;
+    },
+
     getOwnEntities: (function()
     {
         return new EntityCollection(this.ai, this.ai._ownEntities);
@@ -231 +236 @@
 
     isEntityAlly: function(ent)
     {
-        return ent && ent.owner !== undefined && this.playerData.isAlly[ent.owner];
+        return (ent && ent.owner !== undefined && this.playerData.isAlly[ent.owner]);
     },
 
     isEntityEnemy: function(ent)
     {
-        return ent && ent.owner !== undefined && this.playerData.isEnemy[ent.owner];
+        return (ent && ent.owner !== undefined && this.playerData.isEnemy[ent.owner]);
     },
 
     isEntityOwn: function(ent)

binaries/data/mods/public/simulation/ai/testbot/plan-building.js

@@ -124 +124 @@
 
         var cellSize = 4; // size of each tile
 
-        // First, find all tiles that are far enough away from obstructions:
+        var template = gameState.getTemplate(this.type);
 
-        var map = gameState.getMap();
-
+        // Find all tiles in valid territory that are far enough away from obstructions:
+        var passabilityMap = gameState.getPassabilityMap();
+        var territoryMap = gameState.getTerritoryMap();
+        const TERRITORY_PLAYER_MASK = 0x7F;
         var obstructionMask = gameState.getPassabilityClassMask("foundationObstruction");
-        // Only accept valid land tiles (we don't handle docks yet)
-        obstructionMask |= gameState.getPassabilityClassMask("building-land");
 
-        var obstructionTiles = new Uint16Array(map.data.length);
-        for (var i = 0; i < map.data.length; ++i)
-            obstructionTiles[i] = (map.data[i] & obstructionMask) ? 0 : 65535;
+        if (passabilityMap.data.length != territoryMap.data.length)
+            error("passability and territory data are not matched!");
 
-//      Engine.DumpImage("tiles0.png", obstructionTiles, map.width, map.height, 64);
+        // See BuildRestrictions.js
+        switch(template.buildPlacementType())
+        {
+        case "shore":
+            obstructionMask |= gameState.getPassabilityClassMask("building-shore");
+            break;
+        case "land":
+        default:
+            obstructionMask |= gameState.getPassabilityClassMask("building-land");
+        }
 
-        this.expandInfluences(obstructionTiles, map.width, map.height);
+        var playerID = gameState.getPlayerID();
+        var buildOwn = template.hasBuildTerritory("own");
+        var buildAlly = template.hasBuildTerritory("ally");
+        var buildNeutral = template.hasBuildTerritory("neutral");
+        var buildEnemy = template.hasBuildTerritory("enemy");
 
+        var obstructionTiles = new Uint16Array(passabilityMap.data.length);
+        for (var i = 0; i < passabilityMap.data.length; ++i)
+        {
+            var tilePlayer = (territoryMap.data[i] & TERRITORY_PLAYER_MASK);
+            var validTerritory = (
+                (!buildOwn || tilePlayer == playerID) &&
+                (!buildAlly || gameState.isPlayerAlly(tilePlayer)) &&
+                (!buildEnemy || gameState.isPlayerEnemy(tilePlayer)) &&
+                (!buildNeutral || tilePlayer == 0)
+            );
+            obstructionTiles[i] = ((passabilityMap.data[i] & obstructionMask) || !validTerritory) ? 0 : 65535;
+        }
+
+//      Engine.DumpImage("obstruction"+playerID+".png", obstructionTiles, passabilityMap.width, passabilityMap.height, 64);
+
+        this.expandInfluences(obstructionTiles, passabilityMap.width, passabilityMap.height);
+
+        // TODO: handle distance restrictions for e.g. CivCentres
+
         // Compute each tile's closeness to friendly structures:
 
-        var friendlyTiles = new Uint16Array(map.data.length);
+        var friendlyTiles = new Uint16Array(passabilityMap.data.length);
 
         gameState.getOwnEntities().forEach(function(ent) {
             if (ent.hasClass("Structure"))
@@ -154 +185 @@
                 var pos = ent.position();
                 var x = Math.round(pos[0] / cellSize);
                 var z = Math.round(pos[1] / cellSize);
-                self.addInfluence(friendlyTiles, map.width, map.height, x, z, infl);
+                self.addInfluence(friendlyTiles, passabilityMap.width, passabilityMap.height, x, z, infl);
             }
         });
 
         // Find target building's approximate obstruction radius,
         // and expand by a bit to make sure we're not too close
-        var template = gameState.getTemplate(this.type);
         var radius = Math.ceil(template.obstructionRadius() / cellSize) + 2;
 
         // Find the best non-obstructed tile
         var bestIdx = 0;
         var bestVal = -1;
-        for (var i = 0; i < map.data.length; ++i)
+        for (var i = 0; i < passabilityMap.data.length; ++i)
         {
             if (obstructionTiles[i] > radius)
             {
@@ -178 +208 @@
                 }
             }
         }
-        var x = ((bestIdx % map.width) + 0.5) * cellSize;
-        var z = (Math.floor(bestIdx / map.width) + 0.5) * cellSize;
+        var x = ((bestIdx % passabilityMap.width) + 0.5) * cellSize;
+        var z = (Math.floor(bestIdx / passabilityMap.width) + 0.5) * cellSize;
 
-//      Engine.DumpImage("tiles1.png", obstructionTiles, map.width, map.height, 32);
-//      Engine.DumpImage("tiles2.png", friendlyTiles, map.width, map.height, 256);
+//      Engine.DumpImage("influences"+playerID+".png", obstructionTiles, passabilityMap.width, passabilityMap.height, 32);
+//      Engine.DumpImage("friendly"+playerID+".png", friendlyTiles, passabilityMap.width, passabilityMap.height, 256);
 
+        // TODO: special dock placement requirements
+        
         // Fixed angle to match fixed starting cam
         var angle = 0.75*Math.PI;