add Tool: controlled dice

Monopoly/Controller.cpp

@@ -31,18 +31,13 @@ namespace monopoly {
             case GS::normal:
             {
                 if (strcmp(cmd, "t") == 0) {
+                    gs.message += "请选择工具编号:";
                     gs.state = GS::tool;
                 }
                 else if (strcmp(cmd, "s") == 0) {
                     gs.message += "请输入步数(-9 ~ 9), 负号表示反向于前进方向: (输入 " + RED + "x" + NC + " 返回)";
                     gs.state = GS::step;
                 }
-//                else if (strcmp(cmd, "i") == 0) {
-//                    Player &player = gs.currentPlayer();
-//                    gs.message += "玩家 " + gc.posSymbolMap[player.name] + "信息:";
-//                    gs.message += "\n现金: ￥" + to_string(player.cash);
-//                    gs.message += "\n存款: ￥" + to_string(player.deposit);
-//                }
                 else if (strcmp(cmd, "r") == 0) {
                     gs.lastRoll = static_cast<int>(rand() % 6) + 1;
 //                    gs.lastRoll = 2; // TODO: remove
@@ -62,11 +57,32 @@ namespace monopoly {
             {
                 Player& player = gs.currentPlayer();
                 size_t count = player.tools.size();
-                if (strlen(cmd) == 1 && cmd[0] >= 48/*0*/ && cmd[0] < 48 + count) {
-                    gs.message = string("你选择了道具: ") + cmd + player.tools[atoi(cmd)].name;
-                    gs.state = GS::normal;
+                if (player.usingMagicDice) {
+                    int num = atoi(cmd);
+                    if (num > 0 && num < 7) {
+                        gs.message += "前进 " + to_string(num) + " 步";
+                        gs.state = GS::normal;
+                        player.usingMagicDice = false;
+                        movePlayerWithAnimation(num);
+                        handleEvents();
+                        return;
+                    }
+                    else {
+                        gs.errMsg = RED + "无效的步数" + NC;
+                        gs.message += "请输入前进步数 (1~6)";
+                        break;
+                    }
+                }
+                else if (strlen(cmd) == 1 && cmd[0] >= 48/*0*/ && cmd[0] < 48 + count) {
+                    const Tool &tool = player.tools[atoi(cmd)];
+                    gs.message = string("你选择了道具: ") + cmd + tool.name;
+                    useTool(atoi(cmd));
                     return;
                 }
+                else if (strcmp(cmd, "x") == 0) {
+                    gs.message += "取消操作";
+                    gs.state = GS::normal;
+                }
                 else {
                     gs.errMsg = RED + "没有这个工具 :(" + NC;
                     break; // error
@@ -367,4 +383,29 @@ namespace monopoly {
             gs.today.nextDay();
         }
     }
+//    toolMap[ToolType::MAGIC_DICE] = "遥控骰子";
+//    toolMap[ToolType::ROADBLOCK] = "路障";
+//    toolMap[ToolType::TURNING_CARD] = "转向卡";
+//    toolMap[ToolType::AVERAGE_CARD] = "均富卡";
+//    toolMap[ToolType::BUY_CARD] = "购地卡";
+//    toolMap[ToolType::REMOVE_CARD] = "拆迁卡";
+//    toolMap[ToolType::MONSTER_CARD] = "怪兽卡";
+
+    void Controller::useTool(int i) {
+        Player &player = gs.currentPlayer();
+        const Tool &tool = player.tools[i];
+        switch(tool.type) {
+            case ToolType::MAGIC_DICE:
+            {
+                vector<Tool>::iterator it = player.tools.begin();
+                for (int j = 0; j < i; j++, it++) ;
+                player.tools.erase(it);
+                gs.message += "\n请输入前进步数 (1~6)";
+                gs.currentPlayer().usingMagicDice = true;
+            }
+                break;
+            default:
+                break;
+        }
+    }
 }

Monopoly/Controller.hpp

@@ -11,6 +11,7 @@
 
 #include <iostream>
 #include <unistd.h>
+#include "Tool.hpp"
 #include "GameContext.hpp"
 #include "GameState.hpp"
 
@@ -35,6 +36,7 @@ namespace monopoly {
         void displayPlayers();
         void handleEvents();
         void nextDay();
+        void useTool(int);
     };
 }
 

Monopoly/GameContext.cpp

@@ -59,6 +59,7 @@ namespace monopoly {
         posSymbolMap["player2Land4"] = LBLUE+string("П4 ")+NC;
         posSymbolMap["player2Land5"] = LBLUE+string("П5 ")+NC;
         posSymbolMap["player2Land6"] = LBLUE+string("П6 ")+NC;
+        posSymbolMap["roadBlock"] = RED+string("☀  ")+NC;
         posSymbolMap["void"] = "   ";
 
         toolMap[ToolType::MAGIC_DICE] = "遥控骰子";
@@ -87,13 +88,9 @@ namespace monopoly {
         gs.players.push_back(Player("player1", toolMap));
         gs.players.push_back(Player("player2", toolMap));
 
-//        gs.players[0].tools.push_back(Tool(ToolType::ROADBLOCK));
-//        gs.players[0].tools.push_back(Tool(ToolType::MAGIC_DICE));
         gs.players[0].addTool(ToolType::ROADBLOCK);
         gs.players[0].addTool(ToolType::MAGIC_DICE);
 
-//        gs.board[0][0].name = gs.currentPlayer().name;
-
         init();
     }
 
@@ -181,7 +178,7 @@ namespace monopoly {
         }
 
         cout << NC << "你可以做:" << endl
-//        << "t(tool) - 道具列表" << endl
+        << "t(tool) - 道具列表" << endl
         << "s(step) - 查看前后若干步的具体信息" << endl
 //        << "i(info) - 查看玩家资产信息" << endl
         << "r(roll) - 掷骰子" << endl

Monopoly/Player.cpp

@@ -9,7 +9,7 @@
 #include "Player.hpp"
 
 namespace monopoly {
-    Player::Player(string name, map<ToolType, string> &m): name(name), toolMap(m) {
+    Player::Player(string name, map<ToolType, string> m): name(name), toolMap(m) {
         direction = true;
         curPos = 0;
         prePos = 0;
@@ -18,6 +18,7 @@ namespace monopoly {
         cash = 1000;
         deposit = 0;
         done = false;
+        usingMagicDice = false;
     }
 
     void Player::addTool(ToolType type) {

Monopoly/Player.hpp

@@ -33,9 +33,10 @@ namespace monopoly {
         int cash;
         int deposit;
         bool done; // 回合行动结束标志
+        bool usingMagicDice; // 正在使用遥控骰子的标识
         map<ToolType, string> toolMap;
 
-        Player(string, map<ToolType, string> &);
+        Player(string, map<ToolType, string>);
         void addTool(ToolType);
     };
     ostream& operator <<(ostream&, Player&);