From 46196a1adbed45c68467fddcc58250c5f100191e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Wisniewski?= Date: Sun, 30 Aug 2026 16:53:08 +0200 Subject: [PATCH] tmp --- audio/Sfx.gd | 6 +- buildings/GasBurnerBuildingDefinition.tres | 2 - project.godot | 7 +- ui/MainMenu.gd | 2 - ui/MainMenu.tscn | 147 ++++++++++++--------- 5 files changed, 88 insertions(+), 76 deletions(-) diff --git a/audio/Sfx.gd b/audio/Sfx.gd index 83b614d..85dc951 100644 --- a/audio/Sfx.gd +++ b/audio/Sfx.gd @@ -35,9 +35,9 @@ const SOUNDS: Dictionary = { # Per-sound level. A shot is fired constantly and a death happens once, so # they cannot share a volume and stay in proportion. const LEVELS: Dictionary = { - SHOT: -22.0, - SHIP_DEATH: -6.0, - BUILDING_DEATH: -4.0, + SHOT: -26.0, + SHIP_DEATH: -23.0, + BUILDING_DEATH: -23.0, } # Shots vary a little in pitch so a stream of them does not turn into one diff --git a/buildings/GasBurnerBuildingDefinition.tres b/buildings/GasBurnerBuildingDefinition.tres index 59589aa..dacd8a9 100644 --- a/buildings/GasBurnerBuildingDefinition.tres +++ b/buildings/GasBurnerBuildingDefinition.tres @@ -9,7 +9,6 @@ script = ExtResource("3") input_buffers = { "gas": 40 } -collected_outputs = PackedStringArray("energy") conversion_input = "gas" conversion_output = "energy" conversion_rate = 1.0 @@ -28,7 +27,6 @@ build_resource_costs = { action_icon = 33 menu_icon = 33 visual_scene = ExtResource("2") -capabilities = PackedStringArray("gas_burner") logistics = SubResource("Resource_logistics") map_color = Color(0.95, 0.35, 0.15, 1) map_sides = 5 diff --git a/project.godot b/project.godot index 9af6740..a1f319a 100644 --- a/project.godot +++ b/project.godot @@ -21,8 +21,8 @@ GameState="*res://core/GameState.gd" [display] -window/size/viewport_width=720 -window/size/viewport_height=1280 +window/size/viewport_width=1920 +window/size/viewport_height=1080 window/stretch/mode="canvas_items" window/stretch/aspect="expand" window/handheld/orientation="portrait" @@ -34,9 +34,10 @@ theme/default_font_size=78 [input_devices] -pointing/emulate_touch_from_mouse=true +pointing/emulate_mouse_from_touch=false [rendering] renderer/rendering_method="gl_compatibility" +textures/vram_compression/import_etc2_astc=true environment/defaults/default_clear_color=Color(0.02, 0.02, 0.08, 1) diff --git a/ui/MainMenu.gd b/ui/MainMenu.gd index 00301c5..5b99822 100644 --- a/ui/MainMenu.gd +++ b/ui/MainMenu.gd @@ -207,5 +207,3 @@ func _on_editor_pressed() -> void: _start("res://surface/PlanetSetupEditor.tscn") return status_label.text = "Map editor coming soon" - - diff --git a/ui/MainMenu.tscn b/ui/MainMenu.tscn index 9880607..ce47cc7 100644 --- a/ui/MainMenu.tscn +++ b/ui/MainMenu.tscn @@ -1,128 +1,143 @@ -[gd_scene load_steps=3 format=3] +[gd_scene format=3 uid="uid://dysn3s4stysed"] -[ext_resource type="Script" path="res://ui/MainMenu.gd" id="1"] -[ext_resource type="Script" path="res://ui/IconButton.gd" id="2"] -[node name="MainMenu" type="Node2D"] +[ext_resource type="Script" uid="uid://p7yl0hc43yai" path="res://ui/MainMenu.gd" id="1"] +[ext_resource type="Script" uid="uid://dcvdmc68b3nve" path="res://ui/IconButton.gd" id="2"] + +[node name="MainMenu" type="Node2D" unique_id=2119550059] script = ExtResource("1") -[node name="BackgroundLayer" type="CanvasLayer" parent="."] +[node name="BackgroundLayer" type="CanvasLayer" parent="." unique_id=1572211077] layer = -10 -[node name="Starfield" type="ColorRect" parent="BackgroundLayer"] -color = Color(0, 0, 0, 1) -mouse_filter = 2 +[node name="Starfield" type="ColorRect" parent="BackgroundLayer" unique_id=158789970] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +mouse_filter = 2 +color = Color(0, 0, 0, 1) -[node name="UI" type="CanvasLayer" parent="."] +[node name="UI" type="CanvasLayer" parent="." unique_id=262516585] -[node name="TitleLabel" type="Label" parent="UI"] +[node name="TitleLabel" type="Label" parent="UI" unique_id=633236579] +anchors_preset = 8 anchor_left = 0.5 -anchor_right = 0.5 anchor_top = 0.5 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -300 -offset_right = 300 -offset_top = -560 -offset_bottom = -460 +offset_left = -301.0 +offset_top = -441.0 +offset_right = 299.0 +offset_bottom = -341.0 +grow_horizontal = 2 +grow_vertical = 2 theme_override_font_sizes/font_size = 60 -horizontal_alignment = 1 text = "SPACESHIP" +horizontal_alignment = 1 -[node name="PlayButton" type="Control" parent="UI"] +[node name="PlayButton" type="Control" parent="UI" unique_id=353543031] +layout_mode = 3 +anchors_preset = 8 anchor_left = 0.5 -anchor_right = 0.5 anchor_top = 0.5 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -64 -offset_right = 64 -offset_top = -300 -offset_bottom = -172 +offset_left = -64.0 +offset_top = -300.0 +offset_right = 64.0 +offset_bottom = -172.0 +grow_horizontal = 2 +grow_vertical = 2 script = ExtResource("2") icon = 2 glow_color = Color(0.35, 0.95, 0.55, 1) -[node name="PlayLabel" type="Label" parent="UI"] -mouse_filter = 2 +[node name="PlayLabel" type="Label" parent="UI" unique_id=154177852] +anchors_preset = 8 anchor_left = 0.5 -anchor_right = 0.5 anchor_top = 0.5 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -160 -offset_right = 160 -offset_top = -160 -offset_bottom = -94 +offset_left = -160.0 +offset_top = -160.0 +offset_right = 160.0 +offset_bottom = -94.0 theme_override_font_sizes/font_size = 32 -horizontal_alignment = 1 text = "Play" +horizontal_alignment = 1 -[node name="EditorButton" type="Control" parent="UI"] +[node name="EditorButton" type="Control" parent="UI" unique_id=1570704159] +layout_mode = 3 +anchors_preset = 8 anchor_left = 0.5 -anchor_right = 0.5 anchor_top = 0.5 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -64 -offset_right = 64 -offset_top = -20 -offset_bottom = 108 +offset_left = -64.0 +offset_top = -20.0 +offset_right = 64.0 +offset_bottom = 108.0 +grow_horizontal = 2 +grow_vertical = 2 script = ExtResource("2") -icon = 0 glow_color = Color(0.5, 0.75, 1, 1) -[node name="EditorLabel" type="Label" parent="UI"] -mouse_filter = 2 +[node name="EditorLabel" type="Label" parent="UI" unique_id=2045465507] +anchors_preset = 8 anchor_left = 0.5 -anchor_right = 0.5 anchor_top = 0.5 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -200 -offset_right = 200 -offset_top = 120 -offset_bottom = 186 +offset_left = -200.0 +offset_top = 120.0 +offset_right = 200.0 +offset_bottom = 186.0 theme_override_font_sizes/font_size = 32 -horizontal_alignment = 1 text = "Map Editor" +horizontal_alignment = 1 -[node name="DevModeButton" type="Control" parent="UI"] +[node name="DevModeButton" type="Control" parent="UI" unique_id=1570194022] +layout_mode = 3 +anchors_preset = 8 anchor_left = 0.5 -anchor_right = 0.5 anchor_top = 0.5 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -64 -offset_right = 64 -offset_top = 190 -offset_bottom = 318 +offset_left = -64.0 +offset_top = 190.0 +offset_right = 64.0 +offset_bottom = 318.0 +grow_horizontal = 2 +grow_vertical = 2 script = ExtResource("2") icon = 29 glow_color = Color(1, 0.7, 0.25, 1) -[node name="DevModeLabel" type="Label" parent="UI"] -mouse_filter = 2 +[node name="DevModeLabel" type="Label" parent="UI" unique_id=1717729483] +anchors_preset = 8 anchor_left = 0.5 -anchor_right = 0.5 anchor_top = 0.5 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -200 -offset_right = 200 -offset_top = 324 -offset_bottom = 380 +offset_left = -200.0 +offset_top = 324.0 +offset_right = 200.0 +offset_bottom = 380.0 theme_override_font_sizes/font_size = 32 -horizontal_alignment = 1 text = "Dev Mode" +horizontal_alignment = 1 -[node name="StatusLabel" type="Label" parent="UI"] +[node name="StatusLabel" type="Label" parent="UI" unique_id=1490912235] +anchors_preset = 8 anchor_left = 0.5 -anchor_right = 0.5 anchor_top = 0.5 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -260 -offset_right = 260 -offset_top = 200 -offset_bottom = 260 +offset_left = -260.0 +offset_top = 200.0 +offset_right = 260.0 +offset_bottom = 260.0 theme_override_font_sizes/font_size = 26 horizontal_alignment = 1 autowrap_mode = 2 -text = ""