From da03fddf2d9900ab51fd4794361a7f6f118d18b1 Mon Sep 17 00:00:00 2001
From: Hazel Snider <hazel.lsnider@gmail.com>
Date: Mon, 16 Jan 2023 02:07:11 -0500
Subject: [PATCH] clean up enemy stuff a tiny bit

---
 objects/enemy/enemy.tscn         |  6 ------
 objects/enemy/rolling_fiend.tscn | 18 ++++++++----------
 objects/enemy/tentacle.tscn      |  2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 objects/enemy/enemy.tscn

diff --git a/objects/enemy/enemy.tscn b/objects/enemy/enemy.tscn
deleted file mode 100644
index 57e923a..0000000
--- a/objects/enemy/enemy.tscn
+++ /dev/null
@@ -1,6 +0,0 @@
-[gd_scene load_steps=2 format=2]
-
-[ext_resource path="res://objects/enemy/enemy.gd" type="Script" id=1]
-
-[node name="Enemy" type="Node2D" groups=["enemy"]]
-script = ExtResource( 1 )
diff --git a/objects/enemy/rolling_fiend.tscn b/objects/enemy/rolling_fiend.tscn
index 5c4e75c..23fb04b 100644
--- a/objects/enemy/rolling_fiend.tscn
+++ b/objects/enemy/rolling_fiend.tscn
@@ -1,6 +1,5 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=9 format=2]
 
-[ext_resource path="res://objects/enemy/enemy.tscn" type="PackedScene" id=1]
 [ext_resource path="res://graphics/enemy/roller_fiend.png" type="Texture" id=2]
 [ext_resource path="res://objects/enemy/rolling_fiend.gd" type="Script" id=3]
 [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=4]
@@ -29,35 +28,34 @@ animations = [ {
 [sub_resource type="RectangleShape2D" id=4]
 extents = Vector2( 4.0094, 4.0094 )
 
-[node name="RollingFiend" instance=ExtResource( 1 )]
+[node name="RollingFiend" type="Node2D" groups=["enemy"]]
 script = ExtResource( 3 )
 score_for_killing = 40
 move_speed = 50.0
 
-[node name="AnimatedSprite" type="AnimatedSprite" parent="." index="0"]
+[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 material = SubResource( 5 )
 position = Vector2( 0, 1 )
 frames = SubResource( 3 )
 playing = true
 
-[node name="Hitbox" type="Area2D" parent="." index="1"]
+[node name="Hitbox" type="Area2D" parent="."]
 position = Vector2( 0, 1 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox" index="0"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2( -0.010025, 0.0104442 )
 rotation = -0.020475
-scale = Vector2( 1, 1 )
 shape = SubResource( 4 )
 
-[node name="Raycasts" type="Node2D" parent="." index="2"]
+[node name="Raycasts" type="Node2D" parent="."]
 position = Vector2( 0, 1 )
 
-[node name="WallCast" type="RayCast2D" parent="Raycasts" index="0"]
+[node name="WallCast" type="RayCast2D" parent="Raycasts"]
 position = Vector2( -7, 7 )
 enabled = true
 cast_to = Vector2( 0, -10 )
 
-[node name="FloorCast" type="RayCast2D" parent="Raycasts" index="1"]
+[node name="FloorCast" type="RayCast2D" parent="Raycasts"]
 position = Vector2( -7, 8 )
 enabled = true
 cast_to = Vector2( 10, 0 )
diff --git a/objects/enemy/tentacle.tscn b/objects/enemy/tentacle.tscn
index 074d5e1..555f05e 100644
--- a/objects/enemy/tentacle.tscn
+++ b/objects/enemy/tentacle.tscn
@@ -22,7 +22,7 @@ animations = [ {
 [sub_resource type="RectangleShape2D" id=4]
 extents = Vector2( 4, 12 )
 
-[node name="Tentacle" type="Node2D"]
+[node name="Tentacle" type="Node2D" groups=["enemy"]]
 script = ExtResource( 1 )
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]