Some v0.10.16 fixes/updates (#168)

* Restore missing images * Fixup pokemon dungeon location display * All available shadows
pokeclicker · Dec 1, 2023 · e628b35 · e628b35
1 parent b5488d4
commit e628b35
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 18 deletions.
diff --git a/bundle.js b/bundle.js
@@ -78950,13 +78950,9 @@ const hasLootWithRequirements = (dungeon) => {
 hasLootWithRequirements.cache = new WeakMap();
 
 const getDungeonShadowPokemon = (dungeon) => {
-    // This will need to be updated to skip checking requirements once Orre XD is released
-    const shadows = [];
+    let shadows = [];
     dungeon.enemyList.forEach(enemy => {
         if (enemy instanceof DungeonTrainer) {
-            if (enemy.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             enemy.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -78970,9 +78966,6 @@ const getDungeonShadowPokemon = (dungeon) => {
     });
     dungeon.bossList.forEach(boss => {
         if (boss instanceof DungeonTrainer) {
-            if (boss.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             boss.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -78986,6 +78979,15 @@ const getDungeonShadowPokemon = (dungeon) => {
         }
     });
 
+    // Some dungeons have duplicate trainers with the same shadow form, filter these out
+    shadows = shadows.reduce((unique, s) => {
+        if (!unique.some(obj => obj.pokemon === s.pokemon && obj.dungeon === s.dungeon
+            && obj.trainer.name === s.trainer.name && obj.boss === s.boss)) {
+            unique.push(s);
+        }
+        return unique;
+    }, []);
+
     return shadows;
 };
 

diff --git a/data/Shadow Pokémon/overview_description.md b/data/Shadow Pokémon/overview_description.md
@@ -1,4 +1,4 @@
-Shadow Pokémon are Pokémon with a shadowy aura that can be encountered in Orre, a subregion from [[Regions/Hoenn]]. They can only be encountered as part of a trainer battle and never as a wild encounter.
+Shadow Pokémon are Pokémon with a shadowy aura that can be encountered in Orre, a subregion from [[Regions/Hoenn]]. They can only be encountered as part of a trainer battle and never as a wild encounter. There are a total of **131** Pokémon that can be obtained as shadows.
 
 These Pokémon have a **0.8x** multiplier to its attack. However, they can be purified which will change the multiplier to **1.2x** instead, making Purified Pokémon stronger than a regular one.
 

diff --git a/images/settings.svg b/images/settings.svg
diff --git a/images/user.svg b/images/user.svg
diff --git a/pages/Pokémon/main.html b/pages/Pokémon/main.html
@@ -101,7 +101,14 @@ <h4 class="accordion-header">
                     </h4>
                     <div id="obtain-method-dungeon" class="accordion-collapse collapse">
                         <div class="accordion-body" data-bind="foreach: Object.values($data[PokemonLocationType.Dungeon])">
-                            <a class="badge text-bg-secondary" data-bind="text: $data, attr: { href: `#!Dungeons/${$data}` }"></a>
+                            <a class="badge text-bg-secondary" data-bind="text: $data.dungeon + `${$data.requirements ? ' 🔒' : ''}`,
+                            attr: { href: `#!Dungeons/${$data.dungeon}` },
+                            tooltip: {
+                                title: $data.requirements ?? '',
+                                html: false,
+                                placement: 'bottom',
+                                trigger: 'hover'
+                            }"></a>
                         </div>
                     </div>
                 </div>

diff --git a/scripts/pages/dungeons.js b/scripts/pages/dungeons.js
@@ -316,13 +316,9 @@ const hasLootWithRequirements = (dungeon) => {
 hasLootWithRequirements.cache = new WeakMap();
 
 const getDungeonShadowPokemon = (dungeon) => {
-    // This will need to be updated to skip checking requirements once Orre XD is released
-    const shadows = [];
+    let shadows = [];
     dungeon.enemyList.forEach(enemy => {
         if (enemy instanceof DungeonTrainer) {
-            if (enemy.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             enemy.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -336,9 +332,6 @@ const getDungeonShadowPokemon = (dungeon) => {
     });
     dungeon.bossList.forEach(boss => {
         if (boss instanceof DungeonTrainer) {
-            if (boss.options?.requirement?.isCompleted() === false) {
-                return;
-            }
             boss.getTeam().forEach(pokemon => {
                 if (pokemon.shadow == GameConstants.ShadowStatus.Shadow) {
                     shadows.push({
@@ -352,6 +345,15 @@ const getDungeonShadowPokemon = (dungeon) => {
         }
     });
 
+    // Some dungeons have duplicate trainers with the same shadow form, filter these out
+    shadows = shadows.reduce((unique, s) => {
+        if (!unique.some(obj => obj.pokemon === s.pokemon && obj.dungeon === s.dungeon
+            && obj.trainer.name === s.trainer.name && obj.boss === s.boss)) {
+            unique.push(s);
+        }
+        return unique;
+    }, []);
+
     return shadows;
 };