feat:fix animations, add sfx + bgm, healthbar, spawner node

feat: add bars + more anims
Merge pull request 'feat: viruling behaviour, entity class, melee attacks' (#1 ) from abstralexis/gmtk-2024:main into main
2024-08-18 03:04:28 +01:00 · 2024-08-17 22:39:51 +01:00 · 2024-08-17 19:59:55 +00:00
48 changed files with 1441 additions and 352 deletions
--- a/assets/EnemyHurt.wav
+++ b/assets/EnemyHurt.wav
--- a/assets/EnemyHurt.wav.import
+++ b/assets/EnemyHurt.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dxnxix8qrr6tq"
+path="res://.godot/imported/EnemyHurt.wav-fb6c033455c8fd2c64ccfdf0c818a65a.sample"
+
+[deps]
+
+source_file="res://assets/EnemyHurt.wav"
+dest_files=["res://.godot/imported/EnemyHurt.wav-fb6c033455c8fd2c64ccfdf0c818a65a.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0
--- a/assets/Explode.wav
+++ b/assets/Explode.wav
--- a/assets/Explode.wav.import
+++ b/assets/Explode.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dfrc2luquqqlw"
+path="res://.godot/imported/Explode.wav-1025ed9a84beb2ef982eff388b1bbeea.sample"
+
+[deps]
+
+source_file="res://assets/Explode.wav"
+dest_files=["res://.godot/imported/Explode.wav-1025ed9a84beb2ef982eff388b1bbeea.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0
--- a/assets/Go.aseprite
+++ b/assets/Go.aseprite
--- a/assets/Go.aseprite.import
+++ b/assets/Go.aseprite.import
@ -0,0 +1,14 @@
+[remap]
+
+importer="aseprite_wizard.plugin.noop"
+type="PackedDataContainer"
+uid="uid://davrou2v4qw2i"
+path="res://.godot/imported/Go.aseprite-25f8aee4e191af232eb3cbeb790ac21b.res"
+
+[deps]
+
+source_file="res://assets/Go.aseprite"
+dest_files=["res://.godot/imported/Go.aseprite-25f8aee4e191af232eb3cbeb790ac21b.res"]
+
+[params]
+
--- a/assets/HealthBorder.aseprite
+++ b/assets/HealthBorder.aseprite
--- a/assets/HealthBorder.aseprite.import
+++ b/assets/HealthBorder.aseprite.import
@ -0,0 +1,14 @@
+[remap]
+
+importer="aseprite_wizard.plugin.noop"
+type="PackedDataContainer"
+uid="uid://dgqr8sd2xeyni"
+path="res://.godot/imported/HealthBorder.aseprite-114a2c214cb1e322dfa2a303d28a908a.res"
+
+[deps]
+
+source_file="res://assets/HealthBorder.aseprite"
+dest_files=["res://.godot/imported/HealthBorder.aseprite-114a2c214cb1e322dfa2a303d28a908a.res"]
+
+[params]
+
--- a/assets/Level1BGAudio.wav
+++ b/assets/Level1BGAudio.wav
--- a/assets/Level1BGAudio.wav.import
+++ b/assets/Level1BGAudio.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ce3soc3run6um"
+path="res://.godot/imported/Level1BGAudio.wav-e7b60b70a4523876968adf4a6c8994a4.sample"
+
+[deps]
+
+source_file="res://assets/Level1BGAudio.wav"
+dest_files=["res://.godot/imported/Level1BGAudio.wav-e7b60b70a4523876968adf4a6c8994a4.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0
--- a/assets/PlayerCharacter.aseprite
+++ b/assets/PlayerCharacter.aseprite
--- a/assets/PlayerDeathSound.wav
+++ b/assets/PlayerDeathSound.wav
--- a/assets/PlayerDeathSound.wav.import
+++ b/assets/PlayerDeathSound.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://du0f57xgcxuxf"
+path="res://.godot/imported/PlayerDeathSound.wav-064911359937abe1fa0c8cddb7e84ea4.sample"
+
+[deps]
+
+source_file="res://assets/PlayerDeathSound.wav"
+dest_files=["res://.godot/imported/PlayerDeathSound.wav-064911359937abe1fa0c8cddb7e84ea4.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0
--- a/assets/PlayerHurt.wav
+++ b/assets/PlayerHurt.wav
--- a/assets/PlayerHurt.wav.import
+++ b/assets/PlayerHurt.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cir5d1qi0hcev"
+path="res://.godot/imported/PlayerHurt.wav-7dea0e9202985b5dd27d18b772b40ee2.sample"
+
+[deps]
+
+source_file="res://assets/PlayerHurt.wav"
+dest_files=["res://.godot/imported/PlayerHurt.wav-7dea0e9202985b5dd27d18b772b40ee2.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0
--- a/assets/TopBottom.aseprite
+++ b/assets/TopBottom.aseprite
--- a/assets/TopBottom.aseprite.import
+++ b/assets/TopBottom.aseprite.import
@ -0,0 +1,14 @@
+[remap]
+
+importer="aseprite_wizard.plugin.noop"
+type="PackedDataContainer"
+uid="uid://crfosyduwl8ln"
+path="res://.godot/imported/TopBottom.aseprite-4492d70b38a804feac46851918def1b1.res"
+
+[deps]
+
+source_file="res://assets/TopBottom.aseprite"
+dest_files=["res://.godot/imported/TopBottom.aseprite-4492d70b38a804feac46851918def1b1.res"]
+
+[params]
+
--- a/assets/viruling_spin.aseprite
+++ b/assets/viruling_spin.aseprite
--- a/assets/Viruling.aseprite.import
+++ b/assets/Viruling.aseprite.import
@ -0,0 +1,14 @@
+[remap]
+
+importer="aseprite_wizard.plugin.noop"
+type="PackedDataContainer"
+uid="uid://2g8hbnap6s5a"
+path="res://.godot/imported/Viruling.aseprite-f412110448d264873303b17f07c6def6.res"
+
+[deps]
+
+source_file="res://assets/Viruling.aseprite"
+dest_files=["res://.godot/imported/Viruling.aseprite-f412110448d264873303b17f07c6def6.res"]
+
+[params]
+
--- a/assets/bars.jpg
+++ b/assets/bars.jpg
--- a/assets/bars.jpg.import
+++ b/assets/bars.jpg.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://8trlh7j2pkam"
+path="res://.godot/imported/bars.jpg-cab2dec6a2095b0b47f5525c278f01e5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/bars.jpg"
+dest_files=["res://.godot/imported/bars.jpg-cab2dec6a2095b0b47f5525c278f01e5.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/export/health-.png
+++ b/assets/export/health-.png
--- a/assets/export/health-.png.import
+++ b/assets/export/health-.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cliy3s4yykb3k"
+path="res://.godot/imported/health-.png-4c2f44980382af653fa17687a74ed113.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/export/health-.png"
+dest_files=["res://.godot/imported/health-.png-4c2f44980382af653fa17687a74ed113.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/export/player-.png
+++ b/assets/export/player-.png
--- a/assets/export/player-.png.import
+++ b/assets/export/player-.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://wg4a6srri5sa"
+path="res://.godot/imported/player-.png-6120af0e1813dedc7607e4f99506416b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/export/player-.png"
+dest_files=["res://.godot/imported/player-.png-6120af0e1813dedc7607e4f99506416b.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/export/player-Layer
+++ b/assets/export/player-Layer
--- a/assets/export/player-Layer
+++ b/assets/export/player-Layer
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c0kd8wu2yvssc"
+path="res://.godot/imported/player-Layer 4.png-e87abd4355ca2452a56cf19bd4f3b0ec.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/export/player-Layer 4.png"
+dest_files=["res://.godot/imported/player-Layer 4.png-e87abd4355ca2452a56cf19bd4f3b0ec.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/export/player-Layer
+++ b/assets/export/player-Layer
--- a/assets/export/player-Layer
+++ b/assets/export/player-Layer
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d4mjdwhmho5vs"
+path="res://.godot/imported/player-Layer 5.png-f6df3f22bdd8a4f3b2a581cc00ceda44.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/export/player-Layer 5.png"
+dest_files=["res://.godot/imported/player-Layer 5.png-f6df3f22bdd8a4f3b2a581cc00ceda44.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/export/player-Layer
+++ b/assets/export/player-Layer
--- a/assets/export/player-Layer
+++ b/assets/export/player-Layer
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bfw5h4af15wth"
+path="res://.godot/imported/player-Layer 6.png-f1cf81b1232504e250c598018d463c5c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/export/player-Layer 6.png"
+dest_files=["res://.godot/imported/player-Layer 6.png-f1cf81b1232504e250c598018d463c5c.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/export/playerLayer
+++ b/assets/export/playerLayer
--- a/assets/export/top-bottom-.png
+++ b/assets/export/top-bottom-.png
--- a/assets/export/top-bottom-.png.import
+++ b/assets/export/top-bottom-.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dailayr5c75eu"
+path="res://.godot/imported/top-bottom-.png-f040386dc0350eeaa8c2f46c3e11e100.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/export/top-bottom-.png"
+dest_files=["res://.godot/imported/top-bottom-.png-f040386dc0350eeaa8c2f46c3e11e100.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/viruling_spin.aseprite.import
+++ b/assets/viruling_spin.aseprite.import
@ -1,14 +0,0 @@
-[remap]
-
-importer="aseprite_wizard.plugin.noop"
-type="PackedDataContainer"
-uid="uid://2g8hbnap6s5a"
-path="res://.godot/imported/viruling_spin.aseprite-2addb3a6357cbfdfd34eecd5833985aa.res"
-
-[deps]
-
-source_file="res://assets/viruling_spin.aseprite"
-dest_files=["res://.godot/imported/viruling_spin.aseprite-2addb3a6357cbfdfd34eecd5833985aa.res"]
-
-[params]
-
--- a/components/Bars.tscn
+++ b/components/Bars.tscn
@ -0,0 +1,15 @@
+[gd_scene load_steps=2 format=3 uid="uid://clptnshbcs6cn"]
+
+[ext_resource type="Texture2D" uid="uid://8trlh7j2pkam" path="res://assets/bars.jpg" id="1_ryukb"]
+
+[node name="Bars" type="Control"]
+layout_mode = 3
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="TextureRect" type="TextureRect" parent="."]
+layout_mode = 0
+offset_right = 640.0
+offset_bottom = 360.0
+texture = ExtResource("1_ryukb")
--- a/components/Borders.tscn
+++ b/components/Borders.tscn
@ -6,7 +6,7 @@ distance = -184.0

 [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_wodb0"]
 normal = Vector2(-1, 0)
-distance = -208.0
+distance = -216.0

 [node name="Borders" type="Node2D"]

--- a/components/Player.tscn
+++ b/components/Player.tscn
@ -1,225 +1,298 @@
-[gd_scene load_steps=45 format=3 uid="uid://cjiuycwqqxaxn"]
+[gd_scene load_steps=79 format=3 uid="uid://cjiuycwqqxaxn"]

 [ext_resource type="Script" path="res://scripts/player.gd" id="1_oy25y"]
-[ext_resource type="Texture2D" uid="uid://cownabyc1p26u" path="res://assets/export/playerLayer 3.png" id="2_5c6qp"]
+[ext_resource type="Texture2D" uid="uid://d4mjdwhmho5vs" path="res://assets/export/player-Layer 5.png" id="2_g0lnn"]
+[ext_resource type="AudioStream" uid="uid://cir5d1qi0hcev" path="res://assets/PlayerHurt.wav" id="3_ggoam"]
+[ext_resource type="AudioStream" uid="uid://du0f57xgcxuxf" path="res://assets/PlayerDeathSound.wav" id="4_8skcp"]
+[ext_resource type="Texture2D" uid="uid://cliy3s4yykb3k" path="res://assets/export/health-.png" id="5_1x6di"]

-[sub_resource type="AtlasTexture" id="AtlasTexture_6hs0l"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(128, 256, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_7slh2"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(160, 256, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_io1xr"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(192, 256, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_vh4hn"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(0, 320, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_wwamw"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(32, 320, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_nens7"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(64, 320, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_xnw82"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(96, 320, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_sv3rw"]
-atlas = ExtResource("2_5c6qp")
+[sub_resource type="AtlasTexture" id="AtlasTexture_l521r"]
+atlas = ExtResource("2_g0lnn")
 region = Rect2(0, 0, 32, 64)

-[sub_resource type="AtlasTexture" id="AtlasTexture_kldb3"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(128, 192, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_daegq"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(160, 192, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_c3qy7"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(192, 192, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_5iowx"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(0, 256, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_2f5nd"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(32, 256, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_xuig4"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(64, 256, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_uk8ao"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(96, 256, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_6wkkf"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(32, 0, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_mecdt"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(64, 0, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_pvo15"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(96, 0, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_fcvkv"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(128, 0, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ejt0g"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(160, 0, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_l4s6u"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(192, 0, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_qw5vg"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(0, 64, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_agdq2"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(32, 64, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_1qa8b"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(64, 64, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_a5wcc"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(96, 64, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_5ra6k"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(128, 64, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_l1grw"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(160, 64, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_gae7w"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(192, 64, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_p0xeb"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(0, 128, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_tuo0l"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(32, 128, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_iygu1"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(64, 128, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_nlq48"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(96, 128, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_581d4"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(128, 128, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_depii"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(160, 128, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_nsu0f"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(192, 128, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_kdf7b"]
-atlas = ExtResource("2_5c6qp")
-region = Rect2(0, 192, 32, 64)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_dvo1k"]
-atlas = ExtResource("2_5c6qp")
+[sub_resource type="AtlasTexture" id="AtlasTexture_qvttr"]
+atlas = ExtResource("2_g0lnn")
 region = Rect2(32, 192, 32, 64)

-[sub_resource type="AtlasTexture" id="AtlasTexture_nuos6"]
-atlas = ExtResource("2_5c6qp")
+[sub_resource type="AtlasTexture" id="AtlasTexture_ofguw"]
+atlas = ExtResource("2_g0lnn")
 region = Rect2(64, 192, 32, 64)

-[sub_resource type="AtlasTexture" id="AtlasTexture_fgj7i"]
-atlas = ExtResource("2_5c6qp")
+[sub_resource type="AtlasTexture" id="AtlasTexture_co8k7"]
+atlas = ExtResource("2_g0lnn")
 region = Rect2(96, 192, 32, 64)

-[sub_resource type="SpriteFrames" id="SpriteFrames_o2lgd"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_41d2d"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(128, 192, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hbosn"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(160, 192, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0km57"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(192, 192, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_51sll"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(224, 192, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_px3nn"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(128, 256, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ripko"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(32, 320, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_561ig"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(64, 320, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7js0p"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(160, 256, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_wjcje"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(192, 256, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_q2cd0"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(224, 256, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_htmbl"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(0, 320, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rnxuc"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(64, 64, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_wo1m8"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(64, 448, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_fk6te"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(96, 448, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_fbjir"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(128, 448, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3ihru"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(160, 448, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4jlds"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(192, 448, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_81wn7"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(0, 384, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ufuyf"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(32, 384, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mf2dl"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(64, 384, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ke4ob"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(96, 384, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_yt7ej"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(128, 384, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8ejvg"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(160, 384, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_m3wjx"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(192, 384, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_drf5o"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(224, 384, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jpfep"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(0, 448, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_bwlrc"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(32, 448, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2txm3"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(96, 320, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_uaysy"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(128, 320, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_o7mn6"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(160, 320, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_q0v0p"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(192, 320, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_sv0e8"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(224, 320, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mbcqm"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(32, 0, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_m8ku5"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(64, 0, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mdsdu"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(96, 0, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_24k44"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(128, 0, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_idj6d"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(160, 0, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_gcw5r"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(192, 0, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_cpkux"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(224, 0, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ht6wj"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(0, 64, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vlyrt"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(32, 64, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_18fxb"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(0, 256, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_6uboo"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(32, 256, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_p16r1"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(64, 256, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_aewy4"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(96, 256, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3q0vi"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(96, 64, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7te6v"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(128, 64, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tfxjn"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(160, 64, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rjqbd"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(192, 64, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_dcng7"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(224, 64, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ma1kj"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(0, 128, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4mnk0"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(32, 128, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_uxup4"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(64, 128, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2c0ng"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(96, 128, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_72rar"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(128, 128, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_be8t0"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(160, 128, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_qypdu"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(192, 128, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hay5m"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(224, 128, 32, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3722o"]
+atlas = ExtResource("2_g0lnn")
+region = Rect2(0, 192, 32, 64)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_6noqu"]
 animations = [{
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_6hs0l")
+"texture": SubResource("AtlasTexture_l521r")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_7slh2")
+"texture": SubResource("AtlasTexture_qvttr")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_io1xr")
+"texture": SubResource("AtlasTexture_ofguw")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_vh4hn")
+"texture": SubResource("AtlasTexture_co8k7")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_wwamw")
+"texture": SubResource("AtlasTexture_41d2d")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_nens7")
+"texture": SubResource("AtlasTexture_hbosn")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_xnw82")
-}],
-"loop": true,
-"name": &" punch",
-"speed": 10.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_sv3rw")
+"texture": SubResource("AtlasTexture_0km57")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_kldb3")
+"texture": SubResource("AtlasTexture_51sll")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_daegq")
+"texture": SubResource("AtlasTexture_ofguw")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_c3qy7")
+"texture": SubResource("AtlasTexture_qvttr")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_5iowx")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_2f5nd")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_xuig4")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_uk8ao")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_daegq")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_kldb3")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_sv3rw")
+"texture": SubResource("AtlasTexture_l521r")
 }],
 "loop": true,
 "name": &"Jump",
@ -227,34 +300,212 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_sv3rw")
+"texture": SubResource("AtlasTexture_px3nn")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_6wkkf")
+"texture": SubResource("AtlasTexture_ripko")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_mecdt")
+"texture": SubResource("AtlasTexture_561ig")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_pvo15")
+"texture": SubResource("AtlasTexture_ripko")
+}],
+"loop": true,
+"name": &"Left",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_px3nn")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_fcvkv")
+"texture": SubResource("AtlasTexture_7js0p")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_ejt0g")
+"texture": SubResource("AtlasTexture_wjcje")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_l4s6u")
+"texture": SubResource("AtlasTexture_q2cd0")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_qw5vg")
+"texture": SubResource("AtlasTexture_htmbl")
+}],
+"loop": true,
+"name": &"Right",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rnxuc")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_agdq2")
+"texture": SubResource("AtlasTexture_wo1m8")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_1qa8b")
+"texture": SubResource("AtlasTexture_fk6te")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_fbjir")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3ihru")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_fbjir")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4jlds")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rnxuc")
+}],
+"loop": true,
+"name": &"air kick",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_l521r")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_81wn7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ufuyf")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mf2dl")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ke4ob")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_yt7ej")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8ejvg")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_m3wjx")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_drf5o")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jpfep")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bwlrc")
+}],
+"loop": true,
+"name": &"death",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_2txm3")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_uaysy")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_o7mn6")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_q0v0p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_sv0e8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_q0v0p")
+}],
+"loop": true,
+"name": &"hurt",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_l521r")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mbcqm")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_m8ku5")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mdsdu")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_24k44")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_idj6d")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_gcw5r")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_cpkux")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ht6wj")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vlyrt")
 }],
 "loop": true,
 "name": &"idle",
@ -262,49 +513,93 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_a5wcc")
+"texture": SubResource("AtlasTexture_l521r")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_5ra6k")
+"texture": SubResource("AtlasTexture_qvttr")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_l1grw")
+"texture": SubResource("AtlasTexture_ofguw")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_gae7w")
+"texture": SubResource("AtlasTexture_41d2d")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_p0xeb")
+"texture": SubResource("AtlasTexture_hbosn")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_tuo0l")
+"texture": SubResource("AtlasTexture_18fxb")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_iygu1")
+"texture": SubResource("AtlasTexture_6uboo")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_nlq48")
+"texture": SubResource("AtlasTexture_p16r1")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_581d4")
+"texture": SubResource("AtlasTexture_p16r1")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_depii")
+"texture": SubResource("AtlasTexture_aewy4")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_nsu0f")
+"texture": SubResource("AtlasTexture_ofguw")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_kdf7b")
+"texture": SubResource("AtlasTexture_qvttr")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_dvo1k")
+"texture": SubResource("AtlasTexture_l521r")
+}],
+"loop": true,
+"name": &"slam",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rnxuc")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_nuos6")
+"texture": SubResource("AtlasTexture_3q0vi")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_fgj7i")
+"texture": SubResource("AtlasTexture_7te6v")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_tfxjn")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rjqbd")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_dcng7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ma1kj")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4mnk0")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_uxup4")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_2c0ng")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_72rar")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_be8t0")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_qypdu")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_hay5m")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3722o")
 }],
 "loop": true,
 "name": &"walk",
@ -317,35 +612,117 @@ size = Vector2(28, 64)
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_mst3b"]
 size = Vector2(27, 41)

+[sub_resource type="AtlasTexture" id="AtlasTexture_5bnwc"]
+atlas = ExtResource("5_1x6di")
+region = Rect2(128, 16, 64, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_og4rp"]
+atlas = ExtResource("5_1x6di")
+region = Rect2(0, 0, 64, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_03d4u"]
+atlas = ExtResource("5_1x6di")
+region = Rect2(64, 16, 64, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_sox5s"]
+atlas = ExtResource("5_1x6di")
+region = Rect2(0, 16, 64, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_o1ukw"]
+atlas = ExtResource("5_1x6di")
+region = Rect2(128, 0, 64, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5qc6y"]
+atlas = ExtResource("5_1x6di")
+region = Rect2(64, 0, 64, 16)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_tbw5i"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5bnwc")
+}],
+"loop": true,
+"name": &"0",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_og4rp")
+}],
+"loop": true,
+"name": &"100",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_03d4u")
+}],
+"loop": true,
+"name": &"20",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_sox5s")
+}],
+"loop": true,
+"name": &"40",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_o1ukw")
+}],
+"loop": true,
+"name": &"60",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5qc6y")
+}],
+"loop": true,
+"name": &"80",
+"speed": 10.0
+}]
+
 [node name="Player" type="CharacterBody2D"]
 collision_mask = 3
 script = ExtResource("1_oy25y")

 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 texture_filter = 1
-sprite_frames = SubResource("SpriteFrames_o2lgd")
-animation = &" punch"
-frame_progress = 0.126525
+sprite_frames = SubResource("SpriteFrames_6noqu")
+animation = &"death"
 metadata/_aseprite_wizard_config_ = {
-"layer": "Layer 3",
+"layer": "Layer 5",
 "o_ex_p": "",
 "o_folder": "res://assets/export",
-"o_name": "player",
+"o_name": "player-",
 "only_visible": false,
 "slice": "",
 "source": "res://assets/PlayerCharacter.aseprite"
 }
-metadata/_aseprite_wizard_source_file_hash_ = "dd5426320f333c1fca2ec67ca43f9db7"
 metadata/_aseprite_wizard_interface_config_ = {
 "layer_section": true,
-"output_section": true
+"output_section": true,
+"slice_section": false
 }
+metadata/_aseprite_wizard_source_file_hash_ = "9b87e116b10fe7a61dc017b05e385632"

 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(2, 0)
 shape = SubResource("RectangleShape2D_0on8q")
 debug_color = Color(1, 0.254902, 0.415686, 0.105882)

+[node name="PunchHitbox" type="Area2D" parent="."]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PunchHitbox"]
+position = Vector2(29, -3)
+shape = SubResource("RectangleShape2D_mst3b")
+debug_color = Color(2.11775e-06, 0.631094, 0.465774, 0.42)
+
 [node name="AttackTimer" type="Timer" parent="."]
 editor_description = "

@ -353,9 +730,37 @@ editor_description = "
 wait_time = 0.5
 one_shot = true

-[node name="PunchHitbox" type="Area2D" parent="."]
+[node name="DeathTimer" type="Timer" parent="."]
+wait_time = 2.7
+one_shot = true

-[node name="CollisionShape2D" type="CollisionShape2D" parent="PunchHitbox"]
-position = Vector2(29, -3)
-shape = SubResource("RectangleShape2D_mst3b")
-debug_color = Color(2.11775e-06, 0.631094, 0.465774, 0.42)
+[node name="HurtTimer" type="Timer" parent="."]
+wait_time = 0.6
+one_shot = true
+
+[node name="PlayerHurtSfx" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("3_ggoam")
+
+[node name="PlayerDeathSfx" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("4_8skcp")
+volume_db = 2.0
+
+[node name="HealthBar" type="AnimatedSprite2D" parent="."]
+texture_filter = 1
+position = Vector2(0, -41)
+sprite_frames = SubResource("SpriteFrames_tbw5i")
+animation = &"100"
+metadata/_aseprite_wizard_config_ = {
+"layer": "",
+"o_ex_p": "",
+"o_folder": "res://assets/export",
+"o_name": "health-",
+"only_visible": true,
+"slice": "",
+"source": "res://assets/HealthBorder.aseprite"
+}
+metadata/_aseprite_wizard_interface_config_ = {
+"layer_section": false,
+"output_section": true
+}
+metadata/_aseprite_wizard_source_file_hash_ = "72e00fdcd91dac701215afc35f081aa5"
--- a/components/Viruling.tscn
+++ b/components/Viruling.tscn
@ -1,115 +1,116 @@
-[gd_scene load_steps=27 format=3 uid="uid://bxbpvgteyfh02"]
+[gd_scene load_steps=28 format=3 uid="uid://bxbpvgteyfh02"]

 [ext_resource type="Script" path="res://scripts/viruling.gd" id="1_eevnl"]
 [ext_resource type="Texture2D" uid="uid://djjun1p0rx1ap" path="res://assets/export/viruling-.png" id="1_i45rj"]
+[ext_resource type="AudioStream" uid="uid://dfrc2luquqqlw" path="res://assets/Explode.wav" id="3_hno7f"]

 [sub_resource type="CircleShape2D" id="CircleShape2D_gi7h4"]
 radius = 17.0294

-[sub_resource type="AtlasTexture" id="AtlasTexture_kidce"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_ey3ug"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(0, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_qe36s"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_yg44u"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(32, 96, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_ngfqf"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_10kxp"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(64, 96, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_nii03"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_asgry"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(96, 96, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_tkn6b"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_shkjk"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(128, 96, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_2r8jg"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_n7xsd"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(0, 128, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_0s3k4"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_b78uq"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(32, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_2h71d"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_yk2as"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(64, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_45yd5"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_bp4sa"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(96, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_6isb8"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_qe65k"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(128, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_m6d0y"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_ii7ue"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(0, 32, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_kp48x"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_2mb0r"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(32, 32, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_rhh7o"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_rwb2y"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(64, 32, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_0l2ip"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_muc0u"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(96, 32, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_u0o6v"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_lh2dq"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(128, 32, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_hh53s"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_ynt0w"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(0, 64, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_g0xj4"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_gys0u"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(32, 64, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_smgex"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_tspca"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(64, 64, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_efhl8"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_e81jk"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(96, 64, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_smw3b"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_4h8vk"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(128, 64, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_hc7x2"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_4j73j"]
 atlas = ExtResource("1_i45rj")
 region = Rect2(0, 96, 32, 32)

-[sub_resource type="SpriteFrames" id="SpriteFrames_01e4m"]
+[sub_resource type="SpriteFrames" id="SpriteFrames_paa88"]
 animations = [{
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_kidce")
+"texture": SubResource("AtlasTexture_ey3ug")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_qe36s")
+"texture": SubResource("AtlasTexture_yg44u")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_ngfqf")
+"texture": SubResource("AtlasTexture_10kxp")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_nii03")
+"texture": SubResource("AtlasTexture_asgry")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_tkn6b")
+"texture": SubResource("AtlasTexture_shkjk")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_2r8jg")
+"texture": SubResource("AtlasTexture_n7xsd")
 }],
 "loop": true,
 "name": &"death",
@ -117,55 +118,55 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_kidce")
+"texture": SubResource("AtlasTexture_ey3ug")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_0s3k4")
+"texture": SubResource("AtlasTexture_b78uq")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_2h71d")
+"texture": SubResource("AtlasTexture_yk2as")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_45yd5")
+"texture": SubResource("AtlasTexture_bp4sa")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_6isb8")
+"texture": SubResource("AtlasTexture_qe65k")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_m6d0y")
+"texture": SubResource("AtlasTexture_ii7ue")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_kp48x")
+"texture": SubResource("AtlasTexture_2mb0r")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_rhh7o")
+"texture": SubResource("AtlasTexture_rwb2y")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_kidce")
+"texture": SubResource("AtlasTexture_ey3ug")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_0l2ip")
+"texture": SubResource("AtlasTexture_muc0u")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_u0o6v")
+"texture": SubResource("AtlasTexture_lh2dq")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_hh53s")
+"texture": SubResource("AtlasTexture_ynt0w")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_g0xj4")
+"texture": SubResource("AtlasTexture_gys0u")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_smgex")
+"texture": SubResource("AtlasTexture_tspca")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_efhl8")
+"texture": SubResource("AtlasTexture_e81jk")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_smw3b")
+"texture": SubResource("AtlasTexture_4h8vk")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_hc7x2")
+"texture": SubResource("AtlasTexture_4j73j")
 }],
 "loop": true,
 "name": &"spin",
@ -185,7 +186,7 @@ shape = SubResource("CircleShape2D_gi7h4")

 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 texture_filter = 1
-sprite_frames = SubResource("SpriteFrames_01e4m")
+sprite_frames = SubResource("SpriteFrames_paa88")
 animation = &"spin"
 metadata/_aseprite_wizard_config_ = {
 "layer": "",
@ -194,7 +195,7 @@ metadata/_aseprite_wizard_config_ = {
 "o_name": "viruling-",
 "only_visible": true,
 "slice": "",
-"source": "res://assets/viruling_spin.aseprite"
+"source": "res://assets/Viruling.aseprite"
 }
 metadata/_aseprite_wizard_source_file_hash_ = "e9452ba317bc3563d2373e8b9d673cef"
 metadata/_aseprite_wizard_interface_config_ = {
@ -207,9 +208,13 @@ metadata/_aseprite_wizard_interface_config_ = {
 shape = SubResource("CircleShape2D_kpyhc")
 debug_color = Color(0.972226, 0, 0.442516, 0.42)

-[node name="Timer" type="Timer" parent="."]
+[node name="AttackTimer" type="Timer" parent="."]
 one_shot = true

 [node name="DeathTimer" type="Timer" parent="."]
 wait_time = 0.55
 one_shot = true
+
+[node name="ExplosionSFX" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("3_hno7f")
+volume_db = 10.0
--- a/levels/level1/sta1910.tmp
+++ b/levels/level1/sta1910.tmp
@ -0,0 +1,121 @@
+[gd_scene load_steps=10 format=3 uid="uid://cei5gjgfoginb"]
+
+[ext_resource type="Script" path="res://scripts/stageController.gd" id="1_m1n7w"]
+[ext_resource type="Texture2D" uid="uid://bynsxkfd4t4cn" path="res://assets/export/stage1.png" id="2_48003"]
+[ext_resource type="AudioStream" uid="uid://ce3soc3run6um" path="res://assets/Level1BGAudio.wav" id="2_qcnna"]
+[ext_resource type="PackedScene" uid="uid://cjiuycwqqxaxn" path="res://components/Player.tscn" id="2_sxo5w"]
+[ext_resource type="PackedScene" uid="uid://bab4ac3s2n0o1" path="res://components/Borders.tscn" id="3_04xvl"]
+[ext_resource type="PackedScene" uid="uid://bxbpvgteyfh02" path="res://components/Viruling.tscn" id="5_w7lww"]
+[ext_resource type="PackedScene" path="res://components/Bars.tscn" id="6_u2jd3"]
+[ext_resource type="Texture2D" uid="uid://dailayr5c75eu" path="res://assets/export/top-bottom-.png" id="7_gw1ay"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_h5wua"]
+size = Vector2(492, 101)
+
+[node name="World" type="Node2D"]
+position = Vector2(344, 240)
+script = ExtResource("1_m1n7w")
+next_stage = "res://levels/level1/stage2.tscn"
+
+[node name="BGM" type="AudioStreamPlayer2D" parent="."]
+position = Vector2(-344, -240)
+stream = ExtResource("2_qcnna")
+
+[node name="Bars" parent="." instance=ExtResource("6_u2jd3")]
+offset_left = -344.0
+offset_top = -240.0
+offset_right = -304.0
+offset_bottom = -200.0
+
+[node name="Background" type="Sprite2D" parent="."]
+position = Vector2(-28, -64)
+scale = Vector2(1.01667, 1)
+texture = ExtResource("2_48003")
+
+[node name="Player" parent="." instance=ExtResource("2_sxo5w")]
+position = Vector2(-233, -21)
+
+[node name="Borders" parent="." instance=ExtResource("3_04xvl")]
+position = Vector2(-272, -240)
+
+[node name="Floor" type="StaticBody2D" parent="."]
+
+[node name="Sprite2D" type="Sprite2D" parent="Floor"]
+z_index = 1
+texture_filter = 1
+position = Vector2(-28, -191)
+scale = Vector2(1, 0.283333)
+texture = ExtResource("7_gw1ay")
+flip_v = true
+metadata/_aseprite_wizard_config_ = {
+"i_mode": 1,
+"keep_anim_length": false,
+"layer": "",
+"o_ex_p": "",
+"o_folder": "res://assets/export",
+"o_name": "top-bottom-",
+"only_visible": true,
+"player": "",
+"slice": "",
+"source": "res://assets/TopBottom.aseprite"
+}
+metadata/_aseprite_wizard_interface_config_ = {
+"output_section": true
+}
+metadata/_aseprite_wizard_source_file_hash_ = "1b764edd2623a4481e3cf82f9aa840f7"
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Floor"]
+position = Vector2(-28, 69)
+shape = SubResource("RectangleShape2D_h5wua")
+
+[node name="Ceiling" type="StaticBody2D" parent="."]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Ceiling"]
+position = Vector2(-29, -190)
+shape = SubResource("RectangleShape2D_h5wua")
+
+[node name="Sprite2D" type="Sprite2D" parent="Ceiling"]
+z_index = 1
+texture_filter = 1
+position = Vector2(-28.5, 68.25)
+scale = Vector2(0.99591, 0.284722)
+texture = ExtResource("7_gw1ay")
+metadata/_aseprite_wizard_config_ = {
+"i_mode": 1,
+"keep_anim_length": false,
+"layer": "",
+"o_ex_p": "",
+"o_folder": "res://assets/export",
+"o_name": "top-bottom-",
+"only_visible": true,
+"player": "",
+"slice": "",
+"source": "res://assets/TopBottom.aseprite"
+}
+metadata/_aseprite_wizard_interface_config_ = {
+"output_section": true
+}
+metadata/_aseprite_wizard_source_file_hash_ = "1b764edd2623a4481e3cf82f9aa840f7"
+
+[node name="Level1Spawner" type="Node2D" parent="."]
+
+[node name="Viruling" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(528, -55)
+
+[node name="Viruling7" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(827, 6)
+
+[node name="Viruling6" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(923, -27)
+
+[node name="Viruling5" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(727, -3)
+
+[node name="Viruling4" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(431, -41)
+
+[node name="Viruling3" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(334, -4)
+
+[node name="Viruling2" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(627, -33)
--- a/levels/level1/stage1.tscn
+++ b/levels/level1/stage1.tscn
@ -1,53 +1,121 @@
-[gd_scene load_steps=8 format=3 uid="uid://cei5gjgfoginb"]
+[gd_scene load_steps=10 format=3 uid="uid://cei5gjgfoginb"]

 [ext_resource type="Script" path="res://scripts/stageController.gd" id="1_m1n7w"]
 [ext_resource type="Texture2D" uid="uid://bynsxkfd4t4cn" path="res://assets/export/stage1.png" id="2_48003"]
+[ext_resource type="AudioStream" uid="uid://ce3soc3run6um" path="res://assets/Level1BGAudio.wav" id="2_qcnna"]
 [ext_resource type="PackedScene" uid="uid://cjiuycwqqxaxn" path="res://components/Player.tscn" id="2_sxo5w"]
 [ext_resource type="PackedScene" uid="uid://bab4ac3s2n0o1" path="res://components/Borders.tscn" id="3_04xvl"]
 [ext_resource type="PackedScene" uid="uid://bxbpvgteyfh02" path="res://components/Viruling.tscn" id="5_w7lww"]
-
-[sub_resource type="QuadMesh" id="QuadMesh_seics"]
-size = Vector2(480, 64)
+[ext_resource type="PackedScene" path="res://components/Bars.tscn" id="6_u2jd3"]
+[ext_resource type="Texture2D" uid="uid://dailayr5c75eu" path="res://assets/export/top-bottom-.png" id="7_gw1ay"]

 [sub_resource type="RectangleShape2D" id="RectangleShape2D_h5wua"]
-size = Vector2(480, 106)
+size = Vector2(492, 101)

 [node name="World" type="Node2D"]
-position = Vector2(272, 240)
+position = Vector2(344, 240)
 script = ExtResource("1_m1n7w")
 next_stage = "res://levels/level1/stage2.tscn"

+[node name="BGM" type="AudioStreamPlayer2D" parent="."]
+position = Vector2(-344, -240)
+stream = ExtResource("2_qcnna")
+
+[node name="Bars" parent="." instance=ExtResource("6_u2jd3")]
+offset_left = -344.0
+offset_top = -240.0
+offset_right = -304.0
+offset_bottom = -200.0
+
 [node name="Background" type="Sprite2D" parent="."]
-position = Vector2(-32, -64)
+position = Vector2(-28, -64)
+scale = Vector2(1.01667, 1)
 texture = ExtResource("2_48003")

+[node name="Player" parent="." instance=ExtResource("2_sxo5w")]
+position = Vector2(-233, -21)
+
 [node name="Borders" parent="." instance=ExtResource("3_04xvl")]
 position = Vector2(-272, -240)

-[node name="Player" parent="." instance=ExtResource("2_sxo5w")]
-position = Vector2(-240, -16)
-
-[node name="Viruling" parent="." instance=ExtResource("5_w7lww")]
-position = Vector2(179, -13)
-
 [node name="Floor" type="StaticBody2D" parent="."]

-[node name="MeshInstance2D" type="MeshInstance2D" parent="Floor"]
-position = Vector2(-32, 68)
-scale = Vector2(1, 1.625)
-mesh = SubResource("QuadMesh_seics")
+[node name="Sprite2D" type="Sprite2D" parent="Floor"]
+z_index = 1
+texture_filter = 1
+position = Vector2(-28, -191)
+scale = Vector2(1, 0.283333)
+texture = ExtResource("7_gw1ay")
+flip_v = true
+metadata/_aseprite_wizard_config_ = {
+"i_mode": 1,
+"keep_anim_length": false,
+"layer": "",
+"o_ex_p": "",
+"o_folder": "res://assets/export",
+"o_name": "top-bottom-",
+"only_visible": true,
+"player": "",
+"slice": "",
+"source": "res://assets/TopBottom.aseprite"
+}
+metadata/_aseprite_wizard_interface_config_ = {
+"output_section": true
+}
+metadata/_aseprite_wizard_source_file_hash_ = "1b764edd2623a4481e3cf82f9aa840f7"

 [node name="CollisionShape2D" type="CollisionShape2D" parent="Floor"]
-position = Vector2(-32, 69)
+position = Vector2(-28, 69)
 shape = SubResource("RectangleShape2D_h5wua")

 [node name="Ceiling" type="StaticBody2D" parent="."]

-[node name="MeshInstance2D" type="MeshInstance2D" parent="Ceiling"]
-position = Vector2(-32, -192)
-scale = Vector2(1, 1.625)
-mesh = SubResource("QuadMesh_seics")
-
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Ceiling"]
-position = Vector2(-32, -192)
+position = Vector2(-29, -190)
 shape = SubResource("RectangleShape2D_h5wua")
+
+[node name="Sprite2D" type="Sprite2D" parent="Ceiling"]
+z_index = 1
+texture_filter = 1
+position = Vector2(-28.5, 68.25)
+scale = Vector2(0.99591, 0.284722)
+texture = ExtResource("7_gw1ay")
+metadata/_aseprite_wizard_config_ = {
+"i_mode": 1,
+"keep_anim_length": false,
+"layer": "",
+"o_ex_p": "",
+"o_folder": "res://assets/export",
+"o_name": "top-bottom-",
+"only_visible": true,
+"player": "",
+"slice": "",
+"source": "res://assets/TopBottom.aseprite"
+}
+metadata/_aseprite_wizard_interface_config_ = {
+"output_section": true
+}
+metadata/_aseprite_wizard_source_file_hash_ = "1b764edd2623a4481e3cf82f9aa840f7"
+
+[node name="Level1Spawner" type="Node2D" parent="."]
+
+[node name="Viruling" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(528, -55)
+
+[node name="Viruling7" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(827, 6)
+
+[node name="Viruling6" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(923, -27)
+
+[node name="Viruling5" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(727, -3)
+
+[node name="Viruling4" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(431, -41)
+
+[node name="Viruling3" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(334, -4)
+
+[node name="Viruling2" parent="Level1Spawner" instance=ExtResource("5_w7lww")]
+position = Vector2(627, -33)
--- a/project.godot
+++ b/project.godot
@ -23,11 +23,11 @@ animation/layers/only_include_visible_layers_by_default=true

 [autoload]

-GlobalKeybinds="*res://scripts/globalKeybinds.gd"
+GlobalKeybinds="*res://scripts/global.gd"

 [display]

-window/size/viewport_width=480
+window/size/viewport_width=640
 window/size/viewport_height=360
 window/stretch/mode="canvas_items"
 window/vsync/vsync_mode=0
--- a/scripts/entity.gd
+++ b/scripts/entity.gd
@ -1,9 +1,9 @@
 class_name Entity extends CharacterBody2D

-@export var health = null
-@export var speed = null
-@export var damage = null
-@export var kb_speed = null
+var health = null
+var speed = null
+var damage = null
+var kb_speed = null

 func _init(initial_health: int, speed_multiplier: int, attack_damage: int) -> void:
 	health = initial_health
@ -13,21 +13,17 @@ func _init(initial_health: int, speed_multiplier: int, attack_damage: int) -> vo

 func _physics_process(delta: float) -> void:
 	var init_velocity = velocity
-	
 	velocity.x = 0
 	velocity.y = 0
 		
 	if init_velocity.x == 0:
 		init_velocity.x = 1
-		
 	if kb_speed > 0:
 		velocity.x = -sign(init_velocity.x) * kb_speed
 		kb_speed = 0
-		
-	move_and_slide()
 	
+	move_and_slide()
 	velocity = init_velocity

 func take_knockback(speed: int) -> void:
 	kb_speed = speed
-	
--- a/scripts/globalKeybinds.gd
+++ b/scripts/globalKeybinds.gd
@ -3,6 +3,7 @@ extends Node
 var previous_window_mode = -1

 func _process(delta: float) -> void:
+	# keybinds
 	if Input.is_action_just_pressed("toggle_fullscreen"):
 		if get_window().mode == Window.MODE_FULLSCREEN:
 			if previous_window_mode != -1:
--- a/scripts/health_bar.gd
+++ b/scripts/health_bar.gd
@ -0,0 +1,11 @@
+extends MeshInstance2D
+
+@onready var border_sprite = $Border
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	pass # Replace with function body.
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta: float) -> void:
+	pass
--- a/scripts/player.gd
+++ b/scripts/player.gd
@ -7,12 +7,21 @@ extends Entity
@onready var attack_timer = $AttackTimer
@onready var collider = $CollisionShape2D
@onready var punch_hitbox = $PunchHitbox
+@onready var death_timer = $DeathTimer
+@onready var player_hurt_sfx = $PlayerHurtSfx
+@onready var player_death_sfx = $PlayerDeathSfx
+@onready var hurt_timer = $HurtTimer
+@onready var health_bar = $HealthBar

 var jumping = false
 var facing_right = true
+var right_punch = false
+var hurting = false
+var is_dying = false
+var is_death_sfx = false

 const ATTACK_DAMAGE = 25 
-const INITIAL_HEALTH = 100
+const INITIAL_HEALTH = 50
 const SPEED_MULTIPLIER = 300
 const ATTACK_KNOCKBACK = 5000

@ -25,8 +34,6 @@ func _ready():
 	punch_hitbox.visible = false

 func _physics_process(delta):
-	super._physics_process(delta)
-	
 	if is_on_floor():
 		# allow the player to jump
 		if jumping:
@ -42,6 +49,11 @@ func _physics_process(delta):
 		if velocity.y > 1000:
 			velocity.y = 1000
 	
+	if is_dying and !player_death_sfx.playing:
+		player_death_sfx.play()	
+	elif hurting and !player_hurt_sfx.playing and death_timer.is_stopped():
+		player_hurt_sfx.play()
+
 	# perform horizontal movement
 	var horizontal_direction = Input.get_axis("move_left", "move_right")
 	velocity.x = speed * horizontal_direction
@ -50,28 +62,74 @@ func _physics_process(delta):
 	# ensure the player faces the correct direction
 	if horizontal_direction > 0 && !facing_right:
 		animated_sprite.flip_h = false
+		punch_hitbox.rotate(PI)
 	elif horizontal_direction < 0 && facing_right:
 		animated_sprite.flip_h = true
+		punch_hitbox.rotate(PI)
 	
 	if horizontal_direction != 0:
 		facing_right = horizontal_direction > 0
 	
-	# figure out which animation should be played
-	# respecting the jump animation above all
-	if !jumping and attack_timer.is_stopped():
-		if is_on_floor() && horizontal_direction != 0:
-			animated_sprite.play("walk")
-		else:
-			animated_sprite.play("idle")
-			
+	super._physics_process(delta)
+	
 	punch_hitbox.visible = true if !attack_timer.is_stopped() else false
-			
+	
 func punch_connect(node: Node):
 	if node is Entity and node != self and !attack_timer.is_stopped():
 		node.health -= damage
 		node.take_knockback(ATTACK_KNOCKBACK)
+		if node.has_method("hurt_anim"):
+			node.call("hurt_anim")
+			
+func hurt_anim():
+	hurting = true
+	hurt_timer.start()

 func _process(delta: float) -> void:
+	if health <= 0:
+		is_dying = true
+		death_timer.start()
+		health = 99999
+		
+	if is_dying:
+		
+		animated_sprite.play("death")
+		punch_hitbox.visible = false
+		speed = 0
+		
+		if death_timer.is_stopped():
+			queue_free()
+	
 	if attack_timer.is_stopped() and Input.is_action_just_pressed("attack"):
 		attack_timer.start()
-		animated_sprite.play(" punch") # TODO: Implement hitbox/endlag
+		
+		if is_on_floor():
+			animated_sprite.play("Right" if right_punch else "Left")
+			right_punch = !right_punch
+		else:
+			animated_sprite.play("slam")
+			
+	elif attack_timer.is_stopped() and !hurting and !is_dying and !jumping:
+		var horizontal_direction = Input.get_axis("move_left", "move_right")
+		if is_on_floor() && horizontal_direction != 0:
+			animated_sprite.play("walk")
+		else:
+			animated_sprite.play("idle")
+		
+	if !hurt_timer.is_stopped():
+		animated_sprite.play("hurt")
+	else:
+		hurting = false
+		
+	var health_percentage = health * 100 / INITIAL_HEALTH
+	if is_dying:
+		health_bar.play("0")
+	elif health_percentage > 80:
+		health_bar.play("100")
+	elif health_percentage > 60:
+		health_bar.play("80")
+	elif health_percentage > 40:
+		health_bar.play("40")
+	elif health_percentage > 20:
+		health_bar.play("20")
+		
--- a/scripts/stageController.gd
+++ b/scripts/stageController.gd
@ -5,6 +5,7 @@ var completed = false;

@onready var right_border = $Borders/Right/CollisionShape2D;
@onready var right_trigger = $Borders/Right/Trigger;
+@onready var bgm = $BGM

 func _process(delta: float) -> void:
 	if Input.is_action_just_pressed("trigger_completed"):
@ -14,5 +15,8 @@ func _process(delta: float) -> void:
 		right_border.shape = null
 		right_trigger.body_entered.connect(_on_trigger)
 		
+	if !bgm.playing:
+		bgm.play()
+		
 func _on_trigger(body: Node) -> void:
 	get_tree().change_scene_to_file(next_stage)
--- a/scripts/viruling.gd
+++ b/scripts/viruling.gd
@ -4,9 +4,10 @@ extends Entity;
@onready var collider = $CollisionShape2D
@onready var contact_hitbox = $ContactHitbox
@onready var collision_shape = collider.shape
-@onready var attack_timer = $Timer
-@onready var is_dying = false
+@onready var attack_timer = $AttackTimer
@onready var death_timer = $DeathTimer
+@onready var explosion_sfx = $ExplosionSFX
+var is_dying = false

 const SPEED_MULTIPLIER = 100
 const INITIAL_HEALTH = 10
@ -32,21 +33,25 @@ func _physics_process(delta: float) -> void:
 		move_and_slide()
 	
 func _process(delta: float) -> void:
-		if health <= 0:
-			is_dying = true
-			death_timer.start()
-			health = 99999
+	if health <= 0:
+		is_dying = true
+		death_timer.start()
+		health = 99999
+	
+	if is_dying:
 		
-		if is_dying:
-			animated_sprite.play("death")
-			contact_hitbox.visible = false
-			speed = 0
-			
-			if death_timer.is_stopped():
-				queue_free()
+		animated_sprite.play("death")
+		explosion_sfx.play()
+		contact_hitbox.visible = false
+		speed = 0
+		
+		if death_timer.is_stopped():
+			queue_free()

 func body_connect(node: Node):
 	if node is Entity and node != self and attack_timer.is_stopped():
-		attack_timer.start(0.25)
+		attack_timer.start()
 		node.health -= damage
-		take_knockback(ATTACK_KNOCKBACK)
+		node.take_knockback(ATTACK_KNOCKBACK)
+		if node.has_method("hurt_anim"):
+			node.call("hurt_anim")
Author	SHA1	Message	Date
AlexisComix	39f77e671f	feat:fix animations, add sfx + bgm, healthbar, spawner node	2024-08-18 03:04:28 +01:00
newt	d9bc66acc0	feat: add bars + more anims	2024-08-17 22:39:51 +01:00
newt	117d17f69d	Merge pull request 'feat: viruling behaviour, entity class, melee attacks' (#1 ) from abstralexis/gmtk-2024:main into main Reviewed-on: newt/gmtk-2024#1	2024-08-17 19:59:55 +00:00