changes UI to a global singleton
This commit is contained in:
parent
aa4afc4c4b
commit
e3aec75404
16 changed files with 371 additions and 119 deletions
|
|
@ -12,12 +12,12 @@ func _on_close_button_pressed() -> void:
|
|||
pass # Replace with function body.
|
||||
|
||||
func _update_monster_list() -> void:
|
||||
for i in Inventory.monsters.size():
|
||||
var monster = Inventory.monsters[i]
|
||||
for i in SaveData.monsters.size():
|
||||
var monster = SaveData.monsters[i]
|
||||
var entry = monster_list_entry.instantiate()
|
||||
|
||||
# populate the new entry
|
||||
entry.populate(Inventory.monsters[i])
|
||||
entry.populate(SaveData.monsters[i])
|
||||
|
||||
# add it to the list
|
||||
monster_list_entry_container.add_child(entry)
|
||||
|
|
|
|||
33
scenes/ui/main_menu.gd
Normal file
33
scenes/ui/main_menu.gd
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
extends Control
|
||||
|
||||
signal on_new_game_started
|
||||
signal on_game_continued
|
||||
|
||||
# On ready, check which buttons to show
|
||||
func _ready() -> void:
|
||||
if SaveGame.savegame_exists():
|
||||
%ContinueGameButton.visible = true
|
||||
%NewGameButton.visible = false
|
||||
|
||||
func _on_new_game_button_pressed() -> void:
|
||||
# Hide the main menu
|
||||
self.visible = false
|
||||
|
||||
# emit the new game signal
|
||||
on_new_game_started.emit()
|
||||
|
||||
func _on_continue_game_button_pressed() -> void:
|
||||
# Hide the main menu
|
||||
self.visible = false
|
||||
|
||||
# emit the continue game signal
|
||||
on_game_continued.emit()
|
||||
|
||||
func _on_options_button_pressed() -> void:
|
||||
print("TODO")
|
||||
|
||||
func _on_licenses_button_pressed() -> void:
|
||||
print("TODO")
|
||||
|
||||
func _on_exit_button_pressed() -> void:
|
||||
get_tree().quit()
|
||||
|
|
@ -1,16 +1,79 @@
|
|||
[gd_scene load_steps=3 format=3 uid="uid://dt00rjsodtady"]
|
||||
[gd_scene load_steps=10 format=3 uid="uid://dt00rjsodtady"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://b6ylra30qxf30" path="res://assets/logo/logo.png" id="1_1fmce"]
|
||||
[ext_resource type="Script" path="res://scenes/ui/main_menu.gd" id="1_5gs73"]
|
||||
[ext_resource type="FontFile" uid="uid://bjaavdnopfh0q" path="res://assets/fonts/aoboshi_one/AoboshiOne-Regular.ttf" id="2_aqmkw"]
|
||||
[ext_resource type="Texture2D" uid="uid://da7o6lfuoliid" path="res://assets/textures/Backgrounds/meadow2.jpg" id="2_bb61v"]
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7grw7"]
|
||||
content_margin_left = 20.0
|
||||
content_margin_right = 20.0
|
||||
content_margin_bottom = 5.0
|
||||
bg_color = Color(0.799841, 0.529277, 0.323387, 1)
|
||||
corner_radius_top_left = 5
|
||||
corner_radius_top_right = 5
|
||||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xjg0j"]
|
||||
content_margin_left = 20.0
|
||||
content_margin_right = 20.0
|
||||
content_margin_bottom = 5.0
|
||||
bg_color = Color(0.799841, 0.529277, 0.323387, 1)
|
||||
corner_radius_top_left = 5
|
||||
corner_radius_top_right = 5
|
||||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3y6oq"]
|
||||
content_margin_left = 20.0
|
||||
content_margin_right = 20.0
|
||||
content_margin_bottom = 5.0
|
||||
bg_color = Color(0.799841, 0.529277, 0.323387, 1)
|
||||
corner_radius_top_left = 5
|
||||
corner_radius_top_right = 5
|
||||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cnake"]
|
||||
content_margin_left = 20.0
|
||||
content_margin_right = 20.0
|
||||
content_margin_bottom = 5.0
|
||||
bg_color = Color(0.799841, 0.529277, 0.323387, 1)
|
||||
corner_radius_top_left = 5
|
||||
corner_radius_top_right = 5
|
||||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_0d7mr"]
|
||||
content_margin_left = 20.0
|
||||
content_margin_right = 20.0
|
||||
content_margin_bottom = 5.0
|
||||
bg_color = Color(0.799841, 0.529277, 0.323387, 1)
|
||||
corner_radius_top_left = 5
|
||||
corner_radius_top_right = 5
|
||||
corner_radius_bottom_right = 5
|
||||
corner_radius_bottom_left = 5
|
||||
|
||||
[node name="MainMenu" type="Control"]
|
||||
visible = false
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
script = ExtResource("1_5gs73")
|
||||
|
||||
[node name="Background" type="TextureRect" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
texture = ExtResource("2_bb61v")
|
||||
expand_mode = 3
|
||||
stretch_mode = 6
|
||||
|
||||
[node name="VBoxContainer" type="VBoxContainer" parent="."]
|
||||
layout_mode = 1
|
||||
|
|
@ -22,7 +85,9 @@ grow_vertical = 2
|
|||
theme_override_constants/separation = 50
|
||||
|
||||
[node name="Logo" type="TextureRect" parent="VBoxContainer"]
|
||||
custom_minimum_size = Vector2(600, 600)
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 4
|
||||
texture = ExtResource("1_1fmce")
|
||||
expand_mode = 4
|
||||
stretch_mode = 5
|
||||
|
|
@ -46,22 +111,88 @@ FANGEN"
|
|||
horizontal_alignment = 1
|
||||
max_lines_visible = 2
|
||||
|
||||
[node name="MenuButtons" type="VBoxContainer" parent="VBoxContainer"]
|
||||
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
|
||||
layout_mode = 2
|
||||
size_flags_vertical = 3
|
||||
theme_override_constants/margin_left = 50
|
||||
theme_override_constants/margin_top = 20
|
||||
theme_override_constants/margin_right = 50
|
||||
theme_override_constants/margin_bottom = 50
|
||||
|
||||
[node name="MenuButtons" type="VBoxContainer" parent="VBoxContainer/MarginContainer"]
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 4
|
||||
size_flags_vertical = 3
|
||||
|
||||
[node name="NewGameButton" type="Button" parent="VBoxContainer/MenuButtons"]
|
||||
[node name="NewGameButton" type="Button" parent="VBoxContainer/MarginContainer/MenuButtons"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
theme_override_colors/font_color = Color(0.355673, 0.203473, 0.0399276, 1)
|
||||
theme_override_fonts/font = ExtResource("2_aqmkw")
|
||||
theme_override_font_sizes/font_size = 45
|
||||
theme_override_styles/focus = SubResource("StyleBoxFlat_7grw7")
|
||||
theme_override_styles/hover_pressed = SubResource("StyleBoxFlat_xjg0j")
|
||||
theme_override_styles/hover = SubResource("StyleBoxFlat_3y6oq")
|
||||
theme_override_styles/pressed = SubResource("StyleBoxFlat_cnake")
|
||||
theme_override_styles/normal = SubResource("StyleBoxFlat_0d7mr")
|
||||
text = "New Game"
|
||||
|
||||
[node name="ContinueGameButton" type="Button" parent="VBoxContainer/MenuButtons"]
|
||||
[node name="ContinueGameButton" type="Button" parent="VBoxContainer/MarginContainer/MenuButtons"]
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
layout_mode = 2
|
||||
theme_override_colors/font_color = Color(0.356863, 0.203922, 0.0392157, 1)
|
||||
theme_override_fonts/font = ExtResource("2_aqmkw")
|
||||
theme_override_font_sizes/font_size = 45
|
||||
theme_override_styles/focus = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/hover_pressed = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/hover = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/pressed = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/normal = SubResource("StyleBoxFlat_0d7mr")
|
||||
text = "Continue"
|
||||
|
||||
[node name="OptionsButton" type="Button" parent="VBoxContainer/MenuButtons"]
|
||||
[node name="OptionsButton" type="Button" parent="VBoxContainer/MarginContainer/MenuButtons"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
theme_override_colors/font_color = Color(0.356863, 0.203922, 0.0392157, 1)
|
||||
theme_override_fonts/font = ExtResource("2_aqmkw")
|
||||
theme_override_font_sizes/font_size = 45
|
||||
theme_override_styles/focus = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/hover_pressed = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/hover = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/pressed = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/normal = SubResource("StyleBoxFlat_0d7mr")
|
||||
text = "Options"
|
||||
|
||||
[node name="ExitButton" type="Button" parent="VBoxContainer/MenuButtons"]
|
||||
[node name="LicensesButton" type="Button" parent="VBoxContainer/MarginContainer/MenuButtons"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
theme_override_colors/font_color = Color(0.356863, 0.203922, 0.0392157, 1)
|
||||
theme_override_fonts/font = ExtResource("2_aqmkw")
|
||||
theme_override_font_sizes/font_size = 45
|
||||
theme_override_styles/focus = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/hover_pressed = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/hover = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/pressed = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/normal = SubResource("StyleBoxFlat_0d7mr")
|
||||
text = "Licenses"
|
||||
|
||||
[node name="ExitButton" type="Button" parent="VBoxContainer/MarginContainer/MenuButtons"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_vertical = 10
|
||||
theme_override_colors/font_color = Color(0.356863, 0.203922, 0.0392157, 1)
|
||||
theme_override_fonts/font = ExtResource("2_aqmkw")
|
||||
theme_override_font_sizes/font_size = 45
|
||||
theme_override_styles/focus = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/hover_pressed = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/hover = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/pressed = SubResource("StyleBoxFlat_0d7mr")
|
||||
theme_override_styles/normal = SubResource("StyleBoxFlat_0d7mr")
|
||||
text = "Exit"
|
||||
|
||||
[connection signal="pressed" from="VBoxContainer/MarginContainer/MenuButtons/NewGameButton" to="." method="_on_new_game_button_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/MarginContainer/MenuButtons/ContinueGameButton" to="." method="_on_continue_game_button_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/MarginContainer/MenuButtons/OptionsButton" to="." method="_on_options_button_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/MarginContainer/MenuButtons/LicensesButton" to="." method="_on_licenses_button_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/MarginContainer/MenuButtons/ExitButton" to="." method="_on_exit_button_pressed"]
|
||||
|
|
|
|||
|
|
@ -1,16 +1,35 @@
|
|||
extends CanvasLayer
|
||||
class_name UI
|
||||
extends Node
|
||||
|
||||
@onready var ingame_menu: MarginContainer = %IngameMenu
|
||||
# these two signals come from the MainMenu and start / continue the game
|
||||
# gets sent to the main.gd scene
|
||||
signal on_new_game_started
|
||||
signal on_game_continued
|
||||
|
||||
@onready var root: CanvasLayer = $/root/Game/UI
|
||||
@onready var main_menu: Control = $/root/Game/UI/MainMenu
|
||||
@onready var ingame_controls: MarginContainer = $/root/Game/UI/IngameControls
|
||||
@onready var ingame_menu: Control = $/root/Game/UI/IngameMenu
|
||||
@onready var camera_control_area : Control = $/root/Game/UI/CameraControlArea
|
||||
@onready var save_ui : Control = $/root/Game/UI/SaveUI
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready() -> void:
|
||||
pass # Replace with function body.
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta: float) -> void:
|
||||
main_menu.connect("on_game_continued", _on_main_menu_on_game_continued)
|
||||
main_menu.connect("on_new_game_started", _on_main_menu_on_new_game_started)
|
||||
|
||||
ingame_controls.connect("menu_button_clicked", _on_ingame_controls_menu_button_clicked)
|
||||
ingame_controls.connect("save_button_clicked", _on_ingame_controls_save_button_clicked)
|
||||
ingame_controls.connect("save_button_released", _on_ingame_controls_save_button_released)
|
||||
ingame_controls.connect("save_timer_incremented", _on_ingame_controls_save_timer_incremented)
|
||||
ingame_controls.connect("save_timer_reached", _on_ingame_controls_save_timer_reached)
|
||||
|
||||
pass
|
||||
|
||||
func show_main_menu(p_visible = true) -> void:
|
||||
main_menu.visible = p_visible
|
||||
|
||||
func show_ingame_controls(p_visible = true) -> void:
|
||||
ingame_controls.visible = p_visible
|
||||
|
||||
func _on_ingame_controls_menu_button_clicked() -> void:
|
||||
ingame_menu.visible = true
|
||||
|
||||
|
|
@ -26,19 +45,28 @@ func _update_ui() -> void:
|
|||
|
||||
|
||||
func _on_ingame_controls_save_button_clicked() -> void:
|
||||
%SaveUI.visible = true
|
||||
save_ui.visible = true
|
||||
|
||||
func _on_ingame_controls_save_button_released() -> void:
|
||||
%SaveUI.visible = false
|
||||
save_ui.visible = false
|
||||
|
||||
func _on_ingame_controls_save_timer_incremented(value) -> void:
|
||||
%SavePercentage.text = str(value)
|
||||
save_ui.get_node("SavePercentage").text = str(value)
|
||||
|
||||
|
||||
func _on_ingame_controls_save_timer_reached() -> void:
|
||||
%SavePercentage.text = "Saved!"
|
||||
%IngameControls.disable_save_button()
|
||||
save_ui.get_node("SavePercentage").text = "Saved!"
|
||||
ingame_controls.disable_save_button()
|
||||
await get_tree().create_timer(1.0).timeout
|
||||
%IngameControls.enable_save_button()
|
||||
$SaveUI.visible = false
|
||||
%SavePercentage.text = "0%"
|
||||
ingame_controls.enable_save_button()
|
||||
save_ui.visible = false
|
||||
save_ui.get_node("SavePercentage").text = "0%"
|
||||
|
||||
|
||||
# sends the signal from the MainMenu node up to the main.gd scene
|
||||
func _on_main_menu_on_new_game_started() -> void:
|
||||
on_new_game_started.emit()
|
||||
|
||||
# sends the signal from the MainMenu node up to the main.gd scene
|
||||
func _on_main_menu_on_game_continued() -> void:
|
||||
on_game_continued.emit()
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
[gd_scene load_steps=6 format=3 uid="uid://b5y7pdfe6ougf"]
|
||||
[gd_scene load_steps=5 format=3 uid="uid://b5y7pdfe6ougf"]
|
||||
|
||||
[ext_resource type="Script" path="res://scenes/ui/ui.gd" id="1_vyi3s"]
|
||||
[ext_resource type="Script" path="res://scripts/camera_controls.gd" id="1_x56x6"]
|
||||
[ext_resource type="PackedScene" uid="uid://dt00rjsodtady" path="res://scenes/ui/main_menu.tscn" id="3_tcmm8"]
|
||||
[ext_resource type="PackedScene" uid="uid://1anjhvi173g3" path="res://scenes/ui/ingame_controls.tscn" id="4_likk0"]
|
||||
[ext_resource type="PackedScene" uid="uid://bbvbnrcjatkrb" path="res://scenes/ui/ingame_menu.tscn" id="5_qjqu1"]
|
||||
|
||||
[node name="UI" type="CanvasLayer"]
|
||||
script = ExtResource("1_vyi3s")
|
||||
|
||||
[node name="CameraControlArea" type="Control" parent="."]
|
||||
layout_mode = 3
|
||||
|
|
@ -52,17 +50,12 @@ horizontal_alignment = 1
|
|||
vertical_alignment = 1
|
||||
|
||||
[node name="MainMenu" parent="." instance=ExtResource("3_tcmm8")]
|
||||
unique_name_in_owner = true
|
||||
|
||||
[node name="IngameControls" parent="." instance=ExtResource("4_likk0")]
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
|
||||
[node name="IngameMenu" parent="." instance=ExtResource("5_qjqu1")]
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
|
||||
[connection signal="gui_input" from="CameraControlArea" to="CameraControlArea" method="_on_gui_input"]
|
||||
[connection signal="menu_button_clicked" from="IngameControls" to="." method="_on_ingame_controls_menu_button_clicked"]
|
||||
[connection signal="save_button_clicked" from="IngameControls" to="." method="_on_ingame_controls_save_button_clicked"]
|
||||
[connection signal="save_button_released" from="IngameControls" to="." method="_on_ingame_controls_save_button_released"]
|
||||
[connection signal="save_timer_incremented" from="IngameControls" to="." method="_on_ingame_controls_save_timer_incremented"]
|
||||
[connection signal="save_timer_reached" from="IngameControls" to="." method="_on_ingame_controls_save_timer_reached"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue