Merge pull request #34 from SharifAIChallenge/randomresource

Randomresource

Author: MohsenDehghankar

map.json

@@ -37,16 +37,16 @@
     { "row": 0, "col": 30, "cell_type": 3, "rec1": 0, "rec2": 0 },
     { "row": 0, "col": 31, "cell_type": 3, "rec1": 0, "rec2": 0 },
     { "row": 1, "col": 0, "cell_type": 3, "rec1": 0, "rec2": 0 },
-    { "row": 1, "col": 1, "cell_type": 2, "rec1": 0, "rec2": 0 },
+    { "row": 1, "col": 1, "cell_type": 10, "rec1": 44, "rec2": 0 },
     { "row": 1, "col": 2, "cell_type": 2, "rec1": 40, "rec2": 0 },
-    { "row": 1, "col": 3, "cell_type": 2, "rec1": 0, "rec2": 0 },
+    { "row": 1, "col": 3, "cell_type": 10, "rec1": 0, "rec2": 60 },
     { "row": 1, "col": 4, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 1, "col": 5, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 1, "col": 6, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 1, "col": 7, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 1, "col": 8, "cell_type": 2, "rec1": 0, "rec2": 0 },
-    { "row": 1, "col": 9, "cell_type": 2, "rec1": 0, "rec2": 0 },
-    { "row": 1, "col": 10, "cell_type": 2, "rec1": 0, "rec2": 0 },
+    { "row": 1, "col": 9, "cell_type": 12, "rec1": 33, "rec2": 0 },
+    { "row": 1, "col": 10, "cell_type": 12, "rec1": 33, "rec2": 0 },
     { "row": 1, "col": 11, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 1, "col": 12, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 1, "col": 13, "cell_type": 2, "rec1": 0, "rec2": 0 },
@@ -811,7 +811,7 @@
     { "row": 25, "col": 4, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 5, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 6, "cell_type": 2, "rec1": 0, "rec2": 0 },
-    { "row": 25, "col": 7, "cell_type": 2, "rec1": 0, "rec2": 0 },
+    { "row": 25, "col": 7, "cell_type": 4, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 8, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 9, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 10, "cell_type": 3, "rec1": 0, "rec2": 0 },
@@ -830,7 +830,7 @@
     { "row": 25, "col": 23, "cell_type": 3, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 24, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 25, "cell_type": 2, "rec1": 0, "rec2": 0 },
-    { "row": 25, "col": 26, "cell_type": 2, "rec1": 10, "rec2": 0 },
+    { "row": 25, "col": 26, "cell_type": 4, "rec1": 10, "rec2": 0 },
     { "row": 25, "col": 27, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 28, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 25, "col": 29, "cell_type": 2, "rec1": 0, "rec2": 0 },
@@ -856,7 +856,7 @@
     { "row": 26, "col": 17, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 26, "col": 18, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 26, "col": 19, "cell_type": 2, "rec1": 0, "rec2": 0 },
-    { "row": 26, "col": 20, "cell_type": 2, "rec1": 0, "rec2": 0 },
+    { "row": 26, "col": 20, "cell_type": 5, "rec1": 0, "rec2": 0 },
     { "row": 26, "col": 21, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 26, "col": 22, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 26, "col": 23, "cell_type": 3, "rec1": 0, "rec2": 0 },
@@ -870,11 +870,11 @@
     { "row": 26, "col": 31, "cell_type": 3, "rec1": 0, "rec2": 0 },
     { "row": 27, "col": 0, "cell_type": 3, "rec1": 0, "rec2": 0 },
     { "row": 27, "col": 1, "cell_type": 2, "rec1": 0, "rec2": 0 },
-    { "row": 27, "col": 2, "cell_type": 2, "rec1": 0, "rec2": 0 },
+    { "row": 27, "col": 2, "cell_type": 5, "rec1": 0, "rec2": 0 },
     { "row": 27, "col": 3, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 27, "col": 4, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 27, "col": 5, "cell_type": 2, "rec1": 0, "rec2": 0 },
-    { "row": 27, "col": 6, "cell_type": 2, "rec1": 0, "rec2": 0 },
+    { "row": 27, "col": 6, "cell_type": 5, "rec1": 0, "rec2": 0 },
     { "row": 27, "col": 7, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 27, "col": 8, "cell_type": 2, "rec1": 0, "rec2": 0 },
     { "row": 27, "col": 9, "cell_type": 2, "rec1": 0, "rec2": 0 },

src/main/java/ir/sharif/aichallenge/server/logic/handlers/AttackHandler.java

@@ -102,6 +102,16 @@ private void runAttack(int fromXPosition, int fromYPosition, int damage, int att
             }
         }
         Ant defender = ants.get(index);
+        if (attackerId < 0) {
+            // base attack to all ants of a cell
+            for (Ant defAnt : map.getCell(defender.getXPosition(), defender.getYPosition()).getAnts()) {
+                defAnt.decreaseHealth(damage);
+                AttackSummary attackSummary = new AttackSummary(attackerId, defAnt.getId(), fromYPosition,
+                        fromXPosition, defAnt.getYPosition(), defAnt.getXPosition());
+                attackSummaries.add(attackSummary);
+            }
+            return;
+        }
         defender.decreaseHealth(damage);
         AttackSummary attackSummary = new AttackSummary(attackerId, defender.getId(), fromYPosition, fromXPosition,
                 defender.getYPosition(), defender.getXPosition());

src/main/java/ir/sharif/aichallenge/server/logic/model/Game.java

@@ -67,6 +67,7 @@ public void passTurn(Map<String, List<ClientMessageInfo>> messages) {
         removeDeadAntsNewMessages(messages);
         handleChatMessages(messages);
         handleAntsMove(messages);
+        map.getAllCells().forEach(cell -> cell.renew(map, currentTurn)); //for future resources
         map.getAllCells().forEach(Cell::manageResources);
         /*
          * if (isFinished()) { Colony winnerColony = gameJudge.getWinner();

src/main/java/ir/sharif/aichallenge/server/logic/model/cell/Cell.java

@@ -1,22 +1,25 @@
 package ir.sharif.aichallenge.server.logic.model.cell;
 
+import ir.sharif.aichallenge.server.logic.config.ConstConfigs;
+import ir.sharif.aichallenge.server.logic.model.ant.Ant;
+import ir.sharif.aichallenge.server.logic.model.ant.AntType;
+import ir.sharif.aichallenge.server.logic.model.map.GameMap;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Random;
 import java.util.stream.Collectors;
 
-import ir.sharif.aichallenge.server.logic.config.ConstConfigs;
-import ir.sharif.aichallenge.server.logic.model.ant.Ant;
-import ir.sharif.aichallenge.server.logic.model.ant.AntType;
-
 public class Cell {
     private int xPosition;
     private int yPosition;
     public CellType cellType;
     private ResourceType resourceType;
     private int resourceAmount;
     private List<Ant> ants;
+    private int toBeAddedTurn = -1;
+    private ResourceType toBeAddedResourceType;
+    private int toBeAddedResourceAmount;
 
     public Cell(int xPosition, int yPosition, CellType cellType, ResourceType resourceType, int resourceAmount) {
         this.xPosition = xPosition;
@@ -27,6 +30,23 @@ public Cell(int xPosition, int yPosition, CellType cellType, ResourceType resour
         ants = new ArrayList<>();
     }
 
+    // for future resource
+    public Cell(int xPosition, int yPosition, ResourceType resourceType, int resourceAmount, int toBeAddedTurn) {
+        this(xPosition, yPosition, CellType.EMPTY, ResourceType.NONE, 0);
+        this.toBeAddedResourceType = resourceType;
+        this.resourceType = ResourceType.NONE;
+        this.resourceAmount = 0;
+        this.toBeAddedResourceAmount = resourceAmount;
+        this.toBeAddedTurn = toBeAddedTurn;
+    }
+
+    public void renew(GameMap map, int currentTurn) {
+        if (currentTurn != this.toBeAddedTurn)
+            return;
+        map.addResource(toBeAddedResourceType, toBeAddedResourceAmount, xPosition, yPosition);
+        this.toBeAddedTurn = -1;
+    }
+
     public void setResourceType(ResourceType resourceType) {
         this.resourceType = resourceType;
     }
@@ -93,14 +113,14 @@ public void manageResources() {
         if (cellType == CellType.WALL || resourceType == ResourceType.NONE)
             return;
         List<Ant> freeWorkerAnts = getWorkerAnts().stream()
-                .filter(x -> x.getCarryingResourceType() == ResourceType.NONE ||
-                        (x.getCarryingResourceType() == this.getResourceType() &&
-                                x.getCarryingResourceAmount() < ConstConfigs.WORKER_MAX_CARRYING_RESOURCE_AMOUNT))
+                .filter(x -> x.getCarryingResourceType() == ResourceType.NONE
+                        || (x.getCarryingResourceType() == this.getResourceType()
+                                && x.getCarryingResourceAmount() < ConstConfigs.WORKER_MAX_CARRYING_RESOURCE_AMOUNT))
                 .collect(Collectors.toList());
 
         Collections.shuffle(freeWorkerAnts);
         for (Ant ant : freeWorkerAnts) {
-            if (this.getResourceAmount() <= 0){
+            if (this.getResourceAmount() <= 0) {
                 break;
             }
 

src/main/java/ir/sharif/aichallenge/server/logic/utility/JsonUtility.java

@@ -14,6 +14,9 @@
 
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
 
 public class JsonUtility {
 
@@ -58,6 +61,8 @@ public static ExternalMap readMapFromFile(String fileName) throws IOException, P
         }
     }
 
+    private static HashMap<Integer, Integer> cellTypeToTurn = new HashMap<Integer, Integer>();
+
     private static Cell parseCellObject(JSONObject cell) {
         // Get cell first name
         int yPosition = ((Long) cell.get("row")).intValue();
@@ -95,6 +100,17 @@ private static Cell parseCellObject(JSONObject cell) {
         if (cellType == CellType.BASE) {
             return new BaseCell(xPosition, yPosition);
         }
+        // future resource
+        if (cell_type_value > 6) {
+            int toBeAddedTurn = ThreadLocalRandom.current().nextInt(1, ConstConfigs.GAME_MAXIMUM_TURN_COUNT);
+            if (cellTypeToTurn.keySet().contains(cell_type_value)) {
+                toBeAddedTurn = cellTypeToTurn.get(cell_type_value);
+            } else {
+                cellTypeToTurn.put(cell_type_value, toBeAddedTurn);
+            }
+            // Log.i("JsonUtility", "cell will be added in " + toBeAddedTurn);
+            return new Cell(xPosition, yPosition, resourceType, resourceAmount, toBeAddedTurn);
+        }
         return new Cell(xPosition, yPosition, cellType, resourceType, resourceAmount);
     }
 }