![]()
-
-
Best locations
+
+
The top two locations from each Region are listed below, if they exist.
Pokémon that appear during certain weather or other special conditions are not included in the route calculation.
@@ -15,48 +15,23 @@ Best locations
Region |
Battle Type |
Location |
+ Maximum HP |
+ Average Gems Per Pokémon |
-
+
+
- |
- Gym |
- |
-
-
- | Route |
- |
+ |
+ |
+ |
+ |
+
+
+ ![]()
+ |
+
diff --git a/scripts/game.js b/scripts/game.js
index e26e8b30..628efe96 100644
--- a/scripts/game.js
+++ b/scripts/game.js
@@ -22,8 +22,8 @@ themes.options.sort((a, b) => (a.text).localeCompare(b.text));
// Suppress game notifications
Notifier.notify = () => {};
-// Ensure weather never satisfies requirements so they are always shown
-Weather.currentWeather = () => -1;
+// Ensure requirements are never satisfied so they are always shown
+Requirement.prototype.isCompleted = () => false;
// Not sure why but this was causing an error on load after the v0.10.22 update
SortModules = () => {};
@@ -78,6 +78,7 @@ GemDeals.generateDeals();
ShardDeal.generateDeals();
GenericDeal.generateDeals();
SafariPokemonList.generateSafariLists(); // This needs to be after anything that generates shopmon due to Friend Safari calcs
+Weather.generateWeather(now);
// Farm Simulator
App.game.farming.plotList.forEach((p) => p.isUnlocked = true); // All plots unlocked
diff --git a/scripts/main.js b/scripts/main.js
index efcbc4da..4c9a328e 100644
--- a/scripts/main.js
+++ b/scripts/main.js
@@ -20,6 +20,7 @@ window.Wiki = {
shopMon: require('./pages/shopMon'),
dungeonTokens: require('./pages/dungeonTokens'),
oakItems: require('./pages/oakItems'),
+ gems: require('./pages/gems'),
getDealChains: require('./pages/dealChains').getDealChains,
...require('./navigation'),
}
diff --git a/scripts/pages/dungeonTokens.js b/scripts/pages/dungeonTokens.js
index d974f692..573f7c47 100644
--- a/scripts/pages/dungeonTokens.js
+++ b/scripts/pages/dungeonTokens.js
@@ -51,7 +51,7 @@ const highestRoute = (region, weather) => {
const GBMB = (DT* (catchChanceAV+.15))/(2);
const UB = (DT* (catchChanceAV+.1))/(1.75)
const UBMB = (DT* (catchChanceAV+.2))/(1.75);
- routeArr.push( [Routes.getRoute(region,route.number).routeName, DT.toLocaleString(), +(PB). toFixed(2), +(PBMB). toFixed(2), +(GB). toFixed(2), +(GBMB). toFixed(2), +(UB). toFixed(2), +(UBMB). toFixed(2)] );
+ routeArr.push([Routes.getRoute(region,route.number).routeName, DT.toLocaleString(), +(PB).toFixed(2), +(PBMB).toFixed(2), +(GB).toFixed(2), +(GBMB).toFixed(2), +(UB).toFixed(2), +(UBMB).toFixed(2)])
})
var highestPB = routeArr.reduce((max, dt) => {
diff --git a/scripts/pages/gems.js b/scripts/pages/gems.js
new file mode 100644
index 00000000..bfe268ac
--- /dev/null
+++ b/scripts/pages/gems.js
@@ -0,0 +1,138 @@
+// routeAvgHp copied from PokemonFactory.generateWildPokemon
+const routeAvgHp = (region, route) => {
+ const poke = [...new Set(Object.values(Routes.getRoute(region, route).pokemon).flat().map(p => p.pokemon ?? p).flat())];
+ const total = poke.map(p => pokemonMap[p].base.hitpoints).reduce((s, a) => s + a, 0);
+ return total / poke.length;
+};
+
+const getStandardEncounters = (route) => {
+ return Object.values(route.pokemon).flat().filter((p) => typeof p === 'string');
+}
+
+const maxRouteHp = (regionRoutes, routeName) => {
+ const route = regionRoutes.find((r) => r.routeName === routeName);
+ const allMons = getStandardEncounters(route);
+ const maxHpStat = Math.max(...allMons.map((p) => PokemonHelper.getPokemonByName(p).hitpoints));
+ return Math.round(PokemonFactory.routeHealth(route.number, route.region) * (0.9 + (maxHpStat / routeAvgHp(route.region, route.number)) / 10));
+}
+
+const maxGymHp = (gymName) => {
+ return Math.max(...GymList[gymName].pokemons.map((p) => p.maxHealth));
+}
+
+const gemsPerPokemon = (pokemonName, gemType) => {
+ const pokemon = PokemonHelper.getPokemonByName(pokemonName);
+ const targetType = PokemonType[gemType];
+ if (pokemon.type2 === PokemonType.None) {
+ return pokemon.type1 === targetType ? 2 : 0;
+ } else {
+ return (pokemon.type1 === targetType || pokemon.type2 === targetType) ? 1 : 0;
+ }
+}
+
+const gemsPerGymEncounter = (gymName, gemType) => {
+ const gym = GymList[gymName];
+ const totalMons = gym.pokemons.length;
+ const totalGemsOfType = gym.pokemons.reduce((acc, p) => acc + 5 * gemsPerPokemon(p.name, gemType), 0);
+ return totalGemsOfType / totalMons;
+}
+
+const gemsPerRouteEncounter = (route, gemType) => {
+ const allMons = getStandardEncounters(route);
+ const totalMons = allMons.length;
+ const totalGemsOfType = allMons.reduce((acc, p) => acc + gemsPerPokemon(p, gemType), 0);
+ return totalGemsOfType / totalMons;
+}
+
+const bestGemsPerRegion = (region, gemType) => {
+ const regionRoutes = Routes.regionRoutes.filter((r) => r.region == region);
+ const allRouteGems = regionRoutes.map((route) => ({
+ battleType: "Route",
+ name: route.routeName,
+ gemsPerEncounter: gemsPerRouteEncounter(route, gemType),
+ }));
+
+ const regionGyms = GameConstants.RegionGyms[region].filter((g) => !g.includes('Trial'));
+ const allGymGems = regionGyms.map((gym) => ({
+ battleType: "Gym",
+ name: gym,
+ gemsPerEncounter: gemsPerGymEncounter(gym, gemType),
+ }));
+
+ return allRouteGems.concat(allGymGems)
+ .filter((battle) => battle.gemsPerEncounter > 0)
+ .sort((a, b) => b.gemsPerEncounter - a.gemsPerEncounter)
+ .splice(0, 2)
+ .map((gemData) => {
+ gemData.maxHealth = gemData.battleType === "Route" ? maxRouteHp(regionRoutes, gemData.name) : maxGymHp(gemData.name);
+ return gemData;
+ });
+}
+
+const bestCaptureRoutesPerRegion = (region, type) => {
+ const regionRoutes = Routes.regionRoutes.filter((r) => r.region == region);
+ const currentWeather = Weather.regionalWeather[region]();
+ const today = GameHelper.today().getDay();
+ const allRegionRoutesTypeCatchChance = regionRoutes.map((route) => {
+ const normalEncounters = getStandardEncounters(route);
+ const specialEncounters = route.pokemon.special.flatMap((special) => {
+ if (special.req instanceof OneFromManyRequirement || special.req instanceof SpecialEventRandomRequirement) {
+ // OneFromMany is Santa Jynx only
+ return [];
+ }
+ if (special.req instanceof WeatherRequirement) {
+ return special.req.weather.includes(currentWeather) ? special.pokemon : [];
+ }
+ if (special.req instanceof DayOfWeekRequirement) {
+ return special.req.DayOfWeekNum === today ? special.pokemon : [];
+ }
+ if (special.req instanceof MultiRequirement) {
+ // This might not cover all permutations of requirements
+ if (special.req.requirements.find((req) => req instanceof SpecialEventRequirement)) return [];
+ const weatherReq = special.req.requirements.find((req) => req instanceof WeatherRequirement);
+ if (weatherReq) return weatherReq.weather.includes(currentWeather) ? special.pokemon : [];
+ const dayReq = special.req.requirements.find((req) => req instanceof DayOfWeekRequirement);
+ if (dayReq) return dayReq.DayOfWeekNum === today ? special.pokemon : [];
+ }
+ return special.pokemon
+ });
+
+ const allEncounters = normalEncounters.concat(specialEncounters);
+ const typeCatchChances = allEncounters.map((p) => {
+ const pokemon = PokemonHelper.getPokemonByName(p);
+ return (pokemon.type1 === type || pokemon.type2 === type) ? PokemonFactory.catchRateHelper(pokemon.catchRate, true) : 0;
+ });
+ return {
+ route: route,
+ catchChances: typeCatchChances,
+ };
+ });
+
+ const allRoutesWithType = allRegionRoutesTypeCatchChance.filter((route) => route.catchChances.some((chance) => chance > 0));
+ const allRoutesWithCatchBonuses = allRoutesWithType.map((route) => {
+ const encounters = route.catchChances.length;
+ return {
+ route: route.route,
+ pokeball: route.catchChances.reduce((a, b) => a + b, 0) / encounters,
+ ultraball: route.catchChances.map((chance) => chance > 0 ? chance + 10 : chance).reduce((a, b) => a + b, 0) / encounters,
+ ultraballMagicBall: route.catchChances.map((chance) => chance > 0 ? chance + 20 : chance).reduce((a, b) => a + b, 0) / encounters,
+ }
+ });
+ return allRoutesWithCatchBonuses
+ .sort((a, b) => b.ultraballMagicBall - a.ultraballMagicBall)
+ .splice(0, 2)
+ .map((route) => {
+ return {
+ ...route,
+ weather: currentWeather,
+ today: today,
+ maxHealth: maxRouteHp(regionRoutes, route.route.routeName),
+ }
+ });
+}
+
+
+module.exports = {
+ bestGemsPerRegion,
+ bestCaptureRoutesPerRegion,
+}
diff --git a/scripts/typeahead.js b/scripts/typeahead.js
index e82aa194..d3f6222b 100644
--- a/scripts/typeahead.js
+++ b/scripts/typeahead.js
@@ -60,6 +60,11 @@ const searchOptions = [
type: 'Gems',
page: t,
})),
+ ...GameHelper.enumStrings(PokemonType).filter(t => t != 'None').map(t => ({
+ display: `${t} Catch Type Quests`,
+ type: 'Catch Type Quests',
+ page: t,
+ })),
// Berries
{
display: 'Berries',
diff --git a/styles.css b/styles.css
index 1a1b2bea..91ce6e7a 100644
--- a/styles.css
+++ b/styles.css
@@ -450,3 +450,10 @@ td.tight {
.obtain-methods .accordion-button img {
padding-right: 10px;
}
+
+.type-icon {
+ line-height: normal;
+ text-shadow: 0px 0px 1px black, 0px 0px 1px black, 0px 0px 1px black, 0px 0px 2px black, 0px 0px 2px black, 0px 0px 3px black;
+ text-transform: uppercase;
+ color: #f5f5f5;
+}
diff --git a/templates/pokemon-summary.html b/templates/pokemon-summary.html
index 79fa0095..e10518f3 100644
--- a/templates/pokemon-summary.html
+++ b/templates/pokemon-summary.html
@@ -84,7 +84,7 @@
Type(s) |
-
+
|
+ 
+ or
+ 
+