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

Merge fixes

Browse Source
This commit is contained in:
Dean 2025-07-02 19:02:28 -07:00
parent 6114645208
commit 1dd94c45a0
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/data/abilities/ability.ts
View File

@ -5983,11 +5983,6 @@ export class IllusionPostBattleAbAttr extends PostBattleAbAttr {
} }
} }
export interface BypassSpeedChanceAbAttrParams extends AbAttrBaseParams {
/** Holds whether the speed check is bypassed after ability application */
bypass: BooleanHolder;
}
/** /**
* If a Pokémon with this Ability selects a damaging move, it has a 30% chance of going first in its priority bracket. If the Ability activates, this is announced at the start of the turn (after move selection). * If a Pokémon with this Ability selects a damaging move, it has a 30% chance of going first in its priority bracket. If the Ability activates, this is announced at the start of the turn (after move selection).
* @sealed * @sealed
@ -6003,7 +5998,7 @@ export class BypassSpeedChanceAbAttr extends AbAttr {
this.chance = chance; this.chance = chance;
} }
override canApply({ bypass, simulated, pokemon }: BypassSpeedChanceAbAttrParams): boolean { override canApply({ simulated, pokemon }: AbAttrBaseParams): boolean {
// TODO: Consider whether we can move the simulated check to the `apply` method // TODO: Consider whether we can move the simulated check to the `apply` method
// May be difficult as we likely do not want to modify the randBattleSeed // May be difficult as we likely do not want to modify the randBattleSeed
const turnCommand = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]; const turnCommand = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()];
@ -6020,11 +6015,11 @@ export class BypassSpeedChanceAbAttr extends AbAttr {
/** /**
* bypass move order in their priority bracket when pokemon choose damaging move * bypass move order in their priority bracket when pokemon choose damaging move
*/ */
override apply({ pokemon }: BypassSpeedChanceAbAttrParams): void { override apply({ pokemon }: AbAttrBaseParams): void {
pokemon.addTag(BattlerTagType.BYPASS_SPEED); pokemon.addTag(BattlerTagType.BYPASS_SPEED);
} }
override getTriggerMessage({ pokemon }: BypassSpeedChanceAbAttrParams, _abilityName: string): string { override getTriggerMessage({ pokemon }: AbAttrBaseParams, _abilityName: string): string {
return i18next.t("abilityTriggers:quickDraw", { pokemonName: getPokemonNameWithAffix(pokemon) }); return i18next.t("abilityTriggers:quickDraw", { pokemonName: getPokemonNameWithAffix(pokemon) });
} }
} }

2
src/data/moves/move.ts
View File

@ -874,7 +874,7 @@ export default abstract class Move implements Localizable {
getPriorityModifier(user: Pokemon, simulated = true): MovePriorityModifier { getPriorityModifier(user: Pokemon, simulated = true): MovePriorityModifier {
const modifierHolder = new NumberHolder(MovePriorityModifier.NORMAL); const modifierHolder = new NumberHolder(MovePriorityModifier.NORMAL);
applyAbAttrs("ChangeMovePriorityModifierAbAttr", user, null, simulated, this, modifierHolder); applyAbAttrs("ChangeMovePriorityModifierAbAttr", {pokemon: user, simulated: simulated, move: this, priority: modifierHolder});
modifierHolder.value = user.getTag(BattlerTagType.BYPASS_SPEED) ? MovePriorityModifier.FIRST_IN_BRACKET : modifierHolder.value; modifierHolder.value = user.getTag(BattlerTagType.BYPASS_SPEED) ? MovePriorityModifier.FIRST_IN_BRACKET : modifierHolder.value;
return modifierHolder.value; return modifierHolder.value;
} }

3
src/phases/turn-start-phase.ts
View File

@ -1,4 +1,3 @@
import { Stat } from "#app/enums/stat";
import { PokemonMove } from "#app/data/moves/pokemon-move"; import { PokemonMove } from "#app/data/moves/pokemon-move";
import { Command } from "#enums/command"; import { Command } from "#enums/command";
import { FieldPhase } from "./field-phase"; import { FieldPhase } from "./field-phase";
@ -74,7 +73,7 @@ export class TurnStartPhase extends FieldPhase {
const phaseManager = globalScene.phaseManager; const phaseManager = globalScene.phaseManager;
applyInSpeedOrder(activeField, (p: Pokemon) => { applyInSpeedOrder(activeField, (p: Pokemon) => {
applyAbAttrs("BypassSpeedChanceAbAttr", p, null); applyAbAttrs("BypassSpeedChanceAbAttr", { pokemon: p });
globalScene.applyModifiers(BypassSpeedChanceModifier, p.isPlayer(), p); globalScene.applyModifiers(BypassSpeedChanceModifier, p.isPlayer(), p);
}); });