fixing merge conflicts

2024-05-15 11:45:52 -04:00 · 2024-05-15 11:45:52 -04:00 · dcecd4fab7
parent c60ed73697 38e3022d06
commit dcecd4fab7
60 changed files with 4345 additions and 3564 deletions
--- a/README.md
+++ b/README.md
@ -44,7 +44,8 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
    - Arata Iiyoshi
    - Atsuhiro Ishizuna
  - Pokémon Black/White 2
-  - Firel (Additional biome themes)
+  - Firel (Custom Metropolis and Laboratory biome music)
+  - Lmz (Custom Jungle biome music)
  - edifette (Title screen music)

 ### 🎵 Sound Effects
--- a/index.html
+++ b/index.html
@ -2,6 +2,7 @@
 <html lang="en">

 <head>
+	<meta charset="UTF-8" />
 	<title>PokéRogue</title>
 	<meta name="description" content="A Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, and reaching Pokémon stats you never thought possible." />
 	<meta name="theme-color" content="#da3838" />
@ -12,7 +13,6 @@
 	<link rel="apple-touch-icon" href="./logo512.png" />
 	<link rel="shortcut icon" type="image/png" href="./logo512.png" />
 	<link rel="canonical" href="https://pokerogue.net" />
-	<meta charset="UTF-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
 	<style type="text/css">
 		@font-face {
--- a/public/audio/bgm/jungle.mp3
+++ b/public/audio/bgm/jungle.mp3
--- a/public/images/items.json
+++ b/public/images/items.json
--- a/public/images/items.png
+++ b/public/images/items.png
--- a/public/images/items/quick_claw.png
+++ b/public/images/items/quick_claw.png
--- a/src/account.ts
+++ b/src/account.ts
@ -7,18 +7,29 @@ export interface UserInfo {
 }

 export let loggedInUser: UserInfo = null;
+export const clientSessionId = Utils.randomString(32);

 export function updateUserInfo(): Promise<[boolean, integer]> {
  return new Promise<[boolean, integer]>(resolve => {
    if (bypassLogin) {
+      loggedInUser = { username: 'Guest', lastSessionSlot: -1 };
      let lastSessionSlot = -1;
-      for (let s = 0; s < 2; s++) {
-        if (localStorage.getItem(`sessionData${s ? s : ''}`)) {
+      for (let s = 0; s < 5; s++) {
+        if (localStorage.getItem(`sessionData${s ? s : ''}_${loggedInUser.username}`)) {
          lastSessionSlot = s;
          break;
        }
      }
-      loggedInUser = { username: 'Guest', lastSessionSlot: lastSessionSlot };
+      loggedInUser.lastSessionSlot = lastSessionSlot;
+      // Migrate old data from before the username was appended
+      [ 'data', 'sessionData', 'sessionData1', 'sessionData2', 'sessionData3', 'sessionData4' ].map(d => {
+        if (localStorage.hasOwnProperty(d)) {
+          if (localStorage.hasOwnProperty(`${d}_${loggedInUser.username}`))
+            localStorage.setItem(`${d}_${loggedInUser.username}_bak`, localStorage.getItem(`${d}_${loggedInUser.username}`));
+          localStorage.setItem(`${d}_${loggedInUser.username}`, localStorage.getItem(d));
+          localStorage.removeItem(d);
+        }
+      });
      return resolve([ true, 200 ]);
    }
    Utils.apiFetch('account/info', true).then(response => {
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@ -88,6 +88,7 @@ export default class BattleScene extends SceneBase {
 	public uiInputs: UiInputs;

 	public sessionPlayTime: integer = null;
+	public lastSavePlayTime: integer = null;
 	public masterVolume: number = 0.5;
 	public bgmVolume: number = 1;
 	public seVolume: number = 1;
@ -453,6 +454,8 @@ export default class BattleScene extends SceneBase {
 	initSession(): void {
 		if (this.sessionPlayTime === null)
 			this.sessionPlayTime = 0;
+		if (this.lastSavePlayTime === null)
+			this.lastSavePlayTime = 0;

 		if (this.playTimeTimer)
 			this.playTimeTimer.destroy();
@ -465,6 +468,8 @@ export default class BattleScene extends SceneBase {
 					this.gameData.gameStats.playTime++;
 				if (this.sessionPlayTime !== null)
 					this.sessionPlayTime++;
+				if (this.lastSavePlayTime !== null)
+					this.lastSavePlayTime++;
 			}
 		});

@ -1008,6 +1013,7 @@ export default class BattleScene extends SceneBase {
 			case Species.FLORGES:
 			case Species.FURFROU:
 			case Species.ORICORIO:
+			case Species.MAGEARNA:
 			case Species.SQUAWKABILLY:
 			case Species.TATSUGIRI:
 			case Species.PALDEA_TAUROS:
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@ -3,7 +3,7 @@ import { Type } from "./type";
 import * as Utils from "../utils";
 import { BattleStat, getBattleStatName } from "./battle-stat";
 import { PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from "../phases";
-import { getPokemonMessage } from "../messages";
+import { getPokemonMessage, getPokemonPrefix } from "../messages";
 import { Weather, WeatherType } from "./weather";
 import { BattlerTag } from "./battler-tags";
 import { BattlerTagType } from "./enums/battler-tag-type";
@ -144,7 +144,7 @@ export class BlockRecoilDamageAttr extends AbAttr {
  }

  getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) {
-    return getPokemonMessage(pokemon, `'s ${abilityName}\nprotected it from recoil!`);
+    return i18next.t('abilityTriggers:blockRecoilDamage', {pokemonName: `${getPokemonPrefix(pokemon)}${pokemon.name}`, abilityName: abilityName});
  }
 }

@ -715,7 +715,7 @@ export class PostDefendContactApplyStatusEffectAbAttr extends PostDefendAbAttr {
  applyPostDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean {
    if (move.getMove().checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !attacker.status && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance)) {
      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)];
-      return attacker.trySetStatus(effect, true);
+      return attacker.trySetStatus(effect, true, pokemon);
    }

    return false;
@ -1177,7 +1177,7 @@ export class PostAttackApplyStatusEffectAbAttr extends PostAttackAbAttr {
  applyPostAttack(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean {
    if (pokemon != attacker && (!this.contactRequired || move.getMove().checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && pokemon.randSeedInt(100) < this.chance && !pokemon.status) {
      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)];
-      return attacker.trySetStatus(effect, true);
+      return attacker.trySetStatus(effect, true, pokemon);
    }

    return false;
@ -1407,6 +1407,23 @@ export class PostSummonMessageAbAttr extends PostSummonAbAttr {
  }
 }

+export class PostSummonUnnamedMessageAbAttr extends PostSummonAbAttr { 
+  //Attr doesn't force pokemon name on the message
+  private message: string;
+
+  constructor(message: string) {
+    super(true);
+
+    this.message = message;
+  }
+
+  applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean { 
+    pokemon.scene.queueMessage(this.message);
+
+    return true;
+  }
+}
+
 export class PostSummonAddBattlerTagAbAttr extends PostSummonAbAttr {
  private tagType: BattlerTagType;
  private turnCount: integer;
@ -2631,8 +2648,8 @@ export class NoFusionAbilityAbAttr extends AbAttr {
 }

 export class IgnoreTypeImmunityAbAttr extends AbAttr {
-  defenderType: Type;
-  allowedMoveTypes: Type[];
+  private defenderType: Type;
+  private allowedMoveTypes: Type[];

  constructor(defenderType: Type, allowedMoveTypes: Type[]) {
    super(true);
@ -2649,6 +2666,30 @@ export class IgnoreTypeImmunityAbAttr extends AbAttr {
  }
 }

+/**
+ * Ignores the type immunity to Status Effects of the defender if the defender is of a certain type
+ */
+export class IgnoreTypeStatusEffectImmunityAbAttr extends AbAttr {
+  private statusEffect: StatusEffect[];
+  private defenderType: Type[];
+
+  constructor(statusEffect: StatusEffect[], defenderType: Type[]) {
+    super(true);
+
+    this.statusEffect = statusEffect;
+    this.defenderType = defenderType;
+  }
+
+  apply(pokemon: Pokemon, passive: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+    if (this.statusEffect.includes(args[0] as StatusEffect) && this.defenderType.includes(args[1] as Type)) {
+      cancelled.value = true;
+      return true;
+    }
+
+    return false;
+  }
+}
+
 function applyAbAttrsInternal<TAttr extends AbAttr>(attrType: { new(...args: any[]): TAttr },
  pokemon: Pokemon, applyFunc: AbAttrApplyFunc<TAttr>, args: any[], isAsync: boolean = false, showAbilityInstant: boolean = false, quiet: boolean = false, passive: boolean = false): Promise<void> {
  return new Promise(resolve => {
@ -3061,7 +3102,8 @@ export function initAbilities() {
      .attr(BlockCritAbAttr)
      .ignorable(),
    new Ability(Abilities.AIR_LOCK, 3)
-      .attr(SuppressWeatherEffectAbAttr, true),
+      .attr(SuppressWeatherEffectAbAttr, true)
+      .attr(PostSummonUnnamedMessageAbAttr, "The effects of the weather disappeared."),
    new Ability(Abilities.TANGLED_FEET, 4)
      .conditionalAttr(pokemon => !!pokemon.getTag(BattlerTagType.CONFUSED), BattleStatMultiplierAbAttr, BattleStat.EVA, 2)
      .ignorable(),
@ -3414,7 +3456,7 @@ export function initAbilities() {
      .attr(MovePowerBoostAbAttr, (user, target, move) => user.scene.currentBattle.turnCommands[target.getBattlerIndex()].command === Command.POKEMON, 2),
    new Ability(Abilities.WATER_BUBBLE, 7)
      .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5)
-      .attr(MoveTypePowerBoostAbAttr, Type.WATER, 1)
+      .attr(MoveTypePowerBoostAbAttr, Type.WATER, 2)
      .attr(StatusEffectImmunityAbAttr, StatusEffect.BURN)
      .ignorable(),
    new Ability(Abilities.STEELWORKER, 7)
@ -3471,8 +3513,9 @@ export function initAbilities() {
      .attr(UnsuppressableAbilityAbAttr)
      .attr(NoFusionAbilityAbAttr)
      .partial(),
-    new Ability(Abilities.CORROSION, 7)
-      .unimplemented(),
+    new Ability(Abilities.CORROSION, 7) // TODO: Test Corrosion against Magic Bounce once it is implemented
+      .attr(IgnoreTypeStatusEffectImmunityAbAttr, [StatusEffect.POISON, StatusEffect.TOXIC], [Type.STEEL, Type.POISON])
+      .partial(),
    new Ability(Abilities.COMATOSE, 7)
      .attr(UncopiableAbilityAbAttr)
      .attr(UnswappableAbilityAbAttr)
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@ -316,7 +316,7 @@ class ToxicSpikesTag extends ArenaTrapTag {
        }
      } else if (!pokemon.status) {
        const toxic = this.layers > 1;
-        if (pokemon.trySetStatus(!toxic ? StatusEffect.POISON : StatusEffect.TOXIC, true, null, `the ${this.getMoveName()}`))
+        if (pokemon.trySetStatus(!toxic ? StatusEffect.POISON : StatusEffect.TOXIC, true, null, 0, `the ${this.getMoveName()}`))
          return true;      
      }
    }
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@ -544,6 +544,33 @@ export class AquaRingTag extends BattlerTag {
  }
 }

+/** Tag used to allow moves that interact with {@link Moves.MINIMIZE} to function */
+export class MinimizeTag extends BattlerTag {
+  constructor() {
+    super(BattlerTagType.MINIMIZED, BattlerTagLapseType.TURN_END, 1, Moves.MINIMIZE, undefined);
+  }
+
+  canAdd(pokemon: Pokemon): boolean {
+    return !pokemon.isMax();
+  }
+
+  onAdd(pokemon: Pokemon): void {
+    super.onAdd(pokemon);
+  }
+
+  lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
+    //If a pokemon dynamaxes they lose minimized status
+    if(pokemon.isMax()){
+      return false
+    }
+    return lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType);
+  }
+
+  onRemove(pokemon: Pokemon): void {
+    super.onRemove(pokemon);
+  }
+}
+
 export class DrowsyTag extends BattlerTag {
  constructor() {
    super(BattlerTagType.DROWSY, BattlerTagLapseType.TURN_END, 2, Moves.YAWN);
@ -819,7 +846,7 @@ export class ContactPoisonProtectedTag extends ProtectedTag {
      const effectPhase = pokemon.scene.getCurrentPhase();
      if (effectPhase instanceof MoveEffectPhase && effectPhase.move.getMove().hasFlag(MoveFlags.MAKES_CONTACT)) {
        const attacker = effectPhase.getPokemon();
-        attacker.trySetStatus(StatusEffect.POISON, true);
+        attacker.trySetStatus(StatusEffect.POISON, true, pokemon);
      }
    }

@ -1358,6 +1385,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc
      return new TypeBoostTag(tagType, sourceMove, Type.ELECTRIC, 2, true);
    case BattlerTagType.MAGNET_RISEN:
      return new MagnetRisenTag(tagType, sourceMove);
+    case BattlerTagType.MINIMIZED:
+      return new MinimizeTag();
    case BattlerTagType.NONE:
    default:
        return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
--- a/src/data/biomes.ts
+++ b/src/data/biomes.ts
@ -48,7 +48,7 @@ export const biomeLinks: BiomeLinks = {
  [Biome.SEABED]: [ Biome.CAVE, [ Biome.VOLCANO, 4 ] ],
  [Biome.MOUNTAIN]: [ Biome.VOLCANO, [ Biome.WASTELAND, 3 ] ],
  [Biome.BADLANDS]: [ Biome.DESERT, Biome.MOUNTAIN ],
-  [Biome.CAVE]: [ Biome.BADLANDS, Biome.BEACH ],
+  [Biome.CAVE]: [ Biome.BADLANDS, Biome.LAKE ],
  [Biome.DESERT]: Biome.RUINS,
  [Biome.ICE_CAVE]: Biome.SNOWY_FOREST,
  [Biome.MEADOW]: [ Biome.PLAINS, [ Biome.FAIRY_CAVE, 2 ] ],
--- a/src/data/daily-run.ts
+++ b/src/data/daily-run.ts
@ -13,14 +13,15 @@ export interface DailyRunConfig {
 }

 export function fetchDailyRunSeed(): Promise<string> {
-  return new Promise<string>(resolve => {
+  return new Promise<string>((resolve, reject) => {
    Utils.apiFetch('daily/seed').then(response => {
      if (!response.ok) {
        resolve(null);
        return;
      }
      return response.text();
-    }).then(seed => resolve(seed));
+    }).then(seed => resolve(seed))
+    .catch(err => reject(err));
  });
 }

--- a/src/data/egg.ts
+++ b/src/data/egg.ts
@ -95,9 +95,16 @@ export function getLegendaryGachaSpeciesForTimestamp(scene: BattleScene, timesta

  let ret: Species;

+  // 86400000 is the number of miliseconds in one day
+  const timeDate = new Date(timestamp);
+  const dayDate = new Date(Date.UTC(timeDate.getUTCFullYear(), timeDate.getUTCMonth(), timeDate.getUTCDate()));
+  const dayTimestamp = timeDate.getTime(); // Timestamp of current week
+  const offset = Math.floor(Math.floor(dayTimestamp / 86400000) / legendarySpecies.length); // Cycle number
+  const index = Math.floor(dayTimestamp / 86400000) % legendarySpecies.length // Index within cycle
+
  scene.executeWithSeedOffset(() => {
-    ret = Utils.randSeedItem(legendarySpecies);
-  }, Utils.getSunday(new Date(timestamp)).getTime(), EGG_SEED.toString());
+    ret = Phaser.Math.RND.shuffle(legendarySpecies)[index];
+  }, offset, EGG_SEED.toString());

  return ret;
 }
--- a/src/data/enums/battler-tag-type.ts
+++ b/src/data/enums/battler-tag-type.ts
@ -55,5 +55,6 @@ export enum BattlerTagType {
  CURSED = "CURSED",
  CHARGED = "CHARGED",
  GROUNDED = "GROUNDED",
-  MAGNET_RISEN = "MAGNET_RISEN"
+  MAGNET_RISEN = "MAGNET_RISEN",
+  MINIMIZED = "MINIMIZED"
 }
--- a/src/data/move.ts
+++ b/src/data/move.ts
@ -434,29 +434,66 @@ export class SelfStatusMove extends Move {
  }
 }

+/** 
+ * Base class defining all {@link Move} Attributes 
+ * @abstract
+ */
 export abstract class MoveAttr {
+  /** Should this {@link Move} target the user? */
  public selfTarget: boolean;

  constructor(selfTarget: boolean = false) {
    this.selfTarget = selfTarget;
  }

+  /**
+   * Applies move attributes
+   * @see {@link applyMoveAttrsInternal}
+   * @virtual
+   * @param user The {@link Pokemon} using the move
+   * @param target The target {@link Pokemon} of the move
+   * @param move The {@link Move} being used
+   * @param args Set of unique arguments needed by this attribute
+   * @returns true if the application succeeds
+   */
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> {
    return true;
  }

+  /** 
+   * @virtual
+   * @returns the {@link MoveCondition} or {@link MoveConditionFunc} for this {@link Move}
+   */
  getCondition(): MoveCondition | MoveConditionFunc {
    return null;
  }

+  /**
+   * @virtual
+   * @param user The {@link Pokemon} using the move
+   * @param target The target {@link Pokemon} of the move
+   * @param move The {@link Move} being used 
+   * @param cancelled A {@link Utils.BooleanHolder} which stores if the move should fail
+   * @returns the string representing failure of this {@link Move}
+   */
  getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
    return null;
  }

+  /** 
+   * Used by the Enemy AI to rank an attack based on a given user
+   * @see {@link EnemyPokemon.getNextMove}
+   * @virtual
+   */
  getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer {
    return 0;
  }

+  /** 
+   * Used by the Enemy AI to rank an attack based on a given target
+   * @see {@link EnemyPokemon.getNextMove}
+   * @virtual
+   */
  getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer {
    return 0;
  }
@ -470,6 +507,9 @@ export enum MoveEffectTrigger {
  POST_TARGET,
 }

+/** Base class defining all Move Effect Attributes
+ * @extends MoveAttr
+ */
 export class MoveEffectAttr extends MoveAttr {
  public trigger: MoveEffectTrigger;
  public firstHitOnly: boolean;
@ -480,11 +520,21 @@ export class MoveEffectAttr extends MoveAttr {
    this.firstHitOnly = firstHitOnly;
  }

+  /**
+   * Determines whether the {@link Move}'s effects are valid to {@link apply}
+   * @virtual
+   * @param user The {@link Pokemon} using the move
+   * @param target The target {@link Pokemon} of the move
+   * @param move The {@link Move} being used
+   * @param args Set of unique arguments needed by this attribute
+   * @returns true if the application succeeds
+   */
  canApply(user: Pokemon, target: Pokemon, move: Move, args: any[]) {
    return !!(this.selfTarget ? user.hp && !user.getTag(BattlerTagType.FRENZY) : target.hp)
      && (this.selfTarget || !target.getTag(BattlerTagType.PROTECTED) || move.hasFlag(MoveFlags.IGNORE_PROTECT));
  }

+  /** Applies move effects so long as they are able based on {@link canApply} */
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> {
    return this.canApply(user, target, move, args); 
  }
@ -738,12 +788,60 @@ export class RecoilAttr extends MoveEffectAttr {
  }
 }

+
+/**
+ * Attribute used for moves which self KO the user regardless if the move hits a target
+ * @extends MoveEffectAttr
+ * @see {@link apply}
+ **/
 export class SacrificialAttr extends MoveEffectAttr {
  constructor() {
-    super(true, MoveEffectTrigger.PRE_APPLY);
+    super(true, MoveEffectTrigger.POST_TARGET);
  }

+  /**
+   * Deals damage to the user equal to their current hp
+   * @param user Pokemon that used the move
+   * @param target The target of the move
+   * @param move Move with this attribute
+   * @param args N/A
+   * @returns true if the function succeeds
+   **/
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    user.damageAndUpdate(user.hp, HitResult.OTHER, false, true, true);
+	  user.turnData.damageTaken += user.hp;
+
+    return true;
+  }
+
+  getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer {
+    if (user.isBoss())
+      return -20;
+    return Math.ceil(((1 - user.getHpRatio()) * 10 - 10) * (target.getAttackTypeEffectiveness(move.type, user) - 0.5));
+  }
+}
+
+/**
+ * Attribute used for moves which self KO the user but only if the move hits a target
+ * @extends MoveEffectAttr
+ * @see {@link apply}
+ **/
+export class SacrificialAttrOnHit extends MoveEffectAttr {
+  constructor() {
+    super(true, MoveEffectTrigger.POST_TARGET);
+  }
+
+  /**
+   * Deals damage to the user equal to their current hp if the move lands
+   * @param user Pokemon that used the move
+   * @param target The target of the move
+   * @param move Move with this attribute
+   * @param args N/A
+   * @returns true if the function succeeds
+   **/
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+
+    // If the move fails to hit a target, then the user does not faint and the function returns false
    if (!super.apply(user, target, move, args))
      return false;

@ -806,8 +904,15 @@ export enum MultiHitType {
  _1_TO_10,
 }

+/**
+ * Heals the user or target by {@link healRatio} depending on the value of {@link selfTarget}
+ * @extends MoveEffectAttr
+ * @see {@link apply}
+ */
 export class HealAttr extends MoveEffectAttr {
+  /** The percentage of {@link Stat.HP} to heal */
  private healRatio: number;
+  /** Should an animation be shown? */
  private showAnim: boolean;

  constructor(healRatio?: number, showAnim?: boolean, selfTarget?: boolean) {
@ -822,6 +927,10 @@ export class HealAttr extends MoveEffectAttr {
    return true;
  }

+  /** 
+   * Creates a new {@link PokemonHealPhase}.
+   * This heals the target and shows the appropriate message.
+   */
  addHealPhase(target: Pokemon, healRatio: number) {
    target.scene.unshiftPhase(new PokemonHealPhase(target.scene, target.getBattlerIndex(),
      Math.max(Math.floor(target.getMaxHp() * healRatio), 1), getPokemonMessage(target, ' \nhad its HP restored.'), true, !this.showAnim));
@ -903,7 +1012,7 @@ export class IgnoreWeatherTypeDebuffAttr extends MoveAttr {
   * @param user Pokemon that used the move
   * @param target N/A
   * @param move Move with this attribute
-   * @param args Utils.NumberHolder for arenaAttackTypeMultiplier
+   * @param args [0] Utils.NumberHolder for arenaAttackTypeMultiplier
   * @returns true if the function succeeds
   */
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@ -963,27 +1072,19 @@ export class SandHealAttr extends WeatherHealAttr {
 }

 /**
- * Heals the target by either {@link normalHealRatio} or {@link boostedHealRatio} 
+ * Heals the target or the user by either {@link normalHealRatio} or {@link boostedHealRatio} 
 * depending on the evaluation of {@link condition}
+ * @extends HealAttr
 * @see {@link apply}
- * @param user The Pokemon using this move
- * @param target The target Pokemon of this move
- * @param move This move
- * @param args N/A
- * @returns if the move was successful
 */
 export class BoostHealAttr extends HealAttr {
+  /** Healing received when {@link condition} is false */
  private normalHealRatio?: number;
+  /** Healing received when {@link condition} is true */
  private boostedHealRatio?: number;
+  /** The lambda expression to check against when boosting the healing value */
  private condition?: MoveConditionFunc;

-  /** 
-   * @param normalHealRatio Healing received when {@link condition} is false
-   * @param boostedHealRatio Healing received when {@link condition} is true
-   * @param showAnim Should a healing animation be showed?
-   * @param selfTarget Should the move target the user?
-   * @param condition The condition to check against when boosting the healing value
-   */
  constructor(normalHealRatio?: number, boostedHealRatio?: number, showAnim?: boolean, selfTarget?: boolean, condition?: MoveConditionFunc) {
    super(normalHealRatio, showAnim, selfTarget);
    this.normalHealRatio = normalHealRatio;
@ -991,6 +1092,13 @@ export class BoostHealAttr extends HealAttr {
    this.condition = condition;
  }

+  /**
+   * @param user The Pokemon using this move
+   * @param target The target Pokemon of this move
+   * @param move This move
+   * @param args N/A
+   * @returns true if the move was successful
+   */
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
    const healRatio = this.condition(user, target, move) ? this.boostedHealRatio : this.normalHealRatio;
    this.addHealPhase(target, healRatio);
@ -1156,13 +1264,13 @@ export class StatusEffectAttr extends MoveEffectAttr {
          return false;
      }
      if (!pokemon.status || (pokemon.status.effect === this.effect && move.chance < 0))
-        return pokemon.trySetStatus(this.effect, true, this.cureTurn);
+        return pokemon.trySetStatus(this.effect, true, user, this.cureTurn);
    }
    return false;
  }

  getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    return !(this.selfTarget ? user : target).status && (this.selfTarget ? user : target).canSetStatus(this.effect, true) ? Math.floor(move.chance * -0.1) : 0;
+    return !(this.selfTarget ? user : target).status && (this.selfTarget ? user : target).canSetStatus(this.effect, true, false, user) ? Math.floor(move.chance * -0.1) : 0;
  }
 }

@ -1181,7 +1289,7 @@ export class MultiStatusEffectAttr extends StatusEffectAttr {
  }

  getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    return !(this.selfTarget ? user : target).status && (this.selfTarget ? user : target).canSetStatus(this.effect, true) ? Math.floor(move.chance * -0.1) : 0;
+    return !(this.selfTarget ? user : target).status && (this.selfTarget ? user : target).canSetStatus(this.effect, true, false, user) ? Math.floor(move.chance * -0.1) : 0;
  }
 }

@ -1197,7 +1305,7 @@ export class PsychoShiftEffectAttr extends MoveEffectAttr {
      return false;
    }
    if (!target.status || (target.status.effect === statusToApply && move.chance < 0)) {
-      var statusAfflictResult = target.trySetStatus(statusToApply, true);
+      var statusAfflictResult = target.trySetStatus(statusToApply, true, user);
      if (statusAfflictResult) {
        user.scene.queueMessage(getPokemonMessage(user, getStatusEffectHealText(user.status.effect)));
        user.resetStatus();
@ -1210,7 +1318,7 @@ export class PsychoShiftEffectAttr extends MoveEffectAttr {
  }

  getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    return !(this.selfTarget ? user : target).status && (this.selfTarget ? user : target).canSetStatus(user.status?.effect, true) ? Math.floor(move.chance * -0.1) : 0;
+    return !(this.selfTarget ? user : target).status && (this.selfTarget ? user : target).canSetStatus(user.status?.effect, true, false, user) ? Math.floor(move.chance * -0.1) : 0;
  }
 }

@ -2372,6 +2480,30 @@ export class ThunderAccuracyAttr extends VariableAccuracyAttr {
  }
 }

+/**
+ * Attribute used for moves which never miss
+ * against Pokemon with the {@link BattlerTagType.MINIMIZED}
+ * @see {@link apply}
+ * @param user N/A
+ * @param target Target of the move
+ * @param move N/A
+ * @param args [0] Accuracy of the move to be modified
+ * @returns true if the function succeeds
+ */
+export class MinimizeAccuracyAttr extends VariableAccuracyAttr{
+  
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (target.getTag(BattlerTagType.MINIMIZED)){
+      const accuracy = args[0] as Utils.NumberHolder
+      accuracy.value = -1;
+
+      return true;
+    }
+
+    return false;
+  }
+}
+
 export class ToxicAccuracyAttr extends VariableAccuracyAttr {
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
      if (user.isOfType(Type.POISON)) {
@ -2676,6 +2808,24 @@ export class WaterSuperEffectTypeMultiplierAttr extends VariableMoveTypeMultipli
  }
 }

+export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr {
+  /**
+   * Checks to see if the Target is Ice-Type or not. If so, the move will have no effect.
+   * @param {Pokemon} user N/A
+   * @param {Pokemon} target Pokemon that is being checked whether Ice-Type or not.
+   * @param {Move} move N/A
+   * @param {any[]} args Sets to false if the target is Ice-Type, so it should do no damage/no effect.
+   * @returns {boolean} Returns true if move is successful, false if Ice-Type.
+   */
+   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (target.isOfType(Type.ICE)) {
+      (args[0] as Utils.BooleanHolder).value = false;
+      return false;
+    }
+    return true;
+  }
+}
+
 export class FlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
    const multiplier = args[0] as Utils.NumberHolder;
@ -2695,6 +2845,29 @@ export class OneHitKOAccuracyAttr extends VariableAccuracyAttr {
  }
 }

+export class SheerColdAccuracyAttr extends OneHitKOAccuracyAttr {
+  /**
+   * Changes the normal One Hit KO Accuracy Attr to implement the Gen VII changes, 
+   * where if the user is Ice-Type, it has more accuracy.
+   * @param {Pokemon} user Pokemon that is using the move; checks the Pokemon's level.
+   * @param {Pokemon} target Pokemon that is receiving the move; checks the Pokemon's level.
+   * @param {Move} move N/A 
+   * @param {any[]} args Uses the accuracy argument, allowing to change it from either 0 if it doesn't pass
+   * the first if/else, or 30/20 depending on the type of the user Pokemon.
+   * @returns Returns true if move is successful, false if misses.
+   */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const accuracy = args[0] as Utils.NumberHolder;
+      if (user.level < target.level) {
+          accuracy.value = 0;
+      } else { 
+         const baseAccuracy = user.isOfType(Type.ICE) ? 30 : 20;
+         accuracy.value = Math.min(Math.max(baseAccuracy + 100 * (1 - target.level / user.level), 0), 100);
+      }
+    return true;
+  }
+}
+
 export class MissEffectAttr extends MoveAttr {
  private missEffectFunc: UserMoveConditionFunc;

@ -3086,8 +3259,11 @@ export class FaintCountdownAttr extends AddBattlerTagAttr {
  }
 }

+/** Attribute used when a move hits a {@link BattlerTagType} for double damage */
 export class HitsTagAttr extends MoveAttr {
+  /** The {@link BattlerTagType} this move hits */
  public tagType: BattlerTagType;
+  /** Should this move deal double damage against {@link HitsTagAttr.tagType}? */
  public doubleDamage: boolean;

  constructor(tagType: BattlerTagType, doubleDamage?: boolean) {
@ -4254,6 +4430,8 @@ export function initMoves() {
    new AttackMove(Moves.SLAM, Type.NORMAL, MoveCategory.PHYSICAL, 80, 75, 20, -1, 0, 1),
    new AttackMove(Moves.VINE_WHIP, Type.GRASS, MoveCategory.PHYSICAL, 45, 100, 25, -1, 0, 1),
    new AttackMove(Moves.STOMP, Type.NORMAL, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 1)
+      .attr(MinimizeAccuracyAttr)
+      .attr(HitsTagAttr, BattlerTagType.MINIMIZED, true)
      .attr(FlinchAttr),
    new AttackMove(Moves.DOUBLE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 30, 100, 30, -1, 0, 1)
      .attr(MultiHitAttr, MultiHitType._2),
@ -4277,6 +4455,8 @@ export function initMoves() {
      .attr(OneHitKOAccuracyAttr),
    new AttackMove(Moves.TACKLE, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1),
    new AttackMove(Moves.BODY_SLAM, Type.NORMAL, MoveCategory.PHYSICAL, 85, 100, 15, 30, 0, 1)
+      .attr(MinimizeAccuracyAttr)
+      .attr(HitsTagAttr, BattlerTagType.MINIMIZED, true)
      .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
    new AttackMove(Moves.WRAP, Type.NORMAL, MoveCategory.PHYSICAL, 15, 90, 20, 100, 0, 1)
      .attr(TrapAttr, BattlerTagType.WRAP),
@ -4474,6 +4654,7 @@ export function initMoves() {
    new SelfStatusMove(Moves.HARDEN, Type.NORMAL, -1, 30, -1, 0, 1)
      .attr(StatChangeAttr, BattleStat.DEF, 1, true),
    new SelfStatusMove(Moves.MINIMIZE, Type.NORMAL, -1, 10, -1, 0, 1)
+      .attr(AddBattlerTagAttr, BattlerTagType.MINIMIZED, true, false)
      .attr(StatChangeAttr, BattleStat.EVA, 2, true),
    new StatusMove(Moves.SMOKESCREEN, Type.NORMAL, 100, 20, -1, 0, 1)
      .attr(StatChangeAttr, BattleStat.ACC, -1),
@ -4919,7 +5100,7 @@ export function initMoves() {
    new StatusMove(Moves.WILL_O_WISP, Type.FIRE, 85, 15, -1, 0, 3)
      .attr(StatusEffectAttr, StatusEffect.BURN),
    new StatusMove(Moves.MEMENTO, Type.DARK, 100, 10, -1, 0, 3)
-      .attr(SacrificialAttr)
+      .attr(SacrificialAttrOnHit)
      .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK ], -2),
    new AttackMove(Moves.FACADE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 3)
      .attr(MovePowerMultiplierAttr, (user, target, move) => user.status
@ -5095,9 +5276,10 @@ export function initMoves() {
    new AttackMove(Moves.SAND_TOMB, Type.GROUND, MoveCategory.PHYSICAL, 35, 85, 15, 100, 0, 3)
      .attr(TrapAttr, BattlerTagType.SAND_TOMB)
      .makesContact(false),
-    new AttackMove(Moves.SHEER_COLD, Type.ICE, MoveCategory.SPECIAL, 200, 30, 5, -1, 0, 3)
+    new AttackMove(Moves.SHEER_COLD, Type.ICE, MoveCategory.SPECIAL, 200, 20, 5, -1, 0, 3)
+      .attr(IceNoEffectTypeAttr)
      .attr(OneHitKOAttr)
-      .attr(OneHitKOAccuracyAttr),
+      .attr(SheerColdAccuracyAttr),
    new AttackMove(Moves.MUDDY_WATER, Type.WATER, MoveCategory.SPECIAL, 90, 85, 10, 30, 0, 3)
      .attr(StatChangeAttr, BattleStat.ACC, -1)
      .target(MoveTarget.ALL_NEAR_ENEMIES),
@ -5226,7 +5408,7 @@ export function initMoves() {
        || user.status?.effect === StatusEffect.TOXIC
        || user.status?.effect === StatusEffect.PARALYSIS
        || user.status?.effect === StatusEffect.SLEEP)
-        && target.canSetStatus(user.status?.effect)
+        && target.canSetStatus(user.status?.effect, false, false, user)
        ),
    new AttackMove(Moves.TRUMP_CARD, Type.NORMAL, MoveCategory.SPECIAL, -1, -1, 5, -1, 0, 4)
      .makesContact()
@ -5312,6 +5494,8 @@ export function initMoves() {
    new AttackMove(Moves.DRAGON_PULSE, Type.DRAGON, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 4)
      .pulseMove(),
    new AttackMove(Moves.DRAGON_RUSH, Type.DRAGON, MoveCategory.PHYSICAL, 100, 75, 10, 20, 0, 4)
+      .attr(MinimizeAccuracyAttr)
+      .attr(HitsTagAttr, BattlerTagType.MINIMIZED, true)
      .attr(FlinchAttr),
    new AttackMove(Moves.POWER_GEM, Type.ROCK, MoveCategory.SPECIAL, 80, 100, 20, -1, 0, 4),
    new AttackMove(Moves.DRAIN_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 4)
@ -5454,7 +5638,7 @@ export function initMoves() {
    new AttackMove(Moves.SPACIAL_REND, Type.DRAGON, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 4)
      .attr(HighCritAttr),
    new SelfStatusMove(Moves.LUNAR_DANCE, Type.PSYCHIC, -1, 10, -1, 0, 4)
-      .attr(SacrificialAttr)
+      .attr(SacrificialAttrOnHit)
      .danceMove()
      .triageMove()
      .unimplemented(),
@ -5521,7 +5705,9 @@ export function initMoves() {
      .attr(StatChangeAttr, [ BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD ], 1, true)
      .danceMove(),
    new AttackMove(Moves.HEAVY_SLAM, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5)
+      .attr(MinimizeAccuracyAttr)
      .attr(CompareWeightPowerAttr)
+      .attr(HitsTagAttr, BattlerTagType.MINIMIZED, true)
      .condition(failOnMaxCondition),
    new AttackMove(Moves.SYNCHRONOISE, Type.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 5)
      .target(MoveTarget.ALL_NEAR_OTHERS)
@ -5603,7 +5789,7 @@ export function initMoves() {
      .partial(),
    new AttackMove(Moves.FINAL_GAMBIT, Type.FIGHTING, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 5)
      .attr(UserHpDamageAttr)
-      .attr(SacrificialAttr),
+      .attr(SacrificialAttrOnHit),
    new StatusMove(Moves.BESTOW, Type.NORMAL, -1, 15, -1, 0, 5)
      .ignoresProtect()
      .unimplemented(),
@ -5652,7 +5838,9 @@ export function initMoves() {
      .attr(StatChangeAttr, BattleStat.DEF, -1)
      .slicingMove(),
    new AttackMove(Moves.HEAT_CRASH, Type.FIRE, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5)
+      .attr(MinimizeAccuracyAttr)
      .attr(CompareWeightPowerAttr)
+      .attr(HitsTagAttr, BattlerTagType.MINIMIZED, true)
      .condition(failOnMaxCondition),
    new AttackMove(Moves.LEAF_TORNADO, Type.GRASS, MoveCategory.SPECIAL, 65, 90, 10, 50, 0, 5)
      .attr(StatChangeAttr, BattleStat.ACC, -1),
@ -5723,7 +5911,9 @@ export function initMoves() {
      .makesContact(false)
      .partial(),
    new AttackMove(Moves.FLYING_PRESS, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 6)
+      .attr(MinimizeAccuracyAttr)
      .attr(FlyingTypeMultiplierAttr)
+      .attr(HitsTagAttr, BattlerTagType.MINIMIZED, true)
      .condition(failOnGravityCondition),
    new StatusMove(Moves.MAT_BLOCK, Type.FIGHTING, -1, 10, -1, 0, 6)
      .unimplemented(),
@ -6221,7 +6411,7 @@ export function initMoves() {
      .ignoresVirtual(),
    /* End Unused */
    new AttackMove(Moves.ZIPPY_ZAP, Type.ELECTRIC, MoveCategory.PHYSICAL, 80, 100, 10, 100, 2, 7)
-      .attr(CritOnlyAttr),
+      .attr(StatChangeAttr, BattleStat.EVA, 1, true),
    new AttackMove(Moves.SPLISHY_SPLASH, Type.WATER, MoveCategory.SPECIAL, 90, 100, 15, 30, 0, 7)
      .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
      .target(MoveTarget.ALL_NEAR_ENEMIES),
@ -6246,7 +6436,7 @@ export function initMoves() {
    new AttackMove(Moves.FREEZY_FROST, Type.ICE, MoveCategory.SPECIAL, 100, 90, 10, -1, 0, 7)
      .attr(ResetStatsAttr),
    new AttackMove(Moves.SPARKLY_SWIRL, Type.FAIRY, MoveCategory.SPECIAL, 120, 85, 5, -1, 0, 7)
-      .partial(),
+      .attr(PartyStatusCureAttr, null, Abilities.NONE),
    new AttackMove(Moves.VEEVEE_VOLLEY, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 20, -1, 0, 7)
      .attr(FriendshipPowerAttr),
    new AttackMove(Moves.DOUBLE_IRON_BASH, Type.STEEL, MoveCategory.PHYSICAL, 60, 100, 5, 30, 0, 7)
@ -6841,7 +7031,7 @@ export function initMoves() {
        const turnMove = user.getLastXMoves(1);
        return !turnMove.length || turnMove[0].move !== move.id || turnMove[0].result !== MoveResult.SUCCESS;
      }), // TODO Add Instruct/Encore interaction
-    new AttackMove(Moves.COMEUPPANCE, Type.DARK, MoveCategory.PHYSICAL, 1, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.COMEUPPANCE, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9)
      .attr(CounterDamageAttr, (move: Move) => (move.category === MoveCategory.PHYSICAL || move.category === MoveCategory.SPECIAL), 1.5)
      .target(MoveTarget.ATTACKER),
    new AttackMove(Moves.AQUA_CUTTER, Type.WATER, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 9)
--- a/src/data/pokemon-evolutions.ts
+++ b/src/data/pokemon-evolutions.ts
@ -1385,10 +1385,10 @@ export const pokemonEvolutions: PokemonEvolutions = {
    new SpeciesEvolution(Species.HELIOLISK, 1, EvolutionItem.SUN_STONE, null, SpeciesWildEvolutionDelay.LONG)
  ],
  [Species.CHARJABUG]: [
-    new SpeciesEvolution(Species.VIKAVOLT, 1, EvolutionItem.THUNDER_STONE, null)
+    new SpeciesEvolution(Species.VIKAVOLT, 1, EvolutionItem.THUNDER_STONE, null, SpeciesWildEvolutionDelay.LONG)
  ],
  [Species.CRABRAWLER]: [
-    new SpeciesEvolution(Species.CRABOMINABLE, 1, EvolutionItem.ICE_STONE, null)
+    new SpeciesEvolution(Species.CRABOMINABLE, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.LONG)
  ],
  [Species.ROCKRUFF]: [
    new SpeciesFormEvolution(Species.LYCANROC, '', 'midday', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DAWN || p.scene.arena.getTimeOfDay() === TimeOfDay.DAY) && (p.formIndex === 0)), null),
--- a/src/data/pokemon-level-moves.ts
+++ b/src/data/pokemon-level-moves.ts
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@ -2759,7 +2759,7 @@ export const speciesStarters = {
  [Species.GROUDON]: 8,
  [Species.RAYQUAZA]: 8,
  [Species.JIRACHI]: 7,
-  [Species.DEOXYS]: 8,
+  [Species.DEOXYS]: 7,

  [Species.TURTWIG]: 3,
  [Species.CHIMCHAR]: 3,
@ -2813,7 +2813,7 @@ export const speciesStarters = {
  [Species.DARKRAI]: 7,
  [Species.SHAYMIN]: 7,
  [Species.ARCEUS]: 9,
-  [Species.VICTINI]: 8,
+  [Species.VICTINI]: 7,

  [Species.SNIVY]: 3,
  [Species.TEPIG]: 3,
@ -2895,7 +2895,7 @@ export const speciesStarters = {
  [Species.KYUREM]: 8,
  [Species.KELDEO]: 7,
  [Species.MELOETTA]: 7,
-  [Species.GENESECT]: 8,
+  [Species.GENESECT]: 7,

  [Species.CHESPIN]: 3,
  [Species.FENNEKIN]: 3,
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@ -206,6 +206,7 @@ export class Arena {
      case Biome.TALL_GRASS:
        return Type.GRASS;
      case Biome.FOREST:
+      case Biome.JUNGLE:
        return Type.BUG;
      case Biome.SLUM:
      case Biome.SWAMP:
@ -237,8 +238,10 @@ export class Arena {
      case Biome.TEMPLE:
        return Type.GHOST;
      case Biome.DOJO:
+      case Biome.CONSTRUCTION_SITE:
        return Type.FIGHTING;
      case Biome.FACTORY:
+      case Biome.LABORATORY:
        return Type.STEEL;
      case Biome.RUINS:
      case Biome.SPACE:
@ -248,6 +251,8 @@ export class Arena {
        return Type.DRAGON;
      case Biome.ABYSS:
        return Type.DARK;
+      default:
+        return Type.UNKNOWN;
    }
  }

@ -617,7 +622,7 @@ export class Arena {
      case Biome.CONSTRUCTION_SITE:
        return 1.222;
      case Biome.JUNGLE:
-        return 2.477;
+        return 0.000;
      case Biome.FAIRY_CAVE:
        return 4.542;
      case Biome.TEMPLE:
--- a/src/field/damage-number-handler.ts
+++ b/src/field/damage-number-handler.ts
@ -13,7 +13,7 @@ export default class DamageNumberHandler {
  add(target: Pokemon, amount: integer, result: DamageResult | HitResult.HEAL = HitResult.EFFECTIVE, critical: boolean = false): void {
    const scene = target.scene;

-    if (!scene.damageNumbersMode)
+    if (!scene?.damageNumbersMode)
      return;

    const battlerIndex = target.getBattlerIndex();
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@ -27,7 +27,7 @@ import { TempBattleStat } from '../data/temp-battle-stat';
 import { ArenaTagSide, WeakenMoveScreenTag, WeakenMoveTypeTag } from '../data/arena-tag';
 import { ArenaTagType } from "../data/enums/arena-tag-type";
 import { Biome } from "../data/enums/biome";
-import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, NonSuperEffectiveImmunityAbAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, VariableMoveTypeAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPostDefendAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr } from '../data/ability';
+import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, NonSuperEffectiveImmunityAbAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, VariableMoveTypeAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPostDefendAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr } from '../data/ability';
 import { Abilities } from "#app/data/enums/abilities";
 import PokemonData from '../system/pokemon-data';
 import Battle, { BattlerIndex } from '../battle';
@ -1544,6 +1544,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {

            applyPreAttackAbAttrs(DamageBoostAbAttr, source, this, battlerMove, damage);

+            /** 
+             * For each {@link HitsTagAttr} the move has, doubles the damage of the move if:
+             *  The target has a {@link BattlerTagType} that this move interacts with
+             * AND
+             *  The move doubles damage when used against that tag 
+             * */
            move.getAttrs(HitsTagAttr).map(hta => hta as HitsTagAttr).filter(hta => hta.doubleDamage).forEach(hta => {
              if (this.getTag(hta.tagType))
                damage.value *= 2;
@ -1563,7 +1569,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
          
          if (!result) {
            if (!typeMultiplier.value)
-              result = HitResult.NO_EFFECT;
+              result = move.id == Moves.SHEER_COLD ? HitResult.IMMUNE : HitResult.NO_EFFECT;
            else {
              const oneHitKo = new Utils.BooleanHolder(false);
              applyMoveAttrs(OneHitKOAttr, source, this, move, oneHitKo);
@ -1626,6 +1632,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
                case HitResult.NO_EFFECT:
                  this.scene.queueMessage(i18next.t('battle:hitResultNoEffect', { pokemonName: this.name }));
                  break;
+                case HitResult.IMMUNE:
+                  this.scene.queueMessage(`${this.name} is unaffected!`);
+                  break;
                case HitResult.ONE_HIT_KO:  
                  this.scene.queueMessage(i18next.t('battle:hitResultOneHitKO'));
                  break;
@ -1660,8 +1669,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
              this.resetSummonData();
            }

-          }
-
            /**
             * since damage is an object, I don't see how this would ever by false?
             * i think the motivation was to have this here to counter setPhaseQueueSplice()
@ -1675,6 +1682,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
            }
            */
          }
+        }
        break;
      case MoveCategory.STATUS:
        if (!typeless)
@ -2055,7 +2063,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    return this.gender !== Gender.GENDERLESS && pokemon.gender === (this.gender === Gender.MALE ? Gender.FEMALE : Gender.MALE);
  }

-  canSetStatus(effect: StatusEffect, quiet: boolean = false, overrideStatus: boolean = false): boolean {
+  canSetStatus(effect: StatusEffect, quiet: boolean = false, overrideStatus: boolean = false, sourcePokemon: Pokemon = null): boolean {
    if (effect !== StatusEffect.FAINT) {
      if (overrideStatus ? this.status?.effect === effect : this.status)
        return false;
@ -2063,11 +2071,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
        return false;
    }

+    const types = this.getTypes(true, true);
+
    switch (effect) {
      case StatusEffect.POISON:
      case StatusEffect.TOXIC:
-        if (this.isOfType(Type.POISON) || this.isOfType(Type.STEEL))
+        // Check if the Pokemon is immune to Poison/Toxic or if the source pokemon is canceling the immunity
+        let poisonImmunity = types.map(defType => {
+          // Check if the Pokemon is not immune to Poison/Toxic
+          if (defType !== Type.POISON && defType !== Type.STEEL)
            return false;
+
+          // 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);
+            if (cancelImmunity.value)
+              return false;
+          }
+
+          return true;
+        })
+
+        if (this.isOfType(Type.POISON) || this.isOfType(Type.STEEL)) {
+          if (poisonImmunity.includes(true))
+            return false;
+        }
        break;
      case StatusEffect.PARALYSIS:
        if (this.isOfType(Type.ELECTRIC))
@ -2096,12 +2125,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    return true;
  }

-  trySetStatus(effect: StatusEffect, asPhase: boolean = false, cureTurn: integer = 0, sourceText: string = null): boolean {
-    if (!this.canSetStatus(effect, asPhase))
+  trySetStatus(effect: StatusEffect, asPhase: boolean = false, sourcePokemon: Pokemon = null, cureTurn: integer = 0, sourceText: string = null): boolean { 
+    if (!this.canSetStatus(effect, asPhase, false, sourcePokemon))
      return false;

    if (asPhase) {
-      this.scene.unshiftPhase(new ObtainStatusEffectPhase(this.scene, this.getBattlerIndex(), effect, cureTurn, sourceText));
+      this.scene.unshiftPhase(new ObtainStatusEffectPhase(this.scene, this.getBattlerIndex(), effect, cureTurn, sourceText, sourcePokemon));
      return true;
    }

@ -3370,7 +3399,8 @@ export enum HitResult {
  HEAL,
  FAIL,
  MISS,
-  OTHER
+  OTHER,
+  IMMUNE
 }

 export type DamageResult = HitResult.EFFECTIVE | HitResult.SUPER_EFFECTIVE | HitResult.NOT_VERY_EFFECTIVE | HitResult.ONE_HIT_KO | HitResult.OTHER;
--- a/src/locales/de/ability-trigger.ts
+++ b/src/locales/de/ability-trigger.ts
@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const abilityTriggers: SimpleTranslationEntries = {
+    'blockRecoilDamage' : `{{pokemonName}} wurde durch {{abilityName}}\nvor Rückstoß geschützt!`,
+} as const;
--- a/src/locales/de/battle.ts
+++ b/src/locales/de/battle.ts
@ -9,11 +9,11 @@ export const battle: SimpleTranslationEntries = {
  "trainerComeBack": "{{trainerName}} ruft {{pokemonName}} zurück!",
  "playerGo": "Los! {{pokemonName}}!",
  "trainerGo": "{{trainerName}} sendet {{pokemonName}} raus!",
-  "switchQuestion": "Willst du\n{{pokemonName}} auswechseln?",
+  "switchQuestion": "Möchtest du\n{{pokemonName}} auswechseln?",
  "trainerDefeated": `{{trainerName}}\nwurde besiegt!`,
  "pokemonCaught": "{{pokemonName}} wurde gefangen!",
  "pokemon": "Pokémon",
-  "sendOutPokemon": "Los! {{pokemonName}}!",
+  "sendOutPokemon": "Los, {{pokemonName}}!",
  "hitResultCriticalHit": "Ein Volltreffer!",
  "hitResultSuperEffective": "Das ist sehr effektiv!",
  "hitResultNotVeryEffective": "Das ist nicht sehr effektiv…",
@ -26,24 +26,24 @@ export const battle: SimpleTranslationEntries = {
  "learnMove": "{{pokemonName}} erlernt\n{{moveName}}!",
  "learnMovePrompt": "{{pokemonName}} versucht, {{moveName}} zu erlernen.",
  "learnMoveLimitReached": "Aber {{pokemonName}} kann nur\nmaximal vier Attacken erlernen.",
-  "learnMoveReplaceQuestion": "Soll eine andere Attacke durch\n{{moveName}} ersetzt werden?",
+  "learnMoveReplaceQuestion": "Soll eine bekannte Attacke durch\n{{moveName}} ersetzt werden?",
  "learnMoveStopTeaching": "{{moveName}} nicht\nerlernen?",
  "learnMoveNotLearned": "{{pokemonName}} hat\n{{moveName}} nicht erlernt.",
  "learnMoveForgetQuestion": "Welche Attacke soll vergessen werden?",
  "learnMoveForgetSuccess": "{{pokemonName}} hat\n{{moveName}} vergessen.",
  "levelCapUp": "Das Levellimit\nhat sich zu {{levelCap}} erhöht!",
  "moveNotImplemented": "{{moveName}} ist noch nicht implementiert und kann nicht ausgewählt werden.",
-  "moveNoPP": "Du hast keine AP für\ndiese Attacke mehr übrig!",
+  "moveNoPP": "Es sind keine AP für\ndiese Attacke mehr übrig!",
  "moveDisabled": "{{moveName}} ist deaktiviert!",
  "noPokeballForce": "Eine unsichtbare Kraft\nverhindert die Nutzung von Pokébällen.",
  "noPokeballTrainer": "Du kannst das Pokémon\neines anderen Trainers nicht fangen!",
-  "noPokeballMulti": "Du kannst erst einen Pokéball werden,\nwenn nur noch ein Pokémon übrig ist!",
+  "noPokeballMulti": "Du kannst erst einen Pokéball werfen,\nwenn nur noch ein Pokémon übrig ist!",
  "noPokeballStrong": "Das Ziel-Pokémon ist zu stark, um gefangen zu werden!\nDu musst es zuerst schwächen!",
  "noEscapeForce": "Eine unsichtbare Kraft\nverhindert die Flucht.",
  "noEscapeTrainer": "Du kannst nicht\naus einem Trainerkampf fliehen!",
  "noEscapePokemon": "{{pokemonName}}'s {{moveName}}\nverhindert {{escapeVerb}}!",
  "runAwaySuccess": "Du bist entkommen!",
-  "runAwayCannotEscape": 'Du kannst nicht fliehen!',
+  "runAwayCannotEscape": 'Flucht gescheitert!',
  "escapeVerbSwitch": "auswechseln",
  "escapeVerbFlee": "flucht",
  "skipItemQuestion": "Bist du sicher, dass du kein Item nehmen willst?",
--- a/src/locales/de/config.ts
+++ b/src/locales/de/config.ts
@ -1,4 +1,5 @@
 import { ability } from "./ability";
+import { abilityTriggers } from "./ability-trigger";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";

 export const deConfig = {
    ability: ability,
+    abilityTriggers: abilityTriggers,
    battle: battle,
    commandUiHandler: commandUiHandler,
    fightUiHandler: fightUiHandler,
--- a/src/locales/de/move.ts
+++ b/src/locales/de/move.ts
@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
  },
  "zippyZap": {
    name: "Britzelturbo",
-    effect: "Ein stürmischer Blitz-Angriff mit hoher Erstschlag- und Volltrefferquote."
+    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness."
  },
  "splishySplash": {
    name: "Plätschersurfer",
--- a/src/locales/de/starter-select-ui-handler.ts
+++ b/src/locales/de/starter-select-ui-handler.ts
@ -30,5 +30,6 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
    "enablePassive": "Passiv-Skill aktivieren",
    "disablePassive": "Passiv-Skill deaktivieren",
    "locked": "Gesperrt",
-    "disabled": "Deaktiviert"
+    "disabled": "Deaktiviert",
+    "uncaught": "Uncaught"
 }
--- a/src/locales/en/ability-trigger.ts
+++ b/src/locales/en/ability-trigger.ts
@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const abilityTriggers: SimpleTranslationEntries = {
+    'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
+} as const;
--- a/src/locales/en/config.ts
+++ b/src/locales/en/config.ts
@ -1,4 +1,5 @@
 import { ability } from "./ability";
+import { abilityTriggers } from "./ability-trigger";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";

 export const enConfig = {    
    ability: ability,
+    abilityTriggers: abilityTriggers,
    battle: battle,
    commandUiHandler: commandUiHandler,
    fightUiHandler: fightUiHandler,
--- a/src/locales/en/move.ts
+++ b/src/locales/en/move.ts
@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
  },
  "zippyZap": {
    name: "Zippy Zap",
-    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and results in a critical hit."
+    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness."
  },
  "splishySplash": {
    name: "Splishy Splash",
--- a/src/locales/en/starter-select-ui-handler.ts
+++ b/src/locales/en/starter-select-ui-handler.ts
@ -30,5 +30,6 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
    "enablePassive": "Enable Passive",
    "disablePassive": "Disable Passive",
    "locked": "Locked",
-    "disabled": "Disabled"
+    "disabled": "Disabled",
+    "uncaught": "Uncaught"
 }
--- a/src/locales/es/ability-trigger.ts
+++ b/src/locales/es/ability-trigger.ts
@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const abilityTriggers: SimpleTranslationEntries = {
+    'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
+} as const;
--- a/src/locales/es/config.ts
+++ b/src/locales/es/config.ts
@ -1,4 +1,5 @@
 import { ability } from "./ability";
+import { abilityTriggers } from "./ability-trigger";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";

 export const esConfig = {
    ability: ability,
+    abilityTriggers: abilityTriggers,
    battle: battle,
    commandUiHandler: commandUiHandler,
    fightUiHandler: fightUiHandler,
--- a/src/locales/es/move.ts
+++ b/src/locales/es/move.ts
@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
  },
  zippyZap: {
    name: "Pikaturbo",
-    effect: "Ataque eléctrico a la velocidad del rayo. Este movimiento tiene prioridad alta y propina golpes críticos.",
+    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness.",
  },
  splishySplash: {
    name: "Salpikasurf",
--- a/src/locales/es/starter-select-ui-handler.ts
+++ b/src/locales/es/starter-select-ui-handler.ts
@ -30,5 +30,6 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
    "enablePassive": "Activar Pasiva",
    "disablePassive": "Desactivar Pasiva",
    "locked": "Locked",
-    "disabled": "Disabled"
+    "disabled": "Disabled",
+    "uncaught": "Uncaught"
 }
--- a/src/locales/fr/ability-trigger.ts
+++ b/src/locales/fr/ability-trigger.ts
@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const abilityTriggers: SimpleTranslationEntries = {
+    'blockRecoilDamage' : `{{abilityName}}\nde {{pokemonName}} le protège du contrecoup !`,
+} as const;
--- a/src/locales/fr/config.ts
+++ b/src/locales/fr/config.ts
@ -1,4 +1,5 @@
 import { ability } from "./ability";
+import { abilityTriggers } from "./ability-trigger";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";

 export const frConfig = {
    ability: ability,
+    abilityTriggers: abilityTriggers,
    battle: battle,
    commandUiHandler: commandUiHandler,
    fightUiHandler: fightUiHandler,
--- a/src/locales/fr/move.ts
+++ b/src/locales/fr/move.ts
@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
  },
  "zippyZap": {
    name: "Pika-Sprint",
-    effect: "Une attaque électrique rapide comme l’éclair qui inflige un coup critique à coup sûr. Frappe en priorité."
+    effect: "Une attaque électrique rapide comme l’éclair qui auguemente l’esquive. Frappe en priorité."
  },
  "splishySplash": {
    name: "Pika-Splash",
--- a/src/locales/fr/starter-select-ui-handler.ts
+++ b/src/locales/fr/starter-select-ui-handler.ts
@ -30,5 +30,6 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
    "enablePassive": "Activer Passif",
    "disablePassive": "Désactiver Passif",
    "locked": "Verrouillé",
-    "disabled": "Désactivé"
+    "disabled": "Désactivé",
+    "uncaught": "Uncaught"
 }
--- a/src/locales/it/ability-trigger.ts
+++ b/src/locales/it/ability-trigger.ts
@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const abilityTriggers: SimpleTranslationEntries = {
+    'blockRecoilDamage' : `{{abilityName}} di {{pokemonName}}\nl'ha protetto dal contraccolpo!`,
+} as const;
--- a/src/locales/it/config.ts
+++ b/src/locales/it/config.ts
@ -1,4 +1,5 @@
 import { ability } from "./ability";
+import { abilityTriggers } from "./ability-trigger";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";

 export const itConfig = {
    ability: ability,
+    abilityTriggers: abilityTriggers,
    battle: battle,
    commandUiHandler: commandUiHandler,
    fightUiHandler: fightUiHandler,
--- a/src/locales/it/move.ts
+++ b/src/locales/it/move.ts
@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
  },
  zippyZap: {
    name: "Sprintaboom",
-    effect: "Un attacco elettrico ad altissima velocità. Questa mossa ha priorità alta e infligge sicuramente un brutto colpo.",
+    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness.",
  },
  splishySplash: {
    name: "Surfasplash",
--- a/src/locales/it/starter-select-ui-handler.ts
+++ b/src/locales/it/starter-select-ui-handler.ts
@ -29,6 +29,7 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
    "cycleVariant": 'V: Alterna Variante',
    "enablePassive": "Attiva Passiva",
    "disablePassive": "Disattiva Passiva",
-    "locked": "Locked",
-    "disabled": "Disabled"
+    "locked": "Bloccato",
+    "disabled": "Disabilitato",
+    "uncaught": "Non Catturato"
 }
--- a/src/locales/pt_BR/battle.ts
+++ b/src/locales/pt_BR/battle.ts
@ -9,7 +9,7 @@ export const battle: SimpleTranslationEntries = {
  "trainerComeBack": "{{trainerName}} retirou {{pokemonName}} da batalha!",
  "playerGo": "{{pokemonName}}, eu escolho você!",
  "trainerGo": "{{trainerName}} enviou {{pokemonName}}!",
-  "switchQuestion": "Quer trocar\n{{pokemonName}}?",
+  "switchQuestion": "Quer trocar\nde {{pokemonName}}?",
  "trainerDefeated": "Você derrotou\n{{trainerName}}!",
  "pokemonCaught": "{{pokemonName}} foi capturado!",
  "pokemon": "Pokémon",
--- a/src/locales/pt_BR/move.ts
+++ b/src/locales/pt_BR/move.ts
@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
  },
  zippyZap: {
    name: "Zippy Zap",
-    effect: "O usuário ataca o alvo com rajadas de eletricidade em alta velocidade. Este movimento sempre ataca primeiro e resulta em um golpe crítico."
+    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness."
  },
  splishySplash: {
    name: "Splishy Splash",
--- a/src/locales/pt_BR/nature.ts
+++ b/src/locales/pt_BR/nature.ts
@ -8,7 +8,7 @@ export const nature: SimpleTranslationEntries = {
  "Naughty": "Teimosa",
  "Bold": "Corajosa",
  "Docile": "Dócil",
-  "Relaxed": "Descontraída",
+  "Relaxed": "Relaxada",
  "Impish": "Inquieta",
  "Lax": "Relaxada",
  "Timid": "Tímida",
@ -20,7 +20,7 @@ export const nature: SimpleTranslationEntries = {
  "Mild": "Mansa",
  "Quiet": "Quieta",
  "Bashful": "Atrapalhada",
-  "Rash": "Imprudente",
+  "Rash": "Rabugenta",
  "Calm": "Calma",
  "Gentle": "Gentil",
  "Sassy": "Atrevida",
--- a/src/locales/pt_BR/starter-select-ui-handler.ts
+++ b/src/locales/pt_BR/starter-select-ui-handler.ts
@ -8,9 +8,9 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
 export const starterSelectUiHandler: SimpleTranslationEntries = {
    "confirmStartTeam": 'Começar com esses Pokémon?',
    "growthRate": "Crescimento:",
-    "ability": "Hab.:",
+    "ability": "Habilidade:",
    "passive": "Passiva:",
-    "nature": "Nature:",
+    "nature": "Natureza:",
    "eggMoves": "Mov. de Ovo",
    "start": "Iniciar",
    "addToParty": "Adicionar à equipe",
@ -25,10 +25,11 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
    "cycleForm": 'F: Mudar Forma',
    "cycleGender": 'G: Mudar Gênero',
    "cycleAbility": 'E: Mudar Habilidade',
-    "cycleNature": 'N: Mudar Nature',
+    "cycleNature": 'N: Mudar Natureza',
    "cycleVariant": 'V: Mudar Variante',
    "enablePassive": "Ativar Passiva",
    "disablePassive": "Desativar Passiva",
-    "locked": "Bloqueado",
-    "disabled": "Desativado",
+    "locked": "Bloqueada",
+    "disabled": "Desativada",
+    "uncaught": "Não capturado"
 }
--- a/src/locales/pt_BR/tutorial.ts
+++ b/src/locales/pt_BR/tutorial.ts
@ -1,43 +1,51 @@
 import { SimpleTranslationEntries } from "#app/plugins/i18n";

 export const tutorial: SimpleTranslationEntries = {
-    "intro": `Bem-vindo ao PokéRogue! Este é um jogo de Pokémon feito por fãs focado em batalha com elementos roguelite.
-    $Este jogo não é monetizado e não reivindicamos propriedade de Pokémon nem dos ativos protegidos por direitos autorais usados.
-    $O jogo é um trabalho em andamento, mas totalmente jogável.\nPara relatórios de bugs, use a comunidade no Discord.
-    $Se o jogo rodar lentamente, certifique-se de que a 'Aceleração de hardware' esteja ativada nas configurações do seu navegador.`,
+    "intro": `Bem-vindo ao PokéRogue! Este é um jogo Pokémon feito por fãs focado em batalhas com elementos roguelite.
+    $Este jogo não é monetizado e não reivindicamos propriedade de Pokémon nem dos ativos protegidos
+    $por direitos autorais usados.
+    $O jogo é um trabalho em andamento, mas é totalmente jogável.
+    $Para relatórios de bugs, use a comunidade no Discord.
+    $Se o jogo estiver rodando lentamente, certifique-se de que a 'Aceleração de hardware' esteja ativada 
+    $nas configurações do seu navegador.`,

    "accessMenu": `Para acessar o menu, aperte M ou Esc.
    $O menu contém configurações e diversas funções.`,

    "menu": `A partir deste menu, você pode acessar as configurações. 
-    $Nas configurações, você pode alterar a velocidade do jogo, o estilo da janela e outras opções. 
-    $Existem também vários outros recursos aqui, então não deixe de conferir todos eles!`,
+    $Nas configurações, você pode alterar a velocidade do jogo,
+    $o estilo da janela, entre outras opções. 
+    $Existem também vários outros recursos disponíveis aqui.
+    $Não deixe de conferir todos eles!`,

-    "starterSelect": `Nessa tela, você pode selecionar seus iniciais.\nEsses são os Pokémon iniciais da sua equipe. 
-    $Cada inicial tem seu próprio custo. Sua equipe pode ter até \n6 membros contando que o preço não ultrapasse 10. 
-    $Você pode também selecionar o gênero, habilidade, e formas dependendo \ndas variantes que você capturou ou chocou. 
-    $Os IVs da espécie são os melhores de todos que você \njá capturou ou chocou, então tente conseguir vários Pokémon da mesma espécie!`,
+    "starterSelect": `Aqui você pode escolher seus iniciais.\nEsses serão os primeiro Pokémon da sua equipe. 
+    $Cada inicial tem seu custo. Sua equipe pode ter até 6\nmembros, desde que a soma dos custos não ultrapasse 10. 
+    $Você pode escolher o gênero, a habilidade\ne até a forma do seu inicial.
+    $Essas opções dependem das variantes dessa\nespécie que você já capturou ou chocou. 
+    $Os IVs de cada inicial são os melhores de todos os Pokémon\ndaquela espécie que você já capturou ou chocou.
+    $Sempre capture vários Pokémon de várias espécies!`,

    "pokerus": `Todo dia, 3 Pokémon iniciais ficam com uma borda roxa.
    $Caso veja um inicial que você possui com uma dessa, tente\nadicioná-lo a sua equipe. Lembre-se de olhar seu sumário!`,

-    "statChange": `As mudanças de estatísticas se mantém depois do combate\ndesde que o Pokémon não seja trocado.
+    "statChange": `As mudanças de atributos se mantém após a batalha desde que o Pokémon não seja trocado.
    $Seus Pokémon voltam a suas Poké Bolas antes de batalhas contra treinadores e de entrar em um novo bioma.
-    $Também é possível ver as mudanças de estatísticas dos Pokémon em campo mantendo pressionado C ou Shift.`,
+    $Para ver as mudanças de atributos dos Pokémon em campo, mantena C ou Shift pressionado durante a batalha.`,

-    "selectItem": `Após cada batalha você pode escolher entre 3 itens aleatórios.\nVocê pode escolher apenas um.
-    $Esses variam entre consumíveis, itens de segurar, e itens passivos permanentes.
-    $A maioria dos efeitos de itens não consumíveis serão acumulados de várias maneiras.
-    $Alguns itens só aparecerão se puderem ser usados, por exemplo, itens de evolução.
-    $Você também pode transferir itens de segurar entre os Pokémon utilizando a opção de transferir.
+    "selectItem": `Após cada batalha, você pode escolher entre 3 itens aleatórios.
+    $Você pode escolher apenas um deles.
+    $Esses itens variam entre consumíveis, itens de segurar e itens passivos permanentes.
+    $A maioria dos efeitos de itens não consumíveis podem ser acumulados.
+    $Alguns itens só aparecerão se puderem ser usados, como os itens de evolução.
+    $Você também pode transferir itens de segurar entre os Pokémon utilizando a opção "Transfer".
    $A opção de transferir irá aparecer no canto inferior direito assim que você obter um item de segurar.
-    $Você pode comprar itens consumíveis com dinheiro, e uma maior variedade ficará disponível conforme você for mais longe.
-    $Certifique-se de comprá-los antes de escolher seu item aleatório. Ao escolher, a próxima batalha começará.`,
+    $Você pode comprar itens consumíveis com dinheiro, e sua variedade aumentará conforme você for mais longe.
+    $Certifique-se de comprá-los antes de escolher seu item aleatório. Ao escolhê-lo, a próxima batalha começará.`,

-    "eggGacha": `Nesta tela você pode trocar seus vouchers\npor ovos de Pokémon.
-    $Ovos ficam mais próximos de chocar depois de cada batalha.\nOvos raros demoram mais para chocar.
+    "eggGacha": `Aqui você pode trocar seus vouchers\npor ovos de Pokémon.
+    $Ovos ficam mais próximos de chocar após cada batalha.\nOvos mais raros demoram mais para chocar.
    $Pokémon chocados não serão adicionados a sua equipe,\nmas sim aos seus iniciais.
    $Pokémon chocados geralmente possuem IVs melhores\nque Pokémon selvagens.
    $Alguns Pokémon só podem ser obtidos através de seus ovos.
-    $Há 3 máquinas, cada uma com um bônus diferente,\nentão escolha a que mais lhe convém!`,
+    $Temos 3 máquinas, cada uma com seu bônus específico,\nentão escolha a que mais lhe convém!`,
 } as const;
--- a/src/locales/zh_CN/ability-trigger.ts
+++ b/src/locales/zh_CN/ability-trigger.ts
@ -0,0 +1,5 @@
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
+
+export const abilityTriggers: SimpleTranslationEntries = {
+    'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
+} as const;
--- a/src/locales/zh_CN/config.ts
+++ b/src/locales/zh_CN/config.ts
@ -1,4 +1,5 @@
 import { ability } from "./ability";
+import { abilityTriggers } from "./ability-trigger";
 import { battle } from "./battle";
 import { commandUiHandler } from "./command-ui-handler";
 import { fightUiHandler } from "./fight-ui-handler";
@ -15,6 +16,7 @@ import { nature } from "./nature";

 export const zhCnConfig = {
    ability: ability,
+    abilityTriggers: abilityTriggers,
    battle: battle,
    commandUiHandler: commandUiHandler,
    fightUiHandler: fightUiHandler,
--- a/src/locales/zh_CN/move.ts
+++ b/src/locales/zh_CN/move.ts
@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
  },
  "zippyZap": {
    name: "电电加速",
-    effect: "迅猛无比的电击。必定能够\n先制攻击，击中对方的要害",
+    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness.",
  },
  "splishySplash": {
    name: "滔滔冲浪",
--- a/src/locales/zh_CN/starter-select-ui-handler.ts
+++ b/src/locales/zh_CN/starter-select-ui-handler.ts
@ -30,5 +30,6 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
    "enablePassive": "启用被动",
    "disablePassive": "禁用被动",
    "locked": "Locked",
-    "disabled": "Disabled"
+    "disabled": "Disabled",
+    "uncaught": "Uncaught"
 }
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@ -554,10 +554,10 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge
    super(Utils.toReadableString(EvolutionItem[evolutionItem]), `Causes certain Pokémon to evolve`, (_type, args) => new Modifiers.EvolutionItemModifier(this, (args[0] as PlayerPokemon).id),
    (pokemon: PlayerPokemon) => {
      if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === this.evolutionItem
-        && (!e.condition || e.condition.predicate(pokemon))).length)
+          && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX))
        return null;
      else if (pokemon.isFusion() && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === this.evolutionItem
-        && (!e.condition || e.condition.predicate(pokemon))).length)
+        && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX))
        return null;

      return PartyUiHandler.NoEffectMessage;
@ -925,6 +925,9 @@ export const modifierTypes = {
  FOCUS_BAND: () => new PokemonHeldItemModifierType('Focus Band', 'Adds a 10% chance to survive with 1 HP after being damaged enough to faint',
    (type, args) => new Modifiers.SurviveDamageModifier(type, (args[0] as Pokemon).id)),

+  QUICK_CLAW: () => new PokemonHeldItemModifierType('Quick Claw', 'Adds a 10% chance to move first regardless of speed (after priority)',
+    (type, args) => new Modifiers.BypassSpeedChanceModifier(type, (args[0] as Pokemon).id)),
+
  KINGS_ROCK: () => new PokemonHeldItemModifierType('King\'s Rock', 'Adds a 10% chance an attack move will cause the opponent to flinch',
    (type, args) => new Modifiers.FlinchChanceModifier(type, (args[0] as Pokemon).id)),

@ -1087,6 +1090,7 @@ const modifierPool: ModifierPool = {
    new WeightedModifierType(modifierTypes.SOOTHE_BELL, 4),
    new WeightedModifierType(modifierTypes.ABILITY_CHARM, 6),
    new WeightedModifierType(modifierTypes.FOCUS_BAND, 5),
+    new WeightedModifierType(modifierTypes.QUICK_CLAW, 3),
    new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
    new WeightedModifierType(modifierTypes.LOCK_CAPSULE, 3),
    new WeightedModifierType(modifierTypes.SUPER_EXP_CHARM, 10),
@ -1138,6 +1142,7 @@ const trainerModifierPool: ModifierPool = {
    new WeightedModifierType(modifierTypes.REVIVER_SEED, 2),
    new WeightedModifierType(modifierTypes.FOCUS_BAND, 2),
    new WeightedModifierType(modifierTypes.LUCKY_EGG, 4),
+    new WeightedModifierType(modifierTypes.QUICK_CLAW, 1),
    new WeightedModifierType(modifierTypes.GRIP_CLAW, 1),
    new WeightedModifierType(modifierTypes.WIDE_LENS, 1),
  ].map(m => { m.setTier(ModifierTier.ROGUE); return m; }),
@ -1198,6 +1203,7 @@ const dailyStarterModifierPool: ModifierPool = {
    new WeightedModifierType(modifierTypes.GRIP_CLAW, 5),
    new WeightedModifierType(modifierTypes.BATON, 2),
    new WeightedModifierType(modifierTypes.FOCUS_BAND, 5),
+    new WeightedModifierType(modifierTypes.QUICK_CLAW, 3),
    new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
  ].map(m => { m.setTier(ModifierTier.ROGUE); return m; }),
  [ModifierTier.MASTER]: [
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@ -635,6 +635,9 @@ export class PokemonBaseStatModifier extends PokemonHeldItemModifier {
  }
 }

+  /**
+ * Applies Specific Type item boosts (e.g., Magnet)
+ */
 export class AttackTypeBoosterModifier extends PokemonHeldItemModifier {
  private moveType: Type;
  private boostMultiplier: number;
@ -667,8 +670,15 @@ export class AttackTypeBoosterModifier extends PokemonHeldItemModifier {
    return super.shouldApply(args) && args.length === 3 && typeof args[1] === 'number' && args[2] instanceof Utils.NumberHolder;
  }

+  /**
+ * @param {Array<any>} args Array 
+ *                          - Index 0: {Pokemon} Pokemon
+ *                          - Index 1: {number} Move type
+ *                          - Index 2: {Utils.NumberHolder} Move power
+ * @returns {boolean} Returns true if boosts have been applied to the move.
+ */
  apply(args: any[]): boolean {
-    if (args[1] === this.moveType) {
+    if (args[1] === this.moveType && (args[2] as Utils.NumberHolder).value >= 1) {
      (args[2] as Utils.NumberHolder).value = Math.floor((args[2] as Utils.NumberHolder).value * (1 + (this.getStackCount() * this.boostMultiplier)));
      return true;
    }
@ -721,6 +731,40 @@ export class SurviveDamageModifier extends PokemonHeldItemModifier {
  }
 }

+export class BypassSpeedChanceModifier extends PokemonHeldItemModifier {
+  constructor(type: ModifierType, pokemonId: integer, stackCount?: integer) {
+    super(type, pokemonId, stackCount);
+  }
+
+  matchType(modifier: Modifier) {
+    return modifier instanceof BypassSpeedChanceModifier;
+  }
+
+  clone() {
+    return new BypassSpeedChanceModifier(this.type, this.pokemonId, this.stackCount);
+  }
+
+  shouldApply(args: any[]): boolean {
+    return super.shouldApply(args) && args.length === 2 && args[1] instanceof Utils.BooleanHolder;
+  }
+
+  apply(args: any[]): boolean {
+    const pokemon = args[0] as Pokemon;
+    const bypassSpeed = args[1] as Utils.BooleanHolder;
+
+    if (!bypassSpeed.value && pokemon.randSeedInt(10) < this.getStackCount()) {
+      bypassSpeed.value = true;
+      return true;
+    }
+
+    return false;
+  }
+
+  getMaxHeldItemCount(pokemon: Pokemon): integer {
+    return 3;
+  }
+}
+
 export class FlinchChanceModifier extends PokemonHeldItemModifier {
  constructor(type: ModifierType, pokemonId: integer, stackCount?: integer) {
    super(type, pokemonId, stackCount);
--- a/src/phases.ts
+++ b/src/phases.ts
@ -2,11 +2,11 @@ import BattleScene, { AnySound, bypassLogin, startingWave } from "./battle-scene
 import { default as Pokemon, PlayerPokemon, EnemyPokemon, PokemonMove, MoveResult, DamageResult, FieldPosition, HitResult, TurnMove } from "./field/pokemon";
 import * as Utils from './utils';
 import { Moves } from "./data/enums/moves";
-import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMoveAttrs, HitsTagAttr, MissEffectAttr, MoveAttr, MoveEffectAttr, MoveFlags, MultiHitAttr, OverrideMoveEffectAttr, VariableAccuracyAttr, MoveTarget, OneHitKOAttr, getMoveTargets, MoveTargetSet, MoveEffectTrigger, CopyMoveAttr, AttackMove, SelfStatusMove, DelayedAttackAttr, RechargeAttr, PreMoveMessageAttr, HealStatusEffectAttr, IgnoreOpponentStatChangesAttr, NoEffectAttr, BypassRedirectAttr, FixedDamageAttr, PostVictoryStatChangeAttr, OneHitKOAccuracyAttr, ForceSwitchOutAttr, VariableTargetAttr } from "./data/move";
+import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMoveAttrs, HitsTagAttr, MissEffectAttr, MoveAttr, MoveEffectAttr, MoveFlags, MultiHitAttr, OverrideMoveEffectAttr, VariableAccuracyAttr, MoveTarget, OneHitKOAttr, getMoveTargets, MoveTargetSet, MoveEffectTrigger, CopyMoveAttr, AttackMove, SelfStatusMove, DelayedAttackAttr, RechargeAttr, PreMoveMessageAttr, HealStatusEffectAttr, IgnoreOpponentStatChangesAttr, NoEffectAttr, BypassRedirectAttr, FixedDamageAttr, PostVictoryStatChangeAttr, OneHitKOAccuracyAttr, ForceSwitchOutAttr, VariableTargetAttr, SacrificialAttr } from "./data/move";
 import { Mode } from './ui/ui';
 import { Command } from "./ui/command-ui-handler";
 import { Stat } from "./data/pokemon-stat";
-import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier, IvScannerModifier, LapsingPokemonHeldItemModifier, PokemonMultiHitModifier, PokemonMoveAccuracyBoosterModifier, overrideModifiers, overrideHeldItems } from "./modifier/modifier";
+import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier, IvScannerModifier, LapsingPokemonHeldItemModifier, PokemonMultiHitModifier, PokemonMoveAccuracyBoosterModifier, overrideModifiers, overrideHeldItems, BypassSpeedChanceModifier } from "./modifier/modifier";
 import PartyUiHandler, { PartyOption, PartyUiMode } from "./ui/party-ui-handler";
 import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "./data/pokeball";
 import { CommonAnim, CommonBattleAnim, MoveAnim, initMoveAnim, loadMoveAnimAssets } from "./data/battle-anims";
@ -289,7 +289,7 @@ export class TitlePhase extends Phase {
      }
      this.scene.sessionSlotId = slotId;

-      fetchDailyRunSeed().then(seed => {
+      const generateDaily = (seed: string) => {
        this.scene.gameMode = gameModes[GameModes.DAILY];

        this.scene.setSeed(seed);
@ -330,11 +330,21 @@ export class TitlePhase extends Phase {
          this.scene.newBattle();
          this.scene.arena.init();
          this.scene.sessionPlayTime = 0;
+          this.scene.lastSavePlayTime = 0;
          this.end();
        });
+      };
+      
+      // If Online, calls seed fetch from db to generate daily run. If Offline, generates a daily run based on current date.
+      if (!Utils.isLocal) {
+        fetchDailyRunSeed().then(seed => {
+          generateDaily(seed);
        }).catch(err => {
          console.error("Failed to load daily run:\n", err);
        });
+      } else {
+        generateDaily(btoa(new Date().toISOString().substring(0, 10)));
+      }
    });
  }

@ -384,8 +394,12 @@ export class UnavailablePhase extends Phase {
 }

 export class ReloadSessionPhase extends Phase {
-  constructor(scene: BattleScene) {
+  private systemDataStr: string;
+
+  constructor(scene: BattleScene, systemDataStr?: string) {
    super(scene);
+
+    this.systemDataStr = systemDataStr;
  }

  start(): void {
@ -401,7 +415,9 @@ export class ReloadSessionPhase extends Phase {
        delayElapsed = true;
    });

-    this.scene.gameData.loadSystem().then(() => {
+    this.scene.gameData.clearLocalData();
+
+    (this.systemDataStr ? this.scene.gameData.initSystem(this.systemDataStr) : this.scene.gameData.loadSystem()).then(() => {
      if (delayElapsed)
        this.end();
      else
@ -522,6 +538,7 @@ export class SelectStarterPhase extends Phase {
          this.scene.newBattle();
          this.scene.arena.init();
          this.scene.sessionPlayTime = 0;
+          this.scene.lastSavePlayTime = 0;
          this.end();
        });
      });
@ -775,7 +792,7 @@ export class EncounterPhase extends BattlePhase {

      this.scene.ui.setMode(Mode.MESSAGE).then(() => {
        if (!this.loaded) {
-          this.scene.gameData.saveAll(this.scene, true).then(success => {
+          this.scene.gameData.saveAll(this.scene, true, battle.waveIndex % 10 === 1 || this.scene.lastSavePlayTime >= 300).then(success => {
            this.scene.disableMenu = false;
            if (!success)
              return this.scene.reset(true);
@ -1953,6 +1970,14 @@ export class TurnStartPhase extends FieldPhase {
    const field = this.scene.getField();
    const order = this.getOrder();

+    const battlerBypassSpeed = {};
+
+    this.scene.getField(true).filter(p => p.summonData).map(p => {
+      const bypassSpeed = new Utils.BooleanHolder(false);
+      this.scene.applyModifiers(BypassSpeedChanceModifier, p.isPlayer(), p, bypassSpeed);
+      battlerBypassSpeed[p.getBattlerIndex()] = bypassSpeed;
+    });
+
    const moveOrder = order.slice(0);

    moveOrder.sort((a, b) => {
@ -1978,6 +2003,9 @@ export class TurnStartPhase extends FieldPhase {
          return aPriority.value < bPriority.value ? 1 : -1;
      }

+      if (battlerBypassSpeed[a].value !== battlerBypassSpeed[b].value)
+        return battlerBypassSpeed[a].value ? -1 : 1;
+      
      const aIndex = order.indexOf(a);
      const bIndex = order.indexOf(b);

@ -2294,7 +2322,7 @@ export class MovePhase extends BattlePhase {
      if (this.move.moveId)
        this.showMoveText();

-      if ((moveQueue.length && moveQueue[0].move === Moves.NONE) || !targets.length) {
+      if ((moveQueue.length && moveQueue[0].move === Moves.NONE) || (!targets.length && !this.move.getMove().getAttrs(SacrificialAttr).length)) {
        moveQueue.shift();
        this.cancel();
        this.pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.FAIL });
@ -2526,8 +2554,14 @@ export class MoveEffectPhase extends PokemonPhase {
          }));
        }
        // Trigger effect which should only apply one time after all targeted effects have already applied
-        applyFilteredMoveAttrs((attr: MoveAttr) => attr instanceof MoveEffectAttr && (attr as MoveEffectAttr).trigger === MoveEffectTrigger.POST_TARGET,
-              user, null, this.move.getMove())
+        const postTarget = applyFilteredMoveAttrs((attr: MoveAttr) => attr instanceof MoveEffectAttr && (attr as MoveEffectAttr).trigger === MoveEffectTrigger.POST_TARGET,
+          user, null, this.move.getMove());
+        
+        if (applyAttrs.length)  // If there is a pending asynchronous move effect, do this after
+          applyAttrs[applyAttrs.length - 1]?.then(() => postTarget);
+        else // Otherwise, push a new asynchronous move effect
+          applyAttrs.push(postTarget);
+
        Promise.allSettled(applyAttrs).then(() => this.end());
      });
    });
@ -2941,19 +2975,21 @@ export class ObtainStatusEffectPhase extends PokemonPhase {
  private statusEffect: StatusEffect;
  private cureTurn: integer;
  private sourceText: string;
+  private sourcePokemon: Pokemon;

-  constructor(scene: BattleScene, battlerIndex: BattlerIndex, statusEffect: StatusEffect, cureTurn?: integer, sourceText?: string) {
+  constructor(scene: BattleScene, battlerIndex: BattlerIndex, statusEffect: StatusEffect, cureTurn?: integer, sourceText?: string, sourcePokemon?: Pokemon) {
    super(scene, battlerIndex);

    this.statusEffect = statusEffect;
    this.cureTurn = cureTurn;
    this.sourceText = sourceText;
+    this.sourcePokemon = sourcePokemon; // For tracking which Pokemon caused the status effect
  }

  start() {
    const pokemon = this.getPokemon();
    if (!pokemon.status) {
-      if (pokemon.trySetStatus(this.statusEffect)) {
+      if (pokemon.trySetStatus(this.statusEffect, false, this.sourcePokemon)) {
        if (this.cureTurn)
          pokemon.status.cureTurn = this.cureTurn;
        pokemon.updateInfo(true);
@ -3620,10 +3656,20 @@ export class GameOverPhase extends BattlePhase {
        });
      });
    };
+
+    /* Added a local check to see if the game is running offline on victory
+    If Online, execute apiFetch as intended
+    If Offline, execute offlineNewClear(), a localStorage implementation of newClear daily run checks */
    if (this.victory) {
+      if (!Utils.isLocal) {
        Utils.apiFetch(`savedata/newclear?slot=${this.scene.sessionSlotId}`, true)
        .then(response => response.json())
        .then(newClear => doGameOver(newClear));
+      } else {
+        this.scene.gameData.offlineNewClear(this.scene).then(result => {
+          doGameOver(result);
+        });
+      }
    } else
      doGameOver(false);
  }
@ -3681,7 +3727,7 @@ export class PostGameOverPhase extends Phase {
  start() {
    super.start();

-    this.scene.gameData.saveSystem().then(success => {
+    this.scene.gameData.saveAll(this.scene, true, true, true).then(success => {
      if (!success)
        return this.scene.reset(true);
      this.scene.gameData.tryClearSession(this.scene, this.scene.sessionSlotId).then((success: boolean | [boolean, boolean]) => {
--- a/src/plugins/i18n.ts
+++ b/src/plugins/i18n.ts
@ -98,7 +98,8 @@ declare module 'i18next' {
      menu: SimpleTranslationEntries;
      menuUiHandler: SimpleTranslationEntries;
      move: MoveTranslationEntries;
-      battle: SimpleTranslationEntries,
+      battle: SimpleTranslationEntries;
+      abilityTriggers: SimpleTranslationEntries;
      ability: AbilityTranslationEntries;
      pokeball: SimpleTranslationEntries;
      pokemon: SimpleTranslationEntries;
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@ -20,7 +20,7 @@ import { Egg } from "../data/egg";
 import { VoucherType, vouchers } from "./voucher";
 import { AES, enc } from "crypto-js";
 import { Mode } from "../ui/ui";
-import { loggedInUser, updateUserInfo } from "../account";
+import { clientSessionId, loggedInUser, updateUserInfo } from "../account";
 import { Nature } from "../data/nature";
 import { GameStats } from "./game-stats";
 import { Tutorial } from "../tutorial";
@ -67,6 +67,18 @@ export function getDataTypeKey(dataType: GameDataType, slotId: integer = 0): str
  }
 }

+function encrypt(data: string, bypassLogin: boolean): string {
+  return (bypassLogin
+    ? (data: string) => btoa(data)
+    : (data: string) => AES.encrypt(data, saveKey))(data);
+}
+
+function decrypt(data: string, bypassLogin: boolean): string {
+  return (bypassLogin
+    ? (data: string) => atob(data)
+    : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8))(data);
+}
+
 interface SystemSaveData {
  trainerId: integer;
  secretId: integer;
@ -277,8 +289,10 @@ export class GameData {
      const maxIntAttrValue = Math.pow(2, 31);
      const systemData = JSON.stringify(data, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v);

+      localStorage.setItem(`data_${loggedInUser.username}`, encrypt(systemData, bypassLogin));
+
      if (!bypassLogin) {
-        Utils.apiPost(`savedata/update?datatype=${GameDataType.SYSTEM}`, systemData, undefined, true)
+        Utils.apiPost(`savedata/update?datatype=${GameDataType.SYSTEM}&clientSessionId=${clientSessionId}`, systemData, undefined, true)
          .then(response => response.text())
          .then(error => {
            this.scene.ui.savingIcon.hide();
@ -296,10 +310,6 @@ export class GameData {
            resolve(true);
          });
      } else {
-        localStorage.setItem('data_bak', localStorage.getItem('data'));
-
-        localStorage.setItem('data', btoa(systemData));
-
        this.scene.ui.savingIcon.hide();

        resolve(true);
@ -309,12 +319,48 @@ export class GameData {

  public loadSystem(): Promise<boolean> {
    return new Promise<boolean>(resolve => {
-      if (bypassLogin && !localStorage.hasOwnProperty('data'))
+      console.log('Client Session:', clientSessionId);
+
+      if (bypassLogin && !localStorage.getItem(`data_${loggedInUser.username}`))
        return resolve(false);

-      const handleSystemData = (systemDataStr: string) => {
+      if (!bypassLogin) {
+        Utils.apiFetch(`savedata/system?clientSessionId=${clientSessionId}`, true)
+          .then(response => response.text())
+          .then(response => {
+            if (!response.length || response[0] !== '{') {
+              if (response.startsWith('sql: no rows in result set')) {
+                this.scene.queueMessage('Save data could not be found. If this is a new account, you can safely ignore this message.', null, true);
+                return resolve(true);
+              } else if (response.indexOf('Too many connections') > -1) {
+                this.scene.queueMessage('Too many people are trying to connect and the server is overloaded. Please try again later.', null, true);
+                return resolve(false);
+              }
+              console.error(response);
+              return resolve(false);
+            }
+
+            const cachedSystem = localStorage.getItem(`data_${loggedInUser.username}`);
+            this.initSystem(response, cachedSystem ? AES.decrypt(cachedSystem, saveKey).toString(enc.Utf8) : null).then(resolve);
+          });
+      } else
+        this.initSystem(decrypt(localStorage.getItem(`data_${loggedInUser.username}`), bypassLogin)).then(resolve);
+    });
+  }
+
+  public initSystem(systemDataStr: string, cachedSystemDataStr?: string): Promise<boolean> {
+    return new Promise<boolean>(resolve => {
      try {
-          const systemData = this.parseSystemData(systemDataStr);
+        let systemData = this.parseSystemData(systemDataStr);
+
+        if (cachedSystemDataStr) {
+          let cachedSystemData = this.parseSystemData(cachedSystemDataStr);
+          if (cachedSystemData.timestamp > systemData.timestamp) {
+            console.debug('Use cached system');
+            systemData = cachedSystemData;
+          } else
+            this.clearLocalData();
+        }

        console.debug(systemData);

@ -419,28 +465,6 @@ export class GameData {
        console.error(err);
        resolve(false);
      }
-      }
-
-      if (!bypassLogin) {
-        Utils.apiFetch(`savedata/get?datatype=${GameDataType.SYSTEM}`, true)
-          .then(response => response.text())
-          .then(response => {
-            if (!response.length || response[0] !== '{') {
-              if (response.startsWith('sql: no rows in result set')) {
-                this.scene.queueMessage('Save data could not be found. If this is a new account, you can safely ignore this message.', null, true);
-                return resolve(true);
-              } else if (response.indexOf('Too many connections') > -1) {
-                this.scene.queueMessage('Too many people are trying to connect and the server is overloaded. Please try again later.', null, true);
-                return resolve(false);
-              }
-              console.error(response);
-              return resolve(false);
-            }
-
-            handleSystemData(response);
-          });
-      } else
-        handleSystemData(atob(localStorage.getItem('data')));
    });
  }

@ -474,6 +498,31 @@ export class GameData {
    return dataStr;
  }

+  public async verify(): Promise<boolean> {
+    if (bypassLogin)
+        return true;
+
+    const response = await Utils.apiPost(`savedata/system/verify`, JSON.stringify({ clientSessionId: clientSessionId }), undefined, true)
+      .then(response => response.json());
+
+    if (!response.valid) {
+      this.scene.clearPhaseQueue();
+      this.scene.unshiftPhase(new ReloadSessionPhase(this.scene, JSON.stringify(response.systemData)));
+      this.clearLocalData();
+      return false;
+    }
+
+    return true;
+  }
+
+  public clearLocalData(): void {
+    if (bypassLogin)
+      return;
+    localStorage.removeItem(`data_${loggedInUser.username}`);
+    for (let s = 0; s < 5; s++)
+      localStorage.removeItem(`sessionData${s ? s : ''}_${loggedInUser.username}`);
+  }
+
  public saveSetting(setting: Setting, valueIndex: integer): boolean {
    let settings: object = {};
    if (localStorage.hasOwnProperty('settings'))
@ -557,40 +606,6 @@ export class GameData {
    } as SessionSaveData;
  }

-  saveSession(scene: BattleScene, skipVerification?: boolean): Promise<boolean> {
-    return new Promise<boolean>(resolve => {
-      Utils.executeIf(!skipVerification, updateUserInfo).then(success => {
-        if (success !== null && !success)
-          return resolve(false);
-
-        const sessionData = this.getSessionSaveData(scene);
-
-        if (!bypassLogin) {
-          Utils.apiPost(`savedata/update?datatype=${GameDataType.SESSION}&slot=${scene.sessionSlotId}&trainerId=${this.trainerId}&secretId=${this.secretId}`, JSON.stringify(sessionData), undefined, true)
-            .then(response => response.text())
-            .then(error => {
-              if (error) {
-                if (error.startsWith('session out of date')) {
-                  this.scene.clearPhaseQueue();
-                  this.scene.unshiftPhase(new ReloadSessionPhase(this.scene));
-                }
-                console.error(error);
-                return resolve(false);
-              }
-              console.debug('Session data saved');
-              resolve(true);
-            });
-        } else {
-          localStorage.setItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`, btoa(JSON.stringify(sessionData)));
-
-          console.debug('Session data saved');
-
-          resolve(true);
-        }
-      });
-    });
-  }
-
  getSession(slotId: integer): Promise<SessionSaveData> {
    return new Promise(async (resolve, reject) => {
      if (slotId < 0)
@ -605,8 +620,8 @@ export class GameData {
        }
      };

-      if (!bypassLogin) {
-        Utils.apiFetch(`savedata/get?datatype=${GameDataType.SESSION}&slot=${slotId}`, true)
+      if (!bypassLogin && !localStorage.getItem(`sessionData${slotId ? slotId : ''}_${loggedInUser.username}`)) {
+        Utils.apiFetch(`savedata/session?slot=${slotId}&clientSessionId=${clientSessionId}`, true)
          .then(response => response.text())
          .then(async response => {
            if (!response.length || response[0] !== '{') {
@ -614,12 +629,14 @@ export class GameData {
              return resolve(null);
            }

+            localStorage.setItem(`sessionData${slotId ? slotId : ''}_${loggedInUser.username}`, encrypt(response, bypassLogin));
+
            await handleSessionData(response);
          });
      } else {
-        const sessionData = localStorage.getItem(`sessionData${slotId ? slotId : ''}`);
+        const sessionData = localStorage.getItem(`sessionData${slotId ? slotId : ''}_${loggedInUser.username}`);
        if (sessionData)
-          await handleSessionData(atob(sessionData));
+          await handleSessionData(decrypt(sessionData, bypassLogin));
        else
          return resolve(null);
      }
@ -640,6 +657,7 @@ export class GameData {
          console.log('Seed:', scene.seed);

          scene.sessionPlayTime = sessionData.playTime || 0;
+          scene.lastSavePlayTime = 0;

          const loadPokemonAssets: Promise<void>[] = [];

@ -731,16 +749,17 @@ export class GameData {
  deleteSession(slotId: integer): Promise<boolean> {
    return new Promise<boolean>(resolve => {
      if (bypassLogin) {
-        localStorage.removeItem('sessionData');
+        localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}_${loggedInUser.username}`);
        return resolve(true);
      }

      updateUserInfo().then(success => {
        if (success !== null && !success)
          return resolve(false);
-        Utils.apiFetch(`savedata/delete?datatype=${GameDataType.SESSION}&slot=${slotId}`, true).then(response => {
+        Utils.apiFetch(`savedata/delete?datatype=${GameDataType.SESSION}&slot=${slotId}&clientSessionId=${clientSessionId}`, true).then(response => {
          if (response.ok) {
            loggedInUser.lastSessionSlot = -1;
+            localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}_${loggedInUser.username}`);
            resolve(true);
          }
          return response.text();
@ -759,10 +778,40 @@ export class GameData {
    });
  }

+  /* Defines a localStorage item 'daily' to check on clears, offline implementation of savedata/newclear API
+  If a GameModes clear other than Daily is checked, newClear = true as usual
+  If a Daily mode is cleared, checks if it was already cleared before, based on seed, and returns true only to new daily clear runs */
+  offlineNewClear(scene: BattleScene): Promise<boolean> {
+    return new Promise<boolean>(resolve => {
+      const sessionData = this.getSessionSaveData(scene);
+      const seed = sessionData.seed;
+      let daily: string[] = [];
+
+      if (sessionData.gameMode == GameModes.DAILY) {
+        if (localStorage.hasOwnProperty('daily')) {
+          daily = JSON.parse(atob(localStorage.getItem('daily')));
+          if (daily.includes(seed)) {
+            return resolve(false);
+          } else {
+            daily.push(seed);
+            localStorage.setItem('daily', btoa(JSON.stringify(daily)));
+            return resolve(true);
+          }
+        } else {
+          daily.push(seed);
+          localStorage.setItem('daily', btoa(JSON.stringify(daily)));
+          return resolve(true);
+        }
+      } else {
+        return resolve(true);
+      }
+    });
+  }
+
  tryClearSession(scene: BattleScene, slotId: integer): Promise<[success: boolean, newClear: boolean]> {
    return new Promise<[boolean, boolean]>(resolve => {
      if (bypassLogin) {
-        localStorage.removeItem(`sessionData${slotId ? slotId : ''}`);
+        localStorage.removeItem(`sessionData${slotId ? slotId : ''}_${loggedInUser.username}`);
        return resolve([true, true]);
      }

@ -770,9 +819,11 @@ export class GameData {
        if (success !== null && !success)
          return resolve([false, false]);
        const sessionData = this.getSessionSaveData(scene);
-        Utils.apiPost(`savedata/clear?slot=${slotId}&trainerId=${this.trainerId}&secretId=${this.secretId}`, JSON.stringify(sessionData), undefined, true).then(response => {
-          if (response.ok)
+        Utils.apiPost(`savedata/clear?slot=${slotId}&trainerId=${this.trainerId}&secretId=${this.secretId}&clientSessionId=${clientSessionId}`, JSON.stringify(sessionData), undefined, true).then(response => {
+          if (response.ok) {
            loggedInUser.lastSessionSlot = -1;
+            localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}_${loggedInUser.username}`);
+          }
          return response.json();
        }).then(jsonResponse => {
          if (!jsonResponse.error)
@ -825,14 +876,14 @@ export class GameData {
    }) as SessionSaveData;
  }

-  saveAll(scene: BattleScene, skipVerification?: boolean): Promise<boolean> {
+  saveAll(scene: BattleScene, skipVerification: boolean = false, sync: boolean = false, useCachedSession: boolean = false): Promise<boolean> {
    return new Promise<boolean>(resolve => {
      Utils.executeIf(!skipVerification, updateUserInfo).then(success => {
        if (success !== null && !success)
          return resolve(false);
+        if (sync)
          this.scene.ui.savingIcon.show();
-        const data = this.getSystemSaveData();
-        const sessionData = this.getSessionSaveData(scene);
+        const sessionData = useCachedSession ? this.parseSessionData(decrypt(localStorage.getItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}_${loggedInUser.username}`), bypassLogin)) : this.getSessionSaveData(scene);

        const maxIntAttrValue = Math.pow(2, 31);
        const systemData = this.getSystemSaveData();
@ -840,14 +891,24 @@ export class GameData {
        const request = {
          system: systemData,
          session: sessionData,
-          sessionSlotId: scene.sessionSlotId
+          sessionSlotId: scene.sessionSlotId,
+          clientSessionId: clientSessionId
        };

-        if (!bypassLogin) {
+        localStorage.setItem(`data_${loggedInUser.username}`, encrypt(JSON.stringify(systemData, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), bypassLogin));
+
+        localStorage.setItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}_${loggedInUser.username}`, encrypt(JSON.stringify(sessionData), bypassLogin));
+
+        console.debug('Session data saved');
+
+        if (!bypassLogin && sync) {
          Utils.apiPost('savedata/updateall', JSON.stringify(request, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), undefined, true)
            .then(response => response.text())
            .then(error => {
+              if (sync) {
+                this.scene.lastSavePlayTime = 0;
                this.scene.ui.savingIcon.hide();
+              }
              if (error) {
                if (error.startsWith('client version out of date')) {
                  this.scene.clearPhaseQueue();
@ -862,17 +923,10 @@ export class GameData {
              resolve(true);
            });
        } else {
-          localStorage.setItem('data_bak', localStorage.getItem('data'));
-
-          localStorage.setItem('data', btoa(JSON.stringify(systemData, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v)));
-
-          localStorage.setItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`, btoa(JSON.stringify(sessionData)));
-
-          console.debug('Session data saved');
-
+          this.verify().then(success => {
            this.scene.ui.savingIcon.hide();
-
-          resolve(true);
+            resolve(success);
+          });
        }
      });
    });
@ -880,7 +934,7 @@ export class GameData {

  public tryExportData(dataType: GameDataType, slotId: integer = 0): Promise<boolean> {
    return new Promise<boolean>(resolve => {
-      const dataKey: string = getDataTypeKey(dataType, slotId);
+      const dataKey: string = `${getDataTypeKey(dataType, slotId)}_${loggedInUser.username}`;
      const handleData = (dataStr: string) => {
        switch (dataType) {
          case GameDataType.SYSTEM:
@ -896,7 +950,7 @@ export class GameData {
        link.remove();
      };
      if (!bypassLogin && dataType < GameDataType.SETTINGS) {
-        Utils.apiFetch(`savedata/get?datatype=${dataType}${dataType === GameDataType.SESSION ? `&slot=${slotId}` : ''}`, true)
+        Utils.apiFetch(`savedata/${dataType === GameDataType.SYSTEM ? 'system' : 'session'}?clientSessionId=${clientSessionId}${dataType === GameDataType.SESSION ? `&slot=${slotId}` : ''}`, true)
          .then(response => response.text())
          .then(response => {
            if (!response.length || response[0] !== '{') {
@ -911,14 +965,14 @@ export class GameData {
      } else {
        const data = localStorage.getItem(dataKey);
        if (data)
-          handleData(atob(data));
+          handleData(decrypt(data, bypassLogin));
        resolve(!!data);
      }
    });
  }

  public importData(dataType: GameDataType, slotId: integer = 0): void {
-    const dataKey = getDataTypeKey(dataType, slotId);
+    const dataKey = `${getDataTypeKey(dataType, slotId)}_${loggedInUser.username}`;

    let saveFile: any = document.getElementById('saveFile');
    if (saveFile)
@ -979,11 +1033,13 @@ export class GameData {
                return this.scene.ui.showText(`Your ${dataName} data could not be loaded. It may be corrupted.`, null, () => this.scene.ui.showText(null, 0), Utils.fixedInt(1500));
              this.scene.ui.showText(`Your ${dataName} data will be overridden and the page will reload. Proceed?`, null, () => {
                this.scene.ui.setOverlayMode(Mode.CONFIRM, () => {
+                  localStorage.setItem(dataKey, encrypt(dataStr, bypassLogin));
+
                  if (!bypassLogin && dataType < GameDataType.SETTINGS) {
                    updateUserInfo().then(success => {
                      if (!success)
                        return displayError(`Could not contact the server. Your ${dataName} data could not be imported.`);
-                      Utils.apiPost(`savedata/update?datatype=${dataType}${dataType === GameDataType.SESSION ? `&slot=${slotId}` : ''}&trainerId=${this.trainerId}&secretId=${this.secretId}`, dataStr, undefined, true)
+                      Utils.apiPost(`savedata/update?datatype=${dataType}${dataType === GameDataType.SESSION ? `&slot=${slotId}` : ''}&trainerId=${this.trainerId}&secretId=${this.secretId}&clientSessionId=${clientSessionId}`, dataStr, undefined, true)
                        .then(response => response.text())
                        .then(error => {
                          if (error) {
@ -993,10 +1049,8 @@ export class GameData {
                          window.location = window.location;
                        });
                    });
-                  } else {
-                    localStorage.setItem(dataKey, btoa(dataStr));
+                  } else
                    window.location = window.location;
-                  }
                }, () => {
                  this.scene.ui.revertMode();
                  this.scene.ui.showText(null, 0);
--- a/src/ui/egg-gacha-ui-handler.ts
+++ b/src/ui/egg-gacha-ui-handler.ts
@ -372,7 +372,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
        this.scene.gameData.gameStats.eggsPulled++;
      }

-      this.scene.gameData.saveSystem().then(success => {
+      (this.scene.currentBattle ? this.scene.gameData.saveAll(this.scene, true, true, true) : this.scene.gameData.saveSystem()).then(success => {
        if (!success)
          return this.scene.reset(true);
        doPull();
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@ -1,34 +1,34 @@
-import BattleScene, { starterColors } from "../battle-scene";
-import PokemonSpecies, { allSpecies, getPokemonSpecies, getPokemonSpeciesForm, speciesStarters, starterPassiveAbilities, getStarterValueFriendshipCap } from "../data/pokemon-species";
-import { Species } from "../data/enums/species";
-import { TextStyle, addBBCodeTextObject, addTextObject } from "./text";
-import { Mode } from "./ui";
-import MessageUiHandler from "./message-ui-handler";
-import { Gender, getGenderColor, getGenderSymbol } from "../data/gender";
-import { allAbilities } from "../data/ability";
-import { GameModes, gameModes } from "../game-mode";
-import { GrowthRate, getGrowthRateColor } from "../data/exp";
-import { AbilityAttr, DexAttr, DexAttrProps, DexEntry, Passive as PassiveAttr, StarterFormMoveData, StarterMoveset } from "../system/game-data";
-import * as Utils from "../utils";
-import PokemonIconAnimHandler, { PokemonIconAnimMode } from "./pokemon-icon-anim-handler";
-import { StatsContainer } from "./stats-container";
-import { addWindow } from "./ui-theme";
-import { Nature, getNatureName } from "../data/nature";
-import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
-import { pokemonFormChanges } from "../data/pokemon-forms";
-import { Tutorial, handleTutorial } from "../tutorial";
-import { LevelMoves, pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "../data/pokemon-level-moves";
-import { allMoves } from "../data/move";
-import { Type } from "../data/type";
-import { Moves } from "../data/enums/moves";
-import { speciesEggMoves } from "../data/egg-moves";
-import { TitlePhase } from "../phases";
-import { argbFromRgba } from "@material/material-color-utilities";
-import { OptionSelectItem } from "./abstact-option-select-ui-handler";
 import { pokemonPrevolutions } from "#app/data/pokemon-evolutions";
 import { Variant, getVariantTint } from "#app/data/variant";
+import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
+import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
+import BattleScene, { starterColors } from "../battle-scene";
+import { allAbilities } from "../data/ability";
+import { speciesEggMoves } from "../data/egg-moves";
+import { Moves } from "../data/enums/moves";
+import { Species } from "../data/enums/species";
+import { GrowthRate, getGrowthRateColor } from "../data/exp";
+import { Gender, getGenderColor, getGenderSymbol } from "../data/gender";
+import { allMoves } from "../data/move";
+import { Nature, getNatureName } from "../data/nature";
+import { pokemonFormChanges } from "../data/pokemon-forms";
+import { LevelMoves, pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "../data/pokemon-level-moves";
+import PokemonSpecies, { allSpecies, getPokemonSpecies, getPokemonSpeciesForm, getStarterValueFriendshipCap, speciesStarters, starterPassiveAbilities } from "../data/pokemon-species";
+import { Type } from "../data/type";
 import { Button } from "../enums/buttons";
+import { GameModes, gameModes } from "../game-mode";
+import { TitlePhase } from "../phases";
+import { AbilityAttr, DexAttr, DexAttrProps, DexEntry, Passive as PassiveAttr, StarterFormMoveData, StarterMoveset } from "../system/game-data";
+import { Tutorial, handleTutorial } from "../tutorial";
+import * as Utils from "../utils";
+import { OptionSelectItem } from "./abstact-option-select-ui-handler";
+import MessageUiHandler from "./message-ui-handler";
+import PokemonIconAnimHandler, { PokemonIconAnimMode } from "./pokemon-icon-anim-handler";
+import { StatsContainer } from "./stats-container";
+import { TextStyle, addBBCodeTextObject, addTextObject } from "./text";
+import { Mode } from "./ui";
+import { addWindow } from "./ui-theme";

 export type StarterSelectCallback = (starters: Starter[]) => void;

@ -241,34 +241,58 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
    this.pokemonGenderText.setOrigin(0, 0);
    this.starterSelectContainer.add(this.pokemonGenderText);

-    this.pokemonUncaughtText = addTextObject(this.scene, 6, 127, 'Uncaught', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonUncaughtText = addTextObject(this.scene, 6, 127, i18next.t("starterSelectUiHandler:uncaught"), TextStyle.SUMMARY_ALT, { fontSize: '56px' });
    this.pokemonUncaughtText.setOrigin(0, 0);
    this.starterSelectContainer.add(this.pokemonUncaughtText);

-    this.pokemonAbilityLabelText = addTextObject(this.scene, 6, 127, i18next.t("starterSelectUiHandler:ability"), TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    let starterInfoXPosition = 31; // Only text
+    // The position should be set per language
+    const currentLanguage = i18next.language;
+    switch (currentLanguage) {
+      case 'pt_BR':
+        starterInfoXPosition = 32;
+        break;
+      default:
+        starterInfoXPosition = 31;
+        break
+    }
+
+    let starterInfoTextSize = '56px'; // Labels and text
+    // The font size should be set per language
+    // currentLanguage is already defined
+    switch (currentLanguage) {
+      case 'pt_BR':
+        starterInfoTextSize = '47px';
+        break;
+      default:
+        starterInfoTextSize = '56px';
+        break
+    }
+
+    this.pokemonAbilityLabelText = addTextObject(this.scene, 6, 127, i18next.t("starterSelectUiHandler:ability"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
    this.pokemonAbilityLabelText.setOrigin(0, 0);
    this.pokemonAbilityLabelText.setVisible(false);
    this.starterSelectContainer.add(this.pokemonAbilityLabelText);

-    this.pokemonAbilityText = addTextObject(this.scene, 31, 127, '', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonAbilityText = addTextObject(this.scene, starterInfoXPosition, 127, '', TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
    this.pokemonAbilityText.setOrigin(0, 0);
    this.starterSelectContainer.add(this.pokemonAbilityText);

-    this.pokemonPassiveLabelText = addTextObject(this.scene, 6, 136, i18next.t("starterSelectUiHandler:passive"), TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonPassiveLabelText = addTextObject(this.scene, 6, 136, i18next.t("starterSelectUiHandler:passive"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
    this.pokemonPassiveLabelText.setOrigin(0, 0);
    this.pokemonPassiveLabelText.setVisible(false);
    this.starterSelectContainer.add(this.pokemonPassiveLabelText);

-    this.pokemonPassiveText = addTextObject(this.scene, 31, 136, '', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonPassiveText = addTextObject(this.scene, starterInfoXPosition, 136, '', TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
    this.pokemonPassiveText.setOrigin(0, 0);
    this.starterSelectContainer.add(this.pokemonPassiveText);

-    this.pokemonNatureLabelText = addTextObject(this.scene, 6, 145, i18next.t("starterSelectUiHandler:nature"), TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonNatureLabelText = addTextObject(this.scene, 6, 145, i18next.t("starterSelectUiHandler:nature"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
    this.pokemonNatureLabelText.setOrigin(0, 0);
    this.pokemonNatureLabelText.setVisible(false);
    this.starterSelectContainer.add(this.pokemonNatureLabelText);

-    this.pokemonNatureText = addBBCodeTextObject(this.scene, 31, 145, '', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
+    this.pokemonNatureText = addBBCodeTextObject(this.scene, starterInfoXPosition, 145, '', TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
    this.pokemonNatureText.setOrigin(0, 0);
    this.starterSelectContainer.add(this.pokemonNatureText);

@ -556,8 +580,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {

    let instructionTextSize = '42px';
    // The font size should be set per language
-    const currentLanguage = i18next.language;
+    // currentLanguage is already defined in the previous code block
    switch (currentLanguage) {
+      case 'de':
+        instructionTextSize = '35px';
+        break;
      case 'en':
        instructionTextSize = '42px';
        break;
@ -567,12 +594,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
      case 'fr':
        instructionTextSize = '42px';
        break;
-      case 'de':
-        instructionTextSize = '35px';
-        break;
      case 'it':
        instructionTextSize = '38px';
        break;
+      case 'pt_BR':
+        instructionTextSize = '38px';
+        break;
      case 'zh_CN':
        instructionTextSize = '42px';
        break;
--- a/src/utils.ts
+++ b/src/utils.ts
@ -116,13 +116,6 @@ export function randSeedEasedWeightedItem<T>(items: T[], easingFunction: string
  return items[Math.floor(easedValue * items.length)];
 }

-export function getSunday(date: Date): Date {
-  const day = date.getUTCDay();
-  const diff = date.getUTCDate() - day;
-  const newDate = new Date(date.setUTCDate(diff));
-  return new Date(Date.UTC(newDate.getUTCFullYear(), newDate.getUTCMonth(), newDate.getUTCDate()));
-}
-
 export function getFrameMs(frameCount: integer): integer {
  return Math.floor((1 / 60) * 1000 * frameCount);
 }
@ -199,7 +192,9 @@ export function formatLargeNumber(count: integer, threshold: integer): string {
      return '?';
  }
  const digits = ((ret.length + 2) % 3) + 1;
-  const decimalNumber = parseInt(ret.slice(digits, digits + (3 - digits)));
+  let decimalNumber = ret.slice(digits, digits + 2);
+  while (decimalNumber.endsWith('0'))
+      decimalNumber = decimalNumber.slice(0, -1);
  return `${ret.slice(0, digits)}${decimalNumber ? `.${decimalNumber}` : ''}${suffix}`;
 }