From 4ea895ed30b7c2b64506c93eae0310b760d543c9 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Sun, 8 Sep 2024 14:03:38 +0200 Subject: [PATCH] Minor restructuring. --- player.gd => objects/player.gd | 0 objects/player.tscn | 2 +- root_ui.tscn | 54 +++++++++++++++++----------------- 3 files changed, 28 insertions(+), 28 deletions(-) rename player.gd => objects/player.gd (100%) diff --git a/player.gd b/objects/player.gd similarity index 100% rename from player.gd rename to objects/player.gd diff --git a/objects/player.tscn b/objects/player.tscn index 5699562..7c4b2d9 100644 --- a/objects/player.tscn +++ b/objects/player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://ch0s3dxx3rpir"] -[ext_resource type="Script" path="res://player.gd" id="1_sen68"] +[ext_resource type="Script" path="res://objects/player.gd" id="1_sen68"] [ext_resource type="PackedScene" uid="uid://dy8vjf760prhq" path="res://assets/characters/rogue.tscn" id="2_whuis"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jd31k"] diff --git a/root_ui.tscn b/root_ui.tscn index f66cd5c..74ed764 100644 --- a/root_ui.tscn +++ b/root_ui.tscn @@ -1,21 +1,21 @@ [gd_scene load_steps=11 format=3 uid="uid://c73t0nbuqp68e"] -[ext_resource type="Script" path="res://root_ui.gd" id="1_rjfed"] -[ext_resource type="PackedScene" uid="uid://bo788o53t4rbq" path="res://scenes/startup_scene.tscn" id="2_6rvtu"] -[ext_resource type="PackedScene" uid="uid://cqie4cy0uy1t0" path="res://scenes/game.tscn" id="3_2f0ju"] -[ext_resource type="Theme" uid="uid://dmk7hc81l8gbw" path="res://ui/ui_theme.tres" id="4_ipijj"] -[ext_resource type="Script" path="res://game_ui.gd" id="5_5b1gg"] -[ext_resource type="Script" path="res://ui/inventory_dialog.gd" id="6_o6qry"] -[ext_resource type="PackedScene" uid="uid://dp3fi0g53qrt2" path="res://ui/item_slot.tscn" id="7_fp7as"] -[ext_resource type="PackedScene" uid="uid://bwui4acukq4x6" path="res://ui/ItemGrid.tscn" id="8_b014e"] -[ext_resource type="Script" path="res://ui/game_menu_ui.gd" id="9_ljlw8"] -[ext_resource type="Script" path="res://ui/item_grid.gd" id="10_rnxbp"] +[ext_resource type="Script" path="res://root_ui.gd" id="1_7fnkg"] +[ext_resource type="PackedScene" uid="uid://bo788o53t4rbq" path="res://scenes/startup_scene.tscn" id="2_1untt"] +[ext_resource type="PackedScene" uid="uid://cqie4cy0uy1t0" path="res://scenes/game.tscn" id="3_w1gpn"] +[ext_resource type="Theme" uid="uid://dmk7hc81l8gbw" path="res://ui/ui_theme.tres" id="4_el4q2"] +[ext_resource type="Script" path="res://game_ui.gd" id="5_jkbjp"] +[ext_resource type="Script" path="res://ui/inventory_dialog.gd" id="6_y58iw"] +[ext_resource type="PackedScene" uid="uid://dp3fi0g53qrt2" path="res://ui/item_slot.tscn" id="7_pv315"] +[ext_resource type="PackedScene" uid="uid://bwui4acukq4x6" path="res://ui/ItemGrid.tscn" id="8_anyub"] +[ext_resource type="Script" path="res://ui/game_menu_ui.gd" id="9_g2mav"] +[ext_resource type="Script" path="res://ui/item_grid.gd" id="10_5ufsm"] [node name="RootUI" type="CanvasLayer"] unique_name_in_owner = true -script = ExtResource("1_rjfed") -startup_scene = ExtResource("2_6rvtu") -game_scene = ExtResource("3_2f0ju") +script = ExtResource("1_7fnkg") +startup_scene = ExtResource("2_1untt") +game_scene = ExtResource("3_w1gpn") [node name="MainMenuUI" type="PanelContainer" parent="."] unique_name_in_owner = true @@ -30,7 +30,7 @@ offset_right = 199.0 offset_bottom = 134.5 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("4_ipijj") +theme = ExtResource("4_el4q2") [node name="MarginContainer" type="MarginContainer" parent="MainMenuUI"] layout_mode = 2 @@ -101,7 +101,7 @@ offset_right = 291.0 offset_bottom = 144.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("4_ipijj") +theme = ExtResource("4_el4q2") [node name="MarginContainer" type="MarginContainer" parent="NewGameUI"] layout_mode = 2 @@ -185,8 +185,8 @@ grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -theme = ExtResource("4_ipijj") -script = ExtResource("5_5b1gg") +theme = ExtResource("4_el4q2") +script = ExtResource("5_jkbjp") [node name="MessagesContainer" type="MarginContainer" parent="GameUI"] unique_name_in_owner = true @@ -224,8 +224,8 @@ theme_override_constants/margin_left = 40 theme_override_constants/margin_top = 82 theme_override_constants/margin_right = 40 theme_override_constants/margin_bottom = 128 -script = ExtResource("6_o6qry") -slot_scene = ExtResource("7_fp7as") +script = ExtResource("6_y58iw") +slot_scene = ExtResource("7_pv315") [node name="Panel" type="Panel" parent="GameUI/InventoryDialog"] layout_mode = 2 @@ -277,7 +277,7 @@ text = "Recipes" unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 -theme = ExtResource("4_ipijj") +theme = ExtResource("4_el4q2") item_count = 2 item_0/text = "Blab" item_1/text = "Bloobalb" @@ -309,7 +309,7 @@ grow_horizontal = 2 grow_vertical = 2 size_flags_vertical = 3 -[node name="IngredientsContainer" parent="GameUI/InventoryDialog/Panel/PanelContainer/CraftingUI/HBoxContainer/CraftIngredients/Panel/CenterContainer" instance=ExtResource("8_b014e")] +[node name="IngredientsContainer" parent="GameUI/InventoryDialog/Panel/PanelContainer/CraftingUI/HBoxContainer/CraftIngredients/Panel/CenterContainer" instance=ExtResource("8_anyub")] unique_name_in_owner = true layout_mode = 2 columns = 3 @@ -349,7 +349,7 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="ResultsContainer" parent="GameUI/InventoryDialog/Panel/PanelContainer/CraftingUI/HBoxContainer/CraftResult/Panel/CenterContainer" instance=ExtResource("8_b014e")] +[node name="ResultsContainer" parent="GameUI/InventoryDialog/Panel/PanelContainer/CraftingUI/HBoxContainer/CraftResult/Panel/CenterContainer" instance=ExtResource("8_anyub")] unique_name_in_owner = true layout_mode = 2 columns = 1 @@ -378,7 +378,7 @@ layout_mode = 2 layout_mode = 2 text = "Backpack" -[node name="InventoryContainer" parent="GameUI/InventoryDialog/Panel/PanelContainer/BackpackUI/VBoxContainer" instance=ExtResource("8_b014e")] +[node name="InventoryContainer" parent="GameUI/InventoryDialog/Panel/PanelContainer/BackpackUI/VBoxContainer" instance=ExtResource("8_anyub")] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 4 @@ -400,8 +400,8 @@ offset_right = 199.0 offset_bottom = 215.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("4_ipijj") -script = ExtResource("9_ljlw8") +theme = ExtResource("4_el4q2") +script = ExtResource("9_g2mav") [node name="MarginContainer" type="MarginContainer" parent="GameUI/GameMenuUI"] layout_mode = 2 @@ -495,8 +495,8 @@ layout_mode = 2 unique_name_in_owner = true layout_mode = 2 columns = 9 -script = ExtResource("10_rnxbp") -slot_scene = ExtResource("7_fp7as") +script = ExtResource("10_5ufsm") +slot_scene = ExtResource("7_pv315") [node name="Scene" type="Node3D" parent="."] unique_name_in_owner = true