.gitignore

@@ -4,4 +4,3 @@
 .mono/
 addons/
 android/
-build/

assets/Tiles/Assets/Demo TileSet.tres

@@ -1,126 +0,0 @@
-[gd_resource type="TileSet" load_steps=13 format=2]
-
-[ext_resource path="res://assets/Tiles/Assets/Assets.png" type="Texture" id=1]
-
-[sub_resource type="ConvexPolygonShape2D" id=2]
-points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
-
-[sub_resource type="ConvexPolygonShape2D" id=3]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=4]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=5]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=6]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=7]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=8]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=9]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=10]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=11]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=12]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[resource]
-0/name = "Assets.png 0"
-0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 16, 0, 192, 96 )
-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( 2 )
-0/shape_one_way = false
-0/shape_one_way_margin = 1.0
-0/shapes = [ {
-"autotile_coord": Vector2( 1, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 2 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 2, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 3 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 3, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 4 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 3, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 5 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 2, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 6 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 2, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 7 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 1, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 8 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 0, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 9 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 0, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 10 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 4, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 11 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 5, 3 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 12 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-0/z_index = 0

export_presets.cfg

@@ -203,71 +203,3 @@ permissions/write_sms=false
 permissions/write_social_stream=false
 permissions/write_sync_settings=false
 permissions/write_user_dictionary=false
-
-[preset.1]
-
-name="Linux/X11"
-platform="Linux/X11"
-runnable=true
-custom_features=""
-export_filter="all_resources"
-include_filter=""
-exclude_filter=""
-export_path="build/linux/MegaMoves.x86_64"
-script_export_mode=1
-script_encryption_key=""
-
-[preset.1.options]
-
-custom_template/debug=""
-custom_template/release=""
-binary_format/64_bits=true
-binary_format/embed_pck=false
-texture_format/bptc=false
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false
-texture_format/no_bptc_fallbacks=true
-
-[preset.2]
-
-name="Windows Desktop"
-platform="Windows Desktop"
-runnable=true
-custom_features=""
-export_filter="all_resources"
-include_filter=""
-exclude_filter=""
-export_path="build/windows/MegaMoves.exe"
-script_export_mode=1
-script_encryption_key=""
-
-[preset.2.options]
-
-custom_template/debug=""
-custom_template/release=""
-binary_format/64_bits=true
-binary_format/embed_pck=false
-texture_format/bptc=false
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false
-texture_format/no_bptc_fallbacks=true
-codesign/enable=false
-codesign/identity_type=0
-codesign/identity=""
-codesign/password=""
-codesign/timestamp=true
-codesign/timestamp_server_url=""
-codesign/digest_algorithm=1
-codesign/description=""
-codesign/custom_options=PoolStringArray(  )
-application/modify_resources=true
-application/icon=""
-application/file_version=""
-application/product_version=""
-application/company_name=""
-application/product_name=""
-application/file_description=""
-application/copyright=""
-application/trademarks=""

src/playerD/Player.gd

@@ -34,13 +34,3 @@ func _on_attack_do_attack():
 
 func _on_Health_Component_health_depleted():
 	queue_free()
-
-func _on_roll_frame_reached(state_name, animation_name, frame_number):
-	print("I'm invincible!!!")
-	$Hurtbox_Component.set_hurtbox(false)
-
-func _on_roll_state_exited():
-	print("Nevermind. I'm vulnerable.")
-	$Hurtbox_Component.set_hurtbox(true)
-
-

src/playerD/Player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=109 format=2]
+[gd_scene load_steps=117 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]
@@ -102,287 +102,319 @@ region = Rect2( 1920, 0, 240, 160 )
 atlas = SubResource( 90 )
 region = Rect2( 2160, 0, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=112]
+[sub_resource type="AtlasTexture" id=163]
-atlas = SubResource( 90 )
-region = Rect2( 0, 160, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=113]
-atlas = SubResource( 90 )
-region = Rect2( 240, 160, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=114]
 atlas = SubResource( 90 )
 region = Rect2( 480, 160, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=115]
+[sub_resource type="AtlasTexture" id=112]
 atlas = SubResource( 90 )
 region = Rect2( 1920, 160, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=116]
+[sub_resource type="AtlasTexture" id=113]
 atlas = SubResource( 90 )
 region = Rect2( 2160, 160, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=117]
+[sub_resource type="AtlasTexture" id=114]
 atlas = SubResource( 90 )
 region = Rect2( 0, 320, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=118]
+[sub_resource type="AtlasTexture" id=115]
 atlas = SubResource( 90 )
 region = Rect2( 240, 320, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=119]
+[sub_resource type="AtlasTexture" id=116]
 atlas = SubResource( 90 )
 region = Rect2( 480, 320, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=120]
+[sub_resource type="AtlasTexture" id=117]
 atlas = SubResource( 90 )
 region = Rect2( 720, 320, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=121]
+[sub_resource type="AtlasTexture" id=118]
 atlas = SubResource( 90 )
 region = Rect2( 960, 320, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=122]
+[sub_resource type="AtlasTexture" id=119]
 atlas = SubResource( 90 )
 region = Rect2( 1440, 320, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=123]
+[sub_resource type="AtlasTexture" id=120]
 atlas = SubResource( 90 )
 region = Rect2( 1680, 320, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=124]
+[sub_resource type="AtlasTexture" id=121]
 atlas = SubResource( 90 )
 region = Rect2( 1920, 320, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=125]
+[sub_resource type="AtlasTexture" id=122]
 atlas = SubResource( 90 )
 region = Rect2( 240, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=126]
+[sub_resource type="AtlasTexture" id=123]
 atlas = SubResource( 90 )
 region = Rect2( 480, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=127]
+[sub_resource type="AtlasTexture" id=124]
 atlas = SubResource( 90 )
 region = Rect2( 720, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=128]
+[sub_resource type="AtlasTexture" id=125]
 atlas = SubResource( 90 )
 region = Rect2( 960, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=129]
+[sub_resource type="AtlasTexture" id=126]
 atlas = SubResource( 90 )
 region = Rect2( 1200, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=130]
+[sub_resource type="AtlasTexture" id=127]
 atlas = SubResource( 90 )
 region = Rect2( 1440, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=131]
+[sub_resource type="AtlasTexture" id=128]
 atlas = SubResource( 90 )
 region = Rect2( 1680, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=132]
+[sub_resource type="AtlasTexture" id=129]
 atlas = SubResource( 90 )
 region = Rect2( 1920, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=133]
+[sub_resource type="AtlasTexture" id=130]
 atlas = SubResource( 90 )
 region = Rect2( 2160, 800, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=134]
+[sub_resource type="AtlasTexture" id=131]
 atlas = SubResource( 90 )
 region = Rect2( 0, 960, 240, 160 )
 
-[sub_resource type="AtlasTexture" id=135]
+[sub_resource type="AtlasTexture" id=132]
 atlas = SubResource( 90 )
 region = Rect2( 240, 960, 240, 160 )
 
+[sub_resource type="AtlasTexture" id=133]
+atlas = SubResource( 90 )
+region = Rect2( 480, 960, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=134]
+atlas = SubResource( 90 )
+region = Rect2( 720, 960, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=135]
+atlas = SubResource( 90 )
+region = Rect2( 960, 960, 240, 160 )
+
 [sub_resource type="AtlasTexture" id=136]
 atlas = SubResource( 90 )
-region = Rect2( 0, 480, 240, 160 )
+region = Rect2( 1200, 960, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=137]
 atlas = SubResource( 90 )
-region = Rect2( 240, 480, 240, 160 )
+region = Rect2( 1440, 960, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=138]
 atlas = SubResource( 90 )
-region = Rect2( 480, 480, 240, 160 )
+region = Rect2( 1680, 960, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=139]
 atlas = SubResource( 90 )
-region = Rect2( 720, 480, 240, 160 )
+region = Rect2( 1920, 960, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=140]
 atlas = SubResource( 90 )
-region = Rect2( 960, 480, 240, 160 )
+region = Rect2( 2160, 960, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=141]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 480, 240, 160 )
+region = Rect2( 0, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=142]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 480, 240, 160 )
+region = Rect2( 240, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=143]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 480, 240, 160 )
+region = Rect2( 480, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=144]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 480, 240, 160 )
+region = Rect2( 720, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=145]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 480, 240, 160 )
+region = Rect2( 960, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=146]
 atlas = SubResource( 90 )
-region = Rect2( 240, 640, 240, 160 )
+region = Rect2( 1200, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=147]
 atlas = SubResource( 90 )
-region = Rect2( 480, 640, 240, 160 )
+region = Rect2( 1440, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=148]
 atlas = SubResource( 90 )
-region = Rect2( 720, 640, 240, 160 )
+region = Rect2( 1680, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=149]
 atlas = SubResource( 90 )
-region = Rect2( 960, 640, 240, 160 )
+region = Rect2( 1920, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=150]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 640, 240, 160 )
+region = Rect2( 2160, 480, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=151]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 640, 240, 160 )
+region = Rect2( 240, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=152]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 640, 240, 160 )
+region = Rect2( 480, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=153]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 640, 240, 160 )
+region = Rect2( 720, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=154]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 640, 240, 160 )
+region = Rect2( 960, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=155]
 atlas = SubResource( 90 )
-region = Rect2( 0, 800, 240, 160 )
+region = Rect2( 1200, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=156]
 atlas = SubResource( 90 )
-region = Rect2( 0, 1280, 240, 160 )
+region = Rect2( 1440, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=157]
 atlas = SubResource( 90 )
-region = Rect2( 240, 1280, 240, 160 )
+region = Rect2( 1680, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=158]
 atlas = SubResource( 90 )
-region = Rect2( 480, 1280, 240, 160 )
+region = Rect2( 1920, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=159]
 atlas = SubResource( 90 )
-region = Rect2( 720, 1280, 240, 160 )
+region = Rect2( 2160, 640, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=160]
 atlas = SubResource( 90 )
-region = Rect2( 960, 1280, 240, 160 )
+region = Rect2( 0, 800, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=161]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 1280, 240, 160 )
+region = Rect2( 0, 160, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=162]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 1280, 240, 160 )
+region = Rect2( 240, 160, 240, 160 )
-
-[sub_resource type="AtlasTexture" id=163]
-atlas = SubResource( 90 )
-region = Rect2( 1680, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=164]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 1280, 240, 160 )
+region = Rect2( 0, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=165]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 1280, 240, 160 )
+region = Rect2( 240, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=166]
 atlas = SubResource( 90 )
-region = Rect2( 0, 1440, 240, 160 )
+region = Rect2( 480, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=167]
 atlas = SubResource( 90 )
-region = Rect2( 240, 1440, 240, 160 )
+region = Rect2( 720, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=168]
 atlas = SubResource( 90 )
-region = Rect2( 480, 1440, 240, 160 )
+region = Rect2( 960, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=169]
 atlas = SubResource( 90 )
-region = Rect2( 720, 1440, 240, 160 )
+region = Rect2( 1200, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=170]
 atlas = SubResource( 90 )
-region = Rect2( 960, 1440, 240, 160 )
+region = Rect2( 1440, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=171]
 atlas = SubResource( 90 )
-region = Rect2( 1200, 1440, 240, 160 )
+region = Rect2( 1680, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=172]
 atlas = SubResource( 90 )
-region = Rect2( 1440, 1440, 240, 160 )
+region = Rect2( 1920, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=173]
 atlas = SubResource( 90 )
-region = Rect2( 1680, 1440, 240, 160 )
+region = Rect2( 2160, 1280, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=174]
 atlas = SubResource( 90 )
-region = Rect2( 1920, 1440, 240, 160 )
+region = Rect2( 0, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=175]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 1440, 240, 160 )
+region = Rect2( 240, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=176]
 atlas = SubResource( 90 )
-region = Rect2( 240, 0, 240, 160 )
+region = Rect2( 480, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=177]
 atlas = SubResource( 90 )
-region = Rect2( 480, 0, 240, 160 )
+region = Rect2( 720, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=178]
 atlas = SubResource( 90 )
-region = Rect2( 720, 0, 240, 160 )
+region = Rect2( 960, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=179]
 atlas = SubResource( 90 )
-region = Rect2( 960, 0, 240, 160 )
+region = Rect2( 1200, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=180]
 atlas = SubResource( 90 )
-region = Rect2( 2160, 320, 240, 160 )
+region = Rect2( 1440, 1440, 240, 160 )
 
 [sub_resource type="AtlasTexture" id=181]
 atlas = SubResource( 90 )
+region = Rect2( 1680, 1440, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=182]
+atlas = SubResource( 90 )
+region = Rect2( 1920, 1440, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=183]
+atlas = SubResource( 90 )
+region = Rect2( 2160, 1440, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=184]
+atlas = SubResource( 90 )
+region = Rect2( 240, 0, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=185]
+atlas = SubResource( 90 )
+region = Rect2( 480, 0, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=186]
+atlas = SubResource( 90 )
+region = Rect2( 720, 0, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=187]
+atlas = SubResource( 90 )
+region = Rect2( 960, 0, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=188]
+atlas = SubResource( 90 )
+region = Rect2( 2160, 320, 240, 160 )
+
+[sub_resource type="AtlasTexture" id=189]
+atlas = SubResource( 90 )
 region = Rect2( 0, 640, 240, 160 )
 
-[sub_resource type="SpriteFrames" id=182]
+[sub_resource type="SpriteFrames" id=190]
 animations = [ {
 "frames": [ SubResource( 91 ), SubResource( 92 ), SubResource( 93 ), SubResource( 94 ), SubResource( 95 ), SubResource( 96 ), SubResource( 97 ), SubResource( 98 ), SubResource( 99 ), SubResource( 100 ) ],
 "loop": true,
@@ -392,59 +424,64 @@ 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": 15.0
+"speed": 10.0
 }, {
 "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": true,
 "name": "idle",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 112 ), SubResource( 113 ), SubResource( 114 ) ],
+"frames": [ SubResource( 163 ) ],
-"loop": false,
+"loop": true,
 "name": "idle_shoot",
-"speed": 10.0
+"speed": 5.0
 }, {
-"frames": [ SubResource( 115 ), SubResource( 116 ), SubResource( 117 ), SubResource( 118 ), SubResource( 116 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ) ],
+"frames": [ SubResource( 112 ), SubResource( 113 ), SubResource( 114 ), SubResource( 115 ), SubResource( 113 ), SubResource( 116 ), SubResource( 117 ), SubResource( 118 ) ],
 "loop": false,
 "name": "jump",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 122 ), SubResource( 122 ), SubResource( 122 ), SubResource( 122 ), SubResource( 122 ), SubResource( 122 ), SubResource( 123 ), SubResource( 124 ) ],
+"frames": [ SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ) ],
-"loop": false,
+"loop": true,
 "name": "jump_shoot",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 125 ), SubResource( 126 ), SubResource( 127 ), SubResource( 128 ), SubResource( 129 ), SubResource( 130 ), SubResource( 131 ), SubResource( 132 ), SubResource( 133 ), SubResource( 134 ), SubResource( 135 ) ],
+"frames": [ SubResource( 122 ), SubResource( 123 ), SubResource( 124 ), SubResource( 125 ), SubResource( 126 ), SubResource( 127 ), SubResource( 128 ), SubResource( 129 ), SubResource( 130 ), SubResource( 131 ), SubResource( 132 ), SubResource( 133 ), SubResource( 134 ), SubResource( 135 ), SubResource( 136 ), SubResource( 137 ), SubResource( 138 ), SubResource( 139 ), SubResource( 140 ) ],
 "loop": false,
 "name": "roll",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 136 ), SubResource( 137 ), SubResource( 138 ), SubResource( 139 ), SubResource( 140 ), SubResource( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ) ],
+"frames": [ SubResource( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ), SubResource( 146 ), SubResource( 147 ), SubResource( 148 ), SubResource( 149 ), SubResource( 150 ) ],
 "loop": true,
 "name": "run",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 146 ), SubResource( 147 ), SubResource( 148 ), SubResource( 149 ), SubResource( 150 ), SubResource( 151 ), SubResource( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ) ],
+"frames": [ SubResource( 151 ), SubResource( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ), SubResource( 156 ), SubResource( 157 ), SubResource( 158 ), SubResource( 159 ), SubResource( 160 ) ],
 "loop": true,
 "name": "run_shoot",
 "speed": 10.0
 }, {
-"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 ) ],
+"frames": [ SubResource( 161 ), SubResource( 162 ), SubResource( 163 ) ],
+"loop": false,
+"name": "shoot",
+"speed": 10.0
+}, {
+"frames": [ SubResource( 164 ), SubResource( 165 ), SubResource( 166 ), SubResource( 166 ), SubResource( 167 ), SubResource( 168 ), SubResource( 169 ), SubResource( 170 ), SubResource( 170 ), SubResource( 171 ), SubResource( 172 ), SubResource( 173 ), SubResource( 174 ), SubResource( 175 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 179 ), SubResource( 180 ), SubResource( 181 ), SubResource( 182 ), SubResource( 183 ) ],
 "loop": true,
 "name": "slash",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 107 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 179 ) ],
+"frames": [ SubResource( 107 ), SubResource( 184 ), SubResource( 185 ), SubResource( 186 ), SubResource( 187 ) ],
 "loop": true,
 "name": "stand",
-"speed": 10.0
+"speed": 1.0
 }, {
-"frames": [ SubResource( 180 ) ],
+"frames": [ SubResource( 188 ) ],
 "loop": false,
 "name": "step",
 "speed": 10.0
 }, {
-"frames": [ SubResource( 181 ) ],
+"frames": [ SubResource( 189 ) ],
 "loop": false,
 "name": "step_shoot",
 "speed": 10.0
@@ -460,9 +497,9 @@ player_number = 1
 
 [node name="AnimatedSprite" parent="." index="0"]
 position = Vector2( -1, -51 )
-frames = SubResource( 182 )
+frames = SubResource( 190 )
 animation = "idle_shoot"
-frame = 2
+frame = 0
 flip_h = false
 __meta__ = {
 "_aseprite_wizard_config_": {
@@ -486,7 +523,6 @@ debug_state_machine = true
 
 [node name="idle" parent="movement_state_machine" index="0"]
 script = ExtResource( 4 )
-move_speed = 1.0
 animation_sequence = [ "idle" ]
 jump_node = NodePath("../jump")
 attack_node = NodePath("../attack")
@@ -495,7 +531,6 @@ roll_node = NodePath("../roll")
 
 [node name="fall" parent="movement_state_machine" index="1"]
 script = ExtResource( 6 )
-move_speed = 90.0
 animation_sequence = [ "jump" ]
 landing_node = NodePath("landing")
 
@@ -508,24 +543,22 @@ pre_append_animation = true
 
 [node name="move" parent="movement_state_machine" index="2"]
 script = ExtResource( 5 )
-move_speed = 90.0
 animation_sequence = [ "step", "run" ]
 jump_node = NodePath("../jump")
 attack_node = NodePath("../attack")
 
 [node name="jump" type="Node" parent="movement_state_machine" index="3"]
 script = ExtResource( 8 )
-move_speed = 90.0
 animation_sequence = [ "jump" ]
 idle_node = NodePath("../idle")
 fall_node = NodePath("../fall")
 attack_node = NodePath("../attack")
-landing_node = NodePath("../fall/landing")
 jump_force = 250.0
 
 [node name="attack" type="Node" parent="movement_state_machine" index="4"]
 script = ExtResource( 10 )
 timeout_seconds = 2.0
+animation_sequence = [ "shoot" ]
 jump_node = NodePath("../jump")
 idle_node = NodePath("../idle")
 fall_node = NodePath("../fall")
@@ -548,9 +581,6 @@ idle_node = NodePath("../idle")
 
 [node name="dash" type="Node" parent="movement_state_machine" index="6"]
 script = ExtResource( 11 )
-move_speed = 90.0
-move_speed_modifier = 120.0
-move_speed_modifier_decay = -300.0
 animation_sequence = [ "dash" ]
 fall_node = NodePath("../fall")
 idle_node = NodePath("../idle")
@@ -559,11 +589,8 @@ jump_node = NodePath("../jump")
 
 [node name="roll" type="Node" parent="movement_state_machine" index="7"]
 script = ExtResource( 14 )
-move_speed = 50.0
+move_speed = 90.0
 animation_sequence = [ "roll" ]
-emitter_frame_subscriptions = {
-2: "roll"
-}
 fall_node = NodePath("../fall")
 idle_node = NodePath("../idle")
 
@@ -581,7 +608,7 @@ max_health = 100
 
 [node name="Gun" type="Position2D" parent="." index="7"]
 physics_interpolation_mode = 1
-position = Vector2( 23, -9 )
+position = Vector2( 25, -5 )
 script = ExtResource( 13 )
 
 [node name="Cooldown" type="Timer" parent="Gun" index="0"]
@@ -589,12 +616,9 @@ wait_time = 0.5
 one_shot = true
 
 [node name="Line2D" type="Line2D" parent="Gun" index="1"]
-position = Vector2( -3, 0 )
+points = PoolVector2Array( -5, 0, 5, 0 )
-points = PoolVector2Array( -5, 0, 1.25483, 0, 5, 0 )
 width = 2.0
 default_color = Color( 1, 0.607843, 0, 1 )
 
 [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="health_depleted" from="Health_Component" to="." method="_on_Health_Component_health_depleted"]

src/playerD/states/attack.gd

@@ -24,7 +24,7 @@ func enter() -> void:
 	#mod_animation_sequence = animation_sequence.duplicate(true)
 	mod_animation_sequence.append_array(animation_sequence)
 	# Reset animation suffix in case there isn't one
-	animation_suffix = '_shoot'
+	animation_suffix = ''
 	animation_index = 0
 	current_animation_sequence = 0
 	#var enter_animation = ''
@@ -45,7 +45,7 @@ func enter() -> void:
 			 previous_state_frame_number, " ", previous_state_name)
 	match previous_animation_name:
 		"idle":
-			animations.play("idle_shoot")
+			animations.play("shoot")
 		"run":
 			animations.play("run_shoot")
 			animations.frame = previous_state_frame_number

src/playerD/states/dash.gd

@@ -10,15 +10,13 @@ onready var fall_state: State = get_node(fall_node)
 onready var idle_state: State = get_node(idle_node)
 onready var attack_state: State = get_node(attack_node)
 
+var speed_multiplier := 1.0
 var speed_decay_rate := 1.0
-var adjusted_move_speed: float
 
 func enter():
-	remove_animation_state_modifiers()
 	.enter()
-	adjusted_move_speed = move_speed_modifier
+	speed_multiplier = 2.8
-	speed_multiplier = 5
+	speed_decay_rate = 2.0
-	speed_decay_rate = 4
 
 func process_physics(delta: float) -> State:
 
@@ -28,49 +26,24 @@ func process_physics(delta: float) -> State:
 	if move_component.wants_jump():
 		return jump_state
 		
+	if speed_multiplier > 1.0:
+		#print(speed_multiplier,", ", delta)
+		speed_multiplier -= delta * speed_decay_rate
+		speed_decay_rate += delta
+	elif speed_multiplier < 1.0:
+		speed_multiplier += delta * speed_decay_rate
+		speed_decay_rate += delta
 	
-	# Assuming adjusted_move_speed is set to the mood speed modifier on state entry
+	# Deadzone
-	# Move speed is the base speed plus the modifier minus the decay adjusted for time
+	if speed_multiplier < 1.1 and speed_multiplier > 0.9:
-	adjusted_move_speed = adjusted_move_speed + (move_speed_modifier_decay * delta)
+		speed_multiplier = 1.0
-	var new_move_speed = move_speed + adjusted_move_speed
-	
-	# A really crappy normalization to prevent modifying past the base move speed.
-	if move_speed_modifier > 0 and new_move_speed < move_speed: # positive modifier
-		#print("nope1")
-		new_move_speed = move_speed
-	elif move_speed_modifier < 0 and new_move_speed > move_speed: # negative modifier
-		#print("nope2")
-		new_move_speed = move_speed
-
-	#print(new_move_speed, " ", adjusted_move_speed)
 
 	move_component.velocity.y += gravity * delta
 	#parent.velocity = parent.move_and_slide(parent.velocity, Vector2(0, -1))
 	#print(speed_multiplier)
-	move_component.velocity.x = parent.transform.x.x * new_move_speed
+	move_component.velocity.x = parent.transform.x.x * move_speed * speed_multiplier
 	move_component.velocity = parent.move_and_slide(move_component.velocity, Vector2(0, -1))
 	
-	## Trying a whole new model
-#	var new_move_speed = move_speed * speed_multiplier
-#	if speed_multiplier > 1.0:
-#		print("PPS: ", new_move_speed * delta)
-#		speed_multiplier -= delta * (speed_decay_rate * speed_multiplier)
-#		#speed_decay_rate += delta * speed_decay_rate
-#
-#	elif speed_multiplier < 1.0:
-#		speed_multiplier += delta * (speed_decay_rate * speed_multiplier)
-#		#speed_decay_rate += delta * speed_decay_rate
-#
-#	# Deadzone
-#	if speed_multiplier < 1.1 and speed_multiplier > 0.9:
-#		speed_multiplier = 1.0
-#
-#	move_component.velocity.y += gravity * delta
-#	#parent.velocity = parent.move_and_slide(parent.velocity, Vector2(0, -1))
-#	#print(speed_multiplier)
-#	move_component.velocity.x = parent.transform.x.x * new_move_speed
-#	move_component.velocity = parent.move_and_slide(move_component.velocity, Vector2(0, -1))
-	
 	
 	if move_component.velocity.x == 0.0 or animations.playing == false:
 		if !parent.is_on_floor():

src/playerD/states/fall.gd

@@ -7,10 +7,6 @@ onready var idle_state: State = get_node(idle_node)
 onready var landing_mod: StateModifier = get_node(landing_node)
 
 func enter() -> void:
-	var landing_mod_index = modifier_stack_ref.rfind(landing_mod)
-	if landing_mod_index != -1:
-		#print("You're Supposed to be dead!?: ", landing_mod_index)
-		modifier_stack_ref.remove(landing_mod_index)
 	.enter()
 	# Jump to fall frame
 	animations.frame = 5

src/playerD/states/jump.gd

@@ -4,27 +4,16 @@ extends StateAnimatedActor
 export (NodePath) var idle_node
 export (NodePath) var fall_node
 export (NodePath) var attack_node
-export (NodePath) var landing_node
+
 
 onready var idle_state: State = get_node(idle_node)
 onready var fall_state: State = get_node(fall_node)
 onready var attack_state: State = get_node(attack_node)
-onready var landing_mod: StateModifier = get_node(landing_node)
 
 export var jump_force: float = 200.0
 
 func enter() -> void:
-	var landing_mod_index = modifier_stack_ref.rfind(landing_mod)
-	if landing_mod_index != -1:
-		#print("You're Supposed to be dead!?: ", landing_mod_index)
-		modifier_stack_ref.remove(landing_mod_index)
-#	if modifier_stack_ref.has(landing_mod):
-#		print("Jump from Landing Mod at: ", modifier_stack_ref.rfind(landing_mod))
 	.enter()
-	if previous_speed_multiplier > 1.0:
-		speed_multiplier = previous_speed_multiplier
-	else:
-		speed_multiplier = 1.0
 	# Apply initial jump velocity on state enter
 	move_component.velocity.y = -jump_force
 

src/playerD/states/roll.gd

@@ -6,13 +6,9 @@ export (NodePath) var idle_node
 onready var fall_state: State = get_node(fall_node)
 onready var idle_state: State = get_node(idle_node)
 
+var speed_multiplier := 1.0
 var speed_decay_rate := 1.0
 
-func enter():
-	remove_animation_state_modifiers()
-	.enter()
-	
-
 func process_physics(delta: float) -> State:
 
 #	if move_component.wants_shoot():

src/state_animated_actor.gd

@@ -16,12 +16,7 @@ extends State
 ## Deprecated
 # export var animation_name: String
 
-# Movement Speed in Pixels Per Second
 export var move_speed: float = 60
-export var move_speed_decay: float = 0
-export var move_speed_modifier: float = 0
-export var move_speed_modifier_decay: float = 0
-var speed_multiplier: float = 1.0
 
 export(Array, String) var animation_sequence
 
@@ -50,7 +45,6 @@ var parent: KinematicBody2D
 var previous_animation_name : String
 var previous_state_frame_number : int
 var previous_state_name: String
-var previous_speed_multiplier: float
 
 #var animation_sequence_timer: Timer
 
@@ -193,23 +187,9 @@ func process_physics(_delta: float) -> State:
 #		animation_index += 1
 
 func move_actor_as_desired(delta: float):
-	var new_speed = move_speed * speed_multiplier
-	if speed_multiplier > 1.0:
-		speed_multiplier -= delta *  speed_multiplier
-		#speed_decay_rate += delta * speed_decay_rate
-		
-	elif speed_multiplier < 1.0:
-		speed_multiplier += delta * speed_multiplier
-		#speed_decay_rate += delta * speed_decay_rate
-	
-	# Deadzone
-	if speed_multiplier < 1.1 and speed_multiplier > 0.9:
-		speed_multiplier = 1.0
-#	if (new_speed > move_speed):
-#		print("Go Faster Booooy! ", move_speed)
 	move_component.velocity.y += gravity * delta
 	#parent.velocity = parent.move_and_slide(parent.velocity, Vector2(0, -1))
-	move_component.velocity.x = move_component.desired_movement_vector.x * new_speed
+	move_component.velocity.x = move_component.desired_movement_vector.x * move_speed
 	move_component.velocity = parent.move_and_slide(move_component.velocity, Vector2(0, -1))
 	
 func push_animation_state_modifier(modifier: StateModifier):
@@ -256,9 +236,3 @@ func push_animation_state_modifier(modifier: StateModifier):
 		else:
 			modifier_stack_ref.push_front(modifier)
 		
-
-func remove_animation_state_modifiers():
-	for i in modifier_stack_ref.size():
-		if modifier_stack_ref[i].modifier_type != "None":
-			#print("Time to pop state modifer: ", state_modifiers[i].animation_name, current_state.animation_suffix, " <-> ", current_state.animations.animation + current_state.animation_suffix)
-			modifier_stack_ref.pop_at(i)

src/state_machine_animated_actor.gd

@@ -3,9 +3,10 @@ class_name StateMachineAnimatedActor extends StateMachine
 func change_state(new_state: State) -> void:
 	if current_state:
 		current_state.exit()
-		# Set parameters for information
+
-		if new_state is StateAnimatedActor and current_state is StateAnimatedActor:
+	# Set parameters for information
-			set_previous_animation( current_state, new_state)
+	if new_state is StateAnimatedActor and current_state is StateAnimatedActor:
+		set_previous_animation( current_state, new_state)
 
 	current_state = new_state
 	current_state.enter()
@@ -15,12 +16,10 @@ func change_state(new_state: State) -> void:
 			print(mods.name)
 
 func set_previous_animation( old_state: StateAnimatedActor, new_state: StateAnimatedActor ) -> void:
-	# added this to help prevent nul index crashes. (Usually because of signal based state changes.)
+	new_state.previous_animation_name = old_state.mod_animation_sequence[old_state.current_animation_sequence]
-	if old_state.mod_animation_sequence:
-		new_state.previous_animation_name = old_state.mod_animation_sequence[old_state.current_animation_sequence]
 	new_state.previous_state_frame_number = old_state.animations.frame
 	new_state.previous_state_name = old_state.name
-	new_state.previous_speed_multiplier = old_state.speed_multiplier
+	
 	#animation_name :String, frame_number : int, animation_sequence :Array
 	return
 

src/state_modifier.gd

@@ -23,14 +23,7 @@ export(String, "None",
 		"Replace Animation") var modifier_type = "None"
 
 export var starting_frame: int = 0
-
+export var move_speed: float = 60
-# Move Speed in Pixels Per Second
-# These should only apply if Modification Type Set to None.
-# (But I'm not sure if I like that model.)
-export var move_speed: float
-export var move_speed_modifier: float = 0
-export var move_speed_modifier_decay: float = 0
-
 export var timeout_seconds: float = 0.0
 
 # Attempting to use this as an animation suffix that can linger after