From d442770de60d78189ebf68686d556c6759fba5c5 Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Mon, 1 Apr 2024 10:06:28 -0400
Subject: [PATCH] Add themed namebox

---
 public/images/ui/bg.png              | Bin 703 -> 1382 bytes
 public/images/ui/legacy/namebox.json |  41 +++++++++
 public/images/ui/legacy/namebox.png  | Bin 278 -> 193 bytes
 public/images/ui/namebox.json        | 125 +++++++++++++++++++++++++++
 public/images/ui/namebox.png         | Bin 312 -> 397 bytes
 src/battle-scene.ts                  |   2 +-
 src/ui/battle-message-ui-handler.ts  |   2 +-
 src/ui/ui-theme.ts                   |  12 +--
 8 files changed, 175 insertions(+), 7 deletions(-)
 create mode 100644 public/images/ui/legacy/namebox.json
 create mode 100644 public/images/ui/namebox.json

diff --git a/public/images/ui/bg.png b/public/images/ui/bg.png
index 9d39d701fe1e3c571cd536484d496bd4b3d59cae..9c35e80ff8b08a9c0b5d629156906f357fd4037e 100644
GIT binary patch
literal 1382
zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoKX9-C$wJ+|*+7c1ILO_JVcj{Imp~3nx}&cn
z1H;CC?mvmFK<+nB7srr_xVLxrW`#ydG$dZX(|A`e_f3zzMq|SY#`=qH+R9xwez4!V
zp~)3h!7BEMcgfbxTfPVtahL6EIrF5zNWxv+>gtm{=P$3>dhXuW)9lp;B`=%g$}(_B
z#ZTksR+wNiPu^a$!QoOxNlqj~<C4P9FS;0*JRe`Wl*!04>DZ@Bl0fR;jP(qbOdKhk
z3KLWt9HucaMbeyOs;4{m-mLeGLC4N6)@I^R>2*Ioja9%y>U{rv5eJ3Lnn*hxprdCj
z^JHjLxt`Flrtrn%YGI&n`fTbnfD#r}ulqpWI5PD$NOQ2ZI7stp?{pRck0M^S6G9FO
z-VBX8j4Yd21ZdA$Q<(Mi(X|@>2}XV~JN1y9cj9q7$a&84_dzkSEEDLglco|1**Q5m
zGk}rt@z>L6P%KPlKM!=bRJQp$E}*h=^Y^I%&4`GzQf_dVlx;wt2th=A@8{*~bI*Qf
z&`f@NEEdUm>*M!{0;2}#b`Dg})b2`P0{UY2^3@>Eif=y;Oh+c~VnrPmWX8l<Y7eMi
zPHU%ce^%WvrSSbLOORi>Z!>Y2^p^XFgVIa%d_7dJm@%$fyY_6q{q}wP>JonMy?XWP
zPkn~p*Z=<hUZ2Y(VxJ)Rb{2zu{Xd)N{a?Snz8?GWcHMLL_l$4Y^Y87MxwhJ`;Ssye
zrulvi)kohyIN1DI_Q3!9&z?QYxmyg>yWoL5BaloAXE@5Q@zc8DetfB*eZs}FOd53#
z7j=L-MIg*|{R)rRr@Y~M!1s}vt4_k9fr*ktobWI=FYjFWZcc>_7xwkuKNrvNUcezC
zu~vS6{(t7$*$hnFFYiAB`qu6?x59>kZ(a9q-MaNgr{RFp&#OOjg@G#Hi0;pvmG)eg
zi9@I5e(!xVMwV}T{|oKUeY~DMTHdZ^hHTv4D${7jZ;RtQ@1OhpHeJmjLGjPIC)<;+
zvv6#<|MtlH+w1q*Co!>zomzh^|9B45ocD}Qd@?_T*BaZD9i7SpEH4@OQX@Rme0>?T
XfNTyR27yb#lR=cHtDnm{r-UW|QLyFk

literal 703
zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoKX5PuNw?3wkwD5Xz$e7j(b3Vx#>d0bK0?oO
z)22-(mTvC4HfFkZ5)u*y1_p+nfssM+$IVo$42(1N&Ge#Tb+R%PHq1!$cDR21dSh){
zZhCQbjKh>X$N$@13kwV9MLlc>n#@_?5n0T@z;^_M8K-LVNi#4oiF>*@hE&{od-tT5
zbD)Up!Q}ZjzW@67-(A(i!1=M$lz{9hg&*CfZ$7zZ%B<|A&)in-49)VJGOKv$Gbhak
z21X_p4G<~f03^8-fF!E`kYwTjl8h`I0t*<JSU3V082{-zq(Az2;!c3#IT@eSM;DGo
zX#4Fw!}|Efg#^=cv4SoK*q1(wTe&khOK<8d<E1ug6}^lI&G_y3uz+E1=W*p?=T?hi
zgQ=a)(#dNrz8Z=5Bs({URzKX&S`(BtZ|W@ZrO&)pS_Yj;Zn`dk->FEp@pE06Sz%*j
z9@1gV9z4@xi{Z7dVEy8Q7G@?9TgCrHA1Gh?%y(sFXqMd6S;<s$^wnMBaog5T3x0c>
zPhr12^E&g~KX&ymZ@*>ul-&@$|Kj)Cj8CpJ{4{l_<DC%C{3Luon8EgBI%6UOQh+1*
zf|2XN`yY%wb=(JDZD;7IW0*Z(-{2RcPhEDyS^k7CznQMY<^E-G+poLeTkg*&2_~Pq
f?)}Ht)-s%%;rukbHSH8I-7t8%`njxgN@xNA{$TEk

diff --git a/public/images/ui/legacy/namebox.json b/public/images/ui/legacy/namebox.json
new file mode 100644
index 00000000000..4406affbbf3
--- /dev/null
+++ b/public/images/ui/legacy/namebox.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "namebox.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 20,
+				"h": 20
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "namebox",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 20
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:b4b88c93438c49a9a290c11e4001b617:11fbe39458bee41a23e8baf1cebcaf96:39bb626d9e1ec7486391b28b387a1b39$"
+	}
+}
diff --git a/public/images/ui/legacy/namebox.png b/public/images/ui/legacy/namebox.png
index ed43bc4aa5b3deeee6405495a264e637b5485723..25659f9dd40088abbd44d1d4dc61a4f50b7f48f4 100644
GIT binary patch
delta 176
zcmbQnbdYg^WIZzj1H-QHxAs6vG{7gs)hDy?s8`-m<E{%H77ZO884DJy$VkvV@*bps
zxg^Lhm|>aQ+$q)~KrUy2M`SSr1K$x4W}K?cCk+&I_H=O!k+^(yq9YfB0mtE0!T<k1
z=~dd~Xum<mSuc#CAiCL-BlPIP6~|pCWxSrAt@)ZqyFKYw%iMpuPiGbhSk9G;+>^|_
YD1&vW_=cyYK=T+pUHx3vIVCg!0I-lh9smFU

delta 261
zcmV+g0s8*I0hR)g8Gi-<0051N9Sr~g0NqJMK~y-)V`M-AM~%DO7{s3>aQ{0M$v_17
z%4D{j;ib$1>$7FMU}B7L!@TmAp&N8VL4)Cjf(D8q8V_zTXgs)qVX*bKNl|bEu^G0(
zA%Nk9galTXNxXQ$5O81vRzn$&8h5#Ii>}*AtYLT!eI4Y^#C{<DBmv!<gbZU~U|@J5
zA%PJb4B}4`n6QN#u>f5y_rFt-Obk>8qXv!|I4BJK%4D`2y)+>fU@LW)7+%UOKvyL3
z;srs&BwoD0wEU&a0w(LTWxLQ_8E{|&UPEyfUuVm9(WZc<W)%PcObL5alWLf^00000
LNkvXXu0mjfu~BQo

diff --git a/public/images/ui/namebox.json b/public/images/ui/namebox.json
new file mode 100644
index 00000000000..15b6b30ae30
--- /dev/null
+++ b/public/images/ui/namebox.json
@@ -0,0 +1,125 @@
+{
+	"textures": [
+		{
+			"image": "namebox.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 100,
+				"h": 20
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "1",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 20
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 20
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 20,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 20
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 40,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "4",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 20
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 60,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "5",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 20
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 80,
+						"y": 0,
+						"w": 20,
+						"h": 20
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:391f73e29df9fea72712e2e50508f3e6:e6997e6b30ca1a347669b8d148c3c7f8:39bb626d9e1ec7486391b28b387a1b39$"
+	}
+}
diff --git a/public/images/ui/namebox.png b/public/images/ui/namebox.png
index ac84ef5ba2e970e4948ddff933ba1064153f06de..87e5a0875b9db2da8e507446c56f2a581ebca075 100644
GIT binary patch
literal 397
zcmeAS@N?(olHy`uVBq!ia0vp^DL^d3!3-pQ<T926Da!z#5LchfLWK=8j+?1g85lR#
zw&`SLT)%$ZOxI3ALc-C}aY~-!|Lv{@1_qlpZ8EWRiwue{EG&%BvrP1MFy#sj2O7dy
z666=m;PC858j!<T;1OBOz`%C|gc+x5^GO2*-+H<@hFF~5d(~6ukO7a&#WNPd67T9G
zQZ8kAu5qltIaTX=a>1^3p%KUH_VqGL?VPsLeRJ;RCbiq!WOKJ&6%Mst%A+jx=3t%M
z-rUnIVz<BXzTGyL-Kx9UMo^P!r*aU>Cx;~*Pg*@Rx5~X<zIc+-1ZgE#g<TVs1nznW
zcH}MLNO4_a(qXq^3fo0rP2NSbgQQ%{mr5K7lxY!RS3K(IQ78}uWby}gwQC%8p7Kc1
z>!Uyr6U!6^MpXv~PJsX*lVhibU{RpblSM8kTs5D6S1j^6rKl+%eolP;C*gBHjhDq}
mTZ*Tg3Z4J?(y#BYzw_1@>)UQ!^fm(MaRyIUKbLh*2~7YHS&zE_

literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1Ig8=fwXAr`$$
zuO8$*tiZ#1LH-Ksj*WfCKeWgleqE5vQkBu`RKU5!F6!B9%@a==f;E@E`nrB<vE918
z3nvDxI>Vzht8Jy0OA1GA<zW|=(79|vf-Wg9${Uv%AB<Hnc6NCcY02R$o;-(b)vDDz
z{w2>P)86SB&S?)TWe`ZtIpw%x^=!@A1@7j-ZOeDXpDHlkAFKGh=El|gx$WU)$F?ow
zd>cI_Xxd>f&BI}=4>mvXpAsI+U9;#*N$i7lmo77&)0<uNwD3dPt^?~g30<62^waiB
z*_GKJvnn<={;y-q=Vn-1e#*7f6X-|2)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f
D;4pij

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 0ebd972d4c8..b3bb1eb0bf8 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -286,7 +286,7 @@ export default class BattleScene extends Phaser.Scene {
 			for (let w = 1; w <= 5; w++)
 				this.loadImage(`window_${w}${getWindowVariantSuffix(wv)}`, 'ui/windows');
 		}
-		this.loadImage('namebox', 'ui');
+		this.loadAtlas('namebox', 'ui');
 		this.loadImage('pbinfo_player', 'ui');
 		this.loadImage('pbinfo_player_mini', 'ui');
 		this.loadImage('pbinfo_enemy_mini', 'ui');
diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts
index f5adfa4ed41..23830cd75f4 100644
--- a/src/ui/battle-message-ui-handler.ts
+++ b/src/ui/battle-message-ui-handler.ts
@@ -72,7 +72,7 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
     this.nameBoxContainer = this.scene.add.container(0, -16);
     this.nameBoxContainer.setVisible(false);
 
-    this.nameBox = this.scene.add.nineslice(0, 0, 'namebox', null, 72, 16, 8, 8, 5, 5);
+    this.nameBox = this.scene.add.nineslice(0, 0, 'namebox', this.scene.windowType, 72, 16, 8, 8, 5, 5);
     this.nameBox.setOrigin(0, 0);
 
     this.nameText = addTextObject(this.scene, 8, 0, 'Rival', TextStyle.MESSAGE, { maxLines: 1 });
diff --git a/src/ui/ui-theme.ts b/src/ui/ui-theme.ts
index 28612fbcbdd..26ba4be708f 100644
--- a/src/ui/ui-theme.ts
+++ b/src/ui/ui-theme.ts
@@ -58,7 +58,7 @@ export function addWindow(scene: BattleScene, x: number, y: number, width: numbe
 
 export function updateWindowType(scene: BattleScene, windowTypeIndex: integer): void {
   const windowObjects: [Phaser.GameObjects.NineSlice, WindowVariant][] = [];
-  const bgObjects: Phaser.GameObjects.Image[] = [];
+  const themedObjects: Phaser.GameObjects.Image[] = [];
   const traverse = (object: any) => {
     if (object.hasOwnProperty('children')) {
       const children = object.children as Phaser.GameObjects.DisplayList;
@@ -70,8 +70,10 @@ export function updateWindowType(scene: BattleScene, windowTypeIndex: integer):
     } else if (object instanceof Phaser.GameObjects.NineSlice) {
       if (object.texture.key.startsWith('window_'))
         windowObjects.push([ object, object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.XTHIN)) ? WindowVariant.XTHIN : object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.THIN)) ? WindowVariant.THIN : WindowVariant.NORMAL ]);
-    } else if (object instanceof Phaser.GameObjects.Sprite && object.texture?.key === 'bg')
-      bgObjects.push(object)
+    } else if (object instanceof Phaser.GameObjects.Sprite) {
+      if ([ 'bg', 'namebox' ].includes(object.texture?.key))
+        themedObjects.push(object);
+    }
   }
 
   traverse(scene);
@@ -86,8 +88,8 @@ export function updateWindowType(scene: BattleScene, windowTypeIndex: integer):
   for (let [ window, variant ] of windowObjects)
     window.setTexture(`${windowKey}${getWindowVariantSuffix(variant)}`);
 
-  for (let bg of bgObjects)
-    bg.setFrame(windowTypeIndex);
+  for (let obj of themedObjects)
+    obj.setFrame(windowTypeIndex);
 }
 
 export function addUiThemeOverrides(scene: BattleScene): void {