aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-06-24 01:31:17 +0200
committermetamuffin <metamuffin@disroot.org>2024-06-24 01:31:17 +0200
commite501a8e2d505c2c3ec0d084c58ab3b8f29a49450 (patch)
treeff03139489f99eb2e588d09b44496079d50cd384
parent3b373341c1f3055d4b52e42f56c545bfbb96d784 (diff)
downloadhurrycurry-e501a8e2d505c2c3ec0d084c58ab3b8f29a49450.tar
hurrycurry-e501a8e2d505c2c3ec0d084c58ab3b8f29a49450.tar.bz2
hurrycurry-e501a8e2d505c2c3ec0d084c58ab3b8f29a49450.tar.zst
add draft character menu
-rw-r--r--client/menu/character_menu.gd4
-rw-r--r--client/menu/character_menu.tscn89
-rw-r--r--client/menu/credits_menu.tscn3
-rw-r--r--client/menu/main_menu.gd5
-rw-r--r--client/menu/main_menu.tscn5
5 files changed, 101 insertions, 5 deletions
diff --git a/client/menu/character_menu.gd b/client/menu/character_menu.gd
new file mode 100644
index 00000000..46852f23
--- /dev/null
+++ b/client/menu/character_menu.gd
@@ -0,0 +1,4 @@
+extends Control
+
+func _on_back_pressed():
+ $SceneTransition.transition_to("res://menu/main_menu.tscn")
diff --git a/client/menu/character_menu.tscn b/client/menu/character_menu.tscn
new file mode 100644
index 00000000..4d91425a
--- /dev/null
+++ b/client/menu/character_menu.tscn
@@ -0,0 +1,89 @@
+[gd_scene load_steps=6 format=3 uid="uid://1f7xpirm5d28"]
+
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_ak2pw"]
+[ext_resource type="Script" path="res://menu/character_menu.gd" id="1_brhd1"]
+[ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"]
+[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_c0ocf"]
+
+[sub_resource type="Environment" id="Environment_ex25y"]
+background_mode = 1
+background_color = Color(0.145548, 0.151043, 0.207031, 1)
+
+[node name="CharacterMenu" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme = ExtResource("1_ak2pw")
+script = ExtResource("1_brhd1")
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_ex25y")
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(0.857401, 0, 0.514649, -0.15367, 0.954381, 0.256012, -0.491171, -0.298591, 0.818287, 2.76633, 1, 1.90733)
+
+[node name="Camera3D" type="Camera3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 1.75)
+
+[node name="guy" parent="." instance=ExtResource("3_odq7n")]
+
+[node name="Panel" type="Panel" parent="."]
+layout_mode = 1
+anchors_preset = 10
+anchor_right = 1.0
+offset_bottom = 113.0
+grow_horizontal = 2
+
+[node name="a" type="VBoxContainer" parent="Panel"]
+layout_mode = 1
+anchors_preset = 5
+anchor_left = 0.5
+anchor_right = 0.5
+offset_left = -213.0
+offset_top = 13.0
+offset_right = 216.0
+offset_bottom = 110.0
+grow_horizontal = 2
+
+[node name="Label" type="Label" parent="Panel/a"]
+layout_mode = 2
+text = "This textbox is useless."
+horizontal_alignment = 1
+
+[node name="LineEdit" type="LineEdit" parent="Panel/a"]
+layout_mode = 2
+
+[node name="Panel2" type="Panel" parent="."]
+layout_mode = 1
+anchors_preset = 12
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_top = -61.0
+grow_horizontal = 2
+grow_vertical = 0
+
+[node name="back" type="Button" parent="Panel2"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -39.5
+offset_top = -22.0
+offset_right = 39.5
+offset_bottom = 22.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_vertical = 8
+text = "Back"
+
+[node name="SceneTransition" parent="." instance=ExtResource("4_c0ocf")]
+visible = false
+layout_mode = 1
+
+[connection signal="pressed" from="Panel2/back" to="." method="_on_back_pressed"]
diff --git a/client/menu/credits_menu.tscn b/client/menu/credits_menu.tscn
index ffa97b58..8c2fa5ed 100644
--- a/client/menu/credits_menu.tscn
+++ b/client/menu/credits_menu.tscn
@@ -49,8 +49,7 @@ by
[b]tpart, nokoe, metamuffin[/b]
-using assets from kenney.nl
-
+using various models from kenney.nl
[/center]"
[node name="back" type="Button" parent="Panel"]
diff --git a/client/menu/main_menu.gd b/client/menu/main_menu.gd
index ab10911c..1ac80408 100644
--- a/client/menu/main_menu.gd
+++ b/client/menu/main_menu.gd
@@ -47,3 +47,8 @@ func connect_to(url):
print("Connecting to %s" % url)
Multiplayer.url = url
$SceneTransition.transition_to("res://game.tscn")
+
+
+func _on_change_character_pressed():
+ $SceneTransition.transition_to("res://menu/character_menu.tscn")
+
diff --git a/client/menu/main_menu.tscn b/client/menu/main_menu.tscn
index 585b5f86..f6c113de 100644
--- a/client/menu/main_menu.tscn
+++ b/client/menu/main_menu.tscn
@@ -72,7 +72,7 @@ text = "Connect"
[node name="change_character" type="Button" parent="side/margin/options"]
layout_mode = 2
-text = "Select Character (todo)"
+text = "My Chef"
alignment = 0
[node name="settings" type="Button" parent="side/margin/options"]
@@ -91,12 +91,11 @@ text = "Quit"
alignment = 0
[node name="SceneTransition" parent="." instance=ExtResource("5_651nk")]
-visible = false
layout_mode = 1
[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/change_character" to="." method="_on_change_character_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"]