diff --git a/maps/cave.tscn b/maps/cave.tscn index f0b0f0f..a4d0ced 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=25 format=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] @@ -18,6 +18,11 @@ [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://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/turniwood.tscn" type="PackedScene" id=21] +[ext_resource path="res://objects/environment/death tile/death_tile.tscn" type="PackedScene" id=22] +[ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=23] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 96 ) @@ -43,7 +48,7 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 262153, 0, 65537, 262154, 0, 65537, 262155, 0, 65537, 262156, 0, 0, 327685, 0, 65537, 327686, 0, 65537, 327687, 0, 65537, 327692, 0, 0, 393228, 0, 0, 458763, 0, 65537, 458764, 0, 65537, 720896, 0, 65537, 720897, 0, 65537, 720898, 0, 65537, 720899, 0, 65537, 720900, 0, 65537, 720901, 0, 65537, 720902, 0, 65537, 720903, 0, 65537, 720904, 0, 65537, 786455, 0, 65537, 786456, 0, 65537, 786457, 0, 65537, 786458, 0, 0, 851983, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 851989, 0, 65537, 851994, 0, 0, 917530, 0, 0, 983040, 0, 65537, 983041, 0, 65537, 983042, 0, 65537, 983045, 0, 0, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 983066, 0, 0, 1048581, 0, 0, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1048599, 0, 65537, 1048600, 0, 65537, 1048601, 0, 65537, 1048602, 0, 65537, 1114117, 0, 0, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179652, 0, 65537, 1179653, 0, 65537, 1245192, 0, 65537, 1245193, 0, 65537, 1245194, 0, 65537, 1245195, 0, 65537, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0 ) +tile_data = PoolIntArray( 196644, 0, 65537, 196645, 0, 65537, 196646, 0, 65537, 262153, 0, 65537, 262154, 0, 65537, 262155, 0, 65537, 262156, 0, 0, 262159, 0, 65537, 262160, 0, 65537, 262161, 0, 65537, 262162, 0, 65537, 262163, 0, 65537, 262164, 0, 65537, 262165, 0, 65537, 327685, 0, 65537, 327686, 0, 65537, 327687, 0, 65537, 327692, 0, 0, 393228, 0, 0, 393258, 0, 65537, 393259, 0, 65537, 393260, 0, 65537, 393263, 0, 65537, 393264, 0, 65537, 393265, 0, 65537, 458763, 0, 65537, 458764, 0, 65537, 458774, 0, 65537, 458775, 0, 65537, 458776, 0, 65537, 458777, 0, 65537, 458778, 0, 65537, 458779, 0, 65537, 458782, 0, 65537, 458783, 0, 65537, 458784, 0, 65537, 458785, 0, 65537, 458786, 0, 65537, 458787, 0, 65537, 720896, 0, 65537, 720897, 0, 65537, 720898, 0, 65537, 720899, 0, 65537, 720900, 0, 65537, 720901, 0, 65537, 720902, 0, 65537, 720903, 0, 65537, 720904, 0, 65537, 786455, 0, 65537, 786456, 0, 65537, 786457, 0, 65537, 786458, 0, 0, 786464, 0, 65537, 786465, 0, 65537, 786466, 0, 65537, 786467, 0, 65537, 786468, 0, 65537, 786469, 0, 65537, 786477, 0, 65537, 786478, 0, 65537, 786479, 0, 65537, 786480, 0, 65537, 786481, 0, 65537, 786482, 0, 65537, 786483, 0, 65537, 786484, 0, 65537, 786485, 0, 65537, 786486, 0, 65537, 786487, 0, 65537, 786488, 0, 65537, 786489, 0, 65537, 786490, 0, 65537, 786491, 0, 65537, 786492, 0, 65537, 786493, 0, 65537, 786494, 0, 0, 786495, 0, 0, 786496, 0, 65537, 786497, 0, 65537, 786498, 0, 65537, 786499, 0, 65537, 786500, 0, 65537, 786501, 0, 65537, 786502, 0, 65537, 786503, 0, 65537, 786504, 0, 65537, 786505, 0, 65537, 786506, 0, 65537, 786507, 0, 65537, 786508, 0, 65537, 786509, 0, 65537, 786510, 0, 65537, 786511, 0, 65537, 786512, 0, 65537, 786513, 0, 65537, 786514, 0, 65537, 786515, 0, 65537, 786516, 0, 65537, 786517, 0, 65537, 786518, 0, 65537, 786519, 0, 65537, 786520, 0, 65537, 786521, 0, 65537, 786522, 0, 65537, 786523, 0, 65537, 786524, 0, 65537, 786525, 0, 65537, 786526, 0, 65537, 786527, 0, 65537, 851983, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 851989, 0, 65537, 851994, 0, 0, 852030, 0, 0, 852031, 0, 0, 917530, 0, 0, 917566, 0, 0, 917567, 0, 0, 983040, 0, 65537, 983041, 0, 65537, 983044, 0, 0, 983045, 0, 65537, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 983066, 0, 0, 983102, 0, 0, 983103, 0, 0, 1048580, 0, 0, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1048599, 0, 65537, 1048600, 0, 65537, 1048601, 0, 65537, 1048602, 0, 65537, 1048607, 0, 131072, 1048608, 0, 0, 1048609, 0, 0, 1048610, 0, 0, 1048611, 0, 0, 1048612, 0, 0, 1048613, 0, 131073, 1048617, 0, 131072, 1048618, 0, 0, 1048619, 0, 0, 1048620, 0, 0, 1048621, 0, 0, 1048622, 0, 0, 1048623, 0, 0, 1048624, 0, 0, 1048625, 0, 0, 1048626, 0, 0, 1048627, 0, 0, 1048628, 0, 0, 1048629, 0, 0, 1048630, 0, 0, 1048631, 0, 131073, 1048633, 0, 196610, 1048638, 0, 0, 1048639, 0, 0, 1114116, 0, 0, 1114143, 0, 0, 1114144, 0, 0, 1114145, 0, 0, 1114146, 0, 0, 1114147, 0, 0, 1114148, 0, 0, 1114149, 0, 0, 1114153, 0, 0, 1114154, 0, 0, 1114155, 0, 0, 1114156, 0, 0, 1114157, 0, 0, 1114158, 0, 0, 1114159, 0, 65537, 1114160, 0, 65537, 1114161, 0, 0, 1114162, 0, 0, 1114163, 0, 0, 1114164, 0, 65537, 1114165, 0, 65537, 1114166, 0, 0, 1114167, 0, 0, 1114168, 0, 131073, 1114169, 0, 196608, 1114174, 0, 0, 1114175, 0, 0, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179652, 0, 65537, 1179678, 0, 131072, 1179679, 0, 0, 1179680, 0, 0, 1179681, 0, 0, 1179682, 0, 0, 1179683, 0, 0, 1179684, 0, 0, 1179685, 0, 0, 1179689, 0, 0, 1179690, 0, 0, 1179691, 0, 0, 1179692, 0, 0, 1179693, 0, 0, 1179694, 0, 0, 1179697, 0, 0, 1179698, 0, 0, 1179699, 0, 0, 1179702, 0, 0, 1179703, 0, 0, 1179704, 0, 0, 1179705, 0, 196608, 1179710, 0, 0, 1179711, 0, 0, 1245192, 0, 65537, 1245193, 0, 65537, 1245194, 0, 65537, 1245195, 0, 65537, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1245213, 0, 131072, 1245214, 0, 0, 1245215, 0, 0, 1245216, 0, 0, 1245217, 0, 0, 1245218, 0, 0, 1245219, 0, 0, 1245220, 0, 0, 1245221, 0, 0, 1245225, 0, 65537, 1245226, 0, 65537, 1245227, 0, 65537, 1245228, 0, 65537, 1245229, 0, 65537, 1245230, 0, 65537, 1245233, 0, 65537, 1245234, 0, 65537, 1245235, 0, 65537, 1245238, 0, 0, 1245239, 0, 0, 1245240, 0, 0, 1245241, 0, 196608, 1310749, 0, 0, 1310750, 0, 0, 1310751, 0, 0, 1310752, 0, 0, 1310753, 0, 0, 1310754, 0, 0, 1310755, 0, 0, 1310756, 0, 0, 1310757, 0, 0, 1310774, 0, 0, 1310775, 0, 0, 1310776, 0, 0, 1310777, 0, 196608, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1376285, 0, 0, 1376286, 0, 0, 1376287, 0, 0, 1376288, 0, 0, 1376289, 0, 0, 1376290, 0, 0, 1376291, 0, 0, 1376292, 0, 0, 1376293, 0, 0, 1376310, 0, 0, 1376311, 0, 0, 1376312, 0, 0, 1376313, 0, 196609, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1441848, 0, 0, 1441849, 0, 0, 1441850, 0, 0, 1441851, 0, 0, 1441852, 0, 0, 1441853, 0, 0, 1441854, 0, 0, 1441855, 0, 0, 1441856, 0, 0, 1441857, 0, 0, 1441858, 0, 0, 1441859, 0, 0, 1441860, 0, 0, 1441861, 0, 0, 1441862, 0, 0, 1441863, 0, 0, 1441864, 0, 0, 1441865, 0, 0, 1441866, 0, 0, 1441867, 0, 0, 1441868, 0, 0, 1441869, 0, 0, 1441870, 0, 0, 1441871, 0, 0, 1441872, 0, 0, 1441873, 0, 0, 1441874, 0, 0, 1441875, 0, 0, 1441876, 0, 0, 1441877, 0, 0, 1441878, 0, 0, 1441879, 0, 0, 1441880, 0, 0, 1441881, 0, 0, 1441882, 0, 0, 1441883, 0, 0, 1441884, 0, 0, 1441885, 0, 0, 1441886, 0, 0, 1441887, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0, 1507384, 0, 0, 1507385, 0, 0, 1507386, 0, 0, 1507387, 0, 0, 1507388, 0, 0, 1507389, 0, 0, 1507390, 0, 0, 1507391, 0, 0, 1507392, 0, 0, 1507393, 0, 0, 1507394, 0, 0, 1507395, 0, 0, 1507396, 0, 0, 1507397, 0, 0, 1507398, 0, 0, 1507399, 0, 0, 1507400, 0, 0, 1507401, 0, 0, 1507402, 0, 0, 1507403, 0, 0, 1507404, 0, 0, 1507405, 0, 0, 1507406, 0, 0, 1507407, 0, 0, 1507408, 0, 0, 1507409, 0, 0, 1507410, 0, 0, 1507411, 0, 0, 1507412, 0, 0, 1507413, 0, 0, 1507414, 0, 0, 1507415, 0, 0, 1507416, 0, 0, 1507417, 0, 0, 1507418, 0, 0, 1507419, 0, 0, 1507420, 0, 0, 1507421, 0, 0, 1507422, 0, 0, 1507423, 0, 0 ) [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 32, 166 ) @@ -53,7 +58,13 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 786445, 0, 196610, 851981, 0, 196608, 917517, 0, 196608, 983053, 0, 196608, 1048589, 0, 196608, 1114125, 0, 196608, 1179661, 0, 196608, 1245197, 0, 196608, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1310733, 0, 196608, 1376268, 0, 262144, 1376269, 0, 196609, 1376274, 0, 262144, 1376284, 0, 262144 ) +tile_data = PoolIntArray( 720919, 0, 0, 786445, 0, 196610, 786460, 0, 196610, 851981, 0, 196608, 851996, 0, 196608, 917517, 0, 196608, 917532, 0, 196608, 983053, 0, 196608, 983068, 0, 196608, 983078, 0, 196610, 1048589, 0, 196608, 1048604, 0, 196608, 1048614, 0, 196608, 1114125, 0, 196608, 1114150, 0, 196608, 1179661, 0, 196608, 1179686, 0, 196608, 1245197, 0, 196608, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1245222, 0, 196608, 1310733, 0, 196608, 1310758, 0, 196608, 1376268, 0, 262144, 1376269, 0, 196609, 1376274, 0, 262144, 1376284, 0, 262144, 1376294, 0, 196609 ) + +[node name="Death" type="TileMap" parent="."] +tile_set = ExtResource( 5 ) +cell_size = Vector2( 8, 8 ) +format = 1 +tile_data = PoolIntArray( 983082, 1, 0, 983083, 1, 0, 983084, 1, 0, 983085, 1, 0 ) [node name="Platforms" type="Node2D" parent="."] @@ -61,15 +72,50 @@ tile_data = PoolIntArray( 786445, 0, 196610, 851981, 0, 196608, 917517, 0, 19660 position = Vector2( 104, 96 ) scale = Vector2( 1, 10 ) +[node name="Ladder2" parent="Platforms" instance=ExtResource( 9 )] +position = Vector2( 224, 96 ) +scale = Vector2( 1, 5 ) + +[node name="Ladder3" parent="Platforms" instance=ExtResource( 9 )] +position = Vector2( 304, 120 ) +scale = Vector2( 1, 7 ) + +[node name="Ladder4" parent="Platforms" instance=ExtResource( 9 )] +position = Vector2( 456, 128 ) +scale = Vector2( 1, 6 ) + [node name="Rock" parent="Platforms" instance=ExtResource( 3 )] position = Vector2( 138, 144 ) +[node name="Rock2" parent="Platforms" instance=ExtResource( 3 )] +position = Vector2( 208, 88 ) + +[node name="Rock3" parent="Platforms" instance=ExtResource( 3 )] +position = Vector2( 272, 48 ) + [node name="FallingBlock" parent="Platforms" instance=ExtResource( 18 )] position = Vector2( 56, 72 ) [node name="FallingBlock4" parent="Platforms" instance=ExtResource( 18 )] position = Vector2( 64, 40 ) +[node name="FallingBlock6" parent="Platforms" instance=ExtResource( 18 )] +position = Vector2( 240, 96 ) + +[node name="FallingBlock7" parent="Platforms" instance=ExtResource( 18 )] +position = Vector2( 352, 96 ) +fall_speed = 1.0 + +[node name="FallingBlock8" parent="Platforms" instance=ExtResource( 18 )] +position = Vector2( 344, 96 ) +fall_speed = 1.0 + +[node name="FallingBlock9" parent="Platforms" instance=ExtResource( 18 )] +position = Vector2( 312, 64 ) + +[node name="FallingBlock10" parent="Platforms" instance=ExtResource( 18 )] +position = Vector2( 328, 56 ) + [node name="FallingBlock2" parent="Platforms" instance=ExtResource( 18 )] position = Vector2( 40, 64 ) @@ -79,6 +125,21 @@ position = Vector2( 0, 144 ) [node name="FallingBlock3" parent="Platforms" instance=ExtResource( 18 )] position = Vector2( 16, 56 ) +[node name="Turniwood" parent="Platforms" instance=ExtResource( 21 )] +position = Vector2( 320, 96 ) + +[node name="Turniwood2" parent="Platforms" instance=ExtResource( 21 )] +position = Vector2( 320, 32 ) + +[node name="Area2D" parent="Platforms" instance=ExtResource( 22 )] +position = Vector2( 336, 120 ) +scale = Vector2( 4, 1 ) + +[node name="Barrier" parent="Platforms" instance=ExtResource( 23 )] +position = Vector2( 496, 152 ) +scale = Vector2( 1, 24 ) +cost = 30 + [node name="Enemies" type="Node2D" parent="."] [node name="Snail" parent="Enemies" instance=ExtResource( 7 )] @@ -86,30 +147,35 @@ position = Vector2( 192, 168 ) left_up_boundry = 3.0 right_down_boundry = 3.0 -[node name="Snail2" parent="Enemies" instance=ExtResource( 7 )] -position = Vector2( 64, 112 ) -left_up_boundry = 3.0 +[node name="Snail4" parent="Enemies" instance=ExtResource( 7 )] +position = Vector2( 272, 88 ) right_down_boundry = 3.0 [node name="Snail3" parent="Enemies" instance=ExtResource( 7 )] -position = Vector2( 8, 80 ) -right_down_boundry = 6.0 +position = Vector2( 312, 168 ) +right_down_boundry = 15.0 +slower_speed = 40 +faster_speed = 100 + +[node name="Snail2" parent="Enemies" instance=ExtResource( 7 )] +position = Vector2( 64, 112 ) +left_up_boundry = 4.0 +right_down_boundry = 3.0 [node name="Bat" parent="Enemies" instance=ExtResource( 10 )] position = Vector2( 120, 96 ) right_down_boundry = 10.0 -[node name="Bat3" parent="Enemies" instance=ExtResource( 10 )] -position = Vector2( 32, 56 ) -right_down_boundry = 4.0 -speed = 20 - [node name="Bat4" parent="Enemies" instance=ExtResource( 10 )] -position = Vector2( 80, 24 ) +position = Vector2( 80, 16 ) +right_down_boundry = 7.0 + +[node name="Bat5" parent="Enemies" instance=ExtResource( 10 )] +position = Vector2( 148, 16 ) right_down_boundry = 6.0 [node name="Bat2" parent="Enemies" instance=ExtResource( 10 )] -position = Vector2( 32, 120 ) +position = Vector2( 24, 120 ) left_up_boundry = 3.0 right_down_boundry = 3.0 speed = 60 @@ -117,12 +183,24 @@ speed = 60 [node name="RollingFiend" parent="Enemies" instance=ExtResource( 13 )] position = Vector2( 144, 96 ) +[node name="RollingFiend3" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 136, 24 ) +move_speed = 80.0 + +[node name="RollingFiend4" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 168, 40 ) +move_speed = 80.0 + +[node name="RollingFiend5" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 192, 48 ) +move_speed = 60.0 + +[node name="RollingFiend6" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 344, 40 ) + [node name="RollingFiend2" parent="Enemies" instance=ExtResource( 13 )] position = Vector2( 80, 144 ) -[node name="Tentacle" parent="Enemies" instance=ExtResource( 16 )] -position = Vector2( 160, 152 ) - [node name="Tentacle2" parent="Enemies" instance=ExtResource( 16 )] position = Vector2( 176, 104 ) @@ -143,6 +221,45 @@ position = Vector2( 88, 144 ) [node name="Gold9" parent="Collectibles" instance=ExtResource( 14 )] position = Vector2( 160, 120 ) +[node name="Gold24" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 344, 40 ) + +[node name="Gold25" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 384, 40 ) + +[node name="Gold26" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 240, 48 ) + +[node name="Gold29" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 264, 120 ) + +[node name="Gold30" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 280, 120 ) + +[node name="Gold31" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 368, 88 ) + +[node name="Gold32" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 400, 88 ) + +[node name="Gold33" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 400, 88 ) + +[node name="Gold27" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 208, 48 ) + +[node name="Gold28" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 184, 48 ) + +[node name="Gold21" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 328, 168 ) + +[node name="Gold22" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 360, 168 ) + +[node name="Gold23" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 392, 168 ) + [node name="Gold10" parent="Collectibles" instance=ExtResource( 14 )] position = Vector2( 144, 120 ) @@ -158,6 +275,15 @@ position = Vector2( 48, 112 ) [node name="Gold13" parent="Collectibles" instance=ExtResource( 14 )] position = Vector2( 56, 64 ) +[node name="Gold18" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 128, 24 ) + +[node name="Gold19" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 144, 24 ) + +[node name="Gold20" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 160, 24 ) + [node name="Gold16" parent="Collectibles" instance=ExtResource( 14 )] position = Vector2( 16, 80 ) @@ -180,22 +306,52 @@ position = Vector2( 8, 112 ) position = Vector2( 64, 112 ) [node name="Star" parent="Collectibles" instance=ExtResource( 15 )] -position = Vector2( 8, 136 ) +position = Vector2( 192, 120 ) + +[node name="Star3" parent="Collectibles" instance=ExtResource( 15 )] +position = Vector2( 296, 16 ) +color = 1 [node name="Star2" parent="Collectibles" instance=ExtResource( 15 )] position = Vector2( 88, 48 ) color = 1 [node name="Shard" parent="Collectibles" instance=ExtResource( 17 )] -position = Vector2( 192, 120 ) +position = Vector2( 8, 136 ) -[node name="Death" type="TileMap" parent="."] -tile_set = ExtResource( 5 ) -cell_size = Vector2( 8, 8 ) -format = 1 +[node name="Shard2" parent="Collectibles" instance=ExtResource( 17 )] +position = Vector2( 416, 168 ) +number = 1 + +[node name="Arrow" parent="Collectibles" instance=ExtResource( 20 )] +position = Vector2( 96, 24 ) [node name="StaticBody2D" type="StaticBody2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] position = Vector2( -4, 96 ) shape = SubResource( 1 ) + +[node name="CollisionShape2D2" type="CollisionShape2D" parent="StaticBody2D"] +position = Vector2( 772, 96 ) +shape = SubResource( 1 ) + +[node name="ColorRect" type="ColorRect" parent="."] +margin_left = 256.0 +margin_right = 512.0 +margin_bottom = 192.0 +color = Color( 0, 1, 0.180392, 0.0627451 ) +script = ExtResource( 19 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="ColorRect2" type="ColorRect" parent="."] +margin_left = 512.0 +margin_right = 768.0 +margin_bottom = 192.0 +color = Color( 1, 0, 0.890196, 0.0627451 ) +script = ExtResource( 19 ) +__meta__ = { +"_edit_lock_": true +} diff --git a/maps/test_room.tscn b/maps/test_room.tscn index dc9bcac..e755d73 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -23,40 +23,44 @@ music = ExtResource( 12 ) position = Vector2( 128, 96 ) z_index = -2 texture = ExtResource( 8 ) +__meta__ = { +"_edit_lock_": true +} [node name="CanvasLayer" parent="." instance=ExtResource( 4 )] [node name="Tentacle" parent="." instance=ExtResource( 3 )] position = Vector2( 184, 152 ) -[node name="FallingBlock" parent="." instance=ExtResource( 7 )] -position = Vector2( 56, 152 ) - -[node name="FallingBlock2" parent="." instance=ExtResource( 7 )] -position = Vector2( 72, 136 ) - [node name="Ground" type="TileMap" parent="."] tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 1310725, 0, 0, 1376261, 0, 0, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0 ) +tile_data = PoolIntArray( 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0 ) [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 32, 166 ) [node name="Ladder2" parent="." instance=ExtResource( 9 )] -position = Vector2( 136, 128 ) -scale = Vector2( 1, 3 ) +position = Vector2( 56, 104 ) +scale = Vector2( 1, 5 ) + +[node name="Ladder3" parent="." instance=ExtResource( 9 )] +position = Vector2( 80, 104 ) +scale = Vector2( 1, 4 ) [node name="Ladder" type="TileMap" parent="."] tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 1048593, 0, 196608, 1114129, 0, 196608, 1179665, 0, 196608, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0 ) +tile_data = PoolIntArray( 851975, 0, 196608, 851978, 0, 196608, 917511, 0, 196608, 917514, 0, 196608, 983047, 0, 196608, 983050, 0, 196608, 1048583, 0, 196608, 1048586, 0, 196608, 1048593, 0, 196608, 1114119, 0, 196608, 1114129, 0, 196608, 1179665, 0, 196608, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0 ) [node name="Death" type="TileMap" parent="."] tile_set = ExtResource( 5 ) cell_size = Vector2( 8, 8 ) format = 1 + +[node name="FallingBlock" parent="." instance=ExtResource( 7 )] +position = Vector2( 40, 160 ) diff --git a/objects/enemy/enemy_speedup_in_range.gd b/objects/enemy/enemy_speedup_in_range.gd index a2e7df6..7df60c4 100644 --- a/objects/enemy/enemy_speedup_in_range.gd +++ b/objects/enemy/enemy_speedup_in_range.gd @@ -25,7 +25,6 @@ func _physics_process(delta): else: move_up_and_down(delta) #Speed up if in raycast if raycast.get_collider() != null: - Debug.print(raycast.get_collider()) if raycast.get_collider().is_in_group("player"): go_fast = true timer.set_wait_time(0.5) diff --git a/objects/enemy/rolling_fiend.tscn b/objects/enemy/rolling_fiend.tscn index 3cf3370..5c4e75c 100644 --- a/objects/enemy/rolling_fiend.tscn +++ b/objects/enemy/rolling_fiend.tscn @@ -38,7 +38,6 @@ move_speed = 50.0 material = SubResource( 5 ) position = Vector2( 0, 1 ) frames = SubResource( 3 ) -frame = 1 playing = true [node name="Hitbox" type="Area2D" parent="." index="1"] diff --git a/objects/environment/falling_block/falling_block.gd b/objects/environment/falling_block/falling_block.gd index 09d1671..7619b7d 100644 --- a/objects/environment/falling_block/falling_block.gd +++ b/objects/environment/falling_block/falling_block.gd @@ -3,16 +3,27 @@ extends KinematicBody2D var fall = false export var fall_speed = 0.5 onready var startpos = position +onready var timer = $Timer func _physics_process(delta): if fall: position.y += fall_speed + Debug.print($Timer.get_time_left()) func _on_Area2D_area_entered(area): if area.is_in_group("player"): - fall = true + $Timer.start() func _on_VisibilityNotifier2D_screen_exited(): position = startpos fall = false + + +func _on_Timer_timeout(): + fall = true + + +func _on_Area2D_area_exited(area): + $Timer.stop() + diff --git a/objects/environment/falling_block/falling_block.tscn b/objects/environment/falling_block/falling_block.tscn index a2549d8..8d60d66 100644 --- a/objects/environment/falling_block/falling_block.tscn +++ b/objects/environment/falling_block/falling_block.tscn @@ -35,5 +35,11 @@ collision_mask = 2 position = Vector2( 4, -0.5 ) shape = SubResource( 2 ) +[node name="Timer" type="Timer" parent="."] +wait_time = 0.15 +one_shot = true + [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="Timer" to="." method="_on_Timer_timeout"] diff --git a/objects/environment/rock/rock.tscn b/objects/environment/rock/rock.tscn index 1054857..4c2fb90 100644 --- a/objects/environment/rock/rock.tscn +++ b/objects/environment/rock/rock.tscn @@ -21,19 +21,20 @@ script = ExtResource( 3 ) [node name="Sprite" type="Sprite" parent="."] material = SubResource( 1 ) -position = Vector2( 0, -1 ) +position = Vector2( -1, -1 ) texture = ExtResource( 1 ) centered = false [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 5, 3.5 ) +position = Vector2( 4, 3.5 ) shape = SubResource( 2 ) [node name="Area2D" type="Area2D" parent="." groups=["squash"]] +position = Vector2( -1, 0 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] position = Vector2( 5, 3.5 ) shape = SubResource( 3 ) [node name="Bottom" type="Position2D" parent="."] -position = Vector2( 5, 8 ) +position = Vector2( 4, 8 )