diff --git a/graphics/falling_block/falling_block_cave.png b/graphics/falling_block/falling_block_cave.png index a74c260..872c1dd 100644 Binary files a/graphics/falling_block/falling_block_cave.png and b/graphics/falling_block/falling_block_cave.png differ diff --git a/graphics/falling_block/woeful_soul.png b/graphics/falling_block/woeful_soul.png new file mode 100644 index 0000000..06b3238 Binary files /dev/null and b/graphics/falling_block/woeful_soul.png differ diff --git a/graphics/falling_block/woeful_soul.png.import b/graphics/falling_block/woeful_soul.png.import new file mode 100644 index 0000000..fde01eb --- /dev/null +++ b/graphics/falling_block/woeful_soul.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/woeful_soul.png-965187965bd4c63511479b4beca52f66.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/falling_block/woeful_soul.png" +dest_files=[ "res://.import/woeful_soul.png-965187965bd4c63511479b4beca52f66.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/cave.tscn b/maps/cave.tscn index 62ac5f5..87323e7 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -17,7 +17,7 @@ [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=15] [ext_resource path="res://objects/enemy/tentacle.tscn" type="PackedScene" id=16] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=17] -[ext_resource path="res://objects/environment/falling_block/falling_block.tscn" type="PackedScene" id=18] +[ext_resource path="res://objects/environment/falling_block/falling_block_cave.tscn" type="PackedScene" id=18] [ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=19] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=20] [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=21] diff --git a/maps/graveyard.tscn b/maps/graveyard.tscn index d5dc126..bba7c3b 100644 --- a/maps/graveyard.tscn +++ b/maps/graveyard.tscn @@ -12,7 +12,7 @@ [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=10] [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=11] [ext_resource path="res://objects/enemy/hellarcher.tscn" type="PackedScene" id=12] -[ext_resource path="res://objects/environment/falling_block/falling_block.tscn" type="PackedScene" id=13] +[ext_resource path="res://objects/environment/falling_block/falling_block_graveyard.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=14] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=15] [ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=16] @@ -37,7 +37,7 @@ __meta__ = { tile_set = ExtResource( 4 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( -65537, 0, 0, -130976, 0, 0, -1, 0, 65536, -65440, 0, 65536, 65535, 0, 65536, 96, 0, 65536, 131071, 0, 65536, 65632, 0, 65536, 196607, 0, 65536, 131168, 0, 65536, 262143, 0, 65536, 196618, 0, 196609, 196619, 0, 196610, 196620, 0, 196611, 196668, 1, 1, 196669, 1, 2, 196670, 1, 2, 196671, 1, 2, 196672, 1, 2, 196673, 1, 2, 196674, 1, 2, 196675, 1, 2, 196676, 1, 2, 196677, 1, 2, 196678, 1, 2, 196679, 1, 2, 196680, 1, 2, 196681, 1, 3, 196704, 0, 65536, 327679, 0, 65536, 262159, 0, 196609, 262160, 0, 196610, 262161, 0, 196611, 262164, 0, 196609, 262165, 0, 196610, 262166, 0, 196610, 262167, 0, 196610, 262168, 0, 196610, 262169, 0, 196610, 262170, 0, 196610, 262171, 0, 196610, 262172, 0, 196610, 262173, 0, 196610, 262174, 0, 196610, 262175, 0, 196610, 262176, 0, 196610, 262177, 0, 196610, 262178, 0, 196611, 262181, 0, 196609, 262182, 0, 196611, 262189, 1, 196609, 262190, 1, 196610, 262191, 1, 196610, 262192, 1, 196610, 262193, 1, 196610, 262194, 1, 196610, 262195, 1, 196610, 262196, 1, 196610, 262197, 1, 196610, 262198, 1, 196610, 262199, 1, 196610, 262200, 1, 196610, 262201, 1, 196610, 262202, 1, 196610, 262203, 1, 196610, 262204, 1, 131074, 262205, 1, 131074, 262206, 1, 131074, 262207, 1, 131074, 262208, 1, 131074, 262209, 1, 131074, 262210, 1, 131074, 262211, 1, 131074, 262212, 1, 131074, 262213, 1, 131074, 262214, 1, 131074, 262215, 1, 131074, 262216, 1, 131074, 262217, 1, 131075, 262240, 0, 65536, 393215, 0, 65536, 327776, 0, 65536, 458751, 0, 65536, 393312, 0, 65536, 524287, 0, 65537, 458752, 0, 196610, 458753, 0, 196610, 458754, 0, 196611, 458757, 0, 196609, 458758, 0, 196610, 458759, 0, 196611, 458839, 1, 196608, 458848, 0, 65536, 589823, 0, 65536, 524324, 0, 196609, 524325, 0, 196610, 524326, 0, 196610, 524327, 0, 196610, 524328, 0, 196611, 524384, 0, 131072, 655359, 0, 65536, 589838, 0, 196609, 589839, 0, 196610, 589840, 0, 196610, 589841, 0, 196610, 589842, 0, 196610, 589843, 0, 196610, 589844, 0, 196610, 589845, 0, 196610, 589846, 0, 196610, 589847, 0, 3, 589898, 1, 1, 589899, 1, 2, 589900, 1, 2, 589901, 1, 3, 589905, 1, 1, 589906, 1, 2, 589907, 1, 2, 589908, 1, 3, 589914, 1, 1, 589915, 1, 2, 589916, 1, 2, 589917, 1, 2, 589918, 1, 2, 589919, 1, 2, 589920, 1, 3, 720895, 0, 65536, 655383, 0, 131073, 655384, 0, 196610, 655385, 0, 196610, 655386, 0, 196611, 655389, 0, 196609, 655390, 0, 196610, 655391, 0, 196610, 655392, 0, 196610, 655393, 0, 196610, 655394, 0, 196611, 655433, 1, 1, 655434, 1, 65538, 655435, 1, 65538, 655436, 1, 65538, 655437, 1, 65539, 655441, 1, 65537, 655442, 1, 65538, 655443, 1, 131074, 655444, 1, 131075, 655450, 1, 65537, 655451, 1, 65538, 655452, 1, 65538, 655453, 1, 65538, 655454, 1, 65538, 655455, 1, 65538, 655456, 1, 65539, 786431, 0, 65536, 720938, 1, 1, 720939, 1, 2, 720940, 1, 2, 720941, 1, 2, 720942, 1, 2, 720943, 1, 2, 720944, 1, 2, 720945, 1, 2, 720946, 1, 2, 720947, 1, 2, 720948, 1, 2, 720949, 1, 3, 720967, 1, 1, 720968, 1, 2, 720969, 1, 65538, 720970, 1, 65538, 720971, 1, 131074, 720972, 1, 131074, 720973, 1, 131075, 720976, -1073741824, 0, 720977, 1, 131073, 720978, 1, 131075, 720986, 1, 131073, 720987, 1, 131074, 720988, 1, 131074, 720989, 1, 131074, 720990, 1, 131074, 720991, 1, 131074, 720992, 1, 131075, 851967, 0, 65536, 786442, 0, 196609, 786443, 0, 196610, 786444, 0, 196611, 786474, 1, 131073, 786475, 1, 131074, 786476, 1, 131074, 786477, 1, 131074, 786478, 1, 131074, 786479, 1, 131074, 786480, 1, 131074, 786481, 1, 131074, 786482, 1, 65538, 786483, 1, 65538, 786484, 1, 131074, 786485, 1, 131075, 786490, 1, 196609, 786491, 1, 196610, 786492, 1, 196610, 786493, 1, 196610, 786494, 1, 196610, 786495, 1, 2, 786496, 1, 2, 786497, 1, 3, 786503, 1, 131073, 786504, 1, 131074, 786505, 1, 131074, 786506, 1, 131075, 786528, 0, 0, 917503, 0, 65536, 852018, 1, 65537, 852019, 1, 65539, 852031, 1, 65537, 852032, 1, 65538, 852033, 1, 65538, 852034, 1, 2, 852035, 1, 3, 852064, 0, 65536, 983039, 0, 65536, 917525, 0, 196609, 917526, 0, 196610, 917527, 0, 196610, 917528, 0, 196610, 917529, 0, 196610, 917530, 0, 196611, 917554, 1, 65537, 917555, 1, 65539, 917567, 1, 65537, 917568, 1, 65538, 917569, 1, 131074, 917570, 1, 131074, 917571, 1, 131075, 917586, 1, 1, 917587, 1, 2, 917588, 1, 3, 917600, 0, 131072, 1048575, 0, 65536, 983048, 1, 1, 983049, 1, 2, 983050, 1, 2, 983051, 1, 2, 983052, 1, 2, 983053, 1, 2, 983054, 1, 3, 983075, 1, 1, 983076, 1, 3, 983079, 1, 1, 983080, 1, 2, 983081, 1, 2, 983082, 1, 3, 983090, 1, 65537, 983091, 1, 65539, 983103, 1, 65537, 983104, 1, 65539, 983122, 1, 65537, 983123, 1, 65538, 983124, 1, 65538, 983125, 1, 2, 983126, 1, 2, 983127, 1, 2, 983128, 1, 2, 983129, 1, 2, 983130, 1, 2, 983131, 1, 2, 983132, 1, 2, 983133, 1, 2, 983134, 1, 2, 983135, 1, 2, 983136, 1, 3, 1114111, 0, 65536, 1048584, 1, 131073, 1048585, 1, 131074, 1048586, 1, 131074, 1048587, 1, 131074, 1048588, 1, 131074, 1048589, 1, 131074, 1048590, 1, 131075, 1048606, 1, 1, 1048607, 1, 2, 1048608, 1, 2, 1048609, 1, 2, 1048610, 1, 2, 1048611, 1, 131074, 1048612, 1, 131075, 1048615, 1, 131073, 1048616, 1, 131074, 1048617, 1, 131074, 1048618, 1, 131075, 1048626, 1, 65537, 1048627, 1, 65538, 1048628, 1, 2, 1048629, 1, 2, 1048630, 1, 2, 1048631, 1, 2, 1048632, 1, 2, 1048633, 1, 2, 1048634, 1, 2, 1048635, 1, 2, 1048636, 1, 2, 1048637, 1, 2, 1048638, 1, 2, 1048639, 1, 65538, 1048640, 1, 65539, 1048649, 0, 196609, 1048650, 0, 196610, 1048651, 0, 196610, 1048652, 0, 196610, 1048653, 0, 196610, 1048654, 0, 196610, 1048655, 0, 196610, 1048656, 0, 196611, 1048658, 1, 131073, 1048659, 1, 131074, 1048660, 1, 131074, 1048661, 1, 131074, 1048662, 1, 131074, 1048663, 1, 131074, 1048664, 1, 131074, 1048665, 1, 131074, 1048666, 1, 131074, 1048667, 1, 131074, 1048668, 1, 131074, 1048669, 1, 131074, 1048670, 1, 131074, 1048671, 1, 131074, 1048672, 1, 131075, 1179647, 0, 65536, 1114141, 1, 1, 1114142, 1, 65538, 1114143, 1, 65538, 1114144, 1, 65538, 1114145, 1, 131074, 1114146, 1, 131075, 1114162, 1, 131073, 1114163, 1, 131074, 1114164, 1, 131074, 1114165, 1, 131074, 1114166, 1, 131074, 1114167, 1, 131074, 1114168, 1, 131074, 1114169, 1, 131074, 1114170, 1, 131074, 1114171, 1, 131074, 1114172, 1, 131074, 1114173, 1, 131074, 1114174, 1, 131074, 1114175, 1, 131074, 1114176, 1, 131074, 1114177, 1, 196610, 1114178, 1, 196610, 1114179, 1, 196610, 1114180, 1, 196611, 1114208, 0, 0, 1245183, 0, 65536, 1179652, 0, 196609, 1179653, 0, 196610, 1179654, 0, 196611, 1179675, 1, 196609, 1179676, 1, 196610, 1179677, 1, 131074, 1179678, 1, 131074, 1179679, 1, 131074, 1179680, 1, 131075, 1179744, 0, 65536, 1310719, 0, 65536, 1245280, 0, 65536, 1376255, 0, 65537, 1310720, 0, 196610, 1310721, 0, 196611, 1310816, 0, 65536, 1441791, 0, 131072, 1376266, 1, 1, 1376267, 1, 2, 1376268, 1, 2, 1376269, 1, 2, 1376270, 1, 2, 1376271, 1, 2, 1376272, 1, 2, 1376273, 1, 2, 1376274, 1, 2, 1376275, 1, 2, 1376276, 1, 2, 1376277, 1, 2, 1376278, 1, 3, 1376281, 3, 1, 1376287, 2, 65537, 1376289, 2, 65536, 1376290, 2, 65536, 1376291, 2, 65536, 1376292, 2, 65536, 1376293, 2, 65536, 1376352, 0, 131072, 1507326, 1, 1, 1507327, 1, 2, 1441792, 1, 2, 1441793, 1, 2, 1441794, 1, 2, 1441795, 1, 2, 1441796, 1, 2, 1441797, 1, 2, 1441798, 1, 2, 1441799, 1, 2, 1441800, 1, 2, 1441801, 1, 2, 1441802, 1, 65538, 1441803, 1, 65538, 1441804, 1, 65538, 1441805, 1, 65538, 1441806, 1, 65538, 1441807, 1, 65538, 1441808, 1, 65538, 1441809, 1, 65538, 1441810, 1, 65538, 1441811, 1, 65538, 1441812, 1, 65538, 1441813, 1, 65538, 1441814, 1, 65538, 1441815, 1, 2, 1441816, 1, 2, 1441817, 1, 2, 1441818, 1, 2, 1441819, 1, 2, 1441820, 1, 2, 1441821, 1, 2, 1441822, 1, 2, 1441823, 1, 2, 1441824, 1, 2, 1441825, 1, 2, 1441826, 1, 2, 1441827, 1, 2, 1441828, 1, 2, 1441829, 1, 2, 1441830, 1, 3, 1441836, 1, 1, 1441837, 1, 2, 1441838, 1, 2, 1441839, 1, 2, 1441840, 1, 2, 1441841, 1, 2, 1441842, 1, 2, 1441843, 1, 2, 1441844, 1, 2, 1441845, 1, 3, 1441851, 1, 1, 1441852, 1, 2, 1441853, 1, 2, 1441854, 1, 2, 1441855, 1, 2, 1441856, 1, 2, 1441857, 1, 2, 1441858, 1, 2, 1441859, 1, 2, 1441860, 1, 2, 1441861, 1, 2, 1441862, 1, 2, 1441863, 1, 2, 1441864, 1, 2, 1441865, 1, 2, 1441866, 1, 2, 1441867, 1, 2, 1441868, 1, 2, 1441869, 1, 2, 1441870, 1, 2, 1441871, 1, 2, 1441872, 1, 2, 1441873, 1, 2, 1441874, 1, 2, 1441875, 1, 2, 1441876, 1, 2, 1441877, 1, 2, 1441878, 1, 2, 1441879, 1, 2, 1441880, 1, 2, 1441881, 1, 2, 1441882, 1, 2, 1441883, 1, 2, 1441884, 1, 2, 1441885, 1, 2, 1441886, 1, 2, 1441887, 1, 2, 1441888, 1, 3, 1572862, 1, 65537, 1572863, 1, 65538, 1507328, 1, 65538, 1507329, 1, 65538, 1507330, 1, 65538, 1507331, 1, 65538, 1507332, 1, 65538, 1507333, 1, 65538, 1507334, 1, 65538, 1507335, 1, 65538, 1507336, 1, 65538, 1507337, 1, 65538, 1507338, 1, 65538, 1507339, 1, 65538, 1507340, 1, 65538, 1507341, 1, 65538, 1507342, 1, 65538, 1507343, 1, 65538, 1507344, 1, 65538, 1507345, 1, 65538, 1507346, 1, 65538, 1507347, 1, 65538, 1507348, 1, 65538, 1507349, 1, 65538, 1507350, 1, 65538, 1507351, 1, 65538, 1507352, 1, 65538, 1507353, 1, 65538, 1507354, 1, 65538, 1507355, 1, 65538, 1507356, 1, 65538, 1507357, 1, 65538, 1507358, 1, 65538, 1507359, 1, 65538, 1507360, 1, 65538, 1507361, 1, 65538, 1507362, 1, 65538, 1507363, 1, 65538, 1507364, 1, 65538, 1507365, 1, 65538, 1507366, 1, 65539, 1507372, 1, 65537, 1507373, 1, 65538, 1507374, 1, 65538, 1507375, 1, 65538, 1507376, 1, 65538, 1507377, 1, 65538, 1507378, 1, 65538, 1507379, 1, 65538, 1507380, 1, 65538, 1507381, 1, 65539, 1507387, 1, 65537, 1507388, 1, 65538, 1507389, 1, 65538, 1507390, 1, 65538, 1507391, 1, 65538, 1507392, 1, 65538, 1507393, 1, 65538, 1507394, 1, 65538, 1507395, 1, 65538, 1507396, 1, 65538, 1507397, 1, 65538, 1507398, 1, 65538, 1507399, 1, 65538, 1507400, 1, 65538, 1507401, 1, 65538, 1507402, 1, 65538, 1507403, 1, 65538, 1507404, 1, 65538, 1507405, 1, 65538, 1507406, 1, 65538, 1507407, 1, 65538, 1507408, 1, 65538, 1507409, 1, 65538, 1507410, 1, 65538, 1507411, 1, 65538, 1507412, 1, 65538, 1507413, 1, 65538, 1507414, 1, 65538, 1507415, 1, 65538, 1507416, 1, 65538, 1507417, 1, 65538, 1507418, 1, 65538, 1507419, 1, 65538, 1507420, 1, 65538, 1507421, 1, 65538, 1507422, 1, 65538, 1507423, 1, 65538, 1507424, 1, 65539, 1638398, 1, 131073, 1638399, 1, 131074, 1572864, 1, 131074, 1572865, 1, 131074, 1572866, 1, 131074, 1572867, 1, 131074, 1572868, 1, 131074, 1572869, 1, 131074, 1572870, 1, 131074, 1572871, 1, 131074, 1572872, 1, 131074, 1572873, 1, 131074, 1572874, 1, 131074, 1572875, 1, 131074, 1572876, 1, 131074, 1572877, 1, 131074, 1572878, 1, 131074, 1572879, 1, 131074, 1572880, 1, 131074, 1572881, 1, 131074, 1572882, 1, 131074, 1572883, 1, 131074, 1572884, 1, 131074, 1572885, 1, 131074, 1572886, 1, 131074, 1572887, 1, 131074, 1572888, 1, 131074, 1572889, 1, 131074, 1572890, 1, 131074, 1572891, 1, 131074, 1572892, 1, 131074, 1572893, 1, 131074, 1572894, 1, 131074, 1572895, 1, 131074, 1572896, 1, 131074, 1572897, 1, 131074, 1572898, 1, 131074, 1572899, 1, 131074, 1572900, 1, 131074, 1572901, 1, 131074, 1572902, 1, 131075, 1572908, 1, 131073, 1572909, 1, 131074, 1572910, 1, 131074, 1572911, 1, 131074, 1572912, 1, 131074, 1572913, 1, 131074, 1572914, 1, 131074, 1572915, 1, 131074, 1572916, 1, 131074, 1572917, 1, 131075, 1572923, 1, 131073, 1572924, 1, 131074, 1572925, 1, 131074, 1572926, 1, 131074, 1572927, 1, 131074, 1572928, 1, 131074, 1572929, 1, 131074, 1572930, 1, 131074, 1572931, 1, 131074, 1572932, 1, 131074, 1572933, 1, 131074, 1572934, 1, 131074, 1572935, 1, 131074, 1572936, 1, 131074, 1572937, 1, 131074, 1572938, 1, 131074, 1572939, 1, 131074, 1572940, 1, 131074, 1572941, 1, 131074, 1572942, 1, 131074, 1572943, 1, 131074, 1572944, 1, 131074, 1572945, 1, 131074, 1572946, 1, 131074, 1572947, 1, 131074, 1572948, 1, 131074, 1572949, 1, 131074, 1572950, 1, 131074, 1572951, 1, 131074, 1572952, 1, 131074, 1572953, 1, 131074, 1572954, 1, 131074, 1572955, 1, 131074, 1572956, 1, 131074, 1572957, 1, 131074, 1572958, 1, 131074, 1572959, 1, 131074, 1572960, 1, 131075 ) +tile_data = PoolIntArray( -65537, 0, 0, -130976, 0, 0, -1, 0, 65536, -65440, 0, 65536, 65535, 0, 65536, 96, 0, 65536, 131071, 0, 65536, 65632, 0, 65536, 196607, 0, 65536, 131168, 0, 65536, 262143, 0, 65536, 196618, 0, 196609, 196619, 0, 196610, 196620, 0, 196611, 196668, 1, 1, 196669, 1, 2, 196670, 1, 2, 196671, 1, 2, 196672, 1, 2, 196673, 1, 2, 196674, 1, 2, 196675, 1, 2, 196676, 1, 2, 196677, 1, 2, 196678, 1, 2, 196679, 1, 2, 196680, 1, 2, 196681, 1, 3, 196704, 0, 65536, 327679, 0, 65536, 262159, 0, 196609, 262160, 0, 196610, 262161, 0, 196611, 262164, 0, 196609, 262165, 0, 196610, 262166, 0, 196610, 262167, 0, 196610, 262168, 0, 196610, 262169, 0, 196610, 262170, 0, 196610, 262171, 0, 196610, 262172, 0, 196610, 262173, 0, 196610, 262174, 0, 196610, 262175, 0, 196610, 262176, 0, 196610, 262177, 0, 196610, 262178, 0, 196611, 262181, 0, 196609, 262182, 0, 196611, 262189, 1, 196609, 262190, 1, 196610, 262191, 1, 196610, 262192, 1, 196610, 262193, 1, 196610, 262194, 1, 196610, 262195, 1, 196610, 262196, 1, 196610, 262197, 1, 196610, 262198, 1, 196610, 262199, 1, 196610, 262200, 1, 196610, 262201, 1, 196610, 262202, 1, 196610, 262203, 1, 196610, 262204, 1, 131074, 262205, 1, 131074, 262206, 1, 131074, 262207, 1, 131074, 262208, 1, 131074, 262209, 1, 131074, 262210, 1, 131074, 262211, 1, 131074, 262212, 1, 131074, 262213, 1, 131074, 262214, 1, 131074, 262215, 1, 131074, 262216, 1, 131074, 262217, 1, 131075, 262240, 0, 65536, 393215, 0, 65536, 327776, 0, 65536, 458751, 0, 65536, 393312, 0, 65536, 524287, 0, 65537, 458752, 0, 196610, 458753, 0, 196610, 458754, 0, 196611, 458757, 0, 196609, 458758, 0, 196610, 458759, 0, 196611, 458839, 1, 196608, 458848, 0, 65536, 589823, 0, 65536, 524326, 0, 196609, 524327, 0, 196610, 524328, 0, 196611, 524384, 0, 131072, 655359, 0, 65536, 589838, 0, 196609, 589839, 0, 196610, 589840, 0, 196610, 589841, 0, 196610, 589842, 0, 196610, 589843, 0, 196610, 589844, 0, 196610, 589845, 0, 196610, 589846, 0, 196610, 589847, 0, 3, 589898, 1, 1, 589899, 1, 2, 589900, 1, 2, 589901, 1, 3, 589905, 1, 1, 589906, 1, 2, 589907, 1, 2, 589908, 1, 3, 589914, 1, 1, 589915, 1, 2, 589916, 1, 2, 589917, 1, 2, 589918, 1, 2, 589919, 1, 2, 589920, 1, 3, 720895, 0, 65536, 655383, 0, 131073, 655384, 0, 196610, 655385, 0, 196610, 655386, 0, 196611, 655389, 0, 196609, 655390, 0, 196610, 655391, 0, 196610, 655392, 0, 196610, 655393, 0, 196610, 655394, 0, 196611, 655433, 1, 1, 655434, 1, 65538, 655435, 1, 65538, 655436, 1, 65538, 655437, 1, 65539, 655441, 1, 65537, 655442, 1, 65538, 655443, 1, 131074, 655444, 1, 131075, 655450, 1, 65537, 655451, 1, 65538, 655452, 1, 65538, 655453, 1, 65538, 655454, 1, 65538, 655455, 1, 65538, 655456, 1, 65539, 786431, 0, 65536, 720939, 1, 196609, 720940, 1, 196610, 720941, 1, 196610, 720942, 1, 2, 720943, 1, 2, 720944, 1, 2, 720945, 1, 2, 720946, 1, 2, 720947, 1, 2, 720948, 1, 2, 720949, 1, 3, 720967, 1, 1, 720968, 1, 2, 720969, 1, 65538, 720970, 1, 65538, 720971, 1, 131074, 720972, 1, 131074, 720973, 1, 131075, 720976, -1073741824, 0, 720977, 1, 131073, 720978, 1, 131075, 720986, 1, 131073, 720987, 1, 131074, 720988, 1, 131074, 720989, 1, 131074, 720990, 1, 131074, 720991, 1, 131074, 720992, 1, 131075, 851967, 0, 65536, 786442, 0, 196609, 786443, 0, 196610, 786444, 0, 196611, 786478, 1, 131073, 786479, 1, 131074, 786480, 1, 131074, 786481, 1, 131074, 786482, 1, 65538, 786483, 1, 65538, 786484, 1, 131074, 786485, 1, 131075, 786490, 1, 196609, 786491, 1, 196610, 786492, 1, 196610, 786493, 1, 196610, 786494, 1, 196610, 786495, 1, 2, 786496, 1, 2, 786497, 1, 3, 786503, 1, 131073, 786504, 1, 131074, 786505, 1, 131074, 786506, 1, 131075, 786528, 0, 0, 917503, 0, 65536, 852018, 1, 65537, 852019, 1, 65539, 852031, 1, 65537, 852032, 1, 65538, 852033, 1, 65538, 852034, 1, 2, 852035, 1, 3, 852064, 0, 65536, 983039, 0, 65536, 917525, 0, 196609, 917526, 0, 196610, 917527, 0, 196610, 917528, 0, 196610, 917529, 0, 196610, 917530, 0, 196611, 917554, 1, 65537, 917555, 1, 65539, 917567, 1, 65537, 917568, 1, 65538, 917569, 1, 131074, 917570, 1, 131074, 917571, 1, 131075, 917586, 1, 1, 917587, 1, 2, 917588, 1, 3, 917600, 0, 131072, 1048575, 0, 65536, 983048, 1, 1, 983049, 1, 2, 983050, 1, 2, 983051, 1, 2, 983052, 1, 2, 983053, 1, 2, 983054, 1, 3, 983075, 1, 1, 983076, 1, 3, 983079, 1, 1, 983080, 1, 2, 983081, 1, 2, 983082, 1, 3, 983090, 1, 65537, 983091, 1, 65539, 983103, 1, 65537, 983104, 1, 65539, 983122, 1, 65537, 983123, 1, 65538, 983124, 1, 65538, 983125, 1, 2, 983126, 1, 2, 983127, 1, 2, 983128, 1, 2, 983129, 1, 2, 983130, 1, 2, 983131, 1, 2, 983132, 1, 2, 983133, 1, 2, 983134, 1, 2, 983135, 1, 2, 983136, 1, 3, 1114111, 0, 65536, 1048584, 1, 131073, 1048585, 1, 131074, 1048586, 1, 131074, 1048587, 1, 131074, 1048588, 1, 131074, 1048589, 1, 131074, 1048590, 1, 131075, 1048611, 1, 65537, 1048612, 1, 65539, 1048615, 1, 131073, 1048616, 1, 131074, 1048617, 1, 131074, 1048618, 1, 131075, 1048626, 1, 131073, 1048627, 1, 65538, 1048628, 1, 2, 1048629, 1, 2, 1048630, 1, 2, 1048631, 1, 2, 1048632, 1, 2, 1048633, 1, 2, 1048634, 1, 2, 1048635, 1, 2, 1048636, 1, 2, 1048637, 1, 2, 1048638, 1, 2, 1048639, 1, 65538, 1048640, 1, 65539, 1048649, 0, 196609, 1048650, 0, 196610, 1048651, 0, 196610, 1048652, 0, 196610, 1048653, 0, 196610, 1048654, 0, 196610, 1048655, 0, 196610, 1048656, 0, 196611, 1048658, 1, 131073, 1048659, 1, 131074, 1048660, 1, 131074, 1048661, 1, 131074, 1048662, 1, 131074, 1048663, 1, 131074, 1048664, 1, 131074, 1048665, 1, 131074, 1048666, 1, 131074, 1048667, 1, 131074, 1048668, 1, 131074, 1048669, 1, 131074, 1048670, 1, 131074, 1048671, 1, 131074, 1048672, 1, 131075, 1179647, 0, 65536, 1114141, 1, 1, 1114142, 1, 2, 1114143, 1, 2, 1114144, 1, 2, 1114145, 1, 2, 1114146, 1, 2, 1114147, 1, 65538, 1114148, 1, 65539, 1114163, 1, 131073, 1114164, 1, 131074, 1114165, 1, 131074, 1114166, 1, 131074, 1114167, 1, 131074, 1114168, 1, 131074, 1114169, 1, 131074, 1114170, 1, 131074, 1114171, 1, 131074, 1114172, 1, 131074, 1114173, 1, 131074, 1114174, 1, 131074, 1114175, 1, 131074, 1114176, 1, 131074, 1114177, 1, 196610, 1114178, 1, 196610, 1114179, 1, 196610, 1114180, 1, 196611, 1114208, 0, 0, 1245183, 0, 65536, 1179652, 0, 196609, 1179653, 0, 196610, 1179654, 0, 196611, 1179675, 1, 196609, 1179676, 1, 196610, 1179677, 1, 131074, 1179678, 1, 131074, 1179679, 1, 131074, 1179680, 1, 131074, 1179681, 1, 131074, 1179682, 1, 131074, 1179683, 1, 131074, 1179684, 1, 131075, 1179744, 0, 65536, 1310719, 0, 65536, 1245280, 0, 65536, 1376255, 0, 65537, 1310720, 0, 196610, 1310721, 0, 196611, 1310816, 0, 65536, 1441791, 0, 131072, 1376266, 1, 1, 1376267, 1, 2, 1376268, 1, 2, 1376269, 1, 2, 1376270, 1, 2, 1376271, 1, 2, 1376272, 1, 2, 1376273, 1, 2, 1376274, 1, 2, 1376275, 1, 2, 1376276, 1, 2, 1376277, 1, 2, 1376278, 1, 3, 1376281, 3, 1, 1376287, 2, 65537, 1376289, 2, 65536, 1376290, 2, 65536, 1376291, 2, 65536, 1376292, 1, 1, 1376293, 1, 2, 1376294, 1, 3, 1376352, 0, 131072, 1507326, 1, 1, 1507327, 1, 2, 1441792, 1, 2, 1441793, 1, 2, 1441794, 1, 2, 1441795, 1, 2, 1441796, 1, 2, 1441797, 1, 2, 1441798, 1, 2, 1441799, 1, 2, 1441800, 1, 2, 1441801, 1, 2, 1441802, 1, 65538, 1441803, 1, 65538, 1441804, 1, 65538, 1441805, 1, 65538, 1441806, 1, 65538, 1441807, 1, 65538, 1441808, 1, 65538, 1441809, 1, 65538, 1441810, 1, 65538, 1441811, 1, 65538, 1441812, 1, 65538, 1441813, 1, 65538, 1441814, 1, 65538, 1441815, 1, 2, 1441816, 1, 2, 1441817, 1, 2, 1441818, 1, 2, 1441819, 1, 2, 1441820, 1, 2, 1441821, 1, 2, 1441822, 1, 2, 1441823, 1, 2, 1441824, 1, 2, 1441825, 1, 2, 1441826, 1, 2, 1441827, 1, 2, 1441828, 1, 65538, 1441829, 1, 65538, 1441830, 1, 65539, 1441836, 1, 1, 1441837, 1, 2, 1441838, 1, 2, 1441839, 1, 2, 1441840, 1, 2, 1441841, 1, 2, 1441842, 1, 2, 1441843, 1, 2, 1441844, 1, 2, 1441845, 1, 3, 1441851, 1, 1, 1441852, 1, 2, 1441853, 1, 2, 1441854, 1, 2, 1441855, 1, 2, 1441856, 1, 2, 1441857, 1, 2, 1441858, 1, 2, 1441859, 1, 2, 1441860, 1, 2, 1441861, 1, 2, 1441862, 1, 2, 1441863, 1, 2, 1441864, 1, 2, 1441865, 1, 2, 1441866, 1, 2, 1441867, 1, 2, 1441868, 1, 2, 1441869, 1, 2, 1441870, 1, 2, 1441871, 1, 2, 1441872, 1, 2, 1441873, 1, 2, 1441874, 1, 2, 1441875, 1, 2, 1441876, 1, 2, 1441877, 1, 2, 1441878, 1, 2, 1441879, 1, 2, 1441880, 1, 2, 1441881, 1, 2, 1441882, 1, 2, 1441883, 1, 2, 1441884, 1, 2, 1441885, 1, 2, 1441886, 1, 2, 1441887, 1, 2, 1441888, 1, 3, 1572862, 1, 65537, 1572863, 1, 65538, 1507328, 1, 65538, 1507329, 1, 65538, 1507330, 1, 65538, 1507331, 1, 65538, 1507332, 1, 65538, 1507333, 1, 65538, 1507334, 1, 65538, 1507335, 1, 65538, 1507336, 1, 65538, 1507337, 1, 65538, 1507338, 1, 65538, 1507339, 1, 65538, 1507340, 1, 65538, 1507341, 1, 65538, 1507342, 1, 65538, 1507343, 1, 65538, 1507344, 1, 65538, 1507345, 1, 65538, 1507346, 1, 65538, 1507347, 1, 65538, 1507348, 1, 65538, 1507349, 1, 65538, 1507350, 1, 65538, 1507351, 1, 65538, 1507352, 1, 65538, 1507353, 1, 65538, 1507354, 1, 65538, 1507355, 1, 65538, 1507356, 1, 65538, 1507357, 1, 65538, 1507358, 1, 65538, 1507359, 1, 65538, 1507360, 1, 65538, 1507361, 1, 65538, 1507362, 1, 65538, 1507363, 1, 65538, 1507364, 1, 65538, 1507365, 1, 65538, 1507366, 1, 65539, 1507372, 1, 65537, 1507373, 1, 65538, 1507374, 1, 65538, 1507375, 1, 65538, 1507376, 1, 65538, 1507377, 1, 65538, 1507378, 1, 65538, 1507379, 1, 65538, 1507380, 1, 65538, 1507381, 1, 65539, 1507387, 1, 65537, 1507388, 1, 65538, 1507389, 1, 65538, 1507390, 1, 65538, 1507391, 1, 65538, 1507392, 1, 65538, 1507393, 1, 65538, 1507394, 1, 65538, 1507395, 1, 65538, 1507396, 1, 65538, 1507397, 1, 65538, 1507398, 1, 65538, 1507399, 1, 65538, 1507400, 1, 65538, 1507401, 1, 65538, 1507402, 1, 65538, 1507403, 1, 65538, 1507404, 1, 65538, 1507405, 1, 65538, 1507406, 1, 65538, 1507407, 1, 65538, 1507408, 1, 65538, 1507409, 1, 65538, 1507410, 1, 65538, 1507411, 1, 65538, 1507412, 1, 65538, 1507413, 1, 65538, 1507414, 1, 65538, 1507415, 1, 65538, 1507416, 1, 65538, 1507417, 1, 65538, 1507418, 1, 65538, 1507419, 1, 65538, 1507420, 1, 65538, 1507421, 1, 65538, 1507422, 1, 65538, 1507423, 1, 65538, 1507424, 1, 65539, 1638398, 1, 131073, 1638399, 1, 131074, 1572864, 1, 131074, 1572865, 1, 131074, 1572866, 1, 131074, 1572867, 1, 131074, 1572868, 1, 131074, 1572869, 1, 131074, 1572870, 1, 131074, 1572871, 1, 131074, 1572872, 1, 131074, 1572873, 1, 131074, 1572874, 1, 131074, 1572875, 1, 131074, 1572876, 1, 131074, 1572877, 1, 131074, 1572878, 1, 131074, 1572879, 1, 131074, 1572880, 1, 131074, 1572881, 1, 131074, 1572882, 1, 131074, 1572883, 1, 131074, 1572884, 1, 131074, 1572885, 1, 131074, 1572886, 1, 131074, 1572887, 1, 131074, 1572888, 1, 131074, 1572889, 1, 131074, 1572890, 1, 131074, 1572891, 1, 131074, 1572892, 1, 131074, 1572893, 1, 131074, 1572894, 1, 131074, 1572895, 1, 131074, 1572896, 1, 131074, 1572897, 1, 131074, 1572898, 1, 131074, 1572899, 1, 131074, 1572900, 1, 131074, 1572901, 1, 131074, 1572902, 1, 131075, 1572908, 1, 131073, 1572909, 1, 131074, 1572910, 1, 131074, 1572911, 1, 131074, 1572912, 1, 131074, 1572913, 1, 131074, 1572914, 1, 131074, 1572915, 1, 131074, 1572916, 1, 131074, 1572917, 1, 131075, 1572923, 1, 131073, 1572924, 1, 131074, 1572925, 1, 131074, 1572926, 1, 131074, 1572927, 1, 131074, 1572928, 1, 131074, 1572929, 1, 131074, 1572930, 1, 131074, 1572931, 1, 131074, 1572932, 1, 131074, 1572933, 1, 131074, 1572934, 1, 131074, 1572935, 1, 131074, 1572936, 1, 131074, 1572937, 1, 131074, 1572938, 1, 131074, 1572939, 1, 131074, 1572940, 1, 131074, 1572941, 1, 131074, 1572942, 1, 131074, 1572943, 1, 131074, 1572944, 1, 131074, 1572945, 1, 131074, 1572946, 1, 131074, 1572947, 1, 131074, 1572948, 1, 131074, 1572949, 1, 131074, 1572950, 1, 131074, 1572951, 1, 131074, 1572952, 1, 131074, 1572953, 1, 131074, 1572954, 1, 131074, 1572955, 1, 131074, 1572956, 1, 131074, 1572957, 1, 131074, 1572958, 1, 131074, 1572959, 1, 131074, 1572960, 1, 131075 ) [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 32, 166 ) @@ -68,30 +68,6 @@ scale = Vector2( 1, 4 ) position = Vector2( 600, 16 ) scale = Vector2( 1, 5 ) -[node name="FallingBlock" parent="Environment" instance=ExtResource( 13 )] -position = Vector2( 96, 80 ) - -[node name="FallingBlock2" parent="Environment" instance=ExtResource( 13 )] -position = Vector2( 80, 64 ) - -[node name="FallingBlock3" parent="Environment" instance=ExtResource( 13 )] -position = Vector2( 200, 152 ) - -[node name="FallingBlock4" parent="Environment" instance=ExtResource( 13 )] -position = Vector2( 376, 160 ) - -[node name="FallingBlock7" parent="Environment" instance=ExtResource( 13 )] -position = Vector2( 440, 72 ) - -[node name="FallingBlock6" parent="Environment" instance=ExtResource( 13 )] -position = Vector2( 328, 168 ) - -[node name="FallingBlock8" parent="Environment" instance=ExtResource( 13 )] -position = Vector2( 448, 168 ) - -[node name="FallingBlock5" parent="Environment" instance=ExtResource( 13 )] -position = Vector2( 392, 144 ) - [node name="Rock" parent="Environment" instance=ExtResource( 7 )] position = Vector2( 204, 74 ) @@ -99,7 +75,7 @@ position = Vector2( 204, 74 ) position = Vector2( 360, 24 ) [node name="Rock3" parent="Environment" instance=ExtResource( 7 )] -position = Vector2( 384, 168 ) +position = Vector2( 408, 168 ) [node name="Collectibles" type="Node2D" parent="."] @@ -149,7 +125,7 @@ position = Vector2( 272, 168 ) position = Vector2( 64, 112 ) [node name="Key9" parent="Collectibles" instance=ExtResource( 16 )] -position = Vector2( 304, 168 ) +position = Vector2( 304, 160 ) [node name="Key10" parent="Collectibles" instance=ExtResource( 16 )] position = Vector2( 112, 112 ) @@ -291,6 +267,7 @@ scale = Vector2( -1, 1 ) [node name="Skelarcher2" parent="." instance=ExtResource( 12 )] position = Vector2( 384, 24 ) +shoot_time = 1.0 [node name="Skelarcher6" parent="." instance=ExtResource( 12 )] position = Vector2( 760, 112 ) @@ -304,3 +281,27 @@ shoot_time = 0.1 [node name="Skelarcher5" parent="." instance=ExtResource( 12 )] position = Vector2( 480, 168 ) scale = Vector2( -1, 1 ) + +[node name="FallingBlock" parent="." instance=ExtResource( 13 )] +position = Vector2( 200, 152 ) + +[node name="FallingBlock2" parent="." instance=ExtResource( 13 )] +position = Vector2( 96, 80 ) + +[node name="FallingBlock4" parent="." instance=ExtResource( 13 )] +position = Vector2( 328, 168 ) + +[node name="FallingBlock5" parent="." instance=ExtResource( 13 )] +position = Vector2( 368, 152 ) + +[node name="FallingBlock8" parent="." instance=ExtResource( 13 )] +position = Vector2( 440, 72 ) + +[node name="FallingBlock7" parent="." instance=ExtResource( 13 )] +position = Vector2( 448, 168 ) + +[node name="FallingBlock6" parent="." instance=ExtResource( 13 )] +position = Vector2( 352, 136 ) + +[node name="FallingBlock3" parent="." instance=ExtResource( 13 )] +position = Vector2( 80, 64 ) diff --git a/objects/environment/falling_block/falling_block.gd b/objects/environment/falling_block/falling_block.gd index ae7f17d..80c4589 100644 --- a/objects/environment/falling_block/falling_block.gd +++ b/objects/environment/falling_block/falling_block.gd @@ -8,6 +8,13 @@ onready var refresh_timer = $RefreshTimer onready var crush_area = $CrushArea onready var collision_shape = $CollisionShape2D onready var anims = $AnimationPlayer +onready var sprite = $Sprite + +func _ready(): + #Easy Mode + if Game.is_easy_mode: + fall_speed *= Game.easy_mode_speed_factor + fall_timer.wait_time /= Game.easy_mode_speed_factor func _physics_process(delta): #Fall @@ -26,13 +33,15 @@ func _physics_process(delta): func _on_Area2D_area_entered(area): if area.is_in_group("player"): fall_timer.start() + sprite.frame = 1 + -func _on_VisibilityNotifier2D_screen_exited(): - position = startpos - fall = false - refresh_timer.stop() - anims.play("disappear", -1, -1.0, true) +#func _on_VisibilityNotifier2D_screen_exited(): +# position = startpos +# fall = false +# refresh_timer.stop() +# anims.play("disappear", -1, -1.0, true) func _on_RefreshTimer_timeout(): collision_shape.disabled = true # disable collision @@ -42,6 +51,7 @@ func _on_RefreshTimer_timeout(): fall = false anims.play("idle") anims.play("disappear", -1, -1.0, true) + sprite.frame = 0 func _on_FallTimer_timeout(): fall = true @@ -49,4 +59,5 @@ func _on_FallTimer_timeout(): #func _on_Area2D_area_exited(area): -# fall_timer.stop() +# if area.is_in_group("player") && graphic == Graphics.GRAVEYARD: +# sprite.frame = 0 diff --git a/objects/environment/falling_block/falling_block.tscn b/objects/environment/falling_block/falling_block_cave.tscn similarity index 96% rename from objects/environment/falling_block/falling_block.tscn rename to objects/environment/falling_block/falling_block_cave.tscn index 83a8306..715ce75 100644 --- a/objects/environment/falling_block/falling_block.tscn +++ b/objects/environment/falling_block/falling_block_cave.tscn @@ -52,6 +52,7 @@ fall_speed = 1.0 [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) centered = false +hframes = 2 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 4, 2.5 ) @@ -93,5 +94,6 @@ anims/idle = SubResource( 5 ) [connection signal="screen_exited" from="VisibilityNotifier2D" to="." method="_on_VisibilityNotifier2D_screen_exited"] [connection signal="area_entered" from="Area2D" to="." method="_on_Area2D_area_entered"] +[connection signal="area_exited" from="Area2D" to="." method="_on_Area2D_area_exited"] [connection signal="timeout" from="FallTimer" to="." method="_on_FallTimer_timeout"] [connection signal="timeout" from="RefreshTimer" to="." method="_on_RefreshTimer_timeout"] diff --git a/objects/environment/falling_block/falling_block_graveyard.tscn b/objects/environment/falling_block/falling_block_graveyard.tscn new file mode 100644 index 0000000..df42c9d --- /dev/null +++ b/objects/environment/falling_block/falling_block_graveyard.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://objects/environment/falling_block/falling_block_cave.tscn" type="PackedScene" id=1] +[ext_resource path="res://graphics/falling_block/woeful_soul.png" type="Texture" id=2] + +[node name="FallingBlock" instance=ExtResource( 1 )] + +[node name="Sprite" parent="." index="0"] +texture = ExtResource( 2 )