feat: support pokemon display in showcases

WatWowMap · Sep 16, 2024 · d39ebab · d39ebab
1 parent 4825010
commit d39ebab
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git a/packages/types/lib/scanner.d.ts b/packages/types/lib/scanner.d.ts
@@ -142,12 +142,9 @@ export interface Invasion {
   slot_3_form: number
 }
 
-export interface ShowcaseEntry {
+export interface ShowcaseEntry extends PokemonDisplay {
   rank: number
   pokemon_id: number
-  form: number
-  costume: number
-  gender: Gender
   score: number
 }
 

diff --git a/src/features/gym/GymPopup.jsx b/src/features/gym/GymPopup.jsx
@@ -652,17 +652,7 @@ const ExtraGymInfo = ({
       {!!guarding_pokemon_id && updated > gymValidDataLimit && (
         <ExtraInfo title="defender">
           <TextWithIcon
-            src={Icons.getPokemon(
-              guarding_pokemon_id,
-              gpd.form,
-              Date.now() > gpd.temp_evolution_finish_ms
-                ? 0
-                : gpd.temp_evolution,
-              gpd.gender,
-              gpd.costume,
-              gpd.alignment,
-              gpd.shiny,
-            )}
+            src={Icons.getPokemonByDisplay(guarding_pokemon_id, gpd)}
           >
             {gpd.badge === 1 && (
               <>

diff --git a/src/features/pokestop/PokestopPopup.jsx b/src/features/pokestop/PokestopPopup.jsx
@@ -34,6 +34,7 @@ import { NameTT } from '@components/popups/NameTT'
 import { TimeStamp } from '@components/popups/TimeStamps'
 import { useAnalytics } from '@hooks/useAnalytics'
 import { parseQuestConditions } from '@utils/parseConditions'
+import { Img } from '@components/Img'
 
 /**
  *
@@ -846,8 +847,10 @@ const NoBorderCell = styled(TableCell, {
   textAlign,
 }))
 
-const ShowcaseEntry = ({ rank, score, pokemon_id, form, costume, gender }) => {
+const ShowcaseEntry = (entry) => {
+  const { rank, score, pokemon_id, badge } = entry
   const Icons = useMemory((s) => s.Icons)
+  const { t } = useTranslation()
   return (
     <TableRow>
       <NoBorderCell>
@@ -862,10 +865,18 @@ const ShowcaseEntry = ({ rank, score, pokemon_id, form, costume, gender }) => {
       {pokemon_id && (
         <NoBorderCell>
           <img
-            src={Icons.getPokemon(pokemon_id, form, 0, gender, costume)}
+            src={Icons.getPokemonByDisplay(pokemon_id, entry)}
             alt="rank"
             height={20}
           />
+          {badge === 1 && (
+            <Img
+              src={Icons.getMisc('bestbuddy')}
+              alt={t('best_buddy')}
+              maxHeight={15}
+              maxWidth={15}
+            />
+          )}
         </NoBorderCell>
       )}
     </TableRow>

diff --git a/src/services/Assets.js b/src/services/Assets.js
@@ -345,6 +345,24 @@ export class UAssets {
     }
   }
 
+  /**
+   * @param {string|number} pokemonId
+   * @param {PokemonDisplay} pokemonDisplay
+   */
+  getPokemonByDisplay(pokemonId, pokemonDisplay) {
+    return this.getPokemon(
+      pokemonId,
+      pokemonDisplay.form,
+      Date.now() > pokemonDisplay.temp_evolution_finish_ms
+        ? 0
+        : pokemonDisplay.temp_evolution,
+      pokemonDisplay.gender,
+      pokemonDisplay.costume,
+      pokemonDisplay.alignment,
+      pokemonDisplay.shiny,
+    )
+  }
+
   /** @param {number | string} [typeId] */
   getTypes(typeId = 0) {
     try {