Commit 6ce0542b authored by Aaron Sturtevant's avatar Aaron Sturtevant

xMerge branch 'master' of gitlab.cs.wallawalla.edu:sturaa/cptr142_group_project

parents 3470583a 8d622d6d
...@@ -116,7 +116,7 @@ void Boss::bossResponse(int floorNum, bool playerWon) { ...@@ -116,7 +116,7 @@ void Boss::bossResponse(int floorNum, bool playerWon) {
} }
} }
void Boss::giveBossItems(int floorNum, Inventory inventory) { void Boss::giveBossItems(int floorNum, Inventory &inventory) {
switch(floorNum) { switch(floorNum) {
case 1: case 1:
......
...@@ -32,7 +32,7 @@ class Boss { ...@@ -32,7 +32,7 @@ class Boss {
// Other Functions // Other Functions
void summonBoss(int floorNum); void summonBoss(int floorNum);
void bossResponse(int floorNum, bool playerWon); void bossResponse(int floorNum, bool playerWon);
void giveBossItems(int floorNum, Inventory inventory); void giveBossItems(int floorNum, Inventory &inventory);
}; };
......
...@@ -215,7 +215,7 @@ int Monster::getTalk(int encounterNum) { ...@@ -215,7 +215,7 @@ int Monster::getTalk(int encounterNum) {
} }
} }
void Monster::giveMonsterItems(int encounterNum, Inventory inventory) { void Monster::giveMonsterItems(int encounterNum, Inventory &inventory) {
switch(encounterNum) { switch(encounterNum) {
case 1: case 1:
......
...@@ -32,7 +32,7 @@ class Monster { ...@@ -32,7 +32,7 @@ class Monster {
// Other Functions // Other Functions
void summon(int encounterNum); void summon(int encounterNum);
void giveMonsterItems(int encounterNum, Inventory inventory); void giveMonsterItems(int encounterNum, Inventory &inventory);
void monsterResponse(int encounterNum, int playerWon); void monsterResponse(int encounterNum, int playerWon);
......
...@@ -65,3 +65,46 @@ _Feedback_ ...@@ -65,3 +65,46 @@ _Feedback_
Grade: __E__ 3/11/2018 Grade: __E__ 3/11/2018
## Project Implementation
* Your project implementation MUST include the following:
* Use the [CS Department GIT Repository](http://gitlab.cs.wallawalla.edu) for version control and submission.
* __Object-oriented programming__ with classes.
* __Separate interfaces (headers)__, __implementation files__, a __main driver__, and __test driver__.
* __File I/O__.
Include some form of file use even if only to capture results.
* __Well-commented, “clean”, and well-organized code__.
* __Well-tested code__ with a driver file.
* __README.md file__ complete with known bugs and user operation instructions.
* You should __employ__ the following concepts _as appropriate_ to the program: vectors, pointers, dynamic memory, string manipulation.
* __Quality of the code__ and the problem __level of difficulty__ will be considered.
* __To make an E on this project__, you must reach into advanced concepts and present quality code solution.
Top projects designs show ingenuity, creativity, and efficiency.
Demonstration that you have shown initiative, going above and beyond basic course coverage into utilization of advanced concepts.
For instance, inheritance, polymorphism, recursion, graphics libraries, some other more advanced data structures of the STL Library (e.g. linked lists, stacks, queues, binary trees, etc.)
___Submission___
Gitlab project code will be up-to-date per the due date.
### Grade
_Feedback_
* Group project is saved in Gitlab __complete__
* Object-oriented programming __complete__
* Separate interfaces, implementation, main, and test code __complete__
* Uses file I/O __incomplete__
* No file i/o
* Well-commented, “clean”, and well-organized code __incomplete__
* Minimal comments for interfaces. Please fill in.
* Well-tested code with a driver file __incomplete__
* More tests. One is not enough.
* README.md file with known bugs and user operation instructions __incomplete__
* Missing.
* Used appropriate concepts to the program __complete__
* Examples: vectors, pointers, dynamic memory, string manipulation
* Quality of the code __complete__
* Use of advanced concepts __complete__
* Please explain what concepts.
Grade: __R__ 3/19/2018
...@@ -62,8 +62,8 @@ int main() { ...@@ -62,8 +62,8 @@ int main() {
if(playerPtr->getFight() >= bossPtr->getFight(dungeonPtr->floorNum)) { if(playerPtr->getFight() >= bossPtr->getFight(dungeonPtr->floorNum)) {
playerWon = true; playerWon = true;
dungeonPtr->bossResponse(dungeonPtr->floorNum, playerWon); dungeonPtr->bossResponse(dungeonPtr->floorNum, playerWon);
bossPtr->giveBossItems(dungeonPtr->floorNum, *inventoryPtr);
dungeonPtr->floorNum++; dungeonPtr->floorNum++;
dungeonPtr->giveBossItems(dungeonPtr->floorNum, *inventoryPtr);
} else { } else {
dungeonPtr->bossResponse(dungeonPtr->floorNum, playerWon); dungeonPtr->bossResponse(dungeonPtr->floorNum, playerWon);
playerPtr->doDamage(); playerPtr->doDamage();
...@@ -72,8 +72,8 @@ int main() { ...@@ -72,8 +72,8 @@ int main() {
if(playerPtr->getFight() >= bossPtr->getTalk(dungeonPtr->floorNum)) { if(playerPtr->getFight() >= bossPtr->getTalk(dungeonPtr->floorNum)) {
playerWon = true; playerWon = true;
dungeonPtr->bossResponse(dungeonPtr->floorNum, playerWon); dungeonPtr->bossResponse(dungeonPtr->floorNum, playerWon);
bossPtr->giveBossItems(dungeonPtr->floorNum, *inventoryPtr);
dungeonPtr->floorNum++; dungeonPtr->floorNum++;
dungeonPtr->giveBossItems(dungeonPtr->floorNum, *inventoryPtr);
} else { } else {
dungeonPtr->bossResponse(dungeonPtr->floorNum, playerWon); dungeonPtr->bossResponse(dungeonPtr->floorNum, playerWon);
} }
...@@ -81,7 +81,7 @@ int main() { ...@@ -81,7 +81,7 @@ int main() {
cout << "You run crying out of the room. Shame haunts your footsteps" << endl; cout << "You run crying out of the room. Shame haunts your footsteps" << endl;
playerWon = true; playerWon = true;
} }
ingameMenu(*inventoryPtr);
} while (playerWon == false); } while (playerWon == false);
playerWon = false; playerWon = false;
...@@ -98,16 +98,16 @@ int main() { ...@@ -98,16 +98,16 @@ int main() {
if(playerPtr->getFight() >= monsterPtr->getFight(dungeonPtr->roomEncounter)) { if(playerPtr->getFight() >= monsterPtr->getFight(dungeonPtr->roomEncounter)) {
playerWon = true; playerWon = true;
dungeonPtr->monsterResponse(dungeonPtr->roomEncounter, playerWon); dungeonPtr->monsterResponse(dungeonPtr->roomEncounter, playerWon);
dungeonPtr->giveMonsterItems(dungeonPtr->roomEncounter, *inventoryPtr); monsterPtr->giveMonsterItems(dungeonPtr->roomEncounter, *inventoryPtr);
} else { } else {
dungeonPtr->monsterResponse(dungeonPtr->roomEncounter, playerWon); monsterPtr->monsterResponse(dungeonPtr->roomEncounter, playerWon);
playerPtr->doDamage(); playerPtr->doDamage();
} }
} else if (response == "Talk") { } else if (response == "Talk") {
if(playerPtr->getFight() >= monsterPtr->getTalk(dungeonPtr->roomEncounter)) { if(playerPtr->getFight() >= monsterPtr->getTalk(dungeonPtr->roomEncounter)) {
playerWon = true; playerWon = true;
dungeonPtr->monsterResponse(dungeonPtr->roomEncounter, playerWon); dungeonPtr->monsterResponse(dungeonPtr->roomEncounter, playerWon);
dungeonPtr->giveMonsterItems(dungeonPtr->roomEncounter, *inventoryPtr); monsterPtr->giveMonsterItems(dungeonPtr->roomEncounter, *inventoryPtr);
} else { } else {
dungeonPtr->monsterResponse(dungeonPtr->roomEncounter, playerWon); dungeonPtr->monsterResponse(dungeonPtr->roomEncounter, playerWon);
playerPtr->doDamage(); playerPtr->doDamage();
...@@ -116,7 +116,7 @@ int main() { ...@@ -116,7 +116,7 @@ int main() {
cout << "You run crying out of the room. Shame haunts your footsteps" << endl; cout << "You run crying out of the room. Shame haunts your footsteps" << endl;
playerWon = true; playerWon = true;
} }
ingameMenu(*inventoryPtr);
} while (playerWon == false); } while (playerWon == false);
playerWon = false; playerWon = false;
...@@ -159,6 +159,7 @@ int main() { ...@@ -159,6 +159,7 @@ int main() {
cout << "You run crying out of the room. Shame haunts your footsteps" << endl; cout << "You run crying out of the room. Shame haunts your footsteps" << endl;
playerWon = true; playerWon = true;
} }
ingameMenu(*inventoryPtr);
}while (playerWon == false); }while (playerWon == false);
} while (playerVictory == false); } while (playerVictory == false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment