diff --git a/objects/characters/monsters/01/01/idle/frame-1.png b/objects/characters/monsters/01/01/idle/frame-1.png deleted file mode 100644 index eb316d8..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-1.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-10.png b/objects/characters/monsters/01/01/idle/frame-10.png deleted file mode 100644 index 1a3ad08..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-10.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-10.png.import b/objects/characters/monsters/01/01/idle/frame-10.png.import deleted file mode 100644 index 181ef22..0000000 --- a/objects/characters/monsters/01/01/idle/frame-10.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-10.png-924b68af7d4d0e54ea90881797173222.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/idle/frame-10.png" -dest_files=[ "res://.import/frame-10.png-924b68af7d4d0e54ea90881797173222.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=true -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/objects/characters/monsters/01/01/idle/frame-2.png b/objects/characters/monsters/01/01/idle/frame-2.png deleted file mode 100644 index b997748..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-2.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-3.png b/objects/characters/monsters/01/01/idle/frame-3.png deleted file mode 100644 index d4e8ded..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-3.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-4.png b/objects/characters/monsters/01/01/idle/frame-4.png deleted file mode 100644 index afd4bb3..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-4.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-4.png.import b/objects/characters/monsters/01/01/idle/frame-4.png.import deleted file mode 100644 index 9b0741c..0000000 --- a/objects/characters/monsters/01/01/idle/frame-4.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-4.png-eb3376ebb02641a1229324c0f673ac10.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/idle/frame-4.png" -dest_files=[ "res://.import/frame-4.png-eb3376ebb02641a1229324c0f673ac10.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=true -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/objects/characters/monsters/01/01/idle/frame-5.png b/objects/characters/monsters/01/01/idle/frame-5.png deleted file mode 100644 index 65f3bb8..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-5.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-5.png.import b/objects/characters/monsters/01/01/idle/frame-5.png.import deleted file mode 100644 index 62d4de8..0000000 --- a/objects/characters/monsters/01/01/idle/frame-5.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-5.png-a1d1af4294a2c9641e7092b4ddb6a526.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/idle/frame-5.png" -dest_files=[ "res://.import/frame-5.png-a1d1af4294a2c9641e7092b4ddb6a526.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=true -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/objects/characters/monsters/01/01/idle/frame-6.png b/objects/characters/monsters/01/01/idle/frame-6.png deleted file mode 100644 index 73a99f3..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-6.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-6.png.import b/objects/characters/monsters/01/01/idle/frame-6.png.import deleted file mode 100644 index dcde1e6..0000000 --- a/objects/characters/monsters/01/01/idle/frame-6.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-6.png-35216400c9df3486f1f9fa79f1302275.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/idle/frame-6.png" -dest_files=[ "res://.import/frame-6.png-35216400c9df3486f1f9fa79f1302275.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=true -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/objects/characters/monsters/01/01/idle/frame-7.png b/objects/characters/monsters/01/01/idle/frame-7.png deleted file mode 100644 index a92ce4c..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-7.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-7.png.import b/objects/characters/monsters/01/01/idle/frame-7.png.import deleted file mode 100644 index 1618cda..0000000 --- a/objects/characters/monsters/01/01/idle/frame-7.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-7.png-7d48b23f03ea4fb83447691fce055632.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/idle/frame-7.png" -dest_files=[ "res://.import/frame-7.png-7d48b23f03ea4fb83447691fce055632.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=true -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/objects/characters/monsters/01/01/idle/frame-8.png b/objects/characters/monsters/01/01/idle/frame-8.png deleted file mode 100644 index 584e12c..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-8.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-8.png.import b/objects/characters/monsters/01/01/idle/frame-8.png.import deleted file mode 100644 index b93f825..0000000 --- a/objects/characters/monsters/01/01/idle/frame-8.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-8.png-e863ecfe2c378b53f379c91aa34877fb.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/idle/frame-8.png" -dest_files=[ "res://.import/frame-8.png-e863ecfe2c378b53f379c91aa34877fb.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=true -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/objects/characters/monsters/01/01/idle/frame-9.png b/objects/characters/monsters/01/01/idle/frame-9.png deleted file mode 100644 index a7f577f..0000000 Binary files a/objects/characters/monsters/01/01/idle/frame-9.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/idle/frame-9.png.import b/objects/characters/monsters/01/01/idle/frame-9.png.import deleted file mode 100644 index ff116c9..0000000 --- a/objects/characters/monsters/01/01/idle/frame-9.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-9.png-21b9aec41427f14b28c0cedb2deb17fe.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/idle/frame-9.png" -dest_files=[ "res://.import/frame-9.png-21b9aec41427f14b28c0cedb2deb17fe.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=true -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/objects/characters/monsters/01/01/stomped/frame-1.png b/objects/characters/monsters/01/01/stomped/frame-1.png deleted file mode 100644 index b2d0648..0000000 Binary files a/objects/characters/monsters/01/01/stomped/frame-1.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/stomped/frame-1.png.import b/objects/characters/monsters/01/01/stomped/frame-1.png.import deleted file mode 100644 index d2d7b64..0000000 --- a/objects/characters/monsters/01/01/stomped/frame-1.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-1.png-650c3bba4e90ae6ef12f070af767e9c1.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/stomped/frame-1.png" -dest_files=[ "res://.import/frame-1.png-650c3bba4e90ae6ef12f070af767e9c1.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=true -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/objects/characters/monsters/01/01/stomped/frame-2.png b/objects/characters/monsters/01/01/stomped/frame-2.png deleted file mode 100644 index 7479a26..0000000 Binary files a/objects/characters/monsters/01/01/stomped/frame-2.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/stomped/frame-2.png.import b/objects/characters/monsters/01/01/stomped/frame-2.png.import deleted file mode 100644 index a2e9dda..0000000 --- a/objects/characters/monsters/01/01/stomped/frame-2.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-2.png-81870614b1a482614fb0b51639feb20b.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/stomped/frame-2.png" -dest_files=[ "res://.import/frame-2.png-81870614b1a482614fb0b51639feb20b.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=true -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/objects/characters/monsters/01/01/stomped/frame-3.png b/objects/characters/monsters/01/01/stomped/frame-3.png deleted file mode 100644 index f83a828..0000000 Binary files a/objects/characters/monsters/01/01/stomped/frame-3.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/stomped/frame-3.png.import b/objects/characters/monsters/01/01/stomped/frame-3.png.import deleted file mode 100644 index 8e5e040..0000000 --- a/objects/characters/monsters/01/01/stomped/frame-3.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-3.png-d1485ff2f003637fab590d3117f014fc.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/stomped/frame-3.png" -dest_files=[ "res://.import/frame-3.png-d1485ff2f003637fab590d3117f014fc.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=true -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/objects/characters/monsters/01/01/stomped/frame-4.png b/objects/characters/monsters/01/01/stomped/frame-4.png deleted file mode 100644 index 8e41c4d..0000000 Binary files a/objects/characters/monsters/01/01/stomped/frame-4.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/stomped/frame-4.png.import b/objects/characters/monsters/01/01/stomped/frame-4.png.import deleted file mode 100644 index 229c91f..0000000 --- a/objects/characters/monsters/01/01/stomped/frame-4.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-4.png-9ae5122e60e89b233b7c05b19e1113fd.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/stomped/frame-4.png" -dest_files=[ "res://.import/frame-4.png-9ae5122e60e89b233b7c05b19e1113fd.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=true -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/objects/characters/monsters/01/01/stomped/frame-5.png b/objects/characters/monsters/01/01/stomped/frame-5.png deleted file mode 100644 index 39ac012..0000000 Binary files a/objects/characters/monsters/01/01/stomped/frame-5.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/stomped/frame-5.png.import b/objects/characters/monsters/01/01/stomped/frame-5.png.import deleted file mode 100644 index 07581d0..0000000 --- a/objects/characters/monsters/01/01/stomped/frame-5.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-5.png-70df9bc94ee58dab4d59a5e68e5fe4f6.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/stomped/frame-5.png" -dest_files=[ "res://.import/frame-5.png-70df9bc94ee58dab4d59a5e68e5fe4f6.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=true -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/objects/characters/monsters/01/01/stomped/frame-6.png b/objects/characters/monsters/01/01/stomped/frame-6.png deleted file mode 100644 index 61ec36b..0000000 Binary files a/objects/characters/monsters/01/01/stomped/frame-6.png and /dev/null differ diff --git a/objects/characters/monsters/01/01/stomped/frame-6.png.import b/objects/characters/monsters/01/01/stomped/frame-6.png.import deleted file mode 100644 index 7170e3c..0000000 --- a/objects/characters/monsters/01/01/stomped/frame-6.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/frame-6.png-ba96fa01300422c7a0872b62675d3556.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://objects/characters/monsters/01/01/stomped/frame-6.png" -dest_files=[ "res://.import/frame-6.png-ba96fa01300422c7a0872b62675d3556.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=true -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/objects/characters/monsters/01/monster_01.gd b/objects/characters/monsters/01/monster_01.gd index 87851d0..9565f12 100644 --- a/objects/characters/monsters/01/monster_01.gd +++ b/objects/characters/monsters/01/monster_01.gd @@ -6,15 +6,21 @@ func _process(delta): velocity.x = speed if not $RayBottomRight.is_colliding(): velocity.x = -speed - if $RayPlayerLeft.is_colliding(): - var collider = $RayPlayerLeft.get_collider() - collider.monster_hit(-speed, DAMAGE) - if $RayPlayerRight.is_colliding(): - var collider = $RayPlayerRight.get_collider() - collider.monster_hit(speed, DAMAGE) func stomped_on_head(): if not $RayPlayerLeft.is_colliding() and not $RayPlayerRight.is_colliding(): health = 0 $Sprite.animation = "stomped" $StampedSound.play() + + +func _on_PlayerCollision(body): + if $Collision.disabled == false: + if body.velocity.x > 0: + body.monster_hit(-speed, damage) + elif body.velocity.x < 0: + body.monster_hit(speed, damage) + elif velocity and velocity.x > 0: + body.monster_hit(speed, damage) + elif velocity and velocity.x < 0: + body.monster_hit(-speed, damage) diff --git a/objects/characters/monsters/01/monster_01.tscn b/objects/characters/monsters/01/monster_01.tscn index 139d521..81e4cb3 100644 --- a/objects/characters/monsters/01/monster_01.tscn +++ b/objects/characters/monsters/01/monster_01.tscn @@ -43,7 +43,7 @@ script = ExtResource( 2 ) scale = Vector2( 0.2, 0.2 ) frames = SubResource( 1 ) animation = "idle" -frame = 1 +frame = 6 playing = true [node name="Collision" type="CollisionShape2D" parent="."] @@ -75,3 +75,13 @@ cast_to = Vector2( 10, 0 ) [node name="StampedSound" type="AudioStreamPlayer2D" parent="."] stream = ExtResource( 16 ) volume_db = 10.0 + +[node name="PlayerCollision" type="Area2D" parent="."] +collision_layer = 0 + +[node name="Collision" type="CollisionShape2D" parent="PlayerCollision"] +position = Vector2( 0.5, 2.5 ) +scale = Vector2( 1.2, 1.2 ) +shape = SubResource( 2 ) + +[connection signal="body_entered" from="PlayerCollision" to="." method="_on_PlayerCollision"] diff --git a/objects/characters/monsters/02/assets/hole.svg b/objects/characters/monsters/02/assets/hole.svg new file mode 100644 index 0000000..1701273 --- /dev/null +++ b/objects/characters/monsters/02/assets/hole.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + diff --git a/objects/characters/monsters/01/01/idle/frame-2.png.import b/objects/characters/monsters/02/assets/hole.svg.import similarity index 69% rename from objects/characters/monsters/01/01/idle/frame-2.png.import rename to objects/characters/monsters/02/assets/hole.svg.import index 36ba5b5..d6d242b 100644 --- a/objects/characters/monsters/01/01/idle/frame-2.png.import +++ b/objects/characters/monsters/02/assets/hole.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/frame-2.png-d84a37f4a00a76602e3799f601c5844f.stex" +path="res://.import/hole.svg-a380e9e33c033412e22a568adddf345d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://objects/characters/monsters/01/01/idle/frame-2.png" -dest_files=[ "res://.import/frame-2.png-d84a37f4a00a76602e3799f601c5844f.stex" ] +source_file="res://objects/characters/monsters/02/assets/hole.svg" +dest_files=[ "res://.import/hole.svg-a380e9e33c033412e22a568adddf345d.stex" ] [params] diff --git a/objects/characters/monsters/02/assets/monster_02.svg b/objects/characters/monsters/02/assets/monster_02.svg new file mode 100644 index 0000000..67a0521 --- /dev/null +++ b/objects/characters/monsters/02/assets/monster_02.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + diff --git a/objects/characters/monsters/01/01/idle/frame-3.png.import b/objects/characters/monsters/02/assets/monster_02.svg.import similarity index 68% rename from objects/characters/monsters/01/01/idle/frame-3.png.import rename to objects/characters/monsters/02/assets/monster_02.svg.import index 767131a..af8f2dd 100644 --- a/objects/characters/monsters/01/01/idle/frame-3.png.import +++ b/objects/characters/monsters/02/assets/monster_02.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/frame-3.png-45ecfa8c24c3ae6e5fdde21c0ae9c3c8.stex" +path="res://.import/monster_02.svg-5fa8c94a687dc041e8918eed4ba0de85.stex" metadata={ "vram_texture": false } [deps] -source_file="res://objects/characters/monsters/01/01/idle/frame-3.png" -dest_files=[ "res://.import/frame-3.png-45ecfa8c24c3ae6e5fdde21c0ae9c3c8.stex" ] +source_file="res://objects/characters/monsters/02/assets/monster_02.svg" +dest_files=[ "res://.import/monster_02.svg-5fa8c94a687dc041e8918eed4ba0de85.stex" ] [params] diff --git a/objects/characters/monsters/02/monster_02.gd b/objects/characters/monsters/02/monster_02.gd new file mode 100644 index 0000000..4f69a8e --- /dev/null +++ b/objects/characters/monsters/02/monster_02.gd @@ -0,0 +1,20 @@ +extends "res://objects/characters/monsters/static_monster.gd" + +export var sleep_down : float = 5.0 +export var sleep_up : float = 2.0 + +func _ready(): + $Animation.play("move") + +func _on_Animation_finished(anim_name): + if anim_name == "move" and health > 0: + if $Sprite.position.y >= 0: + yield(get_tree().create_timer(sleep_down), "timeout") + $Animation.play("move") + else: + yield(get_tree().create_timer(sleep_up), "timeout") + $Animation.play_backwards("move") + +func _on_PlayerCollision(body): + if $Sprite.position.y <= 0: + body.monster_hit(-body.velocity.x / 10, damage) diff --git a/objects/characters/monsters/02/monster_02.tscn b/objects/characters/monsters/02/monster_02.tscn new file mode 100644 index 0000000..24521ec --- /dev/null +++ b/objects/characters/monsters/02/monster_02.tscn @@ -0,0 +1,97 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://objects/characters/monsters/02/assets/monster_02.svg" type="Texture" id=1] +[ext_resource path="res://objects/characters/monsters/02/monster_02.gd" type="Script" id=2] +[ext_resource path="res://objects/characters/monsters/02/assets/hole.svg" type="Texture" id=3] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 24, 73 ) + +[sub_resource type="Animation" id=3] +resource_name = "die" +length = 0.5 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.5 ), +"transitions": PoolRealArray( 0.5, 1 ), +"update": 0, +"values": [ Vector2( 0, 40 ), Vector2( 0, 57 ) ] +} + +[sub_resource type="Animation" id=2] +resource_name = "move" +length = 2.0 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 2 ), +"transitions": PoolRealArray( -2, 1 ), +"update": 0, +"values": [ Vector2( 0, 40 ), Vector2( 0, -89 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Collision:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 2 ), +"transitions": PoolRealArray( -2, 1 ), +"update": 0, +"values": [ Vector2( 0, 40 ), Vector2( 0, -89 ) ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("PlayerCollision:position") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 2 ), +"transitions": PoolRealArray( -2, 1 ), +"update": 0, +"values": [ Vector2( 0, 40 ), Vector2( 0, -89 ) ] +} + +[node name="monster_02" type="StaticBody2D"] +collision_layer = 2 +script = ExtResource( 2 ) +damage = 15 + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0, 56.32 ) +texture = ExtResource( 1 ) + +[node name="Collision" type="CollisionShape2D" parent="."] +position = Vector2( 0, 40 ) +shape = SubResource( 1 ) + +[node name="Animation" type="AnimationPlayer" parent="."] +playback_process_mode = 0 +anims/die = SubResource( 3 ) +anims/move = SubResource( 2 ) + +[node name="PlayerCollision" type="Area2D" parent="."] +position = Vector2( 0, 40 ) +collision_layer = 0 + +[node name="Collision" type="CollisionShape2D" parent="PlayerCollision"] +scale = Vector2( 1.1, 1.1 ) +shape = SubResource( 1 ) + +[node name="Hole" type="Sprite" parent="."] +position = Vector2( 0, -8 ) +texture = ExtResource( 3 ) + +[connection signal="animation_finished" from="Animation" to="." method="_on_Animation_finished"] +[connection signal="body_entered" from="PlayerCollision" to="." method="_on_PlayerCollision"] diff --git a/objects/characters/monsters/monster.gd b/objects/characters/monsters/monster.gd index f2fa3eb..15e2069 100644 --- a/objects/characters/monsters/monster.gd +++ b/objects/characters/monsters/monster.gd @@ -2,7 +2,7 @@ extends "res://objects/characters/character.gd" export var speed: int = 50 export var reverse_direction: bool = false -const DAMAGE = 5 +export var damage : int = 5 func _ready(): if reverse_direction: @@ -16,12 +16,13 @@ func _process(delta): $Sprite.flip_h = true elif velocity.x < 0: $Sprite.flip_h = false - if health <= 0: + if health <= 0 and $Collision.disabled == false: + velocity = null + $Collision.disabled = true _die() func stomped_on_head(): pass func _die(): - velocity = null - $Collision.disabled = true + pass diff --git a/objects/characters/monsters/static_monster.gd b/objects/characters/monsters/static_monster.gd new file mode 100644 index 0000000..12b6a43 --- /dev/null +++ b/objects/characters/monsters/static_monster.gd @@ -0,0 +1,16 @@ +extends StaticBody2D + +export var health : int = 100 +export var reverse_direction: bool = false +export var damage : int = 5 + +func _process(delta): + if health <= 0 and $Collision.disabled == false: + $Collision.disabled = true + _die() + +func stomped_on_head(): + pass + +func _die(): + pass diff --git a/objects/characters/player.gd b/objects/characters/player.gd index 561d03b..fe99b8e 100644 --- a/objects/characters/player.gd +++ b/objects/characters/player.gd @@ -78,9 +78,15 @@ func _ready(): $Camera2D.limit_right = level.camera_limit_right $Camera2D.limit_top = level.camera_limit_top $Camera2D.limit_bottom = level.camera_limit_bottom - + yield(get_tree().create_timer(0.5), "timeout") + $Camera2D.smoothing_enabled = true + func _physics_process(delta): - # Fall animation if not on floor + # out-of-screen checking + if position.y > level.camera_limit_bottom and health > 0: + _add_damage(100) + + # Fall animation if not on floor if velocity.y > 1 and not is_on_floor(): _set_player_state("fall_start") @@ -101,7 +107,10 @@ func _physics_process(delta): # Jump if Input.is_action_just_pressed("jump"): - if $RayBottomLeft.is_colliding() or $RayBottomRight.is_colliding(): + if $RayBottomLeft.is_colliding() or $RayBottomRight.is_colliding() or $RayBottomCenter.is_colliding(): + print("Left: " + str($RayBottomLeft.is_colliding())) + print("Center: " + str($RayBottomCenter.is_colliding())) + print("Right: " + str($RayBottomRight.is_colliding())) jump() func _next_player_state(): @@ -138,9 +147,8 @@ func move_stop(): func jump(): if _set_player_state("jump_start"): snap = Vector2.ZERO - if get_floor_velocity().y < 0: - position.y += get_floor_velocity().y * get_physics_process_delta_time() \ - - GRAVITY * get_physics_process_delta_time() - 3 + position.y += get_floor_velocity().y * get_physics_process_delta_time() \ + - GRAVITY * get_physics_process_delta_time() - 3 velocity.y -= JUMP_HEIGHT func _on_GroundCheck_body_entered(body): @@ -179,4 +187,6 @@ func _add_damage(value): main.player_died() func _on_screen_exited(): + print("exited") + print($VisibilityNotifier2D.is_on_screen()) _add_damage(100) diff --git a/objects/characters/player.tscn b/objects/characters/player.tscn index 75ada8c..a23401e 100644 --- a/objects/characters/player.tscn +++ b/objects/characters/player.tscn @@ -21,7 +21,7 @@ script = ExtResource( 11 ) [node name="Sprite" type="AnimatedSprite" parent="."] frames = ExtResource( 1 ) animation = "idle" -frame = 2 +frame = 6 playing = true __meta__ = { "_edit_lock_": true @@ -43,7 +43,6 @@ current = true limit_left = 0 limit_bottom = 1080 limit_smoothed = true -smoothing_enabled = true [node name="RayBottomLeft" type="RayCast2D" parent="."] position = Vector2( -184, 0 ) @@ -59,6 +58,13 @@ cast_to = Vector2( 0, 400 ) collision_mask = 6 collide_with_areas = true +[node name="RayBottomCenter" type="RayCast2D" parent="."] +position = Vector2( -14, 0 ) +enabled = true +cast_to = Vector2( 0, 400 ) +collision_mask = 6 +collide_with_areas = true + [node name="EnemyBottomCheck" type="Area2D" parent="."] collision_mask = 2 @@ -66,10 +72,5 @@ collision_mask = 2 position = Vector2( -13, 225 ) shape = SubResource( 5 ) -[node name="VisibilityNotifier2D" type="VisibilityNotifier2D" parent="."] -position = Vector2( -15, -13.5 ) -scale = Vector2( 16.9, 23.25 ) - [connection signal="body_entered" from="GroundCheck" to="." method="_on_GroundCheck_body_entered"] [connection signal="body_entered" from="EnemyBottomCheck" to="." method="_on_Enemy_Entered"] -[connection signal="screen_exited" from="VisibilityNotifier2D" to="." method="_on_screen_exited"] diff --git a/objects/falling_log/assets/log.svg b/objects/falling_log/assets/log.svg new file mode 100644 index 0000000..f0ec856 --- /dev/null +++ b/objects/falling_log/assets/log.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + diff --git a/objects/characters/monsters/01/01/idle/frame-1.png.import b/objects/falling_log/assets/log.svg.import similarity index 69% rename from objects/characters/monsters/01/01/idle/frame-1.png.import rename to objects/falling_log/assets/log.svg.import index 5036038..99f6a5a 100644 --- a/objects/characters/monsters/01/01/idle/frame-1.png.import +++ b/objects/falling_log/assets/log.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/frame-1.png-35614784daba5888c4fa0619c9be7727.stex" +path="res://.import/log.svg-8e83d1dcda57ee6a72d547fca1627586.stex" metadata={ "vram_texture": false } [deps] -source_file="res://objects/characters/monsters/01/01/idle/frame-1.png" -dest_files=[ "res://.import/frame-1.png-35614784daba5888c4fa0619c9be7727.stex" ] +source_file="res://objects/falling_log/assets/log.svg" +dest_files=[ "res://.import/log.svg-8e83d1dcda57ee6a72d547fca1627586.stex" ] [params] diff --git a/objects/falling_log/falling_log.gd b/objects/falling_log/falling_log.gd new file mode 100644 index 0000000..5dc1d18 --- /dev/null +++ b/objects/falling_log/falling_log.gd @@ -0,0 +1,18 @@ +extends StaticBody2D + +export var recover_time : float = 2.0 + +func _ready(): + $Animation.play("recover") + + +func _on_PlayerCollision(body): + $PlayerCollision/Collision.disabled = true + $Animation.play("player_on_log") + + +func _on_Animation_finished(anim_name): + if anim_name == "player_on_log": + yield(get_tree().create_timer(recover_time), "timeout") + $PlayerCollision/Collision.disabled = false + $Animation.play("recover") diff --git a/objects/falling_log/falling_log.tscn b/objects/falling_log/falling_log.tscn new file mode 100644 index 0000000..cae9820 --- /dev/null +++ b/objects/falling_log/falling_log.tscn @@ -0,0 +1,114 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://objects/falling_log/assets/log.svg" type="Texture" id=1] +[ext_resource path="res://objects/falling_log/falling_log.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 34.5, 20 ) + +[sub_resource type="Animation" id=2] +resource_name = "player_on_log" +length = 3.0 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.2, 0.5, 3 ), +"transitions": PoolRealArray( -2, 0.5, 6, 1 ), +"update": 0, +"values": [ Vector2( 0, 20 ), Vector2( 0, 40 ), Vector2( 0, 25 ), Vector2( 0, 1000 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Sprite:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 0.5, 2.5 ), +"transitions": PoolRealArray( 1, 6, 2 ), +"update": 0, +"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Collision:position") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 0.2, 0.5, 3 ), +"transitions": PoolRealArray( 1, -2, 6, 1 ), +"update": 0, +"values": [ Vector2( 0, 20 ), Vector2( 0, 40 ), Vector2( 0, 25 ), Vector2( 0, 1000 ) ] +} + +[sub_resource type="Animation" id=3] +resource_name = "recover" +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 1 ), +"transitions": PoolRealArray( -2, 1 ), +"update": 0, +"values": [ Vector2( 0, 50 ), Vector2( 0, 20 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Collision:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.001, 1 ), +"transitions": PoolRealArray( -2, 1 ), +"update": 0, +"values": [ Vector2( 0, 50 ), Vector2( 0, 20 ) ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Sprite:modulate") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 1 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] +} + +[node name="FallingLog" type="StaticBody2D"] +collision_layer = 4 +collision_mask = 0 +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0, 20 ) +texture = ExtResource( 1 ) + +[node name="Collision" type="CollisionShape2D" parent="."] +position = Vector2( 0, 20 ) +shape = SubResource( 1 ) + +[node name="PlayerCollision" type="Area2D" parent="."] +collision_layer = 0 + +[node name="Collision" type="CollisionShape2D" parent="PlayerCollision"] +position = Vector2( 0, 20 ) +scale = Vector2( 1.2, 1.2 ) +shape = SubResource( 1 ) + +[node name="Animation" type="AnimationPlayer" parent="."] +anims/player_on_log = SubResource( 2 ) +anims/recover = SubResource( 3 ) + +[connection signal="body_entered" from="PlayerCollision" to="." method="_on_PlayerCollision"] +[connection signal="animation_finished" from="Animation" to="." method="_on_Animation_finished"] diff --git a/scenes/levels/02/CollidingMountain.tscn b/scenes/levels/02/CollidingMountain.tscn new file mode 100644 index 0000000..e50cecf --- /dev/null +++ b/scenes/levels/02/CollidingMountain.tscn @@ -0,0 +1,17 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scenes/levels/01/assets/mountain_01.svg" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=3] +extents = Vector2( 105, 319 ) + +[node name="CollidingMountain" type="StaticBody2D"] +z_index = -5 +collision_layer = 4 +collision_mask = 0 + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource( 3 ) diff --git a/scenes/levels/02/background_02.tscn b/scenes/levels/02/background_02.tscn index 120e784..fac9ded 100644 --- a/scenes/levels/02/background_02.tscn +++ b/scenes/levels/02/background_02.tscn @@ -23,21 +23,49 @@ region_rect = Rect2( 0, 0, 500, 500 ) [node name="Sprite2" type="Sprite" parent="Stars"] position = Vector2( 250, 250 ) texture = ExtResource( 7 ) -offset = Vector2( 500, 0 ) +offset = Vector2( 1000, 0 ) region_enabled = true region_rect = Rect2( 0, 0, 500, 500 ) [node name="Sprite3" type="Sprite" parent="Stars"] position = Vector2( 250, 250 ) texture = ExtResource( 7 ) -offset = Vector2( 1000, 0 ) +offset = Vector2( 2000, 0 ) region_enabled = true region_rect = Rect2( 0, 0, 500, 500 ) [node name="Sprite4" type="Sprite" parent="Stars"] position = Vector2( 250, 250 ) texture = ExtResource( 7 ) -offset = Vector2( 1500, 0 ) +offset = Vector2( 3000, 0 ) +region_enabled = true +region_rect = Rect2( 0, 0, 500, 500 ) + +[node name="Sprite5" type="Sprite" parent="Stars"] +position = Vector2( 250, 250 ) +texture = ExtResource( 7 ) +offset = Vector2( 0, 1000 ) +region_enabled = true +region_rect = Rect2( 0, 0, 500, 500 ) + +[node name="Sprite6" type="Sprite" parent="Stars"] +position = Vector2( 250, 250 ) +texture = ExtResource( 7 ) +offset = Vector2( 1000, 1000 ) +region_enabled = true +region_rect = Rect2( 0, 0, 500, 500 ) + +[node name="Sprite7" type="Sprite" parent="Stars"] +position = Vector2( 250, 250 ) +texture = ExtResource( 7 ) +offset = Vector2( 2000, 1000 ) +region_enabled = true +region_rect = Rect2( 0, 0, 500, 500 ) + +[node name="Sprite8" type="Sprite" parent="Stars"] +position = Vector2( 250, 250 ) +texture = ExtResource( 7 ) +offset = Vector2( 3000, 1000 ) region_enabled = true region_rect = Rect2( 0, 0, 500, 500 ) diff --git a/scenes/levels/02/level_02.tscn b/scenes/levels/02/level_02.tscn index e9b1730..31dc642 100644 --- a/scenes/levels/02/level_02.tscn +++ b/scenes/levels/02/level_02.tscn @@ -1,27 +1,58 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://scenes/levels/02/level_02.gd" type="Script" id=1] [ext_resource path="res://common/tiles/grasland.tres" type="TileSet" id=2] [ext_resource path="res://objects/characters/player.tscn" type="PackedScene" id=3] [ext_resource path="res://scenes/levels/02/background_02.tscn" type="PackedScene" id=4] +[ext_resource path="res://scenes/levels/02/CollidingMountain.tscn" type="PackedScene" id=5] +[ext_resource path="res://objects/characters/monsters/02/monster_02.tscn" type="PackedScene" id=6] +[ext_resource path="res://objects/characters/monsters/01/monster_01.tscn" type="PackedScene" id=7] +[ext_resource path="res://objects/falling_log/falling_log.tscn" type="PackedScene" id=8] [node name="Level 02" type="Node2D"] script = ExtResource( 1 ) bgm_path = "res://scenes/levels/02/assets/bgm.ogg" hud_color = Color( 1, 1, 1, 1 ) -clear_color = Color( 0.0431373, 0.298039, 0.403922, 1 ) +clear_color = Color( 0, 0, 0, 1 ) +camera_limit_bottom = 1190 [node name="Player" parent="." instance=ExtResource( 3 )] -position = Vector2( 136, 808 ) +position = Vector2( 350, 980 ) scale = Vector2( 0.2, 0.2 ) background_scene = ExtResource( 4 ) +[node name="monster_02" parent="." instance=ExtResource( 6 )] +position = Vector2( 980, 1050 ) +sleep_down = 3.0 +sleep_up = 1.0 + [node name="Tiles" type="TileMap" parent="."] tile_set = ExtResource( 2 ) +cell_size = Vector2( 70, 70 ) collision_layer = 4 collision_mask = 0 format = 1 -tile_data = PoolIntArray( 917505, 0, 1, 917506, 0, 2, 917507, 0, 2, 917508, 0, 2, 917509, 0, 2, 917510, 0, 2, 917511, 0, 2, 917512, 0, 2, 917513, 0, 2, 917514, 0, 2, 917515, 0, 2, 917516, 0, 2, 917517, 0, 2, 917518, 0, 2, 917519, 0, 2, 917520, 0, 2, 917521, 0, 2, 917522, 0, 2, 917523, 0, 2, 917524, 0, 2, 917525, 0, 2, 917526, 0, 2, 917527, 0, 2, 917528, 0, 2, 917529, 0, 2, 917530, 0, 2, 917531, 0, 2, 917532, 0, 2, 917533, 0, 2, 917534, 0, 2, 917535, 0, 2, 917536, 0, 2, 917537, 0, 2, 917538, 0, 2, 917539, 0, 2, 917540, 0, 2, 917541, 0, 2, 917542, 0, 2, 917543, 0, 2, 917544, 0, 0, 983080, 0, 0, 983081, 0, 2, 983082, 0, 2, 983083, 0, 2, 983084, 0, 3 ) +tile_data = PoolIntArray( 983033, 4, 0, 983034, 4, 0, 983035, 4, 0, 983036, 4, 0, 983037, 4, 0, 983038, 4, 0, 983039, 4, 0, 917504, 4, 0, 917505, 7, 0, 1048569, 5, 0, 1048570, 5, 0, 1048571, 5, 0, 1048572, 5, 0, 1048573, 5, 0, 1048574, 5, 0, 1048575, 5, 0, 983040, 5, 0, 983041, 8, 0, 983042, 4, 0, 983043, 4, 0, 983044, 4, 0, 983045, 4, 0, 983046, 4, 0, 983047, 4, 0, 983048, 4, 0, 983049, 4, 0, 983050, 4, 0, 983051, 4, 0, 983052, 4, 0, 983053, 4, 0, 983054, 15, 0, 983055, 11, 0, 983056, 11, 0, 983057, 11, 0, 983058, 11, 0, 983059, 11, 0, 983060, 11, 0, 983061, 11, 0, 983062, 11, 0, 983063, 11, 0, 983064, 11, 0, 983065, 11, 0, 983066, 11, 0, 983067, 11, 0, 983068, 11, 0, 983069, 11, 0, 983070, 14, 0, 983071, 4, 0, 983072, 4, 0, 983073, 4, 0, 983074, 4, 0, 983075, 4, 0, 983076, 4, 0, 983077, 4, 0, 983078, 4, 0, 983079, 4, 0, 1114105, 5, 0, 1114106, 5, 0, 1114107, 5, 0, 1114108, 5, 0, 1114109, 5, 0, 1114110, 5, 0, 1114111, 5, 0, 1048576, 5, 0, 1048577, 5, 0, 1048578, 5, 0, 1048579, 5, 0, 1048580, 5, 0, 1048581, 5, 0, 1048582, 5, 0, 1048583, 5, 0, 1048584, 5, 0, 1048585, 5, 0, 1048586, 5, 0, 1048587, 5, 0, 1048588, 5, 0, 1048589, 5, 0, 1048590, 5, 0, 1048591, 12, 0, 1048592, 12, 0, 1048593, 12, 0, 1048594, 12, 0, 1048595, 12, 0, 1048596, 12, 0, 1048597, 12, 0, 1048598, 12, 0, 1048599, 12, 0, 1048600, 12, 0, 1048601, 12, 0, 1048602, 12, 0, 1048603, 12, 0, 1048604, 12, 0, 1048605, 12, 0, 1048606, 5, 0, 1048607, 5, 0, 1048608, 5, 0, 1048609, 5, 0, 1048610, 5, 0, 1048611, 5, 0, 1048612, 5, 0, 1048613, 5, 0, 1048614, 5, 0, 1048615, 5, 0, 1179641, 5, 0, 1179642, 5, 0, 1179643, 5, 0, 1179644, 5, 0, 1179645, 5, 0, 1179646, 5, 0, 1179647, 5, 0, 1114112, 5, 0, 1114113, 5, 0, 1114114, 5, 0, 1114115, 5, 0, 1114116, 5, 0, 1114117, 5, 0, 1114118, 5, 0, 1114119, 5, 0, 1114120, 5, 0, 1114121, 5, 0, 1114122, 5, 0, 1114123, 5, 0, 1114124, 5, 0, 1114125, 5, 0, 1114126, 5, 0, 1114127, 12, 0, 1114128, 12, 0, 1114129, 12, 0, 1114130, 12, 0, 1114131, 12, 0, 1114132, 12, 0, 1114133, 12, 0, 1114134, 12, 0, 1114135, 12, 0, 1114136, 12, 0, 1114137, 12, 0, 1114138, 12, 0, 1114139, 12, 0, 1114140, 12, 0, 1114141, 12, 0, 1114142, 5, 0, 1114143, 5, 0, 1114144, 5, 0, 1114145, 5, 0, 1114146, 5, 0, 1114147, 5, 0, 1114148, 5, 0, 1114149, 5, 0, 1114150, 5, 0, 1114151, 5, 0, 1245177, 5, 0, 1245178, 5, 0, 1245179, 5, 0, 1245180, 5, 0, 1245181, 5, 0, 1245182, 5, 0, 1245183, 5, 0, 1179648, 5, 0, 1179649, 5, 0, 1179650, 5, 0, 1179651, 5, 0, 1179652, 5, 0, 1179653, 5, 0, 1179654, 5, 0, 1179655, 5, 0, 1179656, 5, 0, 1179657, 5, 0, 1179658, 5, 0, 1179659, 5, 0, 1179660, 5, 0, 1179661, 5, 0, 1179662, 5, 0, 1179663, 12, 0, 1179664, 12, 0, 1179665, 12, 0, 1179666, 12, 0, 1179667, 12, 0, 1179668, 12, 0, 1179669, 12, 0, 1179670, 12, 0, 1179671, 12, 0, 1179672, 12, 0, 1179673, 12, 0, 1179674, 12, 0, 1179675, 12, 0, 1179676, 12, 0, 1179677, 12, 0, 1179678, 5, 0, 1179679, 5, 0, 1179680, 5, 0, 1179681, 5, 0, 1179682, 5, 0, 1179683, 5, 0, 1179684, 5, 0, 1179685, 5, 0, 1179686, 5, 0, 1179687, 5, 0 ) [node name="CanvasModulate" type="CanvasModulate" parent="."] color = Color( 0.501961, 0.501961, 0.501961, 1 ) + +[node name="CollidingMountain2" parent="." instance=ExtResource( 5 )] +modulate = Color( 0.59, 0.59, 0.59, 1 ) +position = Vector2( 35, 665 ) + +[node name="CollidingMountain" parent="." instance=ExtResource( 5 )] +modulate = Color( 0.59, 0.59, 0.59, 1 ) +position = Vector2( 175, 770 ) + +[node name="monster_01" parent="." instance=ExtResource( 7 )] +position = Vector2( 2205, 1015 ) + +[node name="FallingLog" parent="." instance=ExtResource( 8 )] +position = Vector2( 1260, 1050 ) + +[node name="FallingLog2" parent="." instance=ExtResource( 8 )] +position = Vector2( 1575, 1050 ) + +[node name="FallingLog3" parent="." instance=ExtResource( 8 )] +position = Vector2( 1890, 1050 ) diff --git a/scenes/main.tscn b/scenes/main.tscn index a35042b..eafc059 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -20,7 +20,7 @@ tracks/0/keys = { [node name="Main" type="Node2D"] script = ExtResource( 3 ) -level_path = "res://scenes/levels/00/interlude_00.tscn" +level_path = "res://scenes/levels/02/level_02.tscn" [node name="HUD" parent="." instance=ExtResource( 1 )]