Fixed File Import and Export

Author: Vectabyte

FileExport.hpp

@@ -8,7 +8,7 @@ void exportFile(std::vector<tile>& tiles){
     std::ofstream csv ("Tiles.csv");
 
     for(tile t : tiles){
-        csv<<t.tileIndex<<";"<<t.ownerId<<";"<<t.buyable<<";"<<t.buyPrice<<";"<<t.isMortgaged<<";"<<t.housePrice<<";"<<t.upgradeStage<<";"<<t.price0<<";"<<t.price1<<";"<<t.price2<<";"<<t.price3<<";"<<t.price4<<";"<<t.price5<<";"<<t.color<<";"<<t.tileName<<";"<<t.shortName<<"\n";
+        csv<<t.tileIndex<<";"<<t.ownerId<<";"<<t.buyable<<";"<<t.buyPrice<<";"<<t.isMortgaged<<";"<<t.housePrice<<";"<<t.upgradeStage<<";"<<t.price0<<";"<<t.price1<<";"<<t.price2<<";"<<t.price3<<";"<<t.price4<<";"<<t.price5<<";"<<static_cast<int>(t.color)<<";"<<t.tileName<<";"<<t.shortName<<"\n";
     }
     csv.close();
 }
@@ -18,6 +18,7 @@ void exportFile(std::vector<player>& players){
     std::ofstream ownedStreetsFile ("OwnedStreets.csv");
 
     for(player p : players){
+        csv<<p.playerId<<";"<<p.symbol<<";"<<p.name<<";"<<p.money<<";"<<p.currentPosition<<";"<<p.jailed<<";"<<static_cast<int>(p.color)<<";"<<p.jailCounter<<";"<<p.jailFreeCard<<";"<<p.bankrupt<<"\n";
         for (int street : p.ownedStreets){
             ownedStreetsFile<<p.playerId<<";"<<street<<"\n";
         }
@@ -31,7 +32,7 @@ void exportFile(int freeParkingMoney, int currentPlayerTurn, std::vector<std::si
 
     csv<<freeParkingMoney<<"\n";
     csv<<currentPlayerTurn<<"\n";
-    for(std::size_t i : turnOrder){
+    for(int i : turnOrder){
         csv<<i<<"\n";
     }
     csv.close();

FileImport.hpp

@@ -70,8 +70,9 @@ inline void importFile(std::vector<tile>& tiles)  {
         start = pos + del.length();
 
         pos = line.find(del,start);
-        std::string colorStr = line.substr(start, pos-start);
-        s.color = stringColorGroupMatcher(colorStr);
+        int colorInt;
+        colorInt = std::stoi(line.substr(start, pos-start));
+        s.color = static_cast<ColorGroup>(colorInt);
         start = pos + del.length();
 
         pos = line.find(del,start);
@@ -123,8 +124,9 @@ inline void importFile(std::vector<player>& players)  {
         start = pos + del.length();
 
         pos = line.find(del,start);
-        std::string colorStr = line.substr(start, pos-start);
-        s.color = stringColorGroupMatcher(colorStr);
+        int colorInt;
+        colorInt = std::stoi(line.substr(start, pos-start));
+        s.color = static_cast<ColorGroup>(colorInt);
         start = pos + del.length();
 
         pos = line.find(del,start);
@@ -163,7 +165,7 @@ inline void importFile(std::vector<player>& players)  {
     ownedStreetsFile.close();
 }
 
-inline void importFile(int freeParkingMoney, int currentPlayerTurn, std::vector<std::size_t>& turnOrder)  {
+inline void importFile(int& freeParkingMoney, int& currentPlayerTurn, std::vector<std::size_t>& turnOrder)  {
     std::ifstream csv;
     csv.open("otherData.csv");
     std::string line;

README.md

@@ -28,3 +28,8 @@ cmake --build build
 ```
 
 Windows support is not available due to an utf-8 encoding issue with the player model.
+
+## Missing features
+
+There is no implementation for player vs bot since it is not easily feesible to implement with the broad decision needed to give any challange in this case.
+A pure random generator for doing actions and accessing menu's is not a good idea.

monopoly.cpp

@@ -66,21 +66,6 @@ const std::vector<std::pair<std::string, ColorGroup>> colorCodes = {
     {"\033[38;2;102;0;255m", PURPLE}
 };
 
-inline ColorGroup stringColorGroupMatcher(const std::string& colorStr) {
-    if (colorStr == "brown")      return ColorGroup::BROWN;
-    if (colorStr == "blue")       return ColorGroup::BLUE;
-    if (colorStr == "pink")       return ColorGroup::PINK;
-    if (colorStr == "orange")     return ColorGroup::ORANGE;
-    if (colorStr == "red")        return ColorGroup::RED;
-    if (colorStr == "yellow")     return ColorGroup::YELLOW;
-    if (colorStr == "green")      return ColorGroup::GREEN;
-    if (colorStr == "darkblue")   return ColorGroup::DARK_BLUE;
-    if (colorStr == "gray")       return ColorGroup::GRAY;
-    if (colorStr == "purple")     return ColorGroup::PURPLE;
-
-    return ColorGroup::NONE; // safer default
-}
-
 void clearInputBuffer() {
     std::cin.clear();
     std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
@@ -1327,36 +1312,34 @@ int main(){
         <<std::endl;
         std::cin>>sel;
     } else { sel = 0; }
+
+    std::vector<std::size_t> turnOrder;
+    int index;
     if(sel == 1 && std::cin.good()){
         importFile(gameBoard);
         importFile(players);
+        importFile(freeParkingFunds, index, turnOrder);
     }else{
         gameBoard = initializeGameBoard();
         players = initializePlayers();
+        // Randomize turn order
+        // create vector with player indices
+        turnOrder.resize(players.size());
+        // fill vector with values 0, 1, ..., players.size() - 1
+        std::iota(turnOrder.begin(), turnOrder.end(), 0);
+        // shuffle the vector
+        std::shuffle(turnOrder.begin(), turnOrder.end(), gen);
+        index = 0;
     }
     chanceCards = initializeChanceCards();
     communityCards = initializeCommunityCards();
 
-    // Randomize turn order
-    // create vector with player indices
-    std::vector<std::size_t> turnOrder(players.size());
-    // fill vector with values 0, 1, ..., players.size() - 1
-    std::iota(turnOrder.begin(), turnOrder.end(), 0);
-    // shuffle the vector
-    std::shuffle(turnOrder.begin(), turnOrder.end(), gen);
-
-    int index = 0;
-
-    if(sel == 1 && std::cin.good()){
-        importFile(freeParkingFunds, currentPlayerTurn, turnOrder);
-        index = currentPlayerTurn;
-    }
-
     //Display Gameboard
     displayGameBoard();
 
     do {
-        player &currentPlayer = players[index];
+        std::size_t playerIdx = turnOrder[index];
+        player &currentPlayer = players[playerIdx];
 
         // Skip bankrupt players
         if (!currentPlayer.bankrupt) {
@@ -1397,7 +1380,7 @@ int main(){
         }
     } else {
         std::cout << "Game ended early.\n" 
-        <<"Do you want to export the game state?\n"
+        <<"Do you want to export the game state? (You turn ends with this action)\n"
         <<"┌────────┬────────┐\n"
         <<"│ 1: YES │ 0: NO  │\n"
         <<"└────────┴────────┘\n"
@@ -1406,15 +1389,15 @@ int main(){
         if(sel == 1 && std::cin.good()){
             exportFile(players);
             exportFile(gameBoard);
-            exportFile(freeParkingFunds, currentPlayerTurn, turnOrder);
+            exportFile(freeParkingFunds, ((currentPlayerTurn + 1) % turnOrder.size()), turnOrder);
             std::cout<<"Exited with saving"<<std::endl;
 
         }else if(sel == 0 && std::cin.good()){
             std::cout<<"Exited without saving"<<std::endl;
         }else{
             exportFile(players);
             exportFile(gameBoard);
-            exportFile(freeParkingFunds, currentPlayerTurn, turnOrder);
+            exportFile(freeParkingFunds, ((currentPlayerTurn + 1) % turnOrder.size()), turnOrder);
             std::cout<<"Saved you :)"<<std::endl;
         }
     }