From 8e9e70ca5566bc42460c9fef6b4b714404dd07bb Mon Sep 17 00:00:00 2001 From: Yentis Date: Sat, 18 May 2024 08:22:32 +0200 Subject: [PATCH] remove unrelated code --- src/field/pokemon.ts | 17 +++-------------- src/ui/fight-ui-handler.ts | 3 --- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 22797ccaa37..911e101e668 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -943,17 +943,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return !this.isOfType(Type.FLYING, true) && !this.hasAbility(Abilities.LEVITATE); } - isStabMove(move: Move): boolean { - if (move.category === MoveCategory.STATUS) return false; - - const type = move.type; - const types = this.getTypes(); - const teraType = this.getTeraType(); - const matchesSourceType = types[0] === type || (types.length > 1 && types[1] === type); - - return (teraType === Type.UNKNOWN && matchesSourceType) || (teraType !== Type.UNKNOWN && teraType === type); - } - getMoveEffectiveness(source: Pokemon, move: PokemonMove): TypeDamageMultiplier | undefined { if (move.getMove().category === MoveCategory.STATUS) return undefined; return this.getAttackMoveEffectiveness(source, move); @@ -1593,11 +1582,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const isTypeImmune = (typeMultiplier.value * arenaAttackTypeMultiplier.value) === 0; const sourceTypes = source.getTypes(); const matchesSourceType = sourceTypes[0] === type || (sourceTypes.length > 1 && sourceTypes[1] === type); - let stabMultiplier = new Utils.NumberHolder(1); - if (source.isStabMove(move)) { + if (sourceTeraType === Type.UNKNOWN && matchesSourceType) + stabMultiplier.value += 0.5; + else if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === type) stabMultiplier.value += 0.5; - } applyAbAttrs(StabBoostAbAttr, source, null, stabMultiplier); diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 7ae18541600..bc6e37a230a 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -230,9 +230,6 @@ export default class FightUiHandler extends UiHandler { } moveText.setText(text); - const stab = pokemon.isStabMove(move); - if (stab) moveText.setFontStyle('bold'); - const moveColors = moveEffectivenessList.sort((a, b) => b - a).map((effectiveness) => this.getMoveColor(effectiveness)); const color = moveColors[0];