Merged PR 27: Merge branch Dev into Master

Related work items: #159, #206, #28, #29, #33

Author: ChillinWars

.gitignore

@@ -0,0 +1,3 @@
+**/.idea
+**/.vscode
+build-Pacman*

CppClient/Game/Game.pro

@@ -49,4 +49,5 @@ DISTFILES += \
 HEADERS += \
     ks/commands.h \
     ks/models.h \
-    ai.h
+    ai.h \
+    simple_ai.h

CppClient/Game/ai.cpp

@@ -1,46 +1,67 @@
 #include "ai.h"
 
-#include <ctime>
 #include <vector>
 #include <iostream>
 
+#include "simple_ai.h"
+
 using namespace std;
 using namespace koala::chillin::client;
 using namespace ks::models;
 using namespace ks::commands;
 
 
-AI::AI(World *world): TurnbasedAI<World*>(world)
+AI::AI(World *world): RealtimeAI<World*>(world)
 {
-    srand(time(0));
+    simple_ai::ai = this;
 }
 
 AI::~AI()
 {
-    if (board)
-    {
-        for (int i = 0; i < world->height(); i++)
-            delete[] board[i];
-        delete[] board;
-    }
 }
 
 void AI::initialize()
 {
     cout << "initialize" << endl;
+
+    simple_ai::initialize(
+        world->width(),
+        world->height(),
+        world->ref_scores()[mySide],
+        world->ref_scores()[otherSide],
+        world->ref_board(),
+        world->ref_pacman(),
+        &world->ref_ghosts()[0],
+        world->ref_ghosts().size(),
+        world->ref_constants(),
+        mySide,
+        otherSide,
+        currentCycle,
+        cycleDuration
+    );
 }
 
 void AI::decide()
 {
     cout << "decide" << endl;
-}
 
-int AI::getRandInt(int start, int end)
-{
-    return (rand() % (end - start + 1)) + start;
+    simple_ai::decide(
+        world->width(),
+        world->height(),
+        world->ref_scores()[mySide],
+        world->ref_scores()[otherSide],
+        world->ref_board(),
+        world->ref_pacman(),
+        &world->ref_ghosts()[0],
+        world->ref_ghosts().size(),
+        world->ref_constants(),
+        mySide,
+        otherSide,
+        currentCycle,
+        cycleDuration
+    );
 }
 
-
 void AI::sendCommand(ks::KSObject *command)
 {
     BaseAI::sendCommand(command);

CppClient/Game/ai.h

@@ -7,12 +7,8 @@
 #include "ks/commands.h"
 
 
-class AI : public koala::chillin::client::TurnbasedAI<ks::models::World*>
+class AI : public koala::chillin::client::RealtimeAI<ks::models::World*>
 {
-private:
-    int **board;
-    int getRandInt(int start, int end);
-
 public:
     AI(ks::models::World *world);
     ~AI();

CppClient/Game/gamecfg.json

@@ -15,7 +15,7 @@
 		"": "creating a new decision thread each time a snapshot of game is received from server",
 		"create_new_thread": true,
 		"agent_name": "0",
-		"team_nickname": "BabyKnight",
+		"team_nickname": "Team1",
 		"token": "team_id1-xx"
 	}
 }

CppClient/Game/ks/commands.h

@@ -28,7 +28,7 @@ class KSObject
 namespace commands
 {
 
-enum class ECommandDirection
+enum ECommandDirection
 {
 	Up = 0,
 	Right = 1,

CppClient/Game/ks/commands.ks

@@ -9,7 +9,7 @@ _def = enum <byte>
 
 
 [ChangePacmanDirection]
-_def = class 
+_def = class
 direction = ECommandDirection