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"]