ld55/hella-farm
ld55/hella-farm
1
Fork 0
mirror of https://github.com/Steffo99/hella-farm.git synced 2024-11-21 23:54:23 +00:00
Code Activity

Remove CollisionShape2D from inside behaviours

Browse source
This commit is contained in:
Steffo 2024-04-15 22:32:22 +02:00
parent 0c7c4d581a
commit c12df50328
Signed by: steffo
GPG key ID: 5ADA3868646C3FC0
6 changed files with 6 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
behaviours/collectable.tscn
View file

@ -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"] [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"] [node name="Collectable" type="Node2D"]
script = ExtResource("1_p0pc3") script = ExtResource("1_p0pc3")
@ -12,8 +9,5 @@ script = ExtResource("1_p0pc3")
collision_mask = 0 collision_mask = 0
monitorable = false monitorable = false
[node name="Shape" type="CollisionShape2D" parent="MouseArea"]
shape = SubResource("CircleShape2D_su28r")
[connection signal="collected" from="." to="." method="_on_collected"] [connection signal="collected" from="." to="." method="_on_collected"]
[connection signal="mouse_entered" from="MouseArea" to="." method="_on_mouse_area_mouse_entered"] [connection signal="mouse_entered" from="MouseArea" to="." method="_on_mouse_area_mouse_entered"]

9
behaviours/draggable.tscn
View file

@ -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="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"] [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"] [node name="Draggable" type="Area2D"]
collision_layer = 0 collision_layer = 0
collision_mask = 0 collision_mask = 0
script = ExtResource("1_hdedq") 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")] [node name="MatchMousePosition" parent="." instance=ExtResource("2_gi6xd")]
scale = Vector2(10000, 10000) scale = Vector2(10000, 10000)
speed = 3600.0 speed = 3600.0

9
behaviours/eater.tscn
View file

@ -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"] [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"] [node name="Eater" type="Area2D"]
collision_layer = 0 collision_layer = 0
collision_mask = 8 collision_mask = 8
monitorable = false monitorable = false
script = ExtResource("1_urx5y") 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="body_entered" from="." to="." method="_on_body_entered"]
[connection signal="eaten" from="." to="." method="_on_eaten"] [connection signal="eaten" from="." to="." method="_on_eaten"]

9
behaviours/hover_detector.tscn
View file

@ -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"] [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"] [node name="HoverDetector" type="Area2D"]
collision_mask = 0 collision_mask = 0
monitorable = false monitorable = false
script = ExtResource("1_51m5p") 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_entered" from="." to="." method="_on_mouse_entered"]
[connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"]

9
behaviours/hunter.tscn
View file

@ -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"] [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"] [node name="Hunter" type="Node2D"]
script = ExtResource("1_3bmd5") script = ExtResource("1_3bmd5")
@ -13,10 +10,6 @@ collision_layer = 0
collision_mask = 24 collision_mask = 24
monitorable = false 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="tracked" from="." to="." method="_on_tracked"]
[connection signal="untracked" from="." to="." method="_on_untracked"] [connection signal="untracked" from="." to="." method="_on_untracked"]
[connection signal="body_entered" from="DetectionArea" to="." method="_on_detection_area_body_entered"] [connection signal="body_entered" from="DetectionArea" to="." method="_on_detection_area_body_entered"]

2
behaviours/spawner.tscn
View file

@ -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"] [ext_resource type="Script" path="res://behaviours/spawner.gd" id="1_b4uk0"]