Update currency pages

bundle.js

@@ -77861,10 +77861,8 @@ window.Wiki = {
   dreamOrbs: require('./pages/dreamOrbs'),
   farmSimulator: require('./pages/farmSimulator'),
   dungeons: require('./pages/dungeons'),
-  pokemonDollars: require('./pages/shopMon'),
+  shopMon: require('./pages/shopMon'),
   dungeonTokens: require('./pages/dungeonTokens'),
-  battlePoints: require('./pages/shopMon'),
-  diamonds: require('./pages/shopMon'),
   oakItems: require('./pages/oakItems'),
   getDealChains: require('./pages/dealChains').getDealChains,
   ...require('./navigation'),
@@ -78546,14 +78544,19 @@ const checkExist = setInterval(function() {
     }
  }, 100);
 
+const highestRouteCache = {};
+
 const highestRoute = (region, weather) => {
+    const cacheKey = `${region}-${weather}`;
+    const cachedResult = highestRouteCache[cacheKey];
+    if (cachedResult) return cachedResult;
+
     region = region;
     weather = weather;
 
     var routeArr = [];
 
     Routes.getRoutesByRegion(region).map(route => {
-        const routes = Routes.getRoutesByRegion(region).map(r => MapHelper.normalizeRoute(r.number, region, false));
         var pkmon1 = [];
         pkmon1.push(Object.values(route.pokemon).flat());
         route.pokemon.special.forEach((element) => {
@@ -78609,7 +78612,9 @@ const highestRoute = (region, weather) => {
         return dt[7] > max[7] ? dt : max;
     });
 
-    return( [[highestPB[0], highestPBMB[0], highestGB[0], highestGBMB[0], highestUB[0], highestUBMB[0]],routeArr] );
+    const result = [[highestPB[0], highestPBMB[0], highestGB[0], highestGBMB[0], highestUB[0], highestUBMB[0]], routeArr];
+    highestRouteCache[cacheKey] = result;
+    return result;
 }
 
 const setWeather = (evt, weather) => {
@@ -78626,35 +78631,9 @@ const setWeather = (evt, weather) => {
     return;
 }
 
-const getShopMons = (currency) => {
-    var towns = Object.values(TownList).filter(t => t.region < GameConstants.Region.final);
-    var filteredTowns = [];
-    var filteredShops = [];
-
-    for (var j = 0; j < towns.length; j++){
-        var test = towns[j].content.filter((c) => c instanceof Shop && c.items.length > 0);
-        if (test.length > 0) {
-            test.forEach(function(i) {
-                filteredTowns = [...filteredTowns, i];
-            });
-        }
-    }
-
-    for (var k = 0; k < filteredTowns.length; k++){
-        var test1 = filteredTowns[k].items.filter((c) => c.currency == currency && c instanceof PokemonItem)
-        if (test1.length > 0) {
-            test1.forEach(function(s) {
-                filteredShops = [...filteredShops, [filteredTowns[k], s]];
-            });
-        }
-    }
-    return filteredShops;
-}
-
 module.exports = {
     highestRoute,
     setWeather,
-    getShopMons
 };
 },{}],523:[function(require,module,exports){
 const getTableClearCounts = (dungeon) => {
@@ -80019,8 +79998,8 @@ const searchOptions = [
   },
   //Currency Pages
   {
-    display: 'Pokémon Dollars',
-    type: 'Pokémon Dollars',
+    display: 'Pokédollars',
+    type: 'Pokédollars',
     page: '',
   },
   {
@@ -80136,4 +80115,4 @@ module.exports = {
   searchOptions,
 };
 
-},{"./navigation":518}]},{},[511]);
+},{"./navigation":518,"./pages/pokemon":528}]},{},[511]);

data/Achievements/overview_description.md

@@ -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 completing [[Dungeons/Victory Road]].
+As the player earns achievements they will receive bonuses to [[Poké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]].

data/Battle Frontier/overview_description.md

@@ -1,11 +1,11 @@
-The **Battle Frontier** is a location in Hoenn where your Pokémon fight endless teams of three randomly generated Pokémon. There is a 30 second time limit for each stage - if you do not defeat the three Pokémon within the time limit you will be awarded Pokémon Dollars and Battle Points. *(you won't be awarded if you quit)*
+The **Battle Frontier** is a location in Hoenn where your Pokémon fight endless teams of three randomly generated Pokémon. There is a 30 second time limit for each stage - if you do not defeat the three Pokémon within the time limit you will be awarded Pokédollars and Battle Points. *(you won't be awarded if you quit)*
 Items such as XAttack are permitted; however, you **cannot** Click to damage Pokémon in the Battle Frontier and the time flute **does not** have any effect.
 
 [//]: # (Here will go BF image from old wiki: [[Battle_Frontier.png]])
 
 ## Details
 
-Attack is calculated as 100% of the total attack of all obtained Pokémon - the Regional Attack debuff is ignored. Attack can be further increased through modifiers such as Gems and XAttack. Battle Points and Pokémon Dollars are awarded upon defeat; the former can be used at the Battle Frontier Shop. The higher the stage cleared, the more Battle Points are awarded.
+Attack is calculated as 100% of the total attack of all obtained Pokémon - the Regional Attack debuff is ignored. Attack can be further increased through modifiers such as Gems and XAttack. Battle Points and Pokédollars are awarded upon defeat; the former can be used at the Battle Frontier Shop. The higher the stage cleared, the more Battle Points are awarded.
 Frontier stages that have already been cleared in previous attempts will be cleared twice as fast in subsequent attempts
 
 ### Breeding Strategy
@@ -27,11 +27,11 @@ Gems = `Stage Number / 80`
 ## Rewards
 ### Currencies
 
-**Note:** Currency Rewards are not awarded if your Battle Frontier run is Quit. You must lose your attempt normally to gain Pokémon Dollars and Battle Points
+**Note:** Currency Rewards are not awarded if your Battle Frontier run is Quit. You must lose your attempt normally to gain Pokédollars and Battle Points
 
 Currency Reward | Formula
 :--- | ---:
-Pokémon Dollars | `Stage Beaten ^ 2`
+Pokédollars | `Stage Beaten ^ 2`
 Battle Points\* | `(Stage Beaten ^ 2) / 100`
 
 \* *Battle Points are rounded to the nearest whole number*

data/Dungeons/overview_description.md

@@ -9,10 +9,10 @@ Clearing Dungeons requires active play. To enter a dungeon, select it on the Tow
 4. **Ladder** - Allows the player to progress to the next floor and also adds 10 seconds to the timer. You can either click "Go to next floor" or press Spacebar. This tile can only be encountered from Alola onwards.
 5. **A chest**- Many Items can be collected from chests by either clicking on them or by pressing the Spacebar. They may also contain Pokémon which are known as **Mimics**. Some of them are even exclusive Pokémon that can only be encountered in this way.
 6. **A trainer**- Trainers are found on tiles and have teams of Pokémon that must all be defeated to progress. Wild Pokémon are almost always ~4 times more likely to appear on an enemy tile than a trainer, but in some dungeons this weighting is different. Defeating trainers yields the following rewards:
-	- Dungeon Trainers reward 4% of the dungeon cost as Dungeon Tokens [[File:dungeonToken.svg|18px]] and 50% of the dungeon cost as Poké Dollars whenever they are defeated.
-	- Dungeon Trainer Bosses reward 10% of the dungeon cost as Dungeon Tokens [[File:dungeonToken.svg|18px]]  and 100% of the dungeon cost as Poké Dollars whenever they are defeated.
+	- Dungeon Trainers reward 4% of the dungeon cost as Dungeon Tokens [[File:dungeonToken.svg|18px]] and 50% of the dungeon cost as Pokédollars whenever they are defeated.
+	- Dungeon Trainer Bosses reward 10% of the dungeon cost as Dungeon Tokens [[File:dungeonToken.svg|18px]]  and 100% of the dungeon cost as Pokédollars whenever they are defeated.
 
-Note: Amulet coin and other items that grant increased amounts of pokédollars **do not** affect the amount of money that you receive from Dungeon Trainers or Dungeon Trainer Bosses
+Note: Amulet coin and other items that grant increased amounts of Pokédollars **do not** affect the amount of money that you receive from Dungeon Trainers or Dungeon Trainer Bosses
 
 ## Dungeon Perks and Mechanics
 

data/Hatchery Helpers/Jasmine.md

@@ -1 +1 @@
-*Purchased in @[[Towns/Mauville City]] for 10,000,000 Poké Dollars*
+*Purchased in @[[Towns/Mauville City]] for 10,000,000 Pokédollars*

data/Pokémon Dollars/overview_description.md → data/Pokédollars/overview_description.md

@@ -1,6 +1,6 @@
-Pokemon Dollars [[File:money.svg|25px]] are the basic golden currency of PokéClicker, also known as simply Money or Poké. 
+Pokédollars [[File:money.svg|25px]] are the basic golden currency of PokéClicker, also known as simply Money or Poké.
 
-They are obtained by defeating enemies and are primarily spent on various Items. Poké Dollars can be collected while offline for up to 24 hours.
+They are obtained by defeating enemies and are primarily spent on various Items. Pokédollars can be collected while offline for up to 24 hours.
 
 ---
 
@@ -37,7 +37,7 @@ Galar | Path to the Peak | Elite Peony
 
 ## Uses
 #### Item Purchasing
-A large portion of in-game items are purchasable with Pokémon Dollars, please see the [[Shops]] page for a full listing. 
+A large portion of in-game items are purchasable with Pokédollars, please see the [[Shops]] page for a full listing.
 
 #### Oak Items
 The upgrades of some [[Oak Items]].

pages/Battle Frontier/overview.html

@@ -58,7 +58,7 @@ <h3>Battle Frontier Statistics</h3>
                 <td data-bind="text: Math.max(1, Math.round(($data.stage() ** 2) / 100)).toLocaleString()"></td>       
             </tr>
             <tr>
-                <td>PokéDollars</td>
+                <td>Pokédollars</td>
                 <td data-bind="text: Math.max(100, Math.round($data.stage() ** 2)).toLocaleString()"></td>     
             </tr>
             <tr>

pages/Battle Points/overview.html

@@ -43,7 +43,7 @@ <h4>Shopmon</h4>
                 <th>Shop</th>
                 <th>Region</th>
             </thead>
-            <tbody data-bind="foreach: Wiki.battlePoints.getShopMons(5)">
+            <tbody data-bind="foreach: Wiki.shopMon.getShopMons(Currency.battlePoint)">
                 <tr>
                     <td class="align-middle">
                         <img width="24" class="me-1" data-bind="attr: { src: './pokeclicker/docs/' + $data[1].image }" />

pages/Diamonds/overview.html

@@ -136,7 +136,7 @@ <h3>Shopmon</h3>
                 <th>Shop</th>
                 <th>Region</th>
             </thead>
-            <tbody data-bind="foreach: Wiki.diamonds.getShopMons(3)">
+            <tbody data-bind="foreach: Wiki.shopMon.getShopMons(Currency.diamond)">
                 <tr>
                     <td class="align-middle">
                         <img width="24" class="me-1" data-bind="attr: { src: './pokeclicker/docs/' + $data[1].image }" />

pages/Dungeon Tokens/overview.html

@@ -17,12 +17,9 @@ <h4>By Region</h4>
             <tbody data-bind="foreach: GameHelper.enumNumbers(GameConstants.Region).filter((r) => r <= GameConstants.MAX_AVAILABLE_REGION && r != GameConstants.Region.none)">
                 <tr>
                     <td data-bind="text: GameConstants.camelCaseToString(GameConstants.Region[$data])"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute($data, 0)[0][0]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute($data, 0)[0][1]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute($data, 0)[0][2]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute($data, 0)[0][3]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute($data, 0)[0][4]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute($data, 0)[0][5]"></td>
+                    <!-- ko foreach: Wiki.dungeonTokens.highestRoute($data, 0)[0] -->
+                    <td data-bind="text: $data"></td>
+                    <!-- /ko -->
                 </tr>
             </tbody>
         </table>
@@ -50,12 +47,9 @@ <h4>Galar's Optimal Routes by Weather</h4>
                         <img width="18" class="me-1" data-bind="attr: { src: `./images/weather/${GameConstants.camelCaseToString(WeatherType[$data])}.png` }" />
                         <ko data-bind="text: GameConstants.camelCaseToString(WeatherType[$data])"></ko>
                     </td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute(7, $data)[0][0]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute(7, $data)[0][1]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute(7, $data)[0][2]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute(7, $data)[0][3]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute(7, $data)[0][4]"></td>
-                    <td data-bind="html: Wiki.dungeonTokens.highestRoute(7, $data)[0][5]"></td>
+                    <!-- ko foreach: Wiki.dungeonTokens.highestRoute(7, $data)[0] -->
+                    <td data-bind="text: $data"></td>
+                    <!-- /ko -->
                 </tr>
             </tbody>
         </table>
@@ -83,16 +77,9 @@ <h4><a data-bind="text: GameConstants.camelCaseToString(GameConstants.Region[$da
                     </tr>
                 </thead>
                 <tbody data-bind="foreach: Wiki.dungeonTokens.highestRoute($data, 0)[1]">
-                    <tr>
-                        <td data-bind="text: $data[0]"></td>
-                        <td data-bind="text: $data[1]"></td>
-                        <td data-bind="text: $data[2]"></td>
-                        <td data-bind="text: $data[3]"></td>
-                        <td data-bind="text: $data[4]"></td>
-                        <td data-bind="text: $data[5]"></td>
-                        <td data-bind="text: $data[6]"></td>
-                        <td data-bind="text: $data[7]"></td>
-                        </tr>
+                    <tr data-bind="foreach: $data">
+                        <td data-bind="text: $data"></td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -120,16 +107,9 @@ <h4><a data-bind="text: GameConstants.camelCaseToString(GameConstants.Region[$da
                         </tr>
                     </thead>
                     <tbody id="weatherTable" data-bind="foreach: Wiki.dungeonTokens.highestRoute($parent, $data)[1]">
-                        <tr>
-                            <td data-bind="text: $data[0]"></td>
-                            <td data-bind="text: $data[1]"></td>
-                            <td data-bind="text: $data[2]"></td>
-                            <td data-bind="text: $data[3]"></td>
-                            <td data-bind="text: $data[4]"></td>
-                            <td data-bind="text: $data[5]"></td>
-                            <td data-bind="text: $data[6]"></td>
-                            <td data-bind="text: $data[7]"></td>
-                            </tr>
+                        <tr data-bind="foreach: $data">
+                            <td data-bind="text: $data"></td>
+                        </tr>
                     </tbody>
                 </table>    
             </div>
@@ -174,7 +154,7 @@ <h4>Shopmon</h4>
                 <th>Shop</th>
                 <th>Region</th>
             </thead>
-            <tbody data-bind="foreach: Wiki.dungeonTokens.getShopMons(2)">
+            <tbody data-bind="foreach: Wiki.shopMon.getShopMons(Currency.dungeonToken)">
                 <tr>
                     <td class="align-middle">
                         <img width="24" class="me-1" data-bind="attr: { src: './pokeclicker/docs/' + $data[1].image }" />

pages/Pokémon Dollars/overview.html → pages/Pokédollars/overview.html

@@ -8,7 +8,7 @@ <h4>Shopmon</h4>
                 <th>Shop</th>
                 <th>Region</th>
             </thead>
-            <tbody data-bind="foreach: Wiki.pokemonDollars.getShopMons(0)">
+            <tbody data-bind="foreach: Wiki.shopMon.getShopMons(Currency.money)">
                 <tr>
                     <td class="align-middle">
                         <img width="24" class="me-1" data-bind="attr: { src: './pokeclicker/docs/' + $data[1].image }" />
@@ -27,24 +27,24 @@ <h4>Shopmon</h4>
     </div>
 </div>
 <hr>
-<h2>Obtaining Pokémon Dollars</h2>
+<h2>Obtaining Pokédollars</h2>
 <p>The following table presents the relevant information for gaining Poké. Routes are listed together with gyms of a particular region, and both provide rates of Poké per defeated Pokémon. The most efficient Gym and Route in each region is included in the Optimal Farming Location table.</p> 
-<p>The columns included in each table represent all the various combinations of Lucky Incense and Amulet Coin that apply a bonus to Poke Dollars gained.</p>
+<p>The columns included in each table represent all the various combinations of Lucky Incense and Amulet Coin that apply a bonus to Pokédollars gained.</p>
 
 <div class="table-responsive">
     <table class="table table-hover table-striped table-bordered">
         <tbody>
             <tr>
                 <td>Average</td>
-                <td>Average Pokedollars per defeated Pokémon with no modifiers active</td>
+                <td>Average Pokédollars per defeated Pokémon with no modifiers active</td>
             </tr>
             <tr>
                 <td>(AC/LI) Average</td>
-                <td>Average Pokedollars per defeated Pokémon with either Amulet Coin or Lucky Incense active</td>
+                <td>Average Pokédollars per defeated Pokémon with either Amulet Coin or Lucky Incense active</td>
             </tr>
             <tr>
                 <td>(AC*LI) Average</td>
-                <td>Average Pokedollars per defeated Pokémon with both Amulet Coin and Lucky Incense active</td>
+                <td>Average Pokédollars per defeated Pokémon with both Amulet Coin and Lucky Incense active</td>
             </tr>
         </tbody>
     </table>

pages/home.html

@@ -26,7 +26,7 @@
 <br>
 <center><h4>Currencies</h4></center>
 <div class="d-grid gap-2 d-sm-flex flex-wrap justify-content-sm-center align-items-center pb-2">
-    <a href="#!Pokémon_Dollars" class="btn btn-primary text-nowrap">Pokémon Dollars</a>
+    <a href="#!Pokédollars" class="btn btn-primary text-nowrap">Pokédollars</a>
     <a href="#!Dungeon_Tokens" class="btn btn-primary text-nowrap">Dungeon Tokens</a>
     <a href="#!Quest_Points" class="btn btn-primary text-nowrap">Quest Points</a>
     <a href="#!Farm_Points" class="btn btn-primary text-nowrap">Farm Points</a>

scripts/main.js

@@ -17,10 +17,8 @@ window.Wiki = {
   dreamOrbs: require('./pages/dreamOrbs'),
   farmSimulator: require('./pages/farmSimulator'),
   dungeons: require('./pages/dungeons'),
-  pokemonDollars: require('./pages/shopMon'),
+  shopMon: require('./pages/shopMon'),
   dungeonTokens: require('./pages/dungeonTokens'),
-  battlePoints: require('./pages/shopMon'),
-  diamonds: require('./pages/shopMon'),
   oakItems: require('./pages/oakItems'),
   getDealChains: require('./pages/dealChains').getDealChains,
   ...require('./navigation'),