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

Fix a couple minor nits

Browse Source
This commit is contained in:
NightKev 2024-10-20 22:51:36 -07:00
parent dfeb193e1f
commit e04c246ab9
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/data/battler-tags.ts
View File

@ -1,35 +1,44 @@
import { ChargeAnim, CommonAnim, CommonBattleAnim, MoveChargeAnim } from "#app/data/battle-anims"; import BattleScene from "#app/battle-scene";
import { getPokemonNameWithAffix } from "#app/messages";
import Pokemon, { MoveResult, HitResult } from "#app/field/pokemon";
import { StatusEffect } from "#app/data/status-effect";
import { toDmgValue, BooleanHolder, getFrameMs, NumberHolder } from "#app/utils";
import Move, {
ChargeAttr, MoveFlags, allMoves, MoveCategory, applyMoveAttrs,
StatusCategoryOnAllyAttr, HealOnAllyAttr, ConsecutiveUseDoublePowerAttr
} from "#app/data/move";
import { Type } from "#app/data/type";
import { import {
BlockNonDirectDamageAbAttr, FlinchEffectAbAttr, allAbilities,
ReverseDrainAbAttr, applyAbAttrs, ProtectStatAbAttr applyAbAttrs,
BlockNonDirectDamageAbAttr,
FlinchEffectAbAttr,
ProtectStatAbAttr,
ReverseDrainAbAttr
} from "#app/data/ability"; } from "#app/data/ability";
import { TerrainType } from "#app/data/terrain"; import { ChargeAnim, CommonAnim, CommonBattleAnim, MoveChargeAnim } from "#app/data/battle-anims";
import { WeatherType } from "#app/data/weather"; import Move, {
import { allAbilities } from "#app/data/ability"; allMoves,
applyMoveAttrs,
ChargeAttr,
ConsecutiveUseDoublePowerAttr,
HealOnAllyAttr,
MoveCategory,
MoveFlags,
StatusCategoryOnAllyAttr
} from "#app/data/move";
import { SpeciesFormChangeManualTrigger } from "#app/data/pokemon-forms"; import { SpeciesFormChangeManualTrigger } from "#app/data/pokemon-forms";
import { Abilities } from "#enums/abilities"; import { StatusEffect } from "#app/data/status-effect";
import { BattlerTagType } from "#enums/battler-tag-type"; import { TerrainType } from "#app/data/terrain";
import { Moves } from "#enums/moves"; import { Type } from "#app/data/type";
import { Species } from "#enums/species"; import { WeatherType } from "#app/data/weather";
import i18next from "#app/plugins/i18n"; import Pokemon, { HitResult, MoveResult } from "#app/field/pokemon";
import { Stat, type BattleStat, type EffectiveStat, EFFECTIVE_STATS, getStatKey } from "#enums/stat"; import { getPokemonNameWithAffix } from "#app/messages";
import { CommonAnimPhase } from "#app/phases/common-anim-phase"; import { CommonAnimPhase } from "#app/phases/common-anim-phase";
import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase";
import { MovePhase } from "#app/phases/move-phase"; import { MovePhase } from "#app/phases/move-phase";
import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
import { ShowAbilityPhase } from "#app/phases/show-ability-phase"; import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
import { StatStageChangePhase, StatStageChangeCallback } from "#app/phases/stat-stage-change-phase"; import { StatStageChangeCallback, StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
import i18next from "#app/plugins/i18n";
import { BooleanHolder, getFrameMs, NumberHolder, toDmgValue } from "#app/utils";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Moves } from "#enums/moves";
import { PokemonAnimType } from "#enums/pokemon-anim-type"; import { PokemonAnimType } from "#enums/pokemon-anim-type";
import BattleScene from "#app/battle-scene"; import { Species } from "#enums/species";
import { EFFECTIVE_STATS, getStatKey, Stat, type BattleStat, type EffectiveStat } from "#enums/stat";
export enum BattlerTagLapseType { export enum BattlerTagLapseType {
FAINT, FAINT,
@ -428,7 +437,7 @@ export class BeakBlastChargingTag extends BattlerTag {
* to be removed after the source makes a move (or the turn ends, whichever comes first) * to be removed after the source makes a move (or the turn ends, whichever comes first)
* @param pokemon {@linkcode Pokemon} the owner of this tag * @param pokemon {@linkcode Pokemon} the owner of this tag
* @param lapseType {@linkcode BattlerTagLapseType} the type of functionality invoked in battle * @param lapseType {@linkcode BattlerTagLapseType} the type of functionality invoked in battle
* @returns `true` if invoked with the ON_GET_HIT lapse type; `false` otherwise * @returns `true` if invoked with the `AFTER_HIT` lapse type; `false` otherwise
*/ */
lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
if (lapseType === BattlerTagLapseType.AFTER_HIT) { if (lapseType === BattlerTagLapseType.AFTER_HIT) {

2
src/field/pokemon.ts
View File

@ -2295,7 +2295,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @param target the {@linkcode Pokemon} to compare against. * @param target the {@linkcode Pokemon} to compare against.
* @returns `true` if the two pokemon are allies, `false` otherwise * @returns `true` if the two pokemon are allies, `false` otherwise
*/ */
isOpponent(target: Pokemon): boolean { public isOpponent(target: Pokemon): boolean {
return this.isPlayer() !== target.isPlayer(); return this.isPlayer() !== target.isPlayer();
} }