merge conflicts

public/images/pokemon/variant/exp/953.json

@@ -2,79 +2,35 @@
 	"1": {
 		"5a4d37": "1c1e76",
 		"766348": "323aa5",
-		"9d8361": "4059bd",
 		"c5b4aa": "d3e6e6",
 		"37332b": "104139",
 		"9e8360": "4059bd",
-		"f18725": "2e8c19",
-		"f18625": "2e8c19",
-		"bb6f2a": "2f7410",
 		"0f0f0f": "0f0f0f",
 		"575243": "18734a",
-		"b8702d": "2f7410",
 		"777462": "199e46",
-		"585243": "18734a",
+		"afa668": "f9fba2",
-		"4f4531": "b29c3e",
+		"a28c88": "c1d8db",
-		"4d4530": "b29c3e",
-		"aea56b": "f9fba2",
-		"afa667": "f9fba2",
-		"a28e85": "c1d8db",
-		"a28c8c": "c1d8db",
-		"b64c95": "dedb64",
 		"f2f2f2": "e8eab5",
-		"b05f8f": "dedb64",
+		"b45492": "dedb64",
-		"776348": "323aa5",
 		"f28625": "2e8c19",
-		"bc6e28": "2f7410",
+		"4e4530": "b29c3e",
-		"bb6e27": "2f7410",
+		"ba6e29": "2f7410"
-		"4d4430": "b29c3e",
-		"b0a766": "f9fba2",
-		"a18f8d": "c1d8db",
-		"a28f86": "c1d8db",
-		"b74a94": "dedb64",
-		"9e8461": "4059bd",
-		"777362": "199e46",
-		"ba6d27": "2f7410",
-		"afa567": "f9fba2",
-		"a18f85": "c1d8db"
 	},
 	"2": {
 		"5a4d37": "333e5f",
 		"766348": "8c9fbf",
-		"9d8361": "dbedec",
 		"c5b4aa": "39cfbc",
 		"37332b": "261031",
 		"9e8360": "dbedec",
-		"f18725": "4baecd",
-		"f18625": "4baecd",
-		"bb6f2a": "4792bd",
 		"0f0f0f": "0f0f0f",
 		"575243": "5e2d72",
-		"b8702d": "4792bd",
 		"777462": "8358a1",
-		"585243": "5e2d72",
+		"afa668": "c9dbac",
-		"4f4531": "534b8c",
+		"a28e88": "52b0b0",
-		"4d4530": "534b8c",
-		"aea56b": "c9dbac",
-		"afa667": "c9dbac",
-		"a28e85": "52b0b0",
-		"a28c8c": "52b0b0",
-		"b64c95": "b56c3e",
 		"f2f2f2": "d9c951",
-		"b05f8f": "b56c3e",
+		"b45492": "b56c3e",
-		"776348": "8c9fbf",
 		"f28625": "4baecd",
-		"bc6e28": "4792bd",
+		"4e4530": "534b8c",
-		"bb6e27": "4792bd",
+		"ba6e29": "4792bd"
-		"4d4430": "534b8c",
-		"b0a766": "c9dbac",
-		"a18f8d": "52b0b0",
-		"a28f86": "52b0b0",
-		"b74a94": "b56c3e",
-		"9e8461": "dbedec",
-		"777362": "8358a1",
-		"ba6d27": "4792bd",
-		"afa567": "c9dbac",
-		"a18f85": "52b0b0"
 	}
-}
+}

src/battle-scene.ts

@@ -1100,7 +1100,7 @@ export default class BattleScene extends SceneBase {
         } else if (trainerConfigs[trainerType].hasDouble) {
           const doubleChance = new Utils.IntegerHolder(newWaveIndex % 10 === 0 ? 32 : 8);
           this.applyModifiers(DoubleBattleChanceBoosterModifier, true, doubleChance);
-          playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, doubleChance));
+          playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, false, doubleChance));
           doubleTrainer = !Utils.randSeedInt(doubleChance.value);
           // Add a check that special trainers can't be double except for tate and liza - they should use the normal double chance
           if (trainerConfigs[trainerType].trainerTypeDouble && ![ TrainerType.TATE, TrainerType.LIZA ].includes(trainerType)) {
@@ -1116,7 +1116,7 @@ export default class BattleScene extends SceneBase {
       if (newBattleType === BattleType.WILD && !this.gameMode.isWaveFinal(newWaveIndex)) {
         const doubleChance = new Utils.IntegerHolder(newWaveIndex % 10 === 0 ? 32 : 8);
         this.applyModifiers(DoubleBattleChanceBoosterModifier, true, doubleChance);
-        playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, doubleChance));
+        playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, false, doubleChance));
         newDouble = !Utils.randSeedInt(doubleChance.value);
       } else if (newBattleType === BattleType.TRAINER) {
         newDouble = newTrainer?.variant === TrainerVariant.DOUBLE;
@@ -1518,7 +1518,7 @@ export default class BattleScene extends SceneBase {
       return;
     }
     const formattedMoney = Utils.formatMoney(this.moneyFormat, this.money);
-    this.moneyText.setText(`₽${formattedMoney}`);
+    this.moneyText.setText(i18next.t("battleScene:moneyOwned", { formattedMoney }));
     this.fieldUI.moveAbove(this.moneyText, this.luckText);
     if (forceVisible) {
       this.moneyText.setVisible(true);
@@ -2136,7 +2136,7 @@ export default class BattleScene extends SceneBase {
 
   pushMovePhase(movePhase: MovePhase, priorityOverride?: integer): void {
     const movePriority = new Utils.IntegerHolder(priorityOverride !== undefined ? priorityOverride : movePhase.move.getMove().priority);
-    applyAbAttrs(ChangeMovePriorityAbAttr, movePhase.pokemon, null, movePhase.move.getMove(), movePriority);
+    applyAbAttrs(ChangeMovePriorityAbAttr, movePhase.pokemon, null, false, movePhase.move.getMove(), movePriority);
     const lowerPriorityPhase = this.phaseQueue.find(p => p instanceof MovePhase && p.move.getMove().priority < movePriority.value);
     if (lowerPriorityPhase) {
       this.phaseQueue.splice(this.phaseQueue.indexOf(lowerPriorityPhase), 0, movePhase);

src/data/arena-tag.ts

@@ -269,7 +269,7 @@ const QuickGuardConditionFunc: ProtectConditionFunc = (arena, moveId) => {
   if (effectPhase instanceof MoveEffectPhase) {
     const attacker = effectPhase.getUserPokemon()!;
     applyMoveAttrs(IncrementMovePriorityAttr, attacker, null, move, priority);
-    applyAbAttrs(ChangeMovePriorityAbAttr, attacker, null, move, priority);
+    applyAbAttrs(ChangeMovePriorityAbAttr, attacker, null, false, move, priority);
   }
   return priority.value > 0;
 };
@@ -427,7 +427,7 @@ class WishTag extends ArenaTag {
       if (user) {
         this.battlerIndex = user.getBattlerIndex();
         this.triggerMessage = i18next.t("arenaTag:wishTagOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(user) });
-        this.healHp = Math.max(Math.floor(user.getMaxHp() / 2), 1);
+        this.healHp = Utils.toDmgValue(user.getMaxHp() / 2);
       } else {
         console.warn("Failed to get source for WishTag onAdd");
       }
@@ -585,7 +585,7 @@ class SpikesTag extends ArenaTrapTag {
 
       if (!cancelled.value) {
         const damageHpRatio = 1 / (10 - 2 * this.layers);
-        const damage = Math.ceil(pokemon.getMaxHp() * damageHpRatio);
+        const damage = Utils.toDmgValue(pokemon.getMaxHp() * damageHpRatio);
 
         pokemon.scene.queueMessage(i18next.t("arenaTag:spikesActivateTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
         pokemon.damageAndUpdate(damage, HitResult.OTHER);
@@ -745,7 +745,7 @@ class StealthRockTag extends ArenaTrapTag {
     const damageHpRatio = this.getDamageHpRatio(pokemon);
 
     if (damageHpRatio) {
-      const damage = Math.ceil(pokemon.getMaxHp() * damageHpRatio);
+      const damage = Utils.toDmgValue(pokemon.getMaxHp() * damageHpRatio);
       pokemon.scene.queueMessage(i18next.t("arenaTag:stealthRockActivateTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       pokemon.damageAndUpdate(damage, HitResult.OTHER);
       if (pokemon.turnData) {

src/data/battler-tags.ts

@@ -347,7 +347,7 @@ export class ConfusedTag extends BattlerTag {
       if (pokemon.randSeedInt(3) === 0) {
         const atk = pokemon.getBattleStat(Stat.ATK);
         const def = pokemon.getBattleStat(Stat.DEF);
-        const damage = Math.ceil(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedInt(15, 85) / 100));
+        const damage = Utils.toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedInt(15, 85) / 100));
         pokemon.scene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself"));
         pokemon.damageAndUpdate(damage);
         pokemon.battleData.hitCount++;
@@ -524,7 +524,7 @@ export class SeedTag extends BattlerTag {
         if (!cancelled.value) {
           pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, source.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.LEECH_SEED));
 
-          const damage = pokemon.damageAndUpdate(Math.max(Math.floor(pokemon.getMaxHp() / 8), 1));
+          const damage = pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / 8));
           const reverseDrain = pokemon.hasAbilityWithAttr(ReverseDrainAbAttr, false);
           pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, source.getBattlerIndex(),
             !reverseDrain ? damage : damage * -1,
@@ -570,7 +570,7 @@ export class NightmareTag extends BattlerTag {
       applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
       if (!cancelled.value) {
-        pokemon.damageAndUpdate(Math.ceil(pokemon.getMaxHp() / 4));
+        pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / 4));
       }
     }
 
@@ -714,7 +714,7 @@ export class IngrainTag extends TrappedTag {
         new PokemonHealPhase(
           pokemon.scene,
           pokemon.getBattlerIndex(),
-          Math.floor(pokemon.getMaxHp() / 16),
+          Utils.toDmgValue(pokemon.getMaxHp() / 16),
           i18next.t("battlerTags:ingrainLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
           true
         )
@@ -777,7 +777,7 @@ export class AquaRingTag extends BattlerTag {
         new PokemonHealPhase(
           pokemon.scene,
           pokemon.getBattlerIndex(),
-          Math.floor(pokemon.getMaxHp() / 16),
+          Utils.toDmgValue(pokemon.getMaxHp() / 16),
           i18next.t("battlerTags:aquaRingLapse", {
             moveName: this.getMoveName(),
             pokemonName: getPokemonNameWithAffix(pokemon)
@@ -883,7 +883,7 @@ export abstract class DamagingTrapTag extends TrappedTag {
       applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
       if (!cancelled.value) {
-        pokemon.damageAndUpdate(Math.ceil(pokemon.getMaxHp() / 8));
+        pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / 8));
       }
     }
 
@@ -1067,7 +1067,7 @@ export class ContactDamageProtectedTag extends ProtectedTag {
       if (effectPhase instanceof MoveEffectPhase && effectPhase.move.getMove().hasFlag(MoveFlags.MAKES_CONTACT)) {
         const attacker = effectPhase.getPokemon();
         if (!attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
-          attacker.damageAndUpdate(Math.ceil(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
+          attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
         }
       }
     }
@@ -1541,7 +1541,7 @@ export class SaltCuredTag extends BattlerTag {
 
       if (!cancelled.value) {
         const pokemonSteelOrWater = pokemon.isOfType(Type.STEEL) || pokemon.isOfType(Type.WATER);
-        pokemon.damageAndUpdate(Math.max(Math.floor(pokemonSteelOrWater ? pokemon.getMaxHp() / 4 : pokemon.getMaxHp() / 8), 1));
+        pokemon.damageAndUpdate(Utils.toDmgValue(pokemonSteelOrWater ? pokemon.getMaxHp() / 4 : pokemon.getMaxHp() / 8));
 
         pokemon.scene.queueMessage(
           i18next.t("battlerTags:saltCuredLapse", {
@@ -1587,7 +1587,7 @@ export class CursedTag extends BattlerTag {
       applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
       if (!cancelled.value) {
-        pokemon.damageAndUpdate(Math.max(Math.floor(pokemon.getMaxHp() / 4), 1));
+        pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / 4));
         pokemon.scene.queueMessage(i18next.t("battlerTags:cursedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       }
     }

src/data/berry.ts

@@ -36,25 +36,25 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate {
     return (pokemon: Pokemon) => {
       const threshold = new Utils.NumberHolder(0.25);
       const battleStat = (berryType - BerryType.LIECHI) as BattleStat;
-      applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, threshold);
+      applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
       return pokemon.getHpRatio() < threshold.value && pokemon.summonData.battleStats[battleStat] < 6;
     };
   case BerryType.LANSAT:
     return (pokemon: Pokemon) => {
       const threshold = new Utils.NumberHolder(0.25);
-      applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, threshold);
+      applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
       return pokemon.getHpRatio() < 0.25 && !pokemon.getTag(BattlerTagType.CRIT_BOOST);
     };
   case BerryType.STARF:
     return (pokemon: Pokemon) => {
       const threshold = new Utils.NumberHolder(0.25);
-      applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, threshold);
+      applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
       return pokemon.getHpRatio() < 0.25;
     };
   case BerryType.LEPPA:
     return (pokemon: Pokemon) => {
       const threshold = new Utils.NumberHolder(0.25);
-      applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, threshold);
+      applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
       return !!pokemon.getMoveset().find(m => !m?.getPpRatio());
     };
   }
@@ -70,8 +70,8 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
       if (pokemon.battleData) {
         pokemon.battleData.berriesEaten.push(berryType);
       }
-      const hpHealed = new Utils.NumberHolder(Math.floor(pokemon.getMaxHp() / 4));
+      const hpHealed = new Utils.NumberHolder(Utils.toDmgValue(pokemon.getMaxHp() / 4));
-      applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, hpHealed);
+      applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, hpHealed);
       pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(),
         hpHealed.value, i18next.t("battle:hpHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), berryName: getBerryName(berryType) }), true));
     };
@@ -97,7 +97,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
       }
       const battleStat = (berryType - BerryType.LIECHI) as BattleStat;
       const statLevels = new Utils.NumberHolder(1);
-      applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, statLevels);
+      applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, statLevels);
       pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ battleStat ], statLevels.value));
     };
   case BerryType.LANSAT:
@@ -113,7 +113,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
         pokemon.battleData.berriesEaten.push(berryType);
       }
       const statLevels = new Utils.NumberHolder(2);
-      applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, statLevels);
+      applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, statLevels);
       pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ BattleStat.RAND ], statLevels.value));
     };
   case BerryType.LEPPA:

src/data/move.ts

@@ -590,7 +590,7 @@ export default class Move implements Localizable {
     case MoveFlags.IGNORE_ABILITIES:
       if (user.hasAbilityWithAttr(MoveAbilityBypassAbAttr)) {
         const abilityEffectsIgnored = new Utils.BooleanHolder(false);
-        applyAbAttrs(MoveAbilityBypassAbAttr, user, abilityEffectsIgnored, this);
+        applyAbAttrs(MoveAbilityBypassAbAttr, user, abilityEffectsIgnored, false, this);
         if (abilityEffectsIgnored.value) {
           return true;
         }
@@ -686,11 +686,11 @@ export default class Move implements Localizable {
    * @param target {@linkcode Pokemon} The Pokémon being targeted by the move.
    * @returns The calculated accuracy of the move.
    */
-  calculateBattleAccuracy(user: Pokemon, target: Pokemon) {
+  calculateBattleAccuracy(user: Pokemon, target: Pokemon, simulated: boolean = false) {
     const moveAccuracy = new Utils.NumberHolder(this.accuracy);
 
     applyMoveAttrs(VariableAccuracyAttr, user, target, this, moveAccuracy);
-    applyPreDefendAbAttrs(WonderSkinAbAttr, target, user, this, { value: false }, moveAccuracy);
+    applyPreDefendAbAttrs(WonderSkinAbAttr, target, user, this, { value: false }, simulated, moveAccuracy);
 
     if (moveAccuracy.value === -1) {
       return moveAccuracy.value;
@@ -724,7 +724,7 @@ export default class Move implements Localizable {
    * @param target {@linkcode Pokemon} The Pokémon being targeted by the move.
    * @returns The calculated power of the move.
    */
-  calculateBattlePower(source: Pokemon, target: Pokemon): number {
+  calculateBattlePower(source: Pokemon, target: Pokemon, simulated: boolean = false): number {
     if (this.category === MoveCategory.STATUS) {
       return -1;
     }
@@ -732,17 +732,17 @@ export default class Move implements Localizable {
     const power = new Utils.NumberHolder(this.power);
     const typeChangeMovePowerMultiplier = new Utils.NumberHolder(1);
 
-    applyPreAttackAbAttrs(MoveTypeChangeAttr, source, target, this, typeChangeMovePowerMultiplier);
+    applyPreAttackAbAttrs(MoveTypeChangeAttr, source, target, this, simulated, typeChangeMovePowerMultiplier);
 
     const sourceTeraType = source.getTeraType();
     if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === this.type && power.value < 60 && this.priority <= 0 && !this.hasAttr(MultiHitAttr) && !source.scene.findModifier(m => m instanceof PokemonMultiHitModifier && m.pokemonId === source.id)) {
       power.value = 60;
     }
 
-    applyPreAttackAbAttrs(VariableMovePowerAbAttr, source, target, this, power);
+    applyPreAttackAbAttrs(VariableMovePowerAbAttr, source, target, this, simulated, power);
 
     if (source.getAlly()) {
-      applyPreAttackAbAttrs(AllyMoveCategoryPowerBoostAbAttr, source.getAlly(), target, this, power);
+      applyPreAttackAbAttrs(AllyMoveCategoryPowerBoostAbAttr, source.getAlly(), target, this, simulated, power);
     }
 
     const fieldAuras = new Set(
@@ -752,11 +752,11 @@ export default class Move implements Localizable {
     );
     for (const aura of fieldAuras) {
       // The only relevant values are `move` and the `power` holder
-      aura.applyPreAttack(null, null, null, this, [power]);
+      aura.applyPreAttack(null, null, simulated, null, this, [power]);
     }
 
     const alliedField: Pokemon[] = source instanceof PlayerPokemon ? source.scene.getPlayerField() : source.scene.getEnemyField();
-    alliedField.forEach(p => applyPreAttackAbAttrs(UserFieldMoveTypePowerBoostAbAttr, p, target, this, power));
+    alliedField.forEach(p => applyPreAttackAbAttrs(UserFieldMoveTypePowerBoostAbAttr, p, target, this, simulated, power));
 
     power.value *= typeChangeMovePowerMultiplier.value;
 
@@ -984,9 +984,9 @@ export class MoveEffectAttr extends MoveAttr {
    */
   getMoveChance(user: Pokemon, target: Pokemon, move: Move, selfEffect?: Boolean, showAbility?: Boolean): integer {
     const moveChance = new Utils.NumberHolder(move.chance);
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, user, null, moveChance, move, target, selfEffect, showAbility);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, user, null, false, moveChance, move, target, selfEffect, showAbility);
     if (!selfEffect) {
-      applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, target, user, null, null, moveChance);
+      applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, target, user, null, null, false, moveChance);
     }
     return moveChance.value;
   }
@@ -1162,7 +1162,7 @@ export class TargetHalfHpDamageAttr extends FixedDamageAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = Math.max(Math.floor(target.hp / 2), 1);
+    (args[0] as Utils.IntegerHolder).value = Utils.toDmgValue(target.hp / 2);
 
     return true;
   }
@@ -1208,7 +1208,7 @@ export class CounterDamageAttr extends FixedDamageAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const damage = user.turnData.attacksReceived.filter(ar => this.moveFilter(allMoves[ar.move])).reduce((total: integer, ar: AttackMoveResult) => total + ar.damage, 0);
-    (args[0] as Utils.IntegerHolder).value = Math.floor(Math.max(damage * this.multiplier, 1));
+    (args[0] as Utils.IntegerHolder).value = Utils.toDmgValue(damage * this.multiplier);
 
     return true;
   }
@@ -1234,7 +1234,7 @@ export class RandomLevelDamageAttr extends FixedDamageAttr {
   }
 
   getDamage(user: Pokemon, target: Pokemon, move: Move): number {
-    return Math.max(Math.floor(user.level * (user.randSeedIntRange(50, 150) * 0.01)), 1);
+    return Utils.toDmgValue(user.level * (user.randSeedIntRange(50, 150) * 0.01));
   }
 }
 
@@ -1293,8 +1293,9 @@ export class RecoilAttr extends MoveEffectAttr {
       return false;
     }
 
-    const recoilDamage = Math.max(Math.floor((!this.useHp ? user.turnData.damageDealt : user.getMaxHp()) * this.damageRatio),
+    const damageValue = (!this.useHp ? user.turnData.damageDealt : user.getMaxHp()) * this.damageRatio;
-      user.turnData.damageDealt ? 1 : 0);
+    const minValue = user.turnData.damageDealt ? 1 : 0;
+    const recoilDamage = Utils.toDmgValue(damageValue, minValue);
     if (!recoilDamage) {
       return false;
     }
@@ -1415,7 +1416,7 @@ export class HalfSacrificialAttr extends MoveEffectAttr {
     // Check to see if the Pokemon has an ability that blocks non-direct damage
     applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
     if (!cancelled.value) {
-      user.damageAndUpdate(Math.ceil(user.getMaxHp()/2), HitResult.OTHER, false, true, true);
+      user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp()/2), HitResult.OTHER, false, true, true);
       user.scene.queueMessage(i18next.t("moveTriggers:cutHpPowerUpMove", {pokemonName: getPokemonNameWithAffix(user)})); // Queue recoil message
     }
     return true;
@@ -1466,7 +1467,7 @@ export class HealAttr extends MoveEffectAttr {
    */
   addHealPhase(target: Pokemon, healRatio: number) {
     target.scene.unshiftPhase(new PokemonHealPhase(target.scene, target.getBattlerIndex(),
-      Math.max(Math.floor(target.getMaxHp() * healRatio), 1), i18next.t("moveTriggers:healHp", {pokemonName: getPokemonNameWithAffix(target)}), true, !this.showAnim));
+      Utils.toDmgValue(target.getMaxHp() * healRatio), i18next.t("moveTriggers:healHp", {pokemonName: getPokemonNameWithAffix(target)}), true, !this.showAnim));
   }
 
   getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer {
@@ -1750,7 +1751,7 @@ export class HitHealAttr extends MoveEffectAttr {
       message = i18next.t("battle:drainMessage", {pokemonName: getPokemonNameWithAffix(target)});
     } else {
       // Default healing formula used by draining moves like Absorb, Draining Kiss, Bitter Blade, etc.
-      healAmount = Math.max(Math.floor(user.turnData.currDamageDealt * this.healRatio), 1);
+      healAmount = Utils.toDmgValue(user.turnData.currDamageDealt * this.healRatio);
       message = i18next.t("battle:regainHealth", {pokemonName: getPokemonNameWithAffix(user)});
     }
     if (reverseDrain) {
@@ -1883,7 +1884,7 @@ export class MultiHitAttr extends MoveAttr {
     {
       const rand = user.randSeedInt(16);
       const hitValue = new Utils.IntegerHolder(rand);
-      applyAbAttrs(MaxMultiHitAbAttr, user, null, hitValue);
+      applyAbAttrs(MaxMultiHitAbAttr, user, null, false, hitValue);
       if (hitValue.value >= 10) {
         return 2;
       } else if (hitValue.value >= 4) {
@@ -1954,7 +1955,7 @@ export class StatusEffectAttr extends MoveEffectAttr {
       }
       if ((!pokemon.status || (pokemon.status.effect === this.effect && moveChance < 0))
         && pokemon.trySetStatus(this.effect, true, user, this.cureTurn)) {
-        applyPostAttackAbAttrs(ConfusionOnStatusEffectAbAttr, user, target, move, null, this.effect);
+        applyPostAttackAbAttrs(ConfusionOnStatusEffectAbAttr, user, target, move, null, false, this.effect);
         return true;
       }
     }
@@ -2710,7 +2711,7 @@ export class CutHpStatBoostAttr extends StatChangeAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
     return new Promise<boolean>(resolve => {
-      user.damageAndUpdate(Math.floor(user.getMaxHp() / this.cutRatio), HitResult.OTHER, false, true);
+      user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / this.cutRatio), HitResult.OTHER, false, true);
       user.updateInfo().then(() => {
         const ret = super.apply(user, target, move, args);
         if (this.messageCallback) {
@@ -3190,7 +3191,7 @@ export class CompareWeightPowerAttr extends VariablePowerAttr {
 
 export class HpPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.NumberHolder).value = Math.max(Math.floor(150 * user.getHpRatio()), 1);
+    (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(150 * user.getHpRatio());
 
     return true;
   }
@@ -3218,7 +3219,7 @@ export class OpponentHighHpPowerAttr extends VariablePowerAttr {
    * @returns true
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.NumberHolder).value = Math.max(Math.floor(this.maxBasePower * target.getHpRatio()), 1);
+    (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(this.maxBasePower * target.getHpRatio());
 
     return true;
   }
@@ -3412,7 +3413,7 @@ export class PresentPowerAttr extends VariablePowerAttr {
       // If this move is multi-hit, disable all other hits
       user.stopMultiHit();
       target.scene.unshiftPhase(new PokemonHealPhase(target.scene, target.getBattlerIndex(),
-        Math.max(Math.floor(target.getMaxHp() / 4), 1), i18next.t("moveTriggers:regainedHealth", {pokemonName: getPokemonNameWithAffix(target)}), true));
+        Utils.toDmgValue(target.getMaxHp() / 4), i18next.t("moveTriggers:regainedHealth", {pokemonName: getPokemonNameWithAffix(target)}), true));
     }
 
     return true;
@@ -3784,6 +3785,30 @@ export class TeraBlastCategoryAttr extends VariableMoveCategoryAttr {
   }
 }
 
+/**
+ * Increases the power of Tera Blast if the user is Terastallized into Stellar type
+ * @extends VariablePowerAttr
+ */
+export class TeraBlastPowerAttr extends VariablePowerAttr {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  /**
+   * @param user {@linkcode Pokemon} Pokemon using the move
+   * @param target {@linkcode Pokemon} N/A
+   * @param move {@linkcode Move} {@linkcode Move.TERA_BLAST}
+   * @param {any[]} args N/A
+   * @returns true or false
+   */
+    const power = args[0] as Utils.NumberHolder;
+    if (user.isTerastallized() && move.type === Type.STELLAR) {
+      //200 instead of 100 to reflect lack of stellar being 2x dmg on any type
+      power.value = 200;
+      return true;
+    }
+
+    return false;
+  }
+}
+
 /**
  * Change the move category to status when used on the ally
  * @extends VariableMoveCategoryAttr
@@ -4037,6 +4062,28 @@ export class HiddenPowerTypeAttr extends VariableMoveTypeAttr {
   }
 }
 
+/**
+ * Changes the type of Tera Blast to match the user's tera type
+ * @extends VariableMoveTypeAttr
+ */
+export class TeraBlastTypeAttr extends VariableMoveTypeAttr {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  /**
+   * @param user {@linkcode Pokemon} the user's type is checked
+   * @param target {@linkcode Pokemon} N/A
+   * @param move {@linkcode Move} {@linkcode Move.TeraBlastTypeAttr}
+   * @param {any[]} args N/A
+   * @returns true or false
+   */
+    if (user.isTerastallized()) {
+      move.type = user.getTeraType(); //changes move type to tera type
+      return true;
+    }
+
+    return false;
+  }
+}
+
 export class MatchUserTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const userTypes = user.getTypes(true);
@@ -4186,9 +4233,9 @@ const crashDamageFunc = (user: Pokemon, move: Move) => {
     return false;
   }
 
-  user.damageAndUpdate(Math.floor(user.getMaxHp() / 2), HitResult.OTHER, false, true);
+  user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / 2), HitResult.OTHER, false, true);
   user.scene.queueMessage(i18next.t("moveTriggers:keptGoingAndCrashed", {pokemonName: getPokemonNameWithAffix(user)}));
-  user.turnData.damageTaken += Math.floor(user.getMaxHp() / 2);
+  user.turnData.damageTaken += Utils.toDmgValue(user.getMaxHp() / 2);
 
   return true;
 };
@@ -4438,6 +4485,39 @@ export class GulpMissileTagAttr extends MoveEffectAttr {
   }
 }
 
+/**
+ * Attribute to implement Jaw Lock's linked trapping effect between the user and target
+ * @extends AddBattlerTagAttr
+ */
+export class JawLockAttr extends AddBattlerTagAttr {
+  constructor() {
+    super(BattlerTagType.TRAPPED);
+  }
+
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (!super.canApply(user, target, move, args)) {
+      return false;
+    }
+
+    // If either the user or the target already has the tag, do not apply
+    if (user.getTag(TrappedTag) || target.getTag(TrappedTag)) {
+      return false;
+    }
+
+    const moveChance = this.getMoveChance(user, target, move, this.selfTarget);
+    if (moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance) {
+      /**
+       * Add the tag to both the user and the target.
+       * The target's tag source is considered to be the user and vice versa
+       */
+      return target.addTag(BattlerTagType.TRAPPED, 1, move.id, user.id)
+          && user.addTag(BattlerTagType.TRAPPED, 1, move.id, target.id);
+    }
+
+    return false;
+  }
+}
+
 export class CurseAttr extends MoveEffectAttr {
 
   apply(user: Pokemon, target: Pokemon, move:Move, args: any[]): boolean {
@@ -4865,7 +4945,7 @@ export class RevivalBlessingAttr extends MoveEffectAttr {
         const pokemon = faintedPokemon[user.randSeedInt(faintedPokemon.length)];
         const slotIndex = user.scene.getEnemyParty().findIndex(p => pokemon.id === p.id);
         pokemon.resetStatus();
-        pokemon.heal(Math.min(Math.max(Math.ceil(Math.floor(0.5 * pokemon.getMaxHp())), 1), pokemon.getMaxHp()));
+        pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
         user.scene.queueMessage(`${getPokemonNameWithAffix(pokemon)} was revived!`,0,true);
 
         if (user.scene.currentBattle.double && user.scene.getEnemyParty().length > 1) {
@@ -7477,7 +7557,7 @@ export function initMoves() {
       .attr(OpponentHighHpPowerAttr, 120),
     new AttackMove(Moves.MAGMA_STORM, Type.FIRE, MoveCategory.SPECIAL, 100, 75, 5, -1, 0, 4)
       .attr(TrapAttr, BattlerTagType.MAGMA_STORM),
-    new StatusMove(Moves.DARK_VOID, Type.DARK, 50, 10, -1, 0, 4)
+    new StatusMove(Moves.DARK_VOID, Type.DARK, 80, 10, -1, 0, 4)  //Accuracy from Generations 4-6
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
     new AttackMove(Moves.SEED_FLARE, Type.GRASS, MoveCategory.SPECIAL, 120, 85, 5, 40, 0, 4)
@@ -8316,8 +8396,7 @@ export function initMoves() {
       .attr(HighCritAttr)
       .attr(BypassRedirectAttr),
     new AttackMove(Moves.JAW_LOCK, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8)
-      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, false, true)
+      .attr(JawLockAttr)
-      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, true, false, 1, 1, false, true)
       .bitingMove(),
     new SelfStatusMove(Moves.STUFF_CHEEKS, Type.NORMAL, -1, 10, -1, 0, 8) // TODO: Stuff Cheeks should not be selectable when the user does not have a berry, see wiki
       .attr(EatBerryAttr)
@@ -8762,7 +8841,10 @@ export function initMoves() {
     End Unused */
     new AttackMove(Moves.TERA_BLAST, Type.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9)
       .attr(TeraBlastCategoryAttr)
-      .unimplemented(),
+      .attr(TeraBlastTypeAttr)
+      .attr(TeraBlastPowerAttr)
+      .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK ], -1, true, (user, target, move) => user.isTerastallized() && user.isOfType(Type.STELLAR))
+      .partial(),
     new SelfStatusMove(Moves.SILK_TRAP, Type.BUG, -1, 10, -1, 4, 9)
       .attr(ProtectAttr, BattlerTagType.SILK_TRAP),
     new AttackMove(Moves.AXE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 90, 10, 30, 0, 9)

src/data/terrain.ts

@@ -59,7 +59,7 @@ export class Terrain {
     case TerrainType.PSYCHIC:
       if (!move.hasAttr(ProtectAttr)) {
         const priority = new Utils.IntegerHolder(move.priority);
-        applyAbAttrs(ChangeMovePriorityAbAttr, user, null, move, priority);
+        applyAbAttrs(ChangeMovePriorityAbAttr, user, null, false, move, priority);
         // Cancels move if the move has positive priority and targets a Pokemon grounded on the Psychic Terrain
         return priority.value > 0 && user.getOpponents().some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded());
       }

src/field/arena.ts

@@ -584,6 +584,10 @@ export class Arena {
     return this.getTagOnSide(tagType, ArenaTagSide.BOTH);
   }
 
+  hasTag(tagType: ArenaTagType) : boolean {
+    return !!this.getTag(tagType);
+  }
+
   getTagOnSide(tagType: ArenaTagType | Constructor<ArenaTag>, side: ArenaTagSide): ArenaTag | undefined {
     return typeof(tagType) === "string"
       ? this.tags.find(t => t.tagType === tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side))

src/field/pokemon.ts

@@ -842,7 +842,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           break;
         }
       }
-      applyAbAttrs(IgnoreOpponentStatChangesAbAttr, opponent, null, statLevel);
+      applyAbAttrs(IgnoreOpponentStatChangesAbAttr, opponent, null, false, statLevel);
       if (move) {
         applyMoveAttrs(IgnoreOpponentStatChangesAttr, this, opponent, move, statLevel);
       }
@@ -1169,12 +1169,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     // this.scene potentially can be undefined for a fainted pokemon in doubles
     // use optional chaining to avoid runtime errors
-    if (forDefend && (this.getTag(GroundedTag) || this.scene?.arena.getTag(ArenaTagType.GRAVITY))) {
-      const flyingIndex = types.indexOf(Type.FLYING);
-      if (flyingIndex > -1) {
-        types.splice(flyingIndex, 1);
-      }
-    }
 
     if (!types.length) { // become UNKNOWN if no types are present
       types.push(Type.UNKNOWN);
@@ -1318,10 +1312,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       const suppressed = new Utils.BooleanHolder(false);
       this.scene.getField(true).filter(p => p !== this).map(p => {
         if (p.getAbility().hasAttr(SuppressFieldAbilitiesAbAttr) && p.canApplyAbility()) {
-          p.getAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, false, suppressed, [ability]));
+          p.getAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, false, false, suppressed, [ability]));
         }
         if (p.getPassiveAbility().hasAttr(SuppressFieldAbilitiesAbAttr) && p.canApplyAbility(true)) {
-          p.getPassiveAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, true, suppressed, [ability]));
+          p.getPassiveAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, true, false, suppressed, [ability]));
         }
       });
       if (suppressed.value) {
@@ -1373,7 +1367,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   getWeight(): number {
     const weight = new Utils.NumberHolder(this.species.weight);
     // This will trigger the ability overlay so only call this function when necessary
-    applyAbAttrs(WeightMultiplierAbAttr, this, null, weight);
+    applyAbAttrs(WeightMultiplierAbAttr, this, null, false, weight);
     return weight.value;
   }
 
@@ -1434,10 +1428,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const cancelled = new Utils.BooleanHolder(false);
     applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier);
     if (!typeless && !ignoreAbility) {
-      applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, typeMultiplier, true);
+      applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, true, typeMultiplier);
     }
     if (!cancelled.value && !ignoreAbility) {
-      applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, typeMultiplier, true);
+      applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, true, typeMultiplier);
     }
 
     return (!cancelled.value ? Number(typeMultiplier.value) : 0) as TypeDamageMultiplier;
@@ -1464,12 +1458,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       return this.isTerastallized() ? 2 : 1;
     }
     const types = this.getTypes(true, true, undefined, useIllusion);
+    const arena = this.scene.arena;
+
+    // Handle flying v ground type immunity without removing flying type so effective types are still effective
+    // Related to https://github.com/pagefaultgames/pokerogue/issues/524
+    if (moveType === Type.GROUND && (this.isGrounded() || arena.hasTag(ArenaTagType.GRAVITY))) {
+      const flyingIndex = types.indexOf(Type.FLYING);
+      if (flyingIndex > -1) {
+        types.splice(flyingIndex, 1);
+      }
+    }
 
     let multiplier = types.map(defType => {
       if (source) {
         const ignoreImmunity = new Utils.BooleanHolder(false);
         if (source.isActive(true) && source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr)) {
-          applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, moveType, defType);
+          applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, false, moveType, defType);
         }
         if (ignoreImmunity.value) {
           return 1;
@@ -1485,7 +1489,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }).reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier;
 
     // Handle strong winds lowering effectiveness of types super effective against pure flying
-    if (!ignoreStrongWinds && this.scene.arena.weather?.weatherType === WeatherType.STRONG_WINDS && !this.scene.arena.weather.isEffectSuppressed(this.scene) && this.isOfType(Type.FLYING) && getTypeDamageMultiplier(moveType, Type.FLYING) === 2) {
+    if (!ignoreStrongWinds && arena.weather?.weatherType === WeatherType.STRONG_WINDS && !arena.weather.isEffectSuppressed(this.scene) && this.isOfType(Type.FLYING) && getTypeDamageMultiplier(moveType, Type.FLYING) === 2) {
       multiplier /= 2;
       if (!simulated) {
         this.scene.queueMessage(i18next.t("weather:strongWindsEffectMessage"));
@@ -2111,9 +2115,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const userAccuracyLevel = new Utils.IntegerHolder(this.summonData.battleStats[BattleStat.ACC]);
     const targetEvasionLevel = new Utils.IntegerHolder(target.summonData.battleStats[BattleStat.EVA]);
 
-    applyAbAttrs(IgnoreOpponentStatChangesAbAttr, target, null, userAccuracyLevel);
+    applyAbAttrs(IgnoreOpponentStatChangesAbAttr, target, null, false, userAccuracyLevel);
-    applyAbAttrs(IgnoreOpponentStatChangesAbAttr, this, null, targetEvasionLevel);
+    applyAbAttrs(IgnoreOpponentStatChangesAbAttr, this, null, false, targetEvasionLevel);
-    applyAbAttrs(IgnoreOpponentEvasionAbAttr, this, null, targetEvasionLevel);
+    applyAbAttrs(IgnoreOpponentEvasionAbAttr, this, null, false, targetEvasionLevel);
     applyMoveAttrs(IgnoreOpponentStatChangesAttr, this, target, sourceMove, targetEvasionLevel);
     this.scene.applyModifiers(TempBattleStatBoosterModifier, this.isPlayer(), TempBattleStat.ACC, userAccuracyLevel);
 
@@ -2128,7 +2132,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         : 3 / (3 + Math.min(targetEvasionLevel.value - userAccuracyLevel.value, 6));
     }
 
-    applyBattleStatMultiplierAbAttrs(BattleStatMultiplierAbAttr, this, BattleStat.ACC, accuracyMultiplier, sourceMove);
+    applyBattleStatMultiplierAbAttrs(BattleStatMultiplierAbAttr, this, BattleStat.ACC, accuracyMultiplier, false, sourceMove);
 
     const evasionMultiplier = new Utils.NumberHolder(1);
     applyBattleStatMultiplierAbAttrs(BattleStatMultiplierAbAttr, target, BattleStat.EVA, evasionMultiplier);
@@ -2138,6 +2142,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return accuracyMultiplier.value;
   }
 
+  /**
+  * Apply the results of a move to this pokemon
+  * @param {Pokemon} source The pokemon using the move
+  * @param {PokemonMove} battlerMove The move being used
+  * @returns {HitResult} The result of the attack
+  */
   apply(source: Pokemon, move: Move): HitResult {
     let result: HitResult;
     const damage = new Utils.NumberHolder(0);
@@ -2173,12 +2183,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       const sourceTeraType = source.getTeraType();
 
       if (!typeless) {
-        applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, typeMultiplier);
+        applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, false, typeMultiplier);
         applyMoveAttrs(NeutralDamageAgainstFlyingTypeMultiplierAttr, source, this, move, typeMultiplier);
       }
       if (!cancelled.value) {
-        applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, typeMultiplier);
+        applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, false, typeMultiplier);
-        defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelled, typeMultiplier));
+        defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelled, false, typeMultiplier));
       }
 
       if (cancelled.value) {
@@ -2201,7 +2211,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         const critOnly = new Utils.BooleanHolder(false);
         const critAlways = source.getTag(BattlerTagType.ALWAYS_CRIT);
         applyMoveAttrs(CritOnlyAttr, source, this, move, critOnly);
-        applyAbAttrs(ConditionalCritAbAttr, source, null, critOnly, this, move);
+        applyAbAttrs(ConditionalCritAbAttr, source, null, false, critOnly, this, move);
         if (critOnly.value || critAlways) {
           isCritical = true;
         } else {
@@ -2211,7 +2221,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           this.scene.applyModifiers(TempBattleStatBoosterModifier, source.isPlayer(), TempBattleStat.CRIT, critLevel);
           const bonusCrit = new Utils.BooleanHolder(false);
           //@ts-ignore
-          if (applyAbAttrs(BonusCritAbAttr, source, null, bonusCrit)) { // TODO: resolve ts-ignore. This is a promise. Checking a promise is bogus.
+          if (applyAbAttrs(BonusCritAbAttr, source, null, false, bonusCrit)) { // TODO: resolve ts-ignore. This is a promise. Checking a promise is bogus.
             if (bonusCrit.value) {
               critLevel.value += 1;
             }
@@ -2229,7 +2239,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         if (isCritical) {
           const noCritTag = this.scene.arena.getTagOnSide(NoCritTag, defendingSide);
           const blockCrit = new Utils.BooleanHolder(false);
-          applyAbAttrs(BlockCritAbAttr, this, null, blockCrit);
+          applyAbAttrs(BlockCritAbAttr, this, null, false, blockCrit);
           if (noCritTag || blockCrit.value) {
             isCritical = false;
           }
@@ -2237,7 +2247,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         const sourceAtk = new Utils.IntegerHolder(source.getBattleStat(isPhysical ? Stat.ATK : Stat.SPATK, this, undefined, isCritical));
         const targetDef = new Utils.IntegerHolder(this.getBattleStat(isPhysical ? Stat.DEF : Stat.SPDEF, source, move, isCritical));
         const criticalMultiplier = new Utils.NumberHolder(isCritical ? 1.5 : 1);
-        applyAbAttrs(MultCritAbAttr, source, null, criticalMultiplier);
+        applyAbAttrs(MultCritAbAttr, source, null, false, criticalMultiplier);
         const screenMultiplier = new Utils.NumberHolder(1);
         if (!isCritical) {
           this.scene.arena.applyTagsForSide(WeakenMoveScreenTag, defendingSide, move.category, this.scene.currentBattle.double, screenMultiplier);
@@ -2252,7 +2262,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           stabMultiplier.value += 0.5;
         }
 
-        applyAbAttrs(StabBoostAbAttr, source, null, stabMultiplier);
+        applyAbAttrs(StabBoostAbAttr, source, null, false, stabMultiplier);
 
         if (sourceTeraType !== Type.UNKNOWN && matchesSourceType) {
           stabMultiplier.value = Math.min(stabMultiplier.value + 0.5, 2.25);
@@ -2270,12 +2280,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           numTargets = effectPhase.getTargets().length;
         }
         const twoStrikeMultiplier = new Utils.NumberHolder(1);
-        applyPreAttackAbAttrs(AddSecondStrikeAbAttr, source, this, move, numTargets, new Utils.IntegerHolder(0), twoStrikeMultiplier);
+        applyPreAttackAbAttrs(AddSecondStrikeAbAttr, source, this, move, false, numTargets, new Utils.IntegerHolder(0), twoStrikeMultiplier);
 
         if (!isTypeImmune) {
           const levelMultiplier = (2 * source.level / 5 + 2);
           const randomMultiplier = ((this.scene.randBattleSeedInt(16) + 85) / 100);
-          damage.value = Math.ceil((((levelMultiplier * power * sourceAtk.value / targetDef.value) / 50) + 2)
+          damage.value = Utils.toDmgValue((((levelMultiplier * power * sourceAtk.value / targetDef.value) / 50) + 2)
                                    * stabMultiplier.value
                                    * typeMultiplier.value
                                    * arenaAttackTypeMultiplier.value
@@ -2289,14 +2299,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) {
             if (!move.hasAttr(BypassBurnDamageReductionAttr)) {
               const burnDamageReductionCancelled = new Utils.BooleanHolder(false);
-              applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled);
+              applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled, false);
               if (!burnDamageReductionCancelled.value) {
-                damage.value = Math.floor(damage.value / 2);
+                damage.value = Utils.toDmgValue(damage.value / 2);
               }
             }
           }
 
-          applyPreAttackAbAttrs(DamageBoostAbAttr, source, this, move, damage);
+          applyPreAttackAbAttrs(DamageBoostAbAttr, source, this, move, false, damage);
 
           /**
            * For each {@link HitsTagAttr} the move has, doubles the damage of the move if:
@@ -2312,7 +2322,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         }
 
         if (this.scene.arena.terrain?.terrainType === TerrainType.MISTY && this.isGrounded() && move.type === Type.DRAGON) {
-          damage.value = Math.floor(damage.value / 2);
+          damage.value = Utils.toDmgValue(damage.value / 2);
         }
 
         const fixedDamage = new Utils.IntegerHolder(0);
@@ -2354,7 +2364,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
             this.scene.applyModifiers(EnemyDamageReducerModifier, false, damage);
           }
 
-          applyPreDefendAbAttrs(ReceivedMoveDamageMultiplierAbAttr, this, source, move, cancelled, damage);
+          applyPreDefendAbAttrs(ReceivedMoveDamageMultiplierAbAttr, this, source, move, cancelled, false, damage);
         }
 
         // This attribute may modify damage arbitrarily, so be careful about changing its order of application.
@@ -2367,7 +2377,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
         if (damage.value) {
           if (this.isFullHp()) {
-            applyPreDefendAbAttrs(PreDefendFullHpEndureAbAttr, this, source, move, cancelled, damage);
+            applyPreDefendAbAttrs(PreDefendFullHpEndureAbAttr, this, source, move, cancelled, false, damage);
           } else if (!this.isPlayer() && damage.value >= this.hp) {
             this.scene.applyModifiers(EnemyEndureChanceModifier, false, this);
           }
@@ -2434,11 +2444,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       break;
     case MoveCategory.STATUS:
       if (!typeless) {
-        applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, typeMultiplier);
+        applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, false, typeMultiplier);
       }
       if (!cancelled.value) {
-        applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, typeMultiplier);
+        applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, false, typeMultiplier);
-        defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelled, typeMultiplier));
+        defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelled, false, typeMultiplier));
       }
       if (!typeMultiplier.value) {
         this.scene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) }));
@@ -2530,6 +2540,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return maxForms.includes(this.getFormKey()) || (!!this.getFusionFormKey() && maxForms.includes(this.getFusionFormKey()!));
   }
 
+  canAddTag(tagType: BattlerTagType): boolean {
+    if (this.getTag(tagType)) {
+      return false;
+    }
+
+    const stubTag = new BattlerTag(tagType, 0, 0);
+
+    const cancelled = new Utils.BooleanHolder(false);
+    applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, stubTag, cancelled, true);
+
+    const userField = this.getAlliedField();
+    userField.forEach(pokemon => applyPreApplyBattlerTagAbAttrs(UserFieldBattlerTagImmunityAbAttr, pokemon, stubTag, cancelled, true));
+
+    return !cancelled.value;
+  }
+
   addTag(tagType: BattlerTagType, turnCount: integer = 0, sourceMove?: Moves, sourceId?: integer): boolean {
     const existingTag = this.getTag(tagType);
     if (existingTag) {
@@ -2916,7 +2942,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         // Check if the source Pokemon has an ability that cancels the Poison/Toxic immunity
         const cancelImmunity = new Utils.BooleanHolder(false);
         if (sourcePokemon) {
-          applyAbAttrs(IgnoreTypeStatusEffectImmunityAbAttr, sourcePokemon, cancelImmunity, effect, defType);
+          applyAbAttrs(IgnoreTypeStatusEffectImmunityAbAttr, sourcePokemon, cancelImmunity, false, effect, defType);
           if (cancelImmunity.value) {
             return false;
           }
@@ -2988,7 +3014,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     if (effect === StatusEffect.SLEEP) {
       statusCureTurn = new Utils.IntegerHolder(this.randSeedIntRange(2, 4));
-      applyAbAttrs(ReduceStatusEffectDurationAbAttr, this, null, effect, statusCureTurn);
+      applyAbAttrs(ReduceStatusEffectDurationAbAttr, this, null, false, effect, statusCureTurn);
 
       this.setFrameRate(4);
 
@@ -3622,7 +3648,7 @@ export class PlayerPokemon extends Pokemon {
 
           pokemon.resetTurnData();
           pokemon.resetStatus();
-          pokemon.heal(Math.min(Math.max(Math.ceil(Math.floor(0.5 * pokemon.getMaxHp())), 1), pokemon.getMaxHp()));
+          pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
           this.scene.queueMessage(`${pokemon.name} was revived!`,0,true);
 
           if (this.scene.currentBattle.double && this.scene.getParty().length > 1) {
@@ -4635,7 +4661,7 @@ export class PokemonMove {
   }
 
   getMovePp(): integer {
-    return this.getMove().pp + this.ppUp * Math.max(Math.floor(this.getMove().pp / 5), 1);
+    return this.getMove().pp + this.ppUp * Utils.toDmgValue(this.getMove().pp / 5);
   }
 
   getPpRatio(): number {

src/locales/ca_ES/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "₽{{formattedMoney}}"
+} as const;

src/locales/ca_ES/config.ts

@@ -6,6 +6,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const caESConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/de/battle-scene.ts

@@ -0,0 +1,6 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "{{formattedMoney}} ₽"
+
+} as const;

src/locales/de/battler-tags.ts

@@ -69,5 +69,5 @@ export const battlerTags: SimpleTranslationEntries = {
   "saltCuredLapse": "{{pokemonNameWithAffix}} wurde durch {{moveName}} verletzt!",
   "cursedOnAdd": "{{pokemonNameWithAffix}} nimmt einen Teil seiner KP und legt einen Fluch auf {{pokemonName}}!",
   "cursedLapse": "{{pokemonNameWithAffix}} wurde durch den Fluch verletzt!",
-  "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} hortet {{stockpiledCount}}!",
 } as const;

src/locales/de/config.ts

@@ -4,6 +4,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const deConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/de/starter-select-ui-handler.ts

@@ -7,7 +7,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
  */
 export const starterSelectUiHandler: SimpleTranslationEntries = {
   "confirmStartTeam": "Mit diesen Pokémon losziehen?",
-  "confirmExit": "Do you want to exit?",
+  "confirmExit": "Willst du zurück?",
   "invalidParty": "Das ist kein gültiges Team!",
   "gen1": "I",
   "gen2": "II",
@@ -28,8 +28,8 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
   "toggleIVs": "DVs anzeigen/verbergen",
   "manageMoves": "Attacken ändern",
   "manageNature": "Wesen ändern",
-  "addToFavorites": "Add to Favorites",
+  "addToFavorites": "Zu Favoriten hinzufügen",
-  "removeFromFavorites": "Remove from Favorites",
+  "removeFromFavorites": "Von Favoriten entfernen",
   "useCandies": "Bonbons verwenden",
   "selectNature": "Wähle das neue Wesen.",
   "selectMoveSwapOut": "Wähle die zu ersetzende Attacke.",

src/locales/en/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "₽{{formattedMoney}}"
+} as const;

src/locales/en/config.ts

@@ -6,6 +6,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const enConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/es/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "{{formattedMoney}} ₽"
+} as const;

src/locales/es/config.ts

@@ -4,6 +4,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const esConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/fr/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "{{formattedMoney}} ₽"
+} as const;

src/locales/fr/config.ts

@@ -4,6 +4,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const frConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/it/ability-trigger.ts

@@ -26,39 +26,39 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "postAttackStealHeldItem": "{{pokemonNameWithAffix}} ruba\n{{stolenItemType}} di {{defenderName}}!",
   "postDefendStealHeldItem": "{{pokemonNameWithAffix}} ruba\n{{stolenItemType}} di {{attackerName}}!",
   "copyFaintedAllyAbility": "L'abilità {{abilityName}} di {{pokemonNameWithAffix}} è passata all'alleato!",
-  "intimidateImmunity": "{{pokemonNameWithAffix}}'s {{abilityName}} prevented it from being Intimidated!",
+  "intimidateImmunity": "{{abilityName}} impedisce a {{pokemonNameWithAffix}} di\nessere intimidito!",
-  "postSummonAllyHeal": "{{pokemonNameWithAffix}} drank down all the\nmatcha that {{pokemonName}} made!",
+  "postSummonAllyHeal": "{{pokemonNameWithAffix}} beve il\ntè che {{pokemonName}} gli ha preparato!",
-  "postSummonClearAllyStats": "{{pokemonNameWithAffix}}'s stat changes\nwere removed!",
+  "postSummonClearAllyStats": "Le statistiche di {{pokemonNameWithAffix}}\ntornano alla normalità!",
-  "postSummonTransform": "{{pokemonNameWithAffix}} transformed\ninto {{targetName}}!",
+  "postSummonTransform": "{{pokemonNameWithAffix}} assume le sembianze\ndi {{targetName}}!",
-  "protectStat": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents lowering its {{statName}}!",
+  "protectStat": "{{abilityName}} di {{pokemonNameWithAffix}}\npreviene la riduzione del/della suo/a {{statName}}!",
-  "statusEffectImmunityWithName": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents {{statusEffectName}}!",
+  "statusEffectImmunityWithName": "{{abilityName}} di {{pokemonNameWithAffix}}\nnon gli fa subire il/lo/la {{statusEffectName}}!",
-  "statusEffectImmunity": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents status problems!",
+  "statusEffectImmunity": "{{abilityName}} di {{pokemonNameWithAffix}}\npreviene i problemi di stato!",
-  "battlerTagImmunity": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents {{battlerTagName}}!",
+  "battlerTagImmunity": "{{abilityName}} di {{pokemonNameWithAffix}}\npreviene {{battlerTagName}}!",
-  "forewarn": "{{pokemonNameWithAffix}} was forewarned about {{moveName}}!",
+  "forewarn": "{{pokemonNameWithAffix}} è stato messo in guardia da {{moveName}}!",
-  "frisk": "{{pokemonNameWithAffix}} frisked {{opponentName}}'s {{opponentAbilityName}}!",
+  "frisk": "{{pokemonNameWithAffix}} perquisice {{opponentName}}\ne trova la sua abilità, {{opponentAbilityName}}!",
-  "postWeatherLapseHeal": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP a little!",
+  "postWeatherLapseHeal": "{{pokemonNameWithAffix}} recupera alcuni PS\ncon {{abilityName}}!",
-  "postWeatherLapseDamage": "{{pokemonNameWithAffix}} is hurt\nby its {{abilityName}}!",
+  "postWeatherLapseDamage": "{{pokemonNameWithAffix}} subisce danni\na causa della sua abilità, {{abilityName}}!",
-  "postTurnLootCreateEatenBerry": "{{pokemonNameWithAffix}} harvested one {{berryName}}!",
+  "postTurnLootCreateEatenBerry": "{{pokemonNameWithAffix}} raccoglie una {{berryName}}!",
-  "postTurnHeal": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP a little!",
+  "postTurnHeal": "{{pokemonNameWithAffix}} recupera alcuni PS\ncon {{abilityName}}!",
-  "fetchBall": "{{pokemonNameWithAffix}} found a\n{{pokeballName}}!",
+  "fetchBall": "{{pokemonNameWithAffix}} ha trovato una\n{{pokeballName}}!",
-  "healFromBerryUse": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP!",
+  "healFromBerryUse": "{{abilityName}} di {{pokemonNameWithAffix}}\nristabilisce parte dei PS!",
-  "arenaTrap": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents switching!",
+  "arenaTrap": "L’abilità {{abilityName}} di {{pokemonNameWithAffix}}\nimpedisce la sostituzione!",
-  "postBattleLoot": "{{pokemonNameWithAffix}} picked up\n{{itemName}}!",
+  "postBattleLoot": "{{pokemonNameWithAffix}} ha raccolto\nil/l'/lo/la {{itemName}}!",
-  "postFaintContactDamage": "{{pokemonNameWithAffix}}'s {{abilityName}}\nhurt its attacker!",
+  "postFaintContactDamage": "{{abilityName}} di {{pokemonNameWithAffix}}\nferisce il Pokémon che lo ha attaccato!",
-  "postFaintHpDamage": "{{pokemonNameWithAffix}}'s {{abilityName}}\nhurt its attacker!",
+  "postFaintHpDamage": "{{abilityName}} di {{pokemonNameWithAffix}}\nferisce il Pokémon che lo ha attaccato!",
-  "postSummonPressure": "{{pokemonNameWithAffix}} is exerting its Pressure!",
+  "postSummonPressure": "{{pokemonNameWithAffix}} fa pressione!",
-  "postSummonMoldBreaker": "{{pokemonNameWithAffix}} breaks the mold!",
+  "postSummonMoldBreaker": "{{pokemonNameWithAffix}} ha l’abilità Rompiforma!",
-  "postSummonAnticipation": "{{pokemonNameWithAffix}} shuddered!",
+  "postSummonAnticipation": "{{pokemonNameWithAffix}} rabbrividisce!",
-  "postSummonTurboblaze": "{{pokemonNameWithAffix}} is radiating a blazing aura!",
+  "postSummonTurboblaze": "{{pokemonNameWithAffix}} emana un’aura infuocata!",
-  "postSummonTeravolt": "{{pokemonNameWithAffix}} is radiating a bursting aura!",
+  "postSummonTeravolt": "{{pokemonNameWithAffix}} emana un’aura repulsiva!",
-  "postSummonDarkAura": "{{pokemonNameWithAffix}} is radiating a Dark Aura!",
+  "postSummonDarkAura": "L’abilità Auratetra di {{pokemonNameWithAffix}} è attiva.",
-  "postSummonFairyAura": "{{pokemonNameWithAffix}} is radiating a Fairy Aura!",
+  "postSummonFairyAura": "L’abilità Aurafolletto di {{pokemonNameWithAffix}} è attiva.",
-  "postSummonNeutralizingGas": "{{pokemonNameWithAffix}}'s Neutralizing Gas filled the area!",
+  "postSummonNeutralizingGas": "Il Gas Reagente di {{pokemonNameWithAffix}}\nsi diffonde tutt’intorno!",
-  "postSummonAsOneGlastrier": "{{pokemonNameWithAffix}} has two Abilities!",
+  "postSummonAsOneGlastrier": "{{pokemonNameWithAffix}} ha due abilità!",
-  "postSummonAsOneSpectrier": "{{pokemonNameWithAffix}} has two Abilities!",
+  "postSummonAsOneSpectrier": "{{pokemonNameWithAffix}} ha due abilità!",
-  "postSummonVesselOfRuin": "{{pokemonNameWithAffix}}'s Vessel of Ruin lowered the {{statName}}\nof all surrounding Pokémon!",
+  "postSummonVesselOfRuin": "La/l'{{statName}} dei Pokémon intorno si indebolisce a causa\ndell'abilità Vaso Nefasto di {{pokemonNameWithAffix}}!",
-  "postSummonSwordOfRuin": "{{pokemonNameWithAffix}}'s Sword of Ruin lowered the {{statName}}\nof all surrounding Pokémon!",
+  "postSummonSwordOfRuin": "La/l'{{statName}} dei Pokémon intorno si indebolisce a causa\ndell'abilità Spada Nefasta di {{pokemonNameWithAffix}}!",
-  "postSummonTabletsOfRuin": "{{pokemonNameWithAffix}}'s Tablets of Ruin lowered the {{statName}}\nof all surrounding Pokémon!",
+  "postSummonTabletsOfRuin": "La/l'{{statName}} dei Pokémon intorno si indebolisce a causa\ndell'abilità Amuleto Nefasto di {{pokemonNameWithAffix}}!",
-  "postSummonBeadsOfRuin": "{{pokemonNameWithAffix}}'s Beads of Ruin lowered the {{statName}}\nof all surrounding Pokémon!",
+  "postSummonBeadsOfRuin": "La/l'{{statName}} dei Pokémon intorno si indebolisce a causa\ndell'abilità Monile Nefasto di {{pokemonNameWithAffix}}!",
   "preventBerryUse": "{{pokemonNameWithAffix}} non riesce a\nmangiare le bacche per l'agitazione!",
 } as const;

src/locales/it/achv.ts

@@ -170,8 +170,8 @@ export const PGMachv: AchievementTranslationEntries = {
     description: "Vinci in modalità classica",
   },
   "UNEVOLVED_CLASSIC_VICTORY": {
-    name: "Bring Your Child To Work Day",
+    name: "Alternanza scuola-lavoro",
-    description: "Beat the game in Classic Mode with at least one unevolved party member."
+    description: "Completa la modalità classica con almeno un membro della squadra non evoluto completamente."
   },
 
   "MONO_GEN_ONE": {
@@ -269,8 +269,8 @@ export const PGMachv: AchievementTranslationEntries = {
     name: "Follettini e follettine",
   },
   "FRESH_START": {
-    name: "First Try!",
+    name: "Buona la prima!",
-    description: "Complete the Fresh Start challenge."
+    description: "Completa la modalità sfida 'Un nuovo inizio'."
   }
 } as const;
 

src/locales/it/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "{{formattedMoney}} ₽"
+} as const;

src/locales/it/battle.ts

@@ -74,22 +74,22 @@ export const battle: SimpleTranslationEntries = {
   "fainted": "{{pokemonNameWithAffix}} non è più in\ngrado di combattere!",
   "statsAnd": "e",
   "stats": "statistiche",
-  "statRose_one": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a!",
+  "statRose_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è aumentata!",
-  "statRose_other": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
+  "statRose_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono aumentate!",
-  "statSharplyRose_one": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a molto!",
+  "statSharplyRose_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è aumentata molto!",
-  "statSharplyRose_other": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
+  "statSharplyRose_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono aumentate molto!",
-  "statRoseDrastically_one": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a drasticamente!",
+  "statRoseDrastically_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è aumentata drasticamente!",
-  "statRoseDrastically_other": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
+  "statRoseDrastically_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono aumentate drasticamente!",
-  "statWontGoAnyHigher_one": "{{pokemonNameWithAffix}}'s {{stats}} non può aumentare più di così!",
+  "statWontGoAnyHigher_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} non può aumentare di più!",
-  "statWontGoAnyHigher_other": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
+  "statWontGoAnyHigher_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} non possono aumentare di più!",
-  "statFell_one": "{{pokemonNameWithAffix}}'s {{stats}} è diminuito/a!",
+  "statFell_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è diminuita!",
-  "statFell_other": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
+  "statFell_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono diminuite!",
-  "statHarshlyFell_one": "{{pokemonNameWithAffix}}'s {{stats}} è diminuito/a molto!",
+  "statHarshlyFell_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è diminuita molto!",
-  "statHarshlyFell_other": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
+  "statHarshlyFell_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono diminuite molto!",
-  "statSeverelyFell_one": "{{pokemonNameWithAffix}}'s {{stats}} è diminuito/a drasticamente!",
+  "statSeverelyFell_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è diminuita drasticamente!",
-  "statSeverelyFell_other": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
+  "statSeverelyFell_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono diminuite drasticamente!",
-  "statWontGoAnyLower_one": "{{pokemonNameWithAffix}}'s {{stats}} non può diminuire più di così!",
+  "statWontGoAnyLower_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} non può diminuire di più!",
-  "statWontGoAnyLower_other": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
+  "statWontGoAnyLower_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} non possono diminuire di più!",
   "transformedIntoType": "{{pokemonName}} diventa\ndi tipo {{type}} type!",
   "retryBattle": "Vuoi riprovare dall'inizio della lotta?",
   "unlockedSomething": "{{unlockedThing}}\nè stato/a sbloccato/a.",

src/locales/it/battler-tags.ts

@@ -1,14 +1,14 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const battlerTags: SimpleTranslationEntries = {
-  "trappedDesc": "trapping",
+  "trappedDesc": "intrappolando",
-  "flinchedDesc": "flinching",
+  "flinchedDesc": "tentennando",
-  "confusedDesc": "confusion",
+  "confusedDesc": "confuso",
-  "infatuatedDesc": "infatuation",
+  "infatuatedDesc": "infatuato",
-  "seedDesc": "seeding",
+  "seedDesc": "pieno di semi",
-  "nightmareDesc": "nightmares",
+  "nightmareDesc": "incubi",
-  "ingrainDesc": "roots",
+  "ingrainDesc": "radici",
-  "drowsyDesc": "drowsiness",
+  "drowsyDesc": "assonnato",
   "rechargingLapse": "{{pokemonNameWithAffix}} deve\nricaricarsi!",
   "trappedOnAdd": "{{pokemonNameWithAffix}} non può\npiù fuggire!",
   "trappedOnRemove": "{{pokemonNameWithAffix}} è stato liberato\nda {{moveName}}",

src/locales/it/challenges.ts

@@ -2,7 +2,7 @@ import { TranslationEntries } from "#app/interfaces/locales";
 
 export const challenges: TranslationEntries = {
   "title": "Modificatori delle sfide",
-  "illegalEvolution": "{{pokemon}} changed into an ineligble pokémon\nfor this challenge!",
+  "illegalEvolution": "{{pokemon}} non è più utilizzabile\nsecondo le regole della sfida!",
   "singleGeneration": {
     "name": "Mono gen",
     "desc": "Puoi usare solo Pokémon di {{gen}} generazione.",
@@ -23,8 +23,8 @@ export const challenges: TranslationEntries = {
     "desc_default": "Puoi usare solo Pokémon del tipo selezionato."
   },
   "freshStart": {
-    "name": "Fresh Start",
+    "name": "Un nuovo inizio",
-    "desc": "You can only use the original starters, and only as if you had just started PokéRogue.",
+    "desc": "Puoi usare solo gli starter originali, e come se avessi appena cominciato Pokérogue.",
     "value.0": "Off",
     "value.1": "On",
   }

src/locales/it/config.ts

@@ -4,6 +4,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const itConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/it/menu-ui-handler.ts

@@ -25,5 +25,5 @@ export const menuUiHandler: SimpleTranslationEntries = {
   "unlinkGoogle": "Scollega Google",
   "cancel": "Annulla",
   "losingProgressionWarning": "Perderai tutti i progressi dall'inizio della battaglia. Confermi?",
-  "noEggs": "You are not hatching\nany eggs at the moment!"
+  "noEggs": "Non stai schiudendo\nuova al momento!"
 } as const;

src/locales/it/menu.ts

@@ -17,7 +17,7 @@ export const menu: SimpleTranslationEntries = {
   "username": "Nome utente",
   "password": "Password",
   "login": "Accedi",
-  "orUse": "Or use",
+  "orUse": "O usa",
   "register": "Registrati",
   "emptyUsername": "Nome utente mancante!",
   "invalidLoginUsername": "Nome utente non valido!",
@@ -39,9 +39,9 @@ export const menu: SimpleTranslationEntries = {
   "weeklyRankings": "Classifica settimanale",
   "noRankings": "Nessuna classifica",
   "positionIcon": "#",
-  "usernameScoreboard": "Username",
+  "usernameScoreboard": "Nome utente",
-  "score": "Score",
+  "score": "Punteggio",
-  "wave": "Wave",
+  "wave": "Onda",
   "loading": "Caricamento…",
   "loadingAsset": "Caricamento asset: {{assetName}}",
   "playersOnline": "Giocatori online",

src/locales/it/modifier-type.ts

@@ -101,7 +101,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     },
     "TmModifierTypeWithInfo": {
       name: "MT{{moveId}} - {{moveName}}",
-      description: "Insegna {{moveName}} a un Pokémon\n(Hold C or Shift for more info).",
+      description: "Insegna {{moveName}} a un Pokémon\n(Tieni premuto C o Shift per maggiori informazioni).",
     },
     "EvolutionItemModifierType": {
       description: "Fa evolvere determinate specie di Pokémon.",
@@ -153,7 +153,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
 
     "REVIVER_SEED": { name: "Revitalseme", description: "Il possessore recupera 1/2 di PS in caso di KO causato da un colpo diretto." },
 
-    "WHITE_HERB": { name: "Erbachiara", description: "An item to be held by a Pokémon. It will restore any lowered stat in battle." },
+    "WHITE_HERB": { name: "Erbachiara", description: "Strumento da dare a un Pokémon. Ripristina le statistiche ridotte in lotta." },
 
     "ETHER": { name: "Etere" },
     "MAX_ETHER": { name: "Etere max" },

src/locales/it/modifier.ts

@@ -1,14 +1,14 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const modifier: SimpleTranslationEntries = {
-  "surviveDamageApply": "{{pokemonNameWithAffix}} hung on\nusing its {{typeName}}!",
+  "surviveDamageApply": "{{pokemonNameWithAffix}} resiste\ngrazie al/alla suo/a {{typeName}}!",
-  "turnHealApply": "{{pokemonNameWithAffix}} restored a little HP using\nits {{typeName}}!",
+  "turnHealApply": "{{pokemonNameWithAffix}} recupera alcuni PS con\nil/la suo/a {{typeName}}!",
-  "hitHealApply": "{{pokemonNameWithAffix}} restored a little HP using\nits {{typeName}}!",
+  "hitHealApply": "{{pokemonNameWithAffix}} recupera alcuni PS con\nil/la suo/a {{typeName}}!",
-  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} was revived\nby its {{typeName}}!",
+  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} torna in forze\ngrazie al/alla suo/a {{typeName}}!",
-  "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}'s lowered stats were restored\nby its {{typeName}}!",
+  "pokemonResetNegativeStatStageApply": "La riduzione alle statistiche di {{pokemonNameWithAffix}}\nviene annullata grazie al/alla suo/a {{typeName}}!",
-  "moneyInterestApply": "You received interest of ₽{{moneyAmount}}\nfrom the {{typeName}}!",
+  "moneyInterestApply": "Ricevi un interesse pari a {{moneyAmount}}₽\ngrazie al/allo/a {{typeName}}!",
-  "turnHeldItemTransferApply": "{{pokemonNameWithAffix}}'s {{itemName}} was absorbed\nby {{pokemonName}}'s {{typeName}}!",
+  "turnHeldItemTransferApply": "Il/l'/lo/la {{itemName}} di {{pokemonNameWithAffix}} è stato assorbito\ndal {{typeName}} di {{pokemonName}}!",
-  "contactHeldItemTransferApply": "{{pokemonNameWithAffix}}'s {{itemName}} was snatched\nby {{pokemonName}}'s {{typeName}}!",
+  "contactHeldItemTransferApply": "Il/l'/lo/la {{itemName}} di {{pokemonNameWithAffix}} è stato rubato\nda {{pokemonName}} con {{typeName}}!",
-  "enemyTurnHealApply": "{{pokemonNameWithAffix}}\nrestored some HP!",
+  "enemyTurnHealApply": "{{pokemonNameWithAffix}}\nristabilisce parte dei PS!",
   "bypassSpeedChanceApply": "{{pokemonName}} agisce più rapidamente del normale grazie al suo {{itemName}}!",
 } as const;

src/locales/it/move-trigger.ts

@@ -57,10 +57,10 @@ export const moveTriggers: SimpleTranslationEntries = {
   "sacrificialFullRestore": "{{pokemonName}} riceve i benefici\neffetti di Curardore!",
   "invertStats": "Le modifiche alle statistiche di {{pokemonName}}\nvengono invertite!",
   "resetStats": "Tutte le modifiche alle statistiche sono state annullate!",
-  "statEliminated": "All stat changes were eliminated!",
+  "statEliminated": "Tutte le modifiche alle statistiche sono state annullate!",
   "faintCountdown": "{{pokemonName}}\nandrà KO dopo {{turnCount}} turni.",
   "copyType": "{{pokemonName}} assume il tipo\ndi {{targetPokemonName}}!",
   "suppressAbilities": "L’abilità di {{pokemonName}}\nperde ogni efficacia!",
   "swapArenaTags": "{{pokemonName}} ha invertito gli effetti attivi\nnelle due metà del campo!",
-  "exposedMove": "{{pokemonName}} identified\n{{targetPokemonName}}!",
+  "exposedMove": "{{pokemonName}} ha identificato\n{{targetPokemonName}}!",
 } as const;

src/locales/it/move.ts

@@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
   },
   zippyZap: {
     name: "Sprintaboom",
-    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness.",
+    effect: "Un attacco elettrico ad altissima velocità. Questa mossa ha priorità alta e aumenta l'elusione dell'utilizzatore.",
   },
   splishySplash: {
     name: "Surfasplash",

src/locales/ja/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "{{formattedMoney}}円"
+} as const;

src/locales/ja/config.ts

@@ -4,6 +4,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -61,6 +62,7 @@ export const jaConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/ko/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "₽{{formattedMoney}}"
+} as const;

src/locales/ko/config.ts

@@ -4,6 +4,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const koConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/ko/move-trigger.ts

@@ -8,7 +8,7 @@ export const moveTriggers: SimpleTranslationEntries = {
   "goingAllOutForAttack": "{{pokemonName}}[[는]]\n전력을 다하기 시작했다!",
   "regainedHealth": "{{pokemonName}}[[는]]\n기력을 회복했다!",
   "keptGoingAndCrashed": "{{pokemonName}}[[는]]\n의욕이 넘쳐서 땅에 부딪쳤다!",
-  "fled": "{{pokemonName}}[[는]]\N도망쳤다!",
+  "fled": "{{pokemonName}}[[는]]\n도망쳤다!",
   "cannotBeSwitchedOut": "{{pokemonName}}[[를]]\n돌아오게 할 수 없습니다!",
   "swappedAbilitiesWithTarget": "{{pokemonName}}[[는]]\n서로의 특성을 교체했다!",
   "coinsScatteredEverywhere": "돈이 주위에 흩어졌다!",

src/locales/pt_BR/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "₽{{formattedMoney}}"
+} as const;

src/locales/pt_BR/config.ts

@@ -4,6 +4,7 @@ import { PGFachv, PGMachv } from "./achv";
 import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const ptBrConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/pt_BR/menu.ts

@@ -35,11 +35,11 @@ export const menu: SimpleTranslationEntries = {
   "sessionSuccess": "Sessão carregada com sucesso.",
   "failedToLoadSession": "Não foi possível carregar os dados da sua sessão.\nEles podem estar corrompidos.",
   "boyOrGirl": "Você é um menino ou uma menina?",
-  "evolving": "Que?\n{{pokemonName}} tá evoluindo!",
+  "evolving": "Quê?\n{{pokemonName}} tá evoluindo!",
   "stoppedEvolving": "{{pokemonName}} parou de evoluir.",
   "pauseEvolutionsQuestion": "Gostaria de pausar evoluções para {{pokemonName}}?\nEvoluções podem ser religadas na tela de equipe.",
   "evolutionsPaused": "Evoluções foram paradas para {{pokemonName}}.",
-  "evolutionDone": "Parabéns!\nSeu {{pokemonName}} evolui para {{evolvedPokemonName}}!",
+  "evolutionDone": "Parabéns!\nSeu {{pokemonName}} evoluiu para {{evolvedPokemonName}}!",
   "dailyRankings": "Classificação Diária",
   "weeklyRankings": "Classificação Semanal",
   "noRankings": "Sem Classificação",

src/locales/pt_BR/modifier.ts

@@ -4,7 +4,7 @@ export const modifier: SimpleTranslationEntries = {
   "surviveDamageApply": "{{pokemonNameWithAffix}} aguentou o tranco\nusando sua {{typeName}}!",
   "turnHealApply": "{{pokemonNameWithAffix}} restaurou um pouco de PS usando\nsuas {{typeName}}!",
   "hitHealApply": "{{pokemonNameWithAffix}} restaurou um pouco de PS usando\nsua {{typeName}}!",
-  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} foi revivido\npor sua {{typeName}}!",
+  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} foi reanimado\npor sua {{typeName}}!",
   "pokemonResetNegativeStatStageApply": "Os atributos diminuídos de {{pokemonNameWithAffix}} foram\nrestaurados por seu(sua) {{typeName}}!",
   "moneyInterestApply": "Você recebeu um juros de ₽{{moneyAmount}}\nde sua {{typeName}}!",
   "turnHeldItemTransferApply": "{{itemName}} de {{pokemonNameWithAffix}} foi absorvido(a)\npelo {{typeName}} de {{pokemonName}}!",

src/locales/pt_BR/move-trigger.ts

@@ -26,7 +26,7 @@ export const moveTriggers: SimpleTranslationEntries = {
   "soothingAromaWaftedThroughArea": "Um aroma suave se espalhou pelo ambiente!",
   "sprangUp": "{{pokemonName}} se levantou!",
   "choseDoomDesireAsDestiny": "{{pokemonName}} escolheu\no Desejo da Perdição como seu destino!",
-  "vanishedInstantly": "{{pokemonName}} desapareceu/nde repente!",
+  "vanishedInstantly": "{{pokemonName}} desapareceu\nde repente!",
   "tookTargetIntoSky": "{{pokemonName}} levou {{targetName}}\npara o céu!",
   "becameCloakedInFreezingLight": "{{pokemonName}} ficou envolto/nem uma luz congelante!",
   "becameCloakedInFreezingAir": "{{pokemonName}} ficou envolto/nem ar congelante!",

src/locales/pt_BR/party-ui-handler.ts

@@ -15,7 +15,7 @@ export const partyUiHandler: SimpleTranslationEntries = {
   "ALL": "Tudo",
   "PASS_BATON": "Passar Bastão",
   "UNPAUSE_EVOLUTION": "Ativar Evolução",
-  "REVIVE": "Reviver",
+  "REVIVE": "Reanimar",
   "RENAME": "Renomear",
 
   "choosePokemon": "Escolha um Pokémon.",

src/locales/pt_BR/pokemon-form.ts

@@ -29,7 +29,7 @@ export const pokemonForm: SimpleTranslationEntries = {
   "pikachuPartner": "Parceiro",
   "eeveePartner": "Parceiro",
   // 2G
-  "pichuSpiky": "Spiky",
+  "pichuSpiky": "Orelha Espetada",
   "unownA": "A",
   "unownB": "B",
   "unownC": "C",
@@ -74,8 +74,8 @@ export const pokemonForm: SimpleTranslationEntries = {
   "rotomFrost": "Congelante",
   "rotomFan": "Ventilador",
   "rotomMow": "Corte",
-  "giratinaAltered": "Altered",
+  "giratinaAltered": "Alterado",
-  "shayminLand": "Land",
+  "shayminLand": "Terrestre",
   // 5G
   "basculinRedStriped": "Listras Vermelhas",
   "basculinBlueStriped": "Listras Azuis",
@@ -84,11 +84,11 @@ export const pokemonForm: SimpleTranslationEntries = {
   "deerlingSummer": "Verão",
   "deerlingAutumn": "Outono",
   "deerlingWinter": "Inverno",
-  "tornadusIncarnate": "Incarnate",
+  "tornadusIncarnate": "Materializado",
-  "thundurusIncarnate": "Incarnate",
+  "thundurusIncarnate": "Materializado",
-  "landorusIncarnate": "Incarnate",
+  "landorusIncarnate": "Materializado",
-  "keldeoOrdinary": "Ordinary",
+  "keldeoOrdinary": "Comum",
-  "meloettaAria": "Aria",
+  "meloettaAria": "Ária",
   // 6G
   "froakieBattleBond": "Vínculo de Batalha",
   "scatterbugMeadow": "Prado",
@@ -165,11 +165,11 @@ export const pokemonForm: SimpleTranslationEntries = {
   "eiscueNoIce": "Descongelado",
   "indeedeeMale": "Macho",
   "indeedeeFemale": "Fêmea",
-  "morpekoFullBelly": "Full Belly",
+  "morpekoFullBelly": "Saciado",
-  "zacianHeroOfManyBattles": "Hero Of Many Battles",
+  "zacianHeroOfManyBattles": "Herói Veterano",
-  "zamazentaHeroOfManyBattles": "Hero Of Many Battles",
+  "zamazentaHeroOfManyBattles": "Herói Veterano",
   "zarudeDada": "Papa",
-  "enamorusIncarnate": "Incarnate",
+  "enamorusIncarnate": "Materializado",
   // 9G
   "squawkabillyGreenPlumage": "Plumas Verdes",
   "squawkabillyBluePlumage": "Plumas Azuis",

src/locales/zh_CN/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "₽{{formattedMoney}}"
+} as const;

src/locales/zh_CN/config.ts

@@ -4,6 +4,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const zhCnConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/locales/zh_TW/battle-scene.ts

@@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const battleScene: SimpleTranslationEntries = {
+  "moneyOwned": "₽{{formattedMoney}}"
+} as const;

src/locales/zh_TW/config.ts

@@ -4,6 +4,7 @@ import { arenaFlyout } from "./arena-flyout";
 import { arenaTag } from "./arena-tag";
 import { PGFachv, PGMachv } from "./achv";
 import { battle } from "./battle";
+import { battleScene } from "./battle-scene";
 import { battleInfo } from "./battle-info";
 import { battleMessageUiHandler } from "./battle-message-ui-handler";
 import { battlerTags } from "./battler-tags";
@@ -60,6 +61,7 @@ export const zhTwConfig = {
   arenaFlyout: arenaFlyout,
   arenaTag: arenaTag,
   battle: battle,
+  battleScene: battleScene,
   battleInfo: battleInfo,
   battleMessageUiHandler: battleMessageUiHandler,
   battlePokemonForm: battlePokemonForm,

src/modifier/modifier.ts

@@ -1160,7 +1160,7 @@ export class TurnHealModifier extends PokemonHeldItemModifier {
     if (!pokemon.isFullHp()) {
       const scene = pokemon.scene;
       scene.unshiftPhase(new PokemonHealPhase(scene, pokemon.getBattlerIndex(),
-        Math.max(Math.floor(pokemon.getMaxHp() / 16) * this.stackCount, 1), i18next.t("modifier:turnHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true));
+        Utils.toDmgValue(pokemon.getMaxHp() / 16) * this.stackCount, i18next.t("modifier:turnHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true));
       return true;
     }
 
@@ -1251,7 +1251,7 @@ export class HitHealModifier extends PokemonHeldItemModifier {
     if (pokemon.turnData.damageDealt && !pokemon.isFullHp()) {
       const scene = pokemon.scene;
       scene.unshiftPhase(new PokemonHealPhase(scene, pokemon.getBattlerIndex(),
-        Math.max(Math.floor(pokemon.turnData.damageDealt / 8) * this.stackCount, 1), i18next.t("modifier:hitHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true));
+        Utils.toDmgValue(pokemon.turnData.damageDealt / 8) * this.stackCount, i18next.t("modifier:hitHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true));
     }
 
     return true;
@@ -1386,7 +1386,7 @@ export class PokemonInstantReviveModifier extends PokemonHeldItemModifier {
     const pokemon = args[0] as Pokemon;
 
     pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(),
-      Math.max(Math.floor(pokemon.getMaxHp() / 2), 1), i18next.t("modifier:pokemonInstantReviveApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), false, false, true));
+      Utils.toDmgValue(pokemon.getMaxHp() / 2), i18next.t("modifier:pokemonInstantReviveApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), false, false, true));
 
     pokemon.resetStatus(true, false, true);
     return true;

src/phases/attempt-run-phase.ts

@@ -23,7 +23,7 @@ export class AttemptRunPhase extends PokemonPhase {
     const enemySpeed = enemyField.reduce((total: integer, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD), 0) / enemyField.length;
 
     const escapeChance = new Utils.IntegerHolder((((playerPokemon.getStat(Stat.SPD) * 128) / enemySpeed) + (30 * this.scene.currentBattle.escapeAttempts++)) % 256);
-    applyAbAttrs(RunSuccessAbAttr, playerPokemon, null, escapeChance);
+    applyAbAttrs(RunSuccessAbAttr, playerPokemon, null, false, escapeChance);
 
     if (playerPokemon.randSeedInt(256) < escapeChance.value) {
       this.scene.playSound("flee");

src/phases/command-phase.ts

@@ -189,7 +189,7 @@ export class CommandPhase extends FieldPhase {
         const batonPass = isSwitch && args[0] as boolean;
         const trappedAbMessages: string[] = [];
         if (!batonPass) {
-          enemyField.forEach(enemyPokemon => applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trapped, playerPokemon, true, trappedAbMessages));
+          enemyField.forEach(enemyPokemon => applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trapped, playerPokemon, trappedAbMessages, true));
         }
         if (batonPass || (!trapTag && !trapped.value)) {
           this.scene.currentBattle.turnCommands[this.fieldIndex] = isSwitch

src/phases/encounter-phase.ts

@@ -67,7 +67,7 @@ export class EncounterPhase extends BattlePhase {
             battle.enemyParty[e].ivs = new Array(6).fill(31);
           }
           this.scene.getParty().slice(0, !battle.double ? 1 : 2).reverse().forEach(playerPokemon => {
-            applyAbAttrs(SyncEncounterNatureAbAttr, playerPokemon, null, battle.enemyParty[e]);
+            applyAbAttrs(SyncEncounterNatureAbAttr, playerPokemon, null, false, battle.enemyParty[e]);
           });
         }
       }

src/phases/enemy-command-phase.ts

@@ -47,7 +47,7 @@ export class EnemyCommandPhase extends FieldPhase {
 
       const trapTag = enemyPokemon.findTag(t => t instanceof TrappedTag) as TrappedTag;
       const trapped = new Utils.BooleanHolder(false);
-      opponents.forEach(playerPokemon => applyCheckTrappedAbAttrs(CheckTrappedAbAttr, playerPokemon, trapped, enemyPokemon, true, []));
+      opponents.forEach(playerPokemon => applyCheckTrappedAbAttrs(CheckTrappedAbAttr, playerPokemon, trapped, enemyPokemon, [], true));
       if (!trapTag && !trapped.value) {
         const partyMemberScores = trainer.getPartyMemberMatchupScores(enemyPokemon.trainerSlot, true);
 

src/phases/move-effect-phase.ts

@@ -74,7 +74,7 @@ export class MoveEffectPhase extends PokemonPhase {
         // Assume single target for multi hit
         applyMoveAttrs(MultiHitAttr, user, this.getTarget() ?? null, move, hitCount);
         // If Parental Bond is applicable, double the hit count
-        applyPreAttackAbAttrs(AddSecondStrikeAbAttr, user, null, move, targets.length, hitCount, new Utils.IntegerHolder(0));
+        applyPreAttackAbAttrs(AddSecondStrikeAbAttr, user, null, move, false, targets.length, hitCount, new Utils.IntegerHolder(0));
         // If Multi-Lens is applicable, multiply the hit count by 1 + the number of Multi-Lenses held by the user
         if (move instanceof AttackMove && !move.hasAttr(FixedDamageAttr)) {
           this.scene.applyModifiers(PokemonMultiHitModifier, user.isPlayer(), user, hitCount, new Utils.IntegerHolder(0));

src/phases/move-phase.ts

@@ -90,7 +90,7 @@ export class MovePhase extends BattlePhase {
       : null;
     if (moveTarget) {
       const oldTarget = moveTarget.value;
-      this.scene.getField(true).filter(p => p !== this.pokemon).forEach(p => applyAbAttrs(RedirectMoveAbAttr, p, null, this.move.moveId, moveTarget));
+      this.scene.getField(true).filter(p => p !== this.pokemon).forEach(p => applyAbAttrs(RedirectMoveAbAttr, p, null, false, this.move.moveId, moveTarget));
       this.pokemon.getOpponents().forEach(p => {
         const redirectTag = p.getTag(CenterOfAttentionTag) as CenterOfAttentionTag;
         if (redirectTag && (!redirectTag.powder || (!this.pokemon.isOfType(Type.GRASS) && !this.pokemon.hasAbility(Abilities.OVERCOAT)))) {

src/phases/post-turn-status-effect-phase.ts

@@ -34,7 +34,7 @@ export class PostTurnStatusEffectPhase extends PokemonPhase {
           break;
         case StatusEffect.BURN:
           damage.value = Math.max(pokemon.getMaxHp() >> 4, 1);
-          applyAbAttrs(ReduceBurnDamageAbAttr, pokemon, null, damage);
+          applyAbAttrs(ReduceBurnDamageAbAttr, pokemon, null, false, damage);
           break;
         }
         if (damage.value) {

src/phases/stat-change-phase.ts

@@ -68,7 +68,7 @@ export class StatChangePhase extends PokemonPhase {
     const levels = new Utils.IntegerHolder(this.levels);
 
     if (!this.ignoreAbilities) {
-      applyAbAttrs(StatChangeMultiplierAbAttr, pokemon, null, levels);
+      applyAbAttrs(StatChangeMultiplierAbAttr, pokemon, null, false, levels);
     }
 
     const battleStats = this.getPokemon().summonData.battleStats;
@@ -90,7 +90,7 @@ export class StatChangePhase extends PokemonPhase {
 
       if (levels.value > 0 && this.canBeCopied) {
         for (const opponent of pokemon.getOpponents()) {
-          applyAbAttrs(StatChangeCopyAbAttr, opponent, null, this.stats, levels.value);
+          applyAbAttrs(StatChangeCopyAbAttr, opponent, null, false, this.stats, levels.value);
         }
       }
 

src/phases/turn-start-phase.ts

@@ -34,8 +34,8 @@ export class TurnStartPhase extends FieldPhase {
     this.scene.getField(true).filter(p => p.summonData).map(p => {
       const bypassSpeed = new Utils.BooleanHolder(false);
       const canCheckHeldItems = new Utils.BooleanHolder(true);
-      applyAbAttrs(BypassSpeedChanceAbAttr, p, null, bypassSpeed);
+      applyAbAttrs(BypassSpeedChanceAbAttr, p, null, false, bypassSpeed);
-      applyAbAttrs(PreventBypassSpeedChanceAbAttr, p, null, bypassSpeed, canCheckHeldItems);
+      applyAbAttrs(PreventBypassSpeedChanceAbAttr, p, null, false, bypassSpeed, canCheckHeldItems);
       if (canCheckHeldItems.value) {
         this.scene.applyModifiers(BypassSpeedChanceModifier, p.isPlayer(), p, bypassSpeed);
       }
@@ -64,8 +64,8 @@ export class TurnStartPhase extends FieldPhase {
         applyMoveAttrs(IncrementMovePriorityAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === a)!, null, aMove, aPriority); //TODO: is the bang correct here?
         applyMoveAttrs(IncrementMovePriorityAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === b)!, null, bMove, bPriority); //TODO: is the bang correct here?
 
-        applyAbAttrs(ChangeMovePriorityAbAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === a)!, null, aMove, aPriority); //TODO: is the bang correct here?
+        applyAbAttrs(ChangeMovePriorityAbAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === a)!, null, false, aMove, aPriority); //TODO: is the bang correct here?
-        applyAbAttrs(ChangeMovePriorityAbAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === b)!, null, bMove, bPriority); //TODO: is the bang correct here?
+        applyAbAttrs(ChangeMovePriorityAbAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === b)!, null, false, bMove, bPriority); //TODO: is the bang correct here?
 
         if (aPriority.value !== bPriority.value) {
           const bracketDifference = Math.ceil(aPriority.value) - Math.ceil(bPriority.value);

src/plugins/i18n.ts

@@ -26,6 +26,7 @@ const unicodeRanges = {
   kana: "U+3040-30FF",
   CJKCommon: "U+2E80-2EFF,U+3000-303F,U+31C0-31EF,U+3200-32FF,U+3400-4DBF,U+F900-FAFF,U+FE30-FE4F",
   CJKIdeograph: "U+4E00-9FFF",
+  specialCharacters: "U+266A,U+2605,U+2665,U+2663" //♪.★,♥,♣
 };
 const rangesByLanguage = {
   korean: [unicodeRanges.CJKCommon, unicodeRanges.hangul].join(","),
@@ -34,6 +35,15 @@ const rangesByLanguage = {
 };
 
 const fonts: Array<LoadingFontFaceProperty> = [
+  // unicode (special character from PokePT)
+  {
+    face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: unicodeRanges.specialCharacters }),
+  },
+  {
+    face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: unicodeRanges.specialCharacters }),
+    extraOptions: { sizeAdjust: "133%" },
+  },
+  // unicode (korean)
   {
     face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: rangesByLanguage.korean }),
   },

src/test/abilities/disguise.test.ts

@@ -6,6 +6,7 @@ import { Species } from "#enums/species";
 import { StatusEffect } from "#app/data/status-effect.js";
 import { BattleStat } from "#app/data/battle-stat.js";
 import { SPLASH_ONLY } from "../utils/testUtils";
+import { toDmgValue } from "#app/utils";
 import { Mode } from "#app/ui/ui.js";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase.js";
 import { MoveEndPhase } from "#app/phases/move-end-phase.js";
@@ -47,7 +48,7 @@ describe("Abilities - Disguise", () => {
 
     const mimikyu = game.scene.getEnemyPokemon()!;
     const maxHp = mimikyu.getMaxHp();
-    const disguiseDamage = Math.floor(maxHp / 8);
+    const disguiseDamage = toDmgValue(maxHp / 8);
 
     expect(mimikyu.formIndex).toBe(disguisedForm);
 
@@ -80,7 +81,7 @@ describe("Abilities - Disguise", () => {
 
     const mimikyu = game.scene.getEnemyPokemon()!;
     const maxHp = mimikyu.getMaxHp();
-    const disguiseDamage = Math.floor(maxHp / 8);
+    const disguiseDamage = toDmgValue(maxHp / 8);
 
     expect(mimikyu.formIndex).toBe(disguisedForm);
 
@@ -121,7 +122,7 @@ describe("Abilities - Disguise", () => {
 
     const mimikyu = game.scene.getPlayerPokemon()!;
     const maxHp = mimikyu.getMaxHp();
-    const disguiseDamage = Math.floor(maxHp / 8);
+    const disguiseDamage = toDmgValue(maxHp / 8);
 
     game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
 

src/test/abilities/heatproof.test.ts

@@ -8,6 +8,7 @@ import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { SPLASH_ONLY } from "#test/utils/testUtils";
 import { StatusEffect } from "#app/enums/status-effect.js";
+import { toDmgValue } from "#app/utils";
 
 describe("Abilities - Heatproof", () => {
   let phaserGame: Phaser.Game;
@@ -72,6 +73,6 @@ describe("Abilities - Heatproof", () => {
     await game.toNextTurn();
 
     // Normal burn damage is /16
-    expect(enemy.hp).toBe(enemy.getMaxHp() - Math.floor(enemy.getMaxHp() / 32));
+    expect(enemy.hp).toBe(enemy.getMaxHp() - toDmgValue(enemy.getMaxHp() / 32));
   });
 });

src/test/abilities/parental_bond.test.ts

@@ -16,6 +16,7 @@ import { DamagePhase } from "#app/phases/damage-phase.js";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase.js";
 import { MoveEndPhase } from "#app/phases/move-end-phase.js";
 import { TurnEndPhase } from "#app/phases/turn-end-phase.js";
+import { toDmgValue } from "#app/utils";
 
 const TIMEOUT = 20 * 1000;
 
@@ -73,7 +74,7 @@ describe("Abilities - Parental Bond", () => {
       const secondStrikeDamage = enemyStartingHp - enemyPokemon.hp;
 
       expect(leadPokemon.turnData.hitCount).toBe(2);
-      expect(secondStrikeDamage).toBe(Math.ceil(0.25 * firstStrikeDamage));
+      expect(secondStrikeDamage).toBe(toDmgValue(0.25 * firstStrikeDamage));
     }, TIMEOUT
   );
 
@@ -303,7 +304,7 @@ describe("Abilities - Parental Bond", () => {
       // This test will time out if the user faints
       await game.phaseInterceptor.to(BerryPhase, false);
 
-      expect(leadPokemon.hp).toBe(Math.floor(leadPokemon.getMaxHp()/2));
+      expect(leadPokemon.hp).toBe(toDmgValue(leadPokemon.getMaxHp()/2));
     }, TIMEOUT
   );
 

src/test/abilities/sand_veil.test.ts

@@ -52,7 +52,7 @@ describe("Abilities - Sand Veil", () => {
 
       const sandVeilAttr = allAbilities[Abilities.SAND_VEIL].getAttrs(BattleStatMultiplierAbAttr)[0];
       vi.spyOn(sandVeilAttr, "applyBattleStat").mockImplementation(
-        (pokemon, passive, battleStat, statValue, args) => {
+        (pokemon, passive, simulated, battleStat, statValue, args) => {
           if (battleStat === BattleStat.EVA && game.scene.arena.weather?.weatherType === WeatherType.SANDSTORM) {
             statValue.value *= -1; // will make all attacks miss
             return true;

src/test/abilities/serene_grace.test.ts

@@ -67,7 +67,7 @@ describe("Abilities - Serene Grace", () => {
 
     const chance = new Utils.IntegerHolder(move.chance);
     console.log(move.chance + " Their ability is " + phase.getUserPokemon()!.getAbility().name);
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, chance, move, phase.getTarget(), false);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
     expect(chance.value).toBe(30);
 
   }, 20000);
@@ -99,7 +99,7 @@ describe("Abilities - Serene Grace", () => {
     expect(move.id).toBe(Moves.AIR_SLASH);
 
     const chance = new Utils.IntegerHolder(move.chance);
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, chance, move, phase.getTarget(), false);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
     expect(chance.value).toBe(60);
 
   }, 20000);

src/test/abilities/sheer_force.test.ts

@@ -69,8 +69,8 @@ describe("Abilities - Sheer Force", () => {
     const power = new Utils.IntegerHolder(move.power);
     const chance = new Utils.IntegerHolder(move.chance);
 
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, chance, move, phase.getTarget(), false);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
-    applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, power);
+    applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, false, power);
 
     expect(chance.value).toBe(0);
     expect(power.value).toBe(move.power * 5461/4096);
@@ -108,8 +108,8 @@ describe("Abilities - Sheer Force", () => {
     const power = new Utils.IntegerHolder(move.power);
     const chance = new Utils.IntegerHolder(move.chance);
 
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, chance, move, phase.getTarget(), false);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
-    applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, power);
+    applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, false, power);
 
     expect(chance.value).toBe(-1);
     expect(power.value).toBe(move.power);
@@ -147,8 +147,8 @@ describe("Abilities - Sheer Force", () => {
     const power = new Utils.IntegerHolder(move.power);
     const chance = new Utils.IntegerHolder(move.chance);
 
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, chance, move, phase.getTarget(), false);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
-    applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, power);
+    applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, false, power);
 
     expect(chance.value).toBe(-1);
     expect(power.value).toBe(move.power);
@@ -191,8 +191,8 @@ describe("Abilities - Sheer Force", () => {
     const target = phase.getTarget()!;
     const opponentType = target.getTypes()[0];
 
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, user, null, chance, move, target, false);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, user, null, false, chance, move, target, false);
-    applyPreAttackAbAttrs(MovePowerBoostAbAttr, user, target, move, power);
+    applyPreAttackAbAttrs(MovePowerBoostAbAttr, user, target, move, false, power);
     applyPostDefendAbAttrs(PostDefendTypeChangeAbAttr, target, user, move, target.apply(user, move));
 
     expect(chance.value).toBe(0);

src/test/abilities/shield_dust.test.ts

@@ -67,8 +67,8 @@ describe("Abilities - Shield Dust", () => {
     expect(move.id).toBe(Moves.AIR_SLASH);
 
     const chance = new Utils.IntegerHolder(move.chance);
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, chance, move, phase.getTarget(), false);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
-    applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, phase.getTarget()!, phase.getUserPokemon()!, null!, null!, chance);
+    applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, phase.getTarget()!, phase.getUserPokemon()!, null, null, false, chance);
     expect(chance.value).toBe(0);
 
   }, 20000);

src/test/arena/arena_gravity.test.ts

@@ -1,14 +1,15 @@
-import { allMoves } from "#app/data/move.js";
+import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities.js";
+import { Abilities } from "#app/enums/abilities";
-import { ArenaTagType } from "#app/enums/arena-tag-type.js";
+import { ArenaTagType } from "#app/enums/arena-tag-type";
-import GameManager from "#test/utils/gameManager";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { getMovePosition } from "#test/utils/gameManagerUtils";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
+import GameManager from "#test/utils/gameManager";
+import { getMovePosition } from "#test/utils/gameManagerUtils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase.js";
+import { SPLASH_ONLY } from "../utils/testUtils";
-import { TurnEndPhase } from "#app/phases/turn-end-phase.js";
 
 describe("Arena - Gravity", () => {
   let phaserGame: Phaser.Game;
@@ -26,14 +27,17 @@ describe("Arena - Gravity", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override
-    game.override.moveset([Moves.TACKLE, Moves.GRAVITY, Moves.FISSURE]);
+      .battleType("single")
-    game.override.ability(Abilities.UNNERVE);
+      .moveset([Moves.TACKLE, Moves.GRAVITY, Moves.FISSURE])
-    game.override.enemyAbility(Abilities.BALL_FETCH);
+      .ability(Abilities.UNNERVE)
-    game.override.enemySpecies(Species.SHUCKLE);
+      .enemyAbility(Abilities.BALL_FETCH)
-    game.override.enemyMoveset(new Array(4).fill(Moves.SPLASH));
+      .enemySpecies(Species.SHUCKLE)
+      .enemyMoveset(SPLASH_ONLY);
   });
 
+  // Reference: https://bulbapedia.bulbagarden.net/wiki/Gravity_(move)
+
   it("non-OHKO move accuracy is multiplied by 1.67", async () => {
     const moveToCheck = allMoves[Moves.TACKLE];
 
@@ -77,4 +81,65 @@ describe("Arena - Gravity", () => {
 
     expect(moveToCheck.calculateBattleAccuracy).toHaveReturnedWith(30);
   });
+
+  describe("Against flying types", () => {
+    it("can be hit by ground-type moves now", async () => {
+      game.override
+        .startingLevel(5)
+        .enemyLevel(5)
+        .enemySpecies(Species.PIDGEOT)
+        .moveset([Moves.GRAVITY, Moves.EARTHQUAKE]);
+
+      await game.startBattle([Species.PIKACHU]);
+
+      const pidgeot = game.scene.getEnemyPokemon()!;
+      vi.spyOn(pidgeot, "getAttackTypeEffectiveness");
+
+      // Try earthquake on 1st turn (fails!);
+      game.doAttack(getMovePosition(game.scene, 0, Moves.EARTHQUAKE));
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      expect(pidgeot.getAttackTypeEffectiveness).toHaveReturnedWith(0);
+
+      // Setup Gravity on 2nd turn
+      await game.toNextTurn();
+      game.doAttack(getMovePosition(game.scene, 0, Moves.GRAVITY));
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      expect(game.scene.arena.getTag(ArenaTagType.GRAVITY)).toBeDefined();
+
+      // Use ground move on 3rd turn
+      await game.toNextTurn();
+      game.doAttack(getMovePosition(game.scene, 0, Moves.EARTHQUAKE));
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      expect(pidgeot.getAttackTypeEffectiveness).toHaveReturnedWith(1);
+    });
+
+    it("keeps super-effective moves super-effective after using gravity", async () => {
+      game.override
+        .startingLevel(5)
+        .enemyLevel(5)
+        .enemySpecies(Species.PIDGEOT)
+        .moveset([Moves.GRAVITY, Moves.THUNDERBOLT]);
+
+      await game.startBattle([Species.PIKACHU]);
+
+      const pidgeot = game.scene.getEnemyPokemon()!;
+      vi.spyOn(pidgeot, "getAttackTypeEffectiveness");
+
+      // Setup Gravity on 1st turn
+      game.doAttack(getMovePosition(game.scene, 0, Moves.GRAVITY));
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      expect(game.scene.arena.getTag(ArenaTagType.GRAVITY)).toBeDefined();
+
+      // Use electric move on 2nd turn
+      await game.toNextTurn();
+      game.doAttack(getMovePosition(game.scene, 0, Moves.THUNDERBOLT));
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      expect(pidgeot.getAttackTypeEffectiveness).toHaveReturnedWith(2);
+    });
+  });
 });

src/test/battle/damage_calculation.test.ts

@@ -0,0 +1,71 @@
+import { DamagePhase } from "#app/phases/damage-phase.js";
+import GameManager from "#test/utils/gameManager";
+import { getMovePosition } from "#test/utils/gameManagerUtils";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { SPLASH_ONLY } from "#test/utils/testUtils";
+import { toDmgValue } from "#app/utils";
+
+describe("Round Down and Minimun 1 test in Damage Calculation", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleType("single");
+    game.override.startingLevel(10);
+  });
+
+  it("When the user fails to use Jump Kick with Wonder Guard ability, the damage should be 1.", async () => {
+    game.override.enemySpecies(Species.GASTLY);
+    game.override.enemyMoveset(SPLASH_ONLY);
+    game.override.starterSpecies(Species.SHEDINJA);
+    game.override.moveset([Moves.JUMP_KICK]);
+    game.override.ability(Abilities.WONDER_GUARD);
+
+    await game.startBattle();
+
+    const shedinja = game.scene.getPlayerPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.JUMP_KICK));
+
+    await game.phaseInterceptor.to(DamagePhase);
+
+    expect(shedinja.hp).toBe(shedinja.getMaxHp() - 1);
+  });
+
+
+  it("Charizard with odd HP survives Stealth Rock damage twice", async () => {
+    game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0);
+    game.override.seed("Charizard Stealth Rock test");
+    game.override.enemySpecies(Species.CHARIZARD);
+    game.override.enemyAbility(Abilities.BLAZE);
+    game.override.starterSpecies(Species.PIKACHU);
+    game.override.enemyLevel(100);
+
+    await game.startBattle();
+
+    const charizard = game.scene.getEnemyPokemon()!;
+
+    const maxHp = charizard.getMaxHp();
+    const damage_prediction = toDmgValue(charizard.getMaxHp() / 2);
+    const currentHp = charizard.hp;
+    const expectedHP = maxHp - damage_prediction;
+
+    expect(currentHp).toBe(expectedHP);
+  });
+});

src/test/moves/belly_drum.test.ts

@@ -6,6 +6,7 @@ import { getMovePosition } from "#test/utils/gameManagerUtils";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { BattleStat } from "#app/data/battle-stat";
+import { toDmgValue } from "#app/utils";
 
 const TIMEOUT = 20 * 1000;
 // RATIO : HP Cost of Move
@@ -44,7 +45,7 @@ describe("Moves - BELLY DRUM", () => {
       await game.startBattle([Species.MAGIKARP]);
 
       const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
 
       game.doAttack(getMovePosition(game.scene, 0, Moves.BELLY_DRUM));
       await game.phaseInterceptor.to(TurnEndPhase);
@@ -59,7 +60,7 @@ describe("Moves - BELLY DRUM", () => {
       await game.startBattle([Species.MAGIKARP]);
 
       const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
 
       // Here - BattleStat.ATK -> -3 and BattleStat.SPATK -> 6
       leadPokemon.summonData.battleStats[BattleStat.ATK] = -3;
@@ -95,7 +96,7 @@ describe("Moves - BELLY DRUM", () => {
       await game.startBattle([Species.MAGIKARP]);
 
       const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
       leadPokemon.hp = hpLost - PREDAMAGE;
 
       game.doAttack(getMovePosition(game.scene, 0, Moves.BELLY_DRUM));

src/test/moves/clangorous_soul.test.ts

@@ -7,6 +7,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { BattleStat } from "#app/data/battle-stat";
 import { SPLASH_ONLY } from "#test/utils/testUtils";
+import { toDmgValue } from "#app/utils";
 
 const TIMEOUT = 20 * 1000;
 /** HP Cost of Move */
@@ -45,7 +46,7 @@ describe("Moves - CLANGOROUS_SOUL", () => {
   	 	await game.startBattle([Species.MAGIKARP]);
 
      	const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
 
       game.doAttack(getMovePosition(game.scene, 0, Moves.CLANGOROUS_SOUL));
       await game.phaseInterceptor.to(TurnEndPhase);
@@ -64,7 +65,7 @@ describe("Moves - CLANGOROUS_SOUL", () => {
       await game.startBattle([Species.MAGIKARP]);
 
       const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
 
       //Here - BattleStat.SPD -> 0 and BattleStat.SPDEF -> 4
       leadPokemon.summonData.battleStats[BattleStat.ATK] = 6;
@@ -113,7 +114,7 @@ describe("Moves - CLANGOROUS_SOUL", () => {
       await game.startBattle([Species.MAGIKARP]);
 
       const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
       leadPokemon.hp = hpLost - PREDAMAGE;
 
       game.doAttack(getMovePosition(game.scene, 0, Moves.CLANGOROUS_SOUL));

src/test/moves/fillet_away.test.ts

@@ -7,6 +7,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { BattleStat } from "#app/data/battle-stat";
 import { SPLASH_ONLY } from "#test/utils/testUtils";
+import { toDmgValue } from "#app/utils";
 
 const TIMEOUT = 20 * 1000;
 /** HP Cost of Move */
@@ -45,7 +46,7 @@ describe("Moves - FILLET AWAY", () => {
       await game.startBattle([Species.MAGIKARP]);
 
       const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
 
       game.doAttack(getMovePosition(game.scene, 0, Moves.FILLET_AWAY));
       await game.phaseInterceptor.to(TurnEndPhase);
@@ -62,7 +63,7 @@ describe("Moves - FILLET AWAY", () => {
       await game.startBattle([Species.MAGIKARP]);
 
       const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
 
       //Here - BattleStat.SPD -> 0 and BattleStat.SPATK -> 3
       leadPokemon.summonData.battleStats[BattleStat.ATK] = 6;
@@ -103,7 +104,7 @@ describe("Moves - FILLET AWAY", () => {
       await game.startBattle([Species.MAGIKARP]);
 
       const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
       leadPokemon.hp = hpLost - PREDAMAGE;
 
       game.doAttack(getMovePosition(game.scene, 0, Moves.FILLET_AWAY));

src/test/moves/jaw_lock.test.ts

@@ -0,0 +1,172 @@
+import { Abilities } from "#app/enums/abilities";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import GameManager from "#app/test/utils/gameManager";
+import { getMovePosition } from "#app/test/utils/gameManagerUtils";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { SPLASH_ONLY } from "#app/test/utils/testUtils";
+import { BattlerIndex } from "#app/battle";
+import { FaintPhase } from "#app/phases/faint-phase";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { BerryPhase } from "#app/phases/berry-phase";
+
+const TIMEOUT = 20 * 1000;
+
+describe("Moves - Jaw Lock", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleType("single")
+      .enemySpecies(Species.SNORLAX)
+      .enemyAbility(Abilities.INSOMNIA)
+      .enemyMoveset(SPLASH_ONLY)
+      .moveset([Moves.JAW_LOCK, Moves.SPLASH])
+      .startingLevel(100)
+      .enemyLevel(100)
+      .disableCrits();
+  });
+
+  it(
+    "should trap the move's user and target",
+    async () => {
+      await game.startBattle([ Species.BULBASAUR ]);
+
+      const leadPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.JAW_LOCK));
+
+      await game.phaseInterceptor.to(MoveEffectPhase, false);
+
+      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+    }, TIMEOUT
+  );
+
+  it(
+    "should not trap either pokemon if the target faints",
+    async () => {
+      game.override.enemyLevel(1);
+      await game.startBattle([ Species.BULBASAUR ]);
+
+      const leadPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.JAW_LOCK));
+
+      await game.phaseInterceptor.to(MoveEffectPhase, false);
+
+      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+
+      await game.phaseInterceptor.to(MoveEffectPhase);
+
+      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+
+      await game.phaseInterceptor.to(FaintPhase);
+
+      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    }, TIMEOUT
+  );
+
+  it(
+    "should only trap the user until the target faints",
+    async () => {
+      await game.startBattle([ Species.BULBASAUR ]);
+
+      const leadPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.JAW_LOCK));
+
+      await game.phaseInterceptor.to(MoveEffectPhase);
+
+      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      await game.doKillOpponents();
+
+      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    }, TIMEOUT
+  );
+
+  it(
+    "should not trap other targets after the first target is trapped",
+    async () => {
+      game.override.battleType("double");
+
+      await game.startBattle([ Species.CHARMANDER, Species.BULBASAUR ]);
+
+      const playerPokemon = game.scene.getPlayerField();
+      const enemyPokemon = game.scene.getEnemyField();
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.JAW_LOCK));
+      game.doSelectTarget(BattlerIndex.ENEMY);
+
+      game.doAttack(getMovePosition(game.scene, 1, Moves.SPLASH));
+
+      await game.phaseInterceptor.to(MoveEffectPhase);
+
+      expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
+      expect(enemyPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
+
+      await game.toNextTurn();
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.JAW_LOCK));
+      game.doSelectTarget(BattlerIndex.ENEMY_2);
+
+      game.doAttack(getMovePosition(game.scene, 1, Moves.SPLASH));
+
+      await game.phaseInterceptor.to(MoveEffectPhase);
+
+      expect(enemyPokemon[1].getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+      expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
+      expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)?.sourceId).toBe(enemyPokemon[0].id);
+    }, TIMEOUT
+  );
+
+  it(
+    "should not trap either pokemon if the target is protected",
+    async () => {
+      game.override.enemyMoveset(Array(4).fill(Moves.PROTECT));
+
+      await game.startBattle([ Species.BULBASAUR ]);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.JAW_LOCK));
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+
+      expect(playerPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    }, TIMEOUT
+  );
+});

src/test/moves/rollout.test.ts

@@ -1,13 +1,13 @@
 import { allMoves } from "#app/data/move.js";
 import { CommandPhase } from "#app/phases/command-phase.js";
-import GameManager from "#test/utils/gameManager";
-import { getMovePosition } from "#test/utils/gameManagerUtils";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
+import GameManager from "#test/utils/gameManager";
+import { getMovePosition } from "#test/utils/gameManagerUtils";
+import { SPLASH_ONLY } from "#test/utils/testUtils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { SPLASH_ONLY } from "#test/utils/testUtils";
 
 describe("Moves - Rollout", () => {
   let phaserGame: Phaser.Game;
@@ -29,9 +29,9 @@ describe("Moves - Rollout", () => {
     game.override.disableCrits();
     game.override.battleType("single");
     game.override.starterSpecies(Species.RATTATA);
-    game.override.ability(Abilities.NONE);
+    game.override.ability(Abilities.BALL_FETCH);
     game.override.enemySpecies(Species.BIDOOF);
-    game.override.enemyAbility(Abilities.NONE);
+    game.override.enemyAbility(Abilities.BALL_FETCH);
     game.override.startingLevel(100);
     game.override.enemyLevel(100);
     game.override.enemyMoveset(SPLASH_ONLY);

src/test/moves/tackle.test.ts

@@ -78,6 +78,6 @@ describe("Moves - Tackle", () => {
     await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(TurnEndPhase);
     const hpLost = hpOpponent - game.scene.currentBattle.enemyParty[0].hp;
     expect(hpLost).toBeGreaterThan(0);
-    expect(hpLost).toBe(4);
+    expect(hpLost).toBeLessThan(4);
   }, 20000);
 });

src/test/moves/tera_blast.test.ts

@@ -0,0 +1,106 @@
+import { allMoves } from "#app/data/move";
+import GameManager from "#test/utils/gameManager";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { Abilities } from "#app/enums/abilities";
+import { SPLASH_ONLY } from "../utils/testUtils";
+import { Type } from "#app/data/type";
+import { getMovePosition } from "../utils/gameManagerUtils";
+import { BattleStat } from "#app/data/battle-stat";
+import { Stat } from "#app/enums/stat";
+import { BattlerIndex } from "#app/battle";
+import { HitResult } from "#app/field/pokemon";
+
+describe("Moves - Tera Blast", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  const moveToCheck = allMoves[Moves.TERA_BLAST];
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleType("single")
+      .disableCrits()
+      .starterSpecies(Species.FEEBAS)
+      .moveset([Moves.TERA_BLAST])
+      .ability(Abilities.BALL_FETCH)
+      .startingHeldItems([{name: "TERA_SHARD", type: Type.FIRE}])
+      .enemySpecies(Species.MAGIKARP)
+      .enemyMoveset(SPLASH_ONLY)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyLevel(20);
+
+    vi.spyOn(moveToCheck, "calculateBattlePower");
+  });
+
+  it("changes type to match user's tera type", async() => {
+    game.override
+      .enemySpecies(Species.FURRET)
+      .startingHeldItems([{name: "TERA_SHARD", type: Type.FIGHTING}]);
+    await game.startBattle();
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "apply");
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.TERA_BLAST));
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.SUPER_EFFECTIVE);
+  }, 20000);
+
+  it("increases power if user is Stellar tera type", async() => {
+    game.override.startingHeldItems([{name: "TERA_SHARD", type: Type.STELLAR}]);
+    const stellarTypeMultiplier = 2;
+    const stellarTypeDmgBonus = 20;
+    const basePower = moveToCheck.power;
+
+    await game.startBattle();
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.TERA_BLAST));
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(moveToCheck.calculateBattlePower).toHaveReturnedWith((basePower + stellarTypeDmgBonus) * stellarTypeMultiplier);
+  }, 20000);
+
+  // Currently abilities are bugged and can't see when a move's category is changed
+  it.skip("uses the higher stat of the user's Atk and SpAtk for damage calculation", async() => {
+    game.override.enemyAbility(Abilities.TOXIC_DEBRIS);
+    await game.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.stats[Stat.ATK] = 100;
+    playerPokemon.stats[Stat.SPATK] = 1;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.TERA_BLAST));
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(game.scene.getEnemyPokemon()!.battleData.abilityRevealed).toBe(true);
+  }, 20000);
+
+  it("causes stat drops if user is Stellar tera type", async() => {
+    game.override.startingHeldItems([{name: "TERA_SHARD", type: Type.STELLAR}]);
+    await game.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.TERA_BLAST));
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(playerPokemon.summonData.battleStats[BattleStat.SPATK]).toBe(-1);
+    expect(playerPokemon.summonData.battleStats[BattleStat.ATK]).toBe(-1);
+  }, 20000);
+});

src/ui/target-select-ui-handler.ts

@@ -118,7 +118,7 @@ export default class TargetSelectUiHandler extends UiHandler {
 
     this.targetFlashTween = this.scene.tweens.add({
       targets: this.targetsHighlighted,
-      key: { start: 0.55, to: 1 },
+      key: { start: 1, to: 0.25 },
       loop: -1,
       loopDelay: 150,
       duration: Utils.fixedInt(450),

src/utils.ts

@@ -560,3 +560,17 @@ export function capitalizeString(str: string, sep: string, lowerFirstChar: boole
 export function isNullOrUndefined(object: any): boolean {
   return null === object || undefined === object;
 }
+
+/**
+ * This function is used in the context of a Pokémon battle game to calculate the actual integer damage value from a float result.
+ * Many damage calculation formulas involve various parameters and result in float values.
+ * The actual damage applied to a Pokémon's HP must be an integer.
+ * This function helps in ensuring that by flooring the float value and enforcing a minimum damage value.
+ *
+ * @param value - The float value to convert.
+ * @param minValue - The minimum integer value to return. Defaults to 1.
+ * @returns The converted value as an integer.
+ */
+export function toDmgValue(value: number, minValue: number = 1) {
+  return Math.max(Math.floor(value), minValue);
+}