game/bom
Code Issues Pull Requests Activity

Added souls for testing

Browse Source
This commit is contained in:
Eduard Urbach 2024-02-12 12:38:57 +01:00
parent d8d0c690bd
commit e7132a50f7
Signed by: akyoto
GPG Key ID: C874F672B1AF20C0
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/Main.tscn
View File

@ -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://Main.gd" id="1_cw3ws"]
[ext_resource type="Script" path="res://network/Client.gd" id="2_8hxcx"] [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="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="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://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"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_he5c5"]
diffuse_mode = 3 diffuse_mode = 3
@ -57,7 +58,7 @@ script = ExtResource("4_fsx7a")
packet_type = 2 packet_type = 2
[node name="Timer" type="Timer" parent="Client/Login"] [node name="Timer" type="Timer" parent="Client/Login"]
wait_time = 5.0 wait_time = 3.0
autostart = true autostart = true
[node name="Logout" type="Node" parent="Client"] [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) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.53558, 1.28057, -0.306177)
[node name="Grass" type="MultiMeshInstance3D" parent="World"] [node name="Grass" type="MultiMeshInstance3D" parent="World"]
layers = 2
material_override = ExtResource("18_tja64") material_override = ExtResource("18_tja64")
cast_shadow = 0 cast_shadow = 0
multimesh = ExtResource("19_ae26a") multimesh = ExtResource("19_ae26a")
@ -171,6 +173,9 @@ skeleton = NodePath("../..")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25, 0, -25) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25, 0, -25)
skeleton = NodePath("../..") 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="."] [node name="Players" type="Node3D" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
script = ExtResource("16_dp6bj") script = ExtResource("16_dp6bj")
@ -178,8 +183,8 @@ script = ExtResource("16_dp6bj")
[node name="UI" parent="." instance=ExtResource("17_43qhq")] [node name="UI" parent="." instance=ExtResource("17_43qhq")]
process_mode = 3 process_mode = 3
[node name="Soul" parent="." instance=ExtResource("23_dht53")] [node name="Souls" parent="." instance=ExtResource("21_8ne8m")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1.37246, 4) 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/Ping/Timer" to="Client/Ping" method="send_ping"]
[connection signal="timeout" from="Client/Login/Timer" to="Client/Login" method="send_login"] [connection signal="timeout" from="Client/Login/Timer" to="Client/Login" method="send_login"]

32
client/test/souls.tscn Normal file
View File

@ -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)