From c12df503287908c83cb4ca7d24129bcf8f67a18b Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 15 Apr 2024 22:32:22 +0200 Subject: [PATCH] Remove `CollisionShape2D` from inside behaviours --- behaviours/collectable.tscn | 8 +------- behaviours/draggable.tscn | 9 +-------- behaviours/eater.tscn | 9 +-------- behaviours/hover_detector.tscn | 9 +-------- behaviours/hunter.tscn | 9 +-------- behaviours/spawner.tscn | 2 +- 6 files changed, 6 insertions(+), 40 deletions(-) diff --git a/behaviours/collectable.tscn b/behaviours/collectable.tscn index 6c7c9e1..70765e3 100644 --- a/behaviours/collectable.tscn +++ b/behaviours/collectable.tscn @@ -1,10 +1,7 @@ -[gd_scene load_steps=3 format=3 uid="uid://dj72yshd25ucx"] +[gd_scene load_steps=2 format=3 uid="uid://dj72yshd25ucx"] [ext_resource type="Script" path="res://behaviours/collectable.gd" id="1_p0pc3"] -[sub_resource type="CircleShape2D" id="CircleShape2D_su28r"] -radius = 16.0 - [node name="Collectable" type="Node2D"] script = ExtResource("1_p0pc3") @@ -12,8 +9,5 @@ script = ExtResource("1_p0pc3") collision_mask = 0 monitorable = false -[node name="Shape" type="CollisionShape2D" parent="MouseArea"] -shape = SubResource("CircleShape2D_su28r") - [connection signal="collected" from="." to="." method="_on_collected"] [connection signal="mouse_entered" from="MouseArea" to="." method="_on_mouse_area_mouse_entered"] diff --git a/behaviours/draggable.tscn b/behaviours/draggable.tscn index 24c8ffc..60e1f2c 100644 --- a/behaviours/draggable.tscn +++ b/behaviours/draggable.tscn @@ -1,20 +1,13 @@ -[gd_scene load_steps=4 format=3 uid="uid://dijcjahkddudv"] +[gd_scene load_steps=3 format=3 uid="uid://dijcjahkddudv"] [ext_resource type="Script" path="res://behaviours/draggable.gd" id="1_hdedq"] [ext_resource type="PackedScene" uid="uid://bvrxvrjlo5130" path="res://behaviours/move_towards_mouse.tscn" id="2_gi6xd"] -[sub_resource type="CircleShape2D" id="CircleShape2D_vkph8"] -radius = 8.0 - [node name="Draggable" type="Area2D"] collision_layer = 0 collision_mask = 0 script = ExtResource("1_hdedq") -[node name="Shape" type="CollisionShape2D" parent="."] -shape = SubResource("CircleShape2D_vkph8") -debug_color = Color(1, 1, 1, 0) - [node name="MatchMousePosition" parent="." instance=ExtResource("2_gi6xd")] scale = Vector2(10000, 10000) speed = 3600.0 diff --git a/behaviours/eater.tscn b/behaviours/eater.tscn index 042a7c2..d1f79ab 100644 --- a/behaviours/eater.tscn +++ b/behaviours/eater.tscn @@ -1,19 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://jg7qkbswgqjc"] +[gd_scene load_steps=2 format=3 uid="uid://jg7qkbswgqjc"] [ext_resource type="Script" path="res://behaviours/eater.gd" id="1_urx5y"] -[sub_resource type="CircleShape2D" id="CircleShape2D_61hv0"] -radius = 8.0 - [node name="Eater" type="Area2D"] collision_layer = 0 collision_mask = 8 monitorable = false script = ExtResource("1_urx5y") -[node name="Shape" type="CollisionShape2D" parent="."] -shape = SubResource("CircleShape2D_61hv0") -debug_color = Color(1, 0, 0.027451, 0) - [connection signal="body_entered" from="." to="." method="_on_body_entered"] [connection signal="eaten" from="." to="." method="_on_eaten"] diff --git a/behaviours/hover_detector.tscn b/behaviours/hover_detector.tscn index 1e66aaa..b6800b0 100644 --- a/behaviours/hover_detector.tscn +++ b/behaviours/hover_detector.tscn @@ -1,18 +1,11 @@ -[gd_scene load_steps=3 format=3 uid="uid://cbg5kgwxusvxf"] +[gd_scene load_steps=2 format=3 uid="uid://cbg5kgwxusvxf"] [ext_resource type="Script" path="res://behaviours/hover_detector.gd" id="1_51m5p"] -[sub_resource type="CircleShape2D" id="CircleShape2D_ktsow"] -radius = 8.0 - [node name="HoverDetector" type="Area2D"] collision_mask = 0 monitorable = false script = ExtResource("1_51m5p") -[node name="Shape" type="CollisionShape2D" parent="."] -shape = SubResource("CircleShape2D_ktsow") -debug_color = Color(0.8, 0.396078, 0.384314, 0) - [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] diff --git a/behaviours/hunter.tscn b/behaviours/hunter.tscn index cb0a0ee..2c2c9e7 100644 --- a/behaviours/hunter.tscn +++ b/behaviours/hunter.tscn @@ -1,10 +1,7 @@ -[gd_scene load_steps=3 format=3 uid="uid://ctpn4hvkhxoi3"] +[gd_scene load_steps=2 format=3 uid="uid://ctpn4hvkhxoi3"] [ext_resource type="Script" path="res://behaviours/hunter.gd" id="1_3bmd5"] -[sub_resource type="CircleShape2D" id="CircleShape2D_kxb8e"] -radius = 8.0 - [node name="Hunter" type="Node2D"] script = ExtResource("1_3bmd5") @@ -13,10 +10,6 @@ collision_layer = 0 collision_mask = 24 monitorable = false -[node name="Shape" type="CollisionShape2D" parent="DetectionArea"] -shape = SubResource("CircleShape2D_kxb8e") -debug_color = Color(1, 0, 0, 0.0705882) - [connection signal="tracked" from="." to="." method="_on_tracked"] [connection signal="untracked" from="." to="." method="_on_untracked"] [connection signal="body_entered" from="DetectionArea" to="." method="_on_detection_area_body_entered"] diff --git a/behaviours/spawner.tscn b/behaviours/spawner.tscn index 2154f4a..54b9954 100644 --- a/behaviours/spawner.tscn +++ b/behaviours/spawner.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://cyrg770fsetyu"] +[gd_scene load_steps=2 format=3 uid="uid://tx1qi6ahlxjp"] [ext_resource type="Script" path="res://behaviours/spawner.gd" id="1_b4uk0"]