done, for now

[icfp05.git] / botsrc / bot.cpp

diff --git a/botsrc/bot.cpp b/botsrc/bot.cpp
index 28e8004a2167997f2b5a8bbe629a486ac03f6711..7635f13c7894342ad6a60ba85bbb7a2c7ce7e5e7 100644 (file)
--- a/botsrc/bot.cpp
+++ b/botsrc/bot.cpp
@@ -33,14 +33,16 @@ void Bot::play(){
                return;
        getline(cin, input);
        _name = value<string>(input);
-       cerr << "Got name: " << _name << endl;
+       //cerr << "Got name: " << _name << endl;
 
        getPlayers();
 
-       cerr << "Got players, building graph." << endl;
+       //cerr << "Got players, building graph." << endl;
        getline(cin, input);
        buildGraph();
 
+       preGamePreparations();
+
        while (true){
                getline(cin, input);
                if (input == "game-over")
@@ -48,9 +50,9 @@ void Bot::play(){
                updateWorld();
                _type = _players[_name].type;
                _location = _players[_name].location;
-               cerr << "New turn" << endl;
+               //cerr << "New turn" << endl;
                move(turn());
-               cerr << "Done with turn." << endl;
+               //cerr << "Done with turn." << endl;
        }
 }
 
@@ -83,35 +85,42 @@ void Bot::buildGraph(){
        if (input != "nod\\")
                return;
 
-       cerr << "Getting intersections" << endl;
+       //cerr << "Getting intersections" << endl;
        while (true){
                getline(cin, input);
                if (input == "nod/")
                        break;
                istringstream node(input);
                node >> input;
+               string name;
+               node >> name;
+               Intersection& inter = _intersections[name];
                node >> input;
-               Intersection& inter = _intersections[input];
-               node >> input;
-               if (input == "bank")
+               if (input == "bank"){
                        inter.type = bank;
-               else if (input == "hq")
+                       _banks[name] = 0;
+               }
+               else if (input == "hq"){
                        inter.type = hq;
-               else if (input == "robber-start")
+                       _copHq = name;
+               }
+               else if (input == "robber-start"){
                        inter.type = robber_start;
+                       _robberLocation = name;
+               }
                else
                        inter.type = ordinary;
                node >> inter.x;
                node >> inter.y;
        }
 
-       cerr << "Number of intersections: " << _intersections.size() << endl;
+       //cerr << "Number of intersections: " << _intersections.size() << endl;
 
        getline(cin, input);
        if (input != "edg\\")
                return;
 
-       cerr << "Getting streets" << endl;
+       //cerr << "Getting streets" << endl;
        int streets = 0;
        while (true){
                getline(cin, input);
@@ -135,7 +144,7 @@ void Bot::buildGraph(){
                }else
                        _intersections[from].connections[to] = car;
        }
-       cerr << "Number of streets: " << streets << endl;
+       //cerr << "Number of streets: " << streets << endl;
        getline(cin, input);
 }
 
@@ -177,6 +186,7 @@ void Bot::updateWorld(){
        getline(cin,input);
        _smell = value<int>(input);
 
+       _robberLocation = "";
        getline(cin,input);
        while (true){
                getline(cin, input);
@@ -190,13 +200,15 @@ void Bot::updateWorld(){
                player >> pl.location;
                player >> input;
                pl.type = _playerTypes[input];
+               if (pl.type == robber)
+                       _robberLocation = pl.location;
        }
        //cerr << "Number of players: " << _players.size() << endl;
        getline(cin, input);
 }
 
 void Bot::move(std::string location){
-       cerr << "Moving to: " << location << endl;
+       //cerr << "Moving to: " << location << endl;
        cout << "mov: " << location << " " << _playerTypeNames[_type] << endl;
 }