Tweaking AI

Javanaise · Jan 31, 2018 · 2635a3a · 2635a3a
1 parent 3b67587
commit 2635a3a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/Assets/mrboom.6 b/Assets/mrboom.6
@@ -69,9 +69,6 @@ Color team mode.
 .B \-n, \-\-noautofire
 No autofire for bomb drop.
 .TP
-.B \-x, \-\-xbrz  <x>
-Set xBRZ shader factor: from 1 to 6 (default is 2, 1 is off).
-.TP
 .B \-z, \-\-nomusic
 No music.
 .TP

diff --git a/ai/Bot.cpp b/ai/Bot.cpp
@@ -34,7 +34,7 @@ bool Bot::cellSafe(int cell)
    int cellX = CELLX(cell);
    int cellY = CELLY(cell);
 
-   return(!dangerGrid[cellX][cellY] && !flameGrid[cellX][cellY]);
+   return(!dangerGrid[cellX][cellY] && !flameGrid[cellX][cellY] && !monsterIsComingGrid[cell]);
 }
 
 int Bot::bestBonusCell()
@@ -153,6 +153,10 @@ int Bot::bestCellToDropABomb()
       for (int i = 0; i < grid_size_x; i++)
       {
          int score = bestExplosionsGrid[i][j] * 128;
+         if (score < 0)
+         {
+            score = 0;
+         }
          if (score)
          {
             score += noise(_playerIndex, i, j);
@@ -185,6 +189,10 @@ int Bot::bestSafeCell()
          if (!somethingThatIsNoTABombAndThatWouldStopPlayer(i, j))
          {
             int score = TRAVELCOST_CANTGO - travelGrid.cost(i, j);
+            if (bestExplosionsGrid[i][j])
+            {
+               score += TRAVELCOST_CANTGO;
+            }
             if ((score > bestScore) && cellSafe(CELLINDEX(i, j)))
             {
                int cellIndex = CELLINDEX(i, j);

diff --git a/ai/GridFunctions.cpp b/ai/GridFunctions.cpp
@@ -777,7 +777,7 @@ void updateBestExplosionGrid(int player,
             }
             if (!foundSafePlace)
             {
-               score = 0;
+               score = -score;
             }
          }
          bestExplosionsGrid[i][j] = score;

diff --git a/ai/README.md b/ai/README.md
@@ -1,12 +1,11 @@
-![alt tag](../ tests / screenshots / mrboom - 0.gif)
-![alt tag](../ tests / screenshots / mrboom - 1.gif)
-![alt tag](../ tests / screenshots / mrboom - 2.gif)
-![alt tag](../ tests / screenshots / mrboom - 3.gif)
-![alt tag](../ tests / screenshots / mrboom - 4.gif)
-![alt tag](../ tests / screenshots / mrboom - 5.gif)
-![alt tag](../ tests / screenshots / mrboom - 6.gif)
-![alt tag](../ tests / screenshots / mrboom - 7.gif)
+![alt tag](../tests/screenshots/mrboom-0.gif)
+![alt tag](../tests/screenshots/mrboom-1.gif)
+![alt tag](../tests/screenshots/mrboom-2.gif)
+![alt tag](../tests/screenshots/mrboom-3.gif)
+![alt tag](../tests/screenshots/mrboom-4.gif)
+![alt tag](../tests/screenshots/mrboom-5.gif)
+![alt tag](../tests/screenshots/mrboom-6.gif)
+![alt tag](../tests/screenshots/mrboom-7.gif)
 ![alt tag](bt.png)
 
-Using a c++ 98 port of arvidsson 's [behavior tree library](https://github.com/arvidsson/bt).
-
+Using a c++98 port of arvidsson's [behavior tree library](https://github.com/arvidsson/bt).
diff --git a/sdl2/sdl2.cpp b/sdl2/sdl2.cpp
@@ -336,7 +336,7 @@ void  updateKeyboard(Uint8 scancode, int state)
    case SDL_SCANCODE_ESCAPE:
       if (state)
       {
-         if (beeingPlaying > BEEING_PLAYING_BUFFER)
+         if ((beeingPlaying > BEEING_PLAYING_BUFFER) || !isGameActive())
          {
             pressESC();
          }
@@ -992,10 +992,10 @@ main(int argc, char **argv)
          log_info("  -c, --color     \t\tColor team mode\n");
          log_info("  -n, --noautofire     \t\tNo autofire for bomb drop\n");
          log_info("  -z, --nomusic     \t\tNo music\n");
-         log_info("  -x <x>, --xbrz <x>\t\tSet xBRZ shader factor: from 1 to 6 (default is %d, 1 is off)\n", XBRZ_DEFAULT_FACTOR);
          log_info("  -v, --version  \t\tDisplay version\n");
 #ifdef DEBUG
          log_info("Debugging options:\n");
+         log_info("  -x <x>, --xbrz <x>\t\tSet xBRZ shader factor: from 1 to 6 (default is %d, 1 is off)\n", XBRZ_DEFAULT_FACTOR);
          log_info("  -o <x>, --output <x>\t\tDebug traces to <x> file\n");
          log_info("  -t <x>, --tracemask <x>\tDebug traces mask <x>:\n");
          log_info("                  \t\t1 to 128 player selection bit\n");