Added serving of the customers, npc exits, main menu, settings, saving and loading.

This commit is contained in:
Patrick 2024-12-20 19:51:46 +01:00
parent 3d1e6caa29
commit 2b6d1faadb
19 changed files with 360 additions and 39 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=5 format=3 uid="uid://cvnjpnvchvakj"]
[gd_scene load_steps=6 format=3 uid="uid://cvnjpnvchvakj"]
[ext_resource type="Script" path="res://scripts/entities/npc.gd" id="1_jvyx6"]
@ -10,6 +10,9 @@ material = SubResource("StandardMaterial3D_e5nrh")
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_am313"]
[sub_resource type="BoxShape3D" id="BoxShape3D_wyrst"]
size = Vector3(3, 2, 3)
[node name="Npc" type="CharacterBody3D"]
script = ExtResource("1_jvyx6")
@ -30,3 +33,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.25, 0)
pixel_size = 0.01
billboard = 1
no_depth_test = true
[node name="Area3D" type="Area3D" parent="."]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
shape = SubResource("BoxShape3D_wyrst")

View file

@ -1,10 +1,11 @@
[gd_scene load_steps=10 format=3 uid="uid://cbyee7drds7qu"]
[gd_scene load_steps=11 format=3 uid="uid://cbyee7drds7qu"]
[ext_resource type="Script" path="res://scripts/maps/map.gd" id="1_4npcs"]
[ext_resource type="Script" path="res://scripts/maps/objectives/hungry.gd" id="2_qrp84"]
[ext_resource type="PackedScene" uid="uid://bsghm187n6ykx" path="res://scenes/objects/closet.tscn" id="2_yvpvm"]
[ext_resource type="PackedScene" uid="uid://cvnjpnvchvakj" path="res://scenes/entities/npc.tscn" id="3_x3gyc"]
[ext_resource type="PackedScene" uid="uid://ctpubhh2gsccb" path="res://scenes/maps/elements/guncase.tscn" id="5_k7k8h"]
[ext_resource type="PackedScene" uid="uid://bghvogpaly2a6" path="res://scenes/objects/food/burger.tscn" id="6_rpxne"]
[sub_resource type="Environment" id="Environment_pq0iv"]
@ -50,6 +51,9 @@ script = ExtResource("2_qrp84")
[node name="Closet" parent="NPCCarryables" instance=ExtResource("2_yvpvm")]
transform = Transform3D(0.642788, -0.766044, 0, 0.766044, 0.642788, 0, 0, 0, 1, 29, 10, -30)
[node name="NPCExit" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 44)
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(-0.899519, 0.375, 0.224144, -0.224144, -0.836516, 0.5, 0.375, 0.399519, 0.836516, 0, 0, 0)
@ -75,3 +79,6 @@ shape = SubResource("BoxShape3D_rnmx0")
[node name="Guncase" parent="." instance=ExtResource("5_k7k8h")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24, 1, 0)
[node name="Burger" parent="." instance=ExtResource("6_rpxne")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.99429, 3.5, 15.1689)

View file

@ -0,0 +1,40 @@
[gd_scene load_steps=7 format=3 uid="uid://bghvogpaly2a6"]
[ext_resource type="Script" path="res://scripts/player_interactables/food/burger.gd" id="1_nd3af"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ntjpg"]
albedo_color = Color(0.765272, 0.371996, 0, 1)
[sub_resource type="BoxMesh" id="BoxMesh_366d1"]
material = SubResource("StandardMaterial3D_ntjpg")
size = Vector3(0.2, 0.05, 0.2)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6edt3"]
albedo_color = Color(0.432741, 0.166278, 0, 1)
[sub_resource type="BoxMesh" id="BoxMesh_7qoyo"]
material = SubResource("StandardMaterial3D_6edt3")
size = Vector3(0.2, 0.05, 0.2)
[sub_resource type="BoxShape3D" id="BoxShape3D_cksw3"]
size = Vector3(0.2, 0.15, 0.2)
[node name="Burger" type="RigidBody3D"]
mass = 0.5
script = ExtResource("1_nd3af")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.05, 0)
mesh = SubResource("BoxMesh_366d1")
[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
mesh = SubResource("BoxMesh_7qoyo")
skeleton = NodePath("../MeshInstance3D")
[node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
mesh = SubResource("BoxMesh_366d1")
skeleton = NodePath("../MeshInstance3D2")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("BoxShape3D_cksw3")

41
scenes/ui/main_menu.tscn Normal file
View file

@ -0,0 +1,41 @@
[gd_scene load_steps=2 format=3 uid="uid://dca627msg6a0i"]
[ext_resource type="Script" path="res://scripts/ui/main_menu.gd" id="1_ffbt7"]
[node name="MainMenu" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_ffbt7")
[node name="VBoxContainer" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -20.0
offset_top = -20.0
offset_right = 20.0
offset_bottom = 20.0
grow_horizontal = 2
grow_vertical = 2
[node name="Title" type="Label" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 48
text = "Hotel Madness"
[node name="Join" type="Button" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 32
text = "Create/Join Room"
[node name="Settings" type="Button" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 32
text = "Settings"

68
scenes/ui/settings.tscn Normal file
View file

@ -0,0 +1,68 @@
[gd_scene load_steps=2 format=3 uid="uid://tax7d1r2lvay"]
[ext_resource type="Script" path="res://scripts/ui/settings.gd" id="1_nw44a"]
[node name="Settings" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_nw44a")
[node name="VBoxContainer" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -115.0
offset_top = -50.5
offset_right = 115.0
offset_bottom = 50.5
grow_horizontal = 2
grow_vertical = 2
[node name="Title" type="Label" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 32
text = "Settings:"
[node name="DefaultServerIP" type="HBoxContainer" parent="VBoxContainer"]
layout_mode = 2
[node name="Label" type="Label" parent="VBoxContainer/DefaultServerIP"]
layout_mode = 2
text = "Default Server IP: "
[node name="LineEdit" type="LineEdit" parent="VBoxContainer/DefaultServerIP"]
custom_minimum_size = Vector2(300, 0)
layout_mode = 2
[node name="DefaultUsername" type="HBoxContainer" parent="VBoxContainer"]
layout_mode = 2
[node name="Label" type="Label" parent="VBoxContainer/DefaultUsername"]
layout_mode = 2
text = "Default Username: "
[node name="LineEdit" type="LineEdit" parent="VBoxContainer/DefaultUsername"]
custom_minimum_size = Vector2(300, 0)
layout_mode = 2
[node name="DefaultRoomname" type="HBoxContainer" parent="VBoxContainer"]
layout_mode = 2
[node name="Label" type="Label" parent="VBoxContainer/DefaultRoomname"]
layout_mode = 2
text = "Default Roomname: "
[node name="LineEdit" type="LineEdit" parent="VBoxContainer/DefaultRoomname"]
custom_minimum_size = Vector2(300, 0)
layout_mode = 2
[node name="Return" type="Button" parent="VBoxContainer"]
layout_mode = 2
text = "Save and Return"