From e7132a50f710ca491634f2776e01bbd8b3ea5543 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Mon, 12 Feb 2024 12:38:57 +0100 Subject: [PATCH] Added souls for testing --- client/Main.tscn | 15 ++++++++++----- client/test/souls.tscn | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 client/test/souls.tscn diff --git a/client/Main.tscn b/client/Main.tscn index 609c60a..a9290c6 100644 --- a/client/Main.tscn +++ b/client/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=3 uid="uid://b40y7iuskv1ar"] +[gd_scene load_steps=27 format=3 uid="uid://b40y7iuskv1ar"] [ext_resource type="Script" path="res://Main.gd" id="1_cw3ws"] [ext_resource type="Script" path="res://network/Client.gd" id="2_8hxcx"] @@ -21,7 +21,8 @@ [ext_resource type="Material" uid="uid://bdsblfaxbipaa" path="res://world/grass/GrassMaterial.tres" id="18_tja64"] [ext_resource type="MultiMesh" uid="uid://dog5aq5n2q025" path="res://assets/grass/grass.multimesh" id="19_ae26a"] [ext_resource type="PackedScene" uid="uid://cm0rho6adv2p7" path="res://world/water/Water.tscn" id="20_bmo3k"] -[ext_resource type="PackedScene" uid="uid://dl4vcp04t8iyr" path="res://item/soul/Soul.tscn" id="23_dht53"] +[ext_resource type="PackedScene" uid="uid://daaqqc0e3gy7b" path="res://test/souls.tscn" id="21_8ne8m"] +[ext_resource type="PackedScene" uid="uid://b0w38xjifulq6" path="res://assets/house/House.blend" id="23_5j7b3"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_he5c5"] diffuse_mode = 3 @@ -57,7 +58,7 @@ script = ExtResource("4_fsx7a") packet_type = 2 [node name="Timer" type="Timer" parent="Client/Login"] -wait_time = 5.0 +wait_time = 3.0 autostart = true [node name="Logout" type="Node" parent="Client"] @@ -125,6 +126,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.00829, 1.28057, -1.95247) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.53558, 1.28057, -0.306177) [node name="Grass" type="MultiMeshInstance3D" parent="World"] +layers = 2 material_override = ExtResource("18_tja64") cast_shadow = 0 multimesh = ExtResource("19_ae26a") @@ -171,6 +173,9 @@ skeleton = NodePath("../..") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25, 0, -25) skeleton = NodePath("../..") +[node name="House" parent="World" instance=ExtResource("23_5j7b3")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -6.04985, 0, -6.15938) + [node name="Players" type="Node3D" parent="."] unique_name_in_owner = true script = ExtResource("16_dp6bj") @@ -178,8 +183,8 @@ script = ExtResource("16_dp6bj") [node name="UI" parent="." instance=ExtResource("17_43qhq")] process_mode = 3 -[node name="Soul" parent="." instance=ExtResource("23_dht53")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1.37246, 4) +[node name="Souls" parent="." instance=ExtResource("21_8ne8m")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.92295, 0, -0.238058) [connection signal="timeout" from="Client/Ping/Timer" to="Client/Ping" method="send_ping"] [connection signal="timeout" from="Client/Login/Timer" to="Client/Login" method="send_login"] diff --git a/client/test/souls.tscn b/client/test/souls.tscn new file mode 100644 index 0000000..02ea63f --- /dev/null +++ b/client/test/souls.tscn @@ -0,0 +1,32 @@ +[gd_scene load_steps=2 format=3 uid="uid://daaqqc0e3gy7b"] + +[ext_resource type="PackedScene" uid="uid://dl4vcp04t8iyr" path="res://item/soul/Soul.tscn" id="1_8iduu"] + +[node name="Souls" type="Node3D"] + +[node name="Soul" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0) + +[node name="Soul2" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 2) + +[node name="Soul3" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, -2) + +[node name="Soul4" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0.8, 0) + +[node name="Soul5" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0.8, 2) + +[node name="Soul6" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0.8, -2) + +[node name="Soul7" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.8, 0) + +[node name="Soul8" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.8, 2) + +[node name="Soul9" parent="." instance=ExtResource("1_8iduu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.8, -2)