Some changes.

Author: khodabande

Client/src/client/AI.java

@@ -3,6 +3,7 @@
 import client.model.Block;
 import client.model.Cell;
 import model.Direction;
+import util.Constants;
 import util.ServerConstants;
 
 import java.util.Random;
@@ -32,13 +33,13 @@ public void doTurn(World world) {
         for(Cell c : world.getMyCells())
         {
             Block block = world.getMap().at(c.getPos());
-            if(c.getEnergy() >= ServerConstants.CELL_MIN_ENERGY_FOR_MITOSIS && block.getType().equals(ServerConstants.BLOCK_TYPE_MITOSIS))
+            if(c.getEnergy() >= Constants.CELL_MIN_ENERGY_FOR_MITOSIS && block.getType().equals(Constants.BLOCK_TYPE_MITOSIS))
             {
-                //System.out.println("mitosis");
-                //System.out.println(c.getEnergy());
+                System.out.println("mitosis");
+                System.out.println(c.getEnergy());
                 c.mitosis();
             }
-            else if(c.getEnergy() < ServerConstants.CELL_MAX_ENERGY && block.getResource() > 0)
+            else if(c.getEnergy() < Constants.CELL_MAX_ENERGY && block.getType().equals(Constants.BLOCK_TYPE_RESOURCE) && block.getResource() > 0)
             {
                 //System.out.println("gain");
                 //System.out.println(block.getResource());

Client/src/client/Model.java

@@ -15,7 +15,7 @@
  */
 public class Model {
 
-    private long turnTimeout = 300;
+    private long turnTimeout = 400;
     private long turnStartTime;
     private ArrayList<Event> events;
     private World world;

Mithosis/src/core/Context.java

@@ -6,6 +6,7 @@
 import core.model.Map;
 import model.*;
 import server.core.model.ClientInfo;
+import util.Constants;
 import util.ServerConstants;
 
 import java.io.*;
@@ -94,6 +95,8 @@ private void loadMap(String dir) throws IOException {
                 int height = block.values[1].intValue();
                 int resource = block.values[2].intValue();
                 boolean isMovable = !types[type].equals(ServerConstants.BLOCK_TYPE_IMPASSABLE);
+                if (type != 3)
+                    resource = 0;
                 Block b = new Block(this, ServerConstants.TURN_MAKE_MAP, j, i, height, resource, types[type], isMovable);
                 map.set(j, i, b);
             }
@@ -108,6 +111,8 @@ private void loadMap(String dir) throws IOException {
                 int dof = instance.values[1].intValue();
                 int energy = instance.values[2].intValue();
                 int gainRate = instance.values[3].intValue();
+                dof = Constants.CELL_DEPTH_OF_FIELD;
+                gainRate = Constants.CELL_GAIN_RATE;
                 Cell cell = new Cell(this, new Position(x, y), teamID, dof, energy, gainRate);
                 addCell(cell);
             }

Mithosis/src/core/MitosisGameLogic.java

@@ -242,9 +242,7 @@ public void simulateEvents(Event[] terminalEvent, Event[] environmentEvent, Even
             }
 
             Collection<GameEvent> currentTurnEventsList = gameObjectEvents.values();
-            GameEvent[] currentTurnEvents = currentTurnEventsList.toArray(new GameEvent[currentTurnEventsList.size()]);
-
-            for (GameEvent event: currentTurnEvents) {
+            for (GameEvent event: currentTurnEventsList) {
                 switch (event.getType()) {
                     case GameEvent.TYPE_MOVE:
                         moveEvents.add(event);

Mithosis/src/core/model/Cell.java

@@ -95,6 +95,11 @@ public boolean mitosis() {
             {
                 continue;
             }
+            int currentHeight = ctx.getMap().at(position).getHeight();
+            int nextHeight = ctx.getMap().at(tPos).getHeight();
+            if (nextHeight > currentHeight + 1) {
+                continue;
+            }
             if(ctx.getMap().at(tPos).isEmpty())
             {
                 secondCellPos = tPos;
@@ -104,11 +109,7 @@ public boolean mitosis() {
         if(secondCellPos == null) {
             return false;
         }
-        int currentHeight = ctx.getMap().at(position).getHeight();
-        int nextHeight = ctx.getMap().at(secondCellPos).getHeight();
-        if (nextHeight > currentHeight + 1) {
-            return false;
-        }
+
         int energy = ServerConstants.CELL_MIN_ENERGY_FOR_MITOSIS;
         int secondEnergy = energy / 2;
         setEnergy(energy - secondEnergy);

Server/src/server/core/GameHandler.java

@@ -43,7 +43,7 @@ public class GameHandler {
     private static final String RESOURCE_PATH_OUTPUT_HANDLER = "resources/game_handler/output_handler.conf";
     private static final String RESOURCE_PATH_TURN_TIMEOUT = "resources/game_handler/turn_timeout.conf";
     private final long GAME_LOGIC_SIMULATE_TIMEOUT;
-    private final long GAME_LOGIC_TURN_TIMEOUT = 400;
+    private final long GAME_LOGIC_TURN_TIMEOUT = 1000;
     private final long CLIENT_RESPONSE_TIME;
 
     private ClientNetwork mClientNetwork;

resources/game_handler/turn_timeout.conf

@@ -1,4 +1,4 @@
 {
-  "clientResponseTime" : 350,
+  "clientResponseTime" : 500,
   "simulateTimeout" : 10000
 }