Main.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://src/Levels/Level.tscn" type="PackedScene" id=1]
+[ext_resource path="res://src/playerC/Player.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/CameraControl-Position2D.gd" type="Script" id=5]
 [ext_resource path="res://assets/Fonts/QuinqueFive.tres" type="DynamicFont" id=8]
 [ext_resource path="res://src/UI_Layer.gd" type="Script" id=9]
@@ -17,10 +18,17 @@ b = Vector2( -1, 349 )
 [node name="Main" type="Node2D"]
 
 [node name="Level" parent="." instance=ExtResource( 1 )]
+__meta__ = {
+"_edit_lock_": true
+}
 
 [node name="Player" parent="." instance=ExtResource( 14 )]
 position = Vector2( 93, 54 )
 
+[node name="PlayerC" parent="." instance=ExtResource( 2 )]
+position = Vector2( 144, 226 )
+player_number = 2
+
 [node name="CameraControl" type="Position2D" parent="."]
 process_priority = 1
 script = ExtResource( 5 )
@@ -141,12 +149,3 @@ texture_under = ExtResource( 10 )
 texture_progress = ExtResource( 11 )
 texture_progress_offset = Vector2( 1, 1 )
 script = ExtResource( 12 )
-
-[node name="Debug" type="Label" parent="UI_Layer"]
-anchor_left = 1.0
-anchor_right = 1.0
-margin_left = -64.0
-margin_top = 3.0
-margin_right = -3.0
-margin_bottom = 17.0
-text = "Foo"

assets/High Forest/Assets/Buildings.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Buildings.png-770ff715356884b1c817297b61c9d391.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Assets/Buildings.png"
-dest_files=[ "res://.import/Buildings.png-770ff715356884b1c817297b61c9d391.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Assets/Hive.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Hive.png-a7fa10a68a6ac7e64a951c5120ca919a.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Assets/Hive.png"
-dest_files=[ "res://.import/Hive.png-a7fa10a68a6ac7e64a951c5120ca919a.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Assets/Interior-01.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Interior-01.png-5c49d1d4148443ce62e7ce8e2971cc4b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Assets/Interior-01.png"
-dest_files=[ "res://.import/Interior-01.png-5c49d1d4148443ce62e7ce8e2971cc4b.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Assets/Props-Rocks.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Props-Rocks.png-5fc44cb3261fb640ef6f4b399e25936d.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Assets/Props-Rocks.png"
-dest_files=[ "res://.import/Props-Rocks.png-5fc44cb3261fb640ef6f4b399e25936d.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Assets/Tiles.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Tiles.png-13228209615493c28b4ffdc1d443689f.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Assets/Tiles.png"
-dest_files=[ "res://.import/Tiles.png-13228209615493c28b4ffdc1d443689f.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Assets/Tree-Assets.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Tree-Assets.png-ddc68d744737f7a66e85f4d2594672c8.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Assets/Tree-Assets.png"
-dest_files=[ "res://.import/Tree-Assets.png-ddc68d744737f7a66e85f4d2594672c8.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Background/Background.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Background.png-3958feb05652cfef811e8899a80f4b21.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Background/Background.png"
-dest_files=[ "res://.import/Background.png-3958feb05652cfef811e8899a80f4b21.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/HUD/Base-01.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Base-01.png-e14dd8e752d14575f026a4d902d2c6d1.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/HUD/Base-01.png"
-dest_files=[ "res://.import/Base-01.png-e14dd8e752d14575f026a4d902d2c6d1.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Trees/Background.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Background.png-a121f2f8cdc5cc7f47f7eef3e48f2ea6.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Trees/Background.png"
-dest_files=[ "res://.import/Background.png-a121f2f8cdc5cc7f47f7eef3e48f2ea6.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Trees/Dark-Tree.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Dark-Tree.png-ec5d91cebe262b341ca5e14c371992d1.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Trees/Dark-Tree.png"
-dest_files=[ "res://.import/Dark-Tree.png-ec5d91cebe262b341ca5e14c371992d1.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Trees/Golden-Tree.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Golden-Tree.png-20c481574afe14f8f761d802692ea581.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Trees/Golden-Tree.png"
-dest_files=[ "res://.import/Golden-Tree.png-20c481574afe14f8f761d802692ea581.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Trees/Green-Tree.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Green-Tree.png-d2411d0125ab213d8ffa7bf9c74df92d.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Trees/Green-Tree.png"
-dest_files=[ "res://.import/Green-Tree.png-d2411d0125ab213d8ffa7bf9c74df92d.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Trees/Red-Tree.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Red-Tree.png-3708fbf3bca869e7647318f93e501cc0.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Trees/Red-Tree.png"
-dest_files=[ "res://.import/Red-Tree.png-3708fbf3bca869e7647318f93e501cc0.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/High Forest/Trees/Yellow-Tree.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Yellow-Tree.png-b7a2ad7318796ee49c166d8ef5238bf4.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/High Forest/Trees/Yellow-Tree.png"
-dest_files=[ "res://.import/Yellow-Tree.png-b7a2ad7318796ee49c166d8ef5238bf4.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/Tiles/Assets/Sprite-0002.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Sprite-0002.png-7e0b22663bb9fd1f35794e30fe2058e2.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/Tiles/Assets/Sprite-0002.png"
-dest_files=[ "res://.import/Sprite-0002.png-7e0b22663bb9fd1f35794e30fe2058e2.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

project.godot

@@ -24,16 +24,6 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://src/components/Health_Component.gd"
 }, {
-"base": "Area2D",
-"class": "Interactable",
-"language": "GDScript",
-"path": "res://src/components/Interactable_Component.gd"
-}, {
-"base": "Node2D",
-"class": "Interactable_Receiver",
-"language": "GDScript",
-"path": "res://src/components/Interactable_Receiver.gd"
-}, {
 "base": "Node",
 "class": "MovementComponent",
 "language": "GDScript",
@@ -73,8 +63,6 @@ _global_script_class_icons={
 "Actor": "",
 "FrameSoundEffects": "",
 "HealthComponent": "",
-"Interactable": "",
-"Interactable_Receiver": "",
 "MovementComponent": "",
 "State": "",
 "StateAnimatedActor": "",
@@ -92,8 +80,7 @@ config/icon="res://icon.png"
 
 [aseprite]
 
-animation/layers/exclusion_pattern="_+"
+animation/layers/exclusion_pattern="_"
-animation/layers/only_include_visible_layers_by_default=true
 
 [autoload]
 

src/Levels/Level.tscn

@@ -1,9 +1,8 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/Tiles/Assets/Demo TileSet.tres" type="TileSet" id=2]
 [ext_resource path="res://assets/Backgrounds/bgmuck.png" type="Texture" id=3]
-[ext_resource path="res://src/components/Interactable_Component.tscn" type="PackedScene" id=4]
 [ext_resource path="res://assets/Music/platformer_level03_loop.ogg" type="AudioStream" id=6]
 [ext_resource path="res://src/enemyC/EnemyC.tscn" type="PackedScene" id=7]
 
@@ -72,6 +71,3 @@ __meta__ = {
 "_edit_lock_": true
 }
 actor_type = "NPC"
-
-[node name="Interactable_Component" parent="." instance=ExtResource( 4 )]
-position = Vector2( 186, 144 )

src/Levels/Level2.tscn

@@ -1,104 +0,0 @@
-[gd_scene load_steps=9 format=2]
-
-[ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
-[ext_resource path="res://assets/Tiles/Assets/Demo TileSet.tres" type="TileSet" id=2]
-[ext_resource path="res://assets/Backgrounds/bgmuck.png" type="Texture" id=3]
-[ext_resource path="res://assets/Tiles/Assets/Sprite-0002.png" type="Texture" id=4]
-[ext_resource path="res://assets/Music/platformer_level03_loop.ogg" type="AudioStream" id=6]
-[ext_resource path="res://src/enemyC/EnemyC.tscn" type="PackedScene" id=7]
-
-[sub_resource type="TileSet" id=1]
-
-[sub_resource type="TileSet" id=2]
-0/name = "Sprite-0002.png 0"
-0/texture = ExtResource( 4 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 0, 0, 144, 128 )
-0/tile_mode = 2
-0/autotile/icon_coordinate = Vector2( 0, 0 )
-0/autotile/tile_size = Vector2( 16, 16 )
-0/autotile/spacing = 0
-0/autotile/occluder_map = [  ]
-0/autotile/navpoly_map = [  ]
-0/autotile/priority_map = [  ]
-0/autotile/z_index_map = [  ]
-0/occluder_offset = Vector2( 0, 0 )
-0/navigation_offset = Vector2( 0, 0 )
-0/shape_offset = Vector2( 0, 0 )
-0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-0/shape_one_way = false
-0/shape_one_way_margin = 0.0
-0/shapes = [  ]
-0/z_index = 0
-
-[node name="Level" type="Node2D"]
-
-[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
-scroll_base_scale = Vector2( 0.4, 1 )
-scroll_limit_end = Vector2( 1300, 0 )
-
-[node name="ParallaxLayer" type="ParallaxLayer" parent="ParallaxBackground"]
-motion_mirroring = Vector2( 500, 0 )
-__meta__ = {
-"_edit_group_": true,
-"_edit_lock_": true
-}
-
-[node name="Bgmuck" type="Sprite" parent="ParallaxBackground/ParallaxLayer"]
-texture = ExtResource( 3 )
-centered = false
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="Background TileMap" type="TileMap" parent="."]
-z_index = -1
-tile_set = SubResource( 1 )
-cell_size = Vector2( 16, 16 )
-format = 1
-tile_data = PoolIntArray( 47, 0, 327682, 48, 0, 327682, 49, 0, 327682, 50, 0, 327682, 51, 0, 327682, 52, 0, 327682, 65582, 0, 196608, 65583, 0, 327682, 65584, 0, 327682, 65585, 0, 327682, 65586, 0, 327682, 65587, 0, 327682, 65588, 0, 327682, 131118, 0, 196608, 131119, 0, 327683, 131120, 0, 327682, 131121, 0, 327683, 131122, 0, 327683, 131123, 0, 327683, 131124, 0, 327683, 196655, 0, 327683, 196656, 0, 327682, 196657, 0, 327682, 196658, 0, 327683, 196659, 0, 327683, 196660, 0, 327683, 262191, 0, 327682, 262192, 0, 327682, 262193, 0, 327683, 262194, 0, 327682, 262195, 0, 327682, 262196, 0, 327682, 327727, 0, 327683, 327728, 0, 327683, 327729, 0, 327683, 327730, 0, 327683, 327731, 0, 327682, 327732, 0, 327682, 393263, 0, 327682, 393264, 0, 327682, 393265, 0, 327683, 393266, 0, 327682, 393267, 0, 327682, 393268, 0, 327682, 458799, 0, 327682, 458800, 0, 327682, 458801, 0, 327682, 458802, 0, 327682, 458803, 0, 327682, 458804, 0, 327683, 524335, 0, 327682, 524336, 0, 327682, 524337, 0, 327683, 524338, 0, 327683, 524339, 0, 327683, 524340, 0, 327683, 589871, 0, 327682, 589872, 0, 327682, 589873, 0, 327683, 589874, 0, 327683, 589875, 0, 327683, 589876, 0, 327683 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="Collision TileMap" type="TileMap" parent="."]
-tile_set = SubResource( 2 )
-cell_size = Vector2( 16, 16 )
-show_collision = true
-format = 1
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="Foreground TileMap" type="TileMap" parent="."]
-z_index = 1
-tile_set = ExtResource( 2 )
-cell_size = Vector2( 16, 16 )
-format = 1
-tile_data = PoolIntArray( -131044, 0, 262152, -65508, 0, 262152, 28, 0, 262152, 44, 0, 262145, 45, 0, 262146, 46, 0, 262146, 47, 0, 262147, 65564, 0, 262152, 65581, 0, 327685, 65582, 0, 327686, 65583, 0, 327687, 131100, 0, 262152, 131118, 0, 327688, 196636, 0, 262152, 196654, 0, 327688, 262190, 0, 327688, 327726, 0, 327688, 393262, 0, 327688, 458798, 0, 327690, 589827, 0, 262148, 589828, 0, 262149, 589829, 0, 262149, 589830, 0, 262149, 589831, 0, 262151 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 6 )
-
-[node name="EnemyC" parent="." instance=ExtResource( 7 )]
-position = Vector2( 394, 47 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="EnemyC2" parent="." instance=ExtResource( 7 )]
-position = Vector2( 492, 27 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="ActorTemplate" parent="." instance=ExtResource( 1 )]
-position = Vector2( 262, 44 )
-__meta__ = {
-"_edit_lock_": true
-}
-actor_type = "NPC"

src/Levels/Level3.tscn

@@ -1,291 +0,0 @@
-[gd_scene load_steps=20 format=2]
-
-[ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
-[ext_resource path="res://assets/Tiles/Assets/Demo TileSet.tres" type="TileSet" id=2]
-[ext_resource path="res://assets/High Forest/Background/Background.png" type="Texture" id=3]
-[ext_resource path="res://assets/High Forest/Assets/Tiles.png" type="Texture" id=4]
-[ext_resource path="res://assets/Music/platformer_level03_loop.ogg" type="AudioStream" id=6]
-[ext_resource path="res://src/enemyC/EnemyC.tscn" type="PackedScene" id=7]
-
-[sub_resource type="TileSet" id=1]
-
-[sub_resource type="ConvexPolygonShape2D" id=13]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=14]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=16]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=17]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=18]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=19]
-points = PoolVector2Array( 0, 16, 16, 8.56219, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=20]
-points = PoolVector2Array( 0, 8.40067, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=21]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=22]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=23]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=24]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="TileSet" id=11]
-0/name = "Tiles.png 0"
-0/texture = ExtResource( 4 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 0, 0, 80, 80 )
-0/tile_mode = 2
-0/autotile/icon_coordinate = Vector2( 0, 0 )
-0/autotile/tile_size = Vector2( 16, 16 )
-0/autotile/spacing = 0
-0/autotile/occluder_map = [  ]
-0/autotile/navpoly_map = [  ]
-0/autotile/priority_map = [  ]
-0/autotile/z_index_map = [  ]
-0/occluder_offset = Vector2( 0, 0 )
-0/navigation_offset = Vector2( 0, 0 )
-0/shape_offset = Vector2( 0, 0 )
-0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-0/shape = SubResource( 13 )
-0/shape_one_way = false
-0/shape_one_way_margin = 1.0
-0/shapes = [ {
-"autotile_coord": Vector2( 0, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 13 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 1, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 14 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 2, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 16 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 3, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 17 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 4, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 18 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-0/z_index = 0
-1/name = "Tiles.png 1"
-1/texture = ExtResource( 4 )
-1/tex_offset = Vector2( 0, 0 )
-1/modulate = Color( 1, 1, 1, 1 )
-1/region = Rect2( 0, 80, 80, 80 )
-1/tile_mode = 2
-1/autotile/icon_coordinate = Vector2( 0, 0 )
-1/autotile/tile_size = Vector2( 16, 16 )
-1/autotile/spacing = 0
-1/autotile/occluder_map = [  ]
-1/autotile/navpoly_map = [  ]
-1/autotile/priority_map = [  ]
-1/autotile/z_index_map = [  ]
-1/occluder_offset = Vector2( 0, 0 )
-1/navigation_offset = Vector2( 0, 0 )
-1/shape_offset = Vector2( 0, 0 )
-1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-1/shape_one_way = false
-1/shape_one_way_margin = 0.0
-1/shapes = [  ]
-1/z_index = 0
-2/name = "Tiles.png 2"
-2/texture = ExtResource( 4 )
-2/tex_offset = Vector2( 0, 0 )
-2/modulate = Color( 1, 1, 1, 1 )
-2/region = Rect2( 80, 0, 64, 48 )
-2/tile_mode = 2
-2/autotile/icon_coordinate = Vector2( 0, 0 )
-2/autotile/tile_size = Vector2( 16, 16 )
-2/autotile/spacing = 0
-2/autotile/occluder_map = [  ]
-2/autotile/navpoly_map = [  ]
-2/autotile/priority_map = [  ]
-2/autotile/z_index_map = [  ]
-2/occluder_offset = Vector2( 0, 0 )
-2/navigation_offset = Vector2( 0, 0 )
-2/shape_offset = Vector2( 0, 0 )
-2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-2/shape = SubResource( 19 )
-2/shape_one_way = false
-2/shape_one_way_margin = 1.0
-2/shapes = [ {
-"autotile_coord": Vector2( 0, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 19 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 1, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 20 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-2/z_index = 0
-3/name = "Tiles.png 3"
-3/texture = ExtResource( 4 )
-3/tex_offset = Vector2( 0, 0 )
-3/modulate = Color( 1, 1, 1, 1 )
-3/region = Rect2( 64, 160, 96, 48 )
-3/tile_mode = 2
-3/autotile/icon_coordinate = Vector2( 0, 0 )
-3/autotile/tile_size = Vector2( 16, 16 )
-3/autotile/spacing = 0
-3/autotile/occluder_map = [  ]
-3/autotile/navpoly_map = [  ]
-3/autotile/priority_map = [  ]
-3/autotile/z_index_map = [  ]
-3/occluder_offset = Vector2( 0, 0 )
-3/navigation_offset = Vector2( 0, 0 )
-3/shape_offset = Vector2( 0, 0 )
-3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-3/shape_one_way = false
-3/shape_one_way_margin = 0.0
-3/shapes = [  ]
-3/z_index = 0
-4/name = "Tiles.png 4"
-4/texture = ExtResource( 4 )
-4/tex_offset = Vector2( 0, 0 )
-4/modulate = Color( 1, 1, 1, 1 )
-4/region = Rect2( 80, 48, 48, 64 )
-4/tile_mode = 2
-4/autotile/icon_coordinate = Vector2( 0, 0 )
-4/autotile/tile_size = Vector2( 16, 16 )
-4/autotile/spacing = 0
-4/autotile/occluder_map = [  ]
-4/autotile/navpoly_map = [  ]
-4/autotile/priority_map = [  ]
-4/autotile/z_index_map = [  ]
-4/occluder_offset = Vector2( 0, 0 )
-4/navigation_offset = Vector2( 0, 0 )
-4/shape_offset = Vector2( 0, 0 )
-4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-4/shape = SubResource( 21 )
-4/shape_one_way = false
-4/shape_one_way_margin = 1.0
-4/shapes = [ {
-"autotile_coord": Vector2( 2, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 21 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 0, 3 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 22 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 1, 3 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 23 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 2, 3 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 24 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-4/z_index = 0
-
-[node name="Level3" type="Node2D"]
-
-[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
-scroll_base_scale = Vector2( 0.4, 1 )
-scroll_limit_end = Vector2( 1300, 0 )
-
-[node name="ParallaxLayer" type="ParallaxLayer" parent="ParallaxBackground"]
-motion_mirroring = Vector2( 500, 0 )
-__meta__ = {
-"_edit_group_": true,
-"_edit_lock_": true
-}
-
-[node name="Bgmuck" type="Sprite" parent="ParallaxBackground/ParallaxLayer"]
-texture = ExtResource( 3 )
-centered = false
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="Background TileMap" type="TileMap" parent="."]
-z_index = -1
-tile_set = SubResource( 1 )
-cell_size = Vector2( 16, 16 )
-format = 1
-tile_data = PoolIntArray( 47, 0, 327682, 48, 0, 327682, 49, 0, 327682, 50, 0, 327682, 51, 0, 327682, 52, 0, 327682, 65582, 0, 196608, 65583, 0, 327682, 65584, 0, 327682, 65585, 0, 327682, 65586, 0, 327682, 65587, 0, 327682, 65588, 0, 327682, 131118, 0, 196608, 131119, 0, 327683, 131120, 0, 327682, 131121, 0, 327683, 131122, 0, 327683, 131123, 0, 327683, 131124, 0, 327683, 196655, 0, 327683, 196656, 0, 327682, 196657, 0, 327682, 196658, 0, 327683, 196659, 0, 327683, 196660, 0, 327683, 262191, 0, 327682, 262192, 0, 327682, 262193, 0, 327683, 262194, 0, 327682, 262195, 0, 327682, 262196, 0, 327682, 327727, 0, 327683, 327728, 0, 327683, 327729, 0, 327683, 327730, 0, 327683, 327731, 0, 327682, 327732, 0, 327682, 393263, 0, 327682, 393264, 0, 327682, 393265, 0, 327683, 393266, 0, 327682, 393267, 0, 327682, 393268, 0, 327682, 458799, 0, 327682, 458800, 0, 327682, 458801, 0, 327682, 458802, 0, 327682, 458803, 0, 327682, 458804, 0, 327683, 524335, 0, 327682, 524336, 0, 327682, 524337, 0, 327683, 524338, 0, 327683, 524339, 0, 327683, 524340, 0, 327683, 589871, 0, 327682, 589872, 0, 327682, 589873, 0, 327683, 589874, 0, 327683, 589875, 0, 327683, 589876, 0, 327683 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="Collision TileMap" type="TileMap" parent="."]
-tile_set = SubResource( 11 )
-cell_size = Vector2( 16, 16 )
-show_collision = true
-format = 1
-tile_data = PoolIntArray( 196636, 4, 131072, 196637, 4, 131073, 196638, 4, 131073, 196639, 4, 131073, 196640, 4, 131073, 196641, 4, 131073, 196642, 4, 131073, 196643, 4, 131074, 262172, 4, 196608, 262173, 4, 196609, 262174, 4, 196609, 262175, 4, 196609, 262176, 4, 196609, 262177, 4, 196609, 262178, 4, 196609, 262179, 4, 196610, 458770, 2, 1, 458771, 0, 1, 458772, 0, 2, 458773, 0, 3, 458774, 0, 1, 458775, 0, 2, 458776, 0, 3, 458777, 4, 2, 458778, 0, 1, 458779, 0, 2, 458780, 0, 3, 458781, 0, 1, 458782, 0, 2, 458783, 0, 3, 458784, 4, 2, 458785, 0, 1, 458786, 0, 2, 458787, 0, 3, 458788, 0, 1, 458789, 0, 2, 458790, 0, 3, 458791, 4, 2, 458792, 0, 4, 524304, 2, 1, 524305, 2, 65536, 524306, 2, 65537, 524307, 0, 65537, 524308, 0, 65538, 524309, 0, 65539, 524310, 0, 65537, 524311, 0, 65538, 524312, 0, 65539, 524313, 4, 65538, 524314, 0, 65537, 524315, 0, 65538, 524316, 0, 65539, 524317, 0, 65537, 524318, 0, 65538, 524319, 0, 65539, 524320, 4, 65538, 524321, 0, 65537, 524322, 0, 65538, 524323, 0, 65539, 524324, 0, 65537, 524325, 0, 65538, 524326, 0, 65539, 524327, 4, 65538, 524328, 0, 65540, 589826, 0, 0, 589827, 0, 1, 589828, 0, 2, 589829, 0, 3, 589830, 0, 1, 589831, 0, 2, 589832, 0, 3, 589833, 0, 1, 589834, 0, 2, 589835, 0, 3, 589836, 0, 1, 589837, 0, 2, 589838, 0, 3, 589839, 2, 65536, 589840, 2, 65537, 589841, 2, 131072, 589842, 2, 131073, 589843, 0, 131073, 589844, 0, 131074, 589845, 0, 131075, 589846, 0, 131073, 589847, 0, 131074, 589848, 0, 131075, 589849, 0, 131074, 589850, 0, 131073, 589851, 0, 131074, 589852, 0, 131075, 589853, 0, 131073, 589854, 0, 131074, 589855, 0, 131075, 589856, 0, 131074, 589857, 0, 131073, 589858, 0, 131074, 589859, 0, 131075, 589860, 0, 131073, 589861, 0, 131074, 589862, 0, 131075, 589863, 0, 131074, 589864, 0, 131076, 655362, 0, 65536, 655363, 0, 65537, 655364, 0, 65538, 655365, 0, 65539, 655366, 0, 65537, 655367, 0, 65538, 655368, 0, 65539, 655369, 0, 65537, 655370, 0, 65538, 655371, 0, 65539, 655372, 0, 65537, 655373, 0, 65538, 655374, 0, 65539, 655375, 2, 131072, 655376, 2, 131073, 655377, 4, 0, 655378, 4, 1, 655379, 0, 196610, 655380, 0, 196610, 655381, 0, 196610, 655382, 0, 196610, 655383, 0, 196610, 655384, 0, 196610, 655385, 0, 196610, 655386, 0, 196610, 655387, 0, 196610, 655388, 0, 196610, 655389, 0, 196610, 655390, 0, 196610, 655391, 0, 196610, 655392, 0, 196610, 655393, 0, 196610, 655394, 0, 196610, 655395, 0, 196610, 655396, 0, 196610, 655397, 0, 196610, 655398, 0, 196610, 655399, 0, 196610, 655400, 0, 196612, 720898, 0, 131072, 720899, 0, 131073, 720900, 0, 131074, 720901, 0, 131075, 720902, 0, 131073, 720903, 0, 131074, 720904, 0, 131075, 720905, 0, 131073, 720906, 0, 131074, 720907, 0, 131075, 720908, 0, 131073, 720909, 0, 131074, 720910, 0, 131075, 720911, 4, 0, 720912, 4, 1, 720913, 0, 196610, 720914, 0, 196610, 720915, 0, 196610, 720916, 0, 196610, 720917, 0, 196610, 720918, 0, 196610, 720919, 0, 196610, 720920, 0, 196610, 720921, 0, 196610, 720922, 0, 196610, 720923, 0, 196610, 720924, 0, 196610, 720925, 0, 196610, 720926, 0, 196610, 720927, 0, 196610, 720928, 0, 196610, 720929, 0, 196610, 720930, 0, 196610, 720931, 0, 196610, 720932, 0, 196610, 720933, 0, 196610, 720934, 0, 196610, 720935, 0, 262147, 720936, 0, 262148 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="Foreground TileMap" type="TileMap" parent="."]
-z_index = 1
-tile_set = ExtResource( 2 )
-cell_size = Vector2( 16, 16 )
-format = 1
-tile_data = PoolIntArray( -131044, 0, 262152, -65508, 0, 262152, 28, 0, 262152, 44, 0, 262145, 45, 0, 262146, 46, 0, 262146, 47, 0, 262147, 65564, 0, 262152, 65581, 0, 327685, 65582, 0, 327686, 65583, 0, 327687, 131100, 0, 262152, 131118, 0, 327688, 196636, 0, 262152, 196654, 0, 327688, 262190, 0, 327688, 327726, 0, 327688, 393262, 0, 327688, 458798, 0, 327690, 589827, 0, 262148, 589828, 0, 262149, 589829, 0, 262149, 589830, 0, 262149, 589831, 0, 262151 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 6 )
-
-[node name="EnemyC" parent="." instance=ExtResource( 7 )]
-position = Vector2( 394, 47 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="EnemyC2" parent="." instance=ExtResource( 7 )]
-position = Vector2( 492, 27 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="ActorTemplate" parent="." instance=ExtResource( 1 )]
-position = Vector2( 221, 135 )
-__meta__ = {
-"_edit_lock_": true
-}
-actor_type = "NPC"

src/UI_Layer.gd

@@ -34,7 +34,7 @@ func _ready():
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
-	$Debug.text = UiManager.debug_text
+	
 	if (UiManager.current_pane != current_pane):
 		print("UI Switch detected")
 		current_pane = UiManager.current_pane

src/components/Interactable_Component.gd

@@ -1,48 +0,0 @@
-class_name Interactable
-extends Area2D
-
-## I'm not quite sure what to do with this yet but the idea is having an 
-# area2d that detects not just a body entering a certain zone but triggering an 
-# interract status. For a player this would probably be pressing a button. 
-# the component can perhaps have a prompt of some sort to indicate what they're
-# supposed to do. Additionaly the interraction could perhaps trigger some 
-# sort of animation when the action is performed. 
-
-# This may have to be implemented as a bi-directional mediator pattern where
-# the player node is given some sort of call back upon entering the region and 
-# when it happens it fires off that call back. 
-# This means that whatever entity that is supposed to interract with these
-# objects should also have a receiver function of some kind.
-
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-export (NodePath) var sprite_node
-
-onready var sprite: Sprite = get_node(sprite_node)
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
-
-func trigger_interaction():
-	# This is something that should maybe be extended for every differant interactible.
-	# They could inherit from this base class and implement this function. 
-	pass
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta):
-#	pass
-
-# When a body enters this area
-# We want to give that body (a player I assume) a callback or a reference to this
-# Node.
-func _on_Interactable_Component_body_entered(body):
-	var colliding_node = body
-	if colliding_node.has_node("Interactable_Receiver"):
-		colliding_node.get_node("Interactable_Receiver").register_interactable(self)
-
-func _on_Interactable_Component_body_exited(body):
-	var colliding_node = body
-	if colliding_node.has_node("Interactable_Receiver"):
-		colliding_node.get_node("Interactable_Receiver").register_interactable(self)

src/components/Interactable_Component.tscn

@@ -1,24 +0,0 @@
-[gd_scene load_steps=4 format=2]
-
-[ext_resource path="res://assets/High Forest/Assets/Interior-01.png" type="Texture" id=1]
-[ext_resource path="res://src/components/Interactable_Component.gd" type="Script" id=2]
-
-[sub_resource type="RectangleShape2D" id=1]
-
-[node name="Interactable_Component" type="Area2D"]
-script = ExtResource( 2 )
-sprite_node = NodePath("Sprite")
-
-[node name="Sprite" type="Sprite" parent="."]
-texture = ExtResource( 1 )
-vframes = 2
-region_enabled = true
-region_rect = Rect2( 49, 80, 30, 64 )
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-modulate = Color( 0.290196, 1, 0, 1 )
-position = Vector2( -1, 3 )
-shape = SubResource( 1 )
-
-[connection signal="body_entered" from="." to="." method="_on_Interactable_Component_body_entered"]
-[connection signal="body_exited" from="." to="." method="_on_Interactable_Component_body_exited"]

src/components/Interactable_Receiver.gd

@@ -1,45 +0,0 @@
-class_name Interactable_Receiver
-extends Node2D
-
-# This may be stupid but we're going to have two kinds of callbacks here. 
-# It's going to be up to the parent/actor/kinematicbody2d/whatever to know
-# what conditions have to be met before being able to call that interactible's
-# function. 
-# This is a nice and generic interface that I might be able to use for 
-# things like opening doors in a level, opening chests/flipping switches etc.
-
-# This node can keep an array of various interactibles within a level
-# and provide several helper functions for managing them perhaps.
-
-export(String) var interactable_parent_callback = ""
-
-var call_function: FuncRef
-
-var interactable_function_callables = []
-
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	if interactable_parent_callback:
-		call_function = funcref(owner, interactable_parent_callback)
-	else:
-		print("Warning: No interactable receiver function defined on ", owner.name)
-
-# Switching to a new model that starts with Hitbox 
-func register_interactable(sender):
-	print("Interactable Registered  " + sender.name)
-	if interactable_parent_callback:
-		call_function.call_func()
-		interactable_function_callables.append(sender)
-
-func remove_interactable(sender):
-	print("Interactable Removal  " + sender.name)
-	if interactable_function_callables.has(sender):
-		var sender_index = interactable_function_callables.rfind(sender)
-		if sender_index != -1:
-			interactable_function_callables.remove(sender_index)
-

src/playerD/Player.gd

@@ -33,10 +33,7 @@ func _on_attack_do_attack():
 
 
 func _on_Health_Component_health_depleted():
-	$Hurtbox_Component.set_hurtbox(false)
+	queue_free()
-	movement_state_machine.change_state($movement_state_machine/die)
-	yield( get_tree().create_timer(10), "timeout")
-	#queue_free()
 
 func _on_roll_frame_reached(state_name, animation_name, frame_number):
 	print("I'm invincible!!!")
@@ -46,5 +43,4 @@ func _on_roll_state_exited():
 	print("Nevermind. I'm vulnerable.")
 	$Hurtbox_Component.set_hurtbox(true)
 
-func _on_die_state_entered():
+
-	pass # Replace with function body.

src/playerD/Player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=127 format=2]
+[gd_scene load_steps=109 format=2]
 
 [ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/playerD/movement_component.gd" type="Script" id=2]
@@ -14,441 +14,375 @@
 [ext_resource path="res://src/playerD/states/hurt.gd" type="Script" id=12]
 [ext_resource path="res://src/Gun.gd" type="Script" id=13]
 [ext_resource path="res://src/playerD/states/roll.gd" type="Script" id=14]
-[ext_resource path="res://src/state_animated_actor.gd" type="Script" id=15]
-[ext_resource path="res://src/components/Interactable_Receiver.gd" type="Script" id=16]
 
 [sub_resource type="StreamTexture" id=90]
 load_path = "res://.import/Mega.png-93dfe0790902b932f7b46f7b23c5d4e7.stex"
 
 [sub_resource type="AtlasTexture" id=91]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 960, 240, 160 )
+region = Rect2( 0, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=92]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 960, 240, 160 )
+region = Rect2( 240, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=93]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 960, 240, 160 )
+region = Rect2( 480, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=94]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 960, 240, 160 )
+region = Rect2( 720, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=95]
 atlas = SubResource( 90 )
-region = Rect2( 2400, 960, 240, 160 )
+region = Rect2( 960, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=96]
 atlas = SubResource( 90 )
-region = Rect2( 0, 1120, 240, 160 )
+region = Rect2( 1200, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=97]
 atlas = SubResource( 90 )
-region = Rect2( 240, 1120, 240, 160 )
+region = Rect2( 1440, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=98]
 atlas = SubResource( 90 )
-region = Rect2( 480, 1120, 240, 160 )
+region = Rect2( 1680, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=99]
 atlas = SubResource( 90 )
-region = Rect2( 720, 1120, 240, 160 )
+region = Rect2( 1920, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=100]
 atlas = SubResource( 90 )
-region = Rect2( 960, 1120, 240, 160 )
+region = Rect2( 2160, 1120, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=101]
 atlas = SubResource( 90 )
-region = Rect2( 480, 160, 240, 160 )
+region = Rect2( 720, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=102]
 atlas = SubResource( 90 )
-region = Rect2( 720, 160, 240, 160 )
+region = Rect2( 960, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=103]
 atlas = SubResource( 90 )
-region = Rect2( 960, 160, 240, 160 )
+region = Rect2( 1200, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=104]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 160, 240, 160 )
+region = Rect2( 1440, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=105]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 160, 240, 160 )
+region = Rect2( 1680, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=106]
 atlas = SubResource( 90 )
-region = Rect2( 720, 1440, 240, 160 )
+region = Rect2( 1200, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=107]
 atlas = SubResource( 90 )
-region = Rect2( 960, 1440, 240, 160 )
+region = Rect2( 0, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=108]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 1440, 240, 160 )
+region = Rect2( 1440, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=109]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 1440, 240, 160 )
+region = Rect2( 1680, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=110]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 1440, 240, 160 )
+region = Rect2( 1920, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=111]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 1440, 240, 160 )
+region = Rect2( 2160, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=112]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 1440, 240, 160 )
+region = Rect2( 0, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=113]
 atlas = SubResource( 90 )
-region = Rect2( 2400, 1440, 240, 160 )
+region = Rect2( 240, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=114]
 atlas = SubResource( 90 )
-region = Rect2( 0, 1600, 240, 160 )
+region = Rect2( 480, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=115]
 atlas = SubResource( 90 )
-region = Rect2( 240, 1600, 240, 160 )
+region = Rect2( 1920, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=116]
 atlas = SubResource( 90 )
-region = Rect2( 480, 1600, 240, 160 )
+region = Rect2( 2160, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=117]
 atlas = SubResource( 90 )
-region = Rect2( 960, 960, 240, 160 )
+region = Rect2( 0, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=118]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 960, 240, 160 )
+region = Rect2( 240, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=119]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 0, 240, 160 )
+region = Rect2( 480, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=120]
 atlas = SubResource( 90 )
-region = Rect2( 0, 0, 240, 160 )
+region = Rect2( 720, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=121]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 0, 240, 160 )
+region = Rect2( 960, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=122]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 0, 240, 160 )
+region = Rect2( 1440, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=123]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 0, 240, 160 )
+region = Rect2( 1680, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=124]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 0, 240, 160 )
+region = Rect2( 1920, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=125]
 atlas = SubResource( 90 )
-region = Rect2( 720, 1600, 240, 160 )
+region = Rect2( 240, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=126]
 atlas = SubResource( 90 )
-region = Rect2( 960, 1600, 240, 160 )
+region = Rect2( 480, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=127]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 1600, 240, 160 )
+region = Rect2( 720, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=128]
 atlas = SubResource( 90 )
-region = Rect2( 2400, 0, 240, 160 )
+region = Rect2( 960, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=129]
 atlas = SubResource( 90 )
-region = Rect2( 0, 160, 240, 160 )
+region = Rect2( 1200, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=130]
 atlas = SubResource( 90 )
-region = Rect2( 240, 160, 240, 160 )
+region = Rect2( 1440, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=131]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 160, 240, 160 )
+region = Rect2( 1680, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=132]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 160, 240, 160 )
+region = Rect2( 1920, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=133]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 160, 240, 160 )
+region = Rect2( 2160, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=134]
 atlas = SubResource( 90 )
-region = Rect2( 2400, 160, 240, 160 )
+region = Rect2( 0, 960, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=135]
 atlas = SubResource( 90 )
-region = Rect2( 0, 320, 240, 160 )
+region = Rect2( 240, 960, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=136]
 atlas = SubResource( 90 )
-region = Rect2( 240, 320, 240, 160 )
+region = Rect2( 0, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=137]
 atlas = SubResource( 90 )
-region = Rect2( 480, 320, 240, 160 )
+region = Rect2( 240, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=138]
 atlas = SubResource( 90 )
-region = Rect2( 960, 320, 240, 160 )
+region = Rect2( 480, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=139]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 320, 240, 160 )
+region = Rect2( 720, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=140]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 320, 240, 160 )
+region = Rect2( 960, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=141]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 640, 240, 160 )
+region = Rect2( 1200, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=142]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 640, 240, 160 )
+region = Rect2( 1440, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=143]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 640, 240, 160 )
+region = Rect2( 1680, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=144]
 atlas = SubResource( 90 )
-region = Rect2( 2400, 640, 240, 160 )
+region = Rect2( 1920, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=145]
 atlas = SubResource( 90 )
-region = Rect2( 0, 800, 240, 160 )
+region = Rect2( 2160, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=146]
 atlas = SubResource( 90 )
-region = Rect2( 240, 800, 240, 160 )
+region = Rect2( 240, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=147]
 atlas = SubResource( 90 )
-region = Rect2( 480, 800, 240, 160 )
+region = Rect2( 480, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=148]
 atlas = SubResource( 90 )
-region = Rect2( 720, 800, 240, 160 )
+region = Rect2( 720, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=149]
 atlas = SubResource( 90 )
-region = Rect2( 960, 800, 240, 160 )
+region = Rect2( 960, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=150]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 800, 240, 160 )
+region = Rect2( 1200, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=151]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 800, 240, 160 )
+region = Rect2( 1440, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=152]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 320, 240, 160 )
+region = Rect2( 1680, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=153]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 320, 240, 160 )
+region = Rect2( 1920, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=154]
 atlas = SubResource( 90 )
-region = Rect2( 2400, 320, 240, 160 )
+region = Rect2( 2160, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=155]
 atlas = SubResource( 90 )
-region = Rect2( 0, 480, 240, 160 )
+region = Rect2( 0, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=156]
 atlas = SubResource( 90 )
-region = Rect2( 240, 480, 240, 160 )
+region = Rect2( 0, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=157]
 atlas = SubResource( 90 )
-region = Rect2( 480, 480, 240, 160 )
+region = Rect2( 240, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=158]
 atlas = SubResource( 90 )
-region = Rect2( 720, 480, 240, 160 )
+region = Rect2( 480, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=159]
 atlas = SubResource( 90 )
-region = Rect2( 960, 480, 240, 160 )
+region = Rect2( 720, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=160]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 480, 240, 160 )
+region = Rect2( 960, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=161]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 480, 240, 160 )
+region = Rect2( 1200, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=162]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 480, 240, 160 )
+region = Rect2( 1440, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=163]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 480, 240, 160 )
+region = Rect2( 1680, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=164]
 atlas = SubResource( 90 )
-region = Rect2( 2400, 480, 240, 160 )
+region = Rect2( 1920, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=165]
 atlas = SubResource( 90 )
-region = Rect2( 0, 640, 240, 160 )
+region = Rect2( 2160, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=166]
 atlas = SubResource( 90 )
-region = Rect2( 240, 640, 240, 160 )
+region = Rect2( 0, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=167]
 atlas = SubResource( 90 )
-region = Rect2( 480, 640, 240, 160 )
+region = Rect2( 240, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=168]
 atlas = SubResource( 90 )
-region = Rect2( 720, 640, 240, 160 )
+region = Rect2( 480, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=169]
 atlas = SubResource( 90 )
-region = Rect2( 960, 640, 240, 160 )
+region = Rect2( 720, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=170]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 640, 240, 160 )
+region = Rect2( 960, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=171]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 640, 240, 160 )
+region = Rect2( 1200, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=172]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 1120, 240, 160 )
+region = Rect2( 1440, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=173]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 1120, 240, 160 )
+region = Rect2( 1680, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=174]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 1120, 240, 160 )
+region = Rect2( 1920, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=175]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 1120, 240, 160 )
+region = Rect2( 2160, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=176]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 1120, 240, 160 )
+region = Rect2( 240, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=177]
 atlas = SubResource( 90 )
-region = Rect2( 2400, 1120, 240, 160 )
+region = Rect2( 480, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=178]
 atlas = SubResource( 90 )
-region = Rect2( 0, 1280, 240, 160 )
+region = Rect2( 720, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=179]
 atlas = SubResource( 90 )
-region = Rect2( 240, 1280, 240, 160 )
+region = Rect2( 960, 0, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=180]
 atlas = SubResource( 90 )
-region = Rect2( 480, 1280, 240, 160 )
+region = Rect2( 2160, 320, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=181]
 atlas = SubResource( 90 )
-region = Rect2( 720, 1280, 240, 160 )
+region = Rect2( 0, 640, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=182]
+[sub_resource type="SpriteFrames" id=182]
-atlas = SubResource( 90 )
-region = Rect2( 960, 1280, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=183]
-atlas = SubResource( 90 )
-region = Rect2( 1200, 1280, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=184]
-atlas = SubResource( 90 )
-region = Rect2( 1440, 1280, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=185]
-atlas = SubResource( 90 )
-region = Rect2( 1680, 1280, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=186]
-atlas = SubResource( 90 )
-region = Rect2( 1920, 1280, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=187]
-atlas = SubResource( 90 )
-region = Rect2( 2160, 1280, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=188]
-atlas = SubResource( 90 )
-region = Rect2( 2400, 1280, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=189]
-atlas = SubResource( 90 )
-region = Rect2( 0, 1440, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=190]
-atlas = SubResource( 90 )
-region = Rect2( 240, 1440, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=191]
-atlas = SubResource( 90 )
-region = Rect2( 480, 1440, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=192]
-atlas = SubResource( 90 )
-region = Rect2( 240, 0, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=193]
-atlas = SubResource( 90 )
-region = Rect2( 480, 0, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=194]
-atlas = SubResource( 90 )
-region = Rect2( 720, 0, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=195]
-atlas = SubResource( 90 )
-region = Rect2( 960, 0, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=196]
-atlas = SubResource( 90 )
-region = Rect2( 1680, 320, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=197]
-atlas = SubResource( 90 )
-region = Rect2( 1680, 480, 240, 160 )
-
-[sub_resource type="SpriteFrames" id=198]
 animations = [ {
 "frames": [ SubResource( 91 ), SubResource( 92 ), SubResource( 93 ), SubResource( 94 ), SubResource( 95 ), SubResource( 96 ), SubResource( 97 ), SubResource( 98 ), SubResource( 99 ), SubResource( 100 ) ],
 "loop": true,
@@ -458,74 +392,59 @@ animations = [ {
 "frames": [ SubResource( 101 ), SubResource( 101 ), SubResource( 101 ), SubResource( 102 ), SubResource( 103 ), SubResource( 104 ), SubResource( 105 ), SubResource( 105 ), SubResource( 105 ) ],
 "loop": false,
 "name": "dash",
-"speed": 10.0
+"speed": 15.0
 }, {
-"frames": [ SubResource( 106 ), SubResource( 107 ), SubResource( 108 ), SubResource( 109 ), SubResource( 110 ), SubResource( 111 ), SubResource( 112 ), SubResource( 113 ), SubResource( 114 ), SubResource( 115 ), SubResource( 114 ), SubResource( 116 ) ],
+"frames": [ SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 106 ), SubResource( 107 ), SubResource( 108 ), SubResource( 109 ), SubResource( 110 ), SubResource( 111 ) ],
-"loop": false,
-"name": "die",
-"speed": 10.0
-}, {
-"frames": [ SubResource( 117 ), SubResource( 118 ) ],
-"loop": true,
-"name": "hurt",
-"speed": 4.0
-}, {
-"frames": [ SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ), SubResource( 122 ), SubResource( 123 ), SubResource( 124 ) ],
 "loop": true,
 "name": "idle",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 125 ), SubResource( 126 ), SubResource( 127 ) ],
+"frames": [ SubResource( 112 ), SubResource( 113 ), SubResource( 114 ) ],
-"loop": true,
-"name": "idle_shield",
-"speed": 10.0
-}, {
-"frames": [ SubResource( 128 ), SubResource( 129 ), SubResource( 130 ) ],
 "loop": false,
 "name": "idle_shoot",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 131 ), SubResource( 132 ), SubResource( 133 ), SubResource( 134 ), SubResource( 132 ), SubResource( 135 ), SubResource( 136 ), SubResource( 137 ) ],
+"frames": [ SubResource( 115 ), SubResource( 116 ), SubResource( 117 ), SubResource( 118 ), SubResource( 116 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ) ],
 "loop": false,
 "name": "jump",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 138 ), SubResource( 138 ), SubResource( 138 ), SubResource( 138 ), SubResource( 138 ), SubResource( 138 ), SubResource( 139 ), SubResource( 140 ) ],
+"frames": [ SubResource( 122 ), SubResource( 122 ), SubResource( 122 ), SubResource( 122 ), SubResource( 122 ), SubResource( 122 ), SubResource( 123 ), SubResource( 124 ) ],
 "loop": false,
 "name": "jump_shoot",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ), SubResource( 146 ), SubResource( 147 ), SubResource( 148 ), SubResource( 149 ), SubResource( 150 ), SubResource( 151 ) ],
+"frames": [ SubResource( 125 ), SubResource( 126 ), SubResource( 127 ), SubResource( 128 ), SubResource( 129 ), SubResource( 130 ), SubResource( 131 ), SubResource( 132 ), SubResource( 133 ), SubResource( 134 ), SubResource( 135 ) ],
 "loop": false,
 "name": "roll",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ), SubResource( 156 ), SubResource( 157 ), SubResource( 158 ), SubResource( 159 ), SubResource( 160 ), SubResource( 161 ) ],
+"frames": [ SubResource( 136 ), SubResource( 137 ), SubResource( 138 ), SubResource( 139 ), SubResource( 140 ), SubResource( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ) ],
 "loop": true,
 "name": "run",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 162 ), SubResource( 163 ), SubResource( 164 ), SubResource( 165 ), SubResource( 166 ), SubResource( 167 ), SubResource( 168 ), SubResource( 169 ), SubResource( 170 ), SubResource( 171 ) ],
+"frames": [ SubResource( 146 ), SubResource( 147 ), SubResource( 148 ), SubResource( 149 ), SubResource( 150 ), SubResource( 151 ), SubResource( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ) ],
 "loop": true,
 "name": "run_shoot",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 172 ), SubResource( 173 ), SubResource( 174 ), SubResource( 174 ), SubResource( 175 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 178 ), SubResource( 179 ), SubResource( 180 ), SubResource( 181 ), SubResource( 182 ), SubResource( 183 ), SubResource( 184 ), SubResource( 185 ), SubResource( 186 ), SubResource( 187 ), SubResource( 188 ), SubResource( 189 ), SubResource( 190 ), SubResource( 191 ) ],
+"frames": [ SubResource( 156 ), SubResource( 157 ), SubResource( 158 ), SubResource( 158 ), SubResource( 159 ), SubResource( 160 ), SubResource( 161 ), SubResource( 162 ), SubResource( 162 ), SubResource( 163 ), SubResource( 164 ), SubResource( 165 ), SubResource( 166 ), SubResource( 167 ), SubResource( 168 ), SubResource( 169 ), SubResource( 170 ), SubResource( 171 ), SubResource( 172 ), SubResource( 173 ), SubResource( 174 ), SubResource( 175 ) ],
 "loop": true,
 "name": "slash",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 120 ), SubResource( 192 ), SubResource( 193 ), SubResource( 194 ), SubResource( 195 ) ],
+"frames": [ SubResource( 107 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 179 ) ],
-"loop": false,
+"loop": true,
 "name": "stand",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 196 ) ],
+"frames": [ SubResource( 180 ) ],
 "loop": false,
 "name": "step",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 197 ) ],
+"frames": [ SubResource( 181 ) ],
 "loop": false,
 "name": "step_shoot",
 "speed": 10.0
@@ -541,14 +460,14 @@ player_number = 1
 
 [node name="AnimatedSprite" parent="." index="0"]
 position = Vector2( -1, -51 )
-frames = SubResource( 198 )
+frames = SubResource( 182 )
 animation = "idle_shoot"
 frame = 2
 flip_h = false
 __meta__ = {
 "_aseprite_wizard_config_": {
 "layer": "",
-"o_ex_p": "_+",
+"o_ex_p": "",
 "o_folder": "res://assets",
 "o_name": "",
 "only_visible": true,
@@ -622,9 +541,9 @@ animation_suffix = true
 
 [node name="hurt" type="Node" parent="movement_state_machine" index="5"]
 script = ExtResource( 12 )
-timeout_seconds = 2.0
+timeout_seconds = 1.0
 move_speed = -10.0
-animation_sequence = [ "hurt" ]
+animation_sequence = [ "stand" ]
 idle_node = NodePath("../idle")
 
 [node name="dash" type="Node" parent="movement_state_machine" index="6"]
@@ -648,10 +567,6 @@ emitter_frame_subscriptions = {
 fall_node = NodePath("../fall")
 idle_node = NodePath("../idle")
 
-[node name="die" type="Node" parent="movement_state_machine" index="8"]
-script = ExtResource( 15 )
-animation_sequence = [ "die" ]
-
 [node name="Hurtbox_Component" parent="." index="4"]
 collision_layer = 16
 collision_mask = 128
@@ -679,11 +594,7 @@ points = PoolVector2Array( -5, 0, 1.25483, 0, 5, 0 )
 width = 2.0
 default_color = Color( 1, 0.607843, 0, 1 )
 
-[node name="Interactable_Receiver" type="Node2D" parent="." index="8"]
-script = ExtResource( 16 )
-
 [connection signal="do_attack" from="movement_state_machine/attack" to="." method="_on_attack_do_attack"]
 [connection signal="frame_reached" from="movement_state_machine/roll" to="." method="_on_roll_frame_reached"]
 [connection signal="state_exited" from="movement_state_machine/roll" to="." method="_on_roll_state_exited"]
-[connection signal="state_entered" from="movement_state_machine/die" to="." method="_on_die_state_entered"]
 [connection signal="health_depleted" from="Health_Component" to="." method="_on_Health_Component_health_depleted"]

src/playerD/states/hurt.gd

@@ -4,20 +4,13 @@ export (NodePath) var idle_node
 
 onready var idle_state: State = get_node(idle_node)
 
-var flash_color = Color.yellow
-
 func enter() -> void:
-	modifier_stack_ref.clear()
 	.enter()
 	move_component.velocity.x = 0
 	#parent.set_hurtbox(false)
 	#TODO: Error check if timer was actually instanced
 	state_timeout.start()
 
-func exit() -> void:
-	.exit()
-	animations.modulate = Color.white
-
 func process_input(_event: InputEvent) -> State:
 #	move_component.wants_jump() 
 	move_component.get_movement_direction()
@@ -26,11 +19,6 @@ func process_input(_event: InputEvent) -> State:
 
 
 func process_frame(delta: float) -> State:
-
-	# Apply a little effect when damage taken.
-	#UiManager.debug_text = str(abs(sin((ceil(state_timeout.time_left) - state_timeout.time_left)/.5)))
-	animations.modulate = flash_color.linear_interpolate(Color.white, abs(sin((ceil(state_timeout.time_left) - state_timeout.time_left)/.5)))
-	
 	if state_timeout.time_left == 0:
 		return idle_state
 	return null

src/singleton_autoloads/UIManager.gd

@@ -9,8 +9,6 @@ var dialog_text = 'foo'
 var dialog_portrait = preload("res://icon.png")
 var current_pane = UI_PANES.OFF
 
-var debug_text :String
-
 # Declare member variables here. Examples:
 # var a = 2
 # var b = "text"