From c94ec3396a208f9a157122fd964b32d17e7edcc2 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sat, 31 May 2025 15:45:45 -0700 Subject: [PATCH] fix saving bug and change scale of chuck e corner models --- Scenes/GUI/EditorScreen.tscn | 9 --------- Scenes/Stages/ChuckEsCorner.tscn | 24 ++++++++++++------------ Scripts/EditorScreen.gd | 2 +- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Scenes/GUI/EditorScreen.tscn b/Scenes/GUI/EditorScreen.tscn index 0a9838a..ba542e0 100644 --- a/Scenes/GUI/EditorScreen.tscn +++ b/Scenes/GUI/EditorScreen.tscn @@ -851,15 +851,6 @@ grow_horizontal = 2 grow_vertical = 2 placeholder_text = "Show Name" -[node name="StageTypeLabel" type="Label" parent="ShowtapeNewScreen/DialogPanel"] -layout_mode = 0 -offset_left = 8.0 -offset_top = 192.0 -offset_right = 264.0 -offset_bottom = 224.0 -text = "Creating for Helen House" -vertical_alignment = 1 - [node name="CancelButton" type="Button" parent="ShowtapeNewScreen/DialogPanel"] layout_mode = 0 offset_left = 309.0 diff --git a/Scenes/Stages/ChuckEsCorner.tscn b/Scenes/Stages/ChuckEsCorner.tscn index e41781e..da7e129 100644 --- a/Scenes/Stages/ChuckEsCorner.tscn +++ b/Scenes/Stages/ChuckEsCorner.tscn @@ -11,42 +11,42 @@ ambient_light_source = 1 [node name="ChuckEsCorner" type="Node3D"] [node name="Chuck" parent="." instance=ExtResource("1_m77pm")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -2, 2, 0.5) +transform = Transform3D(-1.5, 0, 2.26494e-07, 0, 1.5, 0, -2.26494e-07, 0, -1.5, -2, 2, 0.312447) script = ExtResource("2_8qvk7") [node name="Warblettes" parent="." instance=ExtResource("3_t27ru")] -transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0.25, 4, 0.5) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 4, 0.5) [node name="Angle 1" type="Camera3D" parent="."] -transform = Transform3D(-0.984613, -0.00554269, 0.174664, 0.0289131, 0.980555, 0.194105, -0.172344, 0.196168, -0.965306, -0.658302, 4.68552, -4) +transform = Transform3D(-0.984612, -0.00554278, 0.174664, 0.0289131, 0.980555, 0.194105, -0.172344, 0.196168, -0.965306, -0.658302, 4.93729, -4) current = true -fov = 50.0 +fov = 60.0 [node name="Angle 2" type="Camera3D" parent="."] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -2, 3, -1.5) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -2, 3.44355, -2.64184) fov = 60.0 [node name="Angle 3" type="Camera3D" parent="."] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.25, 4.77684, -1.29774) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.25, 4.95492, -1.77582) fov = 60.0 [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_4uxdq") [node name="Chuck Spotlight" type="SpotLight3D" parent="."] -transform = Transform3D(-0.972974, -0.0597654, 0.223048, 2.26267e-08, 0.965926, 0.258819, -0.230916, 0.251824, -0.939821, -1.782, 3.73541, -0.75) +transform = Transform3D(-0.972974, -0.0597654, 0.223048, 2.26267e-08, 0.965926, 0.258819, -0.230916, 0.251824, -0.939821, -1.57812, 4.57895, -1.25599) light_color = Color(1, 0.9625, 0.85, 1) light_energy = 2.0 -spot_range = 1.59812 -spot_angle = 32.2181 +spot_range = 6.53799 +spot_angle = 30.5982 spot_angle_attenuation = 0.1 [node name="Chuck Spotlight2" type="SpotLight3D" parent="."] -transform = Transform3D(-0.963761, 0.0690445, -0.257677, 1.9697e-08, 0.965926, 0.258819, 0.266767, 0.24944, -0.930922, -0.186226, 5.29432, -0.75) +transform = Transform3D(-0.963761, 0.0690445, -0.257677, 1.9697e-08, 0.965926, 0.258819, 0.266767, 0.24944, -0.930922, -0.309492, 5.86862, -0.75) light_color = Color(1, 0.9625, 0.85, 1) light_energy = 2.0 -spot_range = 2.26541 -spot_angle = 28.9054 +spot_range = 12.8142 +spot_angle = 28.4779 spot_angle_attenuation = 0.1 [node name="OmniLight3D" type="OmniLight3D" parent="."] diff --git a/Scripts/EditorScreen.gd b/Scripts/EditorScreen.gd index 99e0a20..8b28c62 100644 --- a/Scripts/EditorScreen.gd +++ b/Scripts/EditorScreen.gd @@ -290,7 +290,7 @@ func _on_showtape_save_out_browse_button_pressed() -> void: $SaveShowtapeFileDialog.show() func _on_showtape_save_create_button_pressed() -> void: - var header = "UST,1,"+show_name.replace(",", "_").replace(";", "_")+","+str(stages_info[current_stage][1])+","+stages_info[current_stage][6]+","+stages_info[current_stage][5]+";" + var header = "UST,1,"+show_name.replace(",", "_").replace(";", "_")+","+str(stages_info[current_stage]["bits"])+","+stages_info[current_stage]["ust_stage"]+","+stages_info[current_stage]["ust_character"]+";" var data_out_string = save_data() var file = FileAccess.open($ShowtapeSaveScreen/DialogPanel/OutFilePath.text, FileAccess.WRITE) file.store_string(header+data_out_string+";"+Marshalls.raw_to_base64($AudioStreamPlayer.stream.data))