diff --git a/Dungeon.cpp b/Dungeon.cpp index 018c365f5c32c6e1665bf26576c9db9a80b9303b..d7dc4bef9ac041cb025b5cda3209974a1e49c15a 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 22a922099e294c4f7cce6ea977974171f55fe2e4..1e23dab0e6f72826762ef5dcf0f13de29978d4af 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);