diff --git a/DropOffPoint.tscn b/DropOffPoint.tscn index f18369f..732e9fc 100644 --- a/DropOffPoint.tscn +++ b/DropOffPoint.tscn @@ -6,7 +6,9 @@ [sub_resource type="CircleShape2D" id=1] radius = 25.16 -[node name="DropOffPoint" type="Node2D"] +[node name="DropOffPoint" type="Node2D" groups=[ +"DropOffPoint", +]] script = ExtResource( 2 ) [node name="Area2D" type="Area2D" parent="."] diff --git a/Guest.tscn b/Guest.tscn index 3e6238e..d8c85ce 100644 --- a/Guest.tscn +++ b/Guest.tscn @@ -3,26 +3,28 @@ [ext_resource path="res://assets/placeholder_white.png" type="Texture" id=1] [ext_resource path="res://Guest.gd" type="Script" id=2] -[sub_resource type="CapsuleShape2D" id=2] +[sub_resource type="CapsuleShape2D" id=1] radius = 6.04475 height = 3.32129 -[sub_resource type="CircleShape2D" id=1] +[sub_resource type="CircleShape2D" id=2] radius = 24.5545 -[node name="Guest" type="KinematicBody2D"] +[node name="Guest" type="KinematicBody2D" groups=[ +"Guest", +]] script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="PickUpArea" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="PickUpArea"] -shape = SubResource( 1 ) +shape = SubResource( 2 ) [connection signal="area_entered" from="PickUpArea" to="." method="_on_PickUpArea_area_entered"] [connection signal="body_entered" from="PickUpArea" to="." method="_on_PickUpArea_body_entered"] diff --git a/Playa.tscn b/Playa.tscn index 72de51b..9e02a6c 100644 --- a/Playa.tscn +++ b/Playa.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://assets/car/Auto.png" type="Texture" id=1] [ext_resource path="res://Playa.gd" type="Script" id=2] @@ -7,7 +7,13 @@ radius = 33.6545 height = 72.4629 -[node name="Playa" type="KinematicBody2D"] +[sub_resource type="CapsuleShape2D" id=2] +radius = 33.5246 +height = 72.4617 + +[node name="Playa" type="KinematicBody2D" groups=[ +"Player", +]] script = ExtResource( 2 ) __meta__ = { "_edit_group_": true @@ -21,3 +27,10 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) + +[node name="PickupCheckArea" type="Area2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="PickupCheckArea"] +shape = SubResource( 2 ) + +[connection signal="area_entered" from="PickupCheckArea" to="." method="_on_PickupCheckArea_area_entered"]