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

Merge branch 'beta' into deprecated-func

Browse Source
This commit is contained in:
Wlowscha 2025-08-02 22:07:59 +02:00 committed by GitHub
commit a9040f0048
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/test-utils/helpers/move-helper.ts
View File

@ -143,7 +143,7 @@ export class MoveHelper extends GameManagerHelper {
} }
} }
/** Helper function to get the index of the selected move in the selected part member's moveset. */ /** Helper function to get the index of the selected move in the selected party member's moveset. */
private getMovePosition(pokemonIndex: BattlerIndex.PLAYER | BattlerIndex.PLAYER_2, move: MoveId): number { private getMovePosition(pokemonIndex: BattlerIndex.PLAYER | BattlerIndex.PLAYER_2, move: MoveId): number {
const playerPokemon = this.game.scene.getPlayerField()[pokemonIndex]; const playerPokemon = this.game.scene.getPlayerField()[pokemonIndex];
const moveset = playerPokemon.getMoveset(); const moveset = playerPokemon.getMoveset();
@ -153,17 +153,18 @@ export class MoveHelper extends GameManagerHelper {
} }
/** /**
* Modifies a player pokemon's moveset to contain only the selected move and then * Modifies a player pokemon's moveset to contain only the selected move, and then
* selects it to be used during the next {@linkcode CommandPhase}. * selects it to be used during the next {@linkcode CommandPhase}.
* *
* Warning: Will disable the player moveset override if it is enabled! * **Warning**: Will disable the player moveset override if it is enabled, as well as any mid-battle moveset changes!
* *
* Note: If you need to check for changes in the player's moveset as part of the test, it may be * @param moveId - The {@linkcode MoveId} to use
* best to use {@linkcode changeMoveset} and {@linkcode select} instead. * @param pkmIndex - The {@linkcode BattlerIndex} of the player Pokemon using the move. Relevant for double battles only and defaults to {@linkcode BattlerIndex.PLAYER} if not specified
* @param moveId - the move to use * @param targetIndex - The {@linkcode BattlerIndex} of the Pokemon to target for single-target moves; should be omitted for multi-target moves
* @param pkmIndex - The {@linkcode BattlerIndex} of the player Pokemon using the move. Relevant for double battles only and defaults to {@linkcode BattlerIndex.PLAYER} if not specified. * @param useTera - If `true`, the Pokemon will attempt to Terastallize even without a Tera Orb; default `false`
* @param targetIndex - The {@linkcode BattlerIndex} of the Pokemon to target for single-target moves; should be omitted for multi-target moves. * @remarks
* @param useTera - If `true`, the Pokemon will attempt to Terastallize even without a Tera Orb; default `false`. * If you need to check for changes in the player's moveset as part of the test, it may be
* better to use {@linkcode changeMoveset} and {@linkcode select} instead.
*/ */
public use( public use(
moveId: MoveId, moveId: MoveId,
@ -176,8 +177,11 @@ export class MoveHelper extends GameManagerHelper {
console.warn("Warning: `MoveHelper.use` overwriting player pokemon moveset and disabling moveset override!"); console.warn("Warning: `MoveHelper.use` overwriting player pokemon moveset and disabling moveset override!");
} }
// Clear out both the normal and temporary movesets before setting the move.
const pokemon = this.game.scene.getPlayerField()[pkmIndex]; const pokemon = this.game.scene.getPlayerField()[pkmIndex];
pokemon.moveset = [new PokemonMove(moveId)]; pokemon.moveset.splice(0);
pokemon.summonData.moveset?.splice(0);
pokemon.setMove(0, moveId);
if (useTera) { if (useTera) {
this.selectWithTera(moveId, pkmIndex, targetIndex); this.selectWithTera(moveId, pkmIndex, targetIndex);
@ -211,7 +215,7 @@ export class MoveHelper extends GameManagerHelper {
/** /**
* Changes a pokemon's moveset to the given move(s). * Changes a pokemon's moveset to the given move(s).
* *
* Used when the normal moveset override can't be used (such as when it's necessary to check or update properties of the moveset). * Useful when normal moveset overrides can't be used (such as when it's necessary to check or update properties of the moveset).
* *
* **Note**: Will disable the moveset override matching the pokemon's party. * **Note**: Will disable the moveset override matching the pokemon's party.
* @param pokemon - The {@linkcode Pokemon} being modified * @param pokemon - The {@linkcode Pokemon} being modified
@ -232,8 +236,8 @@ export class MoveHelper extends GameManagerHelper {
moveset = coerceArray(moveset); moveset = coerceArray(moveset);
expect(moveset.length, "Cannot assign more than 4 moves to a moveset!").toBeLessThanOrEqual(4); expect(moveset.length, "Cannot assign more than 4 moves to a moveset!").toBeLessThanOrEqual(4);
pokemon.moveset = []; pokemon.moveset = [];
moveset.forEach(move => { moveset.forEach((move, i) => {
pokemon.moveset.push(new PokemonMove(move)); pokemon.setMove(i, move);
}); });
const movesetStr = moveset.map(moveId => MoveId[moveId]).join(", "); const movesetStr = moveset.map(moveId => MoveId[moveId]).join(", ");
console.log(`Pokemon ${pokemon.species.name}'s moveset manually set to ${movesetStr} (=[${moveset.join(", ")}])!`); console.log(`Pokemon ${pokemon.species.name}'s moveset manually set to ${movesetStr} (=[${moveset.join(", ")}])!`);