From e3c9328fd7eb6125725c558fc39deef0ab970519 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Thu, 22 Jun 2023 21:21:39 -0400 Subject: [PATCH] yet again adjusted oxygen time --- maps/abyss_scholar.tscn | 200 ++++++++++++++++++++++++++----------- maps/test_room.tscn | 11 +- objects/player/player.tscn | 2 +- 3 files changed, 150 insertions(+), 63 deletions(-) diff --git a/maps/abyss_scholar.tscn b/maps/abyss_scholar.tscn index 951fe4e..a059718 100644 --- a/maps/abyss_scholar.tscn +++ b/maps/abyss_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=32 format=2] +[gd_scene load_steps=30 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] @@ -43,17 +43,7 @@ extents = Vector2( 128, 4 ) [sub_resource type="Curve2D" id=13] _data = { -"points": PoolVector2Array( 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 32, 8, 0, 0, 0, 0, 32, 16, 0, 0, 0, 0, 24, 24, 0, 0, 0, 0, 16, 24, 0, 0, 0, 0, 8, 24, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, -8, 24, 0, 0, 0, 0, -16, 16, 0, 0, 0, 0, -16, 8, 0, 0, 0, 0, -8, 0, 0, 0, 0, 0, 8, 0 ) -} - -[sub_resource type="Curve2D" id=14] -_data = { -"points": PoolVector2Array( 0, 0, 0, 0, 8, -24, 0, 0, 0, 0, 8, -32, 0, 0, 0, 0, 8, -40, 0, 0, 0, 0, 16, -40, 0, 0, 0, 0, 64, -40, 0, 0, 0, 0, 72, -40, 0, 0, 0, 0, 72, -16, 0, 0, 0, 0, 72, -8, 0, 0, 0, 0, 8, -8, 0, 0, 0, 0, 8, -24 ) -} - -[sub_resource type="Curve2D" id=15] -_data = { -"points": PoolVector2Array( 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 8, 64, 0, 0, 0, 0, 64, 64, 0, 0, 0, 0, 72, 56, 0, 0, 0, 0, 72, 8, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 8, 0 ) +"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, -24, 0, 0, 0, 0, 0, -48, 0, 0, 0, 0, 24, -72, 0, 0, 0, 0, 0, -96, 0, 0, 0, 0, 24, -72, 0, 0, 0, 0, 0, -48, 0, 0, 0, 0, 24, -24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ) } [node name="Map2" type="Node2D" groups=["map"]] @@ -148,7 +138,7 @@ z_index = -30 tile_set = ExtResource( 10 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 327680, 0, 196609, 327681, 0, 196610, 327682, 0, 196610, 327683, 0, 196610, 327684, 0, 196610, 327685, 0, 196610, 327686, 0, 196611, 327704, 0, 1, 327705, 0, 196610, 327706, 0, 196610, 327707, 0, 196610, 327708, 0, 3, 327711, 0, 0, 393240, 0, 65536, 393244, 0, 65536, 393247, 0, 65536, 458776, 0, 65536, 458780, 0, 65536, 458783, 0, 65536, 524303, 0, 196609, 524304, 0, 196610, 524305, 0, 196610, 524306, 0, 196610, 524307, 0, 196610, 524308, 0, 196610, 524309, 0, 196610, 524310, 0, 196610, 524311, 0, 196610, 524312, 0, 131075, 524316, 0, 65536, 524319, 0, 65536, 589830, 0, 196609, 589831, 0, 196610, 589832, 0, 196610, 589833, 0, 196610, 589834, 0, 196610, 589835, 0, 196610, 589836, 0, 3, 589852, 0, 65536, 589855, 0, 65536, 655363, 0, 196608, 655372, 0, 65536, 655388, 0, 65536, 655391, 0, 65536, 720908, 0, 131073, 720909, 0, 3, 720924, 0, 65536, 720927, 0, 65536, 786445, 0, 131073, 786446, 0, 3, 786456, 0, 196608, 786460, 0, 65536, 786463, 0, 65536, 851982, 0, 131073, 851983, 0, 3, 851986, 0, 196609, 851987, 0, 196610, 851988, 0, 196610, 851989, 0, 196611, 851996, 0, 65536, 851999, 0, 65536, 917506, 0, 196609, 917507, 0, 196610, 917508, 0, 196610, 917509, 0, 3, 917519, 0, 65536, 917532, 0, 65536, 917535, 0, 65536, 983045, 0, 65536, 983055, 0, 131073, 983056, 0, 196610, 983057, 0, 196610, 983058, 0, 196610, 983059, 0, 2, 983060, 0, 196610, 983061, 0, 196610, 983062, 0, 196610, 983063, 0, 196610, 983064, 0, 196610, 983065, 0, 196610, 983066, 0, 196610, 983067, 0, 196610, 983068, 0, 131075, 983071, 0, 131072, 1048581, 0, 65536, 1048588, 0, 1, 1048589, 0, 196611, 1048595, 0, 65536, 1114117, 0, 65536, 1114124, 0, 65536, 1114131, 0, 131072, 1179653, 0, 131073, 1179654, 0, 196610, 1179655, 0, 196610, 1179656, 0, 196610, 1179657, 0, 196610, 1179658, 0, 196610, 1179659, 0, 196610, 1179660, 0, 131075, 1310734, 0, 1, 1310735, 0, 196610, 1310736, 0, 196611, 1310739, 0, 196609, 1310740, 0, 196610, 1310741, 0, 196611, 1376258, 0, 196609, 1376259, 0, 196610, 1376260, 0, 196610, 1376261, 0, 3, 1376270, 0, 65536, 1441797, 0, 131073, 1441798, 0, 196610, 1441799, 0, 196610, 1441800, 0, 196611, 1441803, 0, 196609, 1441804, 0, 196610, 1441805, 0, 196610, 1441806, 0, 65539, 1507342, 0, 131073, 1507343, 0, 196610, 1507344, 0, 196610, 1507345, 0, 196610, 1507346, 0, 196610, 1507347, 0, 196610, 1507348, 0, 196610, 1507349, 0, 196610, 1507350, 0, 196610, 1507351, 0, 196610, 1507352, 0, 196610, 1507353, 0, 196610, 1507354, 0, 196610, 1507355, 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, 1835035, 0, 196609, 1835036, 0, 196610, 1835037, 0, 196610, 1835038, 0, 196610, 1835039, 0, 196611, 1900558, 0, 131073, 1900559, 0, 3, 1966095, 0, 131073, 1966096, 0, 196611, 1966100, 0, 1, 1966101, 0, 3, 2031636, 0, 65537, 2031637, 0, 65538, 2031638, 0, 3, 2097172, 0, 131073, 2097173, 0, 131074, 2097174, 0, 65538, 2097175, 0, 3, 2162710, 0, 131073, 2162711, 0, 131074, 2162712, 0, 196610, 2162713, 0, 196610, 2162714, 0, 196610, 2162715, 0, 196611, 2293767, 0, 196609, 2293768, 0, 196610, 2293769, 0, 196610, 2293770, 0, 196610, 2293771, 0, 196610, 2293772, 0, 196610, 2293773, 0, 196611, 2293790, 0, 196609, 2293791, 0, 196611, 2424859, 0, 196609, 2424860, 0, 196610, 2424861, 0, 196610, 2424862, 0, 196610, 2424863, 0, 196611, 2490386, 0, 196609, 2490387, 0, 196610, 2490388, 0, 196610, 2490389, 0, 196610, 2490390, 0, 196611, 2555907, 0, 196609, 2555908, 0, 196610, 2555909, 0, 196610, 2555910, 0, 196610, 2555911, 0, 196610, 2555912, 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, 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( 327680, 0, 196609, 327681, 0, 196610, 327682, 0, 196610, 327683, 0, 196610, 327684, 0, 196610, 327685, 0, 196610, 327686, 0, 196611, 327704, 0, 1, 327705, 0, 196610, 327706, 0, 196610, 327707, 0, 196610, 327708, 0, 3, 327711, 0, 0, 393240, 0, 65536, 393244, 0, 65536, 393247, 0, 65536, 458776, 0, 65536, 458780, 0, 65536, 458783, 0, 65536, 524303, 0, 196609, 524304, 0, 196610, 524305, 0, 196610, 524306, 0, 196610, 524307, 0, 196610, 524308, 0, 196610, 524309, 0, 196610, 524310, 0, 196610, 524311, 0, 196610, 524312, 0, 131075, 524316, 0, 65536, 524319, 0, 65536, 589830, 0, 196609, 589831, 0, 196610, 589832, 0, 196610, 589833, 0, 196610, 589834, 0, 196610, 589835, 0, 196610, 589836, 0, 3, 589852, 0, 65536, 589855, 0, 65536, 655363, 0, 196608, 655372, 0, 65536, 655388, 0, 65536, 655391, 0, 65536, 720908, 0, 131073, 720909, 0, 3, 720924, 0, 65536, 720927, 0, 65536, 786445, 0, 131073, 786446, 0, 3, 786456, 0, 196608, 786460, 0, 65536, 786463, 0, 65536, 851982, 0, 131073, 851983, 0, 3, 851986, 0, 196609, 851987, 0, 196610, 851988, 0, 196610, 851989, 0, 196611, 851996, 0, 65536, 851999, 0, 65536, 917506, 0, 196609, 917507, 0, 196610, 917508, 0, 196610, 917509, 0, 3, 917519, 0, 65536, 917532, 0, 65536, 917535, 0, 65536, 983045, 0, 65536, 983055, 0, 131073, 983056, 0, 196610, 983057, 0, 196610, 983058, 0, 196610, 983059, 0, 2, 983060, 0, 196610, 983061, 0, 196610, 983062, 0, 196610, 983063, 0, 196610, 983064, 0, 196610, 983065, 0, 196610, 983066, 0, 196610, 983067, 0, 196610, 983068, 0, 131075, 983071, 0, 131072, 1048581, 0, 65536, 1048588, 0, 1, 1048589, 0, 196611, 1048595, 0, 65536, 1114117, 0, 65536, 1114124, 0, 65536, 1114131, 0, 131072, 1179653, 0, 131073, 1179654, 0, 196610, 1179655, 0, 196610, 1179656, 0, 196610, 1179657, 0, 196610, 1179658, 0, 196610, 1179659, 0, 196610, 1179660, 0, 131075, 1310734, 0, 1, 1310735, 0, 196610, 1310736, 0, 196611, 1310739, 0, 196609, 1310740, 0, 196610, 1310741, 0, 196611, 1376258, 0, 196609, 1376259, 0, 196610, 1376260, 0, 196610, 1376261, 0, 3, 1376270, 0, 65536, 1441797, 0, 131073, 1441798, 0, 196610, 1441799, 0, 196610, 1441800, 0, 196611, 1441803, 0, 196609, 1441804, 0, 196610, 1441805, 0, 196610, 1441806, 0, 65539, 1507342, 0, 131073, 1507343, 0, 196610, 1507344, 0, 196610, 1507345, 0, 196610, 1507346, 0, 196610, 1507347, 0, 196610, 1507348, 0, 196610, 1507349, 0, 196610, 1507350, 0, 196610, 1507351, 0, 196610, 1507352, 0, 196610, 1507353, 0, 196610, 1507354, 0, 196610, 1507355, 0, 196610, 1507356, 0, 196610, 1507357, 0, 196610, 1507358, 0, 196610, 1507359, 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, 1835035, 0, 196609, 1835036, 0, 196610, 1835037, 0, 196610, 1835038, 0, 196610, 1835039, 0, 196611, 1900558, 0, 131073, 1900559, 0, 3, 1966095, 0, 131073, 1966096, 0, 196611, 1966100, 0, 1, 1966101, 0, 3, 2031636, 0, 65537, 2031637, 0, 65538, 2031638, 0, 3, 2097172, 0, 131073, 2097173, 0, 131074, 2097174, 0, 65538, 2097175, 0, 3, 2162710, 0, 131073, 2162711, 0, 131074, 2162712, 0, 196610, 2162713, 0, 196610, 2162714, 0, 196610, 2162715, 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 ) [node name="Ladders" type="TileMap" parent="Tilemaps"] z_index = 10 @@ -162,7 +152,7 @@ tile_set = ExtResource( 15 ) cell_size = Vector2( 8, 8 ) collision_layer = 32 format = 1 -tile_data = PoolIntArray( 458768, 1, 0, 458769, 1, 0, 458770, 1, 0, 458771, 1, 0, 458772, 1, 0, 458773, 1, 0, 458774, 1, 0, 458775, 1, 0, 786452, 1, 0, 917520, 1, 0, 917521, 1, 0, 917522, 1, 0, 917523, 1, 0, 917524, 1, 0, 917525, 1, 0, 917526, 1, 0, 917527, 1, 0, 917528, 1, 0, 917529, 1, 0, 1114121, 1, 0, 1441807, 1, 0, 1441808, 1, 0, 1441809, 1, 0, 1441810, 1, 0, 1441811, 1, 0, 1441812, 1, 0, 1441813, 1, 0, 1441814, 1, 0, 1441815, 1, 0, 1441816, 1, 0, 1441817, 1, 0, 1441818, 1, 0, 1441819, 1, 0, 1769478, 1, 0, 1769485, 1, 0, 2228228, 1, 0, 2228229, 1, 0, 2228230, 1, 0, 2228231, 1, 0, 2228232, 1, 0, 2228233, 1, 0, 2228234, 1, 0, 2228235, 1, 0, 2228236, 1, 0, 2228237, 1, 0, 3342345, -1073741823, 0, 3342349, -536870911, 0, 3538960, 1, 0, 3538963, 1, 0, 3538967, 1, 0, 3538970, 1, 0, 3670030, -1073741823, 0, 3932176, 1, 0, 3932178, 1, 0, 4259860, 1, 0, 4325390, 1, 0, 4325391, 1, 0, 4325392, 1, 0, 4325393, 1, 0 ) +tile_data = PoolIntArray( 458768, 1, 0, 458769, 1, 0, 458770, 1, 0, 458771, 1, 0, 458772, 1, 0, 458773, 1, 0, 458774, 1, 0, 458775, 1, 0, 786452, 1, 0, 917520, 1, 0, 917521, 1, 0, 917522, 1, 0, 917523, 1, 0, 917524, 1, 0, 917525, 1, 0, 917526, 1, 0, 917527, 1, 0, 917528, 1, 0, 917529, 1, 0, 1114121, 1, 0, 1441807, 1, 0, 1441808, 1, 0, 1441809, 1, 0, 1441810, 1, 0, 1441811, 1, 0, 1441812, 1, 0, 1441813, 1, 0, 1441814, 1, 0, 1441815, 1, 0, 1441816, 1, 0, 1441817, 1, 0, 1441818, 1, 0, 1441819, 1, 0, 1441820, 1, 0, 1441821, 1, 0, 1441822, 1, 0, 1441823, 1, 0, 1769478, 1, 0, 1769485, 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="."] @@ -230,6 +220,18 @@ position = Vector2( 32, 360 ) [node name="FallingBlock6" parent="Environment/FallingBlocks" instance=ExtResource( 13 )] position = Vector2( 40, 360 ) +[node name="FallingBlock7" parent="Environment/FallingBlocks" instance=ExtResource( 13 )] +position = Vector2( 168, 328 ) + +[node name="FallingBlock9" parent="Environment/FallingBlocks" instance=ExtResource( 13 )] +position = Vector2( 168, 352 ) + +[node name="FallingBlock8" parent="Environment/FallingBlocks" instance=ExtResource( 13 )] +position = Vector2( 152, 312 ) + +[node name="FallingBlock10" parent="Environment/FallingBlocks" instance=ExtResource( 13 )] +position = Vector2( 184, 304 ) + [node name="Enemies" type="Node2D" parent="."] [node name="Mines" type="Node2D" parent="Enemies"] @@ -251,42 +253,17 @@ left_up_boundary = 11.0 [node name="Eels" type="Node2D" parent="Enemies"] -[node name="Eel4" parent="Enemies/Eels" instance=ExtResource( 18 )] -position = Vector2( 8, 520 ) -speed = 80.0 - -[node name="Eel" parent="Enemies/Eels" instance=ExtResource( 18 )] -position = Vector2( 152, 96 ) -speed = 50.0 - -[node name="Path2D" parent="Enemies/Eels/Eel" index="0"] -curve = SubResource( 13 ) - -[node name="PathFollow2D" parent="Enemies/Eels/Eel/Path2D" index="0"] -position = Vector2( 8, 0 ) -rotation = 0.0 - -[node name="Eel2" parent="Enemies/Eels" instance=ExtResource( 18 )] -position = Vector2( 144, 256 ) -speed = 50.0 - -[node name="Path2D" parent="Enemies/Eels/Eel2" index="0"] -curve = SubResource( 14 ) - -[node name="PathFollow2D" parent="Enemies/Eels/Eel2/Path2D" index="0"] -position = Vector2( 8, -24 ) -rotation = -1.5708 - [node name="Eel3" parent="Enemies/Eels" instance=ExtResource( 18 )] position = Vector2( 40, 112 ) speed = 50.0 -[node name="Path2D" parent="Enemies/Eels/Eel3" index="0"] -curve = SubResource( 15 ) +[node name="Eel4" parent="Enemies/Eels" instance=ExtResource( 18 )] +position = Vector2( 0, 528 ) +curve = SubResource( 13 ) +speed = 60.0 -[node name="PathFollow2D" parent="Enemies/Eels/Eel3/Path2D" index="0"] -position = Vector2( 8, 0 ) -rotation = 2.35619 +[node name="Eel" parent="Enemies/Eels" instance=ExtResource( 18 )] +position = Vector2( 136, 96 ) [node name="Fishes" type="Node2D" parent="Enemies"] @@ -300,6 +277,11 @@ position = Vector2( 40, 216 ) left_up_boundary = 2.0 right_down_boundary = 3.0 +[node name="Fish7" parent="Enemies/Fishes" instance=ExtResource( 12 )] +position = Vector2( 16, 272 ) +left_up_boundary = 2.0 +right_down_boundary = 6.0 + [node name="Fish4" parent="Enemies/Fishes" instance=ExtResource( 12 )] position = Vector2( 128, 552 ) left_up_boundary = 5.0 @@ -331,14 +313,13 @@ speed = 50 spike_delay = 3.0 [node name="Turtle2" parent="Enemies/Turtle" instance=ExtResource( 16 )] -position = Vector2( 88, 264 ) -left_up_boundary = 10.0 +position = Vector2( 48, 280 ) +left_up_boundary = 6.0 speed = 30 -spike_delay = 0.5 [node name="Turtle3" parent="Enemies/Turtle" instance=ExtResource( 16 )] position = Vector2( 192, 472 ) -left_up_boundary = 3.0 +left_up_boundary = 5.0 spike_delay = 0.5 [node name="Collectibles" type="Node2D" parent="."] @@ -408,15 +389,118 @@ position = Vector2( 16, 104 ) position = Vector2( 160, 152 ) [node name="Star4" parent="Collectibles" instance=ExtResource( 17 )] -position = Vector2( 240, 552 ) - -[node name="Shard2" parent="Collectibles" instance=ExtResource( 22 )] position = Vector2( 8, 424 ) -[node name="Star5" parent="Collectibles" instance=ExtResource( 17 )] +[node name="Shard2" parent="Collectibles" instance=ExtResource( 22 )] position = Vector2( 104, 480 ) + +[node name="Shard3" parent="Collectibles" instance=ExtResource( 22 )] +position = Vector2( 232, 552 ) + +[node name="Star5" parent="Collectibles" instance=ExtResource( 17 )] +position = Vector2( 0, 256 ) color = 1 +[node name="Star3" parent="Collectibles" instance=ExtResource( 17 )] +position = Vector2( 280, 240 ) +color = 2 + +[node name="Key19" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 40, 552 ) + +[node name="Key20" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 56, 536 ) + +[node name="Key21" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 80, 552 ) + +[node name="Key22" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 96, 520 ) + +[node name="Key23" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 144, 520 ) + +[node name="Key24" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 184, 504 ) + +[node name="Key25" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 128, 480 ) + +[node name="Key26" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 56, 464 ) + +[node name="Key27" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 72, 456 ) + +[node name="Key28" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 104, 456 ) + +[node name="Key29" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 96, 432 ) + +[node name="Key36" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 112, 352 ) + +[node name="Key37" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 152, 352 ) + +[node name="Key38" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 184, 336 ) + +[node name="Key39" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 216, 336 ) + +[node name="Key40" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 144, 296 ) + +[node name="Key41" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 120, 296 ) + +[node name="Key44" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 216, 256 ) + +[node name="Key45" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 184, 248 ) + +[node name="Key46" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 216, 288 ) + +[node name="Key47" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 216, 216 ) + +[node name="Key49" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 144, 552 ) + +[node name="Key50" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 208, 552 ) + +[node name="Key48" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 248, 216 ) + +[node name="Key42" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 24, 304 ) + +[node name="Key43" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 56, 304 ) + +[node name="Key30" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 64, 432 ) + +[node name="Key31" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 48, 416 ) + +[node name="Key33" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 136, 432 ) + +[node name="Key34" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 160, 432 ) + +[node name="Key35" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 192, 432 ) + +[node name="Key32" parent="Collectibles" instance=ExtResource( 21 )] +position = Vector2( 32, 400 ) + [node name="Bubbles" type="Node2D" parent="."] [node name="BubbleSpawner" parent="Bubbles" instance=ExtResource( 24 )] @@ -427,6 +511,7 @@ position = Vector2( 64, 64 ) [node name="BubbleSpawner3" parent="Bubbles" instance=ExtResource( 24 )] position = Vector2( 96, 120 ) +delay = 1.5 [node name="BubbleSpawner4" parent="Bubbles" instance=ExtResource( 24 )] position = Vector2( 24, 104 ) @@ -440,6 +525,12 @@ position = Vector2( 16, 552 ) [node name="BubbleSpawner10" parent="Bubbles" instance=ExtResource( 24 )] position = Vector2( 80, 432 ) +[node name="BubbleSpawner13" parent="Bubbles" instance=ExtResource( 24 )] +position = Vector2( 72, 288 ) + +[node name="BubbleSpawner12" parent="Bubbles" instance=ExtResource( 24 )] +position = Vector2( 24, 400 ) + [node name="BubbleSpawner11" parent="Bubbles" instance=ExtResource( 24 )] position = Vector2( 164, 432 ) @@ -452,7 +543,4 @@ position = Vector2( 120, 152 ) [node name="BubbleSpawner7" parent="Bubbles" instance=ExtResource( 24 )] position = Vector2( 96, 216 ) -[editable path="Enemies/Eels/Eel4"] -[editable path="Enemies/Eels/Eel"] -[editable path="Enemies/Eels/Eel2"] [editable path="Enemies/Eels/Eel3"] diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 0cca83b..74bbedc 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=32 format=2] [ext_resource path="res://objects/enemy/squig.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] [ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=3] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=5] -[ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] [ext_resource path="res://graphics/backgrounds/canopy.png" type="Texture" id=7] [ext_resource path="res://objects/hud/letter_block.tscn" type="PackedScene" id=8] [ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=9] @@ -55,12 +54,10 @@ _data = { } [node name="Map2" type="Node2D" groups=["map"]] +pause_mode = 1 script = ExtResource( 11 ) -[node name="Camera2D" parent="." instance=ExtResource( 6 )] -current = false - -[node name="Sprite" type="Sprite" parent="Camera2D"] +[node name="Sprite" type="Sprite" parent="."] position = Vector2( 128, 96 ) z_index = -50 texture = ExtResource( 7 ) @@ -140,12 +137,14 @@ position = Vector2( 48, 120 ) [node name="AnimatedSprite" parent="RollingFiend" index="0"] visible = false +frame = 1 [node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"] material = SubResource( 4 ) position = Vector2( 4, 4 ) z_index = -3 frames = SubResource( 5 ) +frame = 1 playing = true [node name="Steam" parent="." instance=ExtResource( 23 )] diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 9368c6c..35fcb29 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1386,7 +1386,7 @@ custom_styles/bg = SubResource( 4 ) script = ExtResource( 8 ) [node name="OxygenTimer" type="Timer" parent="."] -wait_time = 10.0 +wait_time = 15.0 autostart = true [node name="JumpPeakTimer" type="Timer" parent="."]