Merge pull request #57 from ssjshields/beta

Update 25385
ssjshields · Jan 5, 2024 · 6075f4b · 6075f4b
2 parents 806fcb4 + 3ae5a4b
commit 6075f4b
Show file tree

Hide file tree

Showing 16 changed files with 87 additions and 47 deletions.
diff --git a/sprites/atlas/Revision 25115 Backup.png → sprites/atlas/Revision 25385 Backup.png b/sprites/atlas/Revision 25115 Backup.png → sprites/atlas/Revision 25385 Backup.png
diff --git a/themes/archetype/assets/Archetype.xml b/themes/archetype/assets/Archetype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><themes>
-	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="icon-color" kerning="true" hinting="AutoSlight" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#3f4449"/>
+	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="icon-color" kerning="true" hinting="AutoSlight" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#3f4449"/>
 
 	<images file="jaejGI7pIp/res/custom/WGRfhUrISa/text-bubble-arrow.png" filter="lineal">
 		<composed name="text-bubble.background" inset="8">

diff --git a/themes/archetype/assets/DGD91ad3qx/SKhBbhenX8/ZuS2aS18ad.xml b/themes/archetype/assets/DGD91ad3qx/SKhBbhenX8/ZuS2aS18ad.xml
@@ -119,7 +119,7 @@
 					<param name="border"><border>10,10,0,0</border></param>
 					<param name="background"><image>none</image></param>
 				</theme>
-				<theme name="dialoglayout" ref="-defaults">
+				<theme name="dialoglayout" ref="dialoglayout">
 					<theme name="label-info" ref="label">
 						<param name="background"><image>ui-inputbox.background</image></param>
 						<param name="textAlignment"><enum type="alignment">CENTER</enum></param>

diff --git a/themes/archetype/assets/DGD91ad3qx/g8YMKJ805g/DUbq0pesAW.xml b/themes/archetype/assets/DGD91ad3qx/g8YMKJ805g/DUbq0pesAW.xml
@@ -150,7 +150,7 @@
 			<param name="namedGaps"><map/></param>
 			<theme name="item-slot" ref="-defaults">
 				<param name="background"><image>Hotkey-Button</image></param>
-				<param name="border"><border>7,4,7,4</border></param>
+				<param name="border"><border>7,4,8,4</border></param>
 				<param name="font"><font>hotkey-button2</font></param>	
 				<param name="font2"><font>hotkey-button</font></param>
 				<param name="minWidth"><int>44</int></param>

diff --git a/themes/archetype/assets/Default-Black.xml b/themes/archetype/assets/Default-Black.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><themes>
-	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="#ffffff" kerning="false" hinting="Medium" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#484848"/>
+	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="#ffffff" kerning="false" hinting="Medium" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#484848"/>
 
 	<images file="jaejGI7pIp/res/custom/WGRfhUrISa/text-bubble-black.png" filter="lineal">
 		<area name="text-bubble.background" xywh="0,0,128,128" splitx="L63,R63" splity="T63,B63"/>

diff --git a/themes/archetype/assets/Default-White.xml b/themes/archetype/assets/Default-White.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><themes>
-	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="#222222" kerning="false" hinting="Medium" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#484848"/>
+	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="#222222" kerning="false" hinting="Medium" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#484848"/>
 
 	<images file="jaejGI7pIp/res/custom/WGRfhUrISa/text-bubble-white.png" filter="lineal">
 		<area name="text-bubble.background" xywh="0,0,128,128" splitx="L63,R63" splity="T63,B63"/>

diff --git a/themes/archetype/assets/jaejGI7pIp/MAsXAmMZ9W.xml b/themes/archetype/assets/jaejGI7pIp/MAsXAmMZ9W.xml
@@ -327,6 +327,7 @@
 	</images>
 
 	<images file="res/custom/j4iabP1aXf/main-hud.png" filter="lineal">
+		<composed name="timer-background"><alias ref="Pure" tint="#95111111" inset="0,0,0,0"/></composed>
 		<composed name="label1.background"><alias ref="Pure-Edge" tint="#95111111" inset="0,0,0,0"/></composed>
 		<composed name="label2.background"><alias ref="label1.background" inset="0,0,0,0"/></composed>
 		<composed name="label3.background"><alias ref="label1.background" tint="#00aeff" inset="0,0,0,0"/></composed>

diff --git a/themes/archetype/assets/jaejGI7pIp/a3ZzQij90e.xml b/themes/archetype/assets/jaejGI7pIp/a3ZzQij90e.xml
diff --git a/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Bold.ttf b/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Bold.ttf
diff --git a/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf b/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf
diff --git a/...assets/jaejGI7pIp/fonts/NotoSans-Bold.ttc → ...ets/jaejGI7pIp/fonts/NotoSansCJK-Bold.ttc b/...assets/jaejGI7pIp/fonts/NotoSans-Bold.ttc → ...ets/jaejGI7pIp/fonts/NotoSansCJK-Bold.ttc
diff --git a/...sets/jaejGI7pIp/fonts/NotoSans-Medium.ttc → ...s/jaejGI7pIp/fonts/NotoSansCJK-Medium.ttc b/...sets/jaejGI7pIp/fonts/NotoSans-Medium.ttc → ...s/jaejGI7pIp/fonts/NotoSansCJK-Medium.ttc
diff --git a/themes/archetype/assets/jaejGI7pIp/mgZEOjSZ0a.xml b/themes/archetype/assets/jaejGI7pIp/mgZEOjSZ0a.xml
@@ -891,6 +891,8 @@
 			<param name="fonts"><map>
 				<param name="default"><font>alphabeta</font></param>
 				<param name="link"><font>alphabeta-blue</font></param>
+				<param name="big-yellow"><font>mechabold-yellow</font></param>
+				<param name="big-red"><font>mechabold-red</font></param>
 			</map></param>
 			<param name="classes"><map/>
 				</param><param name="images">

diff --git a/themes/archetype/fonts.xml b/themes/archetype/fonts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <themes>
-<fontDef name="battle-name" filename="assets/jaejGI7pIp/fonts/NotoSans-Medium.ttc" color="#ffffff" border_width="1.1" border_color="#000000" size="18" hinting="Full" offsetY="-3"/>
+<fontDef name="battle-name" filename="assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf" color="#ffffff" border_width="1.1" border_color="#000000" size="18" hinting="Full" offsetY="-3"/>
 
 
 
@@ -10,9 +10,9 @@ in here as you did for "icon-color" in the CHOOSE_YOUR_COLORS.xml file.-->
 
 
 <fontDef color="#ffffff" 
-name="battle" filename="assets/jaejGI7pIp/fonts/NotoSans-Medium.ttc" border_width="1.0" border_color="#A6000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#A6000000" size="28" hinting="Medium" offsetY="4"/>
+name="battle" filename="assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf" border_width="1.0" border_color="#A6000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#A6000000" size="28" hinting="Medium" offsetY="4"/>
 
 
 <fontDef color="#ffffff" 
-name="alphabeta-border-HUD" filename="assets/jaejGI7pIp/fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" kerning="true" hinting="AutoSlight" size="11" size_cjk="11"/>
+name="alphabeta-border-HUD" filename="assets/jaejGI7pIp/fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" kerning="true" hinting="AutoSlight" size="11" size_cjk="11"/>
 </themes>
diff --git a/themes/archetype/main-widgets.xml b/themes/archetype/main-widgets.xml
@@ -33,11 +33,9 @@
 	</theme>
 
 	<theme name="logingui" ref="-defaults">
-	<param name="background"><image>login-background-animation</image></param>
-		<theme name="logo" ref="-defaults">
-		</theme>
-		<theme name="logo-hween" ref="-defaults">
-		</theme>
+		<param name="background"><image>login-background-animation</image></param>
+		<theme name="logo" ref="-defaults"></theme>
+		<theme name="logo-hween" ref="-defaults"></theme>
 		<theme name="login-window" ref="new-base-frame" allowWildcard="true">
 			<param name="background"><image>Login-Window</image></param>
 			<param name="minWidth"><int>355</int></param>
@@ -51,6 +49,17 @@
 				<theme name="label" ref="label">
 					<param name="border"><border>0,7,0,0</border></param>
 				</theme>
+				<theme name="combobox" ref="combobox" allowWildcard="true">
+					<theme name="display" ref="display">
+						<param name="border"><border>5,17,5,0</border></param>
+					</theme>
+				</theme>
+				<theme name="editfield" ref="editfield" allowWildcard="true">
+					<theme name="renderer" ref="renderer">
+						<param name="textAlignment"><enum type="alignment">center</enum></param>
+					<param name="border"><border>0,0,2,2</border></param>
+					</theme>
+				</theme>
 				<theme name="button" ref="button">
 					<param name="minWidth"><int>100</int></param>
 				</theme>
@@ -1404,4 +1413,15 @@
 			<param name="font"><font>noto-8pt</font></param>
 		</theme>
 	</theme>
+
+	<theme name="hall-of-fame" ref="-defaults">
+		<param name="background"><image>none</image></param>
+		<theme name="label" ref="-defaults" allowWildcard="true">
+			<param name="background"><image>none</image></param>
+			<param name="font"><font>battle</font></param>
+		</theme>
+		<theme name="trainer-name" ref="-defaults">
+			<param name="font"><font>battle</font></param>
+		</theme>
+	</theme>
 </themes>
diff --git a/themes/archetype/ui/battle.xml b/themes/archetype/ui/battle.xml
@@ -216,7 +216,7 @@
 	</theme>
 
 	<theme name="battle-frame" ref="-defaults" allowWildcard="true">
-		<param name="background"><image>label1.background</image></param>
+		<param name="background"><image>timer-background</image></param>
 	</theme>
 
 	<theme name="battle-panel" ref="-defaults" allowWildcard="true">
@@ -269,7 +269,8 @@
 			<param name="maxWidth"><int>106</int></param>
 		</theme>
 		<theme name="button" ref="-defaults" allowWildcard="true">
-			<param name="font"><font>alphabeta-highlight-button</font></param>
+			<param name="font"><font>battle-arrows</font></param>
+			<param name="border"><border>0,0,2,0</border></param>
 			<param name=""><image>button-small.*</image></param>
 			<param name="textAlignment"><enum type="alignment">CENTER</enum></param>
 		</theme>
@@ -295,10 +296,12 @@
 			<param name="minHeight"><int>500</int></param>
 			<param name="namedGaps"><map/></param>
 			<theme name="scrollpane" ref="scrollpane" allowWildcard="true">
+					<param name="border"><border>0,0,6,0</border></param>
 				<theme name="label-black" ref="-defaults" allowWildcard="true">
 					<param name="font"><font>battle-item</font></param>
 					<param name="border"><border>0,0,0,0</border></param>
-					<param name="minHeight"><int>208</int></param>
+					<param name="minHeight"><int>204</int></param>
+					<param name="minWidth"><int>450</int></param>
 					<param name="textAlignment"><enum type="alignment">topleft</enum></param>
 				</theme>
 			</theme>