diff options
| author | Anson Bridges <bridges.anson@gmail.com> | 2022-09-02 23:12:33 -0700 |
|---|---|---|
| committer | Anson Bridges <bridges.anson@gmail.com> | 2022-09-02 23:12:33 -0700 |
| commit | 4d51178d32e07c070c61aa7567856bec7eda3639 (patch) | |
| tree | 7ef4884dd2221340f9c1ed96bd0f52c761ae9fb0 /scenes/characters | |
| parent | 0939d84e611f1c63fd5805339a2f777251fb1653 (diff) | |
hit/killsounds, swimming, main menu, fixed explosion physics
Diffstat (limited to 'scenes/characters')
| -rw-r--r-- | scenes/characters/PlayerAreaDetect.gd | 9 | ||||
| -rw-r--r-- | scenes/characters/PlayerRigid.tscn | 22 |
2 files changed, 22 insertions, 9 deletions
diff --git a/scenes/characters/PlayerAreaDetect.gd b/scenes/characters/PlayerAreaDetect.gd new file mode 100644 index 0000000..7bcf48b --- /dev/null +++ b/scenes/characters/PlayerAreaDetect.gd @@ -0,0 +1,9 @@ +extends Area + +func _on_AreaDetect_area_entered(area): + if area.name == "WaterArea": + get_parent().enter_water() + +func _on_AreaDetect_area_exited(area): + if area.name == "WaterArea": + get_parent().exit_water() 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"] |