From 23e30258b581f6d03b84391be330c6836a10ec74 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Mon, 12 Jun 2023 18:31:41 +0200 Subject: [PATCH] fix: dependency fixes --- src/UserInterface/Screens/InGameMenu/LevelEndScreen.tscn | 2 +- src/UserInterface/Screens/InGameMenu/PauseScreen.tscn | 2 +- .../Screens/MainMenu/ControlsMenu/ActionKeyList.gd | 2 +- .../Screens/MainMenu/ControlsMenu/ControlsMenu.tscn | 8 +++++--- .../Screens/MainMenu/ControlsMenu/InputLine.tscn | 2 +- src/UserInterface/Screens/MainMenu/LevelList.gd | 2 +- src/UserInterface/Screens/MainMenu/MainScreen.tscn | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/UserInterface/Screens/InGameMenu/LevelEndScreen.tscn b/src/UserInterface/Screens/InGameMenu/LevelEndScreen.tscn index 2f99af4..1453205 100644 --- a/src/UserInterface/Screens/InGameMenu/LevelEndScreen.tscn +++ b/src/UserInterface/Screens/InGameMenu/LevelEndScreen.tscn @@ -64,7 +64,7 @@ margin_bottom = -20.0 margin_right = 200.0 margin_bottom = 48.0 text = "Begin Again" -next_scene_path = "res://src/UserInterface/Screens/MainScreen.tscn" +next_scene_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn" [node name="QuitButton" parent="MenuContainer" instance=ExtResource( 5 )] anchor_left = 0.0 diff --git a/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn b/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn index 09a8694..ee0731a 100644 --- a/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn +++ b/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn @@ -67,7 +67,7 @@ margin_bottom = 165.0 focus_neighbour_top = NodePath("../RetryButton") focus_neighbour_bottom = NodePath("../Continue") text = "Main Menu" -next_scene_path = "res://src/UserInterface/Screens/MainScreen.tscn" +next_scene_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn" [node name="PauseLabel" type="Label" parent="PauseOverlay"] anchor_left = 0.5 diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd b/src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd index 29d1407..c27e3f1 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd @@ -1,6 +1,6 @@ extends Control -const InputLine = preload("res://src/UserInterface/Screens/ControlsMenu/InputLine.tscn") +const InputLine = preload("res://src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn") var prev_line = null func clear(): diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn b/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn index 43dca49..07128eb 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn @@ -182,6 +182,8 @@ follow_focus = true [node name="ActionKeyList" type="VBoxContainer" parent="KeymapViewer/ScrollContainer"] unique_name_in_owner = true +margin_right = 552.0 +margin_bottom = 177.0 size_flags_horizontal = 3 size_flags_vertical = 3 script = ExtResource( 14 ) @@ -206,7 +208,7 @@ size_flags_horizontal = 0 size_flags_vertical = 0 text = "Back" script = ExtResource( 2 ) -next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn" +next_screen_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn" [node name="Reset" type="Button" parent="."] unique_name_in_owner = true @@ -359,7 +361,7 @@ size_flags_vertical = 4 text = "Save And Quit" icon_align = 1 script = ExtResource( 4 ) -next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn" +next_screen_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn" [node name="ContinueEdit" type="Button" parent="ReallyQuitMenu/VBoxContainer"] margin_top = 24.0 @@ -390,7 +392,7 @@ size_flags_horizontal = 7 size_flags_vertical = 4 text = "Quit Don't Save" script = ExtResource( 19 ) -next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn" +next_screen_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn" [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource( 11 ) diff --git a/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn b/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn index 88baa33..875086c 100644 --- a/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn +++ b/src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/InputLine.gd" type="Script" id=1] +[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.gd" type="Script" id=1] [node name="InputLine" type="HBoxContainer"] anchor_top = 0.5 diff --git a/src/UserInterface/Screens/MainMenu/LevelList.gd b/src/UserInterface/Screens/MainMenu/LevelList.gd index 688e947..59acbeb 100644 --- a/src/UserInterface/Screens/MainMenu/LevelList.gd +++ b/src/UserInterface/Screens/MainMenu/LevelList.gd @@ -1,7 +1,7 @@ extends ScrollContainer onready var LEVELS_PATH = "res://src/Levels/" -onready var BUTTON_GROUP : ButtonGroup = load("res://src/UserInterface/Screens/LevelSelectButtonGroup.tres") +onready var BUTTON_GROUP : ButtonGroup = load("res://src/UserInterface/Screens/MainMenu/LevelSelectButtonGroup.tres") onready var vbox: VBoxContainer = $VBoxContainer func _ready() -> void: diff --git a/src/UserInterface/Screens/MainMenu/MainScreen.tscn b/src/UserInterface/Screens/MainMenu/MainScreen.tscn index ccb1eb9..943b45d 100644 --- a/src/UserInterface/Screens/MainMenu/MainScreen.tscn +++ b/src/UserInterface/Screens/MainMenu/MainScreen.tscn @@ -87,7 +87,7 @@ focus_neighbour_top = NodePath("../PlayButton") focus_neighbour_bottom = NodePath("../QuitButton") text = "Controls" script = ExtResource( 12 ) -next_screen_path = "res://src/UserInterface/Screens/ControlsMenu/ControlsMenu.tscn" +next_screen_path = "res://src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn" [node name="QuitButton" parent="MenuContainer/Buttons" instance=ExtResource( 1 )] unique_name_in_owner = true