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

Improve canUse computation

Browse Source
This commit is contained in:
Sirz Benjie 2025-05-26 23:13:46 -05:00
parent f856262168
commit 648a565eea
No known key found for this signature in database
GPG Key ID: 38AC42D68CF5E138
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/phases/command-phase.ts
View File

@ -251,13 +251,12 @@ export class CommandPhase extends FieldPhase {
let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP); let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP); let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
// Ternary here ensures we don't compute struggle conditions unless necessary
const useStruggle = canUse const useStruggle = canUse
? false ? false
: cursor > -1 && !playerPokemon.getMoveset().some(m => m.isUsable(playerPokemon)); : cursor > -1 && !playerPokemon.getMoveset().some(m => m.isUsable(playerPokemon));
canUse = canUse || useStruggle; if (!canUse && !useStruggle) {
if (!canUse) {
this.queueFightErrorMessage(playerPokemon, cursor); this.queueFightErrorMessage(playerPokemon, cursor);
return false; return false;
} }