Merge branch 'pagefaultgames:main' into testing-setup

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

src/data/ability.ts

@@ -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;
@@ -3061,7 +3078,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(),

src/data/move.ts

@@ -6221,7 +6221,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 +6246,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)

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),

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,

src/field/arena.ts

@@ -617,7 +617,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:

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();

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",

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",

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",

src/locales/fr/ability-trigger.ts

@@ -1,5 +1,5 @@
 import { SimpleTranslationEntries } from "#app/plugins/i18n";
 
 export const abilityTriggers: SimpleTranslationEntries = {
-    'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
+    'blockRecoilDamage' : `{{abilityName}}\nde {{pokemonName}} le protège du contrecoup !`,
 } as const;

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",

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",

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",

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: "滔滔冲浪",

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 && (pokemon.formIndex == 0))
+          && (!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 && (pokemon.fusionFormIndex == 0))
+        && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX))
         return null;
 
       return PartyUiHandler.NoEffectMessage;

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;
     }

src/phases.ts

@@ -775,7 +775,7 @@ export class EncounterPhase extends BattlePhase {
 
       this.scene.ui.setMode(Mode.MESSAGE).then(() => {
         if (!this.loaded) {
-          this.scene.gameData.saveAll(this.scene, true, battle.waveIndex % 5 === 1).then(success => {
+          this.scene.gameData.saveAll(this.scene, true).then(success => {
             this.scene.disableMenu = false;
             if (!success)
               return this.scene.reset(true);

src/system/game-data.ts

@@ -277,7 +277,7 @@ 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);
 
-      if (!bypassLogin && !localStorage.getItem('data')) {
+      if (!bypassLogin) {
         Utils.apiPost(`savedata/update?datatype=${GameDataType.SYSTEM}`, systemData, undefined, true)
           .then(response => response.text())
           .then(error => {
@@ -293,15 +293,12 @@ export class GameData {
               console.error(error);
               return resolve(false);
             }
-            localStorage.removeItem('data');
             resolve(true);
           });
       } else {
-        const encFunc = bypassLogin
-          ? (data: string) => btoa(data)
-          : (data: string) => AES.encrypt(data, saveKey);
+        localStorage.setItem('data_bak', localStorage.getItem('data'));
 
-        localStorage.setItem('data', encFunc(systemData));
+        localStorage.setItem('data', btoa(systemData));
 
         this.scene.ui.savingIcon.hide();
 
@@ -312,7 +309,7 @@ export class GameData {
 
   public loadSystem(): Promise<boolean> {
     return new Promise<boolean>(resolve => {
-      if (bypassLogin && !localStorage.getItem('data'))
+      if (bypassLogin && !localStorage.hasOwnProperty('data'))
         return resolve(false);
 
       const handleSystemData = (systemDataStr: string) => {
@@ -424,7 +421,7 @@ export class GameData {
         }
       }
 
-      if (!bypassLogin && !localStorage.getItem('data')) {
+      if (!bypassLogin) {
         Utils.apiFetch(`savedata/get?datatype=${GameDataType.SYSTEM}`, true)
           .then(response => response.text())
           .then(response => {
@@ -442,12 +439,8 @@ export class GameData {
 
             handleSystemData(response);
           });
-      } else {
-        const decFunc = bypassLogin
-          ? (data: string) => atob(data)
-          : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8);
-        handleSystemData(decFunc(localStorage.getItem('data')));
-      }
+      } else
+        handleSystemData(atob(localStorage.getItem('data')));
     });
   }
 
@@ -564,6 +557,40 @@ 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)
@@ -578,7 +605,7 @@ export class GameData {
         }
       };
 
-      if (!bypassLogin && !localStorage.getItem(`sessionData${slotId ? slotId : ''}`)) {
+      if (!bypassLogin) {
         Utils.apiFetch(`savedata/get?datatype=${GameDataType.SESSION}&slot=${slotId}`, true)
           .then(response => response.text())
           .then(async response => {
@@ -591,12 +618,9 @@ export class GameData {
           });
       } else {
         const sessionData = localStorage.getItem(`sessionData${slotId ? slotId : ''}`);
-        if (sessionData) {
-          const decFunc = bypassLogin
-            ? (data: string) => atob(data)
-            : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8);
-          await handleSessionData(decFunc(sessionData));
-        } else
+        if (sessionData)
+          await handleSessionData(atob(sessionData));
+        else
           return resolve(null);
       }
     });
@@ -707,7 +731,7 @@ export class GameData {
   deleteSession(slotId: integer): Promise<boolean> {
     return new Promise<boolean>(resolve => {
       if (bypassLogin) {
-        localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}`);
+        localStorage.removeItem('sessionData');
         return resolve(true);
       }
 
@@ -717,7 +741,6 @@ export class GameData {
         Utils.apiFetch(`savedata/delete?datatype=${GameDataType.SESSION}&slot=${slotId}`, true).then(response => {
           if (response.ok) {
             loggedInUser.lastSessionSlot = -1;
-            localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}`);
             resolve(true);
           }
           return response.text();
@@ -748,10 +771,8 @@ export class GameData {
           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) {
+          if (response.ok)
             loggedInUser.lastSessionSlot = -1;
-            localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}`);
-          }
           return response.json();
         }).then(jsonResponse => {
           if (!jsonResponse.error)
@@ -804,13 +825,13 @@ export class GameData {
     }) as SessionSaveData;
   }
 
-  saveAll(scene: BattleScene, skipVerification: boolean = false, sync: boolean = false): Promise<boolean> {
+  saveAll(scene: BattleScene, skipVerification?: boolean): 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();
+        this.scene.ui.savingIcon.show();
+        const data = this.getSystemSaveData();
         const sessionData = this.getSessionSaveData(scene);
 
         const maxIntAttrValue = Math.pow(2, 31);
@@ -822,12 +843,11 @@ export class GameData {
           sessionSlotId: scene.sessionSlotId
         };
 
-        if (!bypassLogin && sync) {
+        if (!bypassLogin) {
           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.ui.savingIcon.hide();
+              this.scene.ui.savingIcon.hide();
               if (error) {
                 if (error.startsWith('client version out of date')) {
                   this.scene.clearPhaseQueue();
@@ -839,18 +859,14 @@ export class GameData {
                 console.error(error);
                 return resolve(false);
               }
-              localStorage.removeItem('data');
-              localStorage.removeItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`);
               resolve(true);
             });
         } else {
-          const encFunc = bypassLogin
-            ? (data: string) => btoa(data)
-            : (data: string) => AES.encrypt(data, saveKey);
+          localStorage.setItem('data_bak', localStorage.getItem('data'));
 
-          localStorage.setItem('data', encFunc(JSON.stringify(systemData, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v)));
+          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 : ''}`, encFunc(JSON.stringify(sessionData)));
+          localStorage.setItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`, btoa(JSON.stringify(sessionData)));
 
           console.debug('Session data saved');
 
@@ -894,12 +910,8 @@ export class GameData {
           });
       } else {
         const data = localStorage.getItem(dataKey);
-        if (data) {
-          const decFunc = bypassLogin
-            ? (data: string) => atob(data)
-            : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8);
-          handleData(decFunc(data));
-        }
+        if (data)
+          handleData(atob(data));
         resolve(!!data);
       }
     });
@@ -967,7 +979,7 @@ 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, () => {
-                  if (!bypassLogin && dataType < GameDataType.SETTINGS && localStorage.getItem(dataKey)) {
+                  if (!bypassLogin && dataType < GameDataType.SETTINGS) {
                     updateUserInfo().then(success => {
                       if (!success)
                         return displayError(`Could not contact the server. Your ${dataName} data could not be imported.`);
@@ -978,15 +990,11 @@ export class GameData {
                             console.error(error);
                             return displayError(`An error occurred while updating ${dataName} data. Please contact the administrator.`);
                           }
-                          localStorage.removeItem(dataKey);
                           window.location = window.location;
                         });
                     });
                   } else {
-                    const encFunc = bypassLogin || dataType === GameDataType.SETTINGS
-                      ? (data: string) => btoa(data)
-                      : (data: string) => AES.encrypt(data, saveKey);
-                    localStorage.setItem(dataKey, encFunc(dataStr));
+                    localStorage.setItem(dataKey, btoa(dataStr));
                     window.location = window.location;
                   }
                 }, () => {