Merge pull request #26 from DeepCodingInTuringAcademy/release-1.0.1

Release 1.0.1

Author: FrozenLemonTee

include/game.h

@@ -33,7 +33,7 @@ class Game
 
 public:
     // 十七
-    Game(int, int, int);
+    Game(int width, int height, int mineCount);
     static std::string version();
     void reset();                               /// 重置游戏数据
     [[nodiscard]] bool Over() const;            /// 游戏是否结束

include/gameboard.h

@@ -19,6 +19,7 @@ class GameBoard
     int width_;                            ///< 地图宽度
     int height_;                           ///< 地图高度
     int mineCount_;                        ///< 地雷总数
+    int mineRemainsCount_;
     std::vector<std::vector<Cell>> board_; ///< 地图格子
 
     // dearling
@@ -49,14 +50,13 @@ class GameBoard
     [[nodiscard]] bool cellIsRevealed(int x, int y) const;
     // 各自是否被插旗
     [[nodiscard]] bool cellIsFlagged(int x, int y) const;
-    // 获取格子周围地雷数
-    [[nodiscard]] int getAdjacentMines(int x, int y) const;
     // 地图尺寸
     [[nodiscard]] int getWidth() const;
     [[nodiscard]] int getHeight() const;
 
     // 获取地图所有地雷数
     [[nodiscard]] int getMineCount() const;
+    [[nodiscard]] int getMinesRemainCount() const;
 };
 
 #endif // GAMEBOARD_H

lib/game.cpp

@@ -55,7 +55,6 @@ void Game::handleInput(const std::string &input)
         {
             board_.generateMines(cur_x, cur_y); // 先埋雷
             first_ = false;
-            board_.revealCell(cur_x, cur_y);
         }
         processReveal(cur_x, cur_y);
     }
@@ -131,13 +130,9 @@ void Game::processFlag(const int x, const int y)
     board_.display();
 }
 
-Game::Game(const int width, const int height, const int mineCount) : board_(width, height, mineCount)
-{
-    gameOver_ = false;
-    win_ = false;
-    begin_ = false;
-    first_ = true;
-}
+Game::Game(const int width, const int height, const int mineCount)
+    : board_(width, height, mineCount), gameOver_(false),
+      win_(false), begin_(false), first_(true) {}
 
 std::string Game::version()
 {
@@ -166,6 +161,7 @@ void Game::run()
             GameUI::printMessage(usageInfo());
             error.clear();
         }
+        GameUI::printMessage("Remaining mines: " + std::to_string(board_.getMinesRemainCount()));
         GameUI::promptInput(); // 提示用户输入
 
         std::string input;

lib/gameboard.cpp

@@ -83,79 +83,81 @@ bool GameBoard::inBounds(const int x, const int y) const
 }
 
 GameBoard::GameBoard(const int width, const int height, const int mineCount)
-{
-  this->width_ = width;
-  this->height_ = height;
-  this->mineCount_ = mineCount;
-  this->board_ = std::vector(height_, std::vector(width_, Cell()));
-}
+    : width_(width), height_(height),
+      mineCount_(mineCount), mineRemainsCount_(mineCount),
+      board_(height_, std::vector(width_, Cell())) {}
 
 void GameBoard::revealCell(const int x, const int y)
 {
-  if (this->board_[x][y].isRevealed())
-  {
+    if (this->board_[x][y].isRevealed())
+    {
     return;
-  }
-  this->board_[x][y].reveal();
+    }
+    this->board_[x][y].reveal();
 }
 
 void GameBoard::toggleFlag(const int x, const int y)
 {
-  this->board_[x][y].toggleFlag();
+    if (this->board_[x][y].isFlagged()){
+        this->mineRemainsCount_ += 1;
+    } else {
+        this->mineRemainsCount_ -= 1;
+    }
+    this->board_[x][y].toggleFlag();
 }
 
 bool GameBoard::isGameWon() const
 {
-  for (const auto &row : board_)
-  {
+    for (const auto &row : board_)
+    {
     for (const auto &cell : row)
     {
       if (!cell.hasMine() && !cell.isRevealed())
       {
         return false; // 非地雷格子没翻开，未胜利
       }
     }
-  }
-  return true; // 所有非雷格子都翻开了，胜利
+    }
+    return true; // 所有非雷格子都翻开了，胜利
 }
 
 bool GameBoard::isGameLose() const
 {
-  for (auto &row : this->board_)
-  {
+    for (auto &row : this->board_)
+    {
     for (auto cell : row)
     {
       if (cell.isRevealed() && cell.hasMine())
       {
         return true;
       }
     }
-  }
-  return false;
+    }
+    return false;
 }
 
 void GameBoard::display(const bool revealAll) const
 {
-  const int height = this->getHeight();
-  const int width = this->getWidth();
+    const int height = this->getHeight();
+    const int width = this->getWidth();
 
-  // 打印列号
-  std::cout << "   "; // 行号空白占位
-  for (int col = 0; col < width; ++col)
-  {
+    // 打印列号
+    std::cout << "   "; // 行号空白占位
+    for (int col = 0; col < width; ++col)
+    {
     std::cout << std::setw(3) << col;
-  }
-  std::cout << std::endl;
+    }
+    std::cout << std::endl;
 
-  std::cout << "   +";
-  for (int col = 0; col < width; ++col)
-  {
+    std::cout << "   +";
+    for (int col = 0; col < width; ++col)
+    {
     std::cout << "---";
-  }
-  std::cout << "+" << std::endl;
+    }
+    std::cout << "+" << std::endl;
 
-  for (int row = 0; row < height; ++row)
-  {
+    for (int row = 0; row < height; ++row)
+    {
     std::cout << std::setw(3) << row << "|";
     for (int col = 0; col < width; ++col)
     {
@@ -180,53 +182,52 @@ void GameBoard::display(const bool revealAll) const
       }
     }
     std::cout << "|" << std::endl;
-  }
+    }
 
-  std::cout << "   +";
-  for (int col = 0; col < width; ++col)
-  {
+    std::cout << "   +";
+    for (int col = 0; col < width; ++col)
+    {
     std::cout << "---";
-  }
-  std::cout << "+" << std::endl;
+    }
+    std::cout << "+" << std::endl;
 }
 
 bool GameBoard::cellHasMine(const int x, const int y) const
 {
-  return board_[x][y].hasMine();
+    return board_[x][y].hasMine();
 }
 
 bool GameBoard::cellHasAdjacentMines(const int x, const int y) const
 {
-  return board_[x][y].hasAdjacentMines();
+    return board_[x][y].hasAdjacentMines();
 }
 
 // Check if the cell is revealed
 bool GameBoard::cellIsRevealed(const int x, const int y) const
 {
-  return board_[x][y].isRevealed(); // Return if the cell is revealed
+    return board_[x][y].isRevealed(); // Return if the cell is revealed
 }
 
 bool GameBoard::cellIsFlagged(const int x, const int y) const
 {
-  return board_[x][y].isFlagged();
-}
-// Get the number of adjacent mines to the cell
-int GameBoard::getAdjacentMines(const int x, const int y) const
-{
-  return board_[x][y].getAdjacentMines(); // Return the number of adjacent mines
+    return board_[x][y].isFlagged();
 }
 
 int GameBoard::getWidth() const
 {
-  return this->width_;
+    return this->width_;
 }
 
 int GameBoard::getHeight() const
 {
-  return this->height_;
+    return this->height_;
 }
 
 int GameBoard::getMineCount() const
 {
-  return this->mineCount_;
+    return this->mineCount_;
+}
+
+int GameBoard::getMinesRemainCount() const {
+    return this->mineRemainsCount_;
 }