beginning of the AI overhaul

currently include a tag game
all other behaviors are disabled
when she touches you she runs away
if you touch her in a short time then nothing happens
if you fail to catch her then she will wipe some of the board

Author: EveningCross

Classes/AiHandler.cpp

@@ -0,0 +1,25 @@
+#include "AiHandler.h"
+
+AiHandler::AiHandler(std::vector<Player*>* players)
+{
+
+	sam = ServerSam::create(players);
+	ptera = Pterodactyl::create();
+}
+
+AiHandler::~AiHandler()
+{}
+
+void AiHandler::runAI() {
+	sam->runAI();
+}
+
+ServerSam * AiHandler::getSam()
+{
+	return sam;
+}
+
+Pterodactyl * AiHandler::getPtera()
+{
+	return ptera;
+}

Classes/AiHandler.h

@@ -0,0 +1,32 @@
+#ifndef AI_HANDLER_HPP
+#define AI_HANDLER_HPP
+
+#include "ServerSam.h"
+#include "Pterodactyl.h"
+#include "cocos2d.h"
+#include "Player.h"
+#include <array>
+#include "Candy.h"
+#include "LevelManager.hpp"
+
+class ServerSam;
+class Pterodactyl;
+
+class AiHandler
+{
+public:
+
+	AiHandler(std::vector<Player*>* players);
+	~AiHandler();
+
+	void runAI();
+
+	ServerSam* getSam();
+	Pterodactyl* getPtera();
+
+private:
+	ServerSam* sam;
+	Pterodactyl* ptera;
+};
+
+#endif //AI_HANDLER_HPP

Classes/ServerDemoScene.cpp

@@ -78,19 +78,19 @@ bool ServerDemo::init()
 	players.push_back(player3);
 	players.push_back(player4);
 
-	serversam = ServerSam::create(this);
+	Ai = new AiHandler(&players);
+
+	serversam = Ai->getSam();
 	addChild(serversam, 0);
 
-	pterodactyl = Pterodactyl::create();
+	pterodactyl = Ai->getPtera();
 	addChild(pterodactyl, 0);
 
 	candy = Candy::create();
 	addChild(candy, 0);
 
 	loadLevel(1);
 
-	serversam->linkPtera(pterodactyl);
-	serversam->linkCandy(candy);
 	serversam->attachLevel(&levelmanager);
 
 	std::ifstream is("config.json");
@@ -165,7 +165,11 @@ void ServerDemo::update(float dt)
 		if (levelmanager.currentlevel != 1 && solved_timer_start == false)
 		{
 			serversam->setPriority(PLAYER_GRID, DRY_GRID, dried);
-			serversam->runAI(&players);
+			Ai->runAI();
+			for (int i = 0; i < serversam->getServerMessage().size(); i++) {
+				enqueueMessage(serversam->getServerMessage()[i]);
+				sendmap = Ai->getSam()->sendMap();
+			}
 		}
 
 		//set local z-order
@@ -180,7 +184,7 @@ void ServerDemo::update(float dt)
 		dryTiles();
 
 		//check if a player collides with sam/ptero and erase tiles
-		checkEnemyCollision();
+		//checkEnemyCollision();
 
 		//check is puzzle solved, then let players admire their finished puzzles for a few seconds
 		checkSolved();
@@ -1456,6 +1460,7 @@ void ServerDemo::checkEnemyCollision(void)
 	}
 }
 
+
 void ServerDemo::dryTiles(void)
 {
 	//if (dry_y == CURRENT_GRID[0].size() - 1 && dry_x == CURRENT_GRID.size() - 1) {

Classes/ServerDemoScene.h

@@ -7,6 +7,7 @@
 #include "ServerSam.h"
 #include "Pterodactyl.h"
 #include "Candy.h"
+#include "AiHandler.h"
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
@@ -37,6 +38,7 @@
 
 class TCPServer;
 class ServerSam;
+class AiHandler;
 
 class ServerDemo : public cocos2d::Layer
 {
@@ -81,6 +83,7 @@ class ServerDemo : public cocos2d::Layer
 	ServerSam* serversam;
 	Pterodactyl* pterodactyl;
 	Candy* candy;
+	AiHandler* Ai;
 
 	std::vector<cocos2d::Sprite*> objects;
 	std::vector<ServerMessage> servermessagequeue;