From afb1ad62d4abd7d2752ea55edd4098a2efd8c799 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 12 Feb 2022 19:59:26 +0100 Subject: [PATCH] Moved the ingame menu and interface settings to a different folder. --- .../{ => player/player_ui}/ingame_menu/ExitButton.gd | 0 .../{ => player/player_ui}/ingame_menu/IngameMenu.tscn | 10 +++++----- .../player_ui}/interface/InterfaceOptions.gd | 0 .../player_ui}/interface/InterfaceOptions.tscn | 5 +++-- .../player_ui}/interface/SetActionbarAsDefault.gd | 0 game/ui/player/player_ui/player_ui.tscn | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) rename game/ui/{ => player/player_ui}/ingame_menu/ExitButton.gd (100%) rename game/ui/{ => player/player_ui}/ingame_menu/IngameMenu.tscn (89%) rename game/ui/{ => player/player_ui}/interface/InterfaceOptions.gd (100%) rename game/ui/{ => player/player_ui}/interface/InterfaceOptions.tscn (87%) rename game/ui/{ => player/player_ui}/interface/SetActionbarAsDefault.gd (100%) diff --git a/game/ui/ingame_menu/ExitButton.gd b/game/ui/player/player_ui/ingame_menu/ExitButton.gd similarity index 100% rename from game/ui/ingame_menu/ExitButton.gd rename to game/ui/player/player_ui/ingame_menu/ExitButton.gd diff --git a/game/ui/ingame_menu/IngameMenu.tscn b/game/ui/player/player_ui/ingame_menu/IngameMenu.tscn similarity index 89% rename from game/ui/ingame_menu/IngameMenu.tscn rename to game/ui/player/player_ui/ingame_menu/IngameMenu.tscn index 673e9587..afe0555a 100644 --- a/game/ui/ingame_menu/IngameMenu.tscn +++ b/game/ui/player/player_ui/ingame_menu/IngameMenu.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] -[ext_resource path="res://ui/windows/options/Options.tscn" type="PackedScene" id=2] -[ext_resource path="res://ui/ingame_menu/ExitButton.gd" type="Script" id=3] +[ext_resource path="res://ui/player/player_ui/ingame_menu/ExitButton.gd" type="Script" id=2] +[ext_resource path="res://ui/windows/options/Options.tscn" type="PackedScene" id=3] [ext_resource path="res://ui/windows/keybinds/Keybinds.tscn" type="PackedScene" id=4] -[ext_resource path="res://ui/interface/InterfaceOptions.tscn" type="PackedScene" id=5] +[ext_resource path="res://ui/player/player_ui/interface/InterfaceOptions.tscn" type="PackedScene" id=5] [node name="IngameMenu" type="Control"] anchor_right = 1.0 @@ -65,9 +65,9 @@ margin_top = 136.0 margin_right = 147.0 margin_bottom = 162.57 text = "Exit" -script = ExtResource( 3 ) +script = ExtResource( 2 ) -[node name="Options" parent="." instance=ExtResource( 2 )] +[node name="Options" parent="." instance=ExtResource( 3 )] visible = false anchor_left = 0.5 anchor_top = 0.5 diff --git a/game/ui/interface/InterfaceOptions.gd b/game/ui/player/player_ui/interface/InterfaceOptions.gd similarity index 100% rename from game/ui/interface/InterfaceOptions.gd rename to game/ui/player/player_ui/interface/InterfaceOptions.gd diff --git a/game/ui/interface/InterfaceOptions.tscn b/game/ui/player/player_ui/interface/InterfaceOptions.tscn similarity index 87% rename from game/ui/interface/InterfaceOptions.tscn rename to game/ui/player/player_ui/interface/InterfaceOptions.tscn index e4a20f3b..a148005d 100644 --- a/game/ui/interface/InterfaceOptions.tscn +++ b/game/ui/player/player_ui/interface/InterfaceOptions.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://ui/interface/SetActionbarAsDefault.gd" type="Script" id=1] -[ext_resource path="res://ui/interface/InterfaceOptions.gd" type="Script" id=2] +[ext_resource path="res://ui/player/player_ui/interface/SetActionbarAsDefault.gd" type="Script" id=1] +[ext_resource path="res://ui/player/player_ui/interface/InterfaceOptions.gd" type="Script" id=2] [node name="InterfaceOptions" type="PanelContainer"] anchor_right = 1.0 @@ -49,4 +49,5 @@ margin_right = 1010.0 margin_bottom = 20.0 text = "Set current actionbar setup as default" script = ExtResource( 1 ) + [connection signal="pressed" from="VBoxContainer2/HBoxContainer/Button" to="." method="hide"] diff --git a/game/ui/interface/SetActionbarAsDefault.gd b/game/ui/player/player_ui/interface/SetActionbarAsDefault.gd similarity index 100% rename from game/ui/interface/SetActionbarAsDefault.gd rename to game/ui/player/player_ui/interface/SetActionbarAsDefault.gd diff --git a/game/ui/player/player_ui/player_ui.tscn b/game/ui/player/player_ui/player_ui.tscn index 688a0d25..67795530 100644 --- a/game/ui/player/player_ui/player_ui.tscn +++ b/game/ui/player/player_ui/player_ui.tscn @@ -6,7 +6,7 @@ [ext_resource path="res://ui/theme/unlocked_icon.tres" type="Texture" id=4] [ext_resource path="res://player/GUI.gd" type="Script" id=5] [ext_resource path="res://ui/player/player_ui/player_ui.gd" type="Script" id=6] -[ext_resource path="res://ui/ingame_menu/IngameMenu.tscn" type="PackedScene" id=7] +[ext_resource path="res://ui/player/player_ui/ingame_menu/IngameMenu.tscn" type="PackedScene" id=7] [ext_resource path="res://ui/player/player_ui/buttons/Buttons.gd" type="Script" id=8] [ext_resource path="res://ui/player/player_ui/buttons/ImageButton.tscn" type="PackedScene" id=9]