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

Fixed up some inconsistencies

Browse Source
This commit is contained in:
Frutescens 2024-08-14 12:26:48 -07:00 committed by frutescens
parent 2267cf2287
commit fccd57bf29
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/phases.ts
View File

@ -2303,7 +2303,7 @@ export class TurnStartPhase extends FieldPhase {
orderedTargets = orderedTargets.reverse(); orderedTargets = orderedTargets.reverse();
} }
orderedTargets = orderedTargets.map(t => t.getFieldIndex() + (!t.isPlayer() ? BattlerIndex.ENEMY : 0)); let moveOrder : BattlerIndex[] = orderedTargets.map(t => t.getFieldIndex() + (!t.isPlayer() ? BattlerIndex.ENEMY : 0));
// The creation of the battlerBypassSpeed object contains checks for the ability Quick Draw and the held item Quick Claw // The creation of the battlerBypassSpeed object contains checks for the ability Quick Draw and the held item Quick Claw
// The ability Mycelium Might disables Quick Claw's activation when using a status move // The ability Mycelium Might disables Quick Claw's activation when using a status move
@ -2323,8 +2323,8 @@ export class TurnStartPhase extends FieldPhase {
// The function begins sorting orderedTargets based on command priority, move priority, and possible speed bypasses. // The function begins sorting orderedTargets based on command priority, move priority, and possible speed bypasses.
// Non-FIGHT commands (SWITCH, BALL, RUN) have a higher command priority and will always occur before any FIGHT commands. // Non-FIGHT commands (SWITCH, BALL, RUN) have a higher command priority and will always occur before any FIGHT commands.
orderedTargets = orderedTargets.slice(0); moveOrder = moveOrder.slice(0);
orderedTargets.sort((a, b) => { moveOrder.sort((a, b) => {
const aCommand = this.scene.currentBattle.turnCommands[a]; const aCommand = this.scene.currentBattle.turnCommands[a];
const bCommand = this.scene.currentBattle.turnCommands[b]; const bCommand = this.scene.currentBattle.turnCommands[b];
@ -2366,13 +2366,12 @@ export class TurnStartPhase extends FieldPhase {
return battlerBypassSpeed[a].value ? -1 : 1; return battlerBypassSpeed[a].value ? -1 : 1;
} }
const aIndex = orderedTargets.indexOf(a); const aIndex = moveOrder.indexOf(a);
const bIndex = orderedTargets.indexOf(b); const bIndex = moveOrder.indexOf(b);
return aIndex < bIndex ? -1 : aIndex > bIndex ? 1 : 0; return aIndex < bIndex ? -1 : aIndex > bIndex ? 1 : 0;
}); });
// The function finally returns BattlerIndex[] object return moveOrder;
return orderedTargets;
} }
start() { start() {