Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-12-21 13:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a simple stub Character Window (with 2 culomns), and the talent window now also has 2 culomns, one will be physical (character level) talents, and one will be astral (class).

Browse Source
This commit is contained in:
Relintai 2020-05-26 17:41:05 +02:00
parent 23dac4b5bc
commit 510272bc3b
6 changed files with 198 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
game/ui/player_ui/player_ui.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=29 format=2]
[gd_scene load_steps=30 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]
@ -28,6 +28,7 @@
[ext_resource path="res://ui/theme/unlocked_icon.tres" type="Texture" id=26]
[ext_resource path="res://ui/windows/TrainerWindow.tscn" type="PackedScene" id=27]
[ext_resource path="res://ui/player_ui/player_ui.gd" type="Script" id=28]
[ext_resource path="res://ui/windows/CharacterWindow.tscn" type="PackedScene" id=29]
[node name="GUILayer" type="CanvasLayer"]
script = ExtResource( 28 )
@ -40,7 +41,6 @@ mouse_filter = 2
theme = ExtResource( 10 )
script = ExtResource( 1 )
__meta__ = {
"_edit_group_": true,
"_edit_lock_": true
}
child_controls = [ NodePath("Unitframes"), NodePath("Actionbars"), NodePath("Windows/SpellBookWindow"), NodePath("Buttons"), NodePath("Castbar"), NodePath("AuraFrame"), NodePath("Windows/Inventory"), NodePath("Windows/LootWindow"), NodePath("Windows/TalentWindow"), NodePath("Windows/CraftingWindow") ]
@ -200,10 +200,22 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="SpellBookButton" type="Button" parent="GUI/Buttons/HBoxContainer"]
[node name="CharacterButton" type="Button" parent="GUI/Buttons/HBoxContainer"]
margin_right = 45.0
margin_bottom = 45.0
rect_min_size = Vector2( 45, 45 )
hint_tooltip = "Inventory"
focus_mode = 0
toggle_mode = true
enabled_focus_mode = 0
keep_pressed_outside = true
text = "Char"
[node name="SpellBookButton" type="Button" parent="GUI/Buttons/HBoxContainer"]
margin_left = 45.0
margin_right = 90.0
margin_bottom = 45.0
rect_min_size = Vector2( 45, 45 )
hint_tooltip = "SpellBook"
focus_mode = 0
toggle_mode = true
@ -227,8 +239,8 @@ __meta__ = {
}
[node name="BagButton" type="Button" parent="GUI/Buttons/HBoxContainer"]
margin_left = 45.0
margin_right = 90.0
margin_left = 90.0
margin_right = 135.0
margin_bottom = 45.0
rect_min_size = Vector2( 45, 45 )
hint_tooltip = "Inventory"
@ -254,8 +266,8 @@ __meta__ = {
}
[node name="TalentButton" type="Button" parent="GUI/Buttons/HBoxContainer"]
margin_left = 90.0
margin_right = 135.0
margin_left = 135.0
margin_right = 181.626
margin_bottom = 45.0
rect_min_size = Vector2( 45, 45 )
hint_tooltip = "Inventory"
@ -263,11 +275,11 @@ focus_mode = 0
toggle_mode = true
enabled_focus_mode = 0
keep_pressed_outside = true
text = "T"
text = "Talent"
[node name="CraftingButton" type="Button" parent="GUI/Buttons/HBoxContainer"]
margin_left = 135.0
margin_right = 180.0
margin_left = 181.0
margin_right = 226.0
margin_bottom = 45.0
rect_min_size = Vector2( 45, 45 )
hint_tooltip = "Inventory"
@ -275,7 +287,19 @@ focus_mode = 0
toggle_mode = true
enabled_focus_mode = 0
keep_pressed_outside = true
text = "Cr"
text = "Craft"
[node name="Trainer" type="Button" parent="GUI/Buttons/HBoxContainer"]
margin_left = 226.0
margin_right = 271.0
margin_bottom = 45.0
rect_min_size = Vector2( 45, 45 )
hint_tooltip = "Inventory"
focus_mode = 0
toggle_mode = true
enabled_focus_mode = 0
keep_pressed_outside = true
text = "Train"
[node name="MapButton" type="Button" parent="GUI/Buttons/HBoxContainer"]
visible = false
@ -291,8 +315,8 @@ keep_pressed_outside = true
text = "Map"
[node name="LockButton" type="Button" parent="GUI/Buttons/HBoxContainer"]
margin_left = 180.0
margin_right = 225.0
margin_left = 271.0
margin_right = 316.0
margin_bottom = 45.0
rect_min_size = Vector2( 45, 45 )
focus_mode = 0
@ -334,14 +358,14 @@ __meta__ = {
}
[node name="Menu" type="Button" parent="GUI/Buttons/HBoxContainer"]
margin_left = 225.0
margin_right = 270.0
margin_left = 316.0
margin_right = 361.0
margin_bottom = 45.0
rect_min_size = Vector2( 45, 45 )
focus_mode = 0
enabled_focus_mode = 0
keep_pressed_outside = true
text = "M"
text = "Menu"
[node name="Actionbars" type="HBoxContainer" parent="GUI"]
anchor_right = 1.0
@ -360,6 +384,15 @@ actionbar_scene = ExtResource( 14 )
[node name="Windows" type="CanvasLayer" parent="GUI"]
layer = 2
[node name="CharacterWindow" parent="GUI/Windows" instance=ExtResource( 29 )]
visible = false
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 66.0
margin_top = 44.0
margin_right = 681.0
margin_bottom = 474.0
[node name="SpellBookWindow" parent="GUI/Windows" instance=ExtResource( 17 )]
visible = false
margin_left = 60.0
@ -370,10 +403,10 @@ margin_right = 561.0
visible = false
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 61.685
margin_top = 54.195
margin_right = 430.685
margin_bottom = 513.195
margin_left = 62.0
margin_top = 54.0
margin_right = 656.0
margin_bottom = 513.0
[node name="CraftingWindow" parent="GUI/Windows" instance=ExtResource( 20 )]
visible = false
@ -458,8 +491,10 @@ mouse_filter = 2
[node name="IngameMenu" parent="GUI" instance=ExtResource( 2 )]
visible = false
[connection signal="toggled" from="GUI/Buttons/HBoxContainer/CharacterButton" to="GUI/Windows/CharacterWindow" method="_on_CharacterButton_toggled"]
[connection signal="toggled" from="GUI/Buttons/HBoxContainer/SpellBookButton" to="GUI/Windows/SpellBookWindow" method="_on_SpellBookButton_toggled"]
[connection signal="toggled" from="GUI/Buttons/HBoxContainer/BagButton" to="GUI/Windows/Inventory" method="_on_BagButton_toggled"]
[connection signal="toggled" from="GUI/Buttons/HBoxContainer/TalentButton" to="GUI/Windows/TalentWindow" method="_on_TalentButton_toggled"]
[connection signal="toggled" from="GUI/Buttons/HBoxContainer/CraftingButton" to="GUI/Windows/CraftingWindow" method="_on_CraftingButton_toggled"]
[connection signal="toggled" from="GUI/Buttons/HBoxContainer/Trainer" to="GUI/Windows/TrainerWindow" method="_on_Trainer_toggled"]
[connection signal="pressed" from="GUI/Buttons/HBoxContainer/Menu" to="GUI/IngameMenu" method="show"]

16
game/ui/theme/ui_theme.tres
View File

File diff suppressed because one or more lines are too long

27
game/ui/windows/CharacterWindow.gd Normal file
View File

@ -0,0 +1,27 @@
extends PanelContainer
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
func _on_CharacterButton_toggled(button_pressed):
if button_pressed:
show()
else:
hide()
func _on_Button_pressed():
hide()

54
game/ui/windows/CharacterWindow.tscn
View File

@ -1,11 +1,13 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=3 format=2]
[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
[ext_resource path="res://ui/windows/CharacterWindow.gd" type="Script" id=2]
[node name="CharacterWindow" type="PanelContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
theme = ExtResource( 1 )
script = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
@ -18,21 +20,55 @@ margin_bottom = 596.0
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_right = 1016.0
margin_bottom = 40.0
margin_bottom = 30.0
rect_min_size = Vector2( 0, 30 )
[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer"]
margin_top = 12.0
margin_right = 968.0
margin_bottom = 27.0
margin_top = 7.0
margin_right = 982.0
margin_bottom = 22.0
size_flags_horizontal = 3
text = "Equipment"
text = "Character"
[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer"]
margin_left = 976.0
margin_left = 986.0
margin_right = 1016.0
margin_bottom = 40.0
rect_min_size = Vector2( 40, 40 )
margin_bottom = 30.0
rect_min_size = Vector2( 30, 30 )
text = "X"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 38.0
margin_right = 1016.0
margin_bottom = 592.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/HBoxContainer2"]
margin_right = 506.0
margin_bottom = 554.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer"]
margin_left = 4.0
margin_top = 4.0
margin_right = 502.0
margin_bottom = 550.0
[node name="PanelContainer2" type="PanelContainer" parent="VBoxContainer/HBoxContainer2"]
margin_left = 510.0
margin_right = 1016.0
margin_bottom = 554.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2"]
margin_left = 4.0
margin_top = 4.0
margin_right = 502.0
margin_bottom = 550.0
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Button" to="." method="_on_Button_pressed"]

77
game/ui/windows/TalentWindow.tscn
View File

@ -15,7 +15,7 @@ __meta__ = {
}
spec_scene = ExtResource( 2 )
spec_switcher_scene = ExtResource( 4 )
spec_container_path = NodePath("VBoxContainer/TabContainer")
spec_container_path = NodePath("VBoxContainer/HBoxContainer/PanelContainer2/VBoxContainer/TabContainer2")
spec_switcher_path = NodePath("VBoxContainer/Header/SpecSwitcher")
[node name="VBoxContainer" type="VBoxContainer" parent="."]
@ -37,8 +37,8 @@ margin_bottom = 22.0
text = "Talents"
[node name="SpecSwitcher" type="HBoxContainer" parent="VBoxContainer/Header"]
margin_left = 50.0
margin_right = 968.0
margin_left = 46.0
margin_right = 972.0
margin_bottom = 30.0
size_flags_horizontal = 3
alignment = 1
@ -50,27 +50,62 @@ margin_bottom = 30.0
rect_min_size = Vector2( 40, 30 )
text = "X"
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
visible = false
margin_top = 48.0
margin_right = 1016.0
margin_bottom = 576.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer/MarginContainer"]
margin_right = 1016.0
margin_bottom = 528.0
scroll_horizontal_enabled = false
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/MarginContainer/ScrollContainer"]
margin_right = 1016.0
size_flags_horizontal = 3
[node name="TabContainer" type="TabContainer" parent="VBoxContainer"]
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 38.0
margin_right = 1016.0
margin_bottom = 592.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/HBoxContainer"]
margin_right = 506.0
margin_bottom = 554.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer/PanelContainer"]
margin_left = 4.0
margin_top = 4.0
margin_right = 502.0
margin_bottom = 550.0
[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer"]
margin_right = 498.0
margin_bottom = 15.0
text = "Body"
[node name="TabContainer" type="TabContainer" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer"]
margin_top = 23.0
margin_right = 498.0
margin_bottom = 546.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="PanelContainer2" type="PanelContainer" parent="VBoxContainer/HBoxContainer"]
margin_left = 510.0
margin_right = 1016.0
margin_bottom = 554.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer/PanelContainer2"]
margin_left = 4.0
margin_top = 4.0
margin_right = 502.0
margin_bottom = 550.0
[node name="Label2" type="Label" parent="VBoxContainer/HBoxContainer/PanelContainer2/VBoxContainer"]
margin_right = 498.0
margin_bottom = 15.0
text = "Astral Body"
[node name="TabContainer2" type="TabContainer" parent="VBoxContainer/HBoxContainer/PanelContainer2/VBoxContainer"]
margin_top = 23.0
margin_right = 498.0
margin_bottom = 546.0
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}
[connection signal="pressed" from="VBoxContainer/Header/Button" to="." method="hide"]

7
game/ui/windows/TrainerWindow.gd
View File

@ -14,3 +14,10 @@ func _ready():
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
func _on_Trainer_toggled(button_pressed):
if button_pressed:
show()
else:
hide()