More comments and removal of commented code in Player.h and Pokemon.h

Author: rmcmulle

Player.h

@@ -6,7 +6,7 @@
 #include <vector>
 #include <fstream>
 #include "Pokemon.h"
-#include "Squirtle.h"
+#include "Squirtle.h" // include each specific Pokemon class 
 #include "Pikachu.h"
 #include "Bulbasaur.h"
 #include "Charmander.h"
@@ -91,7 +91,7 @@ void Player::Battle(){
 //function for adding a new pokemon into players array
 void Player::add_pokemon(int PokeNum, int person, int levelDesired){ //person 1 or 0 for player or npc
 	Pokemon *newPoke_ptr;
-	switch(PokeNum) {
+	switch(PokeNum) { // structure to instantiate specific Pokemon class
 		case 1:
 			newPoke_ptr = new Rattata;
 			break;
@@ -177,7 +177,7 @@ int Player::noValid(){
 	int found = 0;
 	for(int i = 0; i < myPoke.size(); i++){
 		if((*myPoke[i]).getKO() == 0){
-			found = 1;
+			found = 1; // at least one Pokemon is not KO'd
 			cout << (*myPoke[i]).getname() << " in position " << i << " is ready to fight" << endl;
 		}
 	}
@@ -190,31 +190,31 @@ int Player::noValid_other(){
 	int found = 0;
 	for(int i = 0; i < otherPoke.size(); i++){
 		if((*otherPoke[i]).getKO() == 0){
-			found = 1;
+			found = 1; // at least one Pokemon is not KO'd
 		}
 	}
 	if(found)
 		return 0;
 	else
 		return 1; //no valid pokemon
 }
-void Player::wild_battle(int level_enc){	
+void Player::wild_battle(int level_enc){ // Wild grass Pokemon battle
 	otherPoke.clear();
 	add_pokemon((rand()%16)+1,0,level_enc); // comp rand
 	op = 0; //opponent poke
 	cout << endl << "Wild Battle!" << endl;
 	cout << "A Wild, Level " << (*otherPoke[op]).getlevel() << " " << (*otherPoke[op]).getname() << " appeared!" << endl << endl;
 }
 
-void Player::fish_battle(int level_enc){	
+void Player::fish_battle(int level_enc){ // Water Pokemon battle 
 	otherPoke.clear();
 	cout << endl << "Fish Battle!" << endl;
-	add_pokemon(rand_between(9,10),0,level_enc); // comp rand
+	add_pokemon(rand_between(9,10),0,level_enc); // comp rand, ensures Water type Pokemon
 	op = 0; //opponent poke
 	cout << "A Wild, Level " << (*otherPoke[op]).getlevel() << " " << (*otherPoke[op]).getname() << " was hooked!" << endl << endl;
 }
 
-void Player::player_battle(int pick, int level_enc){
+void Player::player_battle(int pick, int level_enc){ // Battle against a Pokemon trainer
 	otherPoke.clear(); //clear other so that it can be filled with player pokemon	
 	cout << endl << "Trainer Battle!" << endl;
 	create_trainer(pick,level_enc);
@@ -223,15 +223,15 @@ void Player::player_battle(int pick, int level_enc){
 
 void Player::pokeCenter(int whiteout){
 	for(int i = 0; i < myPoke.size(); i++){
-		(*myPoke[i]).heal();
+		(*myPoke[i]).heal(); // heal all Pokemon
 		if(whiteout){
 			(*myPoke[i]).setexp(0); //clear current experience on whiteout
 		}
 	}
 }
 
 void Player::create_trainer(int pick, int level_enc){
-	otherPoke.clear();	
+	otherPoke.clear();	// gives trainers semi-random Pokemon
 	switch(pick){
 		case 1: //chick fire and norm
 			add_pokemon(rand_between(11,12),0,level_enc); //fire
@@ -271,10 +271,10 @@ void Player::create_trainer(int pick, int level_enc){
 
 void Player::save_pokemon_stats(){
 	ofstream outFile;
-    outFile.open( "savePoke.txt", ios::out );
+    outFile.open( "savePoke.txt", ios::out ); // specify file
 	outFile << myPoke.size() << " "; //how many pokemon
 	outFile << cp << endl; //current pokemon
-	for(int i = 0; i < myPoke.size(); i++){	
+	for(int i = 0; i < myPoke.size(); i++){	// save all Pokemon stats
 		outFile << (*myPoke[i]).getnum() << " ";
 		outFile << (*myPoke[i]).getmaxHealth() << " ";
     	outFile << (*myPoke[i]).getcurrHealth() << " ";
@@ -299,13 +299,13 @@ void Player::load_pokemon_stats(){
     ifstream inFile;
 	string inStr;
 	int inInt, numPoke;
-    inFile.open( "savePoke.txt",ios::in);
+    inFile.open( "savePoke.txt",ios::in); // specify file
 	inFile >> numPoke;
 	inFile >> cp;
 	for(int i = 0; i < numPoke; i++){
 		inFile >> inInt;
 		add_pokemon(inInt,1,0); //adds certain pokemon in then loads the stats so the moves are saved!
-		inFile >> inInt;
+		inFile >> inInt; // set all Pokemon stats
 		(*myPoke[i]).setmaxHealth(inInt);
 		inFile >> inInt;
 		(*myPoke[i]).setcurrHealth(inInt);
@@ -341,7 +341,7 @@ void Player::load_pokemon_stats(){
 void Player::learnNewMove(int i){
 	(*myPoke[i]).learnNewMove(); //teach pokemon i the new move
 }
-int Player::rand_between(int a, int b){
+int Player::rand_between(int a, int b){ // used for semi-randomness
 	return((rand() % (b - a + 1)) + a);
 }
 int Player::getNumPoke(){
@@ -350,7 +350,7 @@ int Player::getNumPoke(){
 int Player::whatToDo(){
 	int choice;
 	cout << "What would you like to do: 1 fight, 2 catch, 3 run";
-	cin >> choice;	
+	cin >> choice;	// uses this to control game flow 
 }
 int Player::fight(int userMove){
 	cout << "Level " << (*myPoke[cp]).getlevel() << " " <<(*myPoke[cp]).getname() << " attacked with " << (*myPoke[cp]).attackname(userMove-1) << endl;
@@ -364,11 +364,11 @@ int Player::fight(int userMove){
 	return 0;
 }
 int Player::catchPoke(){
-	if(myPoke.size()!=6){
-		int value = rand()%100;
+	if(myPoke.size()!=6){ // have room for more Pokemon
+		int value = rand()%100; // value to compare health fraction to
 		double max = (*otherPoke[op]).getmaxHealth();
 		double curr = (*otherPoke[op]).getcurrHealth();
-		if(value > ((curr/max)*100)){
+		if(value > ((curr/max)*100)){ // catch Pokemon
     		cout << "Caught" << endl;
     	    myPoke.push_back(otherPoke[op]);
        	    otherPoke.clear(); //get rid of him

Pokemon.h

@@ -75,7 +75,7 @@ class Pokemon{
 		int currHealth;
 		int level;
 		int exp;
-		int maxLevelExp;
+		int maxLevelExp; // experience needed to level up
 		int maxAttack;
 		int currAttack;
 		int maxDef;
@@ -84,8 +84,8 @@ class Pokemon{
 		int currSpeed;
 		int KO;	// boolean var
 		int moveLevel; // level at which Pokemon learns fifth move
-		string type;
-		string name;
+		string type; // Pokemon elemental type
+		string name; // Pokemon name
 		string weak; // type Pokemon is weak to
 		vector <string> attackName;//how can we still utilize this given the Moves class?
 		vector <Moves> myMoves;// then we can use for example myMoves[2].attack()
@@ -95,10 +95,6 @@ Pokemon::Pokemon(){
 	srand(time(NULL)); // seed rand
 	maxLevelExp = 50; //genaric maxlevelexp	
 }
-//non-default for loading a pokemon
-//Pokemon::Pokemon(int,int,int,int,int,int,int,int,int,int,int,int,string,string,string){ //check if knows 5 move
-
-//}
 
 void Pokemon::setnum(int n) {
 	num = n;
@@ -120,21 +116,9 @@ void Pokemon::levelUp() {
 	exp = exp - maxLevelExp; // set exp to the overflow 
 	maxLevelExp+=30; //increase max exp to next level up
 	maxAttack += (rand() % 4) + 1; // add a random attack stat amount
-	// Don't increment current attack?
 	maxDef += (rand() % 4) + 1; // increment defense by a random stat amount
-	// Don't increment current def?
 	maxSpeed += (rand() % 4) + 1; // increment speed
-	// Don't increment current Speed?
-	// KO does not change
-	
-	// If necessary, add a new move
-/*
-	myMoves[0] = myMoves[1];
-	myMoves[1] = myMoves[2];
-	myMoves[2] = myMoves[3];
-	myMoves.pop_back(); // remove move from back
-	myMoves.push_back(newmove); // add new move to the back
-*/
+
 	if(level == moveLevel){ //at level 5 learn new moves
 		cout << "Learned new move: " << myMoves[4].display() << " Replaced move: " << myMoves[0].display() << endl;
 		myMoves[0] = myMoves[1]; // first move is removed
@@ -157,39 +141,24 @@ void Pokemon::setcurrHealth(int h) {
 	if(h > 0) 
 		currHealth = h; // sets new health
 	else
-		currHealth = 0;
+		currHealth = 0; // fallback value
 }
 
 void Pokemon::inccurrHealth(int add) {
 	currHealth += add; //inc health for potion and other increases
 }
-/*void Pokemon::attack(int moveNum){ //attack function that calls certain moveNumber
-	int userNum; //input by user, can be removed
-	while (userNum != -1){ //just a way to check each attack
-		cout << "What attack would you like to use (1-4): "; //1-2 right now
-		cin >> userNum; //user enters attack
-	if(userNum > 0 && userNum < 5){ //makes sure attack is in vector and 1 - 4
-		cout << "Move number "<< userNum <<" is " << myMoves[userNum-1].display() << endl;
-		int damage = myMoves[userNum-1].attack(maxAttack); //calculate damage eventually take into account weaknesses and such
-		cout << "The attack did " << damage << " damage!" << endl; //display results
-		subHealth(damage); // subtract health based on damage dealt
-		}
-	}
-}*/
 
 void Pokemon::attack(int attackNum,Pokemon* poke_damage_ptr){ //attack function that calls certain moveNumber
-		//cout << "Move number "<< attackNum <<" is " << myMoves[attackNum-1].display() << endl;
 		int damage = myMoves[attackNum-1].attack(maxAttack); //calculate damage eventually take into account weaknesses and such
 		cout << "Attack power: " << damage << endl; //display results
 		(*poke_damage_ptr).subHealth(damage); // subtract health based on damage dealt
 	}
 
 void Pokemon::subHealth(int dam) {
-	//cout << "Health was: " << getcurrHealth() << endl;
 	int damage = dam - currDef; // calculate damage
-	cout << "Resisted " << getcurrDef() << " damage!" << endl; 
+	cout << "Resisted " << getcurrDef() << " damage!" << endl; // account for defense
 	if(damage > 0) {
-		cout << "Actual damage: " << (damage) << endl;
+		cout << "Actual damage: " << (damage) << endl; // display damage
 		setcurrHealth((getcurrHealth() - damage)); // reduce current health
 	}
 	else {
@@ -200,7 +169,6 @@ void Pokemon::subHealth(int dam) {
 		KO = 1; // if health falls below 0, Pokemon becomes KO'd
 		cout << "KO" << endl;
 	}
-	//cout << "Health is now: " << getcurrHealth() << endl;
 	cout << endl;
 }
 
@@ -210,6 +178,8 @@ void Pokemon::addHealth(int add) {
 	}	
 }
 
+/* Getters and setters for Pokemon data members */
+
 void Pokemon::setlevel(int lv) {
 	level = lv;
 }
@@ -335,24 +305,24 @@ string Pokemon::attackname(int moveNum){
 }
 
 void Pokemon::learnNewMove(){
-		myMoves[0] = myMoves[1]; // first move is removed
-        myMoves[1] = myMoves[2];
+		myMoves[0] = myMoves[1]; // first move is replaced
+        myMoves[1] = myMoves[2]; // move other moves back one usable spot
         myMoves[2] = myMoves[3];
-        myMoves[3] = myMoves[4];	
+        myMoves[3] = myMoves[4]; // move in fifth slot moved to usable fourth slot	
 }
 
 void Pokemon::setMoves(int mv1, int mv2, int mv3, int mv4, int mv5) {
 
-	Moves move1(mv1), move2(mv2), move3(mv3), move4(mv4), move5(mv5);
+	Moves move1(mv1), move2(mv2), move3(mv3), move4(mv4), move5(mv5); // assign moves based on enum values
 
 	myMoves.push_back(move1); // push moves into myMoves
 	myMoves.push_back(move2);
 	myMoves.push_back(move3);
-	myMoves.push_back(move4);
+	myMoves.push_back(move4); // last usable move slot
 	myMoves.push_back(move5); // potential move to learn
 }
 
-int Pokemon::getMoveNum(int move) {
+int Pokemon::getMoveNum(int move) { // returns enum values of specified move number
 	switch (move) {
 		case 0:
 			return myMoves[0].getmovenum();