Merge branch 'main' into berry-wither

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/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/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/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/Galarica Cuff.md

@@ -1,4 +1,4 @@
 ## Use
 Base Pokémon |Evolves into |Available in
 :---|:---|:---
-[[File:pokemon/79,01.png\|25px]] [[Pokemon/Galarian Slowpoke]]  | [[File:pokemon/80,02.png\|25px]] [[Pokemon/Galarian Slowbro]] |Galar onward
+[[File:pokemon/79.01.png\|25px]] [[Pokemon/Galarian Slowpoke]]  | [[File:pokemon/80.02.png\|25px]] [[Pokemon/Galarian Slowbro]] |Galar onward

data/Items/Galarica Wreath.md

@@ -1,4 +1,4 @@
 ## Use
 Base Pokémon |Evolves into |Available in
 :---|:---|:---
-[[File:pokemon/79,01.png\|25px]] [[Pokemon/Galarian Slowpoke]]  | [[File:pokemon/199,01.png\|25px]] [[Pokemon/Galarian Slowking]] |Galar onward
+[[File:pokemon/79.01.png\|25px]] [[Pokemon/Galarian Slowpoke]]  | [[File:pokemon/199.01.png\|25px]] [[Pokemon/Galarian Slowking]] |Galar onward

data/Items/Ice Stone.md

@@ -1,7 +1,7 @@
 Base Pokémon |Evolves into |Available in
 :---|:---|:---
-[[Pokemon/Alolan Sandshrew]]  | [[Pokemon/Alolan Sandslash]] |Alola onward
-[[Pokemon/Alolan Vulpix]]  | [[Pokemon/Alolan Ninetales]] |Alola onward
-[[Pokemon/Crystal Onix]]  | [[Pokemon/Crystal Steelix]] |Sevii 4567 onward
-[[Pokemon/Eevee]]  | [[Pokemon/Glaceon]] | Galar only
-[[Pokemon/Galarian Darumaka]]  | [[Pokemon/Galarian Darmanitan]] | Galar onward
+[[File:pokemon/27.01.png\|25px]] [[Pokemon/Alolan Sandshrew]]  | [[File:pokemon/28.01.png\|25px]] [[Pokemon/Alolan Sandslash]] |Alola onward
+[[File:pokemon/37.01.png\|25px]] [[Pokemon/Alolan Vulpix]]  | [[File:pokemon/38.01.png\|25px]] [[Pokemon/Alolan Ninetales]] |Alola onward
+[[File:pokemon/95.01.png\|25px]] [[Pokemon/Crystal Onix]]  | [[File:pokemon/208.02.png\|25px]] [[Pokemon/Crystal Steelix]] |Sevii 4567 onward
+[[File:pokemon/133.png\|25px]] [[Pokemon/Eevee]]  | [[File:pokemon/471.png\|25px]] [[Pokemon/Glaceon]] | Galar only
+[[File:pokemon/554.01.png\|25px]] [[Pokemon/Galarian Darumaka]]  | [[File:pokemon/555.02.png\|25px]] [[Pokemon/Galarian Darmanitan]] | Galar onward

data/Items/King's Rock.md

@@ -1,3 +1,9 @@
 Base chance of dropping: 1 in 512 (Routes)
 Base chance of dropping: 1 in 128 (Dungeon)
-Base chance of dropping: 1 in 85.3 (Dungeon Boss)
+Base chance of dropping: 1 in 85.3 (Dungeon Boss)
+
+## Use
+Base Pokémon |Evolves into |Available in
+:---|:---|:---
+[[File:pokemon/61.png\|25px]] [[Pokemon/Poliwhirl]] | [[File:pokemon/186.png\|25px]] [[Pokemon/Politoed]] | Johto onwards
+[[File:pokemon/79.png\|25px]] [[Pokemon/Slowpoke]] | [[File:pokemon/199.png\|25px]] [[Pokemon/Slowking]] | Johto onwards

data/Items/Leaf Stone.md

@@ -1,11 +1,10 @@
 ## Use
 Base Pokémon |Evolves into |Available in
 :---|:---|:---
-[[Pokemon/Gloom]]  | [[Pokemon/Vileplume]] |All regions
-[[Pokemon/Weepinbell]]  | [[Pokemon/Victreebel]] |All regions
-[[Pokemon/Exeggcute]]  | [[Pokemon/Exeggutor]] |All regions but Alola
-[[Pokemon/Exeggcute]]  | [[Pokemon/Alolan Exeggutor]]  | Alola
-[[Pokemon/Eevee]]  | [[Pokemon/Leafeon]] | Galar only
-[[Pokemon/Nuzleaf]]  | [[Pokemon/Shiftry]] | Hoenn onward
-[[Pokemon/Pansage]]  | [[Pokemon/Simisage]] |Unova onward
-[[Pokemon/Hisuian Voltorb]] | [[Pokemon/Hisuian Electrode]] |Hisui onward
+[[File:pokemon/44.png\|25px]] [[Pokemon/Gloom]]  | [[File:pokemon/45.png\|25px]] [[Pokemon/Vileplume]] |All regions
+[[File:pokemon/70.png\|25px]] [[Pokemon/Weepinbell]]  | [[File:pokemon/71.png\|25px]] [[Pokemon/Victreebel]] |All regions
+[[File:pokemon/102.png\|25px]] [[Pokemon/Exeggcute]]  | [[File:pokemon/103.png\|25px]] [[Pokemon/Exeggutor]] |All regions but Alola
+[[File:pokemon/102.png\|25px]] [[Pokemon/Exeggcute]]  | [[File:pokemon/103.01.png\|25px]] [[Pokemon/Alolan Exeggutor]]  | Alola only
+[[File:pokemon/133.png\|25px]] [[Pokemon/Eevee]]  | [[File:pokemon/470.png\|25px]] [[Pokemon/Leafeon]] | Galar only
+[[File:pokemon/274.png\|25px]] [[Pokemon/Nuzleaf]]  | [[File:pokemon/275.png\|25px]] [[Pokemon/Shiftry]] | Hoenn onward
+[[File:pokemon/511.png\|25px]] [[Pokemon/Pansage]]  | [[File:pokemon/512.png\|25px]] [[Pokemon/Simisage]] |Unova onward

data/Items/Linking Cord.md

@@ -1,16 +1,19 @@
 ## Use
 Base Pokémon |Evolves into |Avalible in
 :---|:---|:--
-[[Pokemon/Kadabra]] |[[Pokemon/Alakazam]] | All regions
-[[Pokemon/Machoke]] |[[Pokemon/Machamp]] |All regions
-[[Pokemon/Graveler]] |[[Pokemon/Golem]] |All regions
-[[Pokemon/Alolan Graveler]] |[[Pokemon/Alolan Golem]] |Alola
-[[Pokemon/Haunter]] |[[Pokemon/Gengar]] | All regions
-[[Pokemon/Boldore]] |[[Pokemon/Gigalith]] |Unova onward
-[[Pokemon/Gurdurr]] |[[Pokemon/Conkeldurr]] |Unova onward
-[[Pokemon/Karrablast]] |[[Pokemon/Escavalier]] |Unova onward
-[[Pokemon/Helmet]] |[[Pokemon/Accelgor]] |Unova onward
-[[Pokemon/Phantump]] |[[Pokemon/Trevenant]] |Kalos onward
-[All of Pumkaboo sizes](https://wiki.pokeclicker.com/#!Pok%C3%A9mon/Pumpkaboo_(Average)) |[Gourgeist](https://wiki.pokeclicker.com/#!Pok%C3%A9mon/Gourgeist_(Average)) | Kalos onward
+[[File:pokemon/64.png\|25px]] [[Pokemon/Kadabra]] | [[File:pokemon/65.png\|25px]] [[Pokemon/Alakazam]] | All regions
+[[File:pokemon/67.png\|25px]] [[Pokemon/Machoke]] | [[File:pokemon/68.png\|25px]] [[Pokemon/Machamp]] |All regions
+[[File:pokemon/75.png\|25px]] [[Pokemon/Graveler]] | [[File:pokemon/76.png\|25px]] [[Pokemon/Golem]] |All regions
+[[File:pokemon/75.01.png\|25px]] [[Pokemon/Alolan Graveler]] | [[File:pokemon/76.01.png\|25px]] [[Pokemon/Alolan Golem]] |Alola
+[[File:pokemon/93.png\|25px]] [[Pokemon/Haunter]] | [[File:pokemon/94.png\|25px]] [[Pokemon/Gengar]] | All regions
+[[File:pokemon/525.png\|25px]] [[Pokemon/Boldore]] | [[File:pokemon/526.png\|25px]] [[Pokemon/Gigalith]] |Unova onward
+[[File:pokemon/533.png\|25px]] [[Pokemon/Gurdurr]] | [[File:pokemon/534.png\|25px]] [[Pokemon/Conkeldurr]] |Unova onward
+[[File:pokemon/588.png\|25px]] [[Pokemon/Karrablast]] | [[File:pokemon/589.png\|25px]] [[Pokemon/Escavalier]] |Unova onward
+[[File:pokemon/616.png\|25px]] [[Pokemon/Shelmet]] | [[File:pokemon/617.png\|25px]] [[Pokemon/Accelgor]] |Unova onward
+[[File:pokemon/708.png\|25px]] [[Pokemon/Phantump]] | [[File:pokemon/709.png\|25px]] [[Pokemon/Trevenant]] |Kalos onward
+[[File:pokemon/710.png\|25px]] [[Pokemon/Pumpkaboo (Average)]] | [[File:pokemon/711.png\|25px]] [[Pokemon/Gourgeist (Average)]] | Kalos onward
+[[File:pokemon/710.01.png\|25px]] [[Pokemon/Pumpkaboo (Small)]] | [[File:pokemon/711.01.png\|25px]] [[Pokemon/Gourgeist (Small)]] | Kalos onward
+[[File:pokemon/710.02.png\|25px]] [[Pokemon/Pumpkaboo (Large)]] | [[File:pokemon/711.02.png\|25px]] [[Pokemon/Gourgeist (Large)]] | Kalos onward
+[[File:pokemon/710.03.png\|25px]] [[Pokemon/Pumpkaboo (Super Size)]] | [[File:pokemon/711.03.png\|25px]] [[Pokemon/Gourgeist (Super Size)]] | Kalos onward
 
 

data/Items/Luxury Ball.md

@@ -1,4 +1,17 @@
 # Special Effect
 This ball has the same catch rate as a [[Poké Ball]].
 
-When capturing a Pokémon with this ball you will get a random currency instead of dungeon tokens. That includes pokedollars, quest points, farm points, battle points and diamonds.
+When capturing a Pokémon with this ball you will get a random currency instead of dungeon tokens.
+
+The currency rewarded for a catch is calculated as such:
+$CurrencyReward=⌈BaseDungeonTokens * CurrencyMultiplier⌉$
+
+The base dungeon token for each route can be found on the [[Dungeon Tokens]] page, and the Currency Multipliers are as follows:
+|**Currency** | **Multiplier** {.no-data-tables}
+|---|---|
+|Pokédollars | 20x
+|Dungeon Tokens | 1x
+|Farm Points | 0.06x
+|Quest Points | 0.06x
+|Battle Points | 0.01x
+|Diamonds | 0.001x

data/Items/Moon Stone.md

@@ -1,13 +1,13 @@
-Base chance of dropping: 1 in 2048 (Routes)
+Base chance of dropping: 1 in 2,048 (Routes)
 Base chance of dropping: 1 in 512 (Dungeon)
 Base chance of dropping: 1 in 341.3 (Dungeon Boss)
 
 ## Use
 Base Pokémon |Evolves into |Available in
 :---|:---|:---
-[[Pokemon/Nidorina]] |[[Pokemon/Nidoqueen]] |All regions
-[[Pokemon/Nidorino]] |[[Pokemon/Nidoking]] |All regions
-[[Pokemon/Clefairy]] |[[Pokemon/Clefable]] |All regions
-[[Pokemon/Jigglypuff]] |[[Pokemon/Wigglytuff]] |All regions
-[[Pokemon/Skitty]] |[[Pokemon/Delcatty]] |Hoenn onward
-[[Pokemon/Munna]] |[[Pokemon/Musharna]] |Unova onward
+[[File:pokemon/30.png\|25px]] [[Pokemon/Nidorina]] | [[File:pokemon/31.png\|25px]] [[Pokemon/Nidoqueen]] |All regions
+[[File:pokemon/33.png\|25px]] [[Pokemon/Nidorino]] | [[File:pokemon/34.png\|25px]] [[Pokemon/Nidoking]] |All regions
+[[File:pokemon/35.png\|25px]] [[Pokemon/Clefairy]] | [[File:pokemon/36.png\|25px]] [[Pokemon/Clefable]] |All regions
+[[File:pokemon/39.png\|25px]] [[Pokemon/Jigglypuff]] | [[File:pokemon/40.png\|25px]] [[Pokemon/Wigglytuff]] |All regions
+[[File:pokemon/300.png\|25px]] [[Pokemon/Skitty]] | [[File:pokemon/301.png\|25px]] [[Pokemon/Delcatty]] |Hoenn onward
+[[File:pokemon/517.png\|25px]] [[Pokemon/Munna]] | [[File:pokemon/518.png\|25px]] [[Pokemon/Musharna]] |Unova onward

data/Items/Rare Candy.md

@@ -1,4 +1,4 @@
-Base chance of dropping: 1 in 2,048.
+Base chance of dropping: 1 in 1,024.
 
 In addition to being dropped by the above Pokemon, this item can be found as an item in the [[Safari]].
 

data/Pokémon/Santa Jynx_description.md

@@ -0,0 +1,8 @@
+Santa Jynx spawning follows a scenario on a daily basis, tied to Christmas Presents opened, Christmas event, and Temporary Battles.
+A temporary battle appears each day at Bill's House. Defeating it allows the Pokémon to appear with set conditions :
+* On day 1, Santa Jynx will spawn until the player collects 10 more presents.
+* On day 2, Santa Jynx will spawn until the player collects 15 more presents.
+* On day 3, Santa Jynx will spawn until the player collects 21 more presents.
+* On day 4 and on, Santa Jynx will spawn until the player collects 100 more presents.
+
+Not collecting the max amount of presents at the end of a day will cause the same step to repeat on the next day.

data/Pokémon/overview_description.md

@@ -36,9 +36,9 @@ The **Attack bonus** can be increased using 2 different [[Vitamins]]: [[Items/Pr
 #### Breeding Efficiency (BE)
 A Pokémon with a high base attack and a low number of egg steps will have a high Breeding Efficiency stat, which is calculated with the following formula:
 
-$BE = \frac{Attack Bonus}{Egg Cycles} * EV Bonus$
+$BE = \frac{Attack Bonus}{Egg Cycles} * EV Bonus * Shadow Status * Held Item Bonus$
 
-*Attack Bonus refers to the same value from the previous section. An Egg Cycle equals to 40 Egg Steps.*
+*Attack Bonus refers to the same value from the previous section. An Egg Cycle equals to 40 Egg Steps. Also, Held Item Bonus only applies if the Pokémon is holding an item that explicitly raises the attack.*
 
 Since [[Vitamins]] modify the Attack Bonus value, they also affect Breeding Efficiency. Individual Pokémon pages have the best Vitamin distribution to increase this statistic.
 

data/Quest Lines/Gale of Darkness_description.md

@@ -0,0 +1,3 @@
+## Prerequisites
+
+This quest will become available at the [[Towns/Aspertia City]] Bulletin Board upon completing the [[Quest Lines/Shadows in the Desert]] Quest Line and becoming the Unova champion.

data/Quest Lines/The Lair of Giants_description.md

@@ -0,0 +1,3 @@
+## Prerequisites
+
+This quest will become available at the [[Towns/Freezington]] Bulletin Board after becoming the Galar champion.

data/Quest Lines/The Legend Awakened_description.md

@@ -0,0 +1,3 @@
+## Prerequisites
+
+This quest will become available at the [[Towns/Aspertia City]] Bulletin Board after clearing the [[Dungeons/P2 Laboratory]] dungeon once.