Merge pull request #1048 from Mygod/defender-temp-evolution

fix: properly support gym defender temp evolutions
WatWowMap · Sep 4, 2024 · 164c76d · 164c76d
2 parents e4e4dce + 0d5b5f7
commit 164c76d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/types/lib/scanner.d.ts b/packages/types/lib/scanner.d.ts
@@ -33,6 +33,7 @@ export interface PokemonDisplay {
   gender: number
   shiny: boolean
   temp_evolution: number
+  temp_evolution_finish_ms?: number
   alignment: number
   badge: number
   location_card: number

diff --git a/src/features/gym/GymPopup.jsx b/src/features/gym/GymPopup.jsx
@@ -655,7 +655,9 @@ const ExtraGymInfo = ({
             src={Icons.getPokemon(
               guarding_pokemon_id,
               gpd.form,
-              gpd.temp_evolution,
+              Date.now() > gpd.temp_evolution_finish_ms
+                ? 0
+                : gpd.temp_evolution,
               gpd.gender,
               gpd.costume,
               gpd.alignment,