Skip to content

Commit

Permalink
Merge branch 'main' into missing-pokemon-locations
Browse files Browse the repository at this point in the history
  • Loading branch information
CypherX authored Feb 4, 2024
2 parents d7a00ae + 083c8cc commit d73dc62
Show file tree
Hide file tree
Showing 30 changed files with 75 additions and 51 deletions.
2 changes: 1 addition & 1 deletion bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -77184,7 +77184,7 @@ module.exports = function whichTypedArray(value) {
},{"available-typed-arrays":1,"call-bind":6,"call-bind/callBound":5,"for-each":63,"gopd":67,"has-tostringtag/shams":72}],505:[function(require,module,exports){
module.exports={
"name": "pokeclicker",
"version": "0.10.18",
"version": "0.10.19",
"description": "PokéClicker repository",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion data/Achievements/overview_description.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
As the player earns achievements they will receive bonuses to [[Pokémon Dollars]], [[Dungeon Tokens]], and Experience from all sources. Click Attack and [[Flutes]] are also boosted by achievement bonus. The **Achievement Tracker** is unlocked after catching 110 unique Pokémon.
As the player earns achievements they will receive bonuses to [[Pokémon Dollars]], [[Dungeon Tokens]], and Experience from all sources. Click Attack and [[Flutes]] are also boosted by achievement bonus. The **Achievement Tracker** is unlocked after completing [[Dungeons/Victory Road]].
4 changes: 2 additions & 2 deletions data/Dungeons/overview_description.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ Tier | 0 clears | 100 clears | 250 clears | 500 clears | Debuffed {.no-data-tabl

**Example 2:** Mt. Moon has Greatball, Small Restore and Star Piece as 3 of its 5 lootable items from Dungeon chests. All 3 items are in the Mythic tier, but the Greatball Has Weight 2 while the Small Restore and Star Piece have the base weight of 1. This means the Greatball will be twice as likely to be dropped as the other 2 items. In other words, on average when an item looted from Mt. Moon is from the Mythic Tier, 50% of the time it will be a Greatball, 25% of the time it will be a Small Restore, 25% of the time it will be a Star Piece.

### Dowsing machine
### Dowsing Machine

The Dowsing Machine increases the yield of items looted from Dungeons. The amount of items looted depends on both the region of the dungeon, and the Tier of the looted item.
The Dowsing Machine increases the yield of items looted from Dungeons. The amount of items looted depends on both the region of the dungeon, and the Tier of the looted item. Check [[Items/Dowsing Machine]] for more details.

## Dungeon Locations
2 changes: 1 addition & 1 deletion data/Eggs/overview.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Egg Pool Odds {#EggPoolOdds}

As you enter subsequent [[Regions]], the odds of obtaining Pokémon from Eggs from prior Regions decreases to 50% of its prior rate.
As you enter subsequent [[Regions]], the odds of obtaining Pokémon from Eggs from prior Regions decreases to 50% of its prior rate. (i.e: In Sinnoh, there is a 50% chance to obtain Pokémon from the Sinnoh egg pool, a 25% to obtain Pokémon from the Hoenn egg pool, and a 12.5% to obtain Pokémon from the Kanto and Johto egg pool.)
The Kanto and Johto pools are given equal odds in every region (excluding Kanto).
The [[Items/Mystery Egg]] will pull randomly from its own pool and all typed egg pools, making it most useful when you have not obtained any egg Pokémon for that region yet.

Expand Down
2 changes: 1 addition & 1 deletion data/Farm/Setups.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ Here are a few highly efficient strategies on how to level up the [[Oak Items/Sq

### Occa/Kebia Planting Formation (a.k.a. Berry Wars)
If you want to be able to gain experience more passively, then the best strategy is with Occa and Kebia berries. Colbur works for this as well, but takes longer enough to grow that it isn't as useful. This strategy will likely let you level up your Squirtbottle from 0 to 5 without having to set it up again unless you get unlucky with a full takeover.
- _Note: When using this strategy, make sure to plant the berries so that they ripen at the same time to lower the chance of full takeover._
- _Note: When using this strategy, make sure to plant the berries so that they ripen at the same time, so planting Kebia Berries when Occa has 10 minutes left till ripen; to lower the chance of full takeover._

**Farm**
::: table-mutations
Expand Down
2 changes: 1 addition & 1 deletion data/Items/Dusk Stone.md
Original file line number Diff line number Diff line change
@@ -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.01.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
Expand Down
2 changes: 1 addition & 1 deletion data/Items/Sun Stone.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Base chance of dropping: 1 in 2048 (Routes)
Base chance of dropping: 1 in 512 (Dungeon)
Base chance of dropping: 1 in 341.3 (Dungeon Boss
Base chance of dropping: 1 in 341.3 (Dungeon Boss)

## Use
Base Pokémon |Evolves into |Available in
Expand Down
4 changes: 2 additions & 2 deletions data/Key Items/overview_description.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ Key Items are active automatically upon acquisition. To see acquired Key Items g
| [[File:Town_map.png\|20px]] Town Map | Defeat 10 Pokémon on Kanto Route 1. | Unlocks the Town Map panel. |
| [[File:Dungeon_ticket.png\|20px]] Dungeon Ticket | Purchasable at [[Towns/Viridian City]] in Kanto for 100 Quest Points [[File:questPoint.svg\|20px]]. | Allows entry to [[Dungeons]] at the cost of Dungeon Tokens [[File:dungeonToken.svg\|20px]]. |
| [[File:Super_rod.png\|20px]] Super Rod | Defeat 10 Pokémon on Kanto Route 12. | Allows water Pokémon to be encountered and caught in the wild. |
| [[File:Holo_caster.png\|20px]] Holo Caster | Catch 110 unique Pokémon. | View and track Achievements. |
| [[File:Holo_caster.png\|20px]] Holo Caster | Clear the [[Dungeons/Victory Road]] dungeon in Kanto. | Ability to track Achievements. |
| [[File:Mystery_egg.png\|20px]] Mystery Egg | Defeat 10 Pokémon on Kanto Route 5. | Grants access to the [[Hatchery]]. |
| [[File:Safari_ticket.png\|20px]] Safari Ticket | Clear the [[Gyms/Fuchsia City]] Gym in Kanto. | Allows entry to the Kanto Safari Zone. |
| [[File:Wailmer_pail.png\|20px]] Wailmer Pail | Unlock Kanto Route 14. | Allows entry to the [[Farm]]. |
| [[File:Explorer_kit.png\|20px]] Explorer Kit | Purchasable at [[Towns/Cinnabar Island]] in Kanto for 5,000 Quest Points [[File:questPoint.svg\|20px]]. | Allows entry to the Underground. |
| [[File:Eon_ticket.png\|20px]] Eon Ticket | Obtained by redeeming a code during the [[Quest Lines/The Eon Duo]] quest line. | Grants access to [[Towns/Southern Island]] in Hoenn. |
| [[File:Event_calendar.png\|20px]] Event Calendar | Purchasable at [[Towns/Hammerlocke]] in Galar for 100,000 Quest Points [[File:questPoint.svg\|20px]]. | Allows starting [[Events]] early at the cost of Quest Points [[File:questPoint.svg\|20px]]. |
| [[File:Gem_case.png\|20px]] Gem Case | Clear the [[Gyms/Viridian City]] Gym in Kanto. | Allows the collection of [[Gems]] and the purchase of Gem Upgrades. |
| [[File:DNA_splicers.png\|20px]] DNA Splicers | Clear the [[Dungeons/Giant Chasm]] dungeon in Unova. | N/A |
| [[File:DNA_splicers.png\|20px]] DNA Splicers | Clear the [[Dungeons/Giant Chasm]] dungeon in Unova. | N/A |
| [[File:Pokerus_virus.png\|20px]] Pokérus Virus | Clear the [[Dungeons/Distortion World]] dungeon in Sinnoh. | Gives the player access to [[Pokérus]] and EVs. |
| [[File:Reins_of_unity.png\|20px]] Reins of Unity | Progress through the [[Quest Lines/The Crown of Galar]] quest line. | N/A |
3 changes: 1 addition & 2 deletions data/Pokémon/overview_description.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Pokémon are your partners in this adventure and your main source of power. Currently the game has **1,390** different Pokémon forms. Most of them based on main games, with 32 coming from side games, 53 coming from anime and films, and 18 custom forms.
Pokémon are your partners in this adventure and your main source of power. Currently the game has **1,391** different Pokémon forms. Most of them based on main games, with 33 coming from side games, 53 coming from anime and films, and 18 custom forms.

## Statistics

Expand Down Expand Up @@ -58,7 +58,6 @@ There are exceptions to this rule:

* The egg cycle values for Sand Cloak and Trash Cloak forms of Burmy and Wormadam are 1.5x higher than their Plant Cloak counterparts, since [[Pokémon/Burmy (Plant)]] evolves into [[Pokémon/Burmy (Sand)]] and [[Pokémon/Burmy (Trash)]].
* [[Pokémon/Cherrim (Sunshine)]] has 1.5x the egg cycle value of [[Pokémon/Cherrim (Overcast)]].
* All Mega Evolved Pokémon have 1.5x the egg cycle value of their base form.

### Other Pokémon Lists
- [[Alternate Pokémon Forms]] page lists all alternate forms available in the game, including Regional forms, and the corresponding base Pokémon.
Expand Down
2 changes: 1 addition & 1 deletion data/Regions/Galar.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Mimic Pokémon are Pokémon that can be encountered by opening a chest inside [[
|---|---|---|
| [[File:pokemon/845.01.png\|25px]] [[Pokémon/Cramorant (Gulping)]] | Rain | [[Routes/Axew's Eye]], [[Routes/Bridge Field]], [[Routes/Stony Wilderness]], [[Routes/Lake of Outrage]], [[Routes/Galar Route 9]], [[Routes/Circhester Bay]], [[Routes/Forest of Focus]], [[Routes/Challenge Beach]], and [[Routes/Training Lowlands]] |
| [[File:pokemon/845.02.png\|25px]] [[Pokémon/Cramorant (Gorging)]] | Thunderstorm | [[Routes/Axew's Eye]], [[Routes/Galar Route 9]], [[Routes/Circhester Bay]], [[Routes/Forest of Focus]], [[Routes/Challenge Beach]], and [[Routes/Training Lowlands]] |
| [[File:pokemon/875.01.png\|25px]] [[Pokémon/Eiscue (Noice Face)]] | Sunny | [[Routes/Route 10]] and [[Routes/Frigid Sea]] |
| [[File:pokemon/875.01.png\|25px]] [[Pokémon/Eiscue (Noice Face)]] | Harsh Sunlight | [[Routes/Route 10]] and [[Routes/Frigid Sea]] |

### Location-dependent Pokémon
**Note:** Location-dependant Pokémon evolve at or above the level specified (excluding level 100) when leveled at a particular location. Pokémon at level 100 must be bred and retrained to the correct level (level 34), and then leveled at the specified location.
Expand Down
2 changes: 1 addition & 1 deletion data/Regions/Hoenn.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ All starters can also be obtained as Wanderers using [[Berries/Occa]], [[Berries
### Weather-dependent Pokémon
|Pokémon | Required Weather | Location |
|---|---|---|
| [[File:pokemon/351.01.png\|25px]] [[Pokémon/Castform (Sunny)]] | Sunny | [[Dungeons/Weather Institute]] |
| [[File:pokemon/351.01.png\|25px]] [[Pokémon/Castform (Sunny)]] | Harsh Sunlight | [[Dungeons/Weather Institute]] |
| [[File:pokemon/351.02.png\|25px]] [[Pokémon/Castform (Rainy)]] | Rainy or Thunderstorm | [[Dungeons/Weather Institute]] |
| [[File:pokemon/351.03.png\|25px]] [[Pokémon/Castform (Snowy)]] | Snow, Blizzard, or Hail | [[Dungeons/Weather Institute]] |

Expand Down
2 changes: 1 addition & 1 deletion data/Regions/Sinnoh.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Munchlax can also be obtained as a Wanderer by using [[Berries/Chilan]] berries.
### Weather-dependent Pokémon
|Pokémon | Evolution | Required Weather |
|---|---|---|
| [[File:pokemon/421.png\|25px]] [[Pokémon/Cherrim (Overcast)]] | [[File:pokemon/421.01.png\|25px]] [[Pokémon/Cherrim (Sunshine)]] | Sunny |
| [[File:pokemon/421.png\|25px]] [[Pokémon/Cherrim (Overcast)]] | [[File:pokemon/421.01.png\|25px]] [[Pokémon/Cherrim (Sunshine)]] | Harsh Sunlight |

### Level-dependent Pokémon
**Note:** Level-dependant Pokémon evolve at or above the level specified excluding level 100. Pokémon at level 100 must be bred and retrained to the correct level.
Expand Down
6 changes: 5 additions & 1 deletion data/Regions/overview_description.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Kanto is the first region and introduces the player to the core gameplay feature

By giving [[Items/Protein]] to obtained Pokémon the amount of added damage per breeding cycle is increased, but the number of egg steps also increases. Protein becomes available towards the end of Kanto at the [[Towns/Indigo_Plateau_Kanto]].

A unique feature in Kanto is the [[Towns/Safari_Zone]], where the player can freely move and catch Pokémon with the support of throwing rocks increase the capture chance and feeding bait to decrease the fleeing chance of encountered Pokémon.
A feature in Kanto is the [[Towns/Safari_Zone]], where the player can freely move and catch Pokémon with the support of throwing rocks increase the capture chance and feeding bait to decrease the fleeing chance of encountered Pokémon.

**Non-native Pokémon retain 20% damage
Maximum Vitamins per Pokémon: 5**
Expand All @@ -17,6 +17,8 @@ This is the first region where the damage debuff becomes noticeable. Any non-nat
The breeding queue allows the player to queue up 4 Pokémon besides the 4 currently breeding eggs. As soon as the Pokémon are queued up, their damage is no longer added to the overall damage of the team until they are either bred and hatched or otherwise removed from the queue.
In Johto the player has the opportunity to get another Oak item to boost the farm.

A safari zone returns in Johto named [[Towns/National_Park]] though there are no unique Pokemon, instead a new currency can be earned.

**Non-native Pokémon retain 20% damage
Breeding Queue in the hatchery: 4
Maximum Vitamins per Pokémon: 10**
Expand All @@ -33,6 +35,8 @@ Maximum Vitamins per Pokémon: 15**
#### [[Regions/Sinnoh]]
Sinnoh is the fourth region and 107 unique Pokémon are waiting to be caught. The player will encounter some Pokémon that only evolve when they are in a certain area. One should pay attention to the hints from the local people.

A safari zone is once again available in Sinnoh named [[Towns/Great_Marsh]] which offers unique Pokemon.

**Non-native Pokémon retain 40% damage
Breeding Queue in the hatchery: 16
Maximum Vitamins per Pokémon: 20**
Expand Down
8 changes: 4 additions & 4 deletions data/Weather/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

Pokémon | Required Weather | Route(s)
:--- | :--- | :---
| [[Pokemon/Castform (Sunny)]] | Sunny | [[Routes/Hoenn Route 119]]
| [[Pokemon/Castform (Sunny)]] | Harsh Sunlight | [[Routes/Hoenn Route 119]]
| [[Pokemon/Castform (Rainy)]] | Rain or Thunderstorm | [[Routes/Hoenn Route 119]]
| [[Pokemon/Castform (Snowy)]] | Snow, Blizzard, Hail, or Fog | [[Routes/Hoenn Route 119]]
| [[Pokemon/Cramorant (Gulping)]] | Rain | [[Routes/Axew's Eye]], [[Routes/Bridge Field]], [[Routes/Stony Wilderness]], [[Routes/Lake of Outrage]], [[Routes/Galar Route 9]], [[Routes/Circhester Bay]], [[Routes/Forest of Focus]], [[Routes/Challenge Beach]], [[Routes/Training Lowlands]]
| [[Pokemon/Cramorant (Gorging)]] | Thunderstorm | [[Routes/Axew's Eye]], [[Routes/Galar Route 9]], [[Routes/Circhester Bay]], [[Routes/Forest of Focus]], [[Routes/Challenge Beach]], [[Routes/Training Lowlands]]
| [[Pokemon/Eiscue (Noice Face)]] | Sunny | [[Routes/Galar Route 10]], [[Routes/Frigid Sea]]
| [[Pokemon/Eiscue (Noice Face)]] | Harsh Sunlight | [[Routes/Galar Route 10]], [[Routes/Frigid Sea]]

##### **Unique Weather Encounters**

Pokémon | Requirements | Required Weather | Near to | Notes
:--- | :--- | :--- | :--- | :---
Wild Houndoom Horde | Captured 500 [[Pokemon/Houndour]] and defeated [[Towns/Pokémon League Kalos]] | Sunny | [[Routes/Kalos Route 16]] | Awards Houndoominite to evolve [[Pokemon/Mega Houndoom]]
Wild Houndoom Horde | Captured 500 [[Pokemon/Houndour]] and defeated [[Towns/Pokémon League Kalos]] | Harsh Sunlight | [[Routes/Kalos Route 16]] | Awards Houndoominite to evolve [[Pokemon/Mega Houndoom]]
Wild Manectrike Horde | Captured 500 [[Pokemon/Electrike]] and defeated [[Towns/Pokémon League Kalos]] | Thunderstorm | [[Routes/Kalos Route 16]] | Awards Manectite to evolve [[Pokemon/Mega Manectric]]
Primal Groudon | Progress through [[Quest Lines/Primal Reversion]] | Sunny | [[Routes/Hoenn Route 126]] | Awards Red Orb to evolve [[Pokemon/Primal Groudon]]
Primal Groudon | Progress through [[Quest Lines/Primal Reversion]] | Harsh Sunlight | [[Routes/Hoenn Route 126]] | Awards Red Orb to evolve [[Pokemon/Primal Groudon]]
Primal Kyogre | Progress through [[Quest Lines/Primal Reversion]] | Rain | [[Routes/Hoenn Route 126]] | Awards Blue Orb to evolve [[Pokemon/Primal Kyogre]]
1 change: 1 addition & 0 deletions images/Harsh_Sunlight.png
1 change: 0 additions & 1 deletion images/Sunny.png

This file was deleted.

2 changes: 1 addition & 1 deletion images/VivillonPhotoBookFancyMeadow.png
2 changes: 1 addition & 1 deletion images/VivillonPhotoBookIcySnow.png
2 changes: 1 addition & 1 deletion images/VivillonPhotoBookPokéBall.png
2 changes: 1 addition & 1 deletion images/VivillonPhotoBookPolar.png
2 changes: 1 addition & 1 deletion images/VivillonPhotoBookTundra.png
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<script src="./pokeclicker/docs/libs/knockout-latest.js"></script>

<!-- New module-based code from './modules' -->
<script src="./pokeclicker/docs/scripts/modules.min.js?v=0.10.18"></script>
<script src="./pokeclicker/docs/scripts/modules.min.js?v=0.10.19"></script>

<!--Minified scripts-->
<script src="./pokeclicker/docs/scripts/script.min.js?v=0.10.18"></script>
<script src="./pokeclicker/docs/scripts/script.min.js?v=0.10.19"></script>

<!--Bootstrap-->
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
Expand All @@ -35,7 +35,7 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
<script src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>

<link href="./styles.css?t=1705833204671" rel="stylesheet">
<link href="./styles.css?t=1706539047897" rel="stylesheet">

</head>
<body class="no-select">
Expand Down Expand Up @@ -247,6 +247,6 @@ <h5 class="modal-title">Settings</h5>
</template>

<!-- Main wiki script -->
<script src="bundle.js?t=1705833204671"></script>
<script src="bundle.js?t=1706539047897"></script>
</body>
</html>
Loading

0 comments on commit d73dc62

Please sign in to comment.