From 37e9fa8f08e2276ed2873350a4b438b04624889d Mon Sep 17 00:00:00 2001 From: KimJeongSun Date: Sat, 28 Sep 2024 02:07:02 +0900 Subject: [PATCH] revert optimization. it will be on other PR --- src/phases/turn-start-phase.ts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts index 983b1879a77..b070abb390a 100644 --- a/src/phases/turn-start-phase.ts +++ b/src/phases/turn-start-phase.ts @@ -20,7 +20,6 @@ import { WeatherEffectPhase } from "./weather-effect-phase"; import { BattlerIndex } from "#app/battle"; import { TrickRoomTag } from "#app/data/arena-tag"; import { SwitchType } from "#enums/switch-type"; -import { applyChallenges, ChallengeType } from "#app/data/challenge"; export class TurnStartPhase extends FieldPhase { constructor(scene: BattleScene) { @@ -44,18 +43,20 @@ export class TurnStartPhase extends FieldPhase { orderedTargets = Utils.randSeedShuffle(orderedTargets); }, this.scene.currentBattle.turn, this.scene.waveSeed); - // Next, a check for Trick Room is applied to determine sort order. + orderedTargets.sort((a: Pokemon, b: Pokemon) => { + const aSpeed = a?.getEffectiveStat(Stat.SPD) || 0; + const bSpeed = b?.getEffectiveStat(Stat.SPD) || 0; + + return bSpeed - aSpeed; + }); + + // Next, a check for Trick Room is applied. If Trick Room is present, the order is reversed. const speedReversed = new Utils.BooleanHolder(false); this.scene.arena.applyTags(TrickRoomTag, speedReversed); - applyChallenges(this.scene.gameMode, ChallengeType.TRICK_ROOM, speedReversed); - // Adjust the sort function based on whether Trick Room is active. - orderedTargets.sort((a: Pokemon, b: Pokemon) => { - const aSpeed = a?.getEffectiveStat(Stat.SPD) ?? 0; - const bSpeed = b?.getEffectiveStat(Stat.SPD) ?? 0; - - return speedReversed.value ? aSpeed - bSpeed : bSpeed - aSpeed; - }); + if (speedReversed.value) { + orderedTargets = orderedTargets.reverse(); + } return orderedTargets.map(t => t.getFieldIndex() + (!t.isPlayer() ? BattlerIndex.ENEMY : BattlerIndex.PLAYER)); }