File tree Expand file tree Collapse file tree 5 files changed +6
-6
lines changed Expand file tree Collapse file tree 5 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -337,7 +337,7 @@ int Player::fight(int userMove){
337
337
int expinc = ((*otherPoke[op]).getlevel ()*7 + 10 ); // exp based off level
338
338
cout << " Gained " << expinc <<" exp!" << endl;
339
339
(*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;
341
341
return 1 ; // return 1 for a KO
342
342
}
343
343
return 0 ;
Original file line number Diff line number Diff line change @@ -119,8 +119,8 @@ void Pokemon::levelUp() {
119
119
maxDef += (rand () % 4 ) + 1 ; // increment defense by a random stat amount
120
120
maxSpeed += (rand () % 4 ) + 1 ; // increment speed
121
121
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;
124
124
myMoves[0 ] = myMoves[1 ]; // first move is removed
125
125
myMoves[1 ] = myMoves[2 ];
126
126
myMoves[2 ] = myMoves[3 ];
Original file line number Diff line number Diff line change 1
1
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
3
3
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
5
5
11 55 55 5 150 170 14 3 17 6 14 5 0 9
Original file line number Diff line number Diff line change 2
2
0
3
3
375
4
4
302
5
- 769
5
+ 849
6
6
81
You can’t perform that action at this time.
0 commit comments