shift values moved from map.config to map.json

Author: MohsenDehghankar

map.config

@@ -20,8 +20,6 @@ WORKER_MAX_CARRYING_RESOURCE_AMOUNT = 10;
 # SCORPION = Soldier, ANT = Worker :)
 INIT_SCORPIONS = 0
 INIT_ANTS = 4
-SHIFT_X = 0
-SHIFT_Y = 0
 
 # server runtime configs
 READ_MAP_FROM_FILE = true

map.json

@@ -1,6 +1,8 @@
 {
   "MAP_HEIGHT": 32,
   "MAP_WIDTH": 32,
+  "SHIFT_X": 0,
+  "SHIFT_Y": 0,
   "cells_type": [
     { "row": 0, "col": 0, "cell_type": 3, "rec1": 0, "rec2": 0 },
     { "row": 0, "col": 1, "cell_type": 3, "rec1": 0, "rec2": 0 },

src/main/java/ir/sharif/aichallenge/server/logic/config/ConfigReader.java

@@ -56,16 +56,6 @@ public static void readConfigFile() {
             } catch (Exception ignored) {
                 AntGenerator.PROCESS_TIMEOUT_SECONDS = 30;
             }
-            try {
-                ConstConfigs.SHIFT_X = Integer.parseInt(props.getProperty("SHIFT_X"));
-            } catch (Exception ignore) {
-
-            }
-            try {
-                ConstConfigs.SHIFT_Y = Integer.parseInt(props.getProperty("SHIFT_Y"));
-            } catch (Exception ignore) {
-
-            }
         } catch (Exception e) {
             e.printStackTrace();
             Log.e("ConfigReader", "error in config props");

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

@@ -17,15 +17,22 @@
 
 public class JsonUtility {
 
-    public static ExternalMap readMapFromFile(String fileName)
-            throws IOException, ParseException {
+    public static ExternalMap readMapFromFile(String fileName) throws IOException, ParseException {
 
         JSONParser jsonParser = new JSONParser();
         try (FileReader reader = new FileReader(fileName)) {
             JSONObject map = (JSONObject) jsonParser.parse(reader);
             try {
                 ConstConfigs.MAP_HEIGHT = ((Long) map.get("MAP_HEIGHT")).intValue();
                 ConstConfigs.MAP_WIDTH = ((Long) map.get("MAP_WIDTH")).intValue();
+                try {
+                    ConstConfigs.SHIFT_X = ((Long) map.get("SHIFT_X")).intValue();
+                } catch (Exception ignore) {
+                }
+                try {
+                    ConstConfigs.SHIFT_Y = ((Long) map.get("SHIFT_Y")).intValue();
+                } catch (Exception ignore) {
+                }
             } catch (Exception e) {
                 Log.e("JsonUtility", "MAP_HEIGHT or MAP_WIDTH is not available in map.json!");
                 System.exit(-1);