version 1.0

Author: Semora

Client/Client.iml

@@ -9,5 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Common" />
     <orderEntry type="library" name="gson-2.3.1" level="project" />
+    <orderEntry type="module" module-name="common" />
   </component>
 </module>

Mithosis/Mithosis.iml

@@ -10,5 +10,6 @@
     <orderEntry type="module" module-name="Common" />
     <orderEntry type="library" name="gson-2.3.1" level="project" />
     <orderEntry type="module" module-name="Server" />
+    <orderEntry type="module" module-name="common" />
   </component>
 </module>

Mithosis/src/core/Context.java

@@ -202,7 +202,7 @@ public boolean addCell(Cell cell) {
 
     private void calculateRelationVisiblePos(int depthOfField) {
         if (relatedVisiblePositionsFromOdd.size() != relatedVisiblePositionsFromEven.size()) {
-            System.out.println("error!! calculateRelationVisiblePos!");
+//            System.out.println("error!! calculateRelationVisiblePos!");
         }
         if (relatedVisiblePositionsFromOdd.size() == 0) {
             Position[] positions = new Position[1];

Mithosis/src/core/model/Cell.java

@@ -95,6 +95,10 @@ public boolean mitosis() {
             {
                 continue;
             }
+            if(ctx.getMap().at(tPos).getType().equals(Constants.BLOCK_TYPE_IMPASSABLE))
+            {
+                continue;
+            }
             int currentHeight = ctx.getMap().at(position).getHeight();
             int nextHeight = ctx.getMap().at(tPos).getHeight();
             if (nextHeight > currentHeight + 1) {
@@ -172,7 +176,7 @@ public boolean gainResource () {
         if( blockResource < gainRate) {
             gain = blockResource;
         }
-        else if(gainRate + blockResource > ServerConstants.CELL_MAX_ENERGY)
+        else if(gainRate + energy > ServerConstants.CELL_MAX_ENERGY)
         {
             gain = ServerConstants.CELL_MAX_ENERGY - energy;
         }

Mithosis/src/core/model/Map.java

@@ -65,7 +65,7 @@ public static Map load(Context ctx, String dir) throws IOException, IOException
 
         File file = new File(dir);
         String json = new String(Files.readAllBytes(file.toPath()), ServerConstants.MAP_FILE_ENCODING);
-        System.out.println(json);
+//        System.out.println(json);
         FileStructure fs = new Gson().fromJson(json, FileStructure.class);
 
         // create map

Server/Server.iml

@@ -9,5 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Common" />
     <orderEntry type="library" name="gson-2.3.1" level="project" />
+    <orderEntry type="module" module-name="common" />
   </component>
 </module>

Server/src/server/core/GameHandler.java

@@ -263,7 +263,7 @@ public void run() {
 
             while (!shutdownRequest) {
                 long start = System.currentTimeMillis();
-                System.out.println(start);
+//                System.out.println(start);
                 try {
                     simulate.call();
                 } catch (Exception e) {

Terminal/Terminal.iml

@@ -9,5 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson-2.3.1" level="project" />
     <orderEntry type="module" module-name="Common" />
+    <orderEntry type="module" module-name="common" />
   </component>
 </module>

common/src/model/Position.java

@@ -32,7 +32,7 @@ public Position getNextPos (Direction dir) {
                 case SOUTH_WEST:
                     return new Position(x - 1, y - 1);
                 default:
-                    System.out.println("in chi bud dadi?!?!");
+//                    System.out.println("in chi bud dadi?!?!");
                     return null;
             }
         } else {
@@ -50,7 +50,7 @@ public Position getNextPos (Direction dir) {
                 case SOUTH_WEST:
                     return new Position(x - 1, y);
                 default:
-                    System.out.println("in chi bud dadi?!?!");
+//                    System.out.println("in chi bud dadi?!?!");
                     return null;
             }
         }

common/src/network/JsonSocket.java

@@ -112,7 +112,7 @@ public boolean isClosed() {
      */
     public void send(Object obj) throws IOException {
         String json = mGson.toJson(obj);
-        System.out.println("send : " + json);
+//        System.out.println("send : " + json);
         byte buffer[] = json.getBytes(ENCODING);
         mOut.write(buffer, 0, buffer.length);
         mOut.write('\0');
@@ -160,7 +160,7 @@ public <T> T get(Class<T> classOfInput) throws IOException {
             buffer[total++] = (byte) current;
         }
         String json = new String(buffer, 0, total, ENCODING);
-        System.out.println("receive : " + json);
+//        System.out.println("receive : " + json);
         return mGson.fromJson(json, classOfInput);
     }