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

Clean up nits

Browse Source
This commit is contained in:
Jakub Hanko 2024-05-16 22:22:41 +02:00
parent daef0ddf90
commit a5bca16d1c
No known key found for this signature in database
GPG Key ID: 775D427937A306CC
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1126,7 +1126,7 @@ export class MagnetRisenTag extends TypeImmuneTag {
}
}
export class TypeImmunityIgnoreTag extends BattlerTag {
export class IgnoreTypeImmunityTag extends BattlerTag {
public immuneType: Type;
constructor(tagType: BattlerTagType, sourceMove: Moves, type: Type) {
@ -1411,12 +1411,12 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc
return new TypeBoostTag(tagType, sourceMove, Type.ELECTRIC, 2, true);
case BattlerTagType.MAGNET_RISEN:
return new MagnetRisenTag(tagType, sourceMove);
case BattlerTagType.IGNORE_GHOST:
return new TypeImmunityIgnoreTag(tagType, sourceMove, Type.GHOST);
case BattlerTagType.IGNORE_DARK:
return new TypeImmunityIgnoreTag(tagType, sourceMove, Type.DARK);
case BattlerTagType.MINIMIZED:
return new MinimizeTag();
case BattlerTagType.IGNORE_GHOST:
return new IgnoreTypeImmunityTag(tagType, sourceMove, Type.GHOST);
case BattlerTagType.IGNORE_DARK:
return new IgnoreTypeImmunityTag(tagType, sourceMove, Type.DARK);
case BattlerTagType.NONE:
default:
return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);

4
src/data/enums/battler-tag-type.ts
View File

@ -56,7 +56,7 @@ export enum BattlerTagType {
CHARGED = "CHARGED",
GROUNDED = "GROUNDED",
MAGNET_RISEN = "MAGNET_RISEN",
MINIMIZED = "MINIMIZED",
IGNORE_GHOST = "IGNORE_GHOST",
IGNORE_DARK = "IGNORE_DARK",
MINIMIZED = "MINIMIZED"
IGNORE_DARK = "IGNORE_DARK"
}

2
src/data/move.ts
View File

@ -1955,7 +1955,7 @@ export class ResetStatsAttr extends MoveEffectAttr {
target.scene.queueMessage(getPokemonMessage(target, `'s stat changes\nwere eliminated!`));
return true;
}
}
}
/**

8
src/field/pokemon.ts
View File

@ -4,7 +4,7 @@ import { Variant, VariantSet, variantColorCache } from '#app/data/variant';
import { variantData } from '#app/data/variant';
import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info';
import { Moves } from "../data/enums/moves";
import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, VariablePowerAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, MultiHitAttr, StatusMoveTypeImmunityAttr, MoveTarget, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveTypeAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr, ExposedMoveAttr, BypassBurnDamageReductionAttr } from "../data/move";
import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, VariablePowerAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, MultiHitAttr, StatusMoveTypeImmunityAttr, MoveTarget, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveTypeAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr } from "../data/move";
import { default as PokemonSpecies, PokemonSpeciesForm, SpeciesFormKey, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm, getStarterValueFriendshipCap, speciesStarters, starterPassiveAbilities } from '../data/pokemon-species';
import * as Utils from '../utils';
import { Type, TypeDamageMultiplier, getTypeDamageMultiplier, getTypeRgb } from '../data/type';
@ -19,7 +19,7 @@ import { pokemonEvolutions, pokemonPrevolutions, SpeciesFormEvolution, SpeciesEv
import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from '../data/tms';
import { DamagePhase, FaintPhase, LearnMovePhase, ObtainStatusEffectPhase, StatChangePhase, SwitchSummonPhase } from '../phases';
import { BattleStat } from '../data/battle-stat';
import { BattlerTag, BattlerTagLapseType, EncoreTag, HelpingHandTag, HighestStatBoostTag, TypeImmunityIgnoreTag, TypeBoostTag, getBattlerTag } from '../data/battler-tags';
import { BattlerTag, BattlerTagLapseType, EncoreTag, HelpingHandTag, HighestStatBoostTag, IgnoreTypeImmunityTag, TypeBoostTag, getBattlerTag } from '../data/battler-tags';
import { BattlerTagType } from "../data/enums/battler-tag-type";
import { Species } from '../data/enums/species';
import { WeatherType } from '../data/weather';
@ -966,8 +966,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (ignoreImmunity.value)
return 1;
const exposedTags = this.getTags(TypeImmunityIgnoreTag) as TypeImmunityIgnoreTag[];
if (exposedTags.some(t => t.ignoreImmunity(types, moveType))) {
const ignoreTypeImmunityTags = this.getTags(IgnoreTypeImmunityTag) as IgnoreTypeImmunityTag[];
if (ignoreTypeImmunityTags.some(t => t.ignoreImmunity(types, moveType))) {
return 1;
}
}