From 4196f4d9e97069d6cbf63bf24f9d14268687aea1 Mon Sep 17 00:00:00 2001
From: Chris Cromer <chris@cromer.cl>
Date: Fri, 17 Jun 2022 11:33:58 -0400
Subject: [PATCH] change collision layers and masks

---
 .../enemies/blightwing/Blightwing.tscn        | 21 ++++---------------
 .../enemies/blockface/Blockface.tscn          |  2 ++
 .../enemies/dreadtooth/Dreadtooth.tscn        |  3 ++-
 .../enemies/gravevine/Gravevine.tscn          |  3 ++-
 godot/characters/enemies/shelly/Shelly.tscn   |  2 ++
 .../enemies/spikeball/Spikeball.tscn          |  2 ++
 .../enemies/super_shelly/SuperShelly.tscn     |  3 +++
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/godot/characters/enemies/blightwing/Blightwing.tscn b/godot/characters/enemies/blightwing/Blightwing.tscn
index 9292664..d6cefca 100644
--- a/godot/characters/enemies/blightwing/Blightwing.tscn
+++ b/godot/characters/enemies/blightwing/Blightwing.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://assets/characters/characters.png" type="Texture" id=1]
-[ext_resource path="res://characters/enemies/blightwing/Blightwing.gd" type="Script" id=2]
 
 [sub_resource type="AtlasTexture" id=1]
 atlas = ExtResource( 1 )
@@ -26,29 +25,17 @@ animations = [ {
 [sub_resource type="RectangleShape2D" id=5]
 extents = Vector2( 5, 5 )
 
-[sub_resource type="RectangleShape2D" id=6]
-extents = Vector2( 6, 5 )
-
 [node name="Blightwing" type="KinematicBody2D"]
-collision_layer = 4
-collision_mask = 3
-script = ExtResource( 2 )
+collision_layer = 8
+collision_mask = 11
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 4 )
 animation = "fly"
-frame = 3
+frame = 1
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2( 3.47893e-06, 0.999998 )
 rotation = 1.5708
 shape = SubResource( 5 )
-
-[node name="Area2D" type="Area2D" parent="."]
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
-position = Vector2( 0, 2 )
-shape = SubResource( 6 )
-
-[connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"]
diff --git a/godot/characters/enemies/blockface/Blockface.tscn b/godot/characters/enemies/blockface/Blockface.tscn
index 9d2136b..95d9f42 100644
--- a/godot/characters/enemies/blockface/Blockface.tscn
+++ b/godot/characters/enemies/blockface/Blockface.tscn
@@ -27,6 +27,8 @@ animations = [ {
 extents = Vector2( 9, 9 )
 
 [node name="Blockface" type="KinematicBody2D"]
+collision_layer = 8
+collision_mask = 11
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 3 )
diff --git a/godot/characters/enemies/dreadtooth/Dreadtooth.tscn b/godot/characters/enemies/dreadtooth/Dreadtooth.tscn
index eaa6d59..85f3f7b 100644
--- a/godot/characters/enemies/dreadtooth/Dreadtooth.tscn
+++ b/godot/characters/enemies/dreadtooth/Dreadtooth.tscn
@@ -31,11 +31,12 @@ animations = [ {
 extents = Vector2( 7.5, 8.5 )
 
 [node name="Dreadtooth" type="KinematicBody2D"]
+collision_layer = 8
+collision_mask = 11
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 4 )
 animation = "walk"
-frame = 1
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
diff --git a/godot/characters/enemies/gravevine/Gravevine.tscn b/godot/characters/enemies/gravevine/Gravevine.tscn
index f4250f2..734c8c2 100644
--- a/godot/characters/enemies/gravevine/Gravevine.tscn
+++ b/godot/characters/enemies/gravevine/Gravevine.tscn
@@ -22,10 +22,11 @@ animations = [ {
 extents = Vector2( 5.5, 7.5 )
 
 [node name="Gravevine" type="KinematicBody2D"]
+collision_layer = 8
+collision_mask = 11
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 3 )
-frame = 1
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
diff --git a/godot/characters/enemies/shelly/Shelly.tscn b/godot/characters/enemies/shelly/Shelly.tscn
index 1a995a5..c476a4f 100644
--- a/godot/characters/enemies/shelly/Shelly.tscn
+++ b/godot/characters/enemies/shelly/Shelly.tscn
@@ -31,6 +31,8 @@ animations = [ {
 extents = Vector2( 7.5, 7 )
 
 [node name="Shelly" type="KinematicBody2D"]
+collision_layer = 8
+collision_mask = 11
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 4 )
diff --git a/godot/characters/enemies/spikeball/Spikeball.tscn b/godot/characters/enemies/spikeball/Spikeball.tscn
index 1ab881e..2dc1708 100644
--- a/godot/characters/enemies/spikeball/Spikeball.tscn
+++ b/godot/characters/enemies/spikeball/Spikeball.tscn
@@ -18,6 +18,8 @@ animations = [ {
 radius = 9.05539
 
 [node name="Spikeball" type="KinematicBody2D"]
+collision_layer = 8
+collision_mask = 11
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 2 )
diff --git a/godot/characters/enemies/super_shelly/SuperShelly.tscn b/godot/characters/enemies/super_shelly/SuperShelly.tscn
index f8e1606..e10aa6f 100644
--- a/godot/characters/enemies/super_shelly/SuperShelly.tscn
+++ b/godot/characters/enemies/super_shelly/SuperShelly.tscn
@@ -31,10 +31,13 @@ animations = [ {
 extents = Vector2( 12, 11 )
 
 [node name="SuperShelly" type="KinematicBody2D"]
+collision_layer = 8
+collision_mask = 11
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 4 )
 animation = "walk"
+frame = 1
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]