Fix past gen stat calculations

pkmn · Jan 30, 2023 · 709d002 · 709d002
1 parent b560c7f
commit 709d002
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/extension/chrome/manifest.json b/extension/chrome/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "Pokémon Showdown Randbats Tooltip",
   "description": "Enhanced tooltip functionality for Pokémon Showdown Random Battle formats.",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "icons": {
     "16": "/16x16.png",
     "32": "/32x32.png",

diff --git a/extension/firefox/manifest.json b/extension/firefox/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Pokémon Showdown Randbats Tooltip",
   "description": "Enhanced tooltip functionality for Pokémon Showdown Random Battle formats.",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "icons": {
     "16": "/16x16.png",
     "32": "/32x32.png",

diff --git a/extension/index.js b/extension/index.js
@@ -27,6 +27,7 @@ if (TOOLTIP) {
           for (var name in json) {
             var pokemon = json[name];
             data[pokemon.level] = data[pokemon.level] || {};
+            // Dex.forGen not important here because we're not looking at stats
             var species = Dex.species.get(name);
             var id = toID(species.forme === 'Gmax'
               ? species.baseSpecies
@@ -52,16 +53,16 @@ if (TOOLTIP) {
     var format = toID(this.battle.tier);
     if (!format || !format.includes('random')) return original;
 
-    var species = Dex.species.get(
+    var gen = Number(format.charAt(3));
+    var letsgo = format.includes('letsgo');
+    var gameType = this.battle.gameType;
+
+    var species = Dex.forGen(gen).species.get(
       clientPokemon.volatiles.formechange
       ? clientPokemon.volatiles.formechange[1]
       : clientPokemon.speciesForme);
     if (!species) return original;
 
-    var gen = Number(format.charAt(3));
-    var letsgo = format.includes('letsgo');
-    var gameType = this.battle.gameType;
-
     if (!['singles', 'doubles'].includes(gameType)) {
       format = 'gen' + gen + 'randomdoublesbattle';
     } else if (format.includes('monotype') || format.includes('unrated')) {