read desc~

- Improved UI + UX - Added powerups menu - Added uniMenu() edgecases - Rewrote the insufficient funds function
phoebe-leong · May 29, 2021 · 36ae276 · 36ae276
1 parent 87002b2
commit 36ae276
Showing 1 changed file with 98 additions and 23 deletions.
diff --git a/main.cpp b/main.cpp
@@ -27,6 +27,7 @@ void mainMenu();
 void jobMenu();
 void uniMenu();
 void shopMenu();
+void powerupsMenu();
 void difficulty();
 void InsufficientFunds();
 void startScreen();
@@ -277,44 +278,43 @@ void uniMenu() {
                 mainMenu();
             }
         }
-
+        
         if (jobs.teachingDegreeFinished == false && input == "teaching") {
             jobs.currentJobStatus = "Teacher";
             usr.credits -= uni.UniFee;
             usr.credits += startingJobs.teacher * 2;
             uni.numOfDegrees++;
             system("clear");
             mainMenu();
-        }
-
-        if (jobs.teachingDegreeFinished == true && jobs.talkingDegreeFinished == false && input == "talking") {
+        } else if (jobs.teachingDegreeFinished == true && jobs.talkingDegreeFinished == false && input == "talking") {
             jobs.currentJobStatus = "Lecturer";
             usr.credits -= uni.UniFee;
             usr.credits += jobs.lecturer * 2;
             uni.numOfDegrees++;
             system("clear");
             mainMenu();
-        }
-
-        if (jobs.cookingDegreeFinished == false && input == "cooking") {
+        } else if (jobs.cookingDegreeFinished == false && input == "cooking") {
             jobs.currentJobStatus = "Chef";
             usr.credits -= uni.UniFee;
             usr.credits += jobs.chef * 2;
             uni.numOfDegrees++;
             system("clear");
             mainMenu();
-        }
-
-        if (jobs.wizardryDegreeFinished == false && input == "wizard") {
+        } else if (jobs.wizardryDegreeFinished == false && input == "wizard") {
             usr.credits -= uni.UniFee;
             jobs.wizardryDegreeFinished = true;
             system("clear");
             mainMenu();
-        }
-
-        if (input == "exit") {
+        } else if (input == "exit") {
             system("clear");
             mainMenu();
+        } else {
+            system("clear");
+            std::cout << "Not an input.\nPress enter to go back to the uni menu and try again\n";
+            std::cin.ignore();
+            std::cin.get();
+            system("clear");
+            uniMenu();
         }
 
     } else {
@@ -425,6 +425,7 @@ void mainMenu() {
         }    
     }
 
+    std::cout << "'pwr' to go to the powerups menu\n";
     std::cout << "'exit' to exit the program\n";
     std::cout << "'uni' to go to the university menu\n";
 
@@ -470,6 +471,18 @@ void mainMenu() {
         std::cin.ignore();
         system("clear");
         shopMenu();
+    } else if (input == "pwr") {
+        if (pwrUps.pwrUpActive == true) {
+            std::cout << "You already have an active powerup!\n";
+            std::cout << "Press enter to go back to the main menu.\n";
+            std::cin.ignore();
+            std::cin.get();
+            system("clear");
+            mainMenu();
+        } else {
+            system("clear");
+            powerupsMenu();
+        }
     } else if (jobs.currentJobStatus != "Unemployed") {
         if (jobs.currentJobStatus == "Taxi Driver" && input == "drive") {
             std::cin.ignore();
@@ -536,6 +549,10 @@ void mainMenu() {
             mainMenu();
         }
     } else {
+        system("clear");
+        std::cout << "Not an input.\nPress enter to go back to the menu and try again.\n";
+        std::cin.ignore();
+        std::cin.get();
         system("clear");
         mainMenu();
     }
@@ -836,28 +853,86 @@ void shopMenu() {
         mainMenu();
     } else {
         system("clear");
-        mainMenu();
+        std::cout << "Not an input.\nPress enter to go back to the shop menu and try again\n";
+        std::cin.ignore();
+        std::cin.get();
+        system("clear");
+        shopMenu();
     }
 }
 
-void InsufficientFunds() {
+void powerupsMenu() {
 
-    std::string input;
+    std::cout << "==========================================\n";
+    std::cout << "                 Powerups\n";
+    std::cout << "==========================================\n\n";
 
-    std::cout << "          Insufficient funds.\n";
-    std::cout << "   'exit' to go back to the main menu\n";
-    std::cin >> input;
+    if (jobs.wizardryDegreeFinished == true) {
+
+        std::string input;
+        if (pwrUps.pwrUpActive == false) {
+            std::cout << shop.shopItem5  << " - $" << shop.shopItem5Price << "\n\n";
+
+            std::cout << "Commands:\n";
+            std::cout << "'mult' to buy the " << shop.shopItem5 << "\n";
+            std::cout << "'exit' to exit the powerup shop\n";
+            std::cin >> input;
+
+            if (input == "mult") {
+                if (usr.credits >= shop.shopItem5Price) {
+                    usr.credits -= shop.shopItem5Price;
+                    pwrUps.pwrUpActive = true;
+
+                    system("clear");
+                    std::cout << "You now have the " << shop.shopItem5 << "!\n";
+                    std::cout << "This multiplies your income by " << pwrUps.powerUpMultiplier << " for " << pwrUps.maxPowerUpCommands << " commands.\n";
+                    std::cout << "Press enter to continue.\n";
+                    std::cin.ignore();
+                    std::cin.get();
+                    system("clear");
+                    powerupsMenu();
+                } else {
+                    system("clear");
+                    std::cout << "==========================================\n";
+                    std::cout << "                 Powerups\n";
+                    std::cout << "==========================================\n\n";
 
-    if (input == "exit") {
-        system("clear");
-        mainMenu();
+                    std::cin.ignore();
+                    InsufficientFunds();    
+                }
+            } else if (input == "exit") {
+                system("clear");
+                mainMenu();
+            } else {
+                system("clear");
+                std::cout << "Not an input.\n Press enter to go back to the powerups menu and try again.\n";
+                std::cin.ignore();
+                std::cin.get();
+                system("clear");
+                powerupsMenu();
+            }
+        }
     } else {
+        std::cout << "Requires '" << uni.course5 << "' degree.\n";
+        std::cout << "Press enter to go back to the main menu.\n";
+        std::cin.ignore();
+        std::cin.get();
         system("clear");
-        InsufficientFunds();
+        mainMenu();
     }
 
 }
 
+void InsufficientFunds() {
+
+    std::cout << "         Insufficient funds\n";
+    std::cout << " Press enter to go back to the main menu\n";
+    std::cin.get();
+
+    system("clear");
+    mainMenu();
+}
+
 int main() {
     startScreen();
 }