diff --git a/game/ui/player_ui/player_ui.tscn b/game/ui/player_ui/player_ui.tscn index 88f650eb..6aeeb860 100644 --- a/game/ui/player_ui/player_ui.tscn +++ b/game/ui/player_ui/player_ui.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://player/GUI.gd" type="Script" id=1] [ext_resource path="res://ui/ingame_menu/IngameMenu.tscn" type="PackedScene" id=2] @@ -10,7 +10,6 @@ [ext_resource path="res://ui/player_ui/player_ui.gd" type="Script" id=28] [ext_resource path="res://ui/buttons/ImageButton.tscn" type="PackedScene" id=30] [ext_resource path="res://ui/windows/TrainerWindow.tscn" type="PackedScene" id=31] -[ext_resource path="res://ui/windows/VendorWindow.tscn" type="PackedScene" id=32] [node name="GUILayer" type="CanvasLayer"] script = ExtResource( 28 ) @@ -105,15 +104,6 @@ margin_top = 50.7239 margin_right = 446.733 margin_bottom = 542.724 -[node name="VendorWindow" parent="GUI/Windows" instance=ExtResource( 32 )] -visible = false -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 43.4182 -margin_top = 69.8467 -margin_right = 524.418 -margin_bottom = 502.847 - [node name="IngameMenu" parent="GUI" instance=ExtResource( 2 )] visible = false [connection signal="pressed" from="GUI/Buttons/Menu" to="GUI/IngameMenu" method="show"] diff --git a/game/ui/windows/ItemContainer.gd b/game/ui/vendor_window/ItemContainer.gd similarity index 100% rename from game/ui/windows/ItemContainer.gd rename to game/ui/vendor_window/ItemContainer.gd diff --git a/game/ui/windows/ItemContainer.tscn b/game/ui/vendor_window/ItemContainer.tscn similarity index 95% rename from game/ui/windows/ItemContainer.tscn rename to game/ui/vendor_window/ItemContainer.tscn index be527123..8308cf2c 100644 --- a/game/ui/windows/ItemContainer.tscn +++ b/game/ui/vendor_window/ItemContainer.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://ui/windows/ItemDragAndDropVendor.gd" type="Script" id=1] -[ext_resource path="res://ui/windows/ItemContainer.gd" type="Script" id=2] -[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=3] -[ext_resource path="res://ui/vendor_window/VendorEntryPopup.gd" type="Script" id=4] +[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] +[ext_resource path="res://ui/vendor_window/VendorEntryPopup.gd" type="Script" id=2] +[ext_resource path="res://ui/vendor_window/ItemDragAndDropVendor.gd" type="Script" id=3] +[ext_resource path="res://ui/vendor_window/ItemContainer.gd" type="Script" id=4] [node name="ItemContainer" type="Control"] margin_left = 290.0 @@ -12,8 +12,8 @@ margin_right = 576.0 margin_bottom = 370.0 size_flags_horizontal = 3 size_flags_vertical = 3 -theme = ExtResource( 3 ) -script = ExtResource( 2 ) +theme = ExtResource( 1 ) +script = ExtResource( 4 ) __meta__ = { "_edit_use_anchors_": false } @@ -45,7 +45,7 @@ margin_bottom = 60.0 margin_right = 55.0 margin_bottom = 56.0 rect_min_size = Vector2( 55, 55 ) -script = ExtResource( 1 ) +script = ExtResource( 3 ) [node name="CenterContainer" type="MarginContainer" parent="PanelContainer/HBoxContainer/Button"] margin_left = 4.0 @@ -80,7 +80,7 @@ margin_left = 64.0 margin_top = 4.0 margin_right = 360.0 margin_bottom = 207.0 -script = ExtResource( 4 ) +script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/game/ui/windows/ItemDragAndDropVendor.gd b/game/ui/vendor_window/ItemDragAndDropVendor.gd similarity index 100% rename from game/ui/windows/ItemDragAndDropVendor.gd rename to game/ui/vendor_window/ItemDragAndDropVendor.gd diff --git a/game/ui/windows/VendorWindow.gd b/game/ui/vendor_window/VendorWindow.gd similarity index 100% rename from game/ui/windows/VendorWindow.gd rename to game/ui/vendor_window/VendorWindow.gd diff --git a/game/ui/vendor_window/VendorWindow.tscn b/game/ui/vendor_window/VendorWindow.tscn new file mode 100644 index 00000000..887493c8 --- /dev/null +++ b/game/ui/vendor_window/VendorWindow.tscn @@ -0,0 +1,175 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://ui/vendor_window/ItemContainer.tscn" type="PackedScene" id=1] +[ext_resource path="res://ui/vendor_window/VendorWindow.gd" type="Script" id=4] +[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=5] + +[node name="VendorWindow" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +mouse_filter = 2 +theme = ExtResource( 5 ) +script = ExtResource( 4 ) +__meta__ = { +"_edit_use_anchors_": false +} +spell_entry_container_path = NodePath("PanelContainer/PagedContent/GridContainer") +prev_button_path = NodePath("PanelContainer/PagedContent/Controls/HBoxContainer/Button2") +next_button_path = NodePath("PanelContainer/PagedContent/Controls/HBoxContainer/Button") +show_not_learned = false + +[node name="PanelContainer" type="PanelContainer" parent="."] +margin_left = 64.0 +margin_top = 39.0 +margin_right = 580.0 +margin_bottom = 507.0 + +[node name="PagedContent" type="VBoxContainer" parent="PanelContainer"] +margin_left = 4.0 +margin_top = 4.0 +margin_right = 512.0 +margin_bottom = 464.0 + +[node name="Header" type="HBoxContainer" parent="PanelContainer/PagedContent"] +margin_right = 508.0 +margin_bottom = 30.0 + +[node name="Label" type="Label" parent="PanelContainer/PagedContent/Header"] +margin_top = 7.0 +margin_right = 36.0 +margin_bottom = 22.0 +text = "Vendor" + +[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/PagedContent/Header"] +margin_left = 40.0 +margin_right = 464.0 +margin_bottom = 30.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +alignment = 1 + +[node name="Button" type="Button" parent="PanelContainer/PagedContent/Header"] +margin_left = 468.0 +margin_right = 508.0 +margin_bottom = 30.0 +rect_min_size = Vector2( 40, 30 ) +text = "X" + +[node name="GridContainer" type="GridContainer" parent="PanelContainer/PagedContent"] +margin_top = 38.0 +margin_right = 508.0 +margin_bottom = 422.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +columns = 2 + +[node name="ItemContainer" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 0.0 +margin_top = 0.0 +margin_right = 252.0 +margin_bottom = 60.0 + +[node name="ItemContainer2" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 256.0 +margin_top = 0.0 +margin_right = 508.0 +margin_bottom = 60.0 + +[node name="ItemContainer3" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 0.0 +margin_top = 64.0 +margin_right = 252.0 +margin_bottom = 124.0 + +[node name="ItemContainer4" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 256.0 +margin_top = 64.0 +margin_right = 508.0 +margin_bottom = 124.0 + +[node name="ItemContainer5" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 0.0 +margin_top = 128.0 +margin_right = 252.0 +margin_bottom = 188.0 + +[node name="ItemContainer6" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 256.0 +margin_top = 128.0 +margin_right = 508.0 +margin_bottom = 188.0 + +[node name="ItemContainer7" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 0.0 +margin_top = 192.0 +margin_right = 252.0 +margin_bottom = 252.0 + +[node name="ItemContainer8" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 256.0 +margin_top = 192.0 +margin_right = 508.0 +margin_bottom = 252.0 + +[node name="ItemContainer9" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 0.0 +margin_top = 256.0 +margin_right = 252.0 +margin_bottom = 316.0 + +[node name="ItemContainer10" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 256.0 +margin_top = 256.0 +margin_right = 508.0 +margin_bottom = 316.0 + +[node name="ItemContainer11" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 0.0 +margin_top = 320.0 +margin_right = 252.0 +margin_bottom = 380.0 + +[node name="ItemContainer12" parent="PanelContainer/PagedContent/GridContainer" instance=ExtResource( 1 )] +margin_left = 256.0 +margin_top = 320.0 +margin_right = 508.0 +margin_bottom = 380.0 + +[node name="Controls" type="MarginContainer" parent="PanelContainer/PagedContent"] +margin_top = 430.0 +margin_right = 508.0 +margin_bottom = 460.0 +custom_constants/margin_right = 2 +custom_constants/margin_top = 2 +custom_constants/margin_left = 2 +custom_constants/margin_bottom = 2 + +[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/PagedContent/Controls"] +margin_left = 2.0 +margin_top = 2.0 +margin_right = 506.0 +margin_bottom = 28.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="Button2" type="Button" parent="PanelContainer/PagedContent/Controls/HBoxContainer"] +margin_right = 165.0 +margin_bottom = 26.5702 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "< Previous page" + +[node name="Spacer" type="Control" parent="PanelContainer/PagedContent/Controls/HBoxContainer"] +margin_left = 169.0 +margin_right = 334.0 +margin_bottom = 26.0 +size_flags_horizontal = 3 + +[node name="Button" type="Button" parent="PanelContainer/PagedContent/Controls/HBoxContainer"] +margin_left = 338.0 +margin_right = 504.0 +margin_bottom = 26.5702 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Next page >" +[connection signal="pressed" from="PanelContainer/PagedContent/Header/Button" to="." method="hide"] diff --git a/game/ui/vendor_window/game_module.tres b/game/ui/vendor_window/game_module.tres new file mode 100644 index 00000000..df5688ed --- /dev/null +++ b/game/ui/vendor_window/game_module.tres @@ -0,0 +1,11 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://ui/vendor_window/VendorWindow.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2] + +[resource] +script = ExtResource( 2 ) +enabled = true +scene = ExtResource( 1 ) +index = -1 +add_button = false diff --git a/game/ui/windows/VendorWindow.tscn b/game/ui/windows/VendorWindow.tscn deleted file mode 100644 index c065c877..00000000 --- a/game/ui/windows/VendorWindow.tscn +++ /dev/null @@ -1,168 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://ui/windows/ItemContainer.tscn" type="PackedScene" id=1] -[ext_resource path="res://ui/windows/VendorWindow.gd" type="Script" id=4] -[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=5] - -[node name="VendorWindow" type="PanelContainer"] -anchor_right = 1.0 -anchor_bottom = 1.0 -theme = ExtResource( 5 ) -script = ExtResource( 4 ) -__meta__ = { -"_edit_use_anchors_": false -} -spell_entry_container_path = NodePath("../VendorWindow/PagedContent/GridContainer") -prev_button_path = NodePath("../VendorWindow/PagedContent/Controls/HBoxContainer/Button2") -next_button_path = NodePath("../VendorWindow/PagedContent/Controls/HBoxContainer/Button") -show_not_learned = false - -[node name="PagedContent" type="VBoxContainer" parent="."] -margin_left = 4.0 -margin_top = 4.0 -margin_right = 1020.0 -margin_bottom = 596.0 - -[node name="Header" type="HBoxContainer" parent="PagedContent"] -margin_right = 1016.0 -margin_bottom = 30.0 - -[node name="Label" type="Label" parent="PagedContent/Header"] -margin_top = 7.0 -margin_right = 36.0 -margin_bottom = 22.0 -text = "Vendor" - -[node name="HBoxContainer" type="HBoxContainer" parent="PagedContent/Header"] -margin_left = 40.0 -margin_right = 972.0 -margin_bottom = 30.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -alignment = 1 - -[node name="Button" type="Button" parent="PagedContent/Header"] -margin_left = 976.0 -margin_right = 1016.0 -margin_bottom = 30.0 -rect_min_size = Vector2( 40, 30 ) -text = "X" - -[node name="GridContainer" type="GridContainer" parent="PagedContent"] -margin_top = 38.0 -margin_right = 1016.0 -margin_bottom = 554.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -columns = 2 - -[node name="ItemContainer" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 0.0 -margin_top = 0.0 -margin_right = 506.0 -margin_bottom = 82.0 - -[node name="ItemContainer2" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 510.0 -margin_top = 0.0 -margin_right = 1016.0 -margin_bottom = 82.0 - -[node name="ItemContainer3" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 0.0 -margin_top = 86.0 -margin_right = 506.0 -margin_bottom = 168.0 - -[node name="ItemContainer4" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 510.0 -margin_top = 86.0 -margin_right = 1016.0 -margin_bottom = 168.0 - -[node name="ItemContainer5" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 0.0 -margin_top = 172.0 -margin_right = 506.0 -margin_bottom = 254.0 - -[node name="ItemContainer6" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 510.0 -margin_top = 172.0 -margin_right = 1016.0 -margin_bottom = 254.0 - -[node name="ItemContainer7" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 0.0 -margin_top = 258.0 -margin_right = 506.0 -margin_bottom = 340.0 - -[node name="ItemContainer8" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 510.0 -margin_top = 258.0 -margin_right = 1016.0 -margin_bottom = 340.0 - -[node name="ItemContainer9" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 0.0 -margin_top = 344.0 -margin_right = 506.0 -margin_bottom = 426.0 - -[node name="ItemContainer10" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 510.0 -margin_top = 344.0 -margin_right = 1016.0 -margin_bottom = 426.0 - -[node name="ItemContainer11" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 0.0 -margin_top = 430.0 -margin_right = 506.0 -margin_bottom = 512.0 - -[node name="ItemContainer12" parent="PagedContent/GridContainer" instance=ExtResource( 1 )] -margin_left = 510.0 -margin_top = 430.0 -margin_right = 1016.0 -margin_bottom = 512.0 - -[node name="Controls" type="MarginContainer" parent="PagedContent"] -margin_top = 562.0 -margin_right = 1016.0 -margin_bottom = 592.0 -custom_constants/margin_right = 2 -custom_constants/margin_top = 2 -custom_constants/margin_left = 2 -custom_constants/margin_bottom = 2 - -[node name="HBoxContainer" type="HBoxContainer" parent="PagedContent/Controls"] -margin_left = 2.0 -margin_top = 2.0 -margin_right = 1014.0 -margin_bottom = 28.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="Button2" type="Button" parent="PagedContent/Controls/HBoxContainer"] -margin_right = 334.0 -margin_bottom = 26.5702 -size_flags_horizontal = 3 -size_flags_vertical = 3 -text = "< Previous page" - -[node name="Spacer" type="Control" parent="PagedContent/Controls/HBoxContainer"] -margin_left = 338.0 -margin_right = 673.0 -margin_bottom = 26.0 -size_flags_horizontal = 3 - -[node name="Button" type="Button" parent="PagedContent/Controls/HBoxContainer"] -margin_left = 677.0 -margin_right = 1012.0 -margin_bottom = 26.5702 -size_flags_horizontal = 3 -size_flags_vertical = 3 -text = "Next page >" -[connection signal="pressed" from="PagedContent/Header/Button" to="." method="hide"]