From 29a5dd006868e14c80f9a5fbef6f6335a182bc89 Mon Sep 17 00:00:00 2001
From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Date: Thu, 25 Jul 2024 13:11:21 +0900
Subject: [PATCH] [Bug] fix and condition of shiny and passive (#3136)

---
 src/ui/starter-select-ui-handler.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 12a0174a227..6c2ff9ffe46 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1949,7 +1949,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
       const fitsGen =   this.filterBar.getVals(DropDownColumn.GEN).includes(container.species.generation);
       const fitsType =  this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1));
-      const fitsUnlocks = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(variant => {
+      const fitsShiny = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(variant => {
         if (variant === "SHINY3") {
           return isVariant3Caught;
         } else if (variant === "SHINY2") {
@@ -1960,7 +1960,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           return isCaught && !isVariantCaught && !isVariant2Caught && !isVariant3Caught;
         } else if (variant === "UNCAUGHT") {
           return isUncaught;
-        } else if (variant === "PASSIVEUNLOCKED") {
+        }
+      });
+      const fitsPassive = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(variant => {
+        if (variant === "PASSIVEUNLOCKED") {
           return isPassiveUnlocked;
         } else if (variant === "PASSIVELOCKED") {
           return !isPassiveUnlocked;
@@ -1978,7 +1981,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       });
 
-      if (fitsGen && fitsType && fitsUnlocks && fitsWin) {
+      if (fitsGen && fitsType && fitsShiny && fitsPassive && fitsWin) {
         this.filteredStarterContainers.push(container);
       }
     });