summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/map/map.gd2
-rw-r--r--client/menu/font-sansita-swashed.woff2bin0 -> 92808 bytes
-rw-r--r--client/menu/font-sansita-swashed.woff2.import33
-rw-r--r--client/menu/main_menu.gd6
-rw-r--r--client/menu/main_menu.tscn51
-rw-r--r--client/menu/menu_background.gd2
-rw-r--r--client/menu/menu_background.gdshader17
-rw-r--r--client/menu/menu_background.tscn39
-rw-r--r--client/menu/theme.tres29
9 files changed, 156 insertions, 23 deletions
diff --git a/client/map/map.gd b/client/map/map.gd
index 1155a70c..913c29da 100644
--- a/client/map/map.gd
+++ b/client/map/map.gd
@@ -68,7 +68,7 @@ func update(pos, tile_name, neighbors):
instance = GenericTile.new(node_name, neighbors, t)
instance.position = Vector3(pos[0], 0, pos[1])
- tile_by_pos[str(Vector2i(pos[0],pos[1]))] = instance
+ tile_by_pos[str(Vector2i(pos[0], pos[1]))] = instance
add_child(instance)
func queue_free_rename(node: Node) -> void:
diff --git a/client/menu/font-sansita-swashed.woff2 b/client/menu/font-sansita-swashed.woff2
new file mode 100644
index 00000000..5c665fb0
--- /dev/null
+++ b/client/menu/font-sansita-swashed.woff2
Binary files differ
diff --git a/client/menu/font-sansita-swashed.woff2.import b/client/menu/font-sansita-swashed.woff2.import
new file mode 100644
index 00000000..54056a3c
--- /dev/null
+++ b/client/menu/font-sansita-swashed.woff2.import
@@ -0,0 +1,33 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://bo4vh5xkpvrh1"
+path="res://.godot/imported/font-sansita-swashed.woff2-259623c6db3c7be991207ff769c643a5.fontdata"
+
+[deps]
+
+source_file="res://menu/font-sansita-swashed.woff2"
+dest_files=["res://.godot/imported/font-sansita-swashed.woff2-259623c6db3c7be991207ff769c643a5.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}
diff --git a/client/menu/main_menu.gd b/client/menu/main_menu.gd
index ef03b024..ab10911c 100644
--- a/client/menu/main_menu.gd
+++ b/client/menu/main_menu.gd
@@ -16,8 +16,8 @@
#
extends Control
-@onready var quick_connect = $side/options/quick_connect
-@onready var quit_button = $side/options/quit
+@onready var quick_connect = $side/margin/options/quick_connect
+@onready var quit_button = $side/margin/options/quit
func _ready():
quick_connect.grab_focus()
@@ -31,7 +31,7 @@ func _on_credits_pressed():
$SceneTransition.transition_to("res://menu/credits_menu.tscn")
func _on_connect_pressed():
- connect_to($side/options/connect/uri.text)
+ connect_to($side/margin/options/connect/uri.text)
func _on_quick_connect_pressed():
if OS.has_feature("JavaScript"):
diff --git a/client/menu/main_menu.tscn b/client/menu/main_menu.tscn
index 7b0f9c20..5713a802 100644
--- a/client/menu/main_menu.tscn
+++ b/client/menu/main_menu.tscn
@@ -1,5 +1,6 @@
-[gd_scene load_steps=5 format=3 uid="uid://dbj8508whxgwv"]
+[gd_scene load_steps=6 format=3 uid="uid://dbj8508whxgwv"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_nlcpo"]
[ext_resource type="Script" path="res://menu/main_menu.gd" id="2_qot2j"]
[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="4_ydj5p"]
[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="5_651nk"]
@@ -14,10 +15,10 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
+theme = ExtResource("1_nlcpo")
script = ExtResource("2_qot2j")
[node name="MenuBackground" parent="." instance=ExtResource("4_ydj5p")]
-script = null
[node name="side" type="PanelContainer" parent="."]
layout_mode = 1
@@ -27,52 +28,68 @@ offset_right = 340.0
grow_vertical = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_d8o0f")
-[node name="options" type="VBoxContainer" parent="side"]
+[node name="margin" type="MarginContainer" parent="side"]
layout_mode = 2
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
-[node name="quick_connect" type="Button" parent="side/options"]
+[node name="options" type="VBoxContainer" parent="side/margin"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="side/margin/options"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 40
+text = "Undercooked"
+
+[node name="HSeparator" type="HSeparator" parent="side/margin/options"]
+layout_mode = 2
+
+[node name="quick_connect" type="Button" parent="side/margin/options"]
layout_mode = 2
text = "Quick Connect"
alignment = 0
-[node name="connect" type="HBoxContainer" parent="side/options"]
+[node name="connect" type="HBoxContainer" parent="side/margin/options"]
layout_mode = 2
-[node name="uri" type="LineEdit" parent="side/options/connect"]
+[node name="uri" type="LineEdit" parent="side/margin/options/connect"]
layout_mode = 2
size_flags_horizontal = 3
placeholder_text = "wss://example.org"
-[node name="connect" type="Button" parent="side/options/connect"]
+[node name="connect" type="Button" parent="side/margin/options/connect"]
layout_mode = 2
text = "Connect"
-[node name="change_character" type="Button" parent="side/options"]
+[node name="change_character" type="Button" parent="side/margin/options"]
layout_mode = 2
text = "Select Character (todo)"
alignment = 0
-[node name="settings" type="Button" parent="side/options"]
+[node name="settings" type="Button" parent="side/margin/options"]
layout_mode = 2
text = "Settings (todo)"
alignment = 0
-[node name="credits" type="Button" parent="side/options"]
+[node name="credits" type="Button" parent="side/margin/options"]
layout_mode = 2
text = "Credits"
alignment = 0
-[node name="quit" type="Button" parent="side/options"]
+[node name="quit" type="Button" parent="side/margin/options"]
layout_mode = 2
text = "Quit"
alignment = 0
[node name="SceneTransition" parent="." instance=ExtResource("5_651nk")]
+visible = false
layout_mode = 1
-[connection signal="pressed" from="side/options/quick_connect" to="." method="_on_quick_connect_pressed"]
-[connection signal="pressed" from="side/options/connect/connect" to="." method="_on_connect_pressed"]
-[connection signal="pressed" from="side/options/change_character" to="." method="_on_credits_pressed"]
-[connection signal="pressed" from="side/options/settings" to="." method="_on_credits_pressed"]
-[connection signal="pressed" from="side/options/credits" to="." method="_on_credits_pressed"]
-[connection signal="pressed" from="side/options/quit" to="." method="_on_quit_pressed"]
+[connection signal="pressed" from="side/margin/options/quick_connect" to="." method="_on_quick_connect_pressed"]
+[connection signal="pressed" from="side/margin/options/connect/connect" to="." method="_on_connect_pressed"]
+[connection signal="pressed" from="side/margin/options/change_character" to="." method="_on_credits_pressed"]
+[connection signal="pressed" from="side/margin/options/settings" to="." method="_on_credits_pressed"]
+[connection signal="pressed" from="side/margin/options/credits" to="." method="_on_credits_pressed"]
+[connection signal="pressed" from="side/margin/options/quit" to="." method="_on_quit_pressed"]
diff --git a/client/menu/menu_background.gd b/client/menu/menu_background.gd
index 49a1e628..0e8e87e1 100644
--- a/client/menu/menu_background.gd
+++ b/client/menu/menu_background.gd
@@ -16,7 +16,7 @@
#
extends Node3D
-@onready var map = $map
+@onready var map = $Map
const NULLS = [null,null,null,null]
const BUCKETS = [[], ["floor","floor","floor","floor","tomato-crate", "raw-steak-crate"], ["table", "chair", "counter"], ["sink", "stove"]]
diff --git a/client/menu/menu_background.gdshader b/client/menu/menu_background.gdshader
new file mode 100644
index 00000000..c88f7b8a
--- /dev/null
+++ b/client/menu/menu_background.gdshader
@@ -0,0 +1,17 @@
+shader_type sky;
+
+uniform sampler2D noise : source_color;
+uniform vec3 ccloud : source_color;
+uniform vec3 csky : source_color;
+
+void sky() {
+ vec2 uv = SCREEN_UV * 0.2;
+ uv += TIME * vec2(0.002,0.004);
+
+ float f = texture(noise, uv).x;
+ f = 1. - f;
+ f = pow(f, 3.);
+ f = floor(f*5.)/5.;
+
+ COLOR = mix(csky, ccloud, f);
+}
diff --git a/client/menu/menu_background.tscn b/client/menu/menu_background.tscn
index 89f5c8b9..f1f89895 100644
--- a/client/menu/menu_background.tscn
+++ b/client/menu/menu_background.tscn
@@ -1,9 +1,46 @@
-[gd_scene load_steps=3 format=3 uid="uid://l4vm07dtda4j"]
+[gd_scene load_steps=9 format=3 uid="uid://l4vm07dtda4j"]
[ext_resource type="Script" path="res://menu/menu_background.gd" id="1_ijsg0"]
[ext_resource type="PackedScene" uid="uid://cs8gxa22c6joh" path="res://map/map.tscn" id="2_eg8f5"]
+[ext_resource type="Shader" path="res://menu/menu_background.gdshader" id="3_5mp8y"]
+
+[sub_resource type="FastNoiseLite" id="FastNoiseLite_ulnai"]
+noise_type = 2
+frequency = 0.0113
+fractal_octaves = 4
+fractal_lacunarity = 3.04
+fractal_gain = 0.475
+
+[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_ffl2j"]
+width = 1024
+height = 1024
+noise = SubResource("FastNoiseLite_ulnai")
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_os077"]
+shader = ExtResource("3_5mp8y")
+shader_parameter/ccloud = Color(0.921875, 0.921875, 0.921875, 1)
+shader_parameter/csky = Color(0.320652, 0.346096, 0.734375, 1)
+shader_parameter/noise = SubResource("NoiseTexture2D_ffl2j")
+
+[sub_resource type="Sky" id="Sky_utrtx"]
+sky_material = SubResource("ShaderMaterial_os077")
+
+[sub_resource type="Environment" id="Environment_slkjl"]
+background_mode = 2
+sky = SubResource("Sky_utrtx")
[node name="MenuBackground" type="Node3D"]
script = ExtResource("1_ijsg0")
[node name="Map" parent="." instance=ExtResource("2_eg8f5")]
+
+[node name="Camera" type="Camera3D" parent="."]
+transform = Transform3D(0.614606, 0.499662, -0.610408, -0.00282255, 0.775198, 0.631712, 0.78883, -0.386531, 0.477852, -9.13611, 4.90356, 1.22532)
+projection = 1
+size = 8.0
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(0.5, -0.866025, 2.37987e-16, -3.78552e-08, -2.18557e-08, 1, -0.866025, -0.5, -4.37114e-08, 0, 7, 0)
+
+[node name="s" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_slkjl")
diff --git a/client/menu/theme.tres b/client/menu/theme.tres
new file mode 100644
index 00000000..5865cf77
--- /dev/null
+++ b/client/menu/theme.tres
@@ -0,0 +1,29 @@
+[gd_resource type="Theme" load_steps=4 format=3 uid="uid://b0qmvo504e457"]
+
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/font-sansita-swashed.woff2" id="1_tneco"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_25x32"]
+content_margin_left = 10.0
+content_margin_top = 10.0
+content_margin_right = 10.0
+content_margin_bottom = 10.0
+bg_color = Color(1, 1, 1, 0.0352941)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2fl8q"]
+content_margin_left = 10.0
+content_margin_top = 10.0
+content_margin_right = 10.0
+content_margin_bottom = 10.0
+bg_color = Color(1, 1, 1, 0.266667)
+
+[resource]
+Button/styles/disabled = SubResource("StyleBoxFlat_25x32")
+Button/styles/focus = SubResource("StyleBoxFlat_25x32")
+Button/styles/hover = SubResource("StyleBoxFlat_2fl8q")
+Button/styles/normal = SubResource("StyleBoxFlat_25x32")
+Button/styles/pressed = SubResource("StyleBoxFlat_25x32")
+Label/font_sizes/font_size = 16
+Label/fonts/font = ExtResource("1_tneco")
+LineEdit/styles/focus = SubResource("StyleBoxFlat_25x32")
+LineEdit/styles/normal = SubResource("StyleBoxFlat_25x32")
+LineEdit/styles/read_only = SubResource("StyleBoxFlat_25x32")
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-10-08 12:58:38 +0000