Merged with main

2021-12-09 23:13:44 -06:00
parent 2b7fe1494b ef951fb7e4
commit 111aa4d8ae
136 changed files with 4395 additions and 156 deletions
--- a/Enemies/Creepy
+++ b/Enemies/Creepy
@@ -6,18 +6,20 @@
 [ext_resource path="res://Enemies/Creepy Glowing Ghost.gd" type="Script" id=4]
 [ext_resource path="res://Enemies/Projectiles/Creepy Hand.tscn" type="PackedScene" id=5]

-[sub_resource type="CapsuleShape2D" id=3]
+[sub_resource type="CapsuleShape2D" id=1]
 radius = 1.5
 height = 3.0

-[sub_resource type="CapsuleShape2D" id=1]
+[sub_resource type="CapsuleShape2D" id=2]
 radius = 3.0
 height = 2.0

-[sub_resource type="CircleShape2D" id=2]
+[sub_resource type="CircleShape2D" id=3]
 radius = 60.0

-[node name="Creepy Glowing Ghost" type="KinematicBody2D" groups=["enemy"]]
+[node name="Creepy Glowing Ghost" type="KinematicBody2D" groups=[
+"enemy",
+]]
 light_mask = 0
 collision_layer = 4
 collision_mask = 5
@@ -34,9 +36,11 @@ offset = Vector2( 0, 0.5 )
 visible = false
 light_mask = 0
 rotation = 1.5708
-shape = SubResource( 3 )
+shape = SubResource( 1 )

-[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox_1"]]
+[node name="Hitbox" type="Area2D" parent="." groups=[
+"enemy_hitbox_1",
+]]
 light_mask = 0
 collision_layer = 4
 collision_mask = 2
@@ -45,19 +49,19 @@ collision_mask = 2
 visible = false
 light_mask = 0
 position = Vector2( 0, -2.5 )
-shape = SubResource( 1 )
+shape = SubResource( 2 )

 [node name="Player Detector" type="Area2D" parent="."]
 light_mask = 0
-collision_layer = 0
-collision_mask = 2
 input_pickable = false
 monitorable = false
+collision_layer = 0
+collision_mask = 2

 [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
 visible = false
 light_mask = 0
-shape = SubResource( 2 )
+shape = SubResource( 3 )

 [node name="Light" type="Light2D" parent="."]
 texture = ExtResource( 2 )
--- a/Enemies/Demon
+++ b/Enemies/Demon
@@ -7,7 +7,7 @@ var velocity: Vector2 = Vector2.ZERO
 var health: int = 15
 var hit: bool = false
 var counter: int = 0
-
+signal demon_boss_death

 func _physics_process(_delta: float) -> void:
 	velocity = Vector2.ZERO
@@ -60,6 +60,7 @@ func _on_hitbox_area_entered(area: Area2D) -> void:

 	if health <= 0:
 		call_deferred('queue_free')
+		emit_signal("demon_boss_death")
 	return

 func _on_Player_Detector__Attack_body_entered(body: Node) -> void:
--- a/Enemies/Flaming
+++ b/Enemies/Flaming
@@ -4,34 +4,36 @@
 [ext_resource path="res://Enemies/Flaming Skull.gd" type="Script" id=4]
 [ext_resource path="res://Sprites/Enemies/Flaming_Skull_Design.png" type="Texture" id=5]

-[sub_resource type="AtlasTexture" id=3]
+[sub_resource type="AtlasTexture" id=1]
 atlas = ExtResource( 5 )
 region = Rect2( 0, 0, 672, 672 )

-[sub_resource type="AtlasTexture" id=4]
+[sub_resource type="AtlasTexture" id=2]
 atlas = ExtResource( 5 )
 region = Rect2( 672, 0, 672, 672 )

-[sub_resource type="AtlasTexture" id=5]
+[sub_resource type="AtlasTexture" id=3]
 atlas = ExtResource( 5 )
 region = Rect2( 1344, 0, 672, 672 )

-[sub_resource type="SpriteFrames" id=6]
+[sub_resource type="SpriteFrames" id=4]
 animations = [ {
-"frames": [ SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ],
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ) ],
 "loop": true,
 "name": "default",
 "speed": 5.0
 } ]

-[sub_resource type="CapsuleShape2D" id=1]
+[sub_resource type="CapsuleShape2D" id=5]
 radius = 5.0
 height = 12.0

-[sub_resource type="CircleShape2D" id=2]
+[sub_resource type="CircleShape2D" id=6]
 radius = 50.0

-[node name="Flaming Skull" type="KinematicBody2D" groups=["enemy"]]
+[node name="Flaming Skull" type="KinematicBody2D" groups=[
+"enemy",
+]]
 light_mask = 0
 collision_layer = 4
 collision_mask = 5
@@ -40,8 +42,7 @@ script = ExtResource( 4 )
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 position = Vector2( 4.76837e-07, -2.38419e-07 )
 scale = Vector2( 0.0517113, 0.0517113 )
-frames = SubResource( 6 )
-frame = 2
+frames = SubResource( 4 )
 playing = true
 offset = Vector2( 0, 0.5 )

@@ -57,7 +58,9 @@ visible = false
 light_mask = 0
 rotation = 1.5708

-[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox_1"]]
+[node name="Hitbox" type="Area2D" parent="." groups=[
+"enemy_hitbox_1",
+]]
 light_mask = 0
 collision_layer = 4
 collision_mask = 2
@@ -65,19 +68,19 @@ collision_mask = 2
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 light_mask = 0
 position = Vector2( -1, 1 )
-shape = SubResource( 1 )
+shape = SubResource( 5 )

 [node name="Player Detector" type="Area2D" parent="."]
 light_mask = 0
-collision_layer = 0
-collision_mask = 2
 input_pickable = false
 monitorable = false
+collision_layer = 0
+collision_mask = 2

 [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
 visible = false
 light_mask = 0
-shape = SubResource( 2 )
+shape = SubResource( 6 )

 [connection signal="area_entered" from="Hitbox" to="." method="_on_hitbox_area_entered"]
 [connection signal="body_entered" from="Player Detector" to="." method="_on_player_detector_body_entered"]
--- a/Enemies/Ghost_Enemy.gd
+++ b/Enemies/Ghost_Enemy.gd
@@ -0,0 +1,61 @@
+extends KinematicBody2D
+
+
+# Declare member variables here. Examples:
+# var a: int = 2
+# var b: String = "text"
+export var Fireball: PackedScene
+onready var player = null
+var move = Vector2.ZERO
+var SPEED = 50
+var counter = 0
+var velocity: Vector2 = Vector2.ZERO
+var health: int = 4
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+    self.visible = false
+
+
+func _physics_process(delta):
+    velocity = Vector2.ZERO
+    
+    if player and position.distance_to(player.position) > 1:
+        velocity = position.direction_to(player.position).normalized() * SPEED
+    velocity = move_and_slide(velocity)
+
+
+
+func _on_Area2D_body_entered(body):
+    if body.is_in_group('player'):
+        player = body
+        if counter == 0:
+            self.visible = true
+            $AnimatedSprite.play("appear")
+            counter = 1
+   
+
+
+func _on_AnimatedSprite_animation_finished():
+    $AnimatedSprite.play("idle")
+
+
+func _on_Hitbox_area_entered(area):
+    if area.is_in_group('player_weapon_1'):
+        health -= 1
+    elif area.is_in_group('player_weapon_2'):
+        health -= 2
+    if health <= 0:
+        $AnimatedSprite.play("vanish")
+        yield($AnimatedSprite, "animation_finished")
+        call_deferred('queue_free')
+    return
+
+
+func _on_Projectile_Timer_timeout():
+    if player:
+      var projectile: Node = Fireball.instance()
+      projectile.init($AnimatedSprite.global_position, player.position)
+      get_tree().get_current_scene().get_node('Projectiles').add_child(projectile)
+      $AnimatedSprite.play("shriek")
--- a/Enemies/Ghost_Enemy.tscn
+++ b/Enemies/Ghost_Enemy.tscn
@@ -0,0 +1,193 @@
+[gd_scene load_steps=37 format=2]
+
+[ext_resource path="res://Sprites/Assets/ghost-appears.png" type="Texture" id=1]
+[ext_resource path="res://Sprites/Assets/ghost-idle.png" type="Texture" id=2]
+[ext_resource path="res://Sprites/Assets/ghost-shriek.png" type="Texture" id=3]
+[ext_resource path="res://Sprites/Assets/ghost-vanish.png" type="Texture" id=4]
+[ext_resource path="res://Enemies/Ghost_Enemy.gd" type="Script" id=5]
+[ext_resource path="res://Enemies/Projectiles/Fireball.tscn" type="PackedScene" id=6]
+[ext_resource path="res://Sprites/Assets/fire_column_medium_14.png" type="Texture" id=7]
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 2 )
+region = Rect2( 0, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 2 )
+region = Rect2( 64, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 2 )
+region = Rect2( 128, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=4]
+atlas = ExtResource( 2 )
+region = Rect2( 192, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 2 )
+region = Rect2( 256, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=6]
+atlas = ExtResource( 2 )
+region = Rect2( 320, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=7]
+atlas = ExtResource( 2 )
+region = Rect2( 384, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=8]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 0, 64, 48 )
+
+[sub_resource type="AtlasTexture" id=9]
+atlas = ExtResource( 1 )
+region = Rect2( 64, 0, 64, 48 )
+
+[sub_resource type="AtlasTexture" id=10]
+atlas = ExtResource( 1 )
+region = Rect2( 128, 0, 64, 48 )
+
+[sub_resource type="AtlasTexture" id=11]
+atlas = ExtResource( 1 )
+region = Rect2( 192, 0, 64, 48 )
+
+[sub_resource type="AtlasTexture" id=12]
+atlas = ExtResource( 1 )
+region = Rect2( 256, 0, 64, 48 )
+
+[sub_resource type="AtlasTexture" id=13]
+atlas = ExtResource( 1 )
+region = Rect2( 320, 0, 64, 48 )
+
+[sub_resource type="AtlasTexture" id=14]
+atlas = ExtResource( 4 )
+region = Rect2( 0, 0, 64, 64 )
+
+[sub_resource type="AtlasTexture" id=15]
+atlas = ExtResource( 4 )
+region = Rect2( 64, 0, 64, 64 )
+
+[sub_resource type="AtlasTexture" id=16]
+atlas = ExtResource( 4 )
+region = Rect2( 128, 0, 64, 64 )
+
+[sub_resource type="AtlasTexture" id=17]
+atlas = ExtResource( 4 )
+region = Rect2( 192, 0, 64, 64 )
+
+[sub_resource type="AtlasTexture" id=18]
+atlas = ExtResource( 4 )
+region = Rect2( 256, 0, 64, 64 )
+
+[sub_resource type="AtlasTexture" id=19]
+atlas = ExtResource( 4 )
+region = Rect2( 320, 0, 64, 64 )
+
+[sub_resource type="AtlasTexture" id=20]
+atlas = ExtResource( 4 )
+region = Rect2( 384, 0, 64, 64 )
+
+[sub_resource type="AtlasTexture" id=23]
+atlas = ExtResource( 3 )
+region = Rect2( 128, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=24]
+atlas = ExtResource( 3 )
+region = Rect2( 192, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=22]
+atlas = ExtResource( 3 )
+region = Rect2( 64, 0, 64, 80 )
+
+[sub_resource type="AtlasTexture" id=21]
+atlas = ExtResource( 3 )
+region = Rect2( 0, 0, 64, 80 )
+
+[sub_resource type="SpriteFrames" id=25]
+animations = [ {
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ) ],
+"loop": true,
+"name": "idle",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ) ],
+"loop": true,
+"name": "appear",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ) ],
+"loop": true,
+"name": "vanish",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 23 ), SubResource( 24 ), SubResource( 22 ), SubResource( 21 ) ],
+"loop": true,
+"name": "shriek",
+"speed": 5.0
+} ]
+
+[sub_resource type="CircleShape2D" id=26]
+radius = 57.5936
+
+[sub_resource type="CircleShape2D" id=27]
+
+[sub_resource type="CapsuleShape2D" id=28]
+radius = 12.0077
+height = 18.3862
+
+[sub_resource type="ParticlesMaterial" id=29]
+flag_disable_z = true
+gravity = Vector3( 0, 0, 0 )
+orbit_velocity = 0.0
+orbit_velocity_random = 0.0
+color = Color( 0.729412, 0, 0, 1 )
+hue_variation = 1.0
+
+[node name="KinematicBody2D" type="KinematicBody2D"]
+z_index = 2
+script = ExtResource( 5 )
+Fireball = ExtResource( 6 )
+
+[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
+frames = SubResource( 25 )
+animation = "idle"
+
+[node name="Player Detector" type="Area2D" parent="."]
+position = Vector2( 0.209557, 1.52058 )
+collision_mask = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
+position = Vector2( 0.396843, 1.52058 )
+shape = SubResource( 26 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2( 0.530334, 11.3032 )
+shape = SubResource( 27 )
+
+[node name="Hitbox" type="Area2D" parent="." groups=[
+"enemy_hitbox_1",
+]]
+light_mask = 0
+collision_layer = 4
+collision_mask = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+light_mask = 0
+shape = SubResource( 28 )
+
+[node name="Projectile Timer" type="Timer" parent="."]
+wait_time = 3.0
+autostart = true
+
+[node name="Particles2D" type="Particles2D" parent="."]
+visible = false
+amount = 15
+explosiveness = 1.0
+process_material = SubResource( 29 )
+texture = ExtResource( 7 )
+
+[connection signal="animation_finished" from="AnimatedSprite" to="." method="_on_AnimatedSprite_animation_finished"]
+[connection signal="body_entered" from="Player Detector" to="." method="_on_Area2D_body_entered"]
+[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]
+[connection signal="timeout" from="Projectile Timer" to="." method="_on_Projectile_Timer_timeout"]
--- a/Enemies/Hellhound.tscn
+++ b/Enemies/Hellhound.tscn
@@ -1,111 +1,108 @@
-[gd_scene load_steps=30 format=2]
+[gd_scene load_steps=27 format=2]

-[ext_resource path="res://Resources/Level_5_Enemy_Glowing_Ghost_Occluder.tres" type="OccluderPolygon2D" id=1]
-[ext_resource path="res://Sprites/Assets/Light.png" type="Texture" id=2]
-[ext_resource path="res://Sprites/Enemies/Hell_Hound_Idle.png" type="Texture" id=3]
+[ext_resource path="res://Sprites/Enemies/Hell_Hound_Run.png" type="Texture" id=3]
 [ext_resource path="res://Enemies/Hellhound.gd" type="Script" id=4]
-[ext_resource path="res://Sprites/Enemies/Hell_Hound_Jump.png" type="Texture" id=5]
-[ext_resource path="res://Sprites/Enemies/Hell_Hound_Run.png" type="Texture" id=6]
-[ext_resource path="res://Sprites/Enemies/Chasing_Glowing_Ghost.png" type="Texture" id=7]
+[ext_resource path="res://Sprites/Enemies/Hell_Hound_Idle.png" type="Texture" id=5]
+[ext_resource path="res://Sprites/Enemies/Hell_Hound_Jump.png" type="Texture" id=6]

-[sub_resource type="AtlasTexture" id=23]
-atlas = ExtResource( 3 )
-region = Rect2( 0, 0, 64, 32 )
-
-[sub_resource type="AtlasTexture" id=24]
-atlas = ExtResource( 3 )
-region = Rect2( 64, 0, 64, 32 )
-
-[sub_resource type="AtlasTexture" id=25]
-atlas = ExtResource( 3 )
-region = Rect2( 128, 0, 64, 32 )
-
-[sub_resource type="AtlasTexture" id=26]
-atlas = ExtResource( 3 )
-region = Rect2( 192, 0, 64, 32 )
-
-[sub_resource type="AtlasTexture" id=27]
-atlas = ExtResource( 3 )
-region = Rect2( 256, 0, 64, 32 )
-
-[sub_resource type="AtlasTexture" id=28]
-atlas = ExtResource( 3 )
-region = Rect2( 320, 0, 64, 32 )
-
-[sub_resource type="AtlasTexture" id=29]
+[sub_resource type="AtlasTexture" id=5]
 atlas = ExtResource( 6 )
-region = Rect2( 0, 0, 67, 32 )
-
-[sub_resource type="AtlasTexture" id=30]
-atlas = ExtResource( 6 )
-region = Rect2( 67, 0, 67, 32 )
-
-[sub_resource type="AtlasTexture" id=31]
-atlas = ExtResource( 6 )
-region = Rect2( 134, 0, 67, 32 )
-
-[sub_resource type="AtlasTexture" id=32]
-atlas = ExtResource( 6 )
-region = Rect2( 201, 0, 67, 32 )
-
-[sub_resource type="AtlasTexture" id=33]
-atlas = ExtResource( 6 )
-region = Rect2( 268, 0, 67, 32 )
-
-[sub_resource type="AtlasTexture" id=34]
-atlas = ExtResource( 5 )
 region = Rect2( 0, 0, 65, 48 )

-[sub_resource type="AtlasTexture" id=35]
-atlas = ExtResource( 5 )
+[sub_resource type="AtlasTexture" id=6]
+atlas = ExtResource( 6 )
 region = Rect2( 65, 0, 65, 48 )

-[sub_resource type="AtlasTexture" id=36]
-atlas = ExtResource( 5 )
+[sub_resource type="AtlasTexture" id=7]
+atlas = ExtResource( 6 )
 region = Rect2( 130, 0, 65, 48 )

-[sub_resource type="AtlasTexture" id=37]
-atlas = ExtResource( 5 )
+[sub_resource type="AtlasTexture" id=8]
+atlas = ExtResource( 6 )
 region = Rect2( 195, 0, 65, 48 )

-[sub_resource type="AtlasTexture" id=38]
-atlas = ExtResource( 5 )
+[sub_resource type="AtlasTexture" id=9]
+atlas = ExtResource( 6 )
 region = Rect2( 260, 0, 65, 48 )

-[sub_resource type="AtlasTexture" id=39]
-atlas = ExtResource( 5 )
+[sub_resource type="AtlasTexture" id=10]
+atlas = ExtResource( 6 )
 region = Rect2( 325, 0, 65, 48 )

-[sub_resource type="SpriteFrames" id=40]
+[sub_resource type="AtlasTexture" id=11]
+atlas = ExtResource( 3 )
+region = Rect2( 0, 0, 67, 32 )
+
+[sub_resource type="AtlasTexture" id=12]
+atlas = ExtResource( 3 )
+region = Rect2( 67, 0, 67, 32 )
+
+[sub_resource type="AtlasTexture" id=13]
+atlas = ExtResource( 3 )
+region = Rect2( 134, 0, 67, 32 )
+
+[sub_resource type="AtlasTexture" id=14]
+atlas = ExtResource( 3 )
+region = Rect2( 201, 0, 67, 32 )
+
+[sub_resource type="AtlasTexture" id=15]
+atlas = ExtResource( 3 )
+region = Rect2( 268, 0, 67, 32 )
+
+[sub_resource type="AtlasTexture" id=16]
+atlas = ExtResource( 5 )
+region = Rect2( 0, 0, 64, 32 )
+
+[sub_resource type="AtlasTexture" id=17]
+atlas = ExtResource( 5 )
+region = Rect2( 64, 0, 64, 32 )
+
+[sub_resource type="AtlasTexture" id=18]
+atlas = ExtResource( 5 )
+region = Rect2( 128, 0, 64, 32 )
+
+[sub_resource type="AtlasTexture" id=19]
+atlas = ExtResource( 5 )
+region = Rect2( 192, 0, 64, 32 )
+
+[sub_resource type="AtlasTexture" id=20]
+atlas = ExtResource( 5 )
+region = Rect2( 256, 0, 64, 32 )
+
+[sub_resource type="AtlasTexture" id=21]
+atlas = ExtResource( 5 )
+region = Rect2( 320, 0, 64, 32 )
+
+[sub_resource type="SpriteFrames" id=22]
 animations = [ {
-"frames": [ SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ) ],
+"frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ],
 "loop": true,
-"name": "Idle",
+"name": "Jump",
 "speed": 5.0
 }, {
-"frames": [ SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ), SubResource( 33 ) ],
+"frames": [ SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ) ],
 "loop": true,
 "name": "Running",
 "speed": 5.0
 }, {
-"frames": [ SubResource( 34 ), SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 38 ), SubResource( 39 ) ],
+"frames": [ SubResource( 16 ), SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ) ],
 "loop": true,
-"name": "Jump",
+"name": "Idle",
 "speed": 5.0
 } ]

-[sub_resource type="CapsuleShape2D" id=21]
+[sub_resource type="CapsuleShape2D" id=1]
 radius = 1.5
 height = 3.0

-[sub_resource type="CapsuleShape2D" id=1]
+[sub_resource type="CapsuleShape2D" id=2]
 radius = 8.0
 height = 2.0

-[sub_resource type="CircleShape2D" id=2]
+[sub_resource type="CircleShape2D" id=3]
 radius = 82.0061

-[sub_resource type="CircleShape2D" id=22]
+[sub_resource type="CircleShape2D" id=4]
 radius = 25.02

 [node name="Hellhound" type="KinematicBody2D" groups=["enemy"]]
@@ -118,23 +115,16 @@ script = ExtResource( 4 )
 light_mask = 0
 position = Vector2( 1, -3 )
 scale = Vector2( 0.5625, 0.5625 )
-frames = SubResource( 40 )
+frames = SubResource( 22 )
 animation = "Idle"
 frame = 3
 playing = true

-[node name="Sprite" type="Sprite" parent="."]
-visible = false
-light_mask = 4
-position = Vector2( 0, -3 )
-texture = ExtResource( 7 )
-offset = Vector2( 0, 0.5 )
-
 [node name="Collision" type="CollisionShape2D" parent="."]
 visible = false
 light_mask = 0
 rotation = 1.5708
-shape = SubResource( 21 )
+shape = SubResource( 1 )

 [node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox_1"]]
 light_mask = 0
@@ -144,7 +134,7 @@ collision_mask = 2
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 visible = false
 light_mask = 0
-shape = SubResource( 1 )
+shape = SubResource( 2 )

 [node name="Player Detector" type="Area2D" parent="."]
 light_mask = 0
@@ -156,7 +146,7 @@ monitorable = false
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
 visible = false
 light_mask = 0
-shape = SubResource( 2 )
+shape = SubResource( 3 )

 [node name="Player Detector - Attack" type="Area2D" parent="."]
 light_mask = 0
@@ -166,7 +156,7 @@ input_pickable = false
 monitorable = false

 [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector - Attack"]
-shape = SubResource( 22 )
+shape = SubResource( 4 )

 [node name="Player Detector - Attack2" type="Area2D" parent="."]
 light_mask = 0
@@ -176,28 +166,7 @@ input_pickable = false
 monitorable = false

 [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector - Attack2"]
-shape = SubResource( 22 )
-
-[node name="Light" type="Light2D" parent="."]
-visible = false
-texture = ExtResource( 2 )
-texture_scale = 0.5
-color = Color( 0.984314, 0.94902, 0.211765, 0.392157 )
-energy = 2.0
-range_item_cull_mask = 11
-
-[node name="Eyes" type="Light2D" parent="."]
-visible = false
-scale = Vector2( 0.1, 0.1 )
-texture = ExtResource( 2 )
-offset = Vector2( 5, -35 )
-range_item_cull_mask = 4
-shadow_item_cull_mask = 0
-
-[node name="Occluder" type="LightOccluder2D" parent="."]
-visible = false
-show_behind_parent = true
-occluder = ExtResource( 1 )
+shape = SubResource( 4 )

 [connection signal="area_entered" from="Hitbox" to="." method="_on_hitbox_area_entered"]
 [connection signal="body_entered" from="Player Detector" to="." method="_on_player_detector_body_entered"]
--- a/Enemies/NightBourne.tscn
+++ b/Enemies/NightBourne.tscn
@@ -0,0 +1,261 @@
+[gd_scene load_steps=58 format=2]
+
+[ext_resource path="res://Sprites/Assets/NightBorne.png" type="Texture" id=1]
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 1 )
+region = Rect2( 80, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 1 )
+region = Rect2( 160, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=4]
+atlas = ExtResource( 1 )
+region = Rect2( 240, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 1 )
+region = Rect2( 320, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=6]
+atlas = ExtResource( 1 )
+region = Rect2( 400, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=7]
+atlas = ExtResource( 1 )
+region = Rect2( 480, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=8]
+atlas = ExtResource( 1 )
+region = Rect2( 560, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=9]
+atlas = ExtResource( 1 )
+region = Rect2( 640, 0, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=10]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 80, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=11]
+atlas = ExtResource( 1 )
+region = Rect2( 80, 80, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=12]
+atlas = ExtResource( 1 )
+region = Rect2( 160, 80, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=13]
+atlas = ExtResource( 1 )
+region = Rect2( 240, 80, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=14]
+atlas = ExtResource( 1 )
+region = Rect2( 320, 80, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=15]
+atlas = ExtResource( 1 )
+region = Rect2( 400, 80, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=16]
+atlas = ExtResource( 1 )
+region = Rect2( 480, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=17]
+atlas = ExtResource( 1 )
+region = Rect2( 560, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=18]
+atlas = ExtResource( 1 )
+region = Rect2( 640, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=19]
+atlas = ExtResource( 1 )
+region = Rect2( 720, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=20]
+atlas = ExtResource( 1 )
+region = Rect2( 800, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=21]
+atlas = ExtResource( 1 )
+region = Rect2( 880, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=22]
+atlas = ExtResource( 1 )
+region = Rect2( 480, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=23]
+atlas = ExtResource( 1 )
+region = Rect2( 560, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=24]
+atlas = ExtResource( 1 )
+region = Rect2( 640, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=25]
+atlas = ExtResource( 1 )
+region = Rect2( 720, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=26]
+atlas = ExtResource( 1 )
+region = Rect2( 800, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=27]
+atlas = ExtResource( 1 )
+region = Rect2( 880, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=28]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=29]
+atlas = ExtResource( 1 )
+region = Rect2( 80, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=30]
+atlas = ExtResource( 1 )
+region = Rect2( 160, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=31]
+atlas = ExtResource( 1 )
+region = Rect2( 240, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=32]
+atlas = ExtResource( 1 )
+region = Rect2( 320, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=33]
+atlas = ExtResource( 1 )
+region = Rect2( 400, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=34]
+atlas = ExtResource( 1 )
+region = Rect2( 480, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=35]
+atlas = ExtResource( 1 )
+region = Rect2( 560, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=36]
+atlas = ExtResource( 1 )
+region = Rect2( 640, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=37]
+atlas = ExtResource( 1 )
+region = Rect2( 720, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=38]
+atlas = ExtResource( 1 )
+region = Rect2( 800, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=39]
+atlas = ExtResource( 1 )
+region = Rect2( 880, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=40]
+atlas = ExtResource( 1 )
+region = Rect2( 960, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=41]
+atlas = ExtResource( 1 )
+region = Rect2( 1040, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=42]
+atlas = ExtResource( 1 )
+region = Rect2( 1120, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=43]
+atlas = ExtResource( 1 )
+region = Rect2( 1200, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=44]
+atlas = ExtResource( 1 )
+region = Rect2( 1280, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=45]
+atlas = ExtResource( 1 )
+region = Rect2( 1360, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=46]
+atlas = ExtResource( 1 )
+region = Rect2( 1440, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=47]
+atlas = ExtResource( 1 )
+region = Rect2( 1520, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=48]
+atlas = ExtResource( 1 )
+region = Rect2( 1600, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=49]
+atlas = ExtResource( 1 )
+region = Rect2( 1680, 320, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=50]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=51]
+atlas = ExtResource( 1 )
+region = Rect2( 80, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=52]
+atlas = ExtResource( 1 )
+region = Rect2( 160, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=53]
+atlas = ExtResource( 1 )
+region = Rect2( 240, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=54]
+atlas = ExtResource( 1 )
+region = Rect2( 320, 160, 80, 80 )
+
+[sub_resource type="AtlasTexture" id=55]
+atlas = ExtResource( 1 )
+region = Rect2( 400, 160, 80, 80 )
+
+[sub_resource type="SpriteFrames" id=56]
+animations = [ {
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ) ],
+"loop": true,
+"name": "idle",
+"speed": 10.0
+}, {
+"frames": [ SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ) ],
+"loop": true,
+"name": "running",
+"speed": 10.0
+}, {
+"frames": [ SubResource( 16 ), SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ), SubResource( 27 ) ],
+"loop": true,
+"name": "attack",
+"speed": 10.0
+}, {
+"frames": [ SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ), SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 38 ), SubResource( 39 ), SubResource( 40 ), SubResource( 41 ), SubResource( 42 ), SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ), SubResource( 48 ), SubResource( 49 ), SubResource( 50 ) ],
+"loop": true,
+"name": "death",
+"speed": 10.0
+}, {
+"frames": [ SubResource( 51 ), SubResource( 52 ), SubResource( 53 ), SubResource( 54 ), SubResource( 55 ) ],
+"loop": true,
+"name": "hurt",
+"speed": 5.0
+} ]
+
+[node name="Node2D" type="KinematicBody2D"]
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+
+[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
+frames = SubResource( 56 )
+animation = "running"
+frame = 4
+playing = true
--- a/Enemies/Projectiles/Creepy
+++ b/Enemies/Projectiles/Creepy
@@ -7,13 +7,15 @@
 [sub_resource type="CircleShape2D" id=1]
 radius = 12.0

-[node name="Creepy Hand" type="Area2D" groups=["enemy_projectile_1"]]
+[node name="Creepy Hand" type="Area2D" groups=[
+"enemy_projectile_1",
+]]
 light_mask = 0
 scale = Vector2( 0.5, 0.5 )
-collision_layer = 0
-collision_mask = 2
 input_pickable = false
 monitoring = false
+collision_layer = 0
+collision_mask = 2
 script = ExtResource( 3 )

 [node name="Sprite" type="Sprite" parent="."]
--- a/Enemies/Projectiles/Fireball.gd
+++ b/Enemies/Projectiles/Fireball.gd
@@ -0,0 +1,23 @@
+extends Area2D
+
+const SPEED: int = 200
+
+var player_position: Vector2
+var velocity: Vector2 = Vector2.ZERO
+
+
+func init(spawn_position: Vector2, shoot_position: Vector2) -> void:
+    position = spawn_position
+    player_position = shoot_position
+    velocity = position.direction_to(player_position).normalized() * SPEED
+    $Sprite.rotation = player_position.angle_to_point(position) + deg2rad(180)
+    return
+
+
+func _physics_process(delta: float) -> void:
+    position += velocity * delta
+    return
+
+
+func _on_Lifetime_timeout():
+  call_deferred('queue_free')
--- a/Enemies/Projectiles/Fireball.tscn
+++ b/Enemies/Projectiles/Fireball.tscn
@@ -0,0 +1,80 @@
+[gd_scene load_steps=15 format=2]
+
+[ext_resource path="res://Enemies/Projectiles/Fireball.gd" type="Script" id=1]
+[ext_resource path="res://Sprites/Enemies/Projectiles/Iceball_84x9.png" type="Texture" id=2]
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 2 )
+region = Rect2( 0, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 2 )
+region = Rect2( 84, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 2 )
+region = Rect2( 168, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=4]
+atlas = ExtResource( 2 )
+region = Rect2( 252, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 2 )
+region = Rect2( 336, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=6]
+atlas = ExtResource( 2 )
+region = Rect2( 420, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=7]
+atlas = ExtResource( 2 )
+region = Rect2( 504, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=8]
+atlas = ExtResource( 2 )
+region = Rect2( 588, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=9]
+atlas = ExtResource( 2 )
+region = Rect2( 672, 0, 84, 63 )
+
+[sub_resource type="AtlasTexture" id=10]
+atlas = ExtResource( 2 )
+region = Rect2( 756, 0, 84, 63 )
+
+[sub_resource type="SpriteFrames" id=11]
+animations = [ {
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ],
+"loop": true,
+"name": "fire",
+"speed": 5.0
+} ]
+
+[sub_resource type="CapsuleShape2D" id=12]
+height = 36.5213
+
+[node name="Fireball" type="Area2D" groups=[
+"enemy_projectile_2",
+]]
+scale = Vector2( 0.5, 0.5 )
+collision_layer = 0
+collision_mask = 2
+script = ExtResource( 1 )
+
+[node name="Sprite" type="AnimatedSprite" parent="."]
+frames = SubResource( 11 )
+animation = "fire"
+frame = 7
+playing = true
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2( -34.9228, -2.77795 )
+shape = SubResource( 12 )
+
+[node name="Lifetime" type="Timer" parent="."]
+wait_time = 2.0
+one_shot = true
+autostart = true
+
+[connection signal="timeout" from="Lifetime" to="." method="_on_Lifetime_timeout"]