From 2043ca29364a725032d27bfa1cba4a1f3ebe93ba Mon Sep 17 00:00:00 2001
From: KimJeongSun <leo@atlaslabs.ai>
Date: Tue, 3 Sep 2024 01:33:39 +0900
Subject: [PATCH] update passive label with updated new icons

---
 public/images/ui/icon_lock.png        | Bin 0 -> 172 bytes
 public/images/ui/icon_stop.png        | Bin 0 -> 205 bytes
 public/images/ui/legacy/icon_lock.png | Bin 0 -> 172 bytes
 public/images/ui/legacy/icon_stop.png | Bin 0 -> 205 bytes
 src/loading-scene.ts                  |   2 +
 src/ui/starter-select-ui-handler.ts   |  54 +++++++++++++++++++-------
 6 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 public/images/ui/icon_lock.png
 create mode 100644 public/images/ui/icon_stop.png
 create mode 100644 public/images/ui/legacy/icon_lock.png
 create mode 100644 public/images/ui/legacy/icon_stop.png

diff --git a/public/images/ui/icon_lock.png b/public/images/ui/icon_lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a12efa15e86b868f64a9e34e6fd6fdbcb4d321a
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^JRmj)8<3o<+3y6T7>k44ofy`glX(f`_;|WFhG>W;
zCpa*-E`9rdqTwtPE%8W2Bk54lDeb<DW`;Y`W~jt4oK+|(WSeAi=YG!L`4T+aS|wUf
zWJyf0JhGv^l`SAZ@Nwh>sR>aGN4%{YnBw<@0L|q~jqptK^<~fkvN?bl1TF<n22q}_
KelF{r5}E)!@-N*0

literal 0
HcmV?d00001

diff --git a/public/images/ui/icon_stop.png b/public/images/ui/icon_stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d9c201695a86c04186d139c6c455f5f4064dd17
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|ay?xfLo9mN
z21oN9P~d60`~Td#^vG>|8NSb^*E$GJHOOXsEh)U<)o&H;0EUQ1mJt*0%=X)~db8No
z$hk&LHdZ^=s%P$E+MKY4iG7`=rva;XlkA7k({8Hqx1v2J$8$~TTHF3)mfER*e|<Vn
u{48XermZCs{^E!r&|<#S2+uTMUj{88n*)eJ;8O5p5asFW=d#Wzp$Pz!sYIXv

literal 0
HcmV?d00001

diff --git a/public/images/ui/legacy/icon_lock.png b/public/images/ui/legacy/icon_lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a12efa15e86b868f64a9e34e6fd6fdbcb4d321a
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^JRmj)8<3o<+3y6T7>k44ofy`glX(f`_;|WFhG>W;
zCpa*-E`9rdqTwtPE%8W2Bk54lDeb<DW`;Y`W~jt4oK+|(WSeAi=YG!L`4T+aS|wUf
zWJyf0JhGv^l`SAZ@Nwh>sR>aGN4%{YnBw<@0L|q~jqptK^<~fkvN?bl1TF<n22q}_
KelF{r5}E)!@-N*0

literal 0
HcmV?d00001

diff --git a/public/images/ui/legacy/icon_stop.png b/public/images/ui/legacy/icon_stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d9c201695a86c04186d139c6c455f5f4064dd17
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|ay?xfLo9mN
z21oN9P~d60`~Td#^vG>|8NSb^*E$GJHOOXsEh)U<)o&H;0EUQ1mJt*0%=X)~db8No
z$hk&LHdZ^=s%P$E+MKY4iG7`=rva;XlkA7k({8Hqx1v2J$8$~TTHF3)mfER*e|<Vn
u{48XermZCs{^E!r&|<#S2+uTMUj{88n*)eJ;8O5p5asFW=d#Wzp$Pz!sYIXv

literal 0
HcmV?d00001

diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index e4a73414cd1..4d67ec01ccd 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -98,6 +98,8 @@ export class LoadingScene extends SceneBase {
     this.loadImage("ha_capsule", "ui", "ha_capsule.png");
     this.loadImage("champion_ribbon", "ui", "champion_ribbon.png");
     this.loadImage("icon_spliced", "ui");
+    this.loadImage("icon_lock", "ui", "icon_lock.png");
+    this.loadImage("icon_stop", "ui", "icon_stop.png");
     this.loadImage("icon_tera", "ui");
     this.loadImage("type_tera", "ui");
     this.loadAtlas("type_bgs", "ui");
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 8645e199653..d8a348cba26 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -263,6 +263,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   private pokemonHatchedIcon : Phaser.GameObjects.Sprite;
   private pokemonHatchedCountText: Phaser.GameObjects.Text;
   private pokemonShinyIcon: Phaser.GameObjects.Sprite;
+  private pokemonPassiveDisabledIcon: Phaser.GameObjects.Sprite;
+  private pokemonPassiveLockedIcon: Phaser.GameObjects.Sprite;
 
   private instructionsContainer: Phaser.GameObjects.Container;
   private filterInstructionsContainer: Phaser.GameObjects.Container;
@@ -574,6 +576,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonPassiveText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonPassiveText);
 
+    this.pokemonPassiveDisabledIcon = this.scene.add.sprite(starterInfoXPos, 137 + starterInfoYOffset, "icon_stop");
+    this.pokemonPassiveDisabledIcon.setOrigin(0, 0.5);
+    this.pokemonPassiveDisabledIcon.setDisplaySize(5.5, 5.5);
+    this.pokemonPassiveDisabledIcon.setVisible(false);
+    this.starterSelectContainer.add(this.pokemonPassiveDisabledIcon);
+
+    this.pokemonPassiveLockedIcon = this.scene.add.sprite(starterInfoXPos, 137 + starterInfoYOffset, "icon_lock");
+    this.pokemonPassiveLockedIcon.setOrigin(0, 0.5);
+    this.pokemonPassiveLockedIcon.setDisplaySize(5, 5);
+    this.pokemonPassiveLockedIcon.setVisible(false);
+    this.starterSelectContainer.add(this.pokemonPassiveLockedIcon);
+
     this.pokemonNatureLabelText = addTextObject(this.scene, 6, 145 + starterInfoYOffset, i18next.t("starterSelectUiHandler:nature"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
     this.pokemonNatureLabelText.setOrigin(0, 0);
     this.pokemonNatureLabelText.setVisible(false);
@@ -734,7 +748,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonShinyIcon = this.scene.add.sprite(14, 76, "shiny_icons");
     this.pokemonShinyIcon.setOrigin(0.15, 0.2);
     this.pokemonShinyIcon.setScale(1);
-    this.pokemonCaughtHatchedContainer.add ((this.pokemonShinyIcon));
+    this.pokemonCaughtHatchedContainer.add(this.pokemonShinyIcon);
 
     this.pokemonHatchedCountText = addTextObject(this.scene, 24, 19, "0", TextStyle.SUMMARY_ALT);
     this.pokemonHatchedCountText.setOrigin(0, 0);
@@ -3069,27 +3083,39 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         const passiveAbility = allAbilities[starterPassiveAbilities[this.lastSpecies.speciesId]];
 
         if (passiveAbility) {
-          const isUnlocked = passiveAttr & PassiveAttr.UNLOCKED;
-          const isEnabled = passiveAttr & PassiveAttr.ENABLED;
+          const isUnlocked = !!(passiveAttr & PassiveAttr.UNLOCKED);
+          const isEnabled = !!(passiveAttr & PassiveAttr.ENABLED);
 
-          const labelStyle = isUnlocked ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GRAY;
           const textStyle = isUnlocked && isEnabled ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GRAY;
-          const labelAlpha = isUnlocked ? 1 : 0.5;
           const textAlpha = isUnlocked && isEnabled ? 1 : 0.5;
 
-          this.pokemonPassiveLabelText.setVisible(true);
-          this.pokemonPassiveLabelText.setColor(this.getTextColor(labelStyle));
-          this.pokemonPassiveLabelText.setAlpha(labelAlpha);
-          this.pokemonPassiveLabelText.setShadowColor(this.getTextColor(labelStyle, true));
+          this.pokemonPassiveLabelText
+            .setVisible(true)
+            .setColor(this.getTextColor(TextStyle.SUMMARY_ALT))
+            .setShadowColor(this.getTextColor(TextStyle.SUMMARY_ALT, true));
+          this.pokemonPassiveText
+            .setVisible(true)
+            .setText(passiveAbility.name)
+            .setColor(this.getTextColor(textStyle))
+            .setAlpha(textAlpha)
+            .setShadowColor(this.getTextColor(textStyle, true));
+
+          const iconPosition = {
+            x: this.pokemonPassiveText.x + this.pokemonPassiveText.displayWidth + 1,
+            y: this.pokemonPassiveText.y + this.pokemonPassiveText.displayHeight / 2
+          };
+          this.pokemonPassiveDisabledIcon
+            .setVisible(isUnlocked && !isEnabled)
+            .setPosition(iconPosition.x, iconPosition.y);
+          this.pokemonPassiveLockedIcon
+            .setVisible(!isUnlocked)
+            .setPosition(iconPosition.x, iconPosition.y);
 
-          this.pokemonPassiveText.setVisible(true);
-          this.pokemonPassiveText.setText(passiveAbility.name);
-          this.pokemonPassiveText.setColor(this.getTextColor(textStyle));
-          this.pokemonPassiveText.setAlpha(textAlpha);
-          this.pokemonPassiveText.setShadowColor(this.getTextColor(textStyle, true));
         } else {
           this.pokemonPassiveLabelText.setVisible(false);
           this.pokemonPassiveText.setVisible(false);
+          this.pokemonPassiveDisabledIcon.setVisible(false);
+          this.pokemonPassiveLockedIcon.setVisible(false);
         }
 
         this.pokemonNatureText.setText(getNatureName(natureIndex as unknown as Nature, true, true, false, this.scene.uiTheme));