ruslan/ScrapFrontier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Button sprites updated

Browse Source
This commit is contained in:
Ruslan Ignatov
2025-12-25 00:01:08 +03:00
parent 5384fa3caa
commit 0ed500097d
19 changed files with 467 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/menu/common/credits.tscn
+28 -10
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://c3q3g2647qc27"]
[ext_resource type="Script" uid="uid://dclkpithyykju" path="res://game/menu/common/credits.gd" id="1_wp78b"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_nidem"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_nidem"]
[sub_resource type="InputEventAction" id="InputEventAction_wp78b"]
action = &"ui_cancel"
@@ -11,16 +11,30 @@ events = [SubResource("InputEventAction_wp78b")]
[node name="Credits" type="Control"]
layout_mode = 3
anchors_preset = 0
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_right = 304.0
offset_bottom = 444.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_wp78b")
[node name="BackButton" type="Button" parent="."]
z_index = 100
layout_mode = 1
offset_left = 531.0
offset_top = 299.0
offset_right = 615.0
offset_bottom = 335.0
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -42.0
offset_top = -44.0
offset_right = 42.0
grow_horizontal = 2
grow_vertical = 0
mouse_filter = 2
theme = ExtResource("2_nidem")
shortcut = SubResource("Shortcut_nidem")
@@ -28,13 +42,17 @@ text = "Back"
[node name="Text" type="Label" parent="."]
layout_mode = 1
anchors_preset = 5
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
offset_top = 360.0
offset_right = 640.0
offset_bottom = 760.0
anchor_bottom = 0.5
offset_left = -152.0
offset_top = -222.0
offset_right = 152.0
offset_bottom = 174.0
grow_horizontal = 2
grow_vertical = 2
theme = ExtResource("2_nidem")
text = "PROGRAMMING
game/menu/common/options.gd
-8
View File
@@ -4,13 +4,11 @@ extends Control
const WINDOW_FACTOR = "window_factor"
signal show_credits
signal back
@onready var fullscreen_button : CheckButton = $%FullscreenCheckButton
@onready var window_factor_buttons : HBoxContainer = $%WindowFactorContainer
@onready var credits_button : Button = $%CreditsButton
@onready var back_button : Button = $%BackButton
@onready var master_slider : Slider = $%MasterSlider
@onready var ui_slider : Slider = $%UISlider
@@ -47,8 +45,6 @@ func _init_focus() -> void:
func _setup_neighbors() -> void:
music_slider.focus_neighbor_bottom = back_button.get_path()
back_button.focus_neighbor_right = credits_button.get_path()
credits_button.focus_neighbor_left = back_button.get_path()
func _load_current_settings() -> void:
@@ -79,10 +75,6 @@ func _on_fullscreen_check_button_toggled(toggled: bool) -> void:
_update_window_factor_disabled()
func _on_credits_button_pressed() -> void:
show_credits.emit()
func _on_back_button_pressed() -> void:
back.emit()
game/menu/common/options.tscn
+35 -57
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=6 format=3 uid="uid://btr60idiit4y7"]
[ext_resource type="Script" uid="uid://ceng1u112aqg0" path="res://game/menu/common/options.gd" id="1_61pji"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_1tdpy"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_1tdpy"]
[sub_resource type="ButtonGroup" id="ButtonGroup_6ueaa"]
@@ -11,45 +11,36 @@ action = &"ui_cancel"
[sub_resource type="Shortcut" id="Shortcut_1tdpy"]
events = [SubResource("InputEventAction_61pji")]
[node name="Options" type="Control"]
layout_mode = 3
[node name="Options" type="VBoxContainer"]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_right = -556.0
offset_bottom = -312.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource("1_61pji")
[node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme_override_constants/margin_bottom = 10
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
[node name="ScrollContainer" type="ScrollContainer" parent="."]
layout_mode = 2
size_flags_vertical = 3
follow_focus = true
[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/ScrollContainer"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_constants/margin_top = 10
[node name="OptionsGridContainer" type="GridContainer" parent="MarginContainer/ScrollContainer/MarginContainer"]
[node name="OptionsGridContainer" type="GridContainer" parent="ScrollContainer"]
layout_mode = 2
size_flags_horizontal = 6
size_flags_vertical = 6
columns = 2
[node name="FullscreenLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="FullscreenLabel" type="Label" parent="ScrollContainer/OptionsGridContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
theme = ExtResource("2_1tdpy")
[node name="FullscreenCheckButton" type="CheckButton" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="FullscreenCheckButton" type="CheckButton" parent="ScrollContainer/OptionsGridContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
@@ -57,18 +48,18 @@ mouse_filter = 2
theme = ExtResource("2_1tdpy")
text = "Fullscreen"
[node name="WindowFactorLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="WindowFactorLabel" type="Label" parent="ScrollContainer/OptionsGridContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
theme = ExtResource("2_1tdpy")
text = "Window Factor"
[node name="WindowFactorContainer" type="HBoxContainer" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="WindowFactorContainer" type="HBoxContainer" parent="ScrollContainer/OptionsGridContainer"]
unique_name_in_owner = true
layout_mode = 2
[node name="ButtonX1" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
[node name="ButtonX1" type="Button" parent="ScrollContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_1tdpy")
@@ -77,7 +68,7 @@ button_group = SubResource("ButtonGroup_6ueaa")
text = "*1"
metadata/window_factor = 1
[node name="ButtonX2" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
[node name="ButtonX2" type="Button" parent="ScrollContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_1tdpy")
@@ -86,7 +77,7 @@ button_group = SubResource("ButtonGroup_6ueaa")
text = "*2"
metadata/window_factor = 2
[node name="ButtonX3" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
[node name="ButtonX3" type="Button" parent="ScrollContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_1tdpy")
@@ -95,7 +86,7 @@ button_group = SubResource("ButtonGroup_6ueaa")
text = "*3"
metadata/window_factor = 3
[node name="ButtonX4" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
[node name="ButtonX4" type="Button" parent="ScrollContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_1tdpy")
@@ -104,7 +95,7 @@ button_group = SubResource("ButtonGroup_6ueaa")
text = "*4"
metadata/window_factor = 4
[node name="ButtonX5" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
[node name="ButtonX5" type="Button" parent="ScrollContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_1tdpy")
@@ -113,12 +104,12 @@ button_group = SubResource("ButtonGroup_6ueaa")
text = "*5"
metadata/window_factor = 5
[node name="MasterLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="MasterLabel" type="Label" parent="ScrollContainer/OptionsGridContainer"]
layout_mode = 2
theme = ExtResource("2_1tdpy")
text = "Menu Volume"
[node name="MasterSlider" type="HSlider" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="MasterSlider" type="HSlider" parent="ScrollContainer/OptionsGridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
@@ -129,12 +120,12 @@ value = 100.0
rounded = true
scrollable = false
[node name="UILabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="UILabel" type="Label" parent="ScrollContainer/OptionsGridContainer"]
layout_mode = 2
theme = ExtResource("2_1tdpy")
text = "UI Volume"
[node name="UISlider" type="HSlider" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="UISlider" type="HSlider" parent="ScrollContainer/OptionsGridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
@@ -145,12 +136,12 @@ value = 100.0
rounded = true
scrollable = false
[node name="SFXLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="SFXLabel" type="Label" parent="ScrollContainer/OptionsGridContainer"]
layout_mode = 2
theme = ExtResource("2_1tdpy")
text = "SFX Volume"
[node name="SFXSlider" type="HSlider" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="SFXSlider" type="HSlider" parent="ScrollContainer/OptionsGridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
@@ -161,12 +152,12 @@ value = 100.0
rounded = true
scrollable = false
[node name="MusicLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="MusicLabel" type="Label" parent="ScrollContainer/OptionsGridContainer"]
layout_mode = 2
theme = ExtResource("2_1tdpy")
text = "Music Volume"
[node name="MusicSlider" type="HSlider" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
[node name="MusicSlider" type="HSlider" parent="ScrollContainer/OptionsGridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
@@ -177,21 +168,13 @@ value = 100.0
rounded = true
scrollable = false
[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"]
[node name="HBoxContainer" type="HBoxContainer" parent="."]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 8
alignment = 2
[node name="CreditsButton" type="Button" parent="MarginContainer/HBoxContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_1tdpy")
text = "Credits"
[node name="BackButton" type="Button" parent="MarginContainer/HBoxContainer"]
[node name="BackButton" type="Button" parent="HBoxContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
@@ -200,15 +183,10 @@ theme = ExtResource("2_1tdpy")
shortcut = SubResource("Shortcut_1tdpy")
text = "Back"
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
layout_mode = 2
alignment = 1
[connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"]
[connection signal="toggled" from="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/FullscreenCheckButton" to="." method="_on_fullscreen_check_button_toggled"]
[connection signal="value_changed" from="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/MasterSlider" to="." method="_on_master_volume_changed"]
[connection signal="value_changed" from="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/UISlider" to="." method="_on_ui_volume_changed"]
[connection signal="value_changed" from="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/SFXSlider" to="." method="_on_sfx_volume_changed"]
[connection signal="value_changed" from="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/MusicSlider" to="." method="_on_music_volume_changed"]
[connection signal="pressed" from="MarginContainer/HBoxContainer/CreditsButton" to="." method="_on_credits_button_pressed"]
[connection signal="pressed" from="MarginContainer/HBoxContainer/BackButton" to="." method="_on_back_button_pressed"]
[connection signal="toggled" from="ScrollContainer/OptionsGridContainer/FullscreenCheckButton" to="." method="_on_fullscreen_check_button_toggled"]
[connection signal="value_changed" from="ScrollContainer/OptionsGridContainer/MasterSlider" to="." method="_on_master_volume_changed"]
[connection signal="value_changed" from="ScrollContainer/OptionsGridContainer/UISlider" to="." method="_on_ui_volume_changed"]
[connection signal="value_changed" from="ScrollContainer/OptionsGridContainer/SFXSlider" to="." method="_on_sfx_volume_changed"]
[connection signal="value_changed" from="ScrollContainer/OptionsGridContainer/MusicSlider" to="." method="_on_music_volume_changed"]
[connection signal="pressed" from="HBoxContainer/BackButton" to="." method="_on_back_button_pressed"]
game/menu/ingame/game_over_screen.tscn
+1 -1
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://duxm8n62j2qt6"]
[ext_resource type="Script" uid="uid://bkj8s7588e1ho" path="res://game/menu/ingame/game_over_screen.gd" id="1_rkkr6"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_uh3ar"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_uh3ar"]
[node name="GameOverScreen" type="Control"]
layout_mode = 3
game/menu/ingame/pause_menu.tscn
+1 -1
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://bclo2wl8ibrcg"]
[ext_resource type="Script" uid="uid://npqs2m5g5bd6" path="res://game/menu/ingame/pause_menu.gd" id="1_inj1j"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_vy7sn"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_vy7sn"]
[sub_resource type="Shortcut" id="Shortcut_lgp46"]
game/menu/ingame/pause_screen.gd
+1 -10
View File
@@ -7,7 +7,6 @@ signal show_main_menu
@onready var pause_menu : Control = $PauseMenu
@onready var options : Control = $Options
@onready var credits : Control = $Credits
func _ready() -> void:
@@ -20,7 +19,7 @@ func _input(event: InputEvent) -> void:
func _show_menu(menu: Control) -> void:
var menus : Array[Control] = [ pause_menu, options, credits ]
var menus : Array[Control] = [ pause_menu, options ]
for m in menus:
m.hide()
@@ -44,13 +43,5 @@ func _on_options_back() -> void:
_show_menu(pause_menu)
func _on_options_show_credits() -> void:
_show_menu(credits)
func _on_credits_back() -> void:
_show_menu(options)
func _on_visibility_changed() -> void:
get_tree().paused = visible
game/menu/ingame/pause_screen.tscn
+3 -7
View File
@@ -1,9 +1,8 @@
[gd_scene load_steps=5 format=3 uid="uid://d34nh3lc1gpb"]
[gd_scene load_steps=4 format=3 uid="uid://d34nh3lc1gpb"]
[ext_resource type="Script" uid="uid://c5d2t2o53wkmt" path="res://game/menu/ingame/pause_screen.gd" id="1_fe1q8"]
[ext_resource type="PackedScene" uid="uid://bclo2wl8ibrcg" path="res://game/menu/ingame/pause_menu.tscn" id="2_4r6ly"]
[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://game/menu/common/options.tscn" id="3_3gwb3"]
[ext_resource type="PackedScene" uid="uid://c3q3g2647qc27" path="res://game/menu/common/credits.tscn" id="4_jph5s"]
[node name="PauseScreen" type="Control"]
layout_mode = 3
@@ -19,16 +18,13 @@ layout_mode = 0
anchors_preset = 0
anchor_right = 0.0
anchor_bottom = 0.0
offset_right = 0.0
offset_bottom = 0.0
grow_horizontal = 1
grow_vertical = 1
[node name="Credits" parent="." instance=ExtResource("4_jph5s")]
layout_mode = 0
[connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"]
[connection signal="continue_game" from="PauseMenu" to="." method="_on_pause_menu_continue_game"]
[connection signal="show_main_menu" from="PauseMenu" to="." method="_on_pause_menu_show_main_menu"]
[connection signal="show_options" from="PauseMenu" to="." method="_on_pause_menu_show_options"]
[connection signal="back" from="Options" to="." method="_on_options_back"]
[connection signal="show_credits" from="Options" to="." method="_on_options_show_credits"]
[connection signal="back" from="Credits" to="." method="_on_credits_back"]
game/menu/ingame/victory_screen.tscn
+1 -1
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://bdcs2ff85qjs4"]
[ext_resource type="Script" uid="uid://b0p1ewlw18ijg" path="res://game/menu/ingame/victory_screen.gd" id="1_asigk"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_wb4d8"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_wb4d8"]
[node name="VictoryScreen" type="Control"]
layout_mode = 3
game/menu/ingame/weapon_selection_screen.tscn
+1 -1
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://cv122gw47cnun"]
[ext_resource type="Script" uid="uid://6isk1tmc2ik1" path="res://game/menu/ingame/weapon_selection_screen.gd" id="1_hl2ql"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_mi7cn"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_mi7cn"]
[node name="WeaponSelectionScreen" type="Control"]
layout_mode = 3
game/menu/ingame/weapon_selector.tscn
+1 -1
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://1o3idp54lil2"]
[ext_resource type="Script" uid="uid://beiydi6w6gqqc" path="res://game/menu/ingame/weapon_selector.gd" id="1_4acia"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_g83h6"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_g83h6"]
[node name="WeaponSelector" type="MarginContainer"]
anchors_preset = 15
game/menu/main/main_menu.gd
+6 -1
View File
@@ -3,8 +3,9 @@ extends Control
signal continue_game
signal new_game
signal quit_game
signal show_options
signal show_credits
signal quit_game
@onready var continue_button := $%ContinueButton
@@ -61,5 +62,9 @@ func _on_options_button_pressed() -> void:
show_options.emit()
func _on_credits_button_pressed() -> void:
show_credits.emit()
func _on_quit_button_pressed() -> void:
quit_game.emit()
game/menu/main/main_menu.tscn
+26 -11
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://bxlccevt52y70"]
[ext_resource type="Script" uid="uid://dixdfabe2vfsj" path="res://game/menu/main/main_menu.gd" id="1_chmv6"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_f5okj"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_f5okj"]
[node name="MainMenu" type="Control"]
layout_mode = 3
@@ -9,12 +9,18 @@ anchors_preset = 0
script = ExtResource("1_chmv6")
[node name="VBoxContainer" type="VBoxContainer" parent="."]
top_level = true
layout_mode = 0
offset_left = 100.0
offset_top = 100.0
offset_right = 179.0
offset_bottom = 236.0
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -74.0
offset_top = -94.0
offset_right = 74.0
offset_bottom = 94.0
grow_horizontal = 2
grow_vertical = 2
[node name="ContinueButton" type="Button" parent="VBoxContainer"]
unique_name_in_owner = true
@@ -23,7 +29,7 @@ mouse_filter = 2
theme = ExtResource("2_f5okj")
disabled = true
button_mask = 0
text = "CONTINUE"
text = "Continue"
[node name="StartButton" type="Button" parent="VBoxContainer"]
unique_name_in_owner = true
@@ -31,24 +37,33 @@ layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_f5okj")
button_mask = 0
text = "START"
text = "New Game"
[node name="OptionsButton" type="Button" parent="VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_f5okj")
text = "OPTIONS"
text = "Options"
[node name="CreditsButton" type="Button" parent="VBoxContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_f5okj")
text = "Credits"
[node name="QuitButton" type="Button" parent="VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
mouse_filter = 2
theme = ExtResource("2_f5okj")
text = "QUIT"
text = "Quit"
[connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"]
[connection signal="pressed" from="VBoxContainer/ContinueButton" to="." method="_on_continue_button_pressed"]
[connection signal="pressed" from="VBoxContainer/StartButton" to="." method="_on_start_button_pressed"]
[connection signal="pressed" from="VBoxContainer/OptionsButton" to="." method="_on_options_button_pressed"]
[connection signal="pressed" from="VBoxContainer/CreditsButton" to="." method="_on_credits_button_pressed"]
[connection signal="pressed" from="VBoxContainer/QuitButton" to="." method="_on_quit_button_pressed"]
game/menu/main/seed_selection_menu.gd
+11 -14
View File
@@ -10,11 +10,10 @@ const DEFAULT_SEED_LENGTH := 16
var _seed_regex := RegEx.new()
var _random_seed := ""
@onready var seed_label : Label = $%SeedLabel
@onready var seed_edit : LineEdit = $%SeedEdit
@onready var random_edit : LineEdit = $%RandomEdit
@onready var custom_edit : LineEdit = $%CustomEdit
@onready var use_random_button : Button = $%UseRandomButton
@onready var use_custom_button : Button = $%UseCustomButton
@@ -26,7 +25,7 @@ func _init() -> void:
func _update_use_custom_button() -> void:
var disabled := seed_edit.text.is_empty()
var disabled := custom_edit.text.is_empty()
use_custom_button.disabled = disabled
use_custom_button.focus_mode = FOCUS_NONE if disabled else FOCUS_ALL
@@ -59,10 +58,10 @@ func _on_seed_edit_text_changed(new_text: String) -> void:
for text in result:
filtered_text += text.get_string()
if seed_edit.text != filtered_text:
var caret_position := seed_edit.caret_column
seed_edit.text = filtered_text
seed_edit.caret_column = min(caret_position, filtered_text.length())
if custom_edit.text != filtered_text:
var caret_position := custom_edit.caret_column
custom_edit.text = filtered_text
custom_edit.caret_column = min(caret_position, filtered_text.length())
_update_use_custom_button()
@@ -80,17 +79,15 @@ func _on_visibility_changed() -> void:
if not is_node_ready(): return
if not visible: return
_random_seed = _get_random_seed()
seed_edit.text = ""
seed_label.text = _random_seed
custom_edit.text = ""
random_edit.text = _get_random_seed()
_init_focus()
func _on_use_random_button_pressed() -> void:
_start_game(_random_seed)
_start_game(random_edit.text)
func _on_use_custom_button_pressed() -> void:
_start_game(seed_edit.text)
_start_game(custom_edit.text)
game/menu/main/seed_selection_menu.tscn
+11 -6
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://c36n317rhv8k7"]
[ext_resource type="Script" uid="uid://dyynshvsgnepp" path="res://game/menu/main/seed_selection_menu.gd" id="1_g2smo"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_s4s14"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_s4s14"]
[sub_resource type="InputEventAction" id="InputEventAction_g2smo"]
action = &"ui_cancel"
@@ -33,12 +33,17 @@ grow_horizontal = 2
grow_vertical = 2
columns = 2
[node name="SeedLabel" type="Label" parent="GridContainer"]
[node name="RandomEdit" type="LineEdit" parent="GridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(280, 0)
layout_mode = 2
focus_mode = 0
mouse_filter = 2
theme = ExtResource("2_s4s14")
horizontal_alignment = 1
placeholder_text = "Enter seed"
alignment = 1
max_length = 16
editable = false
[node name="UseRandomButton" type="Button" parent="GridContainer"]
unique_name_in_owner = true
@@ -47,7 +52,7 @@ mouse_filter = 2
theme = ExtResource("2_s4s14")
text = "Use random seed"
[node name="SeedEdit" type="LineEdit" parent="GridContainer"]
[node name="CustomEdit" type="LineEdit" parent="GridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(280, 0)
layout_mode = 2
@@ -76,7 +81,7 @@ text = "Main menu"
[connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"]
[connection signal="pressed" from="GridContainer/UseRandomButton" to="." method="_on_use_random_button_pressed"]
[connection signal="text_changed" from="GridContainer/SeedEdit" to="." method="_on_seed_edit_text_changed"]
[connection signal="text_submitted" from="GridContainer/SeedEdit" to="." method="_on_seed_edit_text_submitted"]
[connection signal="text_changed" from="GridContainer/CustomEdit" to="." method="_on_seed_edit_text_changed"]
[connection signal="text_submitted" from="GridContainer/CustomEdit" to="." method="_on_seed_edit_text_submitted"]
[connection signal="pressed" from="GridContainer/UseCustomButton" to="." method="_on_use_custom_button_pressed"]
[connection signal="pressed" from="GridContainer/BackButton" to="." method="_on_back_button_pressed"]
game/menu/main/title_screen.gd
+6 -6
View File
@@ -1,10 +1,10 @@
extends Control
@onready var main_menu : Control = $MainMenu
@onready var options : Control = $Options
@onready var credits : Control = $Credits
@onready var seed_selection : Control = $SeedSelection
@onready var main_menu : Control = $%MainMenu
@onready var options : Control = $%Options
@onready var credits : Control = $%Credits
@onready var seed_selection : Control = $%SeedSelection
func _ready() -> void:
@@ -37,12 +37,12 @@ func _on_main_menu_show_options() -> void:
_show_menu(options)
func _on_options_show_credits() -> void:
func _on_main_menu_show_credits() -> void:
_show_menu(credits)
func _on_credits_back() -> void:
_show_menu(options)
_show_menu(main_menu)
func _show_main_menu() -> void:
game/menu/main/title_screen.tscn
+37 -34
View File
@@ -1,6 +1,7 @@
[gd_scene load_steps=7 format=3 uid="uid://2oavbr7oaihg"]
[gd_scene load_steps=8 format=3 uid="uid://2oavbr7oaihg"]
[ext_resource type="Script" uid="uid://bqnepsuk13qo8" path="res://game/menu/main/title_screen.gd" id="1_lxdol"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_4xt7k"]
[ext_resource type="PackedScene" uid="uid://bxlccevt52y70" path="res://game/menu/main/main_menu.tscn" id="2_o0rbc"]
[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://game/menu/common/options.tscn" id="3_88gnj"]
[ext_resource type="PackedScene" uid="uid://c3q3g2647qc27" path="res://game/menu/common/credits.tscn" id="4_w1y3c"]
@@ -9,45 +10,47 @@
[node name="TitleScreen" type="Control"]
layout_mode = 3
anchors_preset = 0
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_lxdol")
[node name="MainMenu" parent="." instance=ExtResource("2_o0rbc")]
layout_mode = 0
[node name="Options" parent="." instance=ExtResource("3_88gnj")]
[node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_right = 640.0
offset_bottom = 360.0
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme = ExtResource("2_4xt7k")
[node name="Credits" parent="." instance=ExtResource("4_w1y3c")]
layout_mode = 0
[node name="MainMenu" parent="MarginContainer" instance=ExtResource("2_o0rbc")]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 4
[node name="SeedSelection" parent="." instance=ExtResource("5_w1y3c")]
layout_mode = 0
anchors_preset = 0
anchor_right = 0.0
anchor_bottom = 0.0
offset_left = 320.0
offset_top = 190.0
offset_right = 320.0
offset_bottom = 190.0
grow_horizontal = 1
grow_vertical = 1
[node name="Options" parent="MarginContainer" instance=ExtResource("3_88gnj")]
unique_name_in_owner = true
layout_mode = 2
[node name="Credits" parent="MarginContainer" instance=ExtResource("4_w1y3c")]
unique_name_in_owner = true
layout_mode = 2
[node name="SeedSelection" parent="MarginContainer" instance=ExtResource("5_w1y3c")]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 4
[node name="Background" parent="." instance=ExtResource("5_88gnj")]
[connection signal="continue_game" from="MainMenu" to="." method="_on_main_menu_continue_game"]
[connection signal="new_game" from="MainMenu" to="." method="_on_main_menu_new_game"]
[connection signal="quit_game" from="MainMenu" to="." method="_on_main_menu_quit_game"]
[connection signal="show_options" from="MainMenu" to="." method="_on_main_menu_show_options"]
[connection signal="back" from="Options" to="." method="_show_main_menu"]
[connection signal="show_credits" from="Options" to="." method="_on_options_show_credits"]
[connection signal="back" from="Credits" to="." method="_on_credits_back"]
[connection signal="back" from="SeedSelection" to="." method="_show_main_menu"]
[connection signal="continue_game" from="MarginContainer/MainMenu" to="." method="_on_main_menu_continue_game"]
[connection signal="new_game" from="MarginContainer/MainMenu" to="." method="_on_main_menu_new_game"]
[connection signal="quit_game" from="MarginContainer/MainMenu" to="." method="_on_main_menu_quit_game"]
[connection signal="show_credits" from="MarginContainer/MainMenu" to="." method="_on_main_menu_show_credits"]
[connection signal="show_options" from="MarginContainer/MainMenu" to="." method="_on_main_menu_show_options"]
[connection signal="back" from="MarginContainer/Options" to="." method="_show_main_menu"]
[connection signal="back" from="MarginContainer/Credits" to="." method="_on_credits_back"]
[connection signal="back" from="MarginContainer/SeedSelection" to="." method="_show_main_menu"]