diff --git a/agents/vixen/vixen.py b/agents/vixen/vixen.py index 7c44aa33f46b67c70397f0545fa7b0266baf3ddb..975f6a79420033bec910c8c02eecd2d4f5f9e8bc 100755 --- a/agents/vixen/vixen.py +++ b/agents/vixen/vixen.py @@ -28,9 +28,9 @@ class Vixen(BasicAI): #self.bombScores = {'1' : -0.9 , '2' : -0.8 , '3' : -0.5 , '4' : 0.1, '5' : 0.1, '6' : 0.3, '7' : 0.7, '8' : 1 , '9' : 0.6, 's' : 0} #self.bombScores = {'1' : -0.9 , '2' : -0.8 , '3' : -0.5 , '4' : -0.5, '5' : -0.4, '6' : -0.5, '7' : -0.2, '8' : 1.0 , '9' : -0.1, 's' : -0.2} - self.suicideScores = {'1' : -0.5 , '2' : -0.4 , '3' : -0.35, '4' : -0.25, '5' : -0.2, '6' : 0.0, '7' : 0.1, '8' : -1.0 , '9' : 0.0, 's' : -0.4} + self.suicideScores = {'1' : -0.8 , '2' : -0.6 , '3' : -0.5, '4' : -0.25, '5' : -0.2, '6' : 0.0, '7' : 0.1, '8' : -1.0 , '9' : 0.0, 's' : -0.4} self.killScores = {'1' : 1.0 , '2' : 0.9 , '3' : 0.9 , '4' : 0.8, '5' : 0.8, '6' : 0.8, '7' : 0.8, '8' : 0.9 , '9' : 0.7, 's' : 1.0} - self.riskScores = {'1' : 0.0, '2' : 0.1, '3' : 0.2, '4': 0.4, '5': 0.6, '6': 0.7, '7':0.8, '8': 0.0, '9' : 1.0, 's' : 0.1} + self.riskScores = {'1' : -0.3, '2' : -0.3, '3' : 0.0, '4': 0.4, '5': 0.6, '6': 0.7, '7':0.8, '8': 0.0, '9' : 1.0, 's' : 0.1} @@ -132,7 +132,7 @@ class Vixen(BasicAI): if attackerRank == '8': return 1.0 else: - return 0.0 + return self.suicideScore(attackerRank) def suicideScore(self, attackerRank): return self.suicideScores[attackerRank] diff --git a/judge/manager/game.cpp b/judge/manager/game.cpp index f25c9f381cfcc62f25eaa951b3928bd34e44468d..e87927df7a1e37e2dfcea0d494c946fbfe2c1489 100644 --- a/judge/manager/game.cpp +++ b/judge/manager/game.cpp @@ -771,6 +771,9 @@ void Game::MakeControllers(const char * redPath, const char * bluePath) { Network * redNetwork = NULL; Network * blueNetwork = NULL; + //To allow for running two network controllers (I don't know why you would, but beside the point...) use two ports + static const int port1 = 4560; + static const int port2 = 4561; if (redPath[0] == '@') { @@ -789,7 +792,7 @@ void Game::MakeControllers(const char * redPath, const char * bluePath) if (network == NULL) { logMessage("Creating server for red AI... "); - redNetwork = new Server(); + redNetwork = new Server(port1); logMessage("Successful!\n"); } @@ -797,7 +800,7 @@ void Game::MakeControllers(const char * redPath, const char * bluePath) { network = (const char*)(network+1); logMessage("Creating client for red AI... "); - redNetwork = new Client(network); + redNetwork = new Client(network, port2); logMessage("Connected to address %s\n", network); } @@ -825,7 +828,7 @@ void Game::MakeControllers(const char * redPath, const char * bluePath) if (network == NULL) { logMessage("Creating server for blue AI... "); - blueNetwork = new Server(); + blueNetwork = new Server(port2); logMessage("Successful!\n"); } @@ -833,7 +836,7 @@ void Game::MakeControllers(const char * redPath, const char * bluePath) { network = (const char*)(network+1); logMessage("Creating client for blue AI... "); - blueNetwork = new Client(network); + blueNetwork = new Client(network, port1); logMessage("Connected to address %s\n", network); } logMessage(" (Blue's responses will be received over the connection)\n"); diff --git a/judge/manager/graphics.cpp b/judge/manager/graphics.cpp index 7cc22d0a495237de04994ea3af01aff23682d1bc..2aed851ecd44c15d5f0a8ad46ddcb3d717a1bebc 100644 --- a/judge/manager/graphics.cpp +++ b/judge/manager/graphics.cpp @@ -215,7 +215,7 @@ void Graphics::Initialise(const char * caption, int newWidth, int newHeight) //COMES AFTER SETVIDEO MODE glEnable(GL_TEXTURE_2D); - glClearColor(1,1,1,0); //Set clear colour (white) here + glClearColor(0,0,0,0); //Set clear colour (white) here glViewport(0,0,screenWidth,screenHeight); //DOES matter glClear(GL_COLOR_BUFFER_BIT); glMatrixMode(GL_PROJECTION); diff --git a/judge/manager/network.h b/judge/manager/network.h index 1cd0a11fd7c45b0cf2b48886760b49fc5809cb1c..49d7704fb689a6da89752d1b541c742376fa63a3 100644 --- a/judge/manager/network.h +++ b/judge/manager/network.h @@ -20,7 +20,7 @@ class Network { public: - Network(int newPort = 666); + Network(int newPort = 4560); virtual ~Network(); bool Valid() const {return sfd != -1;}