diff --git a/common/global_state.gd b/common/global_state.gd new file mode 100644 index 0000000..330f7ff --- /dev/null +++ b/common/global_state.gd @@ -0,0 +1,10 @@ +extends Node + +var keys = { + 'yellow': false, + 'green': false, + 'blue': false, + 'red': false +} + +var coins = 0 diff --git a/common/tiles/assets/grasland.svg b/common/tiles/assets/grasland.svg index 24a9576..0fa3cfb 100644 --- a/common/tiles/assets/grasland.svg +++ b/common/tiles/assets/grasland.svg @@ -2,9 +2,9 @@ @@ -854,5 +854,332 @@ d="m 892.05,390 15.75,-7.3 5.45,-10 -0.5,-1.05 -5.2,-10.55 10.45,-16.1 1,11.15 10.95,16.5 0.05,0.05 -0.6,11.15 -0.1,1.95 9.65,4.2 H 939 892.05" id="path871" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/tiles/grasland.tres b/common/tiles/grasland.tres index fa9458b..f49cd49 100644 --- a/common/tiles/grasland.tres +++ b/common/tiles/grasland.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=39 format=2] +[gd_resource type="TileSet" load_steps=46 format=2] [ext_resource path="res://common/tiles/assets/grasland.svg" type="Texture" id=1] [ext_resource path="res://common/tiles/assets/liquid.svg" type="Texture" id=2] @@ -73,6 +73,9 @@ points = PoolVector2Array( 0, 0, 70, 0, 70, 40, 0, 40 ) [sub_resource type="ConvexPolygonShape2D" id=35] points = PoolVector2Array( 0, 35, 70, 35, 70, 70, 0, 70 ) +[sub_resource type="ConvexPolygonShape2D" id=36] +points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) + [sub_resource type="ConvexPolygonShape2D" id=11] points = PoolVector2Array( -10, 0, -10, 0, -10, 70, -10, 70 ) @@ -88,6 +91,24 @@ points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) [sub_resource type="ConvexPolygonShape2D" id=15] points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) +[sub_resource type="ConvexPolygonShape2D" id=37] +points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) + +[sub_resource type="ConvexPolygonShape2D" id=38] +points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) + +[sub_resource type="ConvexPolygonShape2D" id=39] +points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) + +[sub_resource type="ConvexPolygonShape2D" id=40] +points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) + +[sub_resource type="ConvexPolygonShape2D" id=41] +points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) + +[sub_resource type="ConvexPolygonShape2D" id=42] +points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) + [sub_resource type="ConvexPolygonShape2D" id=16] points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) @@ -800,3 +821,150 @@ points = PoolVector2Array( 0, 70, 70, 0, 70, 70, 0, 70 ) 28/shape_one_way_margin = 0.0 28/shapes = [ ] 28/z_index = 0 +29/name = "Grass 16" +29/texture = ExtResource( 1 ) +29/tex_offset = Vector2( 0, 0 ) +29/modulate = Color( 1, 1, 1, 1 ) +29/region = Rect2( 0, 640, 70, 70 ) +29/tile_mode = 0 +29/occluder_offset = Vector2( 0, 0 ) +29/navigation_offset = Vector2( 0, 0 ) +29/shape_offset = Vector2( 0, 0 ) +29/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +29/shape = SubResource( 36 ) +29/shape_one_way = false +29/shape_one_way_margin = 1.0 +29/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 36 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +29/z_index = 0 +30/name = "Grass 17" +30/texture = ExtResource( 1 ) +30/tex_offset = Vector2( 0, 0 ) +30/modulate = Color( 1, 1, 1, 1 ) +30/region = Rect2( 80, 640, 70, 70 ) +30/tile_mode = 0 +30/occluder_offset = Vector2( 0, 0 ) +30/navigation_offset = Vector2( 0, 0 ) +30/shape_offset = Vector2( 0, 0 ) +30/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +30/shape = SubResource( 37 ) +30/shape_one_way = false +30/shape_one_way_margin = 1.0 +30/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 37 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +30/z_index = 0 +31/name = "Grass 18" +31/texture = ExtResource( 1 ) +31/tex_offset = Vector2( 0, 0 ) +31/modulate = Color( 1, 1, 1, 1 ) +31/region = Rect2( 160, 640, 70, 70 ) +31/tile_mode = 0 +31/occluder_offset = Vector2( 0, 0 ) +31/navigation_offset = Vector2( 0, 0 ) +31/shape_offset = Vector2( 0, 0 ) +31/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +31/shape = SubResource( 38 ) +31/shape_one_way = false +31/shape_one_way_margin = 1.0 +31/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 38 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +31/z_index = 0 +32/name = "Grass 19" +32/texture = ExtResource( 1 ) +32/tex_offset = Vector2( 0, 0 ) +32/modulate = Color( 1, 1, 1, 1 ) +32/region = Rect2( 320, 0, 70, 70 ) +32/tile_mode = 0 +32/occluder_offset = Vector2( 0, 0 ) +32/navigation_offset = Vector2( 0, 0 ) +32/shape_offset = Vector2( 0, 0 ) +32/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +32/shape = SubResource( 39 ) +32/shape_one_way = false +32/shape_one_way_margin = 1.0 +32/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 39 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +32/z_index = 0 +33/name = "Grass 20" +33/texture = ExtResource( 1 ) +33/tex_offset = Vector2( 0, 0 ) +33/modulate = Color( 1, 1, 1, 1 ) +33/region = Rect2( 400, 0, 70, 70 ) +33/tile_mode = 0 +33/occluder_offset = Vector2( 0, 0 ) +33/navigation_offset = Vector2( 0, 0 ) +33/shape_offset = Vector2( 0, 0 ) +33/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +33/shape = SubResource( 40 ) +33/shape_one_way = false +33/shape_one_way_margin = 1.0 +33/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 40 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +33/z_index = 0 +34/name = "Grass 21" +34/texture = ExtResource( 1 ) +34/tex_offset = Vector2( 0, 0 ) +34/modulate = Color( 1, 1, 1, 1 ) +34/region = Rect2( 480, 0, 70, 70 ) +34/tile_mode = 0 +34/occluder_offset = Vector2( 0, 0 ) +34/navigation_offset = Vector2( 0, 0 ) +34/shape_offset = Vector2( 0, 0 ) +34/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +34/shape = SubResource( 41 ) +34/shape_one_way = false +34/shape_one_way_margin = 1.0 +34/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 41 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +34/z_index = 0 +35/name = "Grass 22" +35/texture = ExtResource( 1 ) +35/tex_offset = Vector2( 0, 0 ) +35/modulate = Color( 1, 1, 1, 1 ) +35/region = Rect2( 560, 0, 70, 70 ) +35/tile_mode = 0 +35/occluder_offset = Vector2( 0, 0 ) +35/navigation_offset = Vector2( 0, 0 ) +35/shape_offset = Vector2( 0, 0 ) +35/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +35/shape = SubResource( 42 ) +35/shape_one_way = false +35/shape_one_way_margin = 1.0 +35/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 42 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +35/z_index = 0 diff --git a/objects/characters/player.gd b/objects/characters/player.gd index a7ec011..ede5e2c 100644 --- a/objects/characters/player.gd +++ b/objects/characters/player.gd @@ -27,12 +27,12 @@ const ANIMATIONS = { "jump": { "animation": "jump", "transistion": "jump", - "blocks": ["idle", "run", "fall_start", "fall", "fall_end"] + "blocks": ["idle", "run", "fall_start", "fall", "fall_end", "jump_start"] }, "jump_end": { "animation": "jump_end", "transistion": "idle", - "blocks": ["idle", "run", "fall_start", "fall", "fall_end"] + "blocks": ["idle", "run", "fall_start", "fall", "fall_end", "jump"] }, "fall_start": { "animation": "fall_start", @@ -74,6 +74,10 @@ func _ready(): $Camera2D.add_child(background_scene.instance()) $Sprite.connect("animation_finished", self, "_next_player_state") $Sprite.animation = ANIMATIONS[player_state]['animation'] + $Camera2D.limit_left = level.camera_limit_left + $Camera2D.limit_right = level.camera_limit_right + $Camera2D.limit_top = level.camera_limit_top + $Camera2D.limit_bottom = level.camera_limit_bottom func _physics_process(delta): if velocity.y > 1 and not is_on_floor(): diff --git a/objects/characters/player.tscn b/objects/characters/player.tscn index dfc17be..8c07df2 100644 --- a/objects/characters/player.tscn +++ b/objects/characters/player.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://objects/characters/player.gd" type="Script" id=11] [sub_resource type="CapsuleShape2D" id=4] -radius = 166.75 +radius = 164.75 height = 138.75 [sub_resource type="RectangleShape2D" id=3] @@ -14,12 +14,14 @@ extents = Vector2( 190.5, 100.625 ) radius = 79.0 [node name="Player" type="KinematicBody2D"] +z_index = 10 collision_mask = 4 script = ExtResource( 11 ) [node name="Sprite" type="AnimatedSprite" parent="."] frames = ExtResource( 1 ) animation = "idle" +frame = 5 playing = true __meta__ = { "_edit_lock_": true diff --git a/objects/coin/coin.gd b/objects/coin/coin.gd index f7ecbd2..0201efa 100644 --- a/objects/coin/coin.gd +++ b/objects/coin/coin.gd @@ -21,7 +21,7 @@ func _ready(): func _on_Player_entered(body): if visible: - body.coin_collected(value) + GlobalState.coins += value $SoundCollected.play() hide() diff --git a/objects/door/assets/door1.svg b/objects/door/assets/door1.svg new file mode 100644 index 0000000..887b39c --- /dev/null +++ b/objects/door/assets/door1.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + diff --git a/objects/door/assets/door1.svg.import b/objects/door/assets/door1.svg.import new file mode 100644 index 0000000..a6c466d --- /dev/null +++ b/objects/door/assets/door1.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/door1.svg-7b950b3e71870c053e8c7c058349c1d4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/door/assets/door1.svg" +dest_files=[ "res://.import/door1.svg-7b950b3e71870c053e8c7c058349c1d4.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/door/assets/door2.svg b/objects/door/assets/door2.svg new file mode 100644 index 0000000..956cbd8 --- /dev/null +++ b/objects/door/assets/door2.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/objects/door/assets/door2.svg.import b/objects/door/assets/door2.svg.import new file mode 100644 index 0000000..dca2b7d --- /dev/null +++ b/objects/door/assets/door2.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/door2.svg-6da9f46e6f5bf0dc7cb4a271da181ce6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/door/assets/door2.svg" +dest_files=[ "res://.import/door2.svg-6da9f46e6f5bf0dc7cb4a271da181ce6.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/door/assets/door3.svg b/objects/door/assets/door3.svg new file mode 100644 index 0000000..7ff89f5 --- /dev/null +++ b/objects/door/assets/door3.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/objects/door/assets/door3.svg.import b/objects/door/assets/door3.svg.import new file mode 100644 index 0000000..d9e6192 --- /dev/null +++ b/objects/door/assets/door3.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/door3.svg-03cf9b8a2c92f74709b97c4670a65cd7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/door/assets/door3.svg" +dest_files=[ "res://.import/door3.svg-03cf9b8a2c92f74709b97c4670a65cd7.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/door/assets/door4.svg b/objects/door/assets/door4.svg new file mode 100644 index 0000000..8201413 --- /dev/null +++ b/objects/door/assets/door4.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/objects/door/assets/door4.svg.import b/objects/door/assets/door4.svg.import new file mode 100644 index 0000000..4c6b00b --- /dev/null +++ b/objects/door/assets/door4.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/door4.svg-183a3f0fd353dbddb85bdc8a8cce994f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/door/assets/door4.svg" +dest_files=[ "res://.import/door4.svg-183a3f0fd353dbddb85bdc8a8cce994f.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/door/assets/door5.svg b/objects/door/assets/door5.svg new file mode 100644 index 0000000..397cdac --- /dev/null +++ b/objects/door/assets/door5.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/objects/door/assets/door5.svg.import b/objects/door/assets/door5.svg.import new file mode 100644 index 0000000..74581c9 --- /dev/null +++ b/objects/door/assets/door5.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/door5.svg-08ad82c41d697371ba81d476edf11f11.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/door/assets/door5.svg" +dest_files=[ "res://.import/door5.svg-08ad82c41d697371ba81d476edf11f11.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/door/assets/locked.ogg b/objects/door/assets/locked.ogg new file mode 100644 index 0000000..5970e43 Binary files /dev/null and b/objects/door/assets/locked.ogg differ diff --git a/objects/door/assets/locked.ogg.import b/objects/door/assets/locked.ogg.import new file mode 100644 index 0000000..e7957ad --- /dev/null +++ b/objects/door/assets/locked.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/locked.ogg-6600d8abf71ee93d9e6beebe511c5004.oggstr" + +[deps] + +source_file="res://objects/door/assets/locked.ogg" +dest_files=[ "res://.import/locked.ogg-6600d8abf71ee93d9e6beebe511c5004.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/objects/door/assets/open.ogg b/objects/door/assets/open.ogg new file mode 100644 index 0000000..6bc1ab6 Binary files /dev/null and b/objects/door/assets/open.ogg differ diff --git a/objects/door/assets/open.ogg.import b/objects/door/assets/open.ogg.import new file mode 100644 index 0000000..8b2cb70 --- /dev/null +++ b/objects/door/assets/open.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/open.ogg-b87c68dccf2bf681994a63f03c7291c8.oggstr" + +[deps] + +source_file="res://objects/door/assets/open.ogg" +dest_files=[ "res://.import/open.ogg-b87c68dccf2bf681994a63f03c7291c8.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/objects/door/door.gd b/objects/door/door.gd new file mode 100644 index 0000000..1c38949 --- /dev/null +++ b/objects/door/door.gd @@ -0,0 +1,21 @@ +extends StaticBody2D + +export var key : String = "yellow" + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +func _on_PlayerCollision(body): + if $Sprite.frame == 0 and GlobalState.keys[key] == true: + $Sprite.play("open") + $AudioOpen.play() + print("open") + elif $Sprite.frame == 0 and GlobalState.keys[key] == false: + $AudioLocked.play() + + +func _on_Sprite_animation_finished(): + collision_layer = 0 + GlobalState.keys[key] = false diff --git a/objects/door/door.tscn b/objects/door/door.tscn new file mode 100644 index 0000000..b651b36 --- /dev/null +++ b/objects/door/door.tscn @@ -0,0 +1,57 @@ +[gd_scene load_steps=12 format=2] + +[ext_resource path="res://objects/door/assets/door1.svg" type="Texture" id=1] +[ext_resource path="res://objects/door/assets/door4.svg" type="Texture" id=2] +[ext_resource path="res://objects/door/assets/door2.svg" type="Texture" id=3] +[ext_resource path="res://objects/door/assets/door5.svg" type="Texture" id=4] +[ext_resource path="res://objects/door/assets/door3.svg" type="Texture" id=5] +[ext_resource path="res://objects/door/door.gd" type="Script" id=6] +[ext_resource path="res://objects/door/assets/locked.ogg" type="AudioStream" id=7] +[ext_resource path="res://objects/door/assets/open.ogg" type="AudioStream" id=8] + +[sub_resource type="SpriteFrames" id=1] +animations = [ { +"frames": [ ExtResource( 1 ), ExtResource( 3 ), ExtResource( 5 ), ExtResource( 2 ), ExtResource( 4 ) ], +"loop": false, +"name": "open", +"speed": 10.0 +} ] + +[sub_resource type="RectangleShape2D" id=2] +extents = Vector2( 5.5, 59.75 ) + +[sub_resource type="RectangleShape2D" id=3] +extents = Vector2( 36.5, 60 ) + +[node name="Door" type="StaticBody2D"] +z_index = 20 +collision_layer = 4 +collision_mask = 0 +script = ExtResource( 6 ) + +[node name="Sprite" type="AnimatedSprite" parent="."] +position = Vector2( -31, 47 ) +frames = SubResource( 1 ) +animation = "open" + +[node name="Collision" type="CollisionShape2D" parent="."] +position = Vector2( -0.5, 47 ) +shape = SubResource( 2 ) + +[node name="PlayerCollision" type="Area2D" parent="."] +collision_layer = 8 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerCollision"] +position = Vector2( -0.5, 47 ) +shape = SubResource( 3 ) + +[node name="AudioLocked" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 7 ) +volume_db = 10.0 + +[node name="AudioOpen" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 8 ) +volume_db = 10.0 + +[connection signal="animation_finished" from="Sprite" to="." method="_on_Sprite_animation_finished"] +[connection signal="body_entered" from="PlayerCollision" to="." method="_on_PlayerCollision"] diff --git a/objects/key/assets/key.wav b/objects/key/assets/key.wav new file mode 100644 index 0000000..fab62ef Binary files /dev/null and b/objects/key/assets/key.wav differ diff --git a/objects/key/assets/key.wav.import b/objects/key/assets/key.wav.import new file mode 100644 index 0000000..52f955c --- /dev/null +++ b/objects/key/assets/key.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/key.wav-80824c9e843b31e683637d5ee957831c.sample" + +[deps] + +source_file="res://objects/key/assets/key.wav" +dest_files=[ "res://.import/key.wav-80824c9e843b31e683637d5ee957831c.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=false +compress/mode=0 diff --git a/objects/key/assets/yellow.svg b/objects/key/assets/yellow.svg new file mode 100644 index 0000000..cbe7fd4 --- /dev/null +++ b/objects/key/assets/yellow.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + diff --git a/objects/key/assets/yellow.svg.import b/objects/key/assets/yellow.svg.import new file mode 100644 index 0000000..a51726f --- /dev/null +++ b/objects/key/assets/yellow.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/yellow.svg-8fcc8ed0aa1a775183202b241e6753c7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/key/assets/yellow.svg" +dest_files=[ "res://.import/yellow.svg-8fcc8ed0aa1a775183202b241e6753c7.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/key/key.gd b/objects/key/key.gd new file mode 100644 index 0000000..dc34c20 --- /dev/null +++ b/objects/key/key.gd @@ -0,0 +1,14 @@ +extends StaticBody2D + +func _ready(): + $Sprite/AnimationPlayer.play("default") + +func _on_PlayerCollision(body): + if visible: + GlobalState.keys['yellow'] = true + $SoundCollected.play() + hide() + +func _on_SoundCollected_finished(): + queue_free() + get_parent().remove_child(self) diff --git a/objects/key/key.tscn b/objects/key/key.tscn new file mode 100644 index 0000000..6d7a475 --- /dev/null +++ b/objects/key/key.tscn @@ -0,0 +1,52 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://objects/key/assets/yellow.svg" type="Texture" id=1] +[ext_resource path="res://objects/key/key.gd" type="Script" id=2] +[ext_resource path="res://objects/key/assets/key.wav" type="AudioStream" id=3] + +[sub_resource type="Animation" id=1] +resource_name = "default" +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath(".:offset") +tracks/0/interp = 1 +tracks/0/loop_wrap = false +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.5, 1 ), +"transitions": PoolRealArray( 0.5, 0.5, 0 ), +"update": 0, +"values": [ Vector2( 0, 0 ), Vector2( 0, -10 ), Vector2( 0, 0 ) ] +} + +[sub_resource type="CircleShape2D" id=2] +radius = 35.0 + +[node name="Key" type="StaticBody2D"] +z_index = -10 +collision_layer = 8 +collision_mask = 0 +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Sprite"] +anims/default = SubResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource( 2 ) + +[node name="PlayerCollision" type="Area2D" parent="."] +collision_layer = 8 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerCollision"] +shape = SubResource( 2 ) + +[node name="SoundCollected" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 3 ) +volume_db = -12.0 + +[connection signal="body_entered" from="PlayerCollision" to="." method="_on_PlayerCollision"] +[connection signal="finished" from="SoundCollected" to="." method="_on_SoundCollected_finished"] diff --git a/project.godot b/project.godot index 56c5a92..0619817 100644 --- a/project.godot +++ b/project.godot @@ -14,6 +14,10 @@ config/name="Flopsy the Dog" run/main_scene="res://scenes/main.tscn" config/icon="res://common/player_head.png" +[autoload] + +GlobalState="*res://common/global_state.gd" + [display] window/size/width=1920 diff --git a/scenes/hud/assets/key_yellow.svg b/scenes/hud/assets/key_yellow.svg new file mode 100644 index 0000000..f383f24 --- /dev/null +++ b/scenes/hud/assets/key_yellow.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + diff --git a/scenes/hud/assets/key_yellow.svg.import b/scenes/hud/assets/key_yellow.svg.import new file mode 100644 index 0000000..a9b3c05 --- /dev/null +++ b/scenes/hud/assets/key_yellow.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/key_yellow.svg-baabc1c5d33c1c7d4dd1114d21d40e4d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/hud/assets/key_yellow.svg" +dest_files=[ "res://.import/key_yellow.svg-baabc1c5d33c1c7d4dd1114d21d40e4d.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/scenes/hud.gd b/scenes/hud/hud.gd similarity index 80% rename from scenes/hud.gd rename to scenes/hud/hud.gd index fa5e92c..c5f5efd 100644 --- a/scenes/hud.gd +++ b/scenes/hud/hud.gd @@ -6,12 +6,13 @@ export var font_color : Color = Color(0, 0, 0) func _ready(): set_font_color(font_color) +func _process(delta): + $HUD_Items/ScoreLabel.text = str(GlobalState.coins) + $HUD_Items/PlayerItems/Key_Yellow.visible = GlobalState.keys['yellow'] + func set_font_color(color: Color): font_color = color $HUD_Items/ScoreLabel.add_color_override("font_color", font_color) - -func set_score(value): - $HUD_Items/ScoreLabel.text = str(value) func scene_fadeout(): $SceneTransition/Animation.play_backwards("Fade") diff --git a/scenes/hud.tscn b/scenes/hud/hud.tscn similarity index 77% rename from scenes/hud.tscn rename to scenes/hud/hud.tscn index f7982a8..d38a73b 100644 --- a/scenes/hud.tscn +++ b/scenes/hud/hud.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://common/fonts/DSEG14Classic-Bold.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://scenes/hud.gd" type="Script" id=2] +[ext_resource path="res://scenes/hud/hud.gd" type="Script" id=2] [ext_resource path="res://objects/coin/assets/gold_1.png" type="Texture" id=3] +[ext_resource path="res://scenes/hud/assets/key_yellow.svg" type="Texture" id=4] [sub_resource type="DynamicFont" id=1] size = 64 @@ -52,6 +53,17 @@ margin_bottom = 88.0 rect_scale = Vector2( 0.7, 0.7 ) texture = ExtResource( 3 ) +[node name="PlayerItems" type="HBoxContainer" parent="HUD_Items"] +margin_left = 20.0 +margin_top = 20.0 +margin_right = 40.0 +margin_bottom = 40.0 + +[node name="Key_Yellow" type="TextureRect" parent="HUD_Items/PlayerItems"] +margin_right = 43.0 +margin_bottom = 39.0 +texture = ExtResource( 4 ) + [node name="SceneTransition" type="ColorRect" parent="."] modulate = Color( 1, 1, 1, 0 ) anchor_right = 1.0 diff --git a/scenes/levels/01/CollidingMountain.tscn b/scenes/levels/01/CollidingMountain.tscn new file mode 100644 index 0000000..4d6f253 --- /dev/null +++ b/scenes/levels/01/CollidingMountain.tscn @@ -0,0 +1,19 @@ +[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="."] +position = Vector2( 5845, 805 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 5845, 805 ) +shape = SubResource( 3 ) diff --git a/scenes/levels/01/assets/mountain_01.svg b/scenes/levels/01/assets/mountain_01.svg new file mode 100644 index 0000000..78ef3b2 --- /dev/null +++ b/scenes/levels/01/assets/mountain_01.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + diff --git a/scenes/levels/01/assets/mountain_01.svg.import b/scenes/levels/01/assets/mountain_01.svg.import new file mode 100644 index 0000000..de3eb32 --- /dev/null +++ b/scenes/levels/01/assets/mountain_01.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mountain_01.svg-98168bc0a7812a46ed71e30448ec7ee4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/levels/01/assets/mountain_01.svg" +dest_files=[ "res://.import/mountain_01.svg-98168bc0a7812a46ed71e30448ec7ee4.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/scenes/levels/01/interlude_01.tscn b/scenes/levels/01/interlude_01.tscn index 2cfbb91..7f08d50 100644 --- a/scenes/levels/01/interlude_01.tscn +++ b/scenes/levels/01/interlude_01.tscn @@ -242,7 +242,7 @@ cell_size = Vector2( 70, 70 ) collision_layer = 4 collision_mask = 0 format = 1 -tile_data = PoolIntArray( -65485, 2, 1, -65484, 2, 2, -65483, 2, 2, -65482, 2, 2, -65481, 2, 3, 131114, 2, 1, 131115, 2, 2, 131116, 2, 2, 131117, 2, 2, 131118, 2, 2, 131119, 2, 2, 131120, 2, 3, 917503, 2, 1, 851968, 2, 2, 851969, 2, 2, 851970, 2, 2, 851971, 2, 2, 851972, 2, 2, 851973, 2, 2, 851974, 2, 2, 851975, 2, 2, 851976, 2, 2, 851977, 2, 2, 851978, 2, 2, 851979, 2, 2, 851980, 2, 2, 851981, 2, 2, 851982, 2, 2, 851983, 2, 2, 851984, 2, 2, 851985, 2, 2, 851986, 2, 2, 851987, 2, 2, 851988, 2, 2, 851989, 2, 2, 851990, 2, 2, 851991, 2, 2, 851992, 2, 2, 851993, 2, 2, 851994, 2, 2, 851995, 2, 2, 851996, 2, 3 ) +tile_data = PoolIntArray( -65485, 2, 1, -65484, 2, 2, -65483, 2, 2, -65482, 2, 2, -65481, 2, 3, 131114, 2, 1, 131115, 2, 2, 131116, 2, 2, 131117, 2, 2, 131118, 2, 2, 131119, 2, 2, 131120, 2, 3, 917503, 0, 1, 851968, 0, 2, 851969, 0, 2, 851970, 0, 2, 851971, 0, 2, 851972, 0, 2, 851973, 0, 2, 851974, 0, 2, 851975, 0, 2, 851976, 0, 2, 851977, 0, 2, 851978, 0, 2, 851979, 0, 2, 851980, 0, 2, 851981, 0, 2, 851982, 0, 2, 851983, 0, 2, 851984, 0, 2, 851985, 0, 2, 851986, 0, 2, 851987, 0, 2, 851988, 0, 2, 851989, 0, 2, 851990, 0, 2, 851991, 0, 2, 851992, 0, 2, 851993, 0, 2, 851994, 0, 2, 851995, 0, 2, 851996, 0, 3 ) [node name="Flake" parent="CanvasLayer" instance=ExtResource( 5 )] position = Vector2( 1691, 686 ) diff --git a/scenes/levels/01/level_01.tscn b/scenes/levels/01/level_01.tscn index 60ab9a4..b70b710 100644 --- a/scenes/levels/01/level_01.tscn +++ b/scenes/levels/01/level_01.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://scenes/levels/01/background_01.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/levels/01/level_01.gd" type="Script" id=2] @@ -8,10 +8,33 @@ [ext_resource path="res://objects/characters/monsters/01/monster_01.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/characters/player.tscn" type="PackedScene" id=7] [ext_resource path="res://objects/lift/lift.tscn" type="PackedScene" id=8] +[ext_resource path="res://objects/key/key.tscn" type="PackedScene" id=9] +[ext_resource path="res://objects/door/door.tscn" type="PackedScene" id=10] +[ext_resource path="res://scenes/levels/01/CollidingMountain.tscn" type="PackedScene" id=11] + +[sub_resource type="Gradient" id=1] +colors = PoolColorArray( 0.0431373, 0.0431373, 0.0431373, 0, 0, 0, 0, 1 ) + +[sub_resource type="GradientTexture" id=2] +gradient = SubResource( 1 ) +width = 500 [node name="Level 01" type="Node2D"] script = ExtResource( 2 ) bgm_path = "res://scenes/levels/01/assets/bgm.ogg" +camera_limit_right = 6195 + +[node name="TextureRect" type="TextureRect" parent="."] +margin_left = 5356.0 +margin_top = 772.0 +margin_right = 5634.0 +margin_bottom = 1788.0 +rect_rotation = 90.0 +texture = SubResource( 2 ) +expand = true + +[node name="Door" parent="." instance=ExtResource( 10 )] +position = Vector2( 5355, 945 ) [node name="TileMap" type="TileMap" parent="."] tile_set = ExtResource( 4 ) @@ -19,7 +42,7 @@ cell_size = Vector2( 70, 70 ) collision_layer = 4 collision_mask = 0 format = 1 -tile_data = PoolIntArray( -393183, 3, 0, -327641, 3, 0, -262100, 3, 0, -262094, 3, 0, 524305, 1, 0, 524306, 1, 1, 524307, 1, 1, 524308, 1, 1, 524309, 1, 2, 524332, 13, 1, 524333, 13, 2, 524334, 13, 2, 524335, 13, 2, 524336, 13, 2, 524337, 13, 2, 524338, 13, 2, 524339, 13, 3, 589835, 1, 0, 589836, 1, 1, 589837, 1, 1, 589838, 1, 2, 589864, 3, 0, 589868, 5, 0, 589869, 5, 0, 589870, 5, 0, 589871, 5, 0, 589872, 5, 0, 589873, 5, 0, 589874, 5, 0, 589875, 5, 0, 655396, 3, 0, 655404, 5, 0, 655405, 5, 0, 655406, 5, 0, 655407, 5, 0, 655408, 5, 0, 655409, 5, 0, 655410, 5, 0, 655411, 5, 0, 720925, 23, 0, 720926, 22, 0, 720940, 5, 0, 720941, 5, 0, 720942, 5, 0, 720943, 5, 0, 720944, 5, 0, 720945, 5, 0, 720946, 5, 0, 720947, 5, 0, 786449, 0, 1, 786450, 0, 2, 786451, 0, 3, 786456, 22, 0, 786459, 1, 0, 786460, 4, 0, 786461, 4, 0, 786462, 4, 0, 786463, 4, 0, 786464, 7, 0, 786476, 5, 0, 786477, 16, 0, 786479, 27, 0, 786480, 27, 0, 786482, 17, 0, 786483, 5, 0, 851971, 20, 0, 851973, 23, 0, 851975, 22, 0, 851977, 24, 0, 851979, 20, 0, 851981, 22, 0, 851990, 9, 0, 851991, 4, 0, 851992, 15, 0, 851996, 5, 0, 851997, 5, 0, 851998, 5, 0, 851999, 5, 0, 852000, 8, 0, 852001, 7, 0, 852012, 25, 0, 852019, 25, 0, 983039, 4, 0, 917504, 4, 0, 917505, 4, 0, 917506, 4, 0, 917507, 4, 0, 917508, 4, 0, 917509, 4, 0, 917510, 4, 0, 917511, 4, 0, 917512, 4, 0, 917513, 4, 0, 917514, 4, 0, 917515, 4, 0, 917516, 4, 0, 917517, 4, 0, 917518, 4, 0, 917519, 7, 0, 917521, 23, 0, 917523, 20, 0, 917525, 9, 0, 917526, 10, 0, 917527, 5, 0, 917528, 5, 0, 917529, 11, 0, 917530, 11, 0, 917531, 11, 0, 917532, 5, 0, 917533, 5, 0, 917534, 5, 0, 917535, 5, 0, 917536, 5, 0, 917537, 8, 0, 917538, 7, 0, 917540, 22, 0, 917542, 20, 0, 1048575, 5, 0, 983040, 5, 0, 983041, 5, 0, 983042, 5, 0, 983043, 5, 0, 983044, 5, 0, 983045, 5, 0, 983046, 5, 0, 983047, 5, 0, 983048, 5, 0, 983049, 5, 0, 983050, 5, 0, 983051, 5, 0, 983052, 5, 0, 983053, 5, 0, 983054, 5, 0, 983055, 8, 0, 983056, 4, 0, 983057, 4, 0, 983058, 4, 0, 983059, 4, 0, 983060, 4, 0, 983061, 10, 0, 983062, 5, 0, 983063, 5, 0, 983064, 5, 0, 983065, 12, 0, 983066, 12, 0, 983067, 12, 0, 983068, 5, 0, 983069, 5, 0, 983070, 5, 0, 983071, 5, 0, 983072, 5, 0, 983073, 5, 0, 983074, 8, 0, 983075, 4, 0, 983076, 4, 0, 983077, 4, 0, 983078, 4, 0, 983079, 4, 0, 983080, 4, 0, 983081, 4, 0, 983082, 4, 0, 983083, 4, 0, 983084, 4, 0, 983085, 4, 0, 983086, 4, 0, 983087, 4, 0, 983088, 4, 0, 983089, 4, 0, 983090, 4, 0, 983091, 4, 0, 983092, 4, 0, 983093, 4, 0, 983094, 4, 0, 983095, 4, 0, 983096, 4, 0 ) +tile_data = PoolIntArray( -1310628, 5, 0, -1245092, 5, 0, -1179556, 5, 0, -1114020, 5, 0, -1048484, 5, 0, -982948, 5, 0, -917412, 5, 0, -851876, 5, 0, -786340, 5, 0, -720804, 5, 0, -655277, 24, 0, -655268, 5, 0, -589742, 3, 1, -589741, 3, 65536, -589740, 3, 65536, -589739, 3, 65536, -589738, 3, 65536, -589737, 3, 65537, -589732, 5, 0, -524263, 3, 0, -524196, 5, 0, -458740, 3, 0, -458731, 3, 0, -458674, 3, 0, -458660, 5, 0, -393188, 3, 0, -393183, 3, 0, -393124, 5, 0, -327664, 3, 0, -327641, 3, 0, -327630, 22, 0, -327588, 5, 0, -262100, 3, 0, -262094, 3, 0, -262072, 32, 0, -262071, 4, 0, -262070, 33, 0, -262052, 5, 0, -196536, 29, 0, -196535, 5, 0, -196534, 30, 0, -196516, 5, 0, -131000, 29, 0, -130999, 5, 0, -130998, 30, 0, -130980, 5, 0, -65474, 3, 0, -65464, 29, 0, -65463, 5, 0, -65462, 30, 0, -65460, 3, 0, -65444, 5, 0, 65524, 5, 0, 72, 29, 0, 73, 5, 0, 74, 30, 0, 92, 5, 0, 131060, 5, 0, 65602, 3, 0, 65608, 29, 0, 65609, 5, 0, 65610, 30, 0, 65628, 5, 0, 196596, 5, 0, 131144, 29, 0, 131145, 5, 0, 131146, 30, 0, 131151, 3, 0, 131164, 5, 0, 262132, 5, 0, 196680, 29, 0, 196681, 5, 0, 196682, 30, 0, 196700, 5, 0, 327668, 5, 0, 262216, 29, 0, 262217, 5, 0, 262218, 30, 0, 262220, 22, 0, 262236, 5, 0, 393204, 5, 0, 327752, 29, 0, 327753, 5, 0, 327754, 30, 0, 327756, 3, 0, 327772, 5, 0, 458740, 5, 0, 393288, 29, 0, 393289, 5, 0, 393290, 30, 0, 393308, 5, 0, 524276, 5, 0, 458802, 23, 0, 458824, 29, 0, 458825, 5, 0, 458826, 30, 0, 458831, 23, 0, 458844, 5, 0, 589812, 5, 0, 524305, 1, 0, 524306, 1, 1, 524307, 1, 1, 524308, 1, 1, 524309, 1, 2, 524332, 13, 1, 524333, 13, 2, 524334, 13, 2, 524335, 13, 2, 524336, 13, 2, 524337, 13, 2, 524338, 13, 2, 524339, 13, 3, 524360, 29, 0, 524361, 5, 0, 524362, 30, 0, 524367, 3, 0, 524373, 4, 0, 524380, 5, 0, 655348, 5, 0, 589835, 1, 0, 589836, 1, 1, 589837, 1, 1, 589838, 1, 2, 589864, 3, 0, 589868, 5, 0, 589869, 5, 0, 589870, 5, 0, 589871, 5, 0, 589872, 5, 0, 589873, 5, 0, 589874, 5, 0, 589875, 5, 0, 589887, 23, 0, 589893, 22, 0, 589895, 9, 0, 589896, 10, 0, 589897, 5, 0, 589898, 8, 0, 589899, 7, 0, 589909, 5, 0, 589914, 24, 0, 589916, 5, 0, 720884, 5, 0, 655396, 3, 0, 655404, 5, 0, 655405, 5, 0, 655406, 5, 0, 655407, 5, 0, 655408, 5, 0, 655409, 5, 0, 655410, 5, 0, 655411, 5, 0, 655421, 9, 0, 655422, 4, 0, 655423, 15, 0, 655427, 14, 0, 655428, 4, 0, 655429, 4, 0, 655430, 4, 0, 655431, 10, 0, 655432, 5, 0, 655433, 5, 0, 655434, 5, 0, 655435, 8, 0, 655436, 7, 0, 655445, 5, 0, 655449, 4, 0, 655450, 4, 0, 655451, 7, 0, 655452, 5, 0, 786420, 5, 0, 720925, 23, 0, 720926, 22, 0, 720940, 5, 0, 720941, 5, 0, 720942, 5, 0, 720943, 5, 0, 720944, 5, 0, 720945, 5, 0, 720946, 5, 0, 720947, 5, 0, 720956, 9, 0, 720957, 10, 0, 720958, 5, 0, 720959, 5, 0, 720963, 5, 0, 720964, 5, 0, 720965, 5, 0, 720966, 5, 0, 720967, 5, 0, 720968, 5, 0, 720969, 5, 0, 720970, 5, 0, 720971, 5, 0, 720972, 30, 0, 720981, 5, 0, 720985, 5, 0, 720986, 5, 0, 720987, 8, 0, 720988, 5, 0, 851956, 5, 0, 786449, 0, 1, 786450, 0, 2, 786451, 0, 3, 786456, 22, 0, 786459, 1, 0, 786460, 4, 0, 786461, 4, 0, 786462, 4, 0, 786463, 4, 0, 786464, 7, 0, 786476, 5, 0, 786477, 16, 0, 786479, 27, 0, 786480, 27, 0, 786482, 17, 0, 786483, 5, 0, 786491, 9, 0, 786492, 10, 0, 786493, 5, 0, 786494, 25, 0, 786495, 25, 0, 786498, 1, 0, 786499, 5, 0, 786500, 5, 0, 786501, 5, 0, 786502, 5, 0, 786503, 5, 0, 786504, 5, 0, 786505, 5, 0, 786506, 5, 0, 786507, 5, 0, 786508, 30, 0, 786511, 3, 0, 786517, 5, 0, 786521, 5, 0, 786522, 5, 0, 786523, 5, 0, 786524, 5, 0, 917492, 5, 0, 851971, 20, 0, 851973, 23, 0, 851975, 22, 0, 851977, 24, 0, 851979, 20, 0, 851981, 22, 0, 851990, 9, 0, 851991, 4, 0, 851992, 15, 0, 851996, 5, 0, 851997, 5, 0, 851998, 5, 0, 851999, 5, 0, 852000, 8, 0, 852001, 7, 0, 852012, 25, 0, 852019, 25, 0, 852026, 9, 0, 852027, 10, 0, 852028, 5, 0, 852029, 5, 0, 852035, 25, 0, 852036, 25, 0, 852037, 25, 0, 852038, 25, 0, 852039, 25, 0, 852040, 25, 0, 852041, 25, 0, 852042, 25, 0, 852043, 25, 0, 852044, 25, 0, 852053, 5, 0, 852054, 4, 0, 852055, 4, 0, 852056, 4, 0, 852057, 5, 0, 852058, 5, 0, 852059, 5, 0, 852060, 5, 0, 983028, 5, 0, 983029, 4, 0, 983030, 4, 0, 983031, 4, 0, 983032, 4, 0, 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, 4, 0, 917506, 4, 0, 917507, 4, 0, 917508, 4, 0, 917509, 4, 0, 917510, 4, 0, 917511, 4, 0, 917512, 4, 0, 917513, 4, 0, 917514, 4, 0, 917515, 4, 0, 917516, 4, 0, 917517, 4, 0, 917518, 4, 0, 917519, 7, 0, 917521, 23, 0, 917523, 20, 0, 917525, 9, 0, 917526, 10, 0, 917527, 5, 0, 917528, 5, 0, 917529, 11, 0, 917530, 11, 0, 917531, 11, 0, 917532, 5, 0, 917533, 5, 0, 917534, 5, 0, 917535, 5, 0, 917536, 5, 0, 917537, 8, 0, 917538, 7, 0, 917540, 22, 0, 917542, 20, 0, 917553, 24, 0, 917561, 9, 0, 917562, 10, 0, 917563, 5, 0, 917564, 5, 0, 917565, 5, 0, 917567, 23, 0, 917570, 28, 0, 917574, 24, 0, 917576, 28, 0, 917582, 22, 0, 917589, 5, 0, 917590, 5, 0, 917591, 5, 0, 917592, 5, 0, 917593, 5, 0, 917594, 5, 0, 917595, 5, 0, 917596, 5, 0, 1048564, 5, 0, 1048565, 5, 0, 1048566, 5, 0, 1048567, 5, 0, 1048568, 5, 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, 5, 0, 983042, 5, 0, 983043, 5, 0, 983044, 5, 0, 983045, 5, 0, 983046, 5, 0, 983047, 5, 0, 983048, 5, 0, 983049, 5, 0, 983050, 5, 0, 983051, 5, 0, 983052, 5, 0, 983053, 5, 0, 983054, 5, 0, 983055, 8, 0, 983056, 4, 0, 983057, 4, 0, 983058, 4, 0, 983059, 4, 0, 983060, 4, 0, 983061, 10, 0, 983062, 5, 0, 983063, 5, 0, 983064, 5, 0, 983065, 12, 0, 983066, 12, 0, 983067, 12, 0, 983068, 5, 0, 983069, 5, 0, 983070, 5, 0, 983071, 5, 0, 983072, 5, 0, 983073, 5, 0, 983074, 8, 0, 983075, 4, 0, 983076, 4, 0, 983077, 4, 0, 983078, 4, 0, 983079, 4, 0, 983080, 4, 0, 983081, 4, 0, 983082, 4, 0, 983083, 4, 0, 983084, 4, 0, 983085, 4, 0, 983086, 4, 0, 983087, 4, 0, 983088, 4, 0, 983089, 4, 0, 983090, 4, 0, 983091, 4, 0, 983092, 4, 0, 983093, 4, 0, 983094, 4, 0, 983095, 4, 0, 983096, 4, 0, 983097, 10, 0, 983098, 5, 0, 983099, 5, 0, 983100, 5, 0, 983101, 5, 0, 983102, 5, 0, 983103, 5, 0, 983104, 5, 0, 983105, 5, 0, 983106, 5, 0, 983107, 5, 0, 983108, 5, 0, 983109, 5, 0, 983110, 5, 0, 983111, 5, 0, 983112, 5, 0, 983113, 5, 0, 983114, 5, 0, 983115, 5, 0, 983116, 5, 0, 983117, 4, 0, 983118, 4, 0, 983119, 4, 0, 983120, 4, 0, 983121, 4, 0, 983122, 4, 0, 983123, 4, 0, 983124, 4, 0, 983125, 5, 0, 983126, 5, 0, 983127, 5, 0, 983128, 5, 0, 983129, 5, 0, 983130, 5, 0, 983131, 5, 0, 983132, 5, 0, 1114100, 5, 0, 1114101, 5, 0, 1114102, 5, 0, 1114103, 5, 0, 1114104, 5, 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, 5, 0, 1048592, 5, 0, 1048593, 5, 0, 1048594, 5, 0, 1048595, 5, 0, 1048596, 5, 0, 1048597, 5, 0, 1048598, 5, 0, 1048599, 5, 0, 1048600, 5, 0, 1048601, 12, 0, 1048602, 12, 0, 1048603, 12, 0, 1048604, 5, 0, 1048605, 5, 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, 1048616, 5, 0, 1048617, 5, 0, 1048618, 5, 0, 1048619, 5, 0, 1048620, 5, 0, 1048621, 5, 0, 1048622, 5, 0, 1048623, 5, 0, 1048624, 5, 0, 1048625, 5, 0, 1048626, 5, 0, 1048627, 5, 0, 1048628, 5, 0, 1048629, 5, 0, 1048630, 5, 0, 1048631, 5, 0, 1048632, 5, 0, 1048633, 5, 0, 1048634, 5, 0, 1048635, 5, 0, 1048636, 5, 0, 1048637, 5, 0, 1048638, 5, 0, 1048639, 5, 0, 1048640, 5, 0, 1048641, 5, 0, 1048642, 5, 0, 1048643, 5, 0, 1048644, 5, 0, 1048645, 5, 0, 1048646, 5, 0, 1048647, 5, 0, 1048648, 5, 0, 1048649, 5, 0, 1048650, 5, 0, 1048651, 5, 0, 1048652, 5, 0, 1048653, 5, 0, 1048654, 5, 0, 1048655, 5, 0, 1048656, 5, 0, 1048657, 5, 0, 1048658, 5, 0, 1048659, 5, 0, 1048660, 5, 0, 1048661, 5, 0, 1048662, 5, 0, 1048663, 5, 0, 1048664, 5, 0, 1048665, 5, 0, 1048666, 5, 0, 1048667, 5, 0, 1048668, 5, 0, 1179636, 5, 0, 1179637, 5, 0, 1179638, 5, 0, 1179639, 5, 0, 1179640, 5, 0, 1179641, 5, 0, 1179642, 5, 0, 1179643, 5, 0, 1179644, 5, 0, 1179645, 5, 0, 1179646, 5, 0, 1179647, 5, 0, 1114112, 4, 0, 1114113, 4, 0, 1114114, 5, 0, 1114115, 5, 0, 1114116, 5, 0, 1114117, 5, 0, 1114118, 5, 0, 1114119, 5, 0, 1114120, 4, 0, 1114121, 4, 0, 1114122, 4, 0, 1114123, 4, 0, 1114124, 5, 0, 1114125, 5, 0, 1114126, 5, 0, 1114127, 5, 0, 1114128, 5, 0, 1114129, 5, 0, 1114130, 5, 0, 1114131, 5, 0, 1114132, 5, 0, 1114133, 5, 0, 1114134, 5, 0, 1114135, 5, 0, 1114136, 5, 0, 1114137, 12, 0, 1114138, 12, 0, 1114139, 12, 0, 1114140, 5, 0, 1114141, 5, 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, 4, 0, 1114152, 4, 0, 1114153, 4, 0, 1114154, 4, 0, 1114155, 5, 0, 1114156, 5, 0, 1114157, 5, 0, 1114158, 5, 0, 1114159, 5, 0, 1114160, 5, 0, 1114161, 5, 0, 1114162, 5, 0, 1114163, 5, 0, 1114164, 5, 0, 1114165, 5, 0, 1114166, 5, 0, 1114167, 5, 0, 1114168, 5, 0, 1114169, 5, 0, 1114170, 5, 0, 1114171, 5, 0, 1114172, 5, 0, 1114173, 5, 0, 1114174, 5, 0, 1114175, 5, 0, 1114176, 5, 0, 1114177, 5, 0, 1114178, 5, 0, 1114179, 5, 0, 1114180, 5, 0, 1114181, 5, 0, 1114182, 5, 0, 1114183, 5, 0, 1114184, 5, 0, 1114185, 4, 0, 1114186, 4, 0, 1114187, 4, 0, 1114188, 4, 0, 1114189, 4, 0, 1114190, 4, 0, 1114191, 5, 0, 1114192, 5, 0, 1114193, 5, 0, 1114194, 5, 0, 1114195, 5, 0, 1114196, 5, 0, 1114197, 5, 0, 1114198, 5, 0, 1114199, 5, 0, 1114200, 5, 0, 1114201, 5, 0, 1114202, 5, 0, 1114203, 5, 0, 1114204, 5, 0, 1245172, 5, 0, 1245173, 5, 0, 1245174, 5, 0, 1245175, 5, 0, 1245176, 5, 0, 1245177, 5, 0, 1245178, 5, 0, 1245179, 5, 0, 1245180, 5, 0, 1245181, 4, 0, 1245182, 4, 0, 1245183, 4, 0, 1179648, 4, 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, 5, 0, 1179664, 5, 0, 1179665, 5, 0, 1179666, 4, 0, 1179667, 4, 0, 1179668, 4, 0, 1179669, 5, 0, 1179670, 5, 0, 1179671, 5, 0, 1179672, 5, 0, 1179673, 12, 0, 1179674, 12, 0, 1179675, 12, 0, 1179676, 5, 0, 1179677, 5, 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, 1179688, 5, 0, 1179689, 5, 0, 1179690, 5, 0, 1179691, 5, 0, 1179692, 5, 0, 1179693, 5, 0, 1179694, 5, 0, 1179695, 5, 0, 1179696, 5, 0, 1179697, 5, 0, 1179698, 5, 0, 1179699, 5, 0, 1179700, 5, 0, 1179701, 5, 0, 1179702, 5, 0, 1179703, 5, 0, 1179704, 5, 0, 1179705, 5, 0, 1179706, 5, 0, 1179707, 4, 0, 1179708, 4, 0, 1179709, 4, 0, 1179710, 5, 0, 1179711, 5, 0, 1179712, 5, 0, 1179713, 5, 0, 1179714, 5, 0, 1179715, 5, 0, 1179716, 5, 0, 1179717, 5, 0, 1179718, 5, 0, 1179719, 5, 0, 1179720, 5, 0, 1179721, 5, 0, 1179722, 5, 0, 1179723, 5, 0, 1179724, 5, 0, 1179725, 5, 0, 1179726, 5, 0, 1179727, 5, 0, 1179728, 5, 0, 1179729, 5, 0, 1179730, 5, 0, 1179731, 5, 0, 1179732, 5, 0, 1179733, 5, 0, 1179734, 5, 0, 1179735, 5, 0, 1179736, 5, 0, 1179737, 5, 0, 1179738, 5, 0, 1179739, 5, 0, 1179740, 5, 0, 1310708, 5, 0, 1310709, 5, 0, 1310710, 5, 0, 1310711, 5, 0, 1310712, 5, 0, 1310713, 5, 0, 1310714, 5, 0, 1310715, 5, 0, 1310716, 5, 0, 1310717, 5, 0, 1310718, 5, 0, 1310719, 5, 0, 1245184, 5, 0, 1245185, 5, 0, 1245186, 5, 0, 1245187, 5, 0, 1245188, 5, 0, 1245189, 5, 0, 1245190, 5, 0, 1245191, 5, 0, 1245192, 5, 0, 1245193, 5, 0, 1245194, 5, 0, 1245195, 5, 0, 1245196, 5, 0, 1245197, 5, 0, 1245198, 5, 0, 1245199, 5, 0, 1245200, 5, 0, 1245201, 5, 0, 1245202, 5, 0, 1245203, 5, 0, 1245204, 5, 0, 1245205, 5, 0, 1245206, 5, 0, 1245207, 5, 0, 1245208, 5, 0, 1245209, 12, 0, 1245210, 12, 0, 1245211, 12, 0, 1245212, 5, 0, 1245213, 5, 0, 1245214, 5, 0, 1245215, 4, 0, 1245216, 4, 0, 1245217, 4, 0, 1245218, 4, 0, 1245219, 5, 0, 1245220, 5, 0, 1245221, 5, 0, 1245222, 5, 0, 1245223, 5, 0, 1245224, 5, 0, 1245225, 5, 0, 1245226, 5, 0, 1245227, 5, 0, 1245228, 5, 0, 1245229, 5, 0, 1245230, 5, 0, 1245231, 5, 0, 1245232, 5, 0, 1245233, 5, 0, 1245234, 5, 0, 1245235, 5, 0, 1245236, 5, 0, 1245237, 5, 0, 1245238, 5, 0, 1245239, 5, 0, 1245240, 5, 0, 1245241, 5, 0, 1245242, 5, 0, 1245243, 5, 0, 1245244, 5, 0, 1245245, 5, 0, 1245246, 5, 0, 1245247, 5, 0, 1245248, 5, 0, 1245249, 5, 0, 1245250, 5, 0, 1245251, 5, 0, 1245252, 5, 0, 1245253, 5, 0, 1245254, 5, 0, 1245255, 5, 0, 1245256, 5, 0, 1245257, 5, 0, 1245258, 5, 0, 1245259, 5, 0, 1245260, 5, 0, 1245261, 5, 0, 1245262, 5, 0, 1245263, 5, 0, 1245264, 5, 0, 1245265, 5, 0, 1245266, 5, 0, 1245267, 5, 0, 1245268, 5, 0, 1245269, 5, 0, 1245270, 5, 0, 1245271, 5, 0, 1245272, 5, 0, 1245273, 5, 0, 1245274, 5, 0, 1245275, 5, 0, 1245276, 5, 0, 1376244, 5, 0, 1376245, 5, 0, 1376246, 5, 0, 1376247, 5, 0, 1376248, 5, 0, 1376249, 5, 0, 1376250, 5, 0, 1376251, 5, 0, 1376252, 5, 0, 1376253, 5, 0, 1376254, 5, 0, 1376255, 5, 0, 1310720, 5, 0, 1310721, 5, 0, 1310722, 5, 0, 1310723, 5, 0, 1310724, 5, 0, 1310725, 5, 0, 1310726, 5, 0, 1310727, 5, 0, 1310728, 5, 0, 1310729, 5, 0, 1310730, 5, 0, 1310731, 5, 0, 1310732, 5, 0, 1310733, 5, 0, 1310734, 5, 0, 1310735, 5, 0, 1310736, 5, 0, 1310737, 5, 0, 1310738, 5, 0, 1310739, 5, 0, 1310740, 5, 0, 1310741, 5, 0, 1310742, 5, 0, 1310743, 5, 0, 1310744, 5, 0, 1310745, 12, 0, 1310746, 12, 0, 1310747, 12, 0, 1310748, 5, 0, 1310749, 5, 0, 1310750, 5, 0, 1310751, 5, 0, 1310752, 5, 0, 1310753, 5, 0, 1310754, 5, 0, 1310755, 5, 0, 1310756, 5, 0, 1310757, 5, 0, 1310758, 5, 0, 1310759, 5, 0, 1310760, 5, 0, 1310761, 5, 0, 1310762, 5, 0, 1310763, 5, 0, 1310764, 5, 0, 1310765, 5, 0, 1310766, 5, 0, 1310767, 5, 0, 1310768, 5, 0, 1310769, 5, 0, 1310770, 5, 0, 1310771, 5, 0, 1310772, 5, 0, 1310773, 5, 0, 1310774, 5, 0, 1310775, 5, 0, 1310776, 5, 0, 1310777, 5, 0, 1310778, 5, 0, 1310779, 5, 0, 1310780, 5, 0, 1310781, 5, 0, 1310782, 5, 0, 1310783, 5, 0, 1310784, 5, 0, 1310785, 5, 0, 1310786, 5, 0, 1310787, 5, 0, 1310788, 5, 0, 1310789, 5, 0, 1310790, 5, 0, 1310791, 5, 0, 1310792, 5, 0, 1310793, 5, 0, 1310794, 5, 0, 1310795, 5, 0, 1310796, 5, 0, 1310797, 5, 0, 1310798, 5, 0, 1310799, 5, 0, 1310800, 5, 0, 1310801, 5, 0, 1310802, 5, 0, 1310803, 5, 0, 1310804, 5, 0, 1310805, 5, 0, 1310806, 5, 0, 1310807, 5, 0, 1310808, 5, 0, 1310809, 5, 0, 1310810, 5, 0, 1310811, 5, 0, 1310812, 5, 0 ) [node name="monster_01" parent="." instance=ExtResource( 6 )] position = Vector2( 1015, 945 ) @@ -38,7 +61,6 @@ position = Vector2( 420, 700 ) [node name="Coin3" parent="." instance=ExtResource( 5 )] position = Vector2( 910, 455 ) -type = 1 [node name="Coin4" parent="." instance=ExtResource( 5 )] position = Vector2( 1295, 420 ) @@ -46,7 +68,6 @@ type = 1 [node name="Coin5" parent="." instance=ExtResource( 5 )] position = Vector2( 1435, 420 ) -type = 2 [node name="Lift" parent="." instance=ExtResource( 8 )] margin_left = 3815.0 @@ -56,29 +77,25 @@ margin_bottom = 685.0 [node name="Coin6" parent="." instance=ExtResource( 5 )] position = Vector2( 3185, 385 ) -type = 1 [node name="Coin7" parent="." instance=ExtResource( 5 )] position = Vector2( 3290, 385 ) -type = 1 [node name="Coin8" parent="." instance=ExtResource( 5 )] position = Vector2( 3360, 245 ) -type = 2 +type = 1 [node name="Coin9" parent="." instance=ExtResource( 5 )] position = Vector2( 3430, 385 ) -type = 1 [node name="Coin10" parent="." instance=ExtResource( 5 )] position = Vector2( 3535, 385 ) -type = 1 [node name="monster_02" parent="." instance=ExtResource( 6 )] position = Vector2( 3360, 525 ) [node name="Flake" parent="." instance=ExtResource( 3 )] -position = Vector2( 5113, 216 ) +position = Vector2( 6090, -700 ) scale = Vector2( 0.2, 0.2 ) reverse_direction = true flake_scene = "res://scenes/levels/01/interlude_01.tscn" @@ -90,5 +107,30 @@ position = Vector2( 3255, 910 ) position = Vector2( 3465, 910 ) [node name="Coin13" parent="." instance=ExtResource( 5 )] -position = Vector2( 2065, -560 ) +position = Vector2( 2170, -630 ) type = 2 + +[node name="Coin14" parent="." instance=ExtResource( 5 )] +position = Vector2( 4655, 0 ) + +[node name="Coin15" parent="." instance=ExtResource( 5 )] +position = Vector2( 4410, 945 ) + +[node name="Key" parent="." instance=ExtResource( 9 )] +position = Vector2( 875, -525 ) + +[node name="Coin16" parent="." instance=ExtResource( 5 )] +position = Vector2( 5145, -385 ) +type = 2 + +[node name="CollidingMountain4" parent="." instance=ExtResource( 11 )] +position = Vector2( 210, -805 ) + +[node name="CollidingMountain3" parent="." instance=ExtResource( 11 )] +position = Vector2( 140, -560 ) + +[node name="CollidingMountain" parent="." instance=ExtResource( 11 )] +position = Vector2( 0, -70 ) + +[node name="CollidingMountain2" parent="." instance=ExtResource( 11 )] +position = Vector2( 280, -210 ) diff --git a/scenes/levels/level.gd b/scenes/levels/level.gd index 2ca9bac..df1ead3 100644 --- a/scenes/levels/level.gd +++ b/scenes/levels/level.gd @@ -4,6 +4,10 @@ export(String, FILE, "*.ogg") var bgm_path export(bool) var hud_visible = true export var hud_color : Color = Color("000000") export var clear_color : Color = Color("cfeffc") +export var camera_limit_left : int = 0 +export var camera_limit_right : int = 10000000 +export var camera_limit_top : int = -10000000 +export var camera_limit_bottom : int = 1080 onready var main = get_parent() diff --git a/scenes/main.gd b/scenes/main.gd index 04b506c..211a615 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -41,16 +41,8 @@ func play_bgm(bgm_path): stream.loop = true $BGM.stream = stream $BGM.play() - -func _set_score(value: int): - score = value - $HUD.set_score(score) - -func add_score(value: int): - _set_score(score + value) func player_died(): $HUD.scene_fadeout() yield(get_tree().create_timer(1.0), "timeout") - _set_score(0) load_level() diff --git a/scenes/main.tscn b/scenes/main.tscn index bb99328..a35042b 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/hud.tscn" type="PackedScene" id=1] +[ext_resource path="res://scenes/hud/hud.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/main.gd" type="Script" id=3] [sub_resource type="Animation" id=2] @@ -20,7 +20,7 @@ tracks/0/keys = { [node name="Main" type="Node2D"] script = ExtResource( 3 ) -level_path = "res://scenes/levels/01/level_01.tscn" +level_path = "res://scenes/levels/00/interlude_00.tscn" [node name="HUD" parent="." instance=ExtResource( 1 )]