From 2987c8ec93c177eedd41284d09df0fe6873d09f1 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 10 Nov 2023 21:30:11 -0500 Subject: [PATCH] Undo rename of grip claw modifier class due to corrupting old data --- src/battle-phases.ts | 4 ++-- src/modifier/modifier-type.ts | 2 +- src/modifier/modifier.ts | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/battle-phases.ts b/src/battle-phases.ts index 5744d2c49..a4e683871 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -5,7 +5,7 @@ import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMov import { Mode } from './ui/ui'; import { Command } from "./ui/command-ui-handler"; import { Stat } from "./data/pokemon-stat"; -import { BerryModifier, AttackHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyInstantReviveChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier } from "./modifier/modifier"; +import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyInstantReviveChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier } from "./modifier/modifier"; import PartyUiHandler, { PartyOption, PartyUiMode } from "./ui/party-ui-handler"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "./data/pokeball"; import { CommonAnim, CommonBattleAnim, MoveAnim, initMoveAnim, loadMoveAnimAssets } from "./data/battle-anims"; @@ -1591,7 +1591,7 @@ class MoveEffectPhase extends PokemonPhase { user.scene.applyModifiers(EnemyAttackStatusEffectChanceModifier, false, target); } if (this.move instanceof AttackMove) - this.scene.applyModifiers(AttackHeldItemTransferChanceModifier, this.player, user, target.getFieldIndex()); + this.scene.applyModifiers(ContactHeldItemTransferChanceModifier, this.player, user, target.getFieldIndex()); }) ).then(() => resolve()); }); diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 87fac1ff7..dea4495db 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -549,7 +549,7 @@ class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator { export class ContactHeldItemTransferChanceModifierType extends PokemonHeldItemModifierType { constructor(name: string, chancePercent: integer, iconImage?: string, group?: string, soundName?: string) { - super(name, `Upon attacking, there is a ${chancePercent}% chance the foe's held item will be stolen`, (type, args) => new Modifiers.AttackHeldItemTransferChanceModifier(type, (args[0] as Pokemon).id, chancePercent), iconImage, group, soundName); + super(name, `Upon attacking, there is a ${chancePercent}% chance the foe's held item will be stolen`, (type, args) => new Modifiers.ContactHeldItemTransferChanceModifier(type, (args[0] as Pokemon).id, chancePercent), iconImage, group, soundName); } } diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 1c33ead31..5e73eb829 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -1355,7 +1355,7 @@ export class TurnHeldItemTransferModifier extends HeldItemTransferModifier { } } -export class AttackHeldItemTransferChanceModifier extends HeldItemTransferModifier { +export class ContactHeldItemTransferChanceModifier extends HeldItemTransferModifier { private chance: number; constructor(type: ModifierType, pokemonId: integer, chancePercent: number, stackCount?: integer) { @@ -1365,11 +1365,11 @@ export class AttackHeldItemTransferChanceModifier extends HeldItemTransferModifi } matchType(modifier: Modifier): boolean { - return modifier instanceof AttackHeldItemTransferChanceModifier; + return modifier instanceof ContactHeldItemTransferChanceModifier; } - clone(): AttackHeldItemTransferChanceModifier { - return new AttackHeldItemTransferChanceModifier(this.type, this.pokemonId, this.chance * 100, this.stackCount); + clone(): ContactHeldItemTransferChanceModifier { + return new ContactHeldItemTransferChanceModifier(this.type, this.pokemonId, this.chance * 100, this.stackCount); } getArgs(): any[] {