interstellar_development/freeftf
3
1
Fork 1
Code Issues 29 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Milestone 6 Beta 2

Browse source 
Reworked multiplayer, like a lot.
This commit is contained in:
patrick_pluto 2024-08-06 23:28:40 +02:00
parent 17ece77b7c
commit 9de67986dd
17 changed files with 309 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

52
objects/player.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=5 format=3 uid="uid://b440i2oidk5sp"]
[gd_scene load_steps=6 format=3 uid="uid://b440i2oidk5sp"]
[ext_resource type="Script" path="res://scripts/movement.gd" id="1_uru11"]
@ -11,6 +11,9 @@ radius = 0.375
height = 1.75
[sub_resource type="BoxShape3D" id="BoxShape3D_e4age"]
size = Vector3(0.5, 0.25, 0.75)
[sub_resource type="BoxShape3D" id="BoxShape3D_6pbak"]
size = Vector3(0.5, 1, 0.75)
[node name="player" type="CharacterBody3D"]
@ -37,27 +40,12 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
[node name="Camera3D" type="Camera3D" parent="cam_y"]
[node name="detect_hit" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0.25, -1.25)
[node name="CollisionShape3D" type="CollisionShape3D" parent="detect_hit"]
shape = SubResource("BoxShape3D_e4age")
disabled = true
[node name="hammer_bag" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0.25, -0.5)
[node name="bag" type="CSGCylinder3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.875)
visible = false
size = Vector3(0.25, 0.25, 1)
[node name="CSGBox3D" type="CSGBox3D" parent="hammer_bag"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.75)
size = Vector3(0.5, 1, 0.75)
[node name="CSGCylinder3D" type="CSGCylinder3D" parent="hammer_bag"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -0.25, 1.375)
height = 1.0
[node name="CSGSphere3D" type="CSGSphere3D" parent="hammer_bag/CSGCylinder3D"]
[node name="CSGSphere3D" type="CSGSphere3D" parent="bag"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
visible = false
radius = 0.375
@ -100,7 +88,31 @@ size_flags_vertical = 0
theme_override_font_sizes/font_size = 64
text = "HP: 100 "
[connection signal="body_entered" from="detect_hit" to="." method="_on_detect_hit_body_entered"]
[node name="hammer" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0, 0)
visible = false
[node name="hammer2" type="CSGBox3D" parent="hammer"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.5, 0)
size = Vector3(0.25, 0.25, 1)
[node name="CSGBox3D" type="CSGBox3D" parent="hammer/hammer2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.75)
size = Vector3(0.5, 1, 0.75)
[node name="detect_hit" type="Area3D" parent="hammer/hammer2/CSGBox3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
[node name="CollisionShape3D" type="CollisionShape3D" parent="hammer/hammer2/CSGBox3D/detect_hit"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.375, 0)
shape = SubResource("BoxShape3D_e4age")
disabled = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="hammer"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 1.25, 3.27835e-08)
shape = SubResource("BoxShape3D_6pbak")
[connection signal="timeout" from="time_in_bag" to="." method="_on_time_in_bag_timeout"]
[connection signal="timeout" from="show_fps" to="." method="_on_show_fps_timeout"]
[connection signal="timeout" from="jump_timeout" to="." method="_on_jump_timeout_timeout"]
[connection signal="body_entered" from="hammer/hammer2/CSGBox3D/detect_hit" to="." method="_on_detect_hit_body_entered"]