2022.3.2

game-engine/Domain/Models/Position.cs

@@ -28,6 +28,7 @@ public override bool Equals(object obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != typeof(Position) || obj.GetType() != typeof(Land)) return false;
             return Equals((Position) obj);
         }
 

game-engine/Engine/.gitlab-ci.yml

@@ -3,7 +3,7 @@
 #  - deploy
 
 variables:
-  ENGINE_VERSION: 2022.3.1
+  ENGINE_VERSION: 2022.3.2
 #  DOCKER_REGISTRY: NOT_SET
 #  REGION: $AWS_DEFAULT_REGION
 

game-engine/Engine/Interfaces/IWorldStateService.cs

@@ -38,5 +38,6 @@ public interface IWorldStateService
         Node NodeByPosition(Position position);
         ScoutTower GetScoutTowerByRegion(Position position);
         ScoutTower CreateScoutTower(int i, int j);
+        ISet<Position> ScoutTowerPositionsInUse { get; }
     }
 }

game-engine/Engine/Services/TerritoryService.cs

@@ -105,14 +105,19 @@ private void RemoveAvailableNodeWhereBuildingIsPlaced(BotObject bot, AvailableNo
     private void AddBuildingTerritory(BotObject bot, BuildingObject building)
     {
         var buildingTerritory = GetPositionsInBuildingRadius(building);
-        var newBuildingTerritory = buildingTerritory.Where(position => !claimedTerritory.Contains(position)).ToList();
+        var newBuildingTerritory = buildingTerritory.Where(PositionIsClaimable).ToList();
 
         // creating new available nodes here just before creating the new land since it requires the worldStateService having all the available and resource nodes 
         CreateAvailableNodes(bot, newBuildingTerritory);
 
         newBuildingTerritory.ForEach(position => CreateNewLand(bot, position));
     }
 
+    private bool PositionIsClaimable(Position position)
+    {
+        return !(claimedTerritory.Contains(position) || worldStateService.ScoutTowerPositionsInUse.Contains(position));
+    }
+
     private Land CreateNewLand(BotObject bot, Position position)
     {
         var containedNode = worldStateService.NodeByPosition(position);

game-engine/Engine/Services/WorldStateService.cs

@@ -22,7 +22,7 @@ public class WorldStateService : IWorldStateService
         private readonly ISet<Position> woodPositionsInUse = new HashSet<Position>();
         private readonly ISet<Position> stonePositionsInUse = new HashSet<Position>();
         private readonly ISet<Position> goldPositionsInUse = new HashSet<Position>();
-        private readonly ISet<Position> scoutTowersPositionsInUse = new HashSet<Position>();
+        public ISet<Position> ScoutTowerPositionsInUse { get; } = new HashSet<Position>();
 
         private readonly Dictionary<Position, Node> NodesByPosition = new Dictionary<Position, Node>();
 
@@ -307,7 +307,7 @@ public ScoutTower CreateScoutTower(int i, int j)
             int lowerY = j * regionSize;
             int upperY = (j + 1) * regionSize;
 
-            var newScoutTower = new ScoutTower(GenerateRandomPosition(lowerX, upperX, lowerY, upperY, scoutTowersPositionsInUse, 1,
+            var newScoutTower = new ScoutTower(GenerateRandomPosition(lowerX, upperX, lowerY, upperY, ScoutTowerPositionsInUse, 1,
                     false, true))
             {
                 Id = Guid.NewGuid(),

game-engine/GameRunner/.gitlab-ci.yml

@@ -3,7 +3,7 @@
 #  - deploy
 
 variables:
-  RUNNER_VERSION: 2022.3.1
+  RUNNER_VERSION: 2022.3.2
 #  DOCKER_REGISTRY: NOT_SET
 #  REGION: $AWS_DEFAULT_REGION
 

game-engine/Logger/.gitlab-ci.yml

@@ -3,7 +3,7 @@
 #  - deploy
 
 variables:
-  LOGGER_VERSION: 2022.3.1
+  LOGGER_VERSION: 2022.3.2
 #  DOCKER_REGISTRY: NOT_SET
 #  REGION: $AWS_DEFAULT_REGION