next commitHEADmain

11 files changed, 100 insertions, 82 deletions

diff --git a/byte_stream.gd b/byte_stream.gd
index 5477422..526bf12 100644
--- a/byte_stream.gd
+++ b/byte_stream.gd
@@ -102,6 +102,7 @@ func get_string_from_ascii(length: int) -> String:
 	return get_buffer(length).bytes.get_string_from_ascii()
 
 func get_string_from_ro(length: int) -> String:
+	return get_string_from_ascii(length)
 	var buffer := get_buffer(length).bytes
 	Engine.print_error_messages = false
 	var string := buffer.get_string_from_multibyte_char("EUC-KR")
diff --git a/extractor/extractor_interface.gd b/extractor/extractor_interface.gd
index 4d74a20..01f6493 100644
--- a/extractor/extractor_interface.gd
+++ b/extractor/extractor_interface.gd
@@ -4,9 +4,9 @@ extends Control
 func _ready() -> void:
 	pass
 	
-	var grf = GRF.open("res://client_data/data.grf")
+	#var grf = GRF.open("res://client_data/data.grf")
 	#grf.extract("res://client_data")
-	grf.convert("res://client_data")
+	#grf.convert("res://client_data")
 	
 	#Sprite.from_bytes(FileAccess.get_file_as_bytes("res://client_data/data/sprite/cursors.spr"))
 	#ActionFormat.from_bytes(
@@ -24,12 +24,12 @@ func _ready() -> void:
 			#FileAccess.get_file_as_bytes("res://client_data/data/int_land02.gnd")
 		#)
 	#)
-	#var rsw = RSWFormat.from_bytes(
-		#ByteStream.from_bytes(
-			##FileAccess.get_file_as_bytes("res://client_data/data/int_land02.rsw")
-			#FileAccess.get_file_as_bytes("res://client_data/data/pay_dun00.rsw")
-		#)
-	#)
+	var rsw = RSWFormat.from_bytes(
+		ByteStream.from_bytes(
+			#FileAccess.get_file_as_bytes("res://client_data/data/int_land02.rsw")
+			FileAccess.get_file_as_bytes("res://client_data/data/pay_dun00.rsw")
+		)
+	)
 	#RSMFormat.from_bytes(
 		#ByteStream.from_bytes(
 			##FileAccess.get_file_as_bytes("res://client_data/data/model/prontera/chair_01.rsm")
@@ -39,7 +39,7 @@ func _ready() -> void:
 		#)
 	#)
 	
-	#var scene_root := rsw.convert("pay_dun00", "res://client_data")
-	#var scene := PackedScene.new()
-	#scene.pack(scene_root)
-	#ResourceSaver.save(scene, "res://extractor/test/pay_dun00.tscn")
+	var scene_root := rsw.convert("pay_dun00", "res://client_data")
+	var scene := PackedScene.new()
+	scene.pack(scene_root)
+	ResourceSaver.save(scene, "res://extractor/test/pay_dun00.tscn")
diff --git a/extractor/gnd_format.gd b/extractor/gnd_format.gd
index c49bce6..d71cd63 100644
--- a/extractor/gnd_format.gd
+++ b/extractor/gnd_format.gd
@@ -91,7 +91,7 @@ static func from_bytes(bytes: ByteStream) -> GNDFormat:
 	gnd_format.texture_paths = []
 	for _n in gnd_format.texture_count:
 		gnd_format.texture_paths.append(
-			bytes.get_string_from_ro(gnd_format.texture_path_length)
+			bytes.get_string_from_ro(gnd_format.texture_path_length) # TODO: EUC-KR string is empty and converts to ascii instead. that's wrong.
 		)
 	
 	gnd_format.light_map_slice_count = bytes.decode_s32()
@@ -176,10 +176,10 @@ func convert(data_path: String) -> GridMap:
 				var mesh: ArrayMesh = cube[surface_type].mesh
 				var material := StandardMaterial3D.new()
 				material.albedo_texture = load(
-					"%s/data/texture/%s" % [
+					("%s/data/texture/%s" % [
 						data_path,
 						texture_paths[cube[surface_type].surface.texture_index]
-					]
+					]).replace(".bmp", ".png")
 				)
 				
 				mesh.surface_set_material(0, material)
diff --git a/extractor/grf.gd b/extractor/grf.gd
index 5b7046f..0788dfb 100644
--- a/extractor/grf.gd
+++ b/extractor/grf.gd
@@ -206,6 +206,7 @@ func extract(destination: String = "user://client_data"):
 		file.store_buffer(file_entry.get_contents(file_access))
 		
 		extracted_file.emit(idx)
+		print(file_path)
 
 
 func convert(destination: String = "res://client_data"):
@@ -286,6 +287,7 @@ func convert(destination: String = "res://client_data"):
 
 
 static func decode_string(bytes: PackedByteArray):
+	return bytes.get_string_from_ascii()
 	Engine.print_error_messages = false
 	var string := bytes.get_string_from_multibyte_char("EUC-KR")
 	Engine.print_error_messages = true
diff --git a/extractor/rsm_format.gd b/extractor/rsm_format.gd
index 7f16368..30ef3ed 100644
--- a/extractor/rsm_format.gd
+++ b/extractor/rsm_format.gd
@@ -362,7 +362,9 @@ class ModelNode:
 		node.translate(translation_2)
 		
 		if rotation_axis != Vector3.ZERO:
-			node.rotation = (rotation_axis * rotation_angle) * Vector3(1,-1,1)
+			var quat = Quaternion(rotation_axis, rotation_angle)
+			node.rotation = quat.get_euler()
+			#node.rotation = (rotation_axis * rotation_angle) * Vector3(1,-1,1)
 		
 		node.scale = scale
 		
diff --git a/icon.svg.import b/icon.svg.import
index e69137a..8da7c16 100644
--- a/icon.svg.import
+++ b/icon.svg.import
@@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.cte
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -25,6 +27,10 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false
diff --git a/project.godot b/project.godot
index 5951a79..6d281f7 100644
--- a/project.godot
+++ b/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Minerva"
 run/main_scene="res://ui/login.tscn"
-config/features=PackedStringArray("4.5", "Forward Plus")
+config/features=PackedStringArray("4.4", "Forward Plus")
 config/icon="uid://du8c0ll5pq5ci"
 
 [autoload]
diff --git a/rathena-icon.png.import b/rathena-icon.png.import
index 7b02fa5..74e6473 100644
--- a/rathena-icon.png.import
+++ b/rathena-icon.png.import
@@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/rathena-icon.png-a6f5753273990ca7c83a6018bb12
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -25,6 +27,10 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false
diff --git a/ui/login.tscn b/ui/login.tscn
index 04f24b1..b492240 100644
--- a/ui/login.tscn
+++ b/ui/login.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=25 format=3 uid="uid://dser74lcd3a4g"]
+[gd_scene format=3 uid="uid://dser74lcd3a4g"]
 
 [ext_resource type="Script" uid="uid://dqswsdaamfhbq" path="res://ui/login.gd" id="1_1m5cv"]
 [ext_resource type="Texture2D" uid="uid://cxd6dnc7s17vg" path="res://client_data/skin/login_background.jpg" id="2_elmti"]
@@ -27,7 +27,7 @@
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pfdi0"]
 bg_color = Color(0.977834, 0.977834, 0.977834, 1)
 
-[node name="Login" type="Control"]
+[node name="Login" type="Control" unique_id=126823010]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -36,7 +36,7 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_1m5cv")
 
-[node name="Background" type="TextureRect" parent="."]
+[node name="Background" type="TextureRect" parent="." unique_id=1857437705]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -47,7 +47,7 @@ texture = ExtResource("2_elmti")
 expand_mode = 3
 stretch_mode = 6
 
-[node name="Login" type="CenterContainer" parent="."]
+[node name="Login" type="CenterContainer" parent="." unique_id=365420565]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 15
@@ -56,30 +56,30 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Window" parent="Login" instance=ExtResource("17_mma3j")]
+[node name="Window" parent="Login" unique_id=1159771345 instance=ExtResource("17_mma3j")]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="Login/Window/VBoxContainer/TitleBar/TitleBarElements" index="0"]
+[node name="Label" type="Label" parent="Login/Window/VBoxContainer/TitleBar/TitleBarElements" index="0" unique_id=1191750536]
 texture_filter = 1
 layout_mode = 2
 theme = ExtResource("9_toei2")
 text = "Log On"
 
-[node name="MarginContainer" type="MarginContainer" parent="Login/Window/VBoxContainer/Body" index="0"]
+[node name="MarginContainer" type="MarginContainer" parent="Login/Window/VBoxContainer/Body" index="0" unique_id=606576223]
 layout_mode = 2
 theme_override_constants/margin_left = 30
 theme_override_constants/margin_top = 15
 theme_override_constants/margin_right = 30
 theme_override_constants/margin_bottom = 15
 
-[node name="VBoxContainer" type="VBoxContainer" parent="Login/Window/VBoxContainer/Body/MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="Login/Window/VBoxContainer/Body/MarginContainer" unique_id=1813104417]
 layout_mode = 2
 theme_override_constants/separation = 6
 
-[node name="Username" type="HBoxContainer" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer"]
+[node name="Username" type="HBoxContainer" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer" unique_id=1279313481]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer/Username"]
+[node name="Label" type="Label" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer/Username" unique_id=678571466]
 texture_filter = 1
 layout_mode = 2
 size_flags_horizontal = 3
@@ -88,7 +88,7 @@ theme_type_variation = &"LabelLabel"
 text = "ID"
 horizontal_alignment = 2
 
-[node name="Username" type="LineEdit" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer/Username"]
+[node name="Username" type="LineEdit" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer/Username" unique_id=1253188074]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(150, 0)
 layout_mode = 2
@@ -96,17 +96,17 @@ theme = ExtResource("9_toei2")
 text = "dweipert"
 placeholder_text = "Username"
 
-[node name="Password" type="HBoxContainer" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer"]
+[node name="Password" type="HBoxContainer" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer" unique_id=777990787]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer/Password"]
+[node name="Label" type="Label" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer/Password" unique_id=2145186240]
 texture_filter = 1
 layout_mode = 2
 theme = ExtResource("9_toei2")
 theme_type_variation = &"LabelLabel"
 text = "Password"
 
-[node name="Password" type="LineEdit" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer/Password"]
+[node name="Password" type="LineEdit" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer/Password" unique_id=1522153269]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(150, 0)
 layout_mode = 2
@@ -116,7 +116,7 @@ placeholder_text = "Password"
 secret = true
 secret_character = "*"
 
-[node name="Login" parent="Login/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="0" instance=ExtResource("3_qemc0")]
+[node name="Login" parent="Login/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="0" unique_id=351125497 instance=ExtResource("3_qemc0")]
 layout_mode = 2
 size_flags_horizontal = 8
 theme = ExtResource("3_7ogdv")
@@ -124,7 +124,7 @@ texture_normal = ExtResource("7_8pgsx")
 texture_pressed = ExtResource("8_dx2ir")
 texture_hover = ExtResource("9_tftjj")
 
-[node name="CharacterServer" type="CenterContainer" parent="."]
+[node name="CharacterServer" type="CenterContainer" parent="." unique_id=1800590909]
 unique_name_in_owner = true
 visible = false
 layout_mode = 1
@@ -134,54 +134,54 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Window" parent="CharacterServer" instance=ExtResource("17_mma3j")]
+[node name="Window" parent="CharacterServer" unique_id=684596271 instance=ExtResource("17_mma3j")]
 custom_minimum_size = Vector2(280, 200)
 layout_mode = 2
 
-[node name="Label" type="Label" parent="CharacterServer/Window/VBoxContainer/TitleBar/TitleBarElements" index="0"]
+[node name="Label" type="Label" parent="CharacterServer/Window/VBoxContainer/TitleBar/TitleBarElements" index="0" unique_id=1282814422]
 texture_filter = 1
 layout_mode = 2
 theme = ExtResource("9_toei2")
 theme_type_variation = &"WindowLabel"
 text = "Character Server"
 
-[node name="MarginContainer" type="MarginContainer" parent="CharacterServer/Window/VBoxContainer/Body" index="0"]
+[node name="MarginContainer" type="MarginContainer" parent="CharacterServer/Window/VBoxContainer/Body" index="0" unique_id=1937118510]
 layout_mode = 2
 theme_override_constants/margin_left = 12
 theme_override_constants/margin_top = 4
 theme_override_constants/margin_right = 12
 theme_override_constants/margin_bottom = 4
 
-[node name="PanelContainer" type="PanelContainer" parent="CharacterServer/Window/VBoxContainer/Body/MarginContainer"]
+[node name="PanelContainer" type="PanelContainer" parent="CharacterServer/Window/VBoxContainer/Body/MarginContainer" unique_id=1153549297]
 layout_mode = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_pfdi0")
 
-[node name="CharacterServerList" type="VBoxContainer" parent="CharacterServer/Window/VBoxContainer/Body/MarginContainer/PanelContainer"]
+[node name="CharacterServerList" type="VBoxContainer" parent="CharacterServer/Window/VBoxContainer/Body/MarginContainer/PanelContainer" unique_id=923406848]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 3
 
-[node name="CharacterServerButton" parent="CharacterServer/Window/VBoxContainer/Body/MarginContainer/PanelContainer/CharacterServerList" instance=ExtResource("10_38pxr")]
+[node name="CharacterServerButton" parent="CharacterServer/Window/VBoxContainer/Body/MarginContainer/PanelContainer/CharacterServerList" unique_id=1380471044 instance=ExtResource("10_38pxr")]
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="CharacterServer/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="0"]
+[node name="HBoxContainer" type="HBoxContainer" parent="CharacterServer/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="0" unique_id=1190636002]
 layout_mode = 2
 
-[node name="CharacterServerBackButton" parent="CharacterServer/Window/VBoxContainer/ButtonBar/ButtonBarElements/HBoxContainer" instance=ExtResource("3_qemc0")]
+[node name="CharacterServerBackButton" parent="CharacterServer/Window/VBoxContainer/ButtonBar/ButtonBarElements/HBoxContainer" unique_id=1891530186 instance=ExtResource("3_qemc0")]
 layout_mode = 2
 size_flags_horizontal = 0
 texture_normal = ExtResource("11_60jnu")
 texture_pressed = ExtResource("12_up3vp")
 texture_hover = ExtResource("13_swwvu")
 
-[node name="CharacterServerNextButton" parent="CharacterServer/Window/VBoxContainer/ButtonBar/ButtonBarElements/HBoxContainer" instance=ExtResource("3_qemc0")]
+[node name="CharacterServerNextButton" parent="CharacterServer/Window/VBoxContainer/ButtonBar/ButtonBarElements/HBoxContainer" unique_id=2054183590 instance=ExtResource("3_qemc0")]
 layout_mode = 2
 size_flags_horizontal = 10
 texture_normal = ExtResource("14_ohrmw")
 texture_pressed = ExtResource("15_c1fiv")
 texture_hover = ExtResource("16_14c6s")
 
-[node name="CharacterSelection" type="CenterContainer" parent="."]
+[node name="CharacterSelection" type="CenterContainer" parent="." unique_id=534501401]
 unique_name_in_owner = true
 visible = false
 layout_mode = 1
@@ -191,119 +191,119 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="CharacterSelection"]
+[node name="VBoxContainer" type="VBoxContainer" parent="CharacterSelection" unique_id=1553092750]
 visible = false
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/VBoxContainer" unique_id=346373287]
 layout_mode = 2
 
-[node name="CharacterList" type="GridContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer"]
+[node name="CharacterList" type="GridContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer" unique_id=807790608]
 layout_mode = 2
 columns = 5
 
-[node name="CharacterInfo" type="VBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer"]
+[node name="CharacterInfo" type="VBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer" unique_id=806998420]
 custom_minimum_size = Vector2(75, 0)
 layout_mode = 2
 
-[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo" unique_id=1233524450]
 layout_mode = 2
 text = "Info"
 horizontal_alignment = 1
 
-[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo" unique_id=1557183252]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer"]
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer" unique_id=2040702458]
 layout_mode = 2
 text = "Base Level:"
 
-[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer"]
+[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer" unique_id=1937558919]
 layout_mode = 2
 
-[node name="HBoxContainer2" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+[node name="HBoxContainer2" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo" unique_id=402704643]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer2"]
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer2" unique_id=269144229]
 layout_mode = 2
 text = "Job Level:"
 
-[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer2"]
+[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer2" unique_id=38239440]
 layout_mode = 2
 
-[node name="HBoxContainer4" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+[node name="HBoxContainer4" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo" unique_id=195601835]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer4"]
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer4" unique_id=665706070]
 layout_mode = 2
 text = "Job:"
 
-[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer4"]
+[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer4" unique_id=970027668]
 layout_mode = 2
 
-[node name="HBoxContainer3" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+[node name="HBoxContainer3" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo" unique_id=207242163]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer3"]
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer3" unique_id=1276737088]
 layout_mode = 2
 text = "Str:"
 
-[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer3"]
+[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer3" unique_id=1814272922]
 layout_mode = 2
 
-[node name="CharacterSelectionBackButton" type="Button" parent="CharacterSelection/VBoxContainer"]
+[node name="CharacterSelectionBackButton" type="Button" parent="CharacterSelection/VBoxContainer" unique_id=1511286952]
 layout_mode = 2
 size_flags_horizontal = 8
 mouse_default_cursor_shape = 2
 text = "Cancel"
 
-[node name="Window" parent="CharacterSelection" instance=ExtResource("17_mma3j")]
+[node name="Window" parent="CharacterSelection" unique_id=1692601469 instance=ExtResource("17_mma3j")]
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements" index="0"]
+[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements" index="0" unique_id=1455251786]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer"]
+[node name="Label" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer" unique_id=521726577]
 texture_filter = 1
 layout_mode = 2
 theme = ExtResource("9_toei2")
 text = "Character Select"
 
-[node name="-" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer"]
+[node name="-" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer" unique_id=316990216]
 texture_filter = 1
 layout_mode = 2
 theme = ExtResource("9_toei2")
 text = "-"
 
-[node name="CharacterSelectionSlotLabel" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer"]
+[node name="CharacterSelectionSlotLabel" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer" unique_id=210474546]
 unique_name_in_owner = true
 texture_filter = 1
 layout_mode = 2
 theme = ExtResource("9_toei2")
 
-[node name="MarginContainer" type="MarginContainer" parent="CharacterSelection/Window/VBoxContainer/Body" index="0"]
+[node name="MarginContainer" type="MarginContainer" parent="CharacterSelection/Window/VBoxContainer/Body" index="0" unique_id=694950123]
 layout_mode = 2
 theme_override_constants/margin_left = 64
 theme_override_constants/margin_top = 16
 theme_override_constants/margin_right = 64
 theme_override_constants/margin_bottom = 16
 
-[node name="CharacterSelectionList" parent="CharacterSelection/Window/VBoxContainer/Body/MarginContainer" instance=ExtResource("16_tihdy")]
+[node name="CharacterSelectionList" parent="CharacterSelection/Window/VBoxContainer/Body/MarginContainer" unique_id=377250108 instance=ExtResource("16_tihdy")]
 unique_name_in_owner = true
 layout_mode = 2
 
-[node name="CharacterSelectionBackButton" parent="CharacterSelection/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="0" instance=ExtResource("3_qemc0")]
+[node name="CharacterSelectionBackButton" parent="CharacterSelection/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="0" unique_id=166074095 instance=ExtResource("3_qemc0")]
 layout_mode = 2
 size_flags_horizontal = 0
 texture_normal = ExtResource("11_60jnu")
 texture_pressed = ExtResource("12_up3vp")
 texture_hover = ExtResource("13_swwvu")
 
-[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="1"]
+[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="1" unique_id=39043944]
 layout_mode = 2
 size_flags_horizontal = 8
 
-[node name="CharacterSelectionCreate" type="TextureButton" parent="CharacterSelection/Window/VBoxContainer/ButtonBar/ButtonBarElements/HBoxContainer"]
+[node name="CharacterSelectionCreate" type="TextureButton" parent="CharacterSelection/Window/VBoxContainer/ButtonBar/ButtonBarElements/HBoxContainer" unique_id=461387640]
 unique_name_in_owner = true
 texture_filter = 1
 layout_mode = 2
@@ -313,7 +313,7 @@ texture_normal = ExtResource("22_82qbc")
 texture_pressed = ExtResource("19_dx2ir")
 texture_hover = ExtResource("20_tftjj")
 
-[node name="CharacterLogin" parent="CharacterSelection/Window/VBoxContainer/ButtonBar/ButtonBarElements/HBoxContainer" instance=ExtResource("3_qemc0")]
+[node name="CharacterLogin" parent="CharacterSelection/Window/VBoxContainer/ButtonBar/ButtonBarElements/HBoxContainer" unique_id=1017438016 instance=ExtResource("3_qemc0")]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 8
@@ -321,8 +321,9 @@ texture_normal = ExtResource("7_8pgsx")
 texture_pressed = ExtResource("8_dx2ir")
 texture_hover = ExtResource("9_tftjj")
 
-[node name="CharacterCreation" type="CenterContainer" parent="."]
+[node name="CharacterCreation" type="CenterContainer" parent="." unique_id=450343868]
 unique_name_in_owner = true
+visible = false
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -330,21 +331,21 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Window" parent="CharacterCreation" instance=ExtResource("17_mma3j")]
+[node name="Window" parent="CharacterCreation" unique_id=1789535500 instance=ExtResource("17_mma3j")]
 layout_mode = 2
 
-[node name="MarginContainer" type="MarginContainer" parent="CharacterCreation/Window/VBoxContainer/Body" index="0"]
+[node name="MarginContainer" type="MarginContainer" parent="CharacterCreation/Window/VBoxContainer/Body" index="0" unique_id=696701063]
 layout_mode = 2
 theme_override_constants/margin_left = 16
 theme_override_constants/margin_top = 16
 theme_override_constants/margin_right = 16
 theme_override_constants/margin_bottom = 16
 
-[node name="CharacterCreationInterface" parent="CharacterCreation/Window/VBoxContainer/Body/MarginContainer" instance=ExtResource("24_8pgsx")]
+[node name="CharacterCreationInterface" parent="CharacterCreation/Window/VBoxContainer/Body/MarginContainer" unique_id=1601898907 instance=ExtResource("24_8pgsx")]
 unique_name_in_owner = true
 layout_mode = 2
 
-[node name="CharacterCreationCancel" type="TextureButton" parent="CharacterCreation/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="0"]
+[node name="CharacterCreationCancel" type="TextureButton" parent="CharacterCreation/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="0" unique_id=1257785638]
 texture_filter = 1
 layout_mode = 2
 size_flags_horizontal = 0
@@ -353,7 +354,7 @@ texture_normal = ExtResource("11_60jnu")
 texture_pressed = ExtResource("12_up3vp")
 texture_hover = ExtResource("13_swwvu")
 
-[node name="CharacterCreationCreate" type="TextureButton" parent="CharacterCreation/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="1"]
+[node name="CharacterCreationCreate" type="TextureButton" parent="CharacterCreation/Window/VBoxContainer/ButtonBar/ButtonBarElements" index="1" unique_id=732585414]
 texture_filter = 1
 layout_mode = 2
 size_flags_horizontal = 8
@@ -362,10 +363,10 @@ texture_normal = ExtResource("22_82qbc")
 texture_pressed = ExtResource("19_dx2ir")
 texture_hover = ExtResource("20_tftjj")
 
-[node name="BackgroundMusic" type="AudioStreamPlayer" parent="."]
+[node name="BackgroundMusic" type="AudioStreamPlayer" parent="." unique_id=1164357089]
 stream = ExtResource("3_2nukd")
 
-[node name="ChatWindow" parent="." instance=ExtResource("4_ah2a1")]
+[node name="ChatWindow" parent="." unique_id=1743350056 instance=ExtResource("4_ah2a1")]
 unique_name_in_owner = true
 visible = false
 layout_mode = 1
diff --git a/ui/theme.tres b/ui/theme.tres
index a2a513d..0ce84c9 100644
--- a/ui/theme.tres
+++ b/ui/theme.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=5 format=3 uid="uid://c5sm3yvuakj3b"]
+[gd_resource type="Theme" format=3 uid="uid://c5sm3yvuakj3b"]
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_y5ki2"]
 
diff --git a/ui/theme_clear.tres b/ui/theme_clear.tres
index 7fa57f0..d34be8a 100644
--- a/ui/theme_clear.tres
+++ b/ui/theme_clear.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=11 format=3 uid="uid://c6y6r8kcnbb10"]
+[gd_resource type="Theme" format=3 uid="uid://c6y6r8kcnbb10"]
 
 [ext_resource type="FontFile" uid="uid://l34toovp0ncy" path="res://client_data/System/font/SCDream4.otf" id="1_qhl1o"]
 [ext_resource type="FontFile" uid="uid://dqqmqch0dgxxc" path="res://client_data/System/font/SCDream6.otf" id="2_f5aki"]