summaryrefslogtreecommitdiff
path: root/scenes/characters/PlayerRigid.tscn
diff options
context:
space:
mode:
Diffstat (limited to 'scenes/characters/PlayerRigid.tscn')
-rw-r--r--scenes/characters/PlayerRigid.tscn22
1 files changed, 13 insertions, 9 deletions
diff --git a/scenes/characters/PlayerRigid.tscn b/scenes/characters/PlayerRigid.tscn
index 54e93e8..1394258 100644
--- a/scenes/characters/PlayerRigid.tscn
+++ b/scenes/characters/PlayerRigid.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
[ext_resource path="res://scripts/characters/player_controller_new.gd" type="Script" id=1]
-[ext_resource path="res://textures/FreeMono.otf" type="DynamicFontData" id=2]
+[ext_resource path="res://theming/FreeMono.otf" type="DynamicFontData" id=2]
+[ext_resource path="res://scenes/characters/PlayerAreaDetect.gd" type="Script" id=3]
[sub_resource type="PhysicsMaterial" id=3]
friction = 2.0
@@ -22,7 +23,7 @@ outline_size = 3
use_filter = true
font_data = ExtResource( 2 )
-[node name="Player" type="RigidBody" groups=["playable", "player"]]
+[node name="Soldier" type="RigidBody" groups=["playable", "player"]]
collision_layer = 32769
collision_mask = 32769
mode = 2
@@ -56,12 +57,6 @@ cast_to = Vector3( 0, 0, -2.5 )
collision_mask = 131075
collide_with_areas = true
-[node name="LongRay" type="RayCast" parent="Head/Camera"]
-enabled = true
-cast_to = Vector3( 0, 0, -500 )
-collision_mask = 131075
-collide_with_areas = true
-
[node name="MeleeRay" type="RayCast" parent="Head/Camera"]
enabled = true
cast_to = Vector3( 0, 0, -2.5 )
@@ -109,3 +104,12 @@ path_max_distance = 1.0
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.09891, 0 )
billboard = 1
font = SubResource( 5 )
+
+[node name="AreaDetect" type="Area" parent="."]
+script = ExtResource( 3 )
+
+[node name="Collision" type="CollisionShape" parent="AreaDetect"]
+shape = SubResource( 1 )
+
+[connection signal="area_entered" from="AreaDetect" to="AreaDetect" method="_on_AreaDetect_area_entered"]
+[connection signal="area_exited" from="AreaDetect" to="AreaDetect" method="_on_AreaDetect_area_exited"]