mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-16 12:29:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix relearns counting for starter moves

Browse Source
This commit is contained in:
AJ Fontaine 2025-08-01 22:51:39 -04:00
parent 1ab9b72898
commit ae7d963fb5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/data/challenge.ts
View File

@ -24,7 +24,7 @@ import type { Pokemon } from "#field/pokemon";
import { Trainer } from "#field/trainer"; import { Trainer } from "#field/trainer";
import { PokemonMove } from "#moves/pokemon-move"; import { PokemonMove } from "#moves/pokemon-move";
import type { DexAttrProps, GameData } from "#system/game-data"; import type { DexAttrProps, GameData } from "#system/game-data";
import { BooleanHolder, type NumberHolder, randSeedItem } from "#utils/common"; import { BooleanHolder, isBetween, type NumberHolder, randSeedItem } from "#utils/common";
import { deepCopy } from "#utils/data"; import { deepCopy } from "#utils/data";
import { getPokemonSpecies } from "#utils/pokemon-utils"; import { getPokemonSpecies } from "#utils/pokemon-utils";
import { toCamelCase, toSnakeCase } from "#utils/strings"; import { toCamelCase, toSnakeCase } from "#utils/strings";
@ -705,11 +705,12 @@ export class FreshStartChallenge extends Challenge {
pokemon.nature = Nature.HARDY; // Neutral nature pokemon.nature = Nature.HARDY; // Neutral nature
let validMoves = pokemon.species let validMoves = pokemon.species
.getLevelMoves() .getLevelMoves()
.filter(m => m[0] <= 5) .filter(m => isBetween(m[0], 1, 5))
.map(lm => lm[1]); .map(lm => lm[1]);
// filter egg moves out of the moveset, // Filter egg moves out of the moveset
pokemon.moveset = pokemon.moveset.filter(pm => validMoves.includes(pm.moveId)); pokemon.moveset = pokemon.moveset.filter(pm => validMoves.includes(pm.moveId));
if (pokemon.moveset.length < 4) { if (pokemon.moveset.length < 4) {
// If there's empty slots fill with remaining valid moves
validMoves = validMoves.filter(m => !pokemon.moveset.map(pm => pm.moveId).includes(m)); validMoves = validMoves.filter(m => !pokemon.moveset.map(pm => pm.moveId).includes(m));
pokemon.moveset = pokemon.moveset.concat(validMoves.map(m => new PokemonMove(m))).slice(0, 4); pokemon.moveset = pokemon.moveset.concat(validMoves.map(m => new PokemonMove(m))).slice(0, 4);
} }