From a06031a08cbb8119e9b423cce9fa46437eab82d1 Mon Sep 17 00:00:00 2001 From: muskit <15199219+muskit@users.noreply.github.com> Date: Fri, 15 Sep 2023 12:01:05 -0700 Subject: [PATCH] scene mess-arounds --- Scenes/DebugChartLoader.tscn | 4 +-- Scenes/Play.tscn | 53 ++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/Scenes/DebugChartLoader.tscn b/Scenes/DebugChartLoader.tscn index c37d76d..6b40a29 100644 --- a/Scenes/DebugChartLoader.tscn +++ b/Scenes/DebugChartLoader.tscn @@ -33,7 +33,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 8 size_flags_stretch_ratio = 5.97 -text = "AkiraComplex - Ether Strike" +text = "Bad Apple!!" placeholder_text = "Folder path relative to \"user://songs/\"" [node name="DifficultyOptionButton" type="OptionButton" parent="VBoxContainer/HBoxContainer"] @@ -59,7 +59,7 @@ alignment = 1 [node name="SoundLineEdit" type="LineEdit" parent="VBoxContainer/HBoxContainer3"] layout_mode = 2 size_flags_horizontal = 3 -text = "music.wav" +text = "music.mp3" placeholder_text = "Name of audio file in the folder specified above with extension" [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] diff --git a/Scenes/Play.tscn b/Scenes/Play.tscn index e8fe1e4..5222e54 100644 --- a/Scenes/Play.tscn +++ b/Scenes/Play.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=11 format=3 uid="uid://bqh00ot0csqmk"] +[gd_scene load_steps=12 format=3 uid="uid://bqh00ot0csqmk"] +[ext_resource type="Script" path="res://Scripts/Scenes/Play.cs" id="1_d6iv3"] [ext_resource type="Texture2D" uid="uid://dkohutwp0yujj" path="res://_Assets/Textures/BGLine.png" id="2_lkl1c"] [sub_resource type="Environment" id="Environment_nefjb"] @@ -65,6 +66,7 @@ width = 2048 font_size = 271 [node name="Play" type="Node"] +script = ExtResource("1_d6iv3") [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_nefjb") @@ -110,7 +112,7 @@ msaa_2d = 1 size = Vector2i(1920, 1920) render_target_update_mode = 4 -[node name="Base" type="Control" parent="SubViewportContainer/2D Viewport"] +[node name="Node2D" type="Control" parent="SubViewportContainer/2D Viewport"] clip_contents = true layout_mode = 3 anchors_preset = 15 @@ -119,12 +121,12 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="Camera2D" type="Camera2D" parent="SubViewportContainer/2D Viewport/Base"] +[node name="Camera2D" type="Camera2D" parent="SubViewportContainer/2D Viewport/Node2D"] position = Vector2(0, -1920) anchor_mode = 0 enabled = false -[node name="Shadow" type="TextureRect" parent="SubViewportContainer/2D Viewport/Base"] +[node name="Shadow" type="TextureRect" parent="SubViewportContainer/2D Viewport/Node2D"] layout_mode = 2 offset_top = 1920.0 offset_right = 100.0 @@ -133,44 +135,45 @@ rotation = -1.5708 texture = SubResource("GradientTexture1D_vv2ac") expand_mode = 1 -[node name="Line" type="TextureRect" parent="SubViewportContainer/2D Viewport/Base"] -layout_mode = 1 -anchors_preset = 7 -anchor_left = 0.5 -anchor_top = 1.0 -anchor_right = 0.5 -anchor_bottom = 1.0 -offset_left = -960.0 -offset_top = -45.0 -offset_bottom = -13.0 -grow_horizontal = 2 -grow_vertical = 0 -texture = ExtResource("2_lkl1c") -expand_mode = 1 +[node name="HitLine_Reverse" type="Node2D" parent="SubViewportContainer/2D Viewport/Node2D"] -[node name="Line2" type="TextureRect" parent="SubViewportContainer/2D Viewport/Base"] -layout_mode = 1 +[node name="Line" type="TextureRect" parent="SubViewportContainer/2D Viewport/Node2D/HitLine_Reverse"] anchors_preset = 7 anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -offset_top = -45.0 +offset_top = 1875.0 offset_right = 960.0 -offset_bottom = -13.0 +offset_bottom = 1907.0 grow_horizontal = 2 grow_vertical = 0 texture = ExtResource("2_lkl1c") expand_mode = 1 -[node name="Label" type="Label" parent="SubViewportContainer/2D Viewport/Base"] +[node name="Line2" type="TextureRect" parent="SubViewportContainer/2D Viewport/Node2D/HitLine_Reverse"] +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +offset_left = 960.0 +offset_top = 1875.0 +offset_right = 1920.0 +offset_bottom = 1907.0 +grow_horizontal = 2 +grow_vertical = 0 +texture = ExtResource("2_lkl1c") +expand_mode = 1 + +[node name="Label" type="Label" parent="SubViewportContainer/2D Viewport/Node2D"] layout_mode = 1 anchors_preset = 2 anchor_top = 1.0 anchor_bottom = 1.0 offset_top = -2236.45 offset_right = 1885.0 -offset_bottom = 1.54797 +offset_bottom = 1.5481 grow_vertical = 0 size_flags_vertical = 3 text = "1 2 3 4 5 6 7 10 @@ -182,3 +185,5 @@ text = "1 2 3 4 5 6 7 10 label_settings = SubResource("LabelSettings_dj3ei") horizontal_alignment = 1 vertical_alignment = 2 + +[node name="Notes" type="Node2D" parent="SubViewportContainer/2D Viewport/Node2D"]