From 1c36b5ecdd4c3f0f03b211df9fa9803f10c95525 Mon Sep 17 00:00:00 2001 From: geeil-han Date: Sun, 17 Nov 2024 00:40:08 +0100 Subject: [PATCH] line commented target.scene.queueMessage since message does not exist yet --- src/data/move.ts | 7 ++++--- src/field/pokemon.ts | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 2408677c92f..b525eb60487 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -4315,7 +4315,7 @@ export class CueNextRoundAttr extends MoveEffectAttr { /** * Attribute that changes stat stages before the damage is calculated */ -export class StatChangesBeforeDmgCalcAttr extends MoveAttr { +export class StatChangeBeforeDmgCalcAttr extends MoveAttr { /** * Applies Stat Changes before damage is calculated * @@ -4336,7 +4336,7 @@ export class StatChangesBeforeDmgCalcAttr extends MoveAttr { * apply to damage calculation (e.g. {@linkcode Moves.SPECTRAL_THIEF}) * {@link https://bulbapedia.bulbagarden.net/wiki/Spectral_Thief_(move) | Spectral Thief} */ -export class SpectralThiefAttr extends StatChangesBeforeDmgCalcAttr { +export class SpectralThiefAttr extends StatChangeBeforeDmgCalcAttr { /** * steals max amount of positive stats of the target while not exceeding the limit of max 6 stat stages * @@ -4364,7 +4364,8 @@ export class SpectralThiefAttr extends StatChangesBeforeDmgCalcAttr { target.updateInfo(); user.updateInfo(); - target.scene.queueMessage(i18next.t("moveTriggers:stolePositiveStatChanges", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })); + //TODO remove line comment if "stolePositiveStatChanges" text is implemented + //target.scene.queueMessage(i18next.t("moveTriggers:stolePositiveStatChanges", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })); return true; } diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 99ef055c82b..d7617612a40 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -3,7 +3,7 @@ import BattleScene, { AnySound } from "#app/battle-scene"; import { Variant, VariantSet, variantColorCache } from "#app/data/variant"; import { variantData } from "#app/data/variant"; import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from "#app/ui/battle-info"; -import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, VariableMoveTypeAttr, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatStagesAttr, SacrificialAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatStageChangeAttr, RechargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr, SacrificialAttrOnHit, OneHitKOAccuracyAttr, RespectAttackTypeImmunityAttr, MoveTarget, CombinedPledgeStabBoostAttr, VariableMoveTypeChartAttr, StatChangesBeforeDmgCalcAttr } from "#app/data/move"; +import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, VariableMoveTypeAttr, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatStagesAttr, SacrificialAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatStageChangeAttr, RechargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr, SacrificialAttrOnHit, OneHitKOAccuracyAttr, RespectAttackTypeImmunityAttr, MoveTarget, CombinedPledgeStabBoostAttr, VariableMoveTypeChartAttr, StatChangeBeforeDmgCalcAttr } from "#app/data/move"; import { default as PokemonSpecies, PokemonSpeciesForm, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species"; import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER, getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; import { starterPassiveAbilities } from "#app/data/balance/passives"; @@ -2835,7 +2835,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Steals positive stat stages from {@linkcode this} and gives it to {@linkcode source} * before damage calculation */ - applyMoveAttrs(StatChangesBeforeDmgCalcAttr, source, this, move); + applyMoveAttrs(StatChangeBeforeDmgCalcAttr, source, this, move); const { cancelled, result, damage: dmg } = this.getAttackDamage(source, move, false, false, isCritical, false);