From a59255d9d6cfab727cb619b0303f26c5d3251bb5 Mon Sep 17 00:00:00 2001 From: MartinOpat Date: Sat, 7 Mar 2026 14:34:24 +0100 Subject: [PATCH] (wip) settings menu almost works, just need to attach it to the button... --- .../scenes/settings.tscn | 24 +++++++++---------- evolve-die-repeat/game_manager.gd | 7 ++++++ evolve-die-repeat/main_menu.tscn | 13 ++++++++++ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/evolve-die-repeat/addons/modular-settings-menu/scenes/settings.tscn b/evolve-die-repeat/addons/modular-settings-menu/scenes/settings.tscn index a09cb01..c62d6a3 100644 --- a/evolve-die-repeat/addons/modular-settings-menu/scenes/settings.tscn +++ b/evolve-die-repeat/addons/modular-settings-menu/scenes/settings.tscn @@ -13,7 +13,7 @@ [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_qp71p"] -[node name="Settings" type="Control"] +[node name="Settings" type="Control" unique_id=1487060885] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -23,7 +23,7 @@ grow_vertical = 2 mouse_filter = 1 script = ExtResource("1_crapp") -[node name="SettingsPanel" type="VBoxContainer" parent="."] +[node name="SettingsPanel" type="VBoxContainer" parent="." unique_id=481915833] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -37,35 +37,35 @@ offset_bottom = 270.0 grow_horizontal = 2 grow_vertical = 2 -[node name="SettingsTabs" type="TabContainer" parent="SettingsPanel"] +[node name="SettingsTabs" type="TabContainer" parent="SettingsPanel" unique_id=1124467818] layout_mode = 2 size_flags_vertical = 3 theme_override_styles/tab_focus = SubResource("StyleBoxEmpty_kwbsm") current_tab = 0 -[node name="Gameplay" parent="SettingsPanel/SettingsTabs" instance=ExtResource("2_kjxrg")] +[node name="Gameplay" parent="SettingsPanel/SettingsTabs" unique_id=354139496 instance=ExtResource("2_kjxrg")] layout_mode = 2 metadata/_tab_index = 0 -[node name="Graphics" parent="SettingsPanel/SettingsTabs" instance=ExtResource("3_8fcn6")] +[node name="Graphics" parent="SettingsPanel/SettingsTabs" unique_id=1265630621 instance=ExtResource("3_8fcn6")] visible = false layout_mode = 2 metadata/_tab_index = 1 -[node name="Controls" parent="SettingsPanel/SettingsTabs" instance=ExtResource("4_3a4pu")] +[node name="Controls" parent="SettingsPanel/SettingsTabs" unique_id=1352859195 instance=ExtResource("4_3a4pu")] visible = false layout_mode = 2 metadata/_tab_index = 2 -[node name="Audio" parent="SettingsPanel/SettingsTabs" instance=ExtResource("5_ayxwc")] +[node name="Audio" parent="SettingsPanel/SettingsTabs" unique_id=1839468677 instance=ExtResource("5_ayxwc")] visible = false layout_mode = 2 metadata/_tab_index = 3 -[node name="HBoxContainer" type="HBoxContainer" parent="SettingsPanel"] +[node name="HBoxContainer" type="HBoxContainer" parent="SettingsPanel" unique_id=1987062525] layout_mode = 2 -[node name="ApplyButton" type="Button" parent="SettingsPanel/HBoxContainer"] +[node name="ApplyButton" type="Button" parent="SettingsPanel/HBoxContainer" unique_id=266503706] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 @@ -73,13 +73,13 @@ theme_override_styles/focus = SubResource("StyleBoxEmpty_ntlmy") disabled = true text = "Apply" -[node name="BackButton" type="Button" parent="SettingsPanel/HBoxContainer"] +[node name="BackButton" type="Button" parent="SettingsPanel/HBoxContainer" unique_id=1620563241] layout_mode = 2 size_flags_horizontal = 3 theme_override_styles/focus = SubResource("StyleBoxEmpty_qp71p") text = "Back" -[node name="ElementPanels" type="Control" parent="."] +[node name="ElementPanels" type="Control" parent="." unique_id=703442684] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -88,7 +88,7 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 -[node name="DiscardChangesPopup" parent="." instance=ExtResource("4_yfemx")] +[node name="DiscardChangesPopup" parent="." unique_id=1211622821 instance=ExtResource("4_yfemx")] visible = false layout_mode = 1 diff --git a/evolve-die-repeat/game_manager.gd b/evolve-die-repeat/game_manager.gd index 676c230..7fc15a1 100644 --- a/evolve-die-repeat/game_manager.gd +++ b/evolve-die-repeat/game_manager.gd @@ -16,6 +16,7 @@ var eps: float = 1e-4 var foodManager: FoodManager2D # A world "current" +# TODO: This should be moved to a different "game manager" specific to the molecular stage # polar var flow_dir: float # [0, 2pi) var flow_mag: float # [0, 1] @@ -111,3 +112,9 @@ func calc_distance(one, two) -> float: onedup.x += screen_size.x candidate = min(candidate, onedup.distance_to(two)) return candidate + +func change_window_size(width: int, height: int) -> void: + # Do NOT remove this Godot, ffs!!! + var newSize = Vector2i(width, height) + + diff --git a/evolve-die-repeat/main_menu.tscn b/evolve-die-repeat/main_menu.tscn index c7705c1..423e834 100644 --- a/evolve-die-repeat/main_menu.tscn +++ b/evolve-die-repeat/main_menu.tscn @@ -1,5 +1,7 @@ [gd_scene format=3 uid="uid://drgv154ei1vrl"] +[ext_resource type="PackedScene" uid="uid://px6a2dg8cawb" path="res://addons/modular-settings-menu/scenes/settings.tscn" id="1_06t4h"] + [sub_resource type="GDScript" id="GDScript_rhts7"] script/source = "extends Control @@ -50,3 +52,14 @@ text = "The Main Menu" label_settings = SubResource("LabelSettings_rhts7") horizontal_alignment = 1 vertical_alignment = 1 + +[node name="Settings" parent="." unique_id=112964493 node_paths=PackedStringArray("MenuPanelRef") instance=ExtResource("1_06t4h")] +layout_mode = 1 +MenuPanelRef = NodePath("../SettingsWheelButton") + +[node name="SettingsWheelButton" type="Button" parent="." unique_id=2147291321] +layout_mode = 0 +offset_left = 898.0 +offset_top = 46.0 +offset_right = 954.0 +offset_bottom = 93.0