diff --git a/Main.tscn b/Main.tscn index 07dd6f6..5220f22 100644 --- a/Main.tscn +++ b/Main.tscn @@ -149,3 +149,12 @@ 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" diff --git a/assets/Mega.png b/assets/Mega.png index e36610c..4dc20ad 100644 Binary files a/assets/Mega.png and b/assets/Mega.png differ diff --git a/assets/Tiles/Assets/Sprite-0002.png b/assets/Tiles/Assets/Sprite-0002.png new file mode 100644 index 0000000..d703c98 Binary files /dev/null and b/assets/Tiles/Assets/Sprite-0002.png differ diff --git a/assets/Tiles/Assets/Sprite-0002.png.import b/assets/Tiles/Assets/Sprite-0002.png.import new file mode 100644 index 0000000..72860f1 --- /dev/null +++ b/assets/Tiles/Assets/Sprite-0002.png.import @@ -0,0 +1,35 @@ +[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 diff --git a/project.godot b/project.godot index 92e4de7..e4b5410 100644 --- a/project.godot +++ b/project.godot @@ -80,7 +80,8 @@ config/icon="res://icon.png" [aseprite] -animation/layers/exclusion_pattern="_" +animation/layers/exclusion_pattern="_+" +animation/layers/only_include_visible_layers_by_default=true [autoload] diff --git a/src/Levels/Level2.tscn b/src/Levels/Level2.tscn new file mode 100644 index 0000000..5f423b9 --- /dev/null +++ b/src/Levels/Level2.tscn @@ -0,0 +1,104 @@ +[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" diff --git a/src/UI_Layer.gd b/src/UI_Layer.gd index eeea52d..757c3bf 100644 --- a/src/UI_Layer.gd +++ b/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 diff --git a/src/playerD/Player.tscn b/src/playerD/Player.tscn index 6a02e17..29c1858 100644 --- a/src/playerD/Player.tscn +++ b/src/playerD/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=109 format=2] +[gd_scene load_steps=126 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,375 +14,440 @@ [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] [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( 0, 1120, 240, 160 ) +region = Rect2( 1440, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=92] atlas = SubResource( 90 ) -region = Rect2( 240, 1120, 240, 160 ) +region = Rect2( 1680, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=93] atlas = SubResource( 90 ) -region = Rect2( 480, 1120, 240, 160 ) +region = Rect2( 1920, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=94] atlas = SubResource( 90 ) -region = Rect2( 720, 1120, 240, 160 ) +region = Rect2( 2160, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=95] atlas = SubResource( 90 ) -region = Rect2( 960, 1120, 240, 160 ) +region = Rect2( 2400, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=96] atlas = SubResource( 90 ) -region = Rect2( 1200, 1120, 240, 160 ) +region = Rect2( 0, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=97] atlas = SubResource( 90 ) -region = Rect2( 1440, 1120, 240, 160 ) +region = Rect2( 240, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=98] atlas = SubResource( 90 ) -region = Rect2( 1680, 1120, 240, 160 ) +region = Rect2( 480, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=99] atlas = SubResource( 90 ) -region = Rect2( 1920, 1120, 240, 160 ) +region = Rect2( 720, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=100] atlas = SubResource( 90 ) -region = Rect2( 2160, 1120, 240, 160 ) +region = Rect2( 960, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=101] atlas = SubResource( 90 ) -region = Rect2( 720, 160, 240, 160 ) +region = Rect2( 480, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=102] atlas = SubResource( 90 ) -region = Rect2( 960, 160, 240, 160 ) +region = Rect2( 720, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=103] atlas = SubResource( 90 ) -region = Rect2( 1200, 160, 240, 160 ) +region = Rect2( 960, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=104] atlas = SubResource( 90 ) -region = Rect2( 1440, 160, 240, 160 ) +region = Rect2( 1200, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=105] atlas = SubResource( 90 ) -region = Rect2( 1680, 160, 240, 160 ) +region = Rect2( 1440, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=106] atlas = SubResource( 90 ) -region = Rect2( 1200, 0, 240, 160 ) +region = Rect2( 720, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=107] atlas = SubResource( 90 ) -region = Rect2( 0, 0, 240, 160 ) +region = Rect2( 960, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=108] atlas = SubResource( 90 ) -region = Rect2( 1440, 0, 240, 160 ) +region = Rect2( 1200, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=109] atlas = SubResource( 90 ) -region = Rect2( 1680, 0, 240, 160 ) +region = Rect2( 1440, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=110] atlas = SubResource( 90 ) -region = Rect2( 1920, 0, 240, 160 ) +region = Rect2( 1680, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=111] atlas = SubResource( 90 ) -region = Rect2( 2160, 0, 240, 160 ) +region = Rect2( 1920, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=112] atlas = SubResource( 90 ) -region = Rect2( 0, 160, 240, 160 ) +region = Rect2( 2160, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=113] atlas = SubResource( 90 ) -region = Rect2( 240, 160, 240, 160 ) +region = Rect2( 2400, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=114] atlas = SubResource( 90 ) -region = Rect2( 480, 160, 240, 160 ) +region = Rect2( 0, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=115] atlas = SubResource( 90 ) -region = Rect2( 1920, 160, 240, 160 ) +region = Rect2( 240, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=116] atlas = SubResource( 90 ) -region = Rect2( 2160, 160, 240, 160 ) +region = Rect2( 480, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=117] atlas = SubResource( 90 ) -region = Rect2( 0, 320, 240, 160 ) +region = Rect2( 960, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=118] atlas = SubResource( 90 ) -region = Rect2( 240, 320, 240, 160 ) +region = Rect2( 1200, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=119] atlas = SubResource( 90 ) -region = Rect2( 480, 320, 240, 160 ) +region = Rect2( 1200, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=120] atlas = SubResource( 90 ) -region = Rect2( 720, 320, 240, 160 ) +region = Rect2( 0, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=121] atlas = SubResource( 90 ) -region = Rect2( 960, 320, 240, 160 ) +region = Rect2( 1440, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=122] atlas = SubResource( 90 ) -region = Rect2( 1440, 320, 240, 160 ) +region = Rect2( 1680, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=123] atlas = SubResource( 90 ) -region = Rect2( 1680, 320, 240, 160 ) +region = Rect2( 1920, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=124] atlas = SubResource( 90 ) -region = Rect2( 1920, 320, 240, 160 ) +region = Rect2( 2160, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=125] atlas = SubResource( 90 ) -region = Rect2( 240, 800, 240, 160 ) +region = Rect2( 720, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=126] atlas = SubResource( 90 ) -region = Rect2( 480, 800, 240, 160 ) +region = Rect2( 960, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=127] atlas = SubResource( 90 ) -region = Rect2( 720, 800, 240, 160 ) +region = Rect2( 1200, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=128] atlas = SubResource( 90 ) -region = Rect2( 960, 800, 240, 160 ) +region = Rect2( 2400, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=129] atlas = SubResource( 90 ) -region = Rect2( 1200, 800, 240, 160 ) +region = Rect2( 0, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=130] atlas = SubResource( 90 ) -region = Rect2( 1440, 800, 240, 160 ) +region = Rect2( 240, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=131] atlas = SubResource( 90 ) -region = Rect2( 1680, 800, 240, 160 ) +region = Rect2( 1680, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=132] atlas = SubResource( 90 ) -region = Rect2( 1920, 800, 240, 160 ) +region = Rect2( 1920, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=133] atlas = SubResource( 90 ) -region = Rect2( 2160, 800, 240, 160 ) +region = Rect2( 2160, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=134] atlas = SubResource( 90 ) -region = Rect2( 0, 960, 240, 160 ) +region = Rect2( 2400, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=135] atlas = SubResource( 90 ) -region = Rect2( 240, 960, 240, 160 ) +region = Rect2( 0, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=136] atlas = SubResource( 90 ) -region = Rect2( 0, 480, 240, 160 ) +region = Rect2( 240, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=137] atlas = SubResource( 90 ) -region = Rect2( 240, 480, 240, 160 ) +region = Rect2( 480, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=138] atlas = SubResource( 90 ) -region = Rect2( 480, 480, 240, 160 ) +region = Rect2( 960, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=139] atlas = SubResource( 90 ) -region = Rect2( 720, 480, 240, 160 ) +region = Rect2( 1200, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=140] atlas = SubResource( 90 ) -region = Rect2( 960, 480, 240, 160 ) +region = Rect2( 1440, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=141] atlas = SubResource( 90 ) -region = Rect2( 1200, 480, 240, 160 ) +region = Rect2( 1680, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=142] atlas = SubResource( 90 ) -region = Rect2( 1440, 480, 240, 160 ) +region = Rect2( 1920, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=143] atlas = SubResource( 90 ) -region = Rect2( 1680, 480, 240, 160 ) +region = Rect2( 2160, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=144] atlas = SubResource( 90 ) -region = Rect2( 1920, 480, 240, 160 ) +region = Rect2( 2400, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=145] atlas = SubResource( 90 ) -region = Rect2( 2160, 480, 240, 160 ) +region = Rect2( 0, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=146] atlas = SubResource( 90 ) -region = Rect2( 240, 640, 240, 160 ) +region = Rect2( 240, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=147] atlas = SubResource( 90 ) -region = Rect2( 480, 640, 240, 160 ) +region = Rect2( 480, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=148] atlas = SubResource( 90 ) -region = Rect2( 720, 640, 240, 160 ) +region = Rect2( 720, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=149] atlas = SubResource( 90 ) -region = Rect2( 960, 640, 240, 160 ) +region = Rect2( 960, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=150] atlas = SubResource( 90 ) -region = Rect2( 1200, 640, 240, 160 ) +region = Rect2( 1200, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=151] atlas = SubResource( 90 ) -region = Rect2( 1440, 640, 240, 160 ) +region = Rect2( 1440, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=152] atlas = SubResource( 90 ) -region = Rect2( 1680, 640, 240, 160 ) +region = Rect2( 1920, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=153] atlas = SubResource( 90 ) -region = Rect2( 1920, 640, 240, 160 ) +region = Rect2( 2160, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=154] atlas = SubResource( 90 ) -region = Rect2( 2160, 640, 240, 160 ) +region = Rect2( 2400, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=155] atlas = SubResource( 90 ) -region = Rect2( 0, 800, 240, 160 ) +region = Rect2( 0, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=156] atlas = SubResource( 90 ) -region = Rect2( 0, 1280, 240, 160 ) +region = Rect2( 240, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=157] atlas = SubResource( 90 ) -region = Rect2( 240, 1280, 240, 160 ) +region = Rect2( 480, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=158] atlas = SubResource( 90 ) -region = Rect2( 480, 1280, 240, 160 ) +region = Rect2( 720, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=159] atlas = SubResource( 90 ) -region = Rect2( 720, 1280, 240, 160 ) +region = Rect2( 960, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=160] atlas = SubResource( 90 ) -region = Rect2( 960, 1280, 240, 160 ) +region = Rect2( 1200, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=161] atlas = SubResource( 90 ) -region = Rect2( 1200, 1280, 240, 160 ) +region = Rect2( 1440, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=162] atlas = SubResource( 90 ) -region = Rect2( 1440, 1280, 240, 160 ) +region = Rect2( 1920, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=163] atlas = SubResource( 90 ) -region = Rect2( 1680, 1280, 240, 160 ) +region = Rect2( 2160, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=164] atlas = SubResource( 90 ) -region = Rect2( 1920, 1280, 240, 160 ) +region = Rect2( 2400, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=165] atlas = SubResource( 90 ) -region = Rect2( 2160, 1280, 240, 160 ) +region = Rect2( 0, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=166] atlas = SubResource( 90 ) -region = Rect2( 0, 1440, 240, 160 ) +region = Rect2( 240, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=167] atlas = SubResource( 90 ) -region = Rect2( 240, 1440, 240, 160 ) +region = Rect2( 480, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=168] atlas = SubResource( 90 ) -region = Rect2( 480, 1440, 240, 160 ) +region = Rect2( 720, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=169] atlas = SubResource( 90 ) -region = Rect2( 720, 1440, 240, 160 ) +region = Rect2( 960, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=170] atlas = SubResource( 90 ) -region = Rect2( 960, 1440, 240, 160 ) +region = Rect2( 1200, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=171] atlas = SubResource( 90 ) -region = Rect2( 1200, 1440, 240, 160 ) +region = Rect2( 1440, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=172] atlas = SubResource( 90 ) -region = Rect2( 1440, 1440, 240, 160 ) +region = Rect2( 1200, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=173] atlas = SubResource( 90 ) -region = Rect2( 1680, 1440, 240, 160 ) +region = Rect2( 1440, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=174] atlas = SubResource( 90 ) -region = Rect2( 1920, 1440, 240, 160 ) +region = Rect2( 1680, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=175] atlas = SubResource( 90 ) -region = Rect2( 2160, 1440, 240, 160 ) +region = Rect2( 1920, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=176] atlas = SubResource( 90 ) -region = Rect2( 240, 0, 240, 160 ) +region = Rect2( 2160, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=177] atlas = SubResource( 90 ) -region = Rect2( 480, 0, 240, 160 ) +region = Rect2( 2400, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=178] atlas = SubResource( 90 ) -region = Rect2( 720, 0, 240, 160 ) +region = Rect2( 0, 1280, 240, 160 ) [sub_resource type="AtlasTexture" id=179] atlas = SubResource( 90 ) -region = Rect2( 960, 0, 240, 160 ) +region = Rect2( 240, 1280, 240, 160 ) [sub_resource type="AtlasTexture" id=180] atlas = SubResource( 90 ) -region = Rect2( 2160, 320, 240, 160 ) +region = Rect2( 480, 1280, 240, 160 ) [sub_resource type="AtlasTexture" id=181] atlas = SubResource( 90 ) -region = Rect2( 0, 640, 240, 160 ) +region = Rect2( 720, 1280, 240, 160 ) -[sub_resource type="SpriteFrames" id=182] +[sub_resource type="AtlasTexture" 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, @@ -392,59 +457,74 @@ 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 ) ], +"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 ) ], +"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( 112 ), SubResource( 113 ), SubResource( 114 ) ], +"frames": [ SubResource( 125 ), SubResource( 126 ), SubResource( 127 ) ], +"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( 115 ), SubResource( 116 ), SubResource( 117 ), SubResource( 118 ), SubResource( 116 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ) ], +"frames": [ SubResource( 131 ), SubResource( 132 ), SubResource( 133 ), SubResource( 134 ), SubResource( 132 ), SubResource( 135 ), SubResource( 136 ), SubResource( 137 ) ], "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( 138 ), SubResource( 138 ), SubResource( 138 ), SubResource( 138 ), SubResource( 138 ), SubResource( 138 ), SubResource( 139 ), SubResource( 140 ) ], "loop": false, "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( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ), SubResource( 146 ), SubResource( 147 ), SubResource( 148 ), SubResource( 149 ), SubResource( 150 ), SubResource( 151 ) ], "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( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ), SubResource( 156 ), SubResource( 157 ), SubResource( 158 ), SubResource( 159 ), SubResource( 160 ), SubResource( 161 ) ], "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( 162 ), SubResource( 163 ), SubResource( 164 ), SubResource( 165 ), SubResource( 166 ), SubResource( 167 ), SubResource( 168 ), SubResource( 169 ), SubResource( 170 ), SubResource( 171 ) ], "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( 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 ) ], "loop": true, "name": "slash", "speed": 10.0 }, { -"frames": [ SubResource( 107 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 179 ) ], -"loop": true, +"frames": [ SubResource( 120 ), SubResource( 192 ), SubResource( 193 ), SubResource( 194 ), SubResource( 195 ) ], +"loop": false, "name": "stand", "speed": 10.0 }, { -"frames": [ SubResource( 180 ) ], +"frames": [ SubResource( 196 ) ], "loop": false, "name": "step", "speed": 10.0 }, { -"frames": [ SubResource( 181 ) ], +"frames": [ SubResource( 197 ) ], "loop": false, "name": "step_shoot", "speed": 10.0 @@ -460,18 +540,18 @@ player_number = 1 [node name="AnimatedSprite" parent="." index="0"] position = Vector2( -1, -51 ) -frames = SubResource( 182 ) +frames = SubResource( 198 ) 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, -"op_exp": false, +"op_exp": true, "slice": "", "source": "D:/Sync/Assets/Library/Mega.ase" } @@ -541,9 +621,9 @@ animation_suffix = true [node name="hurt" type="Node" parent="movement_state_machine" index="5"] script = ExtResource( 12 ) -timeout_seconds = 1.0 +timeout_seconds = 2.0 move_speed = -10.0 -animation_sequence = [ "stand" ] +animation_sequence = [ "hurt" ] idle_node = NodePath("../idle") [node name="dash" type="Node" parent="movement_state_machine" index="6"] @@ -567,6 +647,9 @@ 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 ) + [node name="Hurtbox_Component" parent="." index="4"] collision_layer = 16 collision_mask = 128 diff --git a/src/playerD/states/hurt.gd b/src/playerD/states/hurt.gd index c667711..06c37ca 100644 --- a/src/playerD/states/hurt.gd +++ b/src/playerD/states/hurt.gd @@ -4,6 +4,8 @@ export (NodePath) var idle_node onready var idle_state: State = get_node(idle_node) +var flash_color = Color.red + func enter() -> void: .enter() move_component.velocity.x = 0 @@ -11,6 +13,10 @@ func enter() -> void: #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() @@ -19,6 +25,10 @@ func process_input(_event: InputEvent) -> State: func process_frame(delta: float) -> State: + #flash_color.linear_interpolate(Color.white, abs(sin(state_timeout.time_left))) + 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 diff --git a/src/singleton_autoloads/UIManager.gd b/src/singleton_autoloads/UIManager.gd index 1252910..171e11d 100644 --- a/src/singleton_autoloads/UIManager.gd +++ b/src/singleton_autoloads/UIManager.gd @@ -9,6 +9,8 @@ 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"