Commit 3b3b6bf6 authored by Eli Chung's avatar Eli Chung
Browse files

Updated Main.cpp

parent 7286b27f
......@@ -21,4 +21,21 @@ void outputMenu() {
cout << "- (S)tart new game" << endl;
cout << "- (R)esume game" << endl;
cout << "- (Q)uit game" << endl;
cin >> input;
ifstream fin;
fin.open("file.txt");
switch(input) {
case 'S':
//runs game
break;
case 'R':
fin >> seed;
break;
case 'Q':
exit(0);
break;
}
fin.close();
}
\ No newline at end of file
......@@ -9,10 +9,7 @@
*
*/
<<<<<<< HEAD
=======
#include "item.h"
>>>>>>> b98efe0e5646456c884e1f718a3cc4e946974b18
#include "Player.h"
#include <cstring>
#include <cstdlib>
......@@ -25,10 +22,7 @@ int main() {
// Declare Character Details
int seed;
<<<<<<< HEAD
=======
char command;
>>>>>>> b98efe0e5646456c884e1f718a3cc4e946974b18
Player player;
string name = player.getPlayerName();
......@@ -38,11 +32,7 @@ int main() {
// Enter Name
cout << "Enter Player Name: ";
<<<<<<< HEAD
cin >> name;
=======
getline(cin,name);
>>>>>>> b98efe0e5646456c884e1f718a3cc4e946974b18
player.setPlayerName(name);
int health = player.getHealth();
......@@ -53,15 +43,6 @@ int main() {
cout << name << "'s stats" << endl
<< "========================" << endl
<< "Health: " << health << endl
<<<<<<< HEAD
<< "Fight: " << fight << endl
<< "Flee: " << flee << endl
<< "Talk: " << talk << endl
<< endl;
// << "Armor: " << armor << endl
// << "Weapon: " << weapon << endl;
=======
<< "Fight: " << fight + item.getEquippedFight() << endl
<< "Flee: " << flee + item.getEquippedFlee() << endl
<< "Talk: " << talk + item.getEquippedTalk() << endl
......@@ -73,18 +54,13 @@ int main() {
if (command == 'i') {
item.listInventory();
}
>>>>>>> b98efe0e5646456c884e1f718a3cc4e946974b18
return 0;
}
void Player::setStats(int seed) {
<<<<<<< HEAD
cin >> seed;
=======
getline(cin,seed);
>>>>>>> b98efe0e5646456c884e1f718a3cc4e946974b18
srand(seed);
// Set Fight Stat and Modifier
......@@ -104,11 +80,8 @@ void Player::setStats(int seed) {
}
<<<<<<< HEAD
=======
void check
>>>>>>> b98efe0e5646456c884e1f718a3cc4e946974b18
bool Player::checkVictory(bool win) {
if (win == true) {
cout << "Congratulations " << getPlayerName() << " you have retrieved the Maguffin of Vauge Desirability!" << endl;
......
Supports Markdown
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