feat: show event stop markers if no quests/invasions

WatWowMap · Jan 10, 2024 · 32df5e9 · 32df5e9
1 parent ef6be7f
commit 32df5e9
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 5 deletions.
diff --git a/server/src/configs/default.json b/server/src/configs/default.json
@@ -956,6 +956,12 @@
         "md": 1,
         "lg": 2,
         "xl": 3
+      },
+      "event": {
+        "sm": 20,
+        "md": 40,
+        "lg": 60,
+        "xl": 80
       }
     }
   },

diff --git a/src/components/markers/usePokestopMarker.js b/src/components/markers/usePokestopMarker.js
@@ -57,10 +57,11 @@ export default function usePokestopMarker({
   }, basicEqualFn)
   const filters = useStore((s) => s.filters.pokestops.filter)
 
-  const [invasionMod, pokestopMod, rewardMod] = Icons.getModifiers(
+  const [invasionMod, pokestopMod, rewardMod, eventMod] = Icons.getModifiers(
     'invasion',
     'pokestop',
     'reward',
+    'event',
   )
 
   let popupYOffset = 1.3
@@ -71,6 +72,8 @@ export default function usePokestopMarker({
   const invasionSizes = []
   const questIcons = []
   const questSizes = []
+  const showcaseIcons = []
+  const showcaseSizes = []
 
   if (hasInvasion) {
     invasions.forEach((invasion) => {
@@ -185,7 +188,34 @@ export default function usePokestopMarker({
       popupY += rewardMod.popupY
     })
   }
-
+  if (hasEvent && !hasInvasion && !hasQuest) {
+    events.forEach((event) => {
+      if (event.display_type === 8) {
+        showcaseIcons.unshift({
+          url: Icons.getPokemon(352),
+        })
+        showcaseSizes.unshift(Icons.getSize('event', filters.b7?.size))
+      } else if (event.display_type === 9) {
+        showcaseIcons.unshift({
+          url: Icons.getPokemon(
+            event.showcase_pokemon_id,
+            event.showcase_pokemon_form_id,
+          ),
+        })
+        showcaseSizes.unshift(
+          Icons.getSize(
+            'event',
+            filters[
+              `f${event.showcase_pokemon_id}-${event.showcase_pokemon_form_id}`
+            ]?.size,
+          ),
+        )
+      }
+      popupYOffset += rewardMod.offsetY - 1
+      popupX += rewardMod.popupX
+      popupY += rewardMod.popupY
+    })
+  }
   const totalQuestSize = questSizes.reduce((a, b) => a + b, 0)
   const totalInvasionSize = invasionSizes.reduce((a, b) => a + b, 0)
 
@@ -284,7 +314,6 @@ export default function usePokestopMarker({
           .map(
             (invasion, i) => /* html */ `
               <img
-                key="${invasion.icon}"
                 src="${invasion.icon}"
                 alt="${invasion.icon}"
                 style="
@@ -301,6 +330,37 @@ export default function usePokestopMarker({
           `,
           )
           .join('')}
-      </div>`,
+          ${showcaseIcons
+            .map(
+              (icon, i) => `
+                <img
+                  src="${icon.url}"
+                  alt="${icon.url}"
+                  style="
+                    width: ${showcaseSizes[i]}px;
+                    height: ${showcaseSizes[i]}px;
+                    bottom: ${
+                      baseSize * 0.6 * eventMod.offsetY + showcaseSizes[i] * i
+                    }px;
+                    left: ${eventMod.offsetX * 50}%;
+                    transform: translateX(-50%);
+                  "
+                />
+                <img
+                  src="${Icons.getMisc('showcase')}"
+                  style="
+                    width: ${showcaseSizes[i] * 0.66}px;
+                    height: ${showcaseSizes[i] * 0.66}px;
+                    bottom: ${
+                      baseSize * 0.3 * eventMod.offsetY + showcaseSizes[i] * i
+                    }px;
+                    left: ${eventMod.offsetX * 50}%;
+                    transform: translateX(-50%);
+                  "
+                />
+            `,
+            )
+            .join('')}
+        </div>`,
   })
 }
diff --git a/src/services/Icons.js b/src/services/Icons.js
@@ -207,7 +207,7 @@ class UAssets {
    * @param {'sm' | 'md' | 'lg' | 'xl'} [size]
    */
   getSize(category, size = 'md') {
-    const baseSize = this.sizes[category][size]
+    const baseSize = this.sizes[category]?.[size] || 20
     return this.modifiers[category]
       ? baseSize * this.modifiers[category].sizeMultiplier
       : baseSize