Commit 4ec7d344 authored by Kameron Kinsey's avatar Kameron Kinsey

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

parents 1f08f245 6c7d8b91
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "Inventory.h" #include "Inventory.h"
#include "Monster.h" #include "Monster.h"
using namespace std; using namespace std;
int Dungeon::rollRoom() { int Dungeon::rollRoom() {
int roll = rand() % 100 + 1; int roll = rand() % 100 + 1;
return roll; return roll;
......
#ifndef DUNGEON_H
#define DUNGEON_H
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
#include <stdlib.h> #include <stdlib.h>
...@@ -24,3 +27,5 @@ class Dungeon { ...@@ -24,3 +27,5 @@ class Dungeon {
void giveMonsterItems(int encounterNum, Inventory inventory); void giveMonsterItems(int encounterNum, Inventory inventory);
}; };
#endif
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
* Random Rooms - Semi-random(seed), Table of encounters - certain numbers correspond to certain contents of a room * Random Rooms - Semi-random(seed), Table of encounters - certain numbers correspond to certain contents of a room
* ___Project Management Plan___ * ___Project Management Plan___
* Aaron Sturtevant - Dungeon Class - 3/4/2018 Save Data Reading - 3/9/2018 * Aaron Sturtevant - Dungeon Class - 3/4/2018 Instructions and General Editing - 3/9/2018
* Eli Chung - Items Class - 3/4/2018 / Menu's - 3/9/2018 * Eli Chung - Save Data / Menu's - 3/18/2018
* Kameron Kinsey - Player Class - 3/4/2018/ Monsters Class - 3/9/2018 * Kameron Kinsey - Player Class - 3/4/2018/ Monsters Class - 3/9/2018
* Milwaukee - Help people in general - (late add in) * Milwaukee - Items Class / Creative Content 3/4/2018
* Everyone - Modifier functions for each class/ making the classes read to each other - 3/11/2018 * Everyone - Modifier functions for each class/ making the classes read to each other - 3/11/2018
* Everyone - The .cpp and .h file for the game - 3/16/2018 * Everyone - All the .cpp and .h files for the game - 3/16/2018
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
#include "Dungeon.h" #include "Dungeon.h"
using namespace std; using namespace std;
void introMenu();
void ingameMenu();
int main() { int main() {
Dungeon *dungeonPtr = new Dungeon; Dungeon *dungeonPtr = new Dungeon;
...@@ -20,22 +24,15 @@ int main() { ...@@ -20,22 +24,15 @@ int main() {
bool playerWon = false; bool playerWon = false;
bool playerVictory = false; bool playerVictory = false;
// if(check for no save data){
int seed; int seed;
cout << "Enter a seed: "; cout << "Enter a seed: ";
cin >> seed; cin >> seed;
introMenu();
// Set Stats
showMenu();
player.setPlayerName(name); player.setPlayerName(name);
player.setStats(seed); player.setStats(seed);
// }else{
while (playerVictory == false){ while (playerVictory == false){
//floor 1-3 //floor 1-3
...@@ -161,4 +158,15 @@ int main() { ...@@ -161,4 +158,15 @@ int main() {
delete playerPtr; delete playerPtr;
return 0; return 0;
}
void introMenu() {
cout << "Welcome to DunGen::theExperience()!" << endl;
cout << "You will be diving into the most interesting dungeon around,"
<< " so good luck fighting, talking or fleeing like a little baby!" << endl;
}
void ingameMenu() {
cout << "--------------------------------" << endl;
cout << endl;
} }
\ No newline at end of file
#include <cstring>
#include <string>
#include <cstdlib>
#include <iostream>
#include <iomanip>
#include "Player.h"
#include "Boss.h"
#include "Monster.h"
#include "Inventory.h"
#include "Dungeon.h"
using namespace std;
Player player;
player.setPlayerName("Geoff");
cout << player.getPlayerName << endl;
\ No newline at end of file
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