From a7e41b458eb0cb82bfd423a237ed1b1b47b20de3 Mon Sep 17 00:00:00 2001
From: Aaron S <aaron.sturtevant@wallawalla.edu>
Date: Mon, 19 Mar 2018 05:44:43 +0000
Subject: [PATCH] commiting

---
 Dungeon.cpp |  6 +-----
 main.cpp    | 36 ++++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Dungeon.cpp b/Dungeon.cpp
index 018c365..d7dc4be 100644
--- a/Dungeon.cpp
+++ b/Dungeon.cpp
@@ -28,14 +28,10 @@ using namespace std;
         Boss.bossResponse(floorNum, playerWon);
     }
     
-    void giveItems(int floorNum, Inventory inventory) {
-        Boss.giveItems(floorNum, inventory);
-    }
-    
     void giveBossItems(int encounterNum, Inventory inventory) {
         Boss.giveItems(floorNum, inventory);
     }
     
     void giveMonsterItems(int encounterNum, Inventory inventory) {
-        Boss.giveItems(encounterNum, inventory);
+        Monster.giveItems(encounterNum, inventory);
     }
diff --git a/main.cpp b/main.cpp
index 22a9220..1e23dab 100644
--- a/main.cpp
+++ b/main.cpp
@@ -57,7 +57,7 @@ int main() {
                             monsterPtr.giveBossItems(dungeonPtr.floorNum, inventoryPtr);
                         } else {
                             dungeonPtr.bossResponse(dungeonPtr.floorNum, playerWon);
-                            playerPtr
+                            playerPtr.doDamage();
                         }
                     } else if (response == "Talk") {
                         if(playerPtr.getFight() >= BossPtr.getTalk(encounterNum)) {
@@ -73,7 +73,7 @@ int main() {
                         playerWon = true;
                     }
                     
-                } while (playerWon == false;);
+                } while (playerWon == false);
                     
                 playerWon = false;
                 dungeon.roomCounter++;
@@ -106,7 +106,7 @@ int main() {
                         playerWon = true;
                     }
                     
-                } while (playerWon == false;);
+                } while (playerWon == false);
                     
                 playerWon = false;
                 dungeon.roomCounter++;
@@ -124,21 +124,29 @@ int main() {
             string *response = new string;
             cout << "How do you respond? (Fight, Talk, Or Flee): ";
             cin >> response;
-            if((response == 'Fight') || (response == 'Talk') {
-                if(dungeon.compareStats(playerPtr, dungeon.floorNum, response)) {
-                    dungeonPtr.bossResponse(dungeonPtr.floorNum, playerWon);
+            if(response == "Fight"){
+                if(playerPtr.getFight() >= BossPtr.getFight(encounterNum)) {
                     playerWon = true;
-                    playerVictory = true;
+                    dungeonPtr.bossResponse(dungeonPtr.floorNum, playerWon);
                     dungeonPtr.floorNum++;
+                    monsterPtr.giveBossItems(dungeonPtr.floorNum, inventoryPtr);
                 } else {
                     dungeonPtr.bossResponse(dungeonPtr.floorNum, playerWon);
-                }
-                        
-            } else {
-                cout << "You run crying out of the room. Shame haunts your footsteps" << endl;
-                playerWon = true;
-                dungeon.floorNum--;
-            }
+                    playerPtr
+                        }
+                    } else if (response == "Talk") {
+                        if(playerPtr.getFight() >= BossPtr.getTalk(encounterNum)) {
+                            playerWon = true;
+                            playerVictory = true;
+                            dungeonPtr.bossResponse(dungeonPtr.floorNum, playerWon);
+                            monsterPtr.giveBossItems(dungeonPtr.floorNum, inventoryPtr);
+                        } else {
+                            dungeonPtr.bossResponse(dungeonPtr.floorNum, playerWon);
+                        }
+                    } else {
+                        cout << "You run crying out of the room. Shame haunts your footsteps" << endl;
+                        playerWon = true;
+                    }
         delete response;            
         } while (playerWon == false);
         
-- 
GitLab