Merge branch 'main' into alt-forms

bundle.js

@@ -77045,7 +77045,7 @@ module.exports = function whichTypedArray(value) {
 },{"available-typed-arrays":1,"call-bind":6,"call-bind/callBound":5,"for-each":62,"gopd":66,"has-tostringtag/shams":70}],502:[function(require,module,exports){
 module.exports={
   "name": "pokeclicker",
-  "version": "0.10.14",
+  "version": "0.10.17",
   "description": "PokéClicker repository",
   "main": "index.js",
   "scripts": {
@@ -77354,7 +77354,6 @@ App.game.keyItems.initialize();
 App.game.underground.initialize();
 App.game.specialEvents.initialize();
 QuestLineHelper.loadQuestLines();
-SafariPokemonList.generateKantoSafariList();
 BattleFrontierRunner.stage(100);
 BattleFrontierBattle.generateNewEnemy();
 
@@ -77363,6 +77362,7 @@ DailyDeal.generateDeals(5, now);
 BerryDeal.generateDeals(now);
 GemDeal.generateDeals();
 ShardDeal.generateDeals();
+SafariPokemonList.generateSafariLists(); // This needs to be after anything that generates shopmon due to Friend Safari calcs
 
 // Farm Simulator
 App.game.farming.plotList.forEach((p) => p.isUnlocked = true); // All plots unlocked
@@ -78188,6 +78188,19 @@ const alert = (message, type = 'primary', timeout = 5e3) => {
   }, timeout);
 }
 
+window.addEventListener("error", (event) => {
+  // Handle KO binding errors, usually occur when knockout is trying to use functions that
+  // don't exist in the cached javascript, but could also be a genuine error that slipped through
+  if (event?.error?.message?.startsWith("Unable to process binding")) {
+    alert(
+      `There was an error loading the page. Hard Refresh (Ctrl+F5 or Cmd+Shift+R) to clear the cache.
+      If this persists please post in #wiki-general on discord.`,
+      'danger',
+      3600e3
+    );
+  }
+});
+
 module.exports = {
   alert,
 };
@@ -78811,13 +78824,9 @@ const hasLootWithRequirements = (dungeon) => {
 hasLootWithRequirements.cache = new WeakMap();
 
 const getDungeonShadowPokemon = (dungeon) => {
-    // This will need to be updated to skip checking requirements once Orre XD is released
-    const shadows = [];
+    let shadows = [];
     dungeon.enemyList.forEach(enemy => {
         if (enemy instanceof DungeonTrainer) {
-            if (enemy.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             enemy.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -78831,9 +78840,6 @@ const getDungeonShadowPokemon = (dungeon) => {
     });
     dungeon.bossList.forEach(boss => {
         if (boss instanceof DungeonTrainer) {
-            if (boss.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             boss.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -78847,6 +78853,15 @@ const getDungeonShadowPokemon = (dungeon) => {
         }
     });
 
+    // Some dungeons have duplicate trainers with the same shadow form, filter these out
+    shadows = shadows.reduce((unique, s) => {
+        if (!unique.some(obj => obj.pokemon === s.pokemon && obj.dungeon === s.dungeon
+            && obj.trainer.name === s.trainer.name && obj.boss === s.boss)) {
+            unique.push(s);
+        }
+        return unique;
+    }, []);
+
     return shadows;
 };
 
@@ -79677,7 +79692,7 @@ const searchOptions = [
     type: 'Towns',
     page: '',
   },
-  ...Object.values(TownList).filter(t => !(t instanceof DungeonTown) && !['Safari Zone', 'Friend Safari'].includes(t.name) && t.region <= GameConstants.MAX_AVAILABLE_REGION).map(t => ({
+  ...Object.values(TownList).filter(t => !(t instanceof DungeonTown) && t.region <= GameConstants.MAX_AVAILABLE_REGION).map(t => ({
     display: t.name,
     type: 'Towns',
     page: t.name,
@@ -79869,6 +79884,12 @@ const searchOptions = [
     type: 'Shops',
     page: '',
   },
+  // Flutes
+  {
+    display: 'Flutes',
+    type: 'Flutes',
+    page: '',
+  },
 ];
 // Differentiate our different links with the same name
 searchOptions.forEach(a => {

data/Berries/Custap.md

@@ -17,13 +17,11 @@ Custap can be obtained by having at least one empty plot and at least 600 points
 :::
 
 #### Pinkan Mutation Strategy
-_Note: Adding 4 additional Pinkan berries allows for Custap mutations when all Pinkan berries are only in the Bloom stage._
-
 ::: table-mutations
 | :----: | :----: | :----: | :----: | :----: |
-| [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | {.mutation} | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | |
-| [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | {.mutation} | {.mutation} | {.mutation} | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | |
-| {.mutation} | {.mutation} | {.mutation} | {.mutation} | {.mutation} | |
+| [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | |
+| [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | {.mutation} | {.mutation} | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | |
 | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | {.mutation} | {.mutation} | {.mutation} | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | |
-| [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | {.mutation} | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | |
+| [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | {.mutation} | {.mutation} | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | |
+| [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | [[File:Pinkan.png\|32px]] [[Berries/Pinkan]] | |
 :::

data/Berries/Enigma.md

@@ -2,7 +2,7 @@
 
 ### Possible Planting Formations {#planting}
 
-Enigma can be obtained by getting 4 different hints from the Kanto Berry Master and surrounding an empty plot with berries according to those hints. These hints depend on the Trainer ID, so each profile will have a different Enigma configuration.
+Enigma can be obtained by getting 4 different hints from the Kanto Berry Master and surrounding an empty plot with berries according to those hints. Enigma hints contain a cardinal direction and a berry. If the hint does not have a cardinal direction, then it's **not** an Enigma hint and it's instead a hint from a berry the player hasn't unlocked yet. These hints depend on the Trainer ID, so each profile will have a different Enigma configuration.
 
 You can fill your farm in the following way to obtain Enigma Berries. Purple squares indicate where mutations can occur.
 

data/Berries/Lum.md

@@ -26,7 +26,7 @@ Lum has a chance of mutating when all Generation 1 Berries (#1 Cheri to #8 Sitru
 All planting times refer to the "Until Ripe" value of the first Berry planted.
 | Berry                                         | Planting Time | Planting Time (Mulch or Sprayduck)    | Planting Time (Mulch and Sprayduck)   |
 | :---:                                         | :---:         | :---:                                 | :---:                                 |
-| [[File:Sitrus.png\|32px]] [[Berries/Sitrus]]  | `N/A`         | `N/A`                                 | `N/A`                                 |
+| [[File:Sitrus.png\|32px]] [[Berries/Sitrus]]  | `N/A`          | `N/A`                                 | `N/A`                                 |
 | [[File:Oran.png\|32px]] [[Berries/Oran]]      | 00:05:00      | 00:03:20                              | `N/A`                                 |
 | [[File:Leppa.png\|32px]] [[Berries/Leppa]]    | 00:04:00      | 00:02:40                              | `N/A`                                 |
 | [[File:Aspear.png\|32px]] [[Berries/Aspear]]  | 00:02:00      | 00:01:20                              | `N/A`                                 |

data/Berries/Roseli.md

@@ -20,8 +20,8 @@ All planting times refer to the "Until Ripe" value of the first Berry planted.
 | :---:                                         | :---:         | :---:                                 | :---:                                 |
 | [[File:Watmel.png\|32px]] [[Berries/Watmel]]  | `N/A`         | `N/A`                                 | `N/A`                                 |
 | [[File:Magost.png\|32px]] [[Berries/Magost]]  | 04:00:00      | 02:40:00                              | 01:46:40                              |
-| [[File:Mago.png\|32px]] [[Berries/Mago]]      | 00:06:10      | 00:04:07                              | `N/A`                                 |
-| [[File:Nanab.png\|32px]] [[Berries/Nanab]]    | 00:04:10      | 00:02:47                              | `N/A`                                 |
+| [[File:Mago.png\|32px]] [[Berries/Mago]]      | 00:06:10      | 00:04:07                              |00:02:44                                |
+| [[File:Nanab.png\|32px]] [[Berries/Nanab]]    | 00:04:10      | 00:02:47                              | 00:01:51                                |
 
 #### Mutations
 Roseli Berries can be used to mutate the following Berries.

data/Dream Orbs/overview_description.md

@@ -4,6 +4,7 @@ Dream Orbs are items obtained when the game is closed that can be opened for ran
 
 Dream Orbs are obtainable once the Force of Nature Pokémon are captured (@[[Pokemon/Thundurus]], @[[Pokemon/Tornadus]] and @[[Pokemon/Landorus]]). From that point on the player will get 1 Dream Orb for each full consecutive hour with the game closed, up to a maximum of 24 hours.
 There are 3 colors of orbs: Pink, Green and Orange. Initially the player will only receive Pink Orbs, the other orbs can be unlocked by getting the exclusive Pokémon from the previous orbs (@[[Pokemon/Thundurus (Therian)]] and  @[[Pokemon/Tornadus (Therian)]]).
+Note that, currently, Blue Orbs **cannot be obtained** yet.
 
 ## Opening Orbs
 

data/Eggs/overview_description.md

@@ -1,5 +1,5 @@
 Eggs are items that can be hatched to obtain Pokémon.
 Eggs can be obtained in two ways: Purchasing them from [[Shops]] and trading for them from the [[Shard Traders]].
-[[Breeding]] level 100 Pokémon will also add them to the Hatchery/Queue as an Egg.
+Breeding level 100 Pokémon will also add them to the [[Hatchery]]/Queue as an Egg.
 Hatching an egg will boost that Pokémon's attack by 25% of its base attack.
 Where an Egg is purchased or obtained from has no effect on which Pokémon will hatch from that egg *(See Egg Pool Odds section below for more details on specific odds)*.

data/Flutes/overview_description.md

@@ -0,0 +1,15 @@
+Flutes are a series of special items each with their own beneficial effect. Flutes are gained by purchasing them from the Hoenn and Unova Gem Master shops. Flutes cannot be used until the player has obtained the **Heat Badge** from the [Lavaridge Town Gym](#!Gyms/Lavaridge_Town) in [[Regions/Hoenn]].
+
+### Usage
+Flutes can be toggled on / off whenever the player wants. Each Flute buffs different properties in game, and requires 3 types of Gems to power their effects.
+
+Activating multiple Flutes simultaneously increases the cost in gems of keeping each Flute active. Each active Flute costs one Gem per second, per active Flute, from the Flutes three gem categories. Keeping all 6 Flutes active costs 6 gems per second from every type of Gem.
+
+Each active flute also provides a static +0.5% attack boost to the required gem types. If all 6 Flutes are active, then all types are given a +0.5% attack boost.
+
+### Effect
+
+The effect of each Flute is determined by achievement bonus:
+`(2% x (1 + Achievement Bonus))`
+
+### List of Flutes

data/Hatchery/overview_description.md

@@ -8,7 +8,16 @@ As soon as [[Routes/Kanto Route 3]] is cleared, the Pokémon Day Care can be acc
 
 There are three different types of hatch-able resources in Pokéclicker: obtained Pokémon Eggs, Fossils, and already obtained level 100 Pokémon. Pokémon Eggs are typically purchased in Shops and Fossils are typically mined from the [[Underground]]. The Egg/Fossil/Obtained Pokémon that can be bred each have their own distinct tab in the Pokémon Day Care modal.
 
-Clicking on the desired Egg/Fossil/Level 100 Pokémon will result in it being added to the Hatchery. The Hatchery only has 4 slots, but Breeding Queue slots can be unlocked in each new Region (See Upgrades Below). The Breeding Queue automatically adds queued Pokémon to the Hatchery if there is space. If there is a Pokémon in the queue, Eggs/Fossils that are ready to hatch will do so and be replaced by the queued Pokémon.
+Clicking on the desired Egg/Fossil/Level 100 Pokémon will result in it being added to the Hatchery. The Hatchery only has 4 slots, one available from the start and 3 need that need to be unlocked:
+
+| Slot | Cost |
+|---|---|
+| 1 | 0 [[File:questPoint.svg\|25px]] |
+| 2 | 1,000 [[File:questPoint.svg\|25px]] |
+| 3 | 1,500 [[File:questPoint.svg\|25px]] |
+| 4 | 2,000 [[File:questPoint.svg\|25px]] |
+
+Later, the player can acquire Breeding Queue slots which are unlocked in each new Region (See Upgrades Below). The Breeding Queue automatically adds queued Pokémon to the Hatchery if there is space. If there is a Pokémon in the queue, Eggs/Fossils that are ready to hatch will do so and be replaced by the queued Pokémon.
 
 Each Pokémon has a certain number of Egg Steps required before it can hatch from an Egg. Consult [[Pokémon]] for egg steps for all Pokémon. Egg Steps are gained through defeating Pokémon. [[Routes]], [[Gyms]], and [[Dungeons]] all yield different numbers of Egg Steps per Pokémon defeated, although the Egg Steps yielded generally scales with the difficulty of the Route, Gym, or Dungeon.
 

data/Items/Absolite_description.md

@@ -1,2 +1,2 @@
-## Description
-Used to mega evolve Absol
+## Acquisition
+Reward from battling [[Temporary Battles/Calem 6]] in [[Towns/Kiloude City]] after becoming Kalos Champion.

data/Items/Aerodactylite_description.md

@@ -1,2 +1,2 @@
-## Description
-Used to mega evolve Aerodactyl
+## Acquisition
+Found by digging in the Underground.

data/Items/Aggronite_description.md

@@ -1,4 +1,2 @@
-## Description
-Used to mega evolve Aggron
-
-Obtained by clearing Cyllage City's Gym 2,000 or more times then battling Marquis Grant in Cyllage City after becoming Kalos Champion.
+## Acquisition
+Obtained by clearing [[Gyms/Cyllage City]]'s Gym 2,000 or more times then battling [[Temporary Battles/Marquis Grant]] in [[Towns/Cyllage City]] after becoming Kalos Champion.

data/Items/Alakazite_description.md

@@ -1,2 +0,0 @@
-## Description
-Used to mega evolve Alakazam

data/Items/Ampharosite_description.md

@@ -1,2 +1,2 @@
-## Description
-Used to mega evolve Ampharos
+## Acquisition
+Enter the code given by the Electric Trainer in [[Towns/Coumarine City]] (including the question mark) in the Start -> Save menu.

data/Items/Audinite_description.md

@@ -1,5 +1,2 @@
-## Description
-Used to mega evolve Audino
-
-## How to obtain
+## Acquisition
 Obtain [[Pokemon/Tornadus (Therian)]], [[Pokemon/Thundurus (Therian)]], and  [[Pokemon/Landorus (Therian)]] from [[Dream Orbs]] then battle the [[Temporary Battles/DreamResearcher]] in [[Towns/Black and White Park]].

data/Items/Beedrillite_description.md

@@ -1,2 +1,2 @@
-## Description
-Used to mega evolve Beedrill
+## Acquisition
+Battle [[Temporary Battles/Delta Giovanni]] in [[Towns/Sea Mauville]] after progressing in [[Quest Lines/The Delta Episode]] Quest Line.

data/Items/Blue Orb_description.md

@@ -0,0 +1,2 @@
+## Acquisition
+Progress in [[Quest Lines/Primal Reversion]] Quest Line.

data/Items/Cameruptite_description.md

@@ -1,2 +1,2 @@
-## Description
-Used to mega evolve Camerupt
+## Acquisition
+Battle [[Temporary Battles/Delta Tabitha]] in [[Towns/Magma Hideout]] after progressing in [[Quest Lines/The Delta Episode]] Quest Line.

data/Items/Christmas Present_description.md

@@ -0,0 +1 @@
+Unusable. Rewards a random currency upon dropping.

data/Items/Diancite_description.md

@@ -1,2 +1,2 @@
-## Description
-Used to mega evolve Diancie
+## Acquisition
+Battle [[Temporary Battles/Rampaging Yveltal]] near [[Towns/Shalour City]], during [[Quest Lines/Princess Diancie]] Quest Line.

data/Items/Dragon Egg.md

@@ -2,11 +2,11 @@
 **Bolded** Pokémon can only be obtained in their respective region from hatching shop eggs or as [[Wandering Pokémon]]. ***Bolded and italicized*** Pokémon can only be obtained in their respective region from hatching shop eggs.
 Region | Pokemon
 :--- | :---
-Kanto | **[[Pokemon/Dratini]]**, _**[[Pokemon/Dragonair]]**_, _**[[Pokemon/Dragonite]]**_
-Johto |
-Hoenn | **[[Pokemon/Bagon]]**, _**[[Pokemon/Shelgon]]**_, _**[[Pokemon/Salamence]]**_
-Sinnoh | **[[Pokemon/Gible]]**, _**[[Pokemon/Gabite]]**_, [[Pokemon/Garchomp]]
-Unova | _**[[Pokemon/Deino]]**_, _**[[Pokemon/Zweilous]]**_, _**[[Pokemon/Hydreigon]]**_
-Kalos | [[Pokemon/Gloomy]], [[Pokemon/Sliggoo]], [[Pokemon/Goodra]]
-Alola | _**[[Pokemon/Turtonator]]**_, **[[Pokemon/Drampa]]**, [[Pokemon/Jangmo-o]], [[Pokemon/Hakamo-o]], [[Pokemon/Kommo-o]]
-Galar | _**[[Pokemon/Dreepy]]**_, [[Pokemon/Drakloak]], [[Pokemon/Dragapult]], [[Pokemon/Duraludon]]
+Kanto | **[[Pokemon/Dratini]]**, _**[[Pokemon/Dragonair]]**_, _**[[Pokemon/Dragonite]]**_ |
+Johto | |
+Hoenn | **[[Pokemon/Bagon]]**, _**[[Pokemon/Shelgon]]**_, _**[[Pokemon/Salamence]]**_ |
+Sinnoh | **[[Pokemon/Gible]]**, _**[[Pokemon/Gabite]]**_, [[Pokemon/Garchomp]] |
+Unova | _**[[Pokemon/Deino]]**_, _**[[Pokemon/Zweilous]]**_, _**[[Pokemon/Hydreigon]]**_ |
+Kalos | [[Pokemon/Goomy]], [[Pokemon/Sliggoo]], [[Pokemon/Goodra]] |
+Alola | _**[[Pokemon/Turtonator]]**_, **[[Pokemon/Drampa]]**, [[Pokemon/Jangmo-o]], [[Pokemon/Hakamo-o]], [[Pokemon/Kommo-o]] |
+Galar | _**[[Pokemon/Dreepy]]**_, [[Pokemon/Drakloak]], [[Pokemon/Dragapult]], [[Pokemon/Duraludon]] |

data/Items/Dusk Ball.md

@@ -1,5 +1,5 @@
 **Catch Rate**
 |Location|Catch Chance (+%)|
 |---|---|
-|Night (6PM - 6AM) and in Dungeons|15
+|Night (6PM - 6AM) or in Dungeons|15
 |Day (6AM - 6PM) and in all other locations|0 (Equal to Poké Ball)

data/Items/Dusk Stone.md

@@ -1,7 +1,7 @@
 ## Use
 Base Pokémon |Evolves into |Available in
 :---|:---|:---
-[[File:pokemon/176,01.png\|25px]] [[Pokemon/Spooky Togetic]]  | [[File:pokemon/468.png\|25px]] [[Pokemon/Spooky Togekiss]] |Sinnoh onward
+[[File:pokemon/176.01.png\|25px]] [[Pokemon/Spooky Togetic]]  | [[File:pokemon/468.png\|25px]] [[Pokemon/Spooky Togekiss]] |Sinnoh onward
 [[File:pokemon/198.png\|25px]] [[Pokemon/Murkrow]]  | [[File:pokemon/430.png\|25px]] [[Pokemon/Honchkrow]] |Sinnoh onward
 [[File:pokemon/200.png\|25px]] [[Pokemon/Misdreavous]]  | [[File:pokemon/429.png\|25px]] [[Pokemon/Mismagius]] |Sinnoh onward
 [[File:pokemon/608.png\|25px]] [[Pokemon/Lampent]]  | [[File:pokemon/609.png\|25px]] [[Pokemon/Chandelure]] |Unova onward

data/Items/Fire Stone.md

@@ -1,7 +1,7 @@
 ## Use
 Base Pokémon |Evolves into |Available in
 :---|:---|:---
-[[Pokemon/Vulpix]]  | [[Pokemon/Ninetales]] |All regions
-[[Pokemon/Growlithe]]  | [[Pokemon/Arcanine]] |All regions
-[[Pokemon/Eevee]]  | [[Pokemon/Flareon]] |All regions
-[[Pokemon/Pansear]]  | [[Pokemon/Simisear]] |Unova onward
+[[File:pokemon/37.png\|25px]] [[Pokemon/Vulpix]]  | [[File:pokemon/38.png\|25px]] [[Pokemon/Ninetales]] |All regions
+[[File:pokemon/58.png\|25px]] [[Pokemon/Growlithe]]  | [[File:pokemon/59.png\|25px]] [[Pokemon/Arcanine]] |All regions
+[[File:pokemon/133.png\|25px]] [[Pokemon/Eevee]]  | [[File:pokemon/136.png\|25px]] [[Pokemon/Flareon]] |All regions
+[[File:pokemon/513.png\|25px]] [[Pokemon/Pansear]]  | [[File:pokemon/514.png\|25px]] [[Pokemon/Simisear]] |Unova onward

data/Items/Fossilized Bird_description.md

@@ -0,0 +1 @@
+Used in [[Towns/Stow-on-Side]]'s Fossil Master together with [[File:Fossilized Drake.png\|20px]] [[Items/Fossilized Drake]] and 25,000 [[File:questPoint.svg\|20px]] to obtain [[File:pokemon/880.png\|25px]] [[Pokémon/Dracozolt]]; and also with [[File:Fossilized Dino.png\|20px]] [[Items/Fossilized Dino]] and 25,000 [[File:questPoint.svg\|20px]] to obtain [[File:pokemon/881.png\|25px]] [[Pokémon/Arctozolt]].