diff --git a/autoloads/audio.gd b/autoloads/audio.gd index 565228e..0d9c600 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -93,9 +93,9 @@ func play_shard_sound(): var r = 0 if Game.deaths == 0: if Game.shards == 4: - r = randi() % 100 + r = 40 else: - r = randi() % 90 + r = 40 if r <= 30: play_sound(a_good_job_penny,ac_shard) if r > 30 && r <= 60: play_sound(a_good_job_haze,ac_shard) if r > 60 && r <= 90: play_sound(a_good_job_ivy,ac_shard) @@ -117,9 +117,9 @@ func great_job(): ac_music.set_stream_paused(true) ac_pause_music.set_stream_paused(true) if Game.deaths == 0: - r = randi() % 100 + r = 40 else: - r = randi() % 90 + r = 40 if r <= 30: play_sound(a_great_job_penny,ac_shard) if r > 30 && r <= 60: play_sound(a_great_job_haze,ac_shard) if r > 60 && r <= 90: play_sound(a_great_job_ivy,ac_shard) diff --git a/autoloads/level_data.tscn b/autoloads/level_data.tscn index b209a3f..6bef229 100644 --- a/autoloads/level_data.tscn +++ b/autoloads/level_data.tscn @@ -171,7 +171,7 @@ scene = ExtResource( 9 ) resource_name = "Fami's Lab" script = ExtResource( 5 ) title = "Fami's Lab" -shard_titles = [ "Jump the Spike", "Final Obstacle Course", "5-Finger Discount", "Partners in law", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] +shard_titles = [ "Spikes Can't Stop You", "Final Obstacle Course", "5-Finger Discount", "Good Job!", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] save_id = "lab" shards_required = 0 shards_required_easy = 0 diff --git a/graphics/enemy/boss/stg_2600/head_cracked.png b/graphics/enemy/boss/stg_2600/head_cracked.png index ac11103..a81ac62 100644 Binary files a/graphics/enemy/boss/stg_2600/head_cracked.png and b/graphics/enemy/boss/stg_2600/head_cracked.png differ diff --git a/maps/cave_scholar.tscn b/maps/cave_scholar.tscn index ceb4442..7c8407c 100644 --- a/maps/cave_scholar.tscn +++ b/maps/cave_scholar.tscn @@ -186,9 +186,6 @@ position = Vector2( 192, 16 ) [node name="Stalactite7" parent="Environment" instance=ExtResource( 3 )] position = Vector2( 176, 96 ) -[node name="Stalactite8" parent="Environment" instance=ExtResource( 3 )] -position = Vector2( 208, 96 ) - [node name="Stalactite11" parent="Environment" instance=ExtResource( 3 )] position = Vector2( 320, 120 ) diff --git a/maps/lab.tscn b/maps/lab.tscn index b3a36a4..f744616 100644 --- a/maps/lab.tscn +++ b/maps/lab.tscn @@ -104,7 +104,7 @@ tile_set = ExtResource( 4 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 39, 1, 0, 46, 1, 0, 90, 1, 0, 65575, 1, 65536, 65582, 1, 65536, 65587, 1, 196609, 65588, 1, 196610, 65589, 1, 196610, 65590, 1, 196610, 65591, 1, 196610, 65592, 1, 196610, 65593, 1, 196610, 65594, 1, 196611, 65626, 1, 65536, 131111, 1, 131073, 131112, 1, 196610, 131113, 1, 196610, 131114, 1, 196610, 131115, 1, 196610, 131116, 1, 196610, 131117, 1, 196610, 131118, 1, 65539, 131119, 4, 65536, 131120, 4, 65536, 131121, 4, 65536, 131122, 4, 65536, 131162, 1, 65536, 196654, 1, 65536, 196698, 1, 65536, 262190, 1, 131073, 262191, 1, 196610, 262192, 1, 196610, 262193, 1, 2, 262194, 1, 196610, 262195, 1, 196611, 262205, 1, 1, 262206, 1, 196610, 262207, 1, 196610, 262208, 1, 196611, 262213, 1, 196609, 262214, 1, 196610, 262215, 1, 196610, 262216, 1, 196610, 262217, 1, 196611, 262229, 1, 196609, 262230, 1, 196610, 262231, 1, 196610, 262232, 1, 196610, 262233, 1, 196610, 262234, 1, 65539, 327699, 1, 0, 327729, 1, 65536, 327741, 1, 65536, 327770, 1, 65536, 393220, 1, 196609, 393221, 1, 196610, 393222, 1, 196611, 393235, 1, 131072, 393243, 1, 196609, 393244, 1, 196610, 393245, 1, 196610, 393246, 1, 196610, 393247, 1, 2, 393248, 1, 196610, 393249, 1, 3, 393265, 1, 65537, 393266, 1, 196610, 393267, 1, 196610, 393268, 1, 196610, 393269, 1, 196610, 393270, 1, 196610, 393271, 1, 196610, 393272, 1, 196610, 393273, 1, 196610, 393274, 1, 196610, 393275, 1, 196610, 393276, 1, 196610, 393277, 1, 131075, 393306, 1, 131073, 393307, 1, 196610, 393308, 1, 196610, 393309, 1, 3, 458783, 1, 65536, 458785, 1, 131073, 458786, 1, 196610, 458787, 1, 196610, 458788, 1, 196611, 458790, 1, 1, 458791, 1, 196610, 458792, 1, 196610, 458793, 1, 196610, 458794, 1, 196610, 458795, 1, 196610, 458796, 1, 196610, 458797, 1, 196610, 458798, 1, 196610, 458799, 1, 196610, 458800, 1, 196610, 458801, 1, 131075, 458815, 1, 1, 458816, 1, 196611, 458845, 1, 65536, 524319, 1, 65536, 524326, 1, 65536, 524351, 1, 65536, 524361, 1, 0, 524381, 1, 65536, 589855, 1, 65536, 589862, 1, 65536, 589886, 1, 1, 589887, 1, 65539, 589896, 1, 1, 589897, 1, 65539, 589903, 1, 196608, 589908, 1, 196609, 589909, 1, 196610, 589910, 1, 196610, 589911, 1, 196610, 589912, 1, 196610, 589913, 1, 196610, 589914, 1, 196610, 589915, 1, 196611, 589917, 1, 131072, 655390, 1, 196609, 655391, 1, 131075, 655398, 1, 65536, 655418, 1, 1, 655419, 1, 196610, 655420, 1, 196610, 655421, 1, 196610, 655422, 1, 131074, 655423, 1, 131075, 655431, 1, 196609, 655432, 1, 131074, 655433, 1, 131074, 655434, 1, 196611, 720899, 1, 0, 720916, 1, 196608, 720934, 1, 131073, 720935, 1, 196610, 720936, 1, 196610, 720937, 1, 196610, 720938, 1, 196610, 720939, 1, 196610, 720940, 1, 196610, 720941, 1, 196610, 720942, 1, 196610, 720943, 1, 196610, 720944, 1, 196610, 720945, 1, 196610, 720946, 1, 196610, 720947, 1, 196610, 720948, 1, 196610, 720949, 1, 196610, 720950, 1, 196610, 720951, 1, 196610, 720952, 1, 196610, 720953, 1, 196610, 720954, 1, 131075, 786435, 1, 131073, 786436, 1, 196610, 786437, 1, 196610, 786438, 1, 196610, 786439, 1, 196610, 786440, 1, 196610, 786441, 1, 196611, 786444, 1, 196609, 786445, 1, 196610, 786446, 1, 196610, 786447, 1, 196610, 786448, 1, 196610, 786449, 1, 196611, 917566, 1, 1, 917567, 1, 196610, 917568, 1, 196610, 917569, 1, 196610, 917570, 1, 196610, 917571, 1, 196610, 917572, 1, 196610, 917573, 1, 196610, 917574, 1, 196610, 917575, 1, 196610, 917576, 1, 196610, 917577, 1, 196610, 917578, 1, 196610, 917579, 1, 196610, 917580, 1, 196610, 917581, 1, 196610, 917582, 1, 196610, 917583, 1, 196610, 917584, 1, 196610, 917585, 1, 196610, 917586, 1, 196610, 917587, 1, 196610, 917588, 1, 196610, 917589, 1, 196611, 917591, 1, 196609, 917592, 1, 196610, 917593, 1, 196611, 917595, 1, 196609, 917596, 1, 196610, 917597, 1, 196611, 917598, 4, 65536, 917599, 4, 65536, 983077, 1, 1, 983078, 1, 196610, 983079, 1, 196610, 983080, 1, 196610, 983081, 1, 196610, 983082, 1, 196611, 983084, 1, 196608, 983087, 1, 196608, 983090, 1, 196609, 983091, 1, 196610, 983092, 1, 196610, 983093, 1, 196610, 983094, 1, 196610, 983095, 1, 196610, 983096, 1, 196610, 983097, 1, 196610, 983098, 1, 196610, 983099, 1, 196610, 983100, 1, 196611, 983102, 1, 65536, 1048578, 1, 196609, 1048579, 1, 196610, 1048580, 1, 3, 1048586, 1, 196609, 1048587, 1, 196611, 1048593, 1, 196609, 1048594, 1, 196610, 1048595, 1, 196611, 1048610, 1, 1, 1048611, 1, 196610, 1048612, 1, 196610, 1048613, 1, 65539, 1048638, 1, 65536, 1114116, 1, 131073, 1114117, 1, 3, 1114133, 1, 196608, 1114143, 1, 1, 1114144, 1, 196610, 1114145, 1, 196610, 1114146, 1, 131075, 1114149, 1, 65536, 1114174, 1, 65536, 1114190, 1, 0, 1179653, 1, 131073, 1179654, 1, 2, 1179655, 1, 3, 1179662, 1, 0, 1179677, 1, 196609, 1179678, 1, 196610, 1179679, 1, 131075, 1179685, 1, 131073, 1179686, 1, 196610, 1179687, 1, 196610, 1179688, 1, 196610, 1179689, 1, 196610, 1179690, 1, 3, 1179693, 1, 1, 1179694, 1, 196610, 1179695, 1, 196610, 1179696, 1, 3, 1179710, 1, 65536, 1179725, 1, 196609, 1179726, 1, 131075, 1179732, 1, 196609, 1179733, 1, 3, 1179737, 1, 0, 1245190, 1, 131073, 1245191, 1, 131074, 1245192, 1, 196610, 1245193, 1, 196610, 1245194, 1, 196610, 1245195, 1, 196610, 1245196, 1, 196610, 1245197, 1, 196610, 1245198, 1, 131074, 1245199, 1, 196610, 1245200, 1, 196611, 1245213, -1073741820, 65536, 1245226, 1, 131072, 1245228, 1, 196609, 1245229, 1, 131075, 1245232, 1, 131073, 1245233, 1, 3, 1245246, 1, 131072, 1245252, 1, 196609, 1245253, 1, 196610, 1245254, 1, 196610, 1245255, 1, 196610, 1245256, 1, 196611, 1245269, 1, 131073, 1245270, 1, 196611, 1245273, 1, 65536, 1310749, -1073741820, 65536, 1310762, -1073741820, 65536, 1310769, 1, 65536, 1310809, 1, 65536, 1376285, -1073741820, 65536, 1376298, -1073741820, 65536, 1376305, 1, 131072, 1376321, 1, 196609, 1376322, 1, 196610, 1376323, 1, 196611, 1376345, 1, 131072, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 2, 1441824, 0, 2, 1441825, 0, 2, 1441826, 0, 2, 1441827, 1610612736, 2, 1441828, 1610612736, 2, 1441829, 0, 2, 1441830, 0, 2, 1441831, 0, 2, 1441832, 0, 2, 1441833, 0, 2, 1441834, 0, 2, 1441835, 0, 2, 1441836, 0, 2, 1441837, 0, 2, 1441838, 0, 2, 1441839, 0, 2, 1441840, 0, 2, 1441841, 0, 2, 1441842, 0, 2, 1441843, 0, 2, 1441844, 0, 2, 1441845, 0, 2, 1441846, 0, 2, 1441847, 0, 2, 1441848, 0, 2, 1441849, 0, 2, 1441850, 0, 2, 1441851, 0, 2, 1441852, 0, 2, 1441853, 0, 2, 1441854, 0, 2, 1441855, 0, 2, 1441856, 0, 2, 1441857, 0, 2, 1441858, 0, 2, 1441859, 0, 2, 1441860, 0, 2, 1441861, 0, 2, 1441862, 0, 2, 1441863, 0, 2, 1441864, 0, 2, 1441865, 0, 2, 1441866, 0, 2, 1441867, 0, 2, 1441868, 0, 2, 1441869, 0, 2, 1441870, 0, 2, 1441871, 0, 2, 1441872, 0, 2, 1441873, 0, 2, 1441874, 0, 2, 1441875, 0, 2, 1441876, 0, 2, 1441877, 0, 2, 1441878, 0, 2, 1441879, 0, 2, 1441880, 0, 2, 1441881, 0, 2, 1441882, 0, 2, 1441883, 0, 2, 1441884, 0, 2, 1441885, 0, 2, 1441886, 0, 2, 1441887, 0, 3, 1507328, 1, 196609, 1507329, 1, 196610, 1507330, 1, 196610, 1507331, 1, 196610, 1507332, 1, 196610, 1507333, 1, 196610, 1507334, 1, 196610, 1507335, 1, 196610, 1507336, 1, 196610, 1507337, 1, 196610, 1507338, 1, 196610, 1507339, 1, 196610, 1507340, 1, 196610, 1507341, 1, 196610, 1507342, 1, 196610, 1507343, 1, 196610, 1507344, 1, 196610, 1507345, 1, 196610, 1507346, 1, 196610, 1507347, 1, 196610, 1507348, 1, 196610, 1507349, 1, 196610, 1507350, 1, 196610, 1507351, 1, 196610, 1507352, 1, 196610, 1507353, 1, 196610, 1507354, 1, 196610, 1507355, 1, 196610, 1507356, 1, 196610, 1507357, 1, 196610, 1507358, 1, 196610, 1507359, 1, 196610, 1507360, 1, 196610, 1507361, 1, 196610, 1507362, 1, 196610, 1507363, 1, 196610, 1507364, 1, 196610, 1507365, 1, 196610, 1507366, 1, 196610, 1507367, 1, 196610, 1507368, 1, 196610, 1507369, 1, 196610, 1507370, 1, 196610, 1507371, 1, 196610, 1507372, 1, 196610, 1507373, 1, 196610, 1507374, 1, 196610, 1507375, 1, 196610, 1507376, 1, 196610, 1507377, 1, 196610, 1507378, 1, 196610, 1507379, 1, 196610, 1507380, 1, 196610, 1507381, 1, 196610, 1507382, 1, 196610, 1507383, 1, 196610, 1507384, 1, 196610, 1507385, 1, 196610, 1507386, 1, 196610, 1507387, 1, 196610, 1507388, 1, 196610, 1507389, 1, 196610, 1507390, 1, 196610, 1507391, 1, 196610, 1507392, 1, 196610, 1507393, 1, 196610, 1507394, 1, 196610, 1507395, 1, 196610, 1507396, 1, 196610, 1507397, 1, 196610, 1507398, 1, 196610, 1507399, 1, 196610, 1507400, 1, 196610, 1507401, 1, 196610, 1507402, 1, 196610, 1507403, 1, 196610, 1507404, 1, 196610, 1507405, 1, 196610, 1507406, 1, 196610, 1507407, 1, 196610, 1507408, 1, 196610, 1507409, 1, 196610, 1507410, 1, 196610, 1507411, 1, 196610, 1507412, 1, 196610, 1507413, 1, 196610, 1507414, 1, 196610, 1507415, 1, 196610, 1507416, 1, 196610, 1507417, 1, 196610, 1507418, 1, 196610, 1507419, 1, 196610, 1507420, 1, 196610, 1507421, 1, 196610, 1507422, 1, 196610, 1507423, 1, 196611 ) +tile_data = PoolIntArray( 39, 1, 0, 46, 1, 0, 90, 1, 0, 65575, 1, 65536, 65582, 1, 65536, 65587, 1, 196609, 65588, 1, 196610, 65589, 1, 196610, 65590, 1, 196610, 65591, 1, 196610, 65592, 1, 196610, 65593, 1, 196610, 65594, 1, 196611, 65626, 1, 65536, 131111, 1, 131073, 131112, 1, 196610, 131113, 1, 196610, 131114, 1, 196610, 131115, 1, 196610, 131116, 1, 196610, 131117, 1, 196610, 131118, 1, 65539, 131119, 4, 65536, 131120, 4, 65536, 131121, 4, 65536, 131122, 4, 65536, 131162, 1, 65536, 196654, 1, 65536, 196698, 1, 65536, 262190, 1, 131073, 262191, 1, 196610, 262192, 1, 196610, 262193, 1, 2, 262194, 1, 196610, 262195, 1, 196611, 262205, 1, 1, 262206, 1, 196610, 262207, 1, 196610, 262208, 1, 196611, 262213, 1, 196609, 262214, 1, 196610, 262215, 1, 196610, 262216, 1, 196610, 262217, 1, 196611, 262229, 1, 196609, 262230, 1, 196610, 262231, 1, 196610, 262232, 1, 196610, 262233, 1, 196610, 262234, 1, 65539, 327699, 1, 0, 327729, 1, 65536, 327741, 1, 65536, 327770, 1, 65536, 393220, 1, 196609, 393221, 1, 196610, 393222, 1, 196611, 393235, 1, 131072, 393243, 1, 196609, 393244, 1, 196610, 393245, 1, 196610, 393246, 1, 196610, 393247, 1, 2, 393248, 1, 196610, 393249, 1, 3, 393265, 1, 65537, 393266, 1, 196610, 393267, 1, 196610, 393268, 1, 196610, 393269, 1, 196610, 393270, 1, 196610, 393271, 1, 196610, 393272, 1, 196610, 393273, 1, 196610, 393274, 1, 196610, 393275, 1, 196610, 393276, 1, 196610, 393277, 1, 131075, 393306, 1, 131073, 393307, 1, 196610, 393308, 1, 196610, 393309, 1, 3, 458783, 1, 65536, 458785, 1, 131073, 458786, 1, 196610, 458787, 1, 196610, 458788, 1, 196611, 458790, 1, 1, 458791, 1, 196610, 458792, 1, 196610, 458793, 1, 196610, 458794, 1, 196610, 458795, 1, 196610, 458796, 1, 196610, 458797, 1, 196610, 458798, 1, 196610, 458799, 1, 196610, 458800, 1, 196610, 458801, 1, 131075, 458815, 1, 1, 458816, 1, 196611, 458845, 1, 65536, 524319, 1, 65536, 524326, 1, 65536, 524351, 1, 65536, 524361, 1, 0, 524381, 1, 65536, 589855, 1, 65536, 589862, 1, 65536, 589886, 1, 1, 589887, 1, 65539, 589896, 1, 1, 589897, 1, 65539, 589903, 1, 196608, 589908, 1, 196609, 589909, 1, 196610, 589910, 1, 196610, 589911, 1, 196610, 589912, 1, 196610, 589913, 1, 196610, 589914, 1, 196610, 589915, 1, 196611, 589917, 1, 131072, 655390, 1, 196609, 655391, 1, 131075, 655398, 1, 65536, 655418, 1, 1, 655419, 1, 196610, 655420, 1, 196610, 655421, 1, 196610, 655422, 1, 131074, 655423, 1, 131075, 655431, 1, 196609, 655432, 1, 131074, 655433, 1, 131074, 655434, 1, 196611, 720899, 1, 0, 720916, 1, 196608, 720934, 1, 131073, 720935, 1, 196610, 720936, 1, 196610, 720937, 1, 196610, 720938, 1, 196610, 720939, 1, 196610, 720940, 1, 196610, 720941, 1, 196610, 720942, 1, 196610, 720943, 1, 196610, 720944, 1, 196610, 720945, 1, 196610, 720946, 1, 196610, 720947, 1, 196610, 720948, 1, 196610, 720949, 1, 196610, 720950, 1, 196610, 720951, 1, 196610, 720952, 1, 196610, 720953, 1, 196610, 720954, 1, 131075, 786435, 1, 131073, 786436, 1, 196610, 786437, 1, 196610, 786438, 1, 196610, 786439, 1, 196610, 786440, 1, 196610, 786441, 1, 196611, 786444, 1, 196609, 786445, 1, 196610, 786446, 1, 196610, 786447, 1, 196610, 786448, 1, 196610, 786449, 1, 196611, 917566, 1, 1, 917567, 1, 196610, 917568, 1, 196610, 917569, 1, 196610, 917570, 1, 196610, 917571, 1, 196610, 917572, 1, 196610, 917573, 1, 196610, 917574, 1, 196610, 917575, 1, 196610, 917576, 1, 196610, 917577, 1, 196610, 917578, 1, 196610, 917579, 1, 196610, 917580, 1, 196610, 917581, 1, 196610, 917582, 1, 196610, 917583, 1, 196610, 917584, 1, 196610, 917585, 1, 196610, 917586, 1, 196610, 917587, 1, 196610, 917588, 1, 196610, 917589, 1, 196611, 917591, 1, 196609, 917592, 1, 196610, 917593, 1, 196611, 917595, 1, 196609, 917596, 1, 196610, 917597, 1, 196611, 917598, 4, 65536, 917599, 4, 65536, 983077, 1, 1, 983078, 1, 196610, 983079, 1, 196610, 983080, 1, 196610, 983081, 1, 196610, 983082, 1, 196611, 983084, 1, 196608, 983087, 1, 196608, 983090, 1, 196609, 983091, 1, 196610, 983092, 1, 196610, 983093, 1, 196610, 983094, 1, 196610, 983095, 1, 196610, 983096, 1, 196610, 983097, 1, 196610, 983098, 1, 196610, 983099, 1, 196610, 983100, 1, 196611, 983102, 1, 65536, 1048578, 1, 196609, 1048579, 1, 196610, 1048580, 1, 3, 1048586, 1, 196609, 1048587, 1, 196611, 1048593, 1, 196609, 1048594, 1, 196610, 1048595, 1, 196611, 1048610, 1, 1, 1048611, 1, 196610, 1048612, 1, 196610, 1048613, 1, 65539, 1048638, 1, 65536, 1114116, 1, 131073, 1114117, 1, 3, 1114133, 1, 196608, 1114143, 1, 1, 1114144, 1, 196610, 1114145, 1, 196610, 1114146, 1, 131075, 1114149, 1, 65536, 1114174, 1, 65536, 1114190, 1, 0, 1179653, 1, 131073, 1179654, 1, 2, 1179655, 1, 3, 1179662, 1, 0, 1179677, 1, 196609, 1179678, 1, 196610, 1179679, 1, 131075, 1179685, 1, 131073, 1179686, 1, 196610, 1179687, 1, 196610, 1179688, 1, 196610, 1179689, 1, 196610, 1179690, 1, 3, 1179693, 1, 1, 1179694, 1, 196610, 1179695, 1, 196610, 1179696, 1, 3, 1179710, 1, 65536, 1179725, 1, 196609, 1179726, 1, 131075, 1179732, 1, 196609, 1179733, 1, 3, 1179737, 1, 0, 1245190, 1, 131073, 1245191, 1, 131074, 1245192, 1, 196610, 1245193, 1, 196610, 1245194, 1, 196610, 1245195, 1, 196610, 1245196, 1, 196610, 1245197, 1, 196610, 1245198, 1, 131074, 1245199, 1, 196610, 1245200, 1, 196611, 1245213, -1073741820, 65536, 1245226, 1, 131072, 1245228, 1, 196609, 1245229, 1, 131075, 1245232, 1, 131073, 1245233, 1, 3, 1245246, 1, 131072, 1245252, 1, 196609, 1245253, 1, 196610, 1245254, 1, 196610, 1245255, 1, 196610, 1245256, 1, 196611, 1245269, 1, 131073, 1245270, 1, 196611, 1245273, 1, 65536, 1310749, -1073741820, 65536, 1310762, -1073741820, 65536, 1310769, 1, 65537, 1310770, 1, 3, 1310809, 1, 65536, 1376285, -1073741820, 65536, 1376298, -1073741820, 65536, 1376305, 1, 131073, 1376306, 1, 131075, 1376321, 1, 196609, 1376322, 1, 196610, 1376323, 1, 196611, 1376345, 1, 131072, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 2, 1441824, 0, 2, 1441825, 0, 2, 1441826, 0, 2, 1441827, 1610612736, 2, 1441828, 1610612736, 2, 1441829, 0, 2, 1441830, 0, 2, 1441831, 0, 2, 1441832, 0, 2, 1441833, 0, 2, 1441834, 0, 2, 1441835, 0, 2, 1441836, 0, 2, 1441837, 0, 2, 1441838, 0, 2, 1441839, 0, 2, 1441840, 0, 2, 1441841, 0, 2, 1441842, 0, 2, 1441843, 0, 2, 1441844, 0, 2, 1441845, 0, 2, 1441846, 0, 2, 1441847, 0, 2, 1441848, 0, 2, 1441849, 0, 2, 1441850, 0, 2, 1441851, 0, 2, 1441852, 0, 2, 1441853, 0, 2, 1441854, 0, 2, 1441855, 0, 2, 1441856, 0, 2, 1441857, 0, 2, 1441858, 0, 2, 1441859, 0, 2, 1441860, 0, 2, 1441861, 0, 2, 1441862, 0, 2, 1441863, 0, 2, 1441864, 0, 2, 1441865, 0, 2, 1441866, 0, 2, 1441867, 0, 2, 1441868, 0, 2, 1441869, 0, 2, 1441870, 0, 2, 1441871, 0, 2, 1441872, 0, 2, 1441873, 0, 2, 1441874, 0, 2, 1441875, 0, 2, 1441876, 0, 2, 1441877, 0, 2, 1441878, 0, 2, 1441879, 0, 2, 1441880, 0, 2, 1441881, 0, 2, 1441882, 0, 2, 1441883, 0, 2, 1441884, 0, 2, 1441885, 0, 2, 1441886, 0, 2, 1441887, 0, 3, 1507328, 1, 196609, 1507329, 1, 196610, 1507330, 1, 196610, 1507331, 1, 196610, 1507332, 1, 196610, 1507333, 1, 196610, 1507334, 1, 196610, 1507335, 1, 196610, 1507336, 1, 196610, 1507337, 1, 196610, 1507338, 1, 196610, 1507339, 1, 196610, 1507340, 1, 196610, 1507341, 1, 196610, 1507342, 1, 196610, 1507343, 1, 196610, 1507344, 1, 196610, 1507345, 1, 196610, 1507346, 1, 196610, 1507347, 1, 196610, 1507348, 1, 196610, 1507349, 1, 196610, 1507350, 1, 196610, 1507351, 1, 196610, 1507352, 1, 196610, 1507353, 1, 196610, 1507354, 1, 196610, 1507355, 1, 196610, 1507356, 1, 196610, 1507357, 1, 196610, 1507358, 1, 196610, 1507359, 1, 196610, 1507360, 1, 196610, 1507361, 1, 196610, 1507362, 1, 196610, 1507363, 1, 196610, 1507364, 1, 196610, 1507365, 1, 196610, 1507366, 1, 196610, 1507367, 1, 196610, 1507368, 1, 196610, 1507369, 1, 196610, 1507370, 1, 196610, 1507371, 1, 196610, 1507372, 1, 196610, 1507373, 1, 196610, 1507374, 1, 196610, 1507375, 1, 196610, 1507376, 1, 196610, 1507377, 1, 196610, 1507378, 1, 196610, 1507379, 1, 196610, 1507380, 1, 196610, 1507381, 1, 196610, 1507382, 1, 196610, 1507383, 1, 196610, 1507384, 1, 196610, 1507385, 1, 196610, 1507386, 1, 196610, 1507387, 1, 196610, 1507388, 1, 196610, 1507389, 1, 196610, 1507390, 1, 196610, 1507391, 1, 196610, 1507392, 1, 196610, 1507393, 1, 196610, 1507394, 1, 196610, 1507395, 1, 196610, 1507396, 1, 196610, 1507397, 1, 196610, 1507398, 1, 196610, 1507399, 1, 196610, 1507400, 1, 196610, 1507401, 1, 196610, 1507402, 1, 196610, 1507403, 1, 196610, 1507404, 1, 196610, 1507405, 1, 196610, 1507406, 1, 196610, 1507407, 1, 196610, 1507408, 1, 196610, 1507409, 1, 196610, 1507410, 1, 196610, 1507411, 1, 196610, 1507412, 1, 196610, 1507413, 1, 196610, 1507414, 1, 196610, 1507415, 1, 196610, 1507416, 1, 196610, 1507417, 1, 196610, 1507418, 1, 196610, 1507419, 1, 196610, 1507420, 1, 196610, 1507421, 1, 196610, 1507422, 1, 196610, 1507423, 1, 196611 ) [node name="ElectricTiles" parent="." groups=["can_stain"] instance=ExtResource( 28 )] material = SubResource( 9 ) @@ -136,7 +136,6 @@ shape = SubResource( 6 ) [node name="CollisionShape2D7" type="CollisionShape2D" parent="ElectricTiles/DeathTile" index="6"] position = Vector2( 520.161, -54.0323 ) -scale = Vector2( 1, 1 ) shape = SubResource( 7 ) [node name="CollisionShape2D10" type="CollisionShape2D" parent="ElectricTiles/DeathTile" index="7"] @@ -152,7 +151,7 @@ tile_set = ExtResource( 9 ) cell_size = Vector2( 8, 8 ) collision_layer = 32 format = 1 -tile_data = PoolIntArray( 196682, 12, 0, 262211, 12, 0, 262218, 12, 0, 262220, 12, 0, 262221, 12, 0, 262223, 12, 0, 327754, 12, 0, 327755, 12, 0, 327756, 12, 0, 327757, 12, 0, 327758, 12, 0, 327759, 12, 0, 327760, 12, 0, 327761, 12, 0, 327762, 12, 0, 327763, 12, 0, 327764, 12, 0, 393230, 12, 0, 393231, 12, 0, 393232, 12, 0, 393233, 12, 0, 393234, 12, 0, 393236, 12, 0, 393237, 12, 0, 393238, 12, 0, 393239, 12, 0, 393240, 12, 0, 393241, 12, 0, 393242, 12, 0, 458818, 12, 0, 589900, 12, 0, 589906, 12, 0, 655384, 12, 0, 655427, 12, 0, 720902, 1, 0, 720905, 1, 0, 720913, 1, 0, 786453, 12, 0, 786454, 12, 0, 786455, 12, 0, 786457, 12, 0, 786458, 12, 0, 786459, 12, 0, 786460, 12, 0, 851996, 12, 0, 852041, 1, 0, 852044, 1, 0, 852048, 1, 0, 852052, 1, 0, 852056, 1, 0, 917532, 12, 0, 917533, 12, 0, 917590, 12, 0, 917594, 12, 0, 983083, 12, 0, 983085, 12, 0, 983086, 12, 0, 983088, 12, 0, 983089, 12, 0, 1048627, 1610612737, 0, 1048628, 1610612737, 0, 1179717, 1, 0, 1179719, 1, 0, 1245257, -1610612735, 0, 1376310, 1, 0, 1376315, 1, 0, 2031608, 9, 0, 2031609, 6, 0, 2031610, 9, 0, 2031611, 6, 0, 2031612, 9, 0, 2097144, 6, 0, 2097145, 9, 0, 2097146, 6, 0, 2097147, 9, 0, 2097148, 6, 0, 2162680, 9, 0, 2162681, 6, 0, 2162682, 9, 0, 2162683, 6, 0, 2162684, 9, 0, 2228216, 6, 0, 2228217, 9, 0, 2228218, 6, 0, 2228219, 9, 0, 2228220, 6, 0, 2293752, 9, 0, 2293753, 6, 0, 2293754, 9, 0, 2293755, 6, 0, 2293756, 9, 0 ) +tile_data = PoolIntArray( 196682, 12, 0, 262211, 12, 0, 262218, 12, 0, 262220, 12, 0, 262221, 12, 0, 262223, 12, 0, 327754, 12, 0, 327755, 12, 0, 327756, 12, 0, 327757, 12, 0, 327758, 12, 0, 327759, 12, 0, 327760, 12, 0, 327761, 12, 0, 327762, 12, 0, 327763, 12, 0, 327764, 12, 0, 393230, 12, 0, 393231, 12, 0, 393232, 12, 0, 393233, 12, 0, 393234, 12, 0, 393236, 12, 0, 393237, 12, 0, 393238, 12, 0, 393239, 12, 0, 393240, 12, 0, 393241, 12, 0, 393242, 12, 0, 458818, 12, 0, 589900, 12, 0, 589906, 12, 0, 655384, 12, 0, 655427, 12, 0, 720902, 1, 0, 720905, 1, 0, 720913, 1, 0, 786453, 12, 0, 786454, 12, 0, 786455, 12, 0, 786457, 12, 0, 786458, 12, 0, 786459, 12, 0, 786460, 12, 0, 851996, 12, 0, 852041, 1, 0, 852044, 1, 0, 852048, 1, 0, 852052, 1, 0, 852056, 1, 0, 917532, 12, 0, 917533, 12, 0, 917590, 12, 0, 917594, 12, 0, 983083, 12, 0, 983085, 12, 0, 983086, 12, 0, 983088, 12, 0, 983089, 12, 0, 1179717, 1, 0, 1179719, 1, 0, 1245257, -1610612735, 0, 1376307, 1, 0, 1376309, 1, 0, 1376311, 1, 0, 1376315, 1, 0, 2031608, 9, 0, 2031609, 6, 0, 2031610, 9, 0, 2031611, 6, 0, 2031612, 9, 0, 2097144, 6, 0, 2097145, 9, 0, 2097146, 6, 0, 2097147, 9, 0, 2097148, 6, 0, 2162680, 9, 0, 2162681, 6, 0, 2162682, 9, 0, 2162683, 6, 0, 2162684, 9, 0, 2228216, 6, 0, 2228217, 9, 0, 2228218, 6, 0, 2228219, 9, 0, 2228220, 6, 0, 2293752, 9, 0, 2293753, 6, 0, 2293754, 9, 0, 2293755, 6, 0, 2293756, 9, 0 ) [node name="Ladder" type="TileMap" parent="."] tile_set = ExtResource( 21 ) @@ -229,7 +228,7 @@ right_boundary = 5.0 turn_time = 1.0 [node name="Shard" parent="Enemies/Cop3" instance=ExtResource( 31 )] -position = Vector2( 8, 0 ) +position = Vector2( 10, 0 ) number = 2 [node name="RollingFiend5" parent="Enemies" instance=ExtResource( 11 )] @@ -292,9 +291,9 @@ down_boundary = 3 [node name="Snake" parent="Enemies" instance=ExtResource( 7 )] position = Vector2( 456, 168 ) -left_up_boundary = 4.0 +left_up_boundary = 6.0 right_down_boundary = 4.0 -speed = 80 +speed = 70 [node name="Platforms" type="Node2D" parent="."] @@ -343,14 +342,6 @@ left_up_boundary = 8.0 right_down_boundary = 1.0 move_direction = 1 -[node name="MovingPlatform2" parent="Platforms" instance=ExtResource( 27 )] -position = Vector2( 416, 168 ) -scale = Vector2( 2, 1 ) -speed = 70 -left_up_boundary = 3.0 -right_down_boundary = 1.0 -move_direction = 1 - [node name="FallingBlock3" parent="Platforms" instance=ExtResource( 33 )] position = Vector2( 144, 48 ) diff --git a/maps/rust.tscn b/maps/rust.tscn index 8683d39..7f5c136 100644 --- a/maps/rust.tscn +++ b/maps/rust.tscn @@ -60,7 +60,7 @@ material = ExtResource( 26 ) tile_set = ExtResource( 4 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 48, 0, 0, 65584, 0, 0, 131120, 0, 0, 196614, 0, 0, 196656, 0, 0, 196671, 0, 0, 196672, 0, 0, 196673, 0, 0, 196674, 0, 0, 262173, 0, 131072, 262174, 0, 65537, 262175, 0, 65537, 262176, 0, 65537, 262177, 0, 65537, 262178, 0, 65537, 262179, 0, 65537, 262180, 0, 65537, 262181, -1610612736, 131072, 262192, 0, 0, 327691, 0, 131072, 327692, 0, 65537, 327693, 0, 65537, 327694, 0, 65537, 327695, 0, 65537, 327696, 0, 65537, 327697, 0, 65537, 327698, 0, 65537, 327699, 0, 65537, 327700, 0, 65537, 327701, 0, 65537, 327702, 0, 65537, 327703, 0, 65537, 327704, 0, 65537, 327705, 0, 65537, 327706, 0, 65537, 327707, 0, 65537, 327708, 0, 65537, 327709, 1610612736, 131072, 327717, -1073741824, 65537, 327733, 0, 0, 327734, 0, 196609, 327735, 0, 196609, 327736, 0, 65536, 327737, 0, 65538, 327738, 0, 65537, 327739, 0, 65538, 327740, 536870912, 65536, 327760, 0, 131072, 327761, 0, 65537, 327762, 1610612736, 65538, 327763, 0, 65537, 327764, 0, 131073, 327765, 0, 65537, 327766, 0, 65537, 327767, 0, 65537, 327768, 0, 65537, 327769, 0, 65537, 327770, 0, 65537, 327771, 0, 65538, 327772, 0, 65537, 327773, 0, 65537, 327774, 0, 65537, 327775, 0, 65537, 393227, -2147483648, 65537, 393253, -1073741824, 65537, 393268, 0, 0, 393269, 0, 0, 393288, 0, 65536, 393289, 0, 65537, 393290, 0, 131075, 393296, -1073741824, 65537, 458763, -2147483648, 65537, 458789, -1073741824, 131072, 458790, 0, 65537, 458791, 0, 65537, 458792, 0, 65537, 458793, 0, 65537, 458794, 0, 65537, 458795, 0, 65537, 458796, 0, 65537, 458797, 0, 65537, 458798, 0, 65537, 458799, 536870912, 65536, 458805, 0, 0, 458832, -1073741824, 65538, 524299, -2147483648, 65537, 524315, 0, 131072, 524316, 0, 65537, 524317, 0, 65537, 524318, 0, 65537, 524319, 0, 65537, 524320, 0, 65537, 524321, 0, 65537, 524322, 536870912, 131072, 524338, 0, 0, 524341, 0, 0, 524342, 0, 0, 524343, 0, 0, 524344, 0, 0, 524368, -1073741824, 65537, 589830, -2147483648, 65536, 589831, 0, 196609, 589832, 0, 196609, 589833, 0, 65536, 589834, 0, 65537, 589835, -536870912, 131072, 589851, -1073741824, 65537, 589858, -1073741824, 65537, 589898, 0, 65536, 589899, 0, 65537, 589900, 536870912, 65536, 589904, -1073741824, 65536, 589906, 0, 0, 589907, 0, 0, 589908, 0, 0, 589910, 0, 0, 589911, 0, 0, 589913, 0, 0, 589914, 0, 0, 655366, -1073741824, 65537, 655376, 0, 65536, 655377, 0, 65537, 655378, 0, 65537, 655379, 0, 65537, 655380, 0, 65537, 655381, 0, 65537, 655382, 0, 65537, 655383, 0, 65537, 655384, 0, 65537, 655385, 0, 65537, 655386, 0, 65537, 655387, 1610612736, 131072, 655394, -1073741824, 131072, 655395, 0, 65537, 655396, 0, 65537, 655397, 0, 65538, 655398, 0, 65537, 655399, 0, 65537, 655400, 0, 65537, 655401, 536870912, 65536, 655418, 0, 0, 655419, 0, 0, 655420, 0, 0, 720902, -1073741824, 65537, 720903, 0, 196609, 720904, 0, 196609, 720962, 0, 0, 720963, 0, 0, 720964, 0, 0, 720966, 0, 0, 720967, 0, 0, 720968, 0, 0, 786438, -1073741824, 65538, 851974, -1073741824, 65537, 851975, 0, 196609, 851976, 0, 196609, 851989, 0, 0, 852021, 0, 0, 852042, 0, 0, 917510, -1073741824, 65537, 917550, 0, 65536, 917551, 0, 65537, 917552, 0, 65537, 917553, 0, 65537, 917554, 0, 65537, 917555, 0, 65537, 917556, 0, 65537, 917557, 0, 65537, 917558, 0, 65537, 917559, 0, 65537, 917560, 0, 65537, 917561, -1610612736, 131072, 917565, 0, 65536, 917566, 0, 65537, 917567, 0, 65537, 917568, 0, 65537, 917569, 0, 65537, 917570, 0, 65537, 917571, 0, 65537, 917572, 536870912, 65536, 917590, 0, 0, 917591, 0, 0, 917592, 0, 0, 917593, 0, 0, 917594, 0, 0, 917595, 0, 0, 917596, 0, 0, 917597, 0, 0, 917599, 0, 0, 983046, -1073741824, 131072, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 983052, 0, 65537, 983053, 0, 65537, 983054, 0, 65538, 983055, 0, 262144, 983057, 0, 262145, 983058, 0, 131075, 983078, 0, 0, 983079, 0, 0, 983080, 0, 0, 983081, 0, 0, 983097, -1073741824, 131072, 983098, -1610612736, 131072, 983113, 0, 0, 983121, 0, 0, 983122, 0, 0, 983123, 0, 0, 1048634, -1073741824, 65537, 1048647, 0, 0, 1114135, 0, 131072, 1114136, 0, 65537, 1114137, 0, 65537, 1114138, 0, 65537, 1114139, 0, 65537, 1114140, 0, 65537, 1114141, 0, 65538, 1114142, 0, 65537, 1114143, 0, 65537, 1114144, 0, 65537, 1114145, 0, 65537, 1114146, 0, 65537, 1114147, 0, 65537, 1114148, -1610612736, 131072, 1114170, -1073741824, 131072, 1114171, 0, 65537, 1114172, 0, 65537, 1114173, 0, 65537, 1114174, 536870912, 65537, 1114175, 0, 65537, 1114176, 0, 65537, 1114177, 0, 65537, 1114178, 0, 131075, 1114191, 0, 0, 1114205, 0, 0, 1114206, 0, 0, 1179661, 0, 65536, 1179662, 0, 65537, 1179663, 0, 131074, 1179664, 0, 131074, 1179665, 0, 65537, 1179666, 0, 65537, 1179667, 0, 65537, 1179668, 0, 131074, 1179669, 0, 131074, 1179670, 0, 65537, 1179671, 1610612736, 131072, 1179684, -1073741824, 65537, 1179723, 0, 0, 1179724, 0, 0, 1179725, 0, 0, 1245220, -1073741824, 131072, 1245221, 0, 65537, 1245222, 0, 65537, 1245223, 0, 131075, 1245254, 0, 65536, 1245255, 0, 65537, 1245256, 536870912, 65536, 1310720, 0, 0, 1310721, 0, 0, 1310731, 0, 0, 1376256, 0, 0, 1376257, 0, 0, 1376261, 0, 0, 1376286, 0, 0, 1376297, 0, 0, 1376304, 0, 0, 1376312, 0, 65536, 1376313, 536870912, 65538, 1376314, 536870912, 65537, 1376315, 536870912, 65536, 1376333, 0, 0, 1376334, 0, 0, 1376335, 0, 0, 1376341, 0, 0, 1376342, 0, 0, 1376343, 0, 0, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 2, 1441824, 0, 2, 1441825, 0, 2, 1441826, 0, 2, 1441827, 0, 2, 1441828, 0, 2, 1441829, 0, 2, 1441830, 0, 2, 1441831, 0, 2, 1441832, 0, 2, 1441833, 0, 2, 1441834, 0, 2, 1441835, 0, 2, 1441836, 0, 2, 1441837, 0, 3, 1441843, 0, 1, 1441844, 0, 2, 1441845, 0, 2, 1441846, 0, 3, 1441853, 0, 1, 1441854, 0, 2, 1441855, 0, 2, 1441856, 0, 2, 1441857, 0, 2, 1441858, 0, 2, 1441859, 0, 2, 1441860, 0, 2, 1441861, 0, 2, 1441862, 0, 2, 1441863, 0, 2, 1441864, 0, 2, 1441865, 0, 2, 1441866, 0, 2, 1441867, 0, 3, 1441882, 0, 1, 1441883, 0, 2, 1441884, 0, 2, 1441885, 0, 2, 1441886, 0, 2, 1441887, 0, 3, 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, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 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, 1507418, 0, 0, 1507419, 0, 0, 1507420, 0, 0, 1507421, 0, 0, 1507422, 0, 0, 1507423, 0, 0 ) +tile_data = PoolIntArray( 48, 0, 0, 65584, 0, 0, 131120, 0, 0, 196614, 0, 0, 196656, 0, 0, 196671, 0, 0, 196672, 0, 0, 196673, 0, 0, 196674, 0, 0, 262173, 0, 131072, 262174, 0, 65537, 262175, 0, 65537, 262176, 0, 65537, 262177, 0, 65537, 262178, 0, 65537, 262179, 0, 65537, 262180, 0, 65537, 262181, -1610612736, 131072, 262192, 0, 0, 327691, 0, 131072, 327692, 0, 65537, 327693, 0, 65537, 327694, 0, 65537, 327695, 0, 65537, 327696, 0, 65537, 327697, 0, 65537, 327698, 0, 65537, 327699, 0, 65537, 327700, 0, 65537, 327701, 0, 65537, 327702, 0, 65537, 327703, 0, 65537, 327704, 0, 65537, 327705, 0, 65537, 327706, 0, 65537, 327707, 0, 65537, 327708, 0, 65537, 327709, 1610612736, 131072, 327717, -1073741824, 65537, 327733, 0, 0, 327734, 0, 196609, 327735, 0, 196609, 327736, 0, 65536, 327737, 0, 65538, 327738, 0, 65537, 327739, 0, 65538, 327740, 536870912, 65536, 327760, 0, 131072, 327761, 0, 65537, 327762, 1610612736, 65538, 327763, 0, 65537, 327764, 0, 131073, 327765, 0, 65537, 327766, 0, 65537, 327767, 0, 65537, 327768, 0, 65537, 327769, 0, 65537, 327770, 0, 65537, 327771, 0, 65538, 327772, 0, 65537, 327773, 0, 65537, 327774, 0, 65537, 327775, 0, 65537, 393227, -2147483648, 65537, 393253, -1073741824, 65537, 393268, 0, 0, 393269, 0, 0, 393288, 0, 65536, 393289, 0, 65537, 393290, 0, 131075, 393296, -1073741824, 65537, 458763, -2147483648, 65537, 458789, -1073741824, 131072, 458790, 0, 65537, 458791, 0, 65537, 458792, 0, 65537, 458793, 0, 65537, 458794, 0, 65537, 458795, 0, 65537, 458796, 0, 65537, 458797, 0, 65537, 458798, 0, 65537, 458799, 536870912, 65536, 458805, 0, 0, 458822, 0, 0, 458832, -1073741824, 65538, 524299, -2147483648, 65537, 524315, 0, 131072, 524316, 0, 65537, 524317, 0, 65537, 524318, 0, 65537, 524319, 0, 65537, 524320, 0, 65537, 524321, 0, 65537, 524322, 536870912, 131072, 524338, 0, 0, 524341, 0, 0, 524342, 0, 0, 524343, 0, 0, 524344, 0, 0, 524357, 0, 0, 524358, 0, 0, 524359, 0, 0, 524368, -1073741824, 65537, 589830, -2147483648, 65536, 589831, 0, 196609, 589832, 0, 196609, 589833, 0, 65536, 589834, 0, 65537, 589835, -536870912, 131072, 589851, -1073741824, 65537, 589858, -1073741824, 65537, 589892, 0, 0, 589893, 0, 0, 589894, 0, 0, 589898, 0, 65536, 589899, 0, 65537, 589900, 536870912, 65536, 589904, -1073741824, 65536, 589906, 0, 0, 589907, 0, 0, 589908, 0, 0, 589910, 0, 0, 589911, 0, 0, 589913, 0, 0, 589914, 0, 0, 655366, -1073741824, 65537, 655376, 0, 65536, 655377, 0, 65537, 655378, 0, 65537, 655379, 0, 65537, 655380, 0, 65537, 655381, 0, 65537, 655382, 0, 65537, 655383, 0, 65537, 655384, 0, 65537, 655385, 0, 65537, 655386, 0, 65537, 655387, 1610612736, 131072, 655394, -1073741824, 131072, 655395, 0, 65537, 655396, 0, 65537, 655397, 0, 65538, 655398, 0, 65537, 655399, 0, 65537, 655400, 0, 65537, 655401, 536870912, 65536, 655418, 0, 0, 655419, 0, 0, 655420, 0, 0, 655427, 0, 0, 655428, 0, 0, 655429, 0, 0, 655430, 0, 0, 720902, -1073741824, 65537, 720903, 0, 196609, 720904, 0, 196609, 720962, 0, 0, 720963, 0, 0, 720964, 0, 0, 720965, 0, 0, 720966, 0, 0, 720967, 0, 0, 720968, 0, 0, 786438, -1073741824, 65538, 851974, -1073741824, 65537, 851975, 0, 196609, 851976, 0, 196609, 851989, 0, 0, 852021, 0, 0, 852042, 0, 0, 917510, -1073741824, 65537, 917519, 0, 131072, 917520, 0, 262144, 917550, 0, 65536, 917551, 0, 65537, 917552, 0, 65537, 917553, 0, 65537, 917554, 0, 65537, 917555, 0, 65537, 917556, 0, 65537, 917557, 0, 65537, 917558, 0, 65537, 917559, 0, 65537, 917560, 0, 65537, 917561, -1610612736, 131072, 917565, 0, 65536, 917566, 0, 65537, 917567, 0, 65537, 917568, 0, 65537, 917569, 0, 65537, 917570, 0, 65537, 917571, 0, 65537, 917572, 536870912, 65536, 917590, 0, 0, 917591, 0, 0, 917592, 0, 0, 917593, 0, 0, 917594, 0, 0, 917595, 0, 0, 917596, 0, 0, 917597, 0, 0, 917599, 0, 0, 983046, -1073741824, 131072, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 983052, 0, 65537, 983053, 0, 65537, 983054, 0, 65538, 983055, 1610612736, 131072, 983058, 0, 0, 983059, 0, 0, 983078, 0, 0, 983079, 0, 0, 983080, 0, 0, 983081, 0, 0, 983097, -1073741824, 131072, 983098, -1610612736, 131072, 983113, 0, 0, 983121, 0, 0, 983122, 0, 0, 983123, 0, 0, 1048634, -1073741824, 65537, 1048647, 0, 0, 1114135, 0, 131072, 1114136, 0, 65537, 1114137, 0, 65537, 1114138, 0, 65537, 1114139, 0, 65537, 1114140, 0, 65537, 1114141, 0, 65538, 1114142, 0, 65537, 1114143, 0, 65537, 1114144, 0, 65537, 1114145, 0, 65537, 1114146, 0, 65537, 1114147, 0, 65537, 1114148, -1610612736, 131072, 1114170, -1073741824, 131072, 1114171, 0, 65537, 1114172, 0, 65537, 1114173, 0, 65537, 1114174, 536870912, 65537, 1114175, 0, 65537, 1114176, 0, 65537, 1114177, 0, 65537, 1114178, 0, 131075, 1114191, 0, 0, 1114205, 0, 0, 1114206, 0, 0, 1179661, 0, 65536, 1179662, 0, 65537, 1179663, 0, 131074, 1179664, 0, 131074, 1179665, 0, 65537, 1179666, 0, 65537, 1179667, 0, 65537, 1179668, 0, 131074, 1179669, 0, 131074, 1179670, 0, 65537, 1179671, 1610612736, 131072, 1179684, -1073741824, 65537, 1179723, 0, 0, 1179724, 0, 0, 1179725, 0, 0, 1245220, -1073741824, 131072, 1245221, 0, 65537, 1245222, 0, 65537, 1245223, 0, 131075, 1245254, 0, 65536, 1245255, 0, 65537, 1245256, 536870912, 65536, 1310720, 0, 0, 1310721, 0, 0, 1310731, 0, 0, 1376256, 0, 0, 1376257, 0, 0, 1376261, 0, 0, 1376286, 0, 0, 1376297, 0, 0, 1376304, 0, 0, 1376312, 0, 65536, 1376313, 536870912, 65538, 1376314, 536870912, 65537, 1376315, 536870912, 65536, 1376333, 0, 0, 1376334, 0, 0, 1376335, 0, 0, 1376341, 0, 0, 1376342, 0, 0, 1376343, 0, 0, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 2, 1441824, 0, 2, 1441825, 0, 2, 1441826, 0, 2, 1441827, 0, 2, 1441828, 0, 2, 1441829, 0, 2, 1441830, 0, 2, 1441831, 0, 2, 1441832, 0, 2, 1441833, 0, 2, 1441834, 0, 2, 1441835, 0, 2, 1441836, 0, 2, 1441837, 0, 3, 1441843, 0, 1, 1441844, 0, 2, 1441845, 0, 2, 1441846, 0, 3, 1441853, 0, 1, 1441854, 0, 2, 1441855, 0, 2, 1441856, 0, 2, 1441857, 0, 2, 1441858, 0, 2, 1441859, 0, 2, 1441860, 0, 2, 1441861, 0, 2, 1441862, 0, 2, 1441863, 0, 2, 1441864, 0, 2, 1441865, 0, 2, 1441866, 0, 2, 1441867, 0, 3, 1441882, 0, 1, 1441883, 0, 2, 1441884, 0, 2, 1441885, 0, 2, 1441886, 0, 2, 1441887, 0, 3, 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, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 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, 1507418, 0, 0, 1507419, 0, 0, 1507420, 0, 0, 1507421, 0, 0, 1507422, 0, 0, 1507423, 0, 0 ) [node name="Player" parent="." instance=ExtResource( 5 )] position = Vector2( 24, 176 ) @@ -94,7 +94,7 @@ tile_data = PoolIntArray( 1441837, 7, 0, 1441843, 7, 0, 1441846, 7, 0, 1441853, tile_set = ExtResource( 23 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 196618, 0, 196608, 262154, 0, 196608, 327690, 0, 196608, 327759, 0, 196608, 393226, 0, 196608, 393295, 0, 196608, 458762, 0, 196608, 458822, 0, 196608, 458831, 0, 196608, 524298, 0, 196608, 524358, 0, 196608, 524367, 0, 196608, 589826, 0, 196608, 589894, 0, 196608, 589917, 536870912, 196608, 655362, 0, 196608, 655430, 0, 196608, 655453, 536870912, 196608, 720898, 0, 196608, 720989, 536870912, 196608, 786434, 0, 196608, 786476, 0, 196608, 851970, 0, 196608, 852012, 0, 196608, 917506, 0, 196608, 917548, 0, 196608, 983042, 0, 196608, 983084, 0, 196608, 1048578, 0, 196608, 1179717, 0, 196608, 1245253, 0, 196608 ) +tile_data = PoolIntArray( 196618, 0, 196608, 262154, 0, 196608, 327690, 0, 196608, 327759, 0, 196608, 393226, 0, 196608, 393295, 0, 196608, 458762, 0, 196608, 458831, 0, 196608, 524298, 0, 196608, 524367, 0, 196608, 589826, 0, 196608, 589917, 536870912, 196608, 655362, 0, 196608, 655453, 536870912, 196608, 720898, 0, 196608, 720989, 536870912, 196608, 786434, 0, 196608, 786476, 0, 196608, 851970, 0, 196608, 852012, 0, 196608, 917506, 0, 196608, 917548, 0, 196608, 983042, 0, 196608, 983084, 0, 196608, 1048578, 0, 196608, 1179717, 0, 196608, 1245253, 0, 196608 ) [node name="Environment" type="Node2D" parent="."] @@ -118,10 +118,6 @@ texture = ExtResource( 32 ) position = Vector2( 352, 96 ) scale = Vector2( 1, 4 ) -[node name="Ladder4" parent="Environment" instance=ExtResource( 14 )] -position = Vector2( 560, 56 ) -scale = Vector2( 1, 4 ) - [node name="Ladder7" parent="Environment" instance=ExtResource( 14 )] position = Vector2( 632, 40 ) scale = Vector2( 1, 4 ) @@ -173,10 +169,7 @@ scale = Vector2( 1, 17 ) cost = 15 [node name="Rock3" parent="Environment" instance=ExtResource( 8 )] -position = Vector2( 146, 113 ) - -[node name="Rock6" parent="Environment" instance=ExtResource( 8 )] -position = Vector2( 536, 80 ) +position = Vector2( 152, 112 ) [node name="Enemies" type="Node2D" parent="."] @@ -238,12 +231,11 @@ position = Vector2( 600, 79 ) [node name="RollingSaw6" parent="Enemies" instance=ExtResource( 11 )] position = Vector2( 648, 128 ) +clockwise = true [node name="RollingSaw7" parent="Enemies" instance=ExtResource( 11 )] position = Vector2( 664, 112 ) - -[node name="RollingSaw12" parent="Enemies" instance=ExtResource( 11 )] -position = Vector2( 696, 64 ) +clockwise = true [node name="RollingSaw13" parent="Enemies" instance=ExtResource( 11 )] position = Vector2( 752, 128 ) @@ -502,7 +494,7 @@ color = 1 position = Vector2( 144, 168 ) [node name="Star4" parent="Collectibles" instance=ExtResource( 20 )] -position = Vector2( 576, 80 ) +position = Vector2( 568, 80 ) color = 3 [node name="Star5" parent="Collectibles" instance=ExtResource( 20 )] diff --git a/menus/credits.tscn b/menus/credits.tscn index c8277b3..d490289 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -609,10 +609,9 @@ script = ExtResource( 14 ) layer = -64 [node name="ColorRect2" type="ColorRect" parent="CanvasLayer"] -margin_left = 512.0 -margin_top = 8.0 -margin_right = 768.0 -margin_bottom = 200.0 +margin_left = 4608.0 +margin_right = 4864.0 +margin_bottom = 192.0 color = Color( 0.0666667, 0.164706, 0.454902, 0.329412 ) [node name="Background" type="ColorRect" parent="CanvasLayer"] @@ -861,7 +860,6 @@ position = Vector2( 3584, 0 ) material = SubResource( 7 ) position = Vector2( 74, 69 ) frames = SubResource( 12 ) -frame = 1 playing = true script = ExtResource( 16 ) @@ -892,7 +890,6 @@ align = 1 material = SubResource( 8 ) position = Vector2( 106, 69 ) frames = SubResource( 18 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -993,7 +990,6 @@ align = 1 [node name="TheScrump" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2992, 128 ) frames = SubResource( 27 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/TheScrump"] @@ -1010,7 +1006,6 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2880, 102 ) frames = SubResource( 30 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/RollingFiend"] @@ -1026,7 +1021,6 @@ align = 1 [node name="ChipIt" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2960, 62 ) frames = SubResource( 33 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/ChipIt"] @@ -1043,7 +1037,6 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -1075,6 +1068,7 @@ align = 1 material = SubResource( 47 ) position = Vector2( 3016, 24 ) frames = SubResource( 50 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/BioSlime"] @@ -1105,7 +1099,6 @@ position = Vector2( 4096, 0 ) [node name="Shedge" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 60, 25 ) frames = SubResource( 54 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Shedge"] @@ -1121,6 +1114,7 @@ align = 1 [node name="TheScrumpsTongue" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 156, 20 ) frames = SubResource( 57 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/TheScrumpsTongue"] @@ -1167,7 +1161,7 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) -frame = 2 +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1184,7 +1178,6 @@ align = 1 material = SubResource( 66 ) position = Vector2( 68, 104 ) frames = SubResource( 70 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Turchin"] @@ -1373,7 +1366,6 @@ align = 1 material = SubResource( 82 ) position = Vector2( 3362, 122.5 ) frames = SubResource( 87 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall4/Famicop"] @@ -1418,7 +1410,7 @@ align = 1 position = Vector2( 256, 0 ) [node name="Famira" parent="Control/RollCall6" instance=ExtResource( 47 )] -position = Vector2( 4512, 184 ) +position = Vector2( 4502, 184 ) credits = true [node name="MonsterousMechaMadeMoral" type="Label" parent="Control/RollCall6"] diff --git a/menus/title_screen.gd b/menus/title_screen.gd index 22cdcde..b78588e 100644 --- a/menus/title_screen.gd +++ b/menus/title_screen.gd @@ -16,7 +16,7 @@ onready var revolution_2083_ivy = preload("res://audio/sounds/revolution2083_ivy func _input(event): if Input.is_action_just_pressed("start") && !has_started: Audio.play_sound(Audio.a_star,Audio.ac_collectible) - var r = randi() % 101 + var r = 40 if r > 0 && r < 31: audio.stream = penny_voice if r >= 30 && r < 61: audio.stream = haze_voice if r >= 60 && r < 91: audio.stream = ivy_voice diff --git a/objects/enemy/2083_bullet.tscn b/objects/enemy/2083_bullet.tscn index 693a766..29c3750 100644 --- a/objects/enemy/2083_bullet.tscn +++ b/objects/enemy/2083_bullet.tscn @@ -37,4 +37,5 @@ shape = SubResource( 5 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] frames = SubResource( 4 ) +frame = 2 playing = true diff --git a/objects/enemy/boss/2600.gd b/objects/enemy/boss/2600.gd index 3d3eb47..d336c4f 100644 --- a/objects/enemy/boss/2600.gd +++ b/objects/enemy/boss/2600.gd @@ -70,7 +70,6 @@ func die(): head_sprite.texture = preload("res://graphics/enemy/boss/stg_2600/head_cracked.png") 1: shot_speed = 70 - fire_rate = 0.8 $"%GlassShape".queue_free() emit_signal("entered_phase", 3) head_sprite.texture = preload("res://graphics/enemy/boss/stg_2600/head_broken.png") diff --git a/objects/enemy/boss/2600_small_explosion.gd b/objects/enemy/boss/2600_small_explosion.gd index af449c2..c79262b 100644 --- a/objects/enemy/boss/2600_small_explosion.gd +++ b/objects/enemy/boss/2600_small_explosion.gd @@ -1,7 +1,7 @@ extends Node2D func _ready() -> void: - Audio.play_sound(Audio.a_small_explosion,Audio.ac_die) + Audio.play_sound(Audio.a_explosion,Audio.ac_die) var sprite: AnimatedSprite = get_child(randi() % get_child_count()) sprite.visible = true sprite.play() diff --git a/objects/enemy/boss/sg2083.tscn b/objects/enemy/boss/sg2083.tscn index 0ebe63b..3d39c93 100644 --- a/objects/enemy/boss/sg2083.tscn +++ b/objects/enemy/boss/sg2083.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=43 format=2] +[gd_scene load_steps=40 format=2] [ext_resource path="res://shaders/color_noise.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/enemy/boss/stg_2600/tailpipes.png" type="Texture" id=2] @@ -19,9 +19,6 @@ [ext_resource path="res://shaders/fade.gdshader" type="Shader" id=17] [ext_resource path="res://graphics/fade_patterns/stg_explosion.png" type="Texture" id=18] [ext_resource path="res://objects/enemy/boss/sg2083.gd" type="Script" id=19] -[ext_resource path="res://audio/sounds/mech_creak.ogg" type="AudioStream" id=20] -[ext_resource path="res://audio/sounds/mech_walk_2.ogg" type="AudioStream" id=21] -[ext_resource path="res://audio/sounds/mech_walk_1.ogg" type="AudioStream" id=22] [sub_resource type="RectangleShape2D" id=27] extents = Vector2( 44, 76 ) @@ -938,6 +935,18 @@ tracks/16/keys = { "update": 1, "values": [ false ] } +tracks/17/type = "value" +tracks/17/path = NodePath("UnDuck:playing") +tracks/17/interp = 1 +tracks/17/loop_wrap = true +tracks/17/imported = false +tracks/17/enabled = true +tracks/17/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ true ] +} [sub_resource type="Animation" id=25] resource_name = "Walk" @@ -988,7 +997,7 @@ tracks/3/keys = { "times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "update": 0, -"values": [ 51.0254, 55.362, 37.1965, -18.9988, 51.0254 ] +"values": [ 51.0254, 60.0, 37.1965, -18.9988, 51.0254 ] } tracks/4/type = "value" tracks/4/path = NodePath("Axle/JointFront/LegFront:rotation_degrees") @@ -1012,7 +1021,7 @@ tracks/5/keys = { "times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "update": 0, -"values": [ -25.1199, -4.6348, -6.27576, -31.2515, -25.1199 ] +"values": [ -25.1199, -4.6348, -6.27576, -43.6, -25.1199 ] } tracks/6/type = "value" tracks/6/path = NodePath("Axle/JointBack/LegBack/KneeBack/ShinBack:rotation_degrees") @@ -1024,7 +1033,7 @@ tracks/6/keys = { "times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "update": 0, -"values": [ 51.0254, 23.4, 43.8, 55.0, 51.0254 ] +"values": [ 51.0254, 23.4, 43.8, 74.0, 51.0254 ] } tracks/7/type = "value" tracks/7/path = NodePath("Axle/JointBack/LegBack:rotation_degrees") @@ -1036,43 +1045,7 @@ tracks/7/keys = { "times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "update": 0, -"values": [ -26.8344, -19.6257, -38.4223, -35.1608, -26.8344 ] -} -tracks/8/type = "value" -tracks/8/path = NodePath("Walk1:playing") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/keys = { -"times": PoolRealArray( 0.5 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/9/type = "value" -tracks/9/path = NodePath("Walk2:playing") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/keys = { -"times": PoolRealArray( 1 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/10/type = "value" -tracks/10/path = NodePath("Creak:playing") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] +"values": [ -26.8344, -19.6257, -38.4223, -36.3773, -26.8344 ] } [sub_resource type="Animation" id=15] @@ -2287,15 +2260,4 @@ monitoring = false position = Vector2( 100, 92 ) shape = SubResource( 26 ) -[node name="Creak" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 20 ) - -[node name="Walk1" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 22 ) -volume_db = -6.0 - -[node name="Walk2" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 21 ) -volume_db = -6.0 - [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_finished"] diff --git a/objects/environment/falling_block/falling_block_cave.tscn b/objects/environment/falling_block/falling_block_cave.tscn index 7ba053d..a30e355 100644 --- a/objects/environment/falling_block/falling_block_cave.tscn +++ b/objects/environment/falling_block/falling_block_cave.tscn @@ -115,7 +115,7 @@ shape = SubResource( 2 ) [node name="FallTimer" type="Timer" parent="."] process_mode = 0 -wait_time = 0.1 +wait_time = 0.2 one_shot = true [node name="RefreshTimer" type="Timer" parent="."] diff --git a/objects/environment/falling_block/falling_block_graveyard.tscn b/objects/environment/falling_block/falling_block_graveyard.tscn index df42c9d..15bc850 100644 --- a/objects/environment/falling_block/falling_block_graveyard.tscn +++ b/objects/environment/falling_block/falling_block_graveyard.tscn @@ -7,3 +7,6 @@ [node name="Sprite" parent="." index="0"] texture = ExtResource( 2 ) + +[node name="FallTimer" parent="." index="3"] +wait_time = 0.2 diff --git a/objects/environment/falling_block/falling_block_lab.tscn b/objects/environment/falling_block/falling_block_lab.tscn index 8d48836..0dd9e71 100644 --- a/objects/environment/falling_block/falling_block_lab.tscn +++ b/objects/environment/falling_block/falling_block_lab.tscn @@ -7,3 +7,6 @@ [node name="Sprite" parent="." index="0"] texture = ExtResource( 2 ) + +[node name="FallTimer" parent="." index="3"] +wait_time = 0.2 diff --git a/objects/lore/hills/catbat.tscn b/objects/lore/hills/catbat.tscn index 6da70bb..ae43fbd 100644 --- a/objects/lore/hills/catbat.tscn +++ b/objects/lore/hills/catbat.tscn @@ -20,11 +20,11 @@ material = SubResource( 1 ) texture = SubResource( 2 ) [node name="Control" parent="." index="1"] -margin_top = 68.0 -margin_bottom = 123.0 +margin_top = 49.0 +margin_bottom = 143.0 [node name="Label" parent="Control" index="0"] margin_top = 3.0 -margin_bottom = 52.0 +margin_bottom = 91.0 text = "CATBAT: -A Chimera created from vampire bat and panther materials given an artificial soul." +A Chimera created from vampire bat and panther materials. Fami wants everyone to believe creatures like this always existed. the propaganda isn't working." diff --git a/objects/lore/hills/speccy.tscn b/objects/lore/hills/speccy.tscn index 6b05e81..737a7f5 100644 --- a/objects/lore/hills/speccy.tscn +++ b/objects/lore/hills/speccy.tscn @@ -21,4 +21,4 @@ margin_bottom = 136.0 margin_top = 3.0 margin_bottom = 78.0 text = "Speccy: -born 04/23/2060, sg's british friend. she once had 9 shards of zircon ultima but had to split them into 45 rainbow stars to keep them from fami." +born 04/23/2060, sg's british friend. he once had 9 shards of zircon ultima but had to split them into 45 rainbow stars to keep them from fami." diff --git a/objects/lore/hills/verdant_hills.tscn b/objects/lore/hills/verdant_hills.tscn index e223a46..c2a2d2c 100644 --- a/objects/lore/hills/verdant_hills.tscn +++ b/objects/lore/hills/verdant_hills.tscn @@ -16,4 +16,4 @@ margin_bottom = 136.0 margin_top = 3.0 margin_bottom = 78.0 text = "Verdant hills: -Verdant hills was once the most peaceful place in virginia, a beatiful stretch of nature that was corrupted by fami's evil deeds." +It was once the most peaceful place in virginia, a beatiful stretch of nature that was corrupted by fami's evil deeds." diff --git a/objects/lore/station/msx.tscn b/objects/lore/station/msx.tscn index 7fb605b..6421c98 100644 --- a/objects/lore/station/msx.tscn +++ b/objects/lore/station/msx.tscn @@ -22,5 +22,5 @@ margin_bottom = 143.0 [node name="Label" parent="Control" index="0"] margin_top = 3.0 margin_bottom = 91.0 -text = "Ms. X (Sally Xevious): +text = "Ms. X: born 10/21/2062, she was locked up for such trivial crimes as shoplifting and marijuana possession. her reliance on drugs causes many issues in her life."