From e7c0c1abd4fc6c23dab967be1c2c2de8a3a6d743 Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Sun, 23 Apr 2023 19:41:32 -0400
Subject: [PATCH] Add some minor details to summary screen

---
 public/images/types.json                   | 135 ++++++++++++---------
 public/images/types.png                    | Bin 1657 -> 1646 bytes
 public/images/types/fairy.png              | Bin 0 -> 271 bytes
 public/images/ui/shiny.png                 | Bin 0 -> 138 bytes
 public/images/ui/summary_overlay_shiny.png | Bin 288 -> 288 bytes
 src/ui/summary-ui-handler.ts               |  11 +-
 src/ui/text.ts                             |  93 +++++++-------
 7 files changed, 129 insertions(+), 110 deletions(-)
 create mode 100644 public/images/types/fairy.png
 create mode 100644 public/images/ui/shiny.png

diff --git a/public/images/types.json b/public/images/types.json
index c348d426f..d8ca3cc41 100644
--- a/public/images/types.json
+++ b/public/images/types.json
@@ -4,11 +4,32 @@
 			"image": "types.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 612,
-				"h": 16
+				"w": 32,
+				"h": 266
 			},
 			"scale": 1,
 			"frames": [
+				{
+					"filename": "unknown",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					}
+				},
 				{
 					"filename": "bug",
 					"rotated": false,
@@ -24,8 +45,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 1,
-						"y": 1,
+						"x": 0,
+						"y": 14,
 						"w": 32,
 						"h": 14
 					}
@@ -45,8 +66,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 1,
+						"x": 0,
+						"y": 28,
 						"w": 32,
 						"h": 14
 					}
@@ -66,8 +87,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 69,
-						"y": 1,
+						"x": 0,
+						"y": 42,
 						"w": 32,
 						"h": 14
 					}
@@ -87,8 +108,29 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 103,
-						"y": 1,
+						"x": 0,
+						"y": 56,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "fairy",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 70,
 						"w": 32,
 						"h": 14
 					}
@@ -108,8 +150,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 137,
-						"y": 1,
+						"x": 0,
+						"y": 84,
 						"w": 32,
 						"h": 14
 					}
@@ -129,8 +171,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 171,
-						"y": 1,
+						"x": 0,
+						"y": 98,
 						"w": 32,
 						"h": 14
 					}
@@ -150,8 +192,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 205,
-						"y": 1,
+						"x": 0,
+						"y": 112,
 						"w": 32,
 						"h": 14
 					}
@@ -171,8 +213,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 239,
-						"y": 1,
+						"x": 0,
+						"y": 126,
 						"w": 32,
 						"h": 14
 					}
@@ -192,8 +234,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 273,
-						"y": 1,
+						"x": 0,
+						"y": 140,
 						"w": 32,
 						"h": 14
 					}
@@ -213,8 +255,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 307,
-						"y": 1,
+						"x": 0,
+						"y": 154,
 						"w": 32,
 						"h": 14
 					}
@@ -234,8 +276,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 341,
-						"y": 1,
+						"x": 0,
+						"y": 168,
 						"w": 32,
 						"h": 14
 					}
@@ -255,8 +297,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 375,
-						"y": 1,
+						"x": 0,
+						"y": 182,
 						"w": 32,
 						"h": 14
 					}
@@ -276,8 +318,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 409,
-						"y": 1,
+						"x": 0,
+						"y": 196,
 						"w": 32,
 						"h": 14
 					}
@@ -297,8 +339,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 443,
-						"y": 1,
+						"x": 0,
+						"y": 210,
 						"w": 32,
 						"h": 14
 					}
@@ -318,8 +360,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 477,
-						"y": 1,
+						"x": 0,
+						"y": 224,
 						"w": 32,
 						"h": 14
 					}
@@ -339,8 +381,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 511,
-						"y": 1,
+						"x": 0,
+						"y": 238,
 						"w": 32,
 						"h": 14
 					}
@@ -360,29 +402,8 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 545,
-						"y": 1,
-						"w": 32,
-						"h": 14
-					}
-				},
-				{
-					"filename": "unknown",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 14
-					},
-					"spriteSourceSize": {
 						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 14
-					},
-					"frame": {
-						"x": 579,
-						"y": 1,
+						"y": 252,
 						"w": 32,
 						"h": 14
 					}
@@ -393,6 +414,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:487be8bed12f0ec062283a698524f491:d47bd2a8523f360e898c134601ed66bd:5961efbfbf4c56b8745347e7a663a32f$"
+		"smartupdate": "$TexturePacker:SmartUpdate:194223c9662d1ecd87e27433f731e65a:63fb5df5cbaa3edbf6f88332a579bdac:5961efbfbf4c56b8745347e7a663a32f$"
 	}
 }
diff --git a/public/images/types.png b/public/images/types.png
index fa705e341954b111acdbdffb3ebe08153c438641..0e07620b7185bc76a196ad284ecb717e26ee2829 100644
GIT binary patch
literal 1646
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

literal 1657
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
Dh|3|1

diff --git a/public/images/types/fairy.png b/public/images/types/fairy.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8ca169d3aae52499101daa1db82f3c12b24d185
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^3P8-q!3HG#?#OKdQrA3P978NlC#NJNB>brV^tQf@
zk)h|=p&p(8{`>y^FZ%zsal`zF|4(lJFBxAlM?&EKVFqC{$3`Y*5u3+{xkL&}?0k5p
z%gvDS;gQ_%peWManYC?kLXs%2tU%deE*5EDd7nK^2O07?HawVoMxf(>wj0lEfdela
zy4v`5^e3<#I`V-r=hulMhANQ-?D~qeKNfXn1v>QDIRzee@e~u%FlhKK7R{x;%HU8K
z-vJ)yGQ&+0il--BU9h>ch#{7Hk*IkZ&y1(qd1n$5K+c~rVS<6e!hj74jLHmuw^Zbu
TQg1c|`jElX)z4*}Q$iB}z-(rq

literal 0
HcmV?d00001

diff --git a/public/images/ui/shiny.png b/public/images/ui/shiny.png
new file mode 100644
index 0000000000000000000000000000000000000000..04dad2a279e47704a315c91a1a535e9a20f20bd2
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)H!VDyjYyB_<Qv3lvA+D*qB|j!e{5YWS<3<Ni
zEK$7WIFMp23GxeOaCmkj4am{-ba4#fxSpJlkix*ECa`eLfddLDIVuMZq~shqa3Cj#
iM`g;C#z#D7xEPdHG3or3U$q&iiNVv=&t;ucLK6VXU@7we

literal 0
HcmV?d00001

diff --git a/public/images/ui/summary_overlay_shiny.png b/public/images/ui/summary_overlay_shiny.png
index 0582b2aadfc186d2520658fcdb985ef66224ba6b..4102a45e3d7496402c9ccf60bd9366d184051ea7 100644
GIT binary patch
delta 200
zcmV;(05|`j0-yqr7k_C81^@s6#g``V0002zNkl<Zc-rmPu?>Sj3_wv|lmQqcqcFye
zb|oWtl#D>h2Be816p<263h#A@&ek^~=6PCMt82V{KXa^GM8r6bVd#C_f4!LJ>9df`
zj9ObUu7e85%-sqy(}d1gz;+3AT7VPNc>#MTM-eA{gttSlwHuYzVs-zymSuVR2k12O
zV)$H|0#JYgPyi?Z6p^e=BKR*B(0BI568ag2M|lB)-|us)qIP-!0000<MNUMnLSTY1
Cx>lwD

delta 197
zcmV;$06PDm0-yqr7k_F91^@s6LjzP^0002zNkl<Zc-rmP!3}~y5J1scV*!+5DU`9L
z?U53u6ie8n9pJ?nV(<u?=zBN9Z6<#R(fhKtR@Zp>eCAk}h=_Tf!_ddLetXgT@?J=0
zMy;(F*Fgnj=57U<X+mc#V7mkcEx?Hxynwxvqlgne!rP(O+7?P{vAX}ji5`!;pRhqQ
zFNV)wQveE3k+DsY;07VT#RA68zF5LI({w9OX}IrmRQAhS00000NkvXXu0mjf&{|q2

diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index b6806ebe8..800c77162 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -4,7 +4,7 @@ import UiHandler from "./uiHandler";
 import * as Utils from "../utils";
 import { PlayerPokemon } from "../pokemon";
 import { Type } from "../data/type";
-import { TextStyle, addTextObject } from "./text";
+import { TextStyle, addTextObject, getTextColor } from "./text";
 import Move, { MoveCategory } from "../data/move";
 import { getPokeballAtlasKey } from "../data/pokeball";
 import { getGenderColor, getGenderSymbol } from "../data/gender";
@@ -30,6 +30,7 @@ export default class SummaryUiHandler extends UiHandler {
 
   private summaryContainer: Phaser.GameObjects.Container;
   private tabSprite: Phaser.GameObjects.Sprite;
+  private shinyOverlay: Phaser.GameObjects.Image;
   private numberText: Phaser.GameObjects.Text;
   private pokemonSprite: Phaser.GameObjects.Sprite;
   private nameText: Phaser.GameObjects.Text;
@@ -81,6 +82,10 @@ export default class SummaryUiHandler extends UiHandler {
     this.tabSprite.setOrigin(1, 1);
     this.summaryContainer.add(this.tabSprite);
 
+    this.shinyOverlay = this.scene.add.image(6, -54, 'summary_overlay_shiny');
+    this.shinyOverlay.setOrigin(0, 1);
+    this.summaryContainer.add(this.shinyOverlay);
+
     this.numberText = addTextObject(this.scene, 17, -150, '000', TextStyle.SUMMARY);
     this.numberText.setOrigin(0, 1);
     this.summaryContainer.add(this.numberText);
@@ -152,7 +157,11 @@ export default class SummaryUiHandler extends UiHandler {
     this.summaryContainer.setVisible(true);
     this.cursor = -1;
 
+    this.shinyOverlay.setVisible(this.pokemon.shiny);
+
     this.numberText.setText(Utils.padInt(this.pokemon.species.speciesId, 3));
+    this.numberText.setColor(getTextColor(!this.pokemon.shiny ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
+    this.numberText.setShadowColor(getTextColor(!this.pokemon.shiny ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true));
 
     this.pokemonSprite.play(this.pokemon.getSpriteKey());
     this.pokemon.cry();
diff --git a/src/ui/text.ts b/src/ui/text.ts
index e59970a06..2236ab976 100644
--- a/src/ui/text.ts
+++ b/src/ui/text.ts
@@ -4,75 +4,45 @@ export enum TextStyle {
   BATTLE_INFO,
   PARTY,
   SUMMARY,
-  SUMMARY_RED
+  SUMMARY_RED,
+  SUMMARY_GOLD
 };
 
 export function addTextObject(scene: Phaser.Scene, x: number, y: number, content: string, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle) {
-  let styleOptions: Phaser.Types.GameObjects.Text.TextStyle;
   let shadowColor: string;
   let shadowSize = 6;
 
+  let styleOptions: Phaser.Types.GameObjects.Text.TextStyle = {
+    fontFamily: 'emerald',
+    fontSize: '96px',
+    color: getTextColor(style, false),
+    padding: {
+      bottom: 6
+    }
+  };
+
   switch (style) {
+    case TextStyle.SUMMARY:
+    case TextStyle.SUMMARY_RED:
+    case TextStyle.SUMMARY_GOLD:
+      styleOptions.padding = undefined;
     case TextStyle.WINDOW:
-      styleOptions = {
-        fontFamily: 'emerald',
-        fontSize: '96px',
-        color: '#484848',
-        padding: {
-          bottom: 6
-        }
-      };
-      shadowColor = '#d0d0c8';
-      break;
     case TextStyle.MESSAGE:
-      styleOptions = {
-        fontFamily: 'emerald',
-        fontSize: '96px',
-        color: '#f8f8f8',
-        padding: {
-          bottom: 6
-        }
-      };
-      shadowColor = '#6b5a73';
+      styleOptions.fontSize = '96px';
       break;
     case TextStyle.BATTLE_INFO:
-      styleOptions = {
-        fontFamily: 'emerald',
-        fontSize: '72px',
-        color: '#404040'
-      };
-      shadowColor = '#ded6b5';
+      styleOptions.fontSize = '72px';
+      styleOptions.padding = undefined;
       shadowSize = 4;
       break;
     case TextStyle.PARTY:
-      styleOptions = {
-        fontFamily: 'pkmnems',
-        fontSize: '66px',
-        color: '#f8f8f8',
-        padding: {
-          bottom: 6
-        }
-      };
-      shadowColor = '#707070';
-      break;
-    case TextStyle.SUMMARY:
-      styleOptions = {
-        fontFamily: 'emerald',
-        fontSize: '96px',
-        color: '#ffffff'
-      };
-      shadowColor = '#636363';
-      break;
-    case TextStyle.SUMMARY_RED:
-      styleOptions = {
-        fontFamily: 'emerald',
-        fontSize: '96px',
-        color: '#f89890'
-      };
-      shadowColor = '#984038';
+      styleOptions.fontFamily = 'pkmnems';
+      styleOptions.fontSize = '66px';
       break;
   }
 
+  shadowColor = getTextColor(style, true);
+
   if (extraStyleOptions)
     styleOptions = Object.assign(styleOptions, extraStyleOptions);
 
@@ -82,4 +52,23 @@ export function addTextObject(scene: Phaser.Scene, x: number, y: number, content
   ret.setLineSpacing(5);
 
   return ret;
+}
+
+export function getTextColor(textStyle: TextStyle, shadow?: boolean) {
+  switch (textStyle) {
+    case TextStyle.MESSAGE:
+      return !shadow ? '#f8f8f8' : '#6b5a73';
+    case TextStyle.WINDOW:
+      return !shadow ? '#484848' : '#d0d0c8';
+    case TextStyle.BATTLE_INFO:
+      return !shadow ? '#404040' : '#ded6b5';
+    case TextStyle.PARTY:
+      return !shadow ? '#f8f8f8' : '#707070';
+    case TextStyle.SUMMARY:
+      return !shadow ? '#ffffff' : '#636363';
+    case TextStyle.SUMMARY_RED:
+      return !shadow ? '#f89890' : '#984038';
+    case TextStyle.SUMMARY_GOLD:
+      return !shadow ? '#e8e8a8' : '#a0a060'
+  }
 }
\ No newline at end of file