Merge branch 'beta' into stats_refactor

xsn34kzx · Aug 31, 2024 · 7d5d3fa · 7d5d3fa
2 parents 4c969eb + 5e2c05a
commit 7d5d3fa
Show file tree

Hide file tree

Showing 46 changed files with 77,325 additions and 2,318 deletions.
diff --git a/public/battle-anims/baddy-bad.json b/public/battle-anims/baddy-bad.json
diff --git a/public/battle-anims/blazing-torque.json b/public/battle-anims/blazing-torque.json
diff --git a/public/battle-anims/bouncy-bubble.json b/public/battle-anims/bouncy-bubble.json
diff --git a/public/battle-anims/buzzy-buzz.json b/public/battle-anims/buzzy-buzz.json
diff --git a/public/battle-anims/combat-torque.json b/public/battle-anims/combat-torque.json
diff --git a/public/battle-anims/floaty-fall.json b/public/battle-anims/floaty-fall.json
diff --git a/public/battle-anims/freezy-frost.json b/public/battle-anims/freezy-frost.json
diff --git a/public/battle-anims/glitzy-glow.json b/public/battle-anims/glitzy-glow.json
diff --git a/public/battle-anims/ivy-cudgel.json b/public/battle-anims/ivy-cudgel.json
diff --git a/public/battle-anims/magical-torque.json b/public/battle-anims/magical-torque.json
diff --git a/public/battle-anims/mortal-spin.json b/public/battle-anims/mortal-spin.json
diff --git a/public/battle-anims/noxious-torque.json b/public/battle-anims/noxious-torque.json
diff --git a/public/battle-anims/pika-papow.json b/public/battle-anims/pika-papow.json
diff --git a/public/battle-anims/psyblade.json b/public/battle-anims/psyblade.json
diff --git a/public/battle-anims/sappy-seed.json b/public/battle-anims/sappy-seed.json
diff --git a/public/battle-anims/sizzly-slide.json b/public/battle-anims/sizzly-slide.json
diff --git a/public/battle-anims/sparkly-swirl.json b/public/battle-anims/sparkly-swirl.json
diff --git a/public/battle-anims/splishy-splash.json b/public/battle-anims/splishy-splash.json
diff --git a/public/battle-anims/syrup-bomb.json b/public/battle-anims/syrup-bomb.json
diff --git a/public/battle-anims/veevee-volley.json b/public/battle-anims/veevee-volley.json
diff --git a/public/battle-anims/wicked-torque.json b/public/battle-anims/wicked-torque.json
diff --git a/public/battle-anims/zippy-zap.json b/public/battle-anims/zippy-zap.json
diff --git a/public/images/items/inverse.png b/public/images/items/inverse.png
diff --git a/public/images/trainer/courtney.png b/public/images/trainer/courtney.png
diff --git a/src/data/ability.ts b/src/data/ability.ts
@@ -4486,7 +4486,7 @@ async function applyAbAttrsInternal<TAttr extends AbAttr>(
   applyFunc: AbAttrApplyFunc<TAttr>,
   args: any[],
   showAbilityInstant: boolean = false,
-  quiet: boolean = false,
+  simulated: boolean = false,
   messages: string[] = [],
 ) {
   for (const passive of [false, true]) {
@@ -4508,33 +4508,29 @@ async function applyAbAttrsInternal<TAttr extends AbAttr>(
       if (result instanceof Promise) {
         result = await result;
       }
-
       if (result) {
         if (pokemon.summonData && !pokemon.summonData.abilitiesApplied.includes(ability.id)) {
           pokemon.summonData.abilitiesApplied.push(ability.id);
         }
-        if (pokemon.battleData && !quiet && !pokemon.battleData.abilitiesApplied.includes(ability.id)) {
+        if (pokemon.battleData && !simulated && !pokemon.battleData.abilitiesApplied.includes(ability.id)) {
           pokemon.battleData.abilitiesApplied.push(ability.id);
         }
-
-        if (attr.showAbility && !quiet) {
+        if (attr.showAbility && !simulated) {
           if (showAbilityInstant) {
             pokemon.scene.abilityBar.showAbility(pokemon, passive);
           } else {
             queueShowAbility(pokemon, passive);
           }
         }
-
-        if (!quiet) {
-          const message = attr.getTriggerMessage(pokemon, ability.name, args);
-          if (message) {
+        const message = attr.getTriggerMessage(pokemon, ability.name, args);
+        if (message) {
+          if (!simulated) {
             pokemon.scene.queueMessage(message);
-            messages.push(message);
           }
         }
+        messages.push(message!);
       }
     }
-
     pokemon.scene.clearPhaseQueueSplice();
   }
 }

diff --git a/src/data/biomes.ts b/src/data/biomes.ts
@@ -7663,6 +7663,12 @@ export function initBiomes() {
   biomeDepths[Biome.TOWN] = [ 0, 1 ];
 
   const traverseBiome = (biome: Biome, depth: integer) => {
+    if (biome === Biome.END) {
+      const biomeList = Object.keys(Biome).filter(key => !isNaN(Number(key)));
+      biomeList.pop(); // Removes Biome.END from the list
+      const randIndex = Utils.randInt(biomeList.length, 2); // Will never be Biome.TOWN or Biome.PLAINS
+      biome = Biome[biomeList[randIndex]];
+    }
     const linkedBiomes: (Biome | [ Biome, integer ])[] = Array.isArray(biomeLinks[biome])
       ? biomeLinks[biome] as (Biome | [ Biome, integer ])[]
       : [ biomeLinks[biome] as Biome ];