cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix evolution level up moves

pull/14/head
Flashfyre 2023-12-14 08:55:08 -05:00
parent 4bad2b46d2
commit f47c3e22ce
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pokemon.ts
View File

@ -634,12 +634,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (!startingLevel) if (!startingLevel)
startingLevel = this.level; startingLevel = this.level;
if (this.fusionSpecies) { if (this.fusionSpecies) {
const evolutionLevelMoves = levelMoves.slice(0, Math.max(levelMoves.findIndex(lm => !!lm[0]), 0));
const fusionLevelMoves = this.getFusionSpeciesForm().getLevelMoves(); const fusionLevelMoves = this.getFusionSpeciesForm().getLevelMoves();
const newLevelMoves: LevelMoves = []; const newLevelMoves: LevelMoves = [];
while (levelMoves.length && levelMoves[0][0] < startingLevel) while (levelMoves.length && levelMoves[0][0] < startingLevel)
levelMoves.shift(); levelMoves.shift();
while (fusionLevelMoves.length && fusionLevelMoves[0][0] < startingLevel) while (fusionLevelMoves.length && fusionLevelMoves[0][0] < startingLevel)
fusionLevelMoves.shift(); fusionLevelMoves.shift();
if (includeEvolutionMoves) {
for (let elm of evolutionLevelMoves.reverse())
levelMoves.unshift(elm);
}
for (let l = includeEvolutionMoves ? 0 : startingLevel; l <= this.level; l++) { for (let l = includeEvolutionMoves ? 0 : startingLevel; l <= this.level; l++) {
if (l === 1 && startingLevel > 1) if (l === 1 && startingLevel > 1)
l = startingLevel; l = startingLevel;
@ -659,7 +664,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (levelMoves) { if (levelMoves) {
for (let lm of levelMoves) { for (let lm of levelMoves) {
const level = lm[0]; const level = lm[0];
if (level < startingLevel) if ((!includeEvolutionMoves || level) && level < startingLevel)
continue; continue;
else if (level > this.level) else if (level > this.level)
break; break;