diff --git a/autoloads/debug.gd b/autoloads/debug.gd index df3a5c0..90988de 100644 --- a/autoloads/debug.gd +++ b/autoloads/debug.gd @@ -132,3 +132,7 @@ func _enter_code(): "GILLS": var player = get_tree().get_nodes_in_group("player").pop_back() player.underwater = false + "CHORUS": + var music = AudioServer.get_bus_index("music") + AudioServer.set_bus_effect_enabled(music,0,true) + Console.print(AudioServer.get_bus_effect_count(music)) diff --git a/default_bus_layout.tres b/default_bus_layout.tres index a252150..0588eaf 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -1,12 +1,29 @@ -[gd_resource type="AudioBusLayout" format=2] +[gd_resource type="AudioBusLayout" load_steps=4 format=2] + +[sub_resource type="AudioEffectLowPassFilter" id=2] +resource_name = "LowPassFilter" +cutoff_hz = 1000.0 + +[sub_resource type="AudioEffectReverb" id=3] +resource_name = "Reverb" +room_size = 0.11 + +[sub_resource type="AudioEffectChorus" id=4] +resource_name = "Chorus" [resource] +bus/0/effect/0/effect = SubResource( 2 ) +bus/0/effect/0/enabled = false +bus/0/effect/1/effect = SubResource( 3 ) +bus/0/effect/1/enabled = false bus/1/name = "music" bus/1/solo = false bus/1/mute = false bus/1/bypass_fx = false bus/1/volume_db = 0.0 bus/1/send = "Master" +bus/1/effect/0/effect = SubResource( 4 ) +bus/1/effect/0/enabled = false bus/2/name = "sound" bus/2/solo = false bus/2/mute = false diff --git a/graphics/player/sg_drown.png b/graphics/player/sg_drown.png new file mode 100644 index 0000000..2d2aa55 Binary files /dev/null and b/graphics/player/sg_drown.png differ diff --git a/graphics/player/sg_drown.png.import b/graphics/player/sg_drown.png.import new file mode 100644 index 0000000..cc3418c --- /dev/null +++ b/graphics/player/sg_drown.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sg_drown.png-9f3aae90e49cac8847cdd0ba90cfe464.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/player/sg_drown.png" +dest_files=[ "res://.import/sg_drown.png-9f3aae90e49cac8847cdd0ba90cfe464.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/maps/abyss_scholar.tscn b/maps/abyss_scholar.tscn index 64f8eca..1e639dc 100644 --- a/maps/abyss_scholar.tscn +++ b/maps/abyss_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=40 format=2] [ext_resource path="res://maps/map.gd" type="Script" id=1] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] @@ -22,7 +22,10 @@ [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=20] [ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=21] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=22] +[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=23] [ext_resource path="res://objects/environment/bubble/bubble_spawner.tscn" type="PackedScene" id=24] +[ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=25] +[ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=26] [sub_resource type="CanvasItemMaterial" id=12] blend_mode = 3 @@ -52,7 +55,7 @@ _data = { [sub_resource type="Curve2D" id=14] _data = { -"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, -8, 0, 0, 0, 0, 16, -16, 0, 0, 0, 0, 56, -16, 0, 0, 0, 0, 72, -32, 0, 0, 0, 0, 80, -40, 0, 0, 0, 0, 160, -40, 0, 0, 0, 0, 168, -32, 0, 0, 0, 0, 168, -24, 0, 0, 0, 0, 88, -24, 0, 0, 0, 0, 80, -16, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0 ) +"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, -8, 0, 0, 0, 0, 16, -16, 0, 0, 0, 0, 56, -16, 0, 0, 0, 0, 72, -32, 0, 0, 0, 0, 80, -40, 0, 0, 0, 0, 160, -40, 0, 0, 0, 0, 168, -32, 0, 0, 0, 0, 168, -24, 0, 0, 0, 0, 88, -24, 0, 0, 0, 0, 80, -16, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ) } [sub_resource type="Curve2D" id=16] @@ -65,6 +68,20 @@ _data = { "points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, -16, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 48, -16, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 80, -16, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 48, -16, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 16, -16, 0, 0, 0, 0, 0, 0 ) } +[sub_resource type="Curve2D" id=18] +_data = { +"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 8, 24, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 16, 48, 0, 0, 0, 0, 24, 56, 0, 0, 0, 0, 32, 56, 0, 0, 0, 0, 32, 64, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 8, 64, 0, 0, 0, 0, -8, 72, 0, 0, 0, 0, -8, 64, 0, 0, 0, 0, 8, 56, 0, 0, 0, 0, 16, 56, 0, 0, 0, 0, 16, 48, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 8, 16, 0, 0, 0, 0, 0, 0 ) +} + +[sub_resource type="RectangleShape2D" id=19] +extents = Vector2( 44, 4 ) + +[sub_resource type="RectangleShape2D" id=20] +extents = Vector2( 80, 4 ) + +[sub_resource type="RectangleShape2D" id=21] +extents = Vector2( 36, 4 ) + [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 script = ExtResource( 1 ) @@ -157,32 +174,26 @@ z_index = -30 tile_set = ExtResource( 10 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 262166, 0, 1, 262167, 0, 196610, 262168, 0, 196610, 262169, 0, 196610, 262170, 0, 196610, 262171, 0, 196610, 262172, 0, 3, 262175, 0, 0, 327680, 0, 196609, 327681, 0, 196610, 327682, 0, 196610, 327683, 0, 196610, 327684, 0, 196610, 327685, 0, 196610, 327686, 0, 196611, 327702, 0, 65536, 327708, 0, 131072, 327711, 0, 65536, 393231, 0, 196609, 393232, 0, 196610, 393233, 0, 196610, 393234, 0, 196610, 393235, 0, 196610, 393236, 0, 196610, 393237, 0, 196610, 393238, 0, 131075, 393244, -1610612733, 0, 393247, 0, 65536, 458780, -1610612733, 0, 458783, 0, 65536, 524316, -1610612733, 0, 524319, 0, 65536, 589830, 0, 196609, 589831, 0, 196610, 589832, 0, 196610, 589833, 0, 196610, 589834, 0, 196610, 589835, 0, 196610, 589836, 0, 3, 589848, 0, 196608, 589852, -1610612733, 0, 589855, 0, 65536, 655363, 0, 196608, 655372, 0, 65536, 655378, 0, 196609, 655379, 0, 196610, 655380, 0, 196610, 655381, 0, 196611, 655388, 0, 0, 655391, 0, 65536, 720908, 0, 131073, 720909, 0, 3, 720924, 0, 65536, 720927, 0, 65536, 786445, 0, 131073, 786446, 0, 196610, 786447, 0, 196610, 786448, 0, 196610, 786449, 0, 196610, 786450, 0, 196610, 786451, 0, 2, 786452, 0, 196610, 786453, 0, 196610, 786454, 0, 196610, 786455, 0, 196610, 786456, 0, 196610, 786457, 0, 196610, 786458, 0, 196610, 786459, 0, 196610, 786460, 0, 131075, 786463, 0, 131072, 917506, 0, 196609, 917507, 0, 196610, 917508, 0, 196610, 917509, 0, 3, 983045, 0, 65536, 1048581, 0, 65536, 1048588, 0, 1, 1048589, 0, 196611, 1048595, 0, 196609, 1048596, 0, 196610, 1048597, 0, 196611, 1114117, 0, 65536, 1114124, 0, 65536, 1179653, 0, 131073, 1179654, 0, 196610, 1179655, 0, 196610, 1179656, 0, 196610, 1179657, 0, 196610, 1179658, 0, 196610, 1179659, 0, 196610, 1179660, 0, 131075, 1245202, 0, 196609, 1245203, 0, 196610, 1245204, 0, 196610, 1245205, 0, 196610, 1245206, 0, 196610, 1245207, 0, 196610, 1245208, 0, 196610, 1245209, 0, 196610, 1245210, 0, 196610, 1245211, 0, 196610, 1245212, 0, 196610, 1245213, 0, 196610, 1245214, 0, 196610, 1245215, 0, 196611, 1376258, 0, 196609, 1376259, 0, 196610, 1376260, 0, 196610, 1376261, 0, 3, 1441797, 0, 131073, 1441798, 0, 196610, 1441799, 0, 196610, 1441800, 0, 196611, 1441803, 0, 196609, 1441804, 0, 196610, 1441805, 0, 196611, 1507349, 0, 196609, 1507350, 0, 196610, 1507351, 0, 196610, 1507352, 0, 196610, 1507353, 0, 196610, 1507354, 0, 196610, 1507355, 0, 196610, 1507356, 0, 196610, 1507357, 0, 196611, 1835008, 0, 196609, 1835009, 0, 196610, 1835010, 0, 196610, 1835011, 0, 196610, 1835012, 0, 196610, 1835013, 0, 196610, 1835014, 0, 196610, 1835015, 0, 196610, 1835016, 0, 196610, 1835017, 0, 196610, 1835018, 0, 196610, 1835019, 0, 196610, 1835020, 0, 196610, 1835021, 0, 196610, 1835022, 0, 3, 1835034, 0, 196609, 1835035, 0, 196610, 1835036, 0, 196610, 1835037, 0, 196610, 1835038, 0, 196610, 1835039, 0, 196611, 1900558, 0, 131073, 1900559, 0, 3, 1966095, 0, 131073, 1966096, 0, 196611, 2162710, 0, 196609, 2162711, 0, 196610, 2162712, 0, 196611, 2293790, 0, 196609, 2293791, 0, 196611, 2424841, 0, 196609, 2424842, 0, 196611, 2424859, 0, 196609, 2424860, 0, 196610, 2424861, 0, 196610, 2424862, 0, 196610, 2424863, 0, 196611, 2490383, 0, 196609, 2490384, 0, 196610, 2490385, 0, 196610, 2490386, 0, 196611, 2555907, 0, 196609, 2555908, 0, 196610, 2555909, 0, 196610, 2555910, 0, 196610, 2555911, 0, 196611, 2818071, 0, 196609, 2818072, 0, 196610, 2818073, 0, 196610, 2818074, 0, 196610, 2818075, 0, 196611, 2949134, 0, 196609, 2949135, 0, 196610, 2949136, 0, 196610, 2949137, 0, 196610, 2949138, 0, 196610, 2949139, 0, 196611, 3342336, 3, 0, 3342337, 3, 0, 3342338, 3, 0, 3342339, 0, 196609, 3342340, 0, 3, 3342346, 0, 196609, 3342347, 0, 196610, 3342348, 0, 196611, 3407876, 0, 65537, 3407877, 0, 3, 3473412, 0, 65537, 3473413, 0, 131074, 3473414, 0, 3, 3538948, 0, 65536, 3538950, 0, 131073, 3538951, 0, 3, 3604484, 0, 65536, 3604487, 0, 131073, 3604488, 0, 196610, 3604489, 0, 196610, 3604490, 0, 196610, 3604491, 0, 196610, 3604492, 0, 196611, 3604496, 0, 1, 3604497, 0, 196610, 3604498, 0, 196610, 3604499, 0, 196610, 3604500, 0, 196610, 3604501, 0, 196610, 3604502, 0, 196610, 3604503, 0, 196610, 3604504, 0, 196610, 3604505, 0, 196610, 3604506, 0, 196611, 3670020, 0, 65536, 3670031, 0, 1, 3670032, 0, 131075, 3735556, 0, 65536, 3735566, 0, 1, 3735567, 0, 131075, 3801092, 0, 65536, 3801097, 0, 196609, 3801098, 0, 196610, 3801099, 0, 2, 3801100, 0, 196610, 3801101, 0, 196610, 3801102, 0, 131075, 3866628, 0, 65536, 3866631, 0, 196609, 3866632, 0, 196611, 3866635, 0, 65536, 3932164, 0, 65536, 3932171, 0, 65536, 3997700, 0, 65536, 3997707, 0, 131072, 3997709, 0, 196609, 3997710, 0, 196610, 3997711, 0, 196610, 3997712, 0, 196610, 3997713, 0, 196610, 3997714, 0, 196610, 3997715, 0, 196611, 4063236, 0, 65536, 4128772, 0, 65536, 4128794, 0, 196609, 4128795, 0, 196610, 4128796, 0, 2, 4128797, 0, 3, 4194308, 0, 65536, 4194327, 0, 196609, 4194328, 0, 196611, 4194332, 0, 131073, 4194333, 0, 131075, 4259844, 0, 131072, 4325387, 0, 1, 4325388, 0, 2, 4325389, 0, 3, 4325394, 0, 1, 4325395, 0, 2, 4325396, 0, 2, 4325397, 0, 196610, 4325398, 0, 196610, 4325399, 0, 196610, 4325400, 0, 196610, 4325401, 0, 3, 4390923, 0, 131073, 4390924, 0, 131074, 4390925, 0, 131074, 4390926, 0, 196610, 4390927, 0, 196610, 4390928, 0, 196610, 4390929, 0, 196610, 4390930, 0, 131074, 4390931, 0, 131074, 4390932, 0, 131075, 4390937, 0, 131073, 4390938, 0, 196610, 4390939, 0, 196610, 4390940, 0, 196610, 4390941, 0, 196611, 4390942, 3, 0, 4390943, 3, 0, 4456455, 0, 1, 4456456, 0, 3, 4521990, 0, 1, 4521991, 0, 65538, 4521992, 0, 65539, 4522015, 0, 0, 4587520, 0, 1, 4587521, 0, 2, 4587522, 0, 2, 4587523, 0, 2, 4587524, 0, 2, 4587525, 0, 2, 4587526, 0, 65538, 4587527, 0, 65538, 4587528, 0, 65538, 4587529, 0, 2, 4587530, 0, 2, 4587531, 0, 2, 4587532, 0, 2, 4587533, 0, 2, 4587534, 0, 2, 4587535, 0, 2, 4587536, 0, 2, 4587537, 0, 2, 4587538, 0, 2, 4587539, 0, 2, 4587540, 0, 2, 4587541, 0, 2, 4587542, 0, 2, 4587543, 0, 2, 4587544, 0, 2, 4587545, 0, 2, 4587546, 0, 2, 4587547, 0, 2, 4587548, 0, 2, 4587549, 0, 2, 4587550, 0, 2, 4587551, 0, 65539, 4653056, 0, 131073, 4653057, 0, 131074, 4653058, 0, 131074, 4653059, 0, 131074, 4653060, 0, 131074, 4653061, 0, 131074, 4653062, 0, 131074, 4653063, 0, 131074, 4653064, 0, 131074, 4653065, 0, 131074, 4653066, 0, 131074, 4653067, 0, 131074, 4653068, 0, 131074, 4653069, 0, 131074, 4653070, 0, 131074, 4653071, 0, 131074, 4653072, 0, 131074, 4653073, 0, 131074, 4653074, 0, 131074, 4653075, 0, 131074, 4653076, 0, 131074, 4653077, 0, 131074, 4653078, 0, 131074, 4653079, 0, 131074, 4653080, 0, 131074, 4653081, 0, 131074, 4653082, 0, 131074, 4653083, 0, 131074, 4653084, 0, 131074, 4653085, 0, 131074, 4653086, 0, 131074, 4653087, 0, 131075 ) +tile_data = PoolIntArray( 262166, 0, 1, 262167, 0, 196610, 262168, 0, 196610, 262169, 0, 196610, 262170, 0, 196610, 262171, 0, 196610, 262172, 0, 3, 262175, 0, 0, 327680, 0, 196609, 327681, 0, 196610, 327682, 0, 196610, 327683, 0, 196610, 327684, 0, 196610, 327685, 0, 196610, 327686, 0, 196611, 327702, 0, 65536, 327708, 0, 131072, 327711, 0, 65536, 393231, 0, 196609, 393232, 0, 196610, 393233, 0, 196610, 393234, 0, 196610, 393235, 0, 196610, 393236, 0, 196610, 393237, 0, 196610, 393238, 0, 131075, 393244, -1610612733, 0, 393247, 0, 65536, 458780, -1610612733, 0, 458783, 0, 65536, 524316, -1610612733, 0, 524319, 0, 65536, 589830, 0, 196609, 589831, 0, 196610, 589832, 0, 196610, 589833, 0, 196610, 589834, 0, 196610, 589835, 0, 196610, 589836, 0, 3, 589848, 0, 196608, 589852, -1610612733, 0, 589855, 0, 65536, 655363, 0, 196608, 655372, 0, 65536, 655378, 0, 196609, 655379, 0, 196610, 655380, 0, 196610, 655381, 0, 196611, 655388, 0, 0, 655391, 0, 65536, 720908, 0, 131073, 720909, 0, 3, 720924, 0, 65536, 720927, 0, 65536, 786445, 0, 131073, 786446, 0, 196610, 786447, 0, 196610, 786448, 0, 196610, 786449, 0, 196610, 786450, 0, 196610, 786451, 0, 2, 786452, 0, 196610, 786453, 0, 196610, 786454, 0, 196610, 786455, 0, 196610, 786456, 0, 196610, 786457, 0, 196610, 786458, 0, 196610, 786459, 0, 196610, 786460, 0, 131075, 786463, 0, 131072, 917506, 0, 196609, 917507, 0, 196610, 917508, 0, 196610, 917509, 0, 3, 983045, 0, 65536, 1048581, 0, 65536, 1048588, 0, 1, 1048589, 0, 196611, 1048595, 0, 196609, 1048596, 0, 196610, 1048597, 0, 196611, 1114117, 0, 65536, 1114124, 0, 65536, 1179653, 0, 131073, 1179654, 0, 196610, 1179655, 0, 196610, 1179656, 0, 196610, 1179657, 0, 196610, 1179658, 0, 196610, 1179659, 0, 196610, 1179660, 0, 131075, 1245202, 0, 196609, 1245203, 0, 196610, 1245204, 0, 196610, 1245205, 0, 196610, 1245206, 0, 196610, 1245207, 0, 196610, 1245208, 0, 196610, 1245209, 0, 196610, 1245210, 0, 196610, 1245211, 0, 196610, 1245212, 0, 196610, 1245213, 0, 196610, 1245214, 0, 196610, 1245215, 0, 196611, 1376259, 0, 196609, 1376260, 0, 196610, 1376261, 0, 3, 1441797, 0, 131073, 1441798, 0, 196610, 1441799, 0, 196610, 1441800, 0, 196611, 1441803, 0, 196609, 1441804, 0, 196610, 1441805, 0, 196610, 1441806, 0, 196610, 1441807, 0, 196610, 1441808, 0, 196610, 1441809, 0, 196611, 1507349, 0, 196609, 1507350, 0, 196610, 1507351, 0, 196610, 1507352, 0, 196610, 1507353, 0, 196610, 1507354, 0, 196610, 1507355, 0, 196610, 1507356, 0, 196610, 1507357, 0, 196611, 1835008, 0, 196609, 1835009, 0, 196610, 1835010, 0, 196610, 1835011, 0, 196610, 1835012, 0, 196610, 1835013, 0, 196610, 1835014, 0, 196610, 1835015, 0, 196610, 1835016, 0, 196610, 1835017, 0, 196610, 1835018, 0, 196610, 1835019, 0, 196610, 1835020, 0, 196610, 1835021, 0, 196610, 1835022, 0, 3, 1835034, 0, 196609, 1835035, 0, 196610, 1835036, 0, 196610, 1835037, 0, 196610, 1835038, 0, 196610, 1835039, 0, 196611, 1900558, 0, 131073, 1900559, 0, 3, 1966095, 0, 131073, 1966096, 0, 196611, 2031636, 0, 196608, 2162701, 0, 196609, 2162702, 0, 196610, 2162703, 0, 196610, 2162704, 0, 196610, 2162705, 0, 196610, 2162706, 0, 196611, 2162710, 0, 196609, 2162711, 0, 196610, 2162712, 0, 196611, 2424841, 0, 196609, 2424842, 0, 196611, 2424857, 0, 0, 2424860, 0, 196609, 2424861, 0, 196610, 2424862, 0, 196610, 2424863, 0, 3, 2490383, 0, 196609, 2490384, 0, 196610, 2490385, 0, 196610, 2490386, 0, 196611, 2490393, 0, 65536, 2490399, 0, 131072, 2555907, 0, 196609, 2555908, 0, 196610, 2555909, 0, 196610, 2555910, 0, 196610, 2555911, 0, 196611, 2555929, 0, 65536, 2621465, 0, 65536, 2621469, 0, 196609, 2621470, 0, 196610, 2621471, 0, 3, 2687001, 0, 65536, 2687007, 0, 65536, 2752537, 0, 65536, 2752543, 0, 65536, 2818071, 0, 196609, 2818072, 0, 196610, 2818073, 0, 65538, 2818074, 0, 196610, 2818075, 0, 196610, 2818076, 0, 196611, 2818079, 0, 65536, 2883609, 0, 65536, 2883614, 0, 196609, 2883615, 0, 65539, 2949134, 0, 196609, 2949135, 0, 196610, 2949136, 0, 196610, 2949137, 0, 196610, 2949138, 0, 196610, 2949139, 0, 196611, 2949145, 0, 65536, 2949150, 2, 3, 2949151, 0, 65536, 3014681, 0, 131073, 3014682, 0, 196610, 3014683, 0, 196610, 3014684, 0, 196610, 3014685, 0, 196610, 3014686, 0, 196610, 3014687, 0, 131075, 3342336, 3, 0, 3342337, 3, 0, 3342338, 3, 0, 3342339, 0, 196609, 3342340, 0, 3, 3342346, 0, 196609, 3342347, 0, 196610, 3342348, 0, 196611, 3407876, 0, 65537, 3407877, 0, 3, 3473412, 0, 65537, 3473413, 0, 131074, 3473414, 0, 3, 3538948, 0, 65536, 3538950, 0, 131073, 3538951, 0, 3, 3604484, 0, 65536, 3604487, 0, 131073, 3604488, 0, 196610, 3604489, 0, 196610, 3604490, 0, 196610, 3604491, 0, 196610, 3604492, 0, 196611, 3604496, 0, 1, 3604497, 0, 196610, 3604498, 0, 196610, 3604499, 0, 196610, 3604500, 0, 196610, 3604501, 0, 196610, 3604502, 0, 196610, 3604503, 0, 3, 3670020, 0, 65536, 3670031, 0, 1, 3670032, 0, 131075, 3670039, 0, 131073, 3670040, 0, 196610, 3670041, 0, 196610, 3670042, 0, 196611, 3735556, 0, 65536, 3735566, 0, 1, 3735567, 0, 131075, 3801092, 0, 65536, 3801097, 0, 196609, 3801098, 0, 196610, 3801099, 0, 2, 3801100, 0, 196610, 3801101, 0, 196610, 3801102, 0, 131075, 3866628, 0, 65536, 3866631, 0, 196609, 3866632, 0, 196611, 3866635, 0, 65536, 3932164, 0, 65536, 3932171, 0, 65536, 3997700, 0, 65536, 3997707, 0, 131072, 3997709, 0, 196609, 3997710, 0, 196610, 3997711, 0, 196610, 3997712, 0, 196610, 3997713, 0, 196610, 3997714, 0, 196610, 3997715, 0, 196610, 3997716, 0, 196610, 3997717, 0, 196611, 4063236, 0, 65536, 4128772, 0, 65536, 4128794, 0, 196609, 4128795, 0, 196610, 4128796, 0, 2, 4128797, 0, 3, 4194308, 0, 65536, 4194327, 0, 196609, 4194328, 0, 196611, 4194332, 0, 131073, 4194333, 0, 131075, 4259844, 0, 131072, 4325387, 0, 1, 4325388, 0, 2, 4325389, 0, 3, 4325394, 0, 1, 4325395, 0, 2, 4325396, 0, 2, 4325397, 0, 196610, 4325398, 0, 196610, 4325399, 0, 196610, 4325400, 0, 196610, 4325401, 0, 3, 4390923, 0, 131073, 4390924, 0, 131074, 4390925, 0, 131074, 4390926, 0, 196610, 4390927, 0, 196610, 4390928, 0, 196610, 4390929, 0, 196610, 4390930, 0, 131074, 4390931, 0, 131074, 4390932, 0, 131075, 4390937, 0, 131073, 4390938, 0, 196610, 4390939, 0, 196610, 4390940, 0, 196610, 4390941, 0, 196611, 4390942, 3, 0, 4390943, 3, 0, 4456455, 0, 1, 4456456, 0, 3, 4521990, 0, 1, 4521991, 0, 65538, 4521992, 0, 65539, 4522015, 0, 0, 4587520, 0, 1, 4587521, 0, 2, 4587522, 0, 2, 4587523, 0, 2, 4587524, 0, 2, 4587525, 0, 2, 4587526, 0, 65538, 4587527, 0, 65538, 4587528, 0, 65538, 4587529, 0, 2, 4587530, 0, 2, 4587531, 0, 2, 4587532, 0, 2, 4587533, 0, 2, 4587534, 0, 2, 4587535, 0, 2, 4587536, 0, 2, 4587537, 0, 2, 4587538, 0, 2, 4587539, 0, 2, 4587540, 0, 2, 4587541, 0, 2, 4587542, 0, 2, 4587543, 0, 2, 4587544, 0, 2, 4587545, 0, 2, 4587546, 0, 2, 4587547, 0, 2, 4587548, 0, 2, 4587549, 0, 2, 4587550, 0, 2, 4587551, 0, 65539, 4653056, 0, 131073, 4653057, 0, 131074, 4653058, 0, 131074, 4653059, 0, 131074, 4653060, 0, 131074, 4653061, 0, 131074, 4653062, 0, 131074, 4653063, 0, 131074, 4653064, 0, 131074, 4653065, 0, 131074, 4653066, 0, 131074, 4653067, 0, 131074, 4653068, 0, 131074, 4653069, 0, 131074, 4653070, 0, 131074, 4653071, 0, 131074, 4653072, 0, 131074, 4653073, 0, 131074, 4653074, 0, 131074, 4653075, 0, 131074, 4653076, 0, 131074, 4653077, 0, 131074, 4653078, 0, 131074, 4653079, 0, 131074, 4653080, 0, 131074, 4653081, 0, 131074, 4653082, 0, 131074, 4653083, 0, 131074, 4653084, 0, 131074, 4653085, 0, 131074, 4653086, 0, 131074, 4653087, 0, 131075 ) [node name="Ladders" type="TileMap" parent="Tilemaps"] z_index = 10 tile_set = ExtResource( 6 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 655360, 0, 131074, 720896, 0, 131074, 786432, 0, 131074, 851968, 0, 131074, 917504, 0, 131074, 983040, 0, 131074, 1048576, 0, 131074, 1114112, 0, 131074, 1179648, 0, 131074, 1245184, 0, 131074, 1310720, 0, 131074, 1376256, 0, 131074, 1441792, 0, 131074, 1441823, 0, 131074, 1507328, 0, 131074, 1507359, 0, 131074, 1572864, 0, 131074, 1572895, 0, 131074, 1638400, 0, 131074, 1638431, 0, 131074, 1703936, 0, 131074, 1703967, 0, 131074, 1769472, 0, 131074, 1769503, 0, 131074, 2555904, 0, 131074, 2621440, 0, 131074, 2686976, 0, 131074, 2752512, 0, 131074, 2818048, 0, 131074, 2883595, 0, 131074, 2949131, 0, 131074, 3014667, 0, 131074, 3080203, 0, 131074, 3145739, 0, 131074, 3211275, 0, 131074, 3276811, 0, 131074, 3276829, 0, 131074, 3342365, 0, 131074, 3407901, 0, 131074, 3473437, 0, 131074, 3538945, 0, 131074, 3538973, 0, 131074, 3604481, 0, 131074, 3604509, 0, 131074, 3670017, 0, 131074, 3670045, 0, 131074, 3735553, 0, 131074, 3735581, 0, 131074, 3801089, 0, 131074, 3801117, 0, 131074, 3866625, 0, 131074, 3866653, 0, 131074, 3932161, 0, 131074, 3932189, 0, 131074, 3997697, 0, 131074, 3997701, 0, 131074, 3997725, 0, 131074, 4063233, 0, 131074, 4063237, 0, 131074, 4063261, 0, 131074, 4128769, 0, 131074, 4128773, 0, 131074, 4194305, 0, 131074, 4194309, 0, 131074, 4259841, 0, 131074, 4259845, 0, 131074, 4325377, 0, 131074, 4325381, 0, 131074, 4390913, 0, 131074, 4456449, 0, 131074 ) +tile_data = PoolIntArray( 327692, 0, 131074, 393228, 0, 131074, 655360, 0, 131074, 720896, 0, 131074, 786432, 0, 131074, 851968, 0, 131074, 917504, 0, 131074, 983040, 0, 131074, 1048576, 0, 131074, 1114112, 0, 131074, 1179648, 0, 131074, 1245184, 0, 131074, 1310720, 0, 131074, 1376256, 0, 131074, 1441792, 0, 131074, 1441823, 0, 131074, 1507328, 0, 131074, 1507359, 0, 131074, 1572864, 0, 131074, 1572895, 0, 131074, 1638400, 0, 131074, 1638431, 0, 131074, 1703936, 0, 131074, 1703967, 0, 131074, 1769472, 0, 131074, 1769503, 0, 131074, 2097163, 0, 131074, 2162699, 0, 131074, 2228235, 0, 131074, 2555904, 0, 131074, 2555917, 0, 131074, 2621440, 0, 131074, 2621453, 0, 131074, 2686976, 0, 131074, 2686989, 0, 131074, 2752512, 0, 131074, 2818048, 0, 131074, 2883595, 0, 131074, 2949131, 0, 131074, 3014667, 0, 131074, 3080203, 0, 131074, 3145739, 0, 131074, 3211275, 0, 131074, 3276811, 0, 131074, 3342365, 0, 131074, 3407901, 0, 131074, 3473437, 0, 131074, 3538945, 0, 131074, 3538973, 0, 131074, 3604481, 0, 131074, 3604509, 0, 131074, 3670017, 0, 131074, 3670045, 0, 131074, 3735553, 0, 131074, 3735581, 0, 131074, 3801089, 0, 131074, 3801117, 0, 131074, 3866625, 0, 131074, 3866653, 0, 131074, 3932161, 0, 131074, 3932189, 0, 131074, 3997697, 0, 131074, 3997701, 0, 131074, 3997725, 0, 131074, 4063233, 0, 131074, 4063237, 0, 131074, 4063261, 0, 131074, 4128769, 0, 131074, 4128773, 0, 131074, 4194305, 0, 131074, 4194309, 0, 131074, 4259841, 0, 131074, 4259845, 0, 131074, 4325377, 0, 131074, 4325381, 0, 131074, 4390913, 0, 131074, 4456449, 0, 131074 ) [node name="Death" type="TileMap" parent="Tilemaps" groups=["death"]] tile_set = ExtResource( 15 ) cell_size = Vector2( 8, 8 ) collision_layer = 32 format = 1 -tile_data = PoolIntArray( 720912, 1, 0, 720913, 1, 0, 720914, 1, 0, 720915, 1, 0, 720916, 1, 0, 720917, 1, 0, 720918, 1, 0, 720919, 1, 0, 720920, 1, 0, 720921, 1, 0, 720922, 1, 0, 720923, 1, 0, 786452, 1, 0, 1114121, 1, 0, 1179666, 1, 0, 1179667, 1, 0, 1179668, 1, 0, 1179669, 1, 0, 1179670, 1, 0, 1179671, 1, 0, 1179672, 1, 0, 1179673, 1, 0, 1179674, 1, 0, 1179675, 1, 0, 1179676, 1, 0, 1179677, 1, 0, 1179678, 1, 0, 1179679, 1, 0, 1769478, 1, 0, 1769485, 1, 0, 1769500, 1, 0, 3342345, -1073741823, 0, 3342349, -536870911, 0, 3538960, 1, 0, 3538963, 1, 0, 3538967, 1, 0, 3538970, 1, 0, 3670030, -1073741823, 0, 3932178, 1, 0, 4259860, 1, 0, 4325390, 1, 0, 4325391, 1, 0, 4325392, 1, 0, 4325393, 1, 0 ) - -[node name="Ladders" type="Node2D" parent="."] - -[node name="Ladder" parent="Ladders" instance=ExtResource( 9 )] -position = Vector2( 0, 80 ) -scale = Vector2( 1, 18 ) +tile_data = PoolIntArray( 327695, 1, 0, 327696, 1, 0, 327697, 1, 0, 327698, 1, 0, 327699, 1, 0, 327700, 1, 0, 327701, 1, 0, 720912, 1, 0, 720913, 1, 0, 720914, 1, 0, 720915, 1, 0, 720916, 1, 0, 720917, 1, 0, 720918, 1, 0, 720919, 1, 0, 720920, 1, 0, 720921, 1, 0, 720922, 1, 0, 720923, 1, 0, 786452, 1, 0, 1114121, 1, 0, 1179666, 1, 0, 1179667, 1, 0, 1179668, 1, 0, 1179669, 1, 0, 1179670, 1, 0, 1179671, 1, 0, 1179672, 1, 0, 1179673, 1, 0, 1179674, 1, 0, 1179675, 1, 0, 1179676, 1, 0, 1179677, 1, 0, 1179678, 1, 0, 1179679, 1, 0, 1769478, 1, 0, 1769485, 1, 0, 1769500, 1, 0, 3342345, -1073741823, 0, 3342349, -536870911, 0, 3538960, 1, 0, 3538963, 1, 0, 3538967, 1, 0, 3670030, -1073741823, 0, 3932178, 1, 0, 4259860, 1, 0, 4325390, 1, 0, 4325391, 1, 0, 4325392, 1, 0, 4325393, 1, 0 ) [node name="Environment" type="Node2D" parent="."] [node name="TurningPlatform" parent="Environment" instance=ExtResource( 20 )] -position = Vector2( 168, 40 ) +position = Vector2( 168, 32 ) [node name="MovingPlatform" parent="Environment" instance=ExtResource( 19 )] position = Vector2( 212, 104 ) @@ -196,30 +207,6 @@ scale = Vector2( 2, 1 ) speed = 40 left_up_boundary = 8.0 -[node name="Ladder" parent="Environment" instance=ExtResource( 9 )] -position = Vector2( 232, 400 ) -scale = Vector2( 1, 13 ) - -[node name="Ladder6" parent="Environment" instance=ExtResource( 9 )] -position = Vector2( 248, 176 ) -scale = Vector2( 1, 6 ) - -[node name="Ladder3" parent="Environment" instance=ExtResource( 9 )] -position = Vector2( 88, 352 ) -scale = Vector2( 1, 7 ) - -[node name="Ladder5" parent="Environment" instance=ExtResource( 9 )] -position = Vector2( 0, 312 ) -scale = Vector2( 1, 5 ) - -[node name="Ladder4" parent="Environment" instance=ExtResource( 9 )] -position = Vector2( 40, 488 ) -scale = Vector2( 1, 6 ) - -[node name="Ladder2" parent="Environment" instance=ExtResource( 9 )] -position = Vector2( 8, 432 ) -scale = Vector2( 1, 15 ) - [node name="FallingBlocks" type="Node2D" parent="Environment"] [node name="FallingBlock" parent="Environment/FallingBlocks" instance=ExtResource( 13 )] @@ -252,8 +239,47 @@ position = Vector2( 152, 312 ) [node name="FallingBlock10" parent="Environment/FallingBlocks" instance=ExtResource( 13 )] position = Vector2( 184, 304 ) -[node name="FallingBlock11" parent="Environment/FallingBlocks" instance=ExtResource( 13 )] -position = Vector2( 216, 272 ) +[node name="Ladders" type="Node2D" parent="Environment"] + +[node name="Ladder" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 0, 80 ) +scale = Vector2( 1, 18 ) + +[node name="Ladder2" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 232, 408 ) +scale = Vector2( 1, 12 ) + +[node name="Ladder6" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 248, 176 ) +scale = Vector2( 1, 6 ) + +[node name="Ladder3" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 88, 352 ) +scale = Vector2( 1, 7 ) + +[node name="Ladder5" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 0, 312 ) +scale = Vector2( 1, 5 ) + +[node name="Ladder9" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 88, 256 ) +scale = Vector2( 1, 3 ) + +[node name="Ladder10" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 104, 312 ) +scale = Vector2( 1, 3 ) + +[node name="Ladder8" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 96, 40 ) +scale = Vector2( 1, 2 ) + +[node name="Ladder4" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 40, 488 ) +scale = Vector2( 1, 6 ) + +[node name="Ladder7" parent="Environment/Ladders" instance=ExtResource( 9 )] +position = Vector2( 8, 432 ) +scale = Vector2( 1, 15 ) [node name="Enemies" type="Node2D" parent="."] @@ -292,7 +318,7 @@ position = Vector2( 120, 72 ) curve = SubResource( 15 ) [node name="Eel2" parent="Enemies/Eels" instance=ExtResource( 18 )] -position = Vector2( 48, 472 ) +position = Vector2( 48, 1472 ) curve = SubResource( 14 ) [node name="Eel5" parent="Enemies/Eels" instance=ExtResource( 18 )] @@ -307,6 +333,10 @@ speed = 45.0 position = Vector2( 136, 184 ) curve = SubResource( 17 ) +[node name="Eel8" parent="Enemies/Eels" instance=ExtResource( 18 )] +position = Vector2( 192, 296 ) +curve = SubResource( 18 ) + [node name="Fishes" type="Node2D" parent="Enemies"] [node name="Fish" parent="Enemies/Fishes" instance=ExtResource( 12 )] @@ -348,10 +378,9 @@ right_down_boundary = 3.0 speed = 60 [node name="Fish9" parent="Enemies/Fishes" instance=ExtResource( 12 )] -position = Vector2( 160, 248 ) +position = Vector2( 160, 240 ) left_up_boundary = 3.0 -right_down_boundary = 2.0 -speed = 60 +right_down_boundary = 5.0 [node name="Fish3" parent="Enemies/Fishes" instance=ExtResource( 12 )] position = Vector2( 96, 216 ) @@ -361,8 +390,8 @@ right_down_boundary = 3.0 [node name="Turtle" type="Node2D" parent="Enemies"] [node name="Turtle" parent="Enemies/Turtle" instance=ExtResource( 16 )] -position = Vector2( 56, 40 ) -right_down_boundary = 9.0 +position = Vector2( 56, 32 ) +right_down_boundary = 13.0 speed = 50 spike_delay = 3.0 @@ -370,6 +399,7 @@ spike_delay = 3.0 position = Vector2( 48, 280 ) left_up_boundary = 6.0 speed = 30 +spike_delay = 2.5 [node name="Turtle5" parent="Enemies/Turtle" instance=ExtResource( 16 )] position = Vector2( 176, 224 ) @@ -381,7 +411,7 @@ node_to_flip = NodePath("") spike_delay = 3.0 [node name="Turtle4" parent="Enemies/Turtle" instance=ExtResource( 16 )] -position = Vector2( 128, 408 ) +position = Vector2( 128, 416 ) left_up_boundary = 2.0 right_down_boundary = 11.0 speed = 30 @@ -389,17 +419,19 @@ speed = 30 [node name="Turtle3" parent="Enemies/Turtle" instance=ExtResource( 16 )] position = Vector2( 192, 472 ) left_up_boundary = 5.0 +right_down_boundary = 3.0 +speed = 30 spike_delay = 0.5 [node name="Collectibles" type="Node2D" parent="."] [node name="Star" parent="Collectibles" instance=ExtResource( 17 )] position = Vector2( 88, 136 ) -color = 2 +color = 3 [node name="Star2" parent="Collectibles" instance=ExtResource( 17 )] position = Vector2( 208, 56 ) -color = 3 +color = 4 [node name="Key" parent="Collectibles" instance=ExtResource( 21 )] position = Vector2( 32, 32 ) @@ -411,7 +443,7 @@ position = Vector2( 48, 32 ) position = Vector2( 40, 104 ) [node name="Key18" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 120, 152 ) +position = Vector2( 24, 160 ) [node name="Key15" parent="Collectibles" instance=ExtResource( 21 )] position = Vector2( 128, 232 ) @@ -432,22 +464,22 @@ position = Vector2( 192, 24 ) position = Vector2( 224, 24 ) [node name="Key12" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 232, 56 ) - -[node name="Key13" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 232, 88 ) - -[node name="Key14" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 96, 168 ) - -[node name="Key9" parent="Collectibles" instance=ExtResource( 21 )] position = Vector2( 104, 80 ) +[node name="Key13" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 24, 72 ) + +[node name="Key14" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 112, 168 ) + +[node name="Key9" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 88, 168 ) + [node name="Key10" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 112, 88 ) +position = Vector2( 136, 168 ) [node name="Key11" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 120, 96 ) +position = Vector2( 56, 168 ) [node name="Key6" parent="Collectibles" instance=ExtResource( 21 )] position = Vector2( 56, 64 ) @@ -457,9 +489,11 @@ position = Vector2( 16, 104 ) [node name="Shard" parent="Collectibles" instance=ExtResource( 22 )] position = Vector2( 160, 120 ) +value = 3 [node name="Shard4" parent="Collectibles" instance=ExtResource( 22 )] -position = Vector2( 176, 176 ) +position = Vector2( 208, 360 ) +value = 2 [node name="Star4" parent="Collectibles" instance=ExtResource( 17 )] position = Vector2( 8, 424 ) @@ -469,6 +503,7 @@ position = Vector2( 104, 480 ) [node name="Shard3" parent="Collectibles" instance=ExtResource( 22 )] position = Vector2( 232, 552 ) +value = 0 [node name="Star5" parent="Collectibles" instance=ExtResource( 17 )] position = Vector2( 0, 256 ) @@ -509,7 +544,7 @@ position = Vector2( 72, 456 ) position = Vector2( 104, 456 ) [node name="Key29" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 96, 432 ) +position = Vector2( 200, 288 ) [node name="Key36" parent="Collectibles" instance=ExtResource( 21 )] position = Vector2( 112, 352 ) @@ -521,7 +556,7 @@ position = Vector2( 152, 352 ) position = Vector2( 184, 336 ) [node name="Key39" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 216, 336 ) +position = Vector2( 208, 496 ) [node name="Key40" parent="Collectibles" instance=ExtResource( 21 )] position = Vector2( 144, 296 ) @@ -530,13 +565,13 @@ position = Vector2( 144, 296 ) position = Vector2( 120, 296 ) [node name="Key44" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 216, 256 ) +position = Vector2( 144, 256 ) [node name="Key45" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 128, 264 ) +position = Vector2( 104, 256 ) [node name="Key46" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 216, 288 ) +position = Vector2( 224, 288 ) [node name="Key47" parent="Collectibles" instance=ExtResource( 21 )] position = Vector2( 208, 216 ) @@ -569,15 +604,22 @@ position = Vector2( 136, 432 ) position = Vector2( 160, 432 ) [node name="Key35" parent="Collectibles" instance=ExtResource( 21 )] -position = Vector2( 192, 432 ) +position = Vector2( 200, 440 ) [node name="Key32" parent="Collectibles" instance=ExtResource( 21 )] position = Vector2( 32, 400 ) +[node name="Star6" parent="Collectibles" instance=ExtResource( 17 )] +position = Vector2( 168, 176 ) +color = 2 + +[node name="Arrow" parent="Collectibles" instance=ExtResource( 23 )] +position = Vector2( 240, 312 ) + [node name="Bubbles" type="Node2D" parent="."] [node name="BubbleSpawner" parent="Bubbles" instance=ExtResource( 24 )] -position = Vector2( 8, 32 ) +position = Vector2( 200, 24 ) [node name="BubbleSpawner2" parent="Bubbles" instance=ExtResource( 24 )] position = Vector2( 64, 64 ) @@ -602,7 +644,10 @@ position = Vector2( 80, 432 ) position = Vector2( 72, 288 ) [node name="BubbleSpawner14" parent="Bubbles" instance=ExtResource( 24 )] -position = Vector2( 192, 336 ) +position = Vector2( 128, 352 ) + +[node name="BubbleSpawner15" parent="Bubbles" instance=ExtResource( 24 )] +position = Vector2( 240, 288 ) [node name="BubbleSpawner12" parent="Bubbles" instance=ExtResource( 24 )] position = Vector2( 24, 400 ) @@ -614,9 +659,70 @@ position = Vector2( 164, 432 ) position = Vector2( 208, 528 ) [node name="BubbleSpawner6" parent="Bubbles" instance=ExtResource( 24 )] -position = Vector2( 120, 152 ) +position = Vector2( 136, 40 ) [node name="BubbleSpawner7" parent="Bubbles" instance=ExtResource( 24 )] -position = Vector2( 96, 216 ) +position = Vector2( 64, 216 ) + +[node name="Respawns" type="Node2D" parent="."] + +[node name="RespawnPoint" parent="Respawns" instance=ExtResource( 25 )] +position = Vector2( 88, 392 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint"] +position = Vector2( -44, 4 ) +shape = SubResource( 19 ) + +[node name="RespawnPoint2" parent="Respawns" instance=ExtResource( 25 )] +position = Vector2( 88, 368 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint2"] +position = Vector2( -44, 4 ) +shape = SubResource( 19 ) + +[node name="RespawnPoint3" parent="Respawns" instance=ExtResource( 25 )] +position = Vector2( 96, 392 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint3"] +position = Vector2( 80, 4 ) +shape = SubResource( 20 ) + +[node name="RespawnPoint4" parent="Respawns" instance=ExtResource( 25 )] +position = Vector2( 96, 368 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint4"] +position = Vector2( 80, 4 ) +shape = SubResource( 20 ) + +[node name="RespawnPoint5" parent="Respawns" instance=ExtResource( 25 )] +position = Vector2( 248, 200 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint5"] +position = Vector2( -36, 4 ) +shape = SubResource( 21 ) + +[node name="RespawnPoint6" parent="Respawns" instance=ExtResource( 25 )] +position = Vector2( 248, 176 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint6"] +position = Vector2( -36, 4 ) +shape = SubResource( 21 ) + +[node name="RespawnPoint7" parent="Respawns" instance=ExtResource( 25 )] +position = Vector2( 8, 200 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint7"] +position = Vector2( 36, 4 ) +shape = SubResource( 21 ) + +[node name="RespawnPoint8" parent="Respawns" instance=ExtResource( 25 )] +position = Vector2( 0, 168 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint8"] +position = Vector2( 36, 4 ) +shape = SubResource( 21 ) + +[node name="Exit" parent="." instance=ExtResource( 26 )] +position = Vector2( 16, 28 ) [editable path="Enemies/Eels/Eel3"] diff --git a/objects/player/player.gd b/objects/player/player.gd index 4047cf1..1e91257 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -105,9 +105,12 @@ func _physics_process(delta: float) -> void: if underwater: if oxygen_timer.time_left < 5: low_oxygen_label.text = str(floor(oxygen_timer.time_left) + 1) + set_underwater_audio(true) else: low_oxygen_label.text = "" + set_underwater_audio(false) else: + #NOT UNDERWATER low_oxygen_label.text = "" #Cheats @@ -130,6 +133,10 @@ func spawn_arrow() -> void: func die() -> void: state_chart.send_event("hurt") +func set_underwater_audio(value): + var idx = AudioServer.get_bus_index("Master") + AudioServer.set_bus_effect_enabled(idx,0,value) + AudioServer.set_bus_effect_enabled(idx,1,value) # STATE ENTERS/EXITS # func _on_Grounded_state_entered() -> void: @@ -402,4 +409,8 @@ func _on_Ducking_event_received(event): func _on_OxygenTimer_timeout(): if underwater: die() +#Reset low oxygen effect when leaving level +func _on_Player_tree_exited(): + set_underwater_audio(false) + diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 35fcb29..ca537f9 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1401,12 +1401,13 @@ margin_bottom = -18.0 theme = ExtResource( 7 ) align = 1 +[connection signal="tree_exited" from="." to="." method="_on_Player_tree_exited"] [connection signal="body_entered" from="Hitbox" to="." method="_on_Hitbox_body_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"]