src/data/battler-tags.ts

@@ -2027,38 +2027,7 @@ export class ExposedTag extends BattlerTag {
   }
 }
 
-/**
- * Tag that doubles the type effectiveness of Fire-type moves.
- * @extends BattlerTag
- */
-export class TarShotTag extends BattlerTag {
-  constructor() {
-    super(BattlerTagType.TAR_SHOT, BattlerTagLapseType.CUSTOM, 0);
-  }
 
-  /**
-   * If the Pokemon is terastallized, the tag cannot be added.
-   * @param {Pokemon} pokemon the {@linkcode Pokemon} to which the tag is added
-   * @returns whether the tag is applied
-   */
-  override canAdd(pokemon: Pokemon): boolean {
-    return !pokemon.isTerastallized();
-  }
-
-  override onAdd(pokemon: Pokemon): void {
-    pokemon.scene.queueMessage(i18next.t("battlerTags:tarShotOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-  }
-}
-
-/**
- * Retrieves a {@linkcode BattlerTag} based on the provided tag type, turn count, source move, and source ID.
- *
- * @param {BattlerTagType} tagType the type of the {@linkcode BattlerTagType}.
- * @param turnCount the turn count.
- * @param {Moves} sourceMove the source {@linkcode Moves}.
- * @param sourceId the source ID.
- * @returns {BattlerTag} the corresponding {@linkcode BattlerTag} object.
- */
 export function getBattlerTag(tagType: BattlerTagType, turnCount: number, sourceMove: Moves, sourceId: number): BattlerTag {
   switch (tagType) {
   case BattlerTagType.RECHARGING:
@@ -2199,8 +2168,6 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
   case BattlerTagType.GULP_MISSILE_ARROKUDA:
   case BattlerTagType.GULP_MISSILE_PIKACHU:
     return new GulpMissileTag(tagType, sourceMove);
-  case BattlerTagType.TAR_SHOT:
-    return new TarShotTag();
   case BattlerTagType.THROAT_CHOPPED:
     return new ThroatChoppedTag();
   case BattlerTagType.NONE:

src/data/move.ts

@@ -8404,7 +8404,7 @@ export function initMoves() {
       .target(MoveTarget.USER_AND_ALLIES)
       .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS].find(a => p.hasAbility(a, false)))),
     new AttackMove(Moves.THROAT_CHOP, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7)
-      .attr(AddBattlerTagAttr, BattlerTagType.THROAT_CHOPPED),
+      .attr(AddBattlerTagAttr, BattlerTagType.THROAT_CHOPPED, false, false),
     new AttackMove(Moves.POLLEN_PUFF, Type.BUG, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7)
       .attr(StatusCategoryOnAllyAttr)
       .attr(HealOnAllyAttr, 0.5, true, false)
@@ -8644,7 +8644,7 @@ export function initMoves() {
       .condition((user, target, move) => user.getTag(TrappedTag)?.sourceMove !== Moves.NO_RETREAT), // fails if the user is currently trapped by No Retreat
     new StatusMove(Moves.TAR_SHOT, Type.ROCK, 100, 15, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
-      .attr(AddBattlerTagAttr, BattlerTagType.TAR_SHOT, false),
+      .partial(),
     new StatusMove(Moves.MAGIC_POWDER, Type.PSYCHIC, 100, 20, -1, 0, 8)
       .attr(ChangeTypeAttr, Type.PSYCHIC)
       .powderMove(),

src/enums/battler-tag-type.ts

@@ -74,5 +74,4 @@ export enum BattlerTagType {
   DRAGON_CHEER = "DRAGON_CHEER",
   NO_RETREAT = "NO_RETREAT",
   THROAT_CHOPPED = "THROAT_CHOPPED",
-  TAR_SHOT = "TAR_SHOT",
 }

src/field/pokemon.ts

@@ -17,7 +17,7 @@ import { initMoveAnim, loadMoveAnimAssets } from "../data/battle-anims";
 import { Status, StatusEffect, getRandomStatus } from "../data/status-effect";
 import { pokemonEvolutions, pokemonPrevolutions, SpeciesFormEvolution, SpeciesEvolutionCondition, FusionSpeciesFormEvolution } from "../data/pokemon-evolutions";
 import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "../data/tms";
-import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag, TarShotTag } from "../data/battler-tags";
+import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag } from "../data/battler-tags";
 import { WeatherType } from "../data/weather";
 import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "../data/arena-tag";
 import { Ability, AbAttr, StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldStatMultiplierAbAttrs, FieldMultiplyStatAbAttr, AddSecondStrikeAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr, FullHpResistTypeAbAttr, applyCheckTrappedAbAttrs, CheckTrappedAbAttr } from "../data/ability";
@@ -1353,7 +1353,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   /**
    * Calculates the effectiveness of a move against the Pokémon.
-   * This includes modifiers from move and ability attributes.
+   *
    * @param source {@linkcode Pokemon} The attacking Pokémon.
    * @param move {@linkcode Move} The move being used by the attacking Pokémon.
    * @param ignoreAbility Whether to ignore abilities that might affect type effectiveness or immunity (defaults to `false`).
@@ -1377,10 +1377,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       typeMultiplier.value = 0;
     }
 
-    if (this.getTag(TarShotTag) && (this.getMoveType(move) === Type.FIRE)) {
-      typeMultiplier.value *= 2;
-    }
-
     const cancelledHolder = cancelled ?? new Utils.BooleanHolder(false);
     if (!ignoreAbility) {
       applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier);
@@ -1412,7 +1408,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   /**
-   * Calculates the move's type effectiveness multiplier based on the target's type/s.
+   * Calculates the type effectiveness multiplier for an attack type
    * @param moveType {@linkcode Type} the type of the move being used
    * @param source {@linkcode Pokemon} the Pokemon using the move
    * @param ignoreStrongWinds whether or not this ignores strong winds (anticipation, forewarn, stealth rocks)

src/locales/en/battler-tags.json

@@ -69,6 +69,5 @@
   "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
   "disabledOnAdd": "{{pokemonNameWithAffix}}'s {{moveName}}\nwas disabled!",
-  "disabledLapse": "{{pokemonNameWithAffix}}'s {{moveName}}\nis no longer disabled.",
+  "disabledLapse": "{{pokemonNameWithAffix}}'s {{moveName}}\nis no longer disabled."
-  "tarShotOnAdd": "{{pokemonNameWithAffix}} became weaker to fire!"
 }

src/test/moves/tar_shot.test.ts

@@ -1,133 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Type } from "#app/data/type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { Stat } from "#app/enums/stat";
-import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
-import { SPLASH_ONLY } from "#test/utils/testUtils";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("Moves - Tar Shot", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-  const TIMEOUT = 20 * 1000;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(SPLASH_ONLY)
-      .enemySpecies(Species.TANGELA)
-      .enemyLevel(1000)
-      .moveset([Moves.TAR_SHOT, Moves.FIRE_PUNCH])
-      .disableCrits();
-  });
-
-  it("lowers the target's Speed stat by one stage and doubles the effectiveness of Fire-type moves used on the target", async () => {
-    await game.classicMode.startBattle([Species.PIKACHU]);
-
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(Moves.TAR_SHOT);
-
-    await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemy.getStatStage(Stat.SPD)).toBe(-1);
-
-    await game.toNextTurn();
-
-    game.move.select(Moves.FIRE_PUNCH);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-
-    await game.phaseInterceptor.to("MoveEndPhase");
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
-  }, TIMEOUT);
-
-  it("will not double the effectiveness of Fire-type moves used on a target that is already under the effect of Tar Shot (but may still lower its Speed)", async () => {
-    await game.classicMode.startBattle([Species.PIKACHU]);
-
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(Moves.TAR_SHOT);
-
-    await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemy.getStatStage(Stat.SPD)).toBe(-1);
-
-    await game.toNextTurn();
-
-    game.move.select(Moves.TAR_SHOT);
-
-    await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemy.getStatStage(Stat.SPD)).toBe(-2);
-
-    await game.toNextTurn();
-
-    game.move.select(Moves.FIRE_PUNCH);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-
-    await game.phaseInterceptor.to("MoveEndPhase");
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
-  }, TIMEOUT);
-
-  it("does not double the effectiveness of Fire-type moves against a Pokémon that is Terastallized", async () => {
-    game.override.enemyHeldItems([{ name: "TERA_SHARD", type: Type.GRASS }]).enemySpecies(Species.SPRIGATITO);
-    await game.classicMode.startBattle([Species.PIKACHU]);
-
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(Moves.TAR_SHOT);
-
-    await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemy.getStatStage(Stat.SPD)).toBe(-1);
-
-    await game.toNextTurn();
-
-    game.move.select(Moves.FIRE_PUNCH);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-
-    await game.phaseInterceptor.to("MoveEndPhase");
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
-  }, TIMEOUT);
-
-  it("doubles the effectiveness of Fire-type moves against a Pokémon that is already under the effects of Tar Shot before it Terastallized", async () => {
-    game.override.enemySpecies(Species.SPRIGATITO);
-    await game.classicMode.startBattle([Species.PIKACHU]);
-
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(Moves.TAR_SHOT);
-
-    await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemy.getStatStage(Stat.SPD)).toBe(-1);
-
-    await game.toNextTurn();
-
-    game.override.enemyHeldItems([{ name: "TERA_SHARD", type: Type.GRASS }]);
-
-    game.move.select(Moves.FIRE_PUNCH);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-
-    await game.phaseInterceptor.to("MoveEndPhase");
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
-  }, TIMEOUT);
-});

src/test/moves/throat_chop.test.ts

@@ -29,8 +29,7 @@ describe("Moves - Throat Chop", () => {
       .battleType("single")
       .ability(Abilities.BALL_FETCH)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Array(4).fill(Moves.THROAT_CHOP))
+      .enemyMoveset(Array(4).fill(Moves.THROAT_CHOP));
-      .enemySpecies(Species.MAGIKARP);
   });
 
   it("prevents the target from using sound-based moves for two turns", async () => {
@@ -50,6 +49,6 @@ describe("Moves - Throat Chop", () => {
     await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
-    expect(game.scene.getEnemyPokemon()!.isFullHp()).toBe(false);
+    expect(game.scene.getEnemyPokemon()!.hp).toBeLessThan(game.scene.getEnemyPokemon()!.getMaxHp());
   }, TIMEOUT);
 });