Skip to content

Commit c64b2fd

Browse files
author
Nicholas Lombardo
committed
some little changes
1 parent cc92c40 commit c64b2fd

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Player.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ int Player::fight(int userMove){
337337
int expinc = ((*otherPoke[op]).getlevel()*7 + 10); //exp based off level
338338
cout << "Gained " << expinc <<" exp!" << endl;
339339
(*myPoke[cp]).incExp(expinc); //increase exp
340-
cout << "Need " << ((*myPoke[cp]).getmaxLevelExp() - expinc) << " more exp till next level." << endl;
340+
cout << "Need " << ((*myPoke[cp]).getmaxLevelExp() - (*myPoke[cp]).getexp()) << " more exp till next level." << endl;
341341
return 1; //return 1 for a KO
342342
}
343343
return 0;

Pokemon.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ void Pokemon::levelUp() {
119119
maxDef += (rand() % 4) + 1; // increment defense by a random stat amount
120120
maxSpeed += (rand() % 4) + 1; // increment speed
121121

122-
if(level == moveLevel){ //at level 5 learn new moves
123-
cout << "Learned new move: " << myMoves[4].display() << " Replaced move: " << myMoves[0].display() << endl;
122+
if(level == moveLevel){ //at level 5 learn new moves
123+
cout << "Learned new move: " << myMoves[4].display() << endl << "Replaced move: " << myMoves[0].display() << endl;
124124
myMoves[0] = myMoves[1]; // first move is removed
125125
myMoves[1] = myMoves[2];
126126
myMoves[2] = myMoves[3];

animation

0 Bytes
Binary file not shown.

savePoke.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
4 0
2-
7 53 53 4 114 140 7 1 10 6 10 3 0 5
2+
7 60 8 5 126 170 11 1 11 6 14 3 0 5
33
16 27 27 2 38 80 5 3 4 2 12 8 0 6
4-
2 68 0 5 9 170 12 1 19 10 11 1 1 6
4+
2 68 68 5 9 170 12 1 19 10 11 1 0 6
55
11 55 55 5 150 170 14 3 17 6 14 5 0 9

savedGame.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Down
22
0
33
375
44
302
5-
769
5+
849
66
81

0 commit comments

Comments
 (0)