From 5f4939430d3de3d0818f1c30578fc47d6aade0d9 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sat, 25 Nov 2023 01:39:37 -0500 Subject: [PATCH] adjusted some lore entries --- graphics/stalactite/stalactite.png | Bin 199 -> 205 bytes graphics/tiles/cave.png | Bin 5710 -> 2718 bytes maps/cave_scholar.tscn | 112 +++++++++++++++++-- objects/environment/stalactite/stalactite.gd | 2 +- objects/lore/abyss/turchin.tscn | 2 +- objects/lore/boss/dr_intelli.tscn | 9 +- objects/lore/station/famicop.tscn | 8 +- 7 files changed, 115 insertions(+), 18 deletions(-) diff --git a/graphics/stalactite/stalactite.png b/graphics/stalactite/stalactite.png index c258803d335c36495d6fcd847e5512641d0bf9c7..4fddf3478c4568b9b35c96f8db9aff7e58a60b1e 100644 GIT binary patch delta 148 zcmX@kc$RU3W4%y-Plzi61H;}eo0iO;dHl%!M1MG8>R$kW9!L?T@GRG=7x0}IoEu6OlMMSnL|axGZpav)>n uGl?~62~RdIu$vTPl0ETMsh!a`X4PVbPtA4zc!6dyFnGH9xvXwEK{^R?1FfcH%zj|X0q*zOW{DS`j0mJWYe8Cg* zBwP(VT^vIs!gae23NjdQ99p#L{~6IY&SxAKytwDU^TjUEHZ`EDp|xT9Y%`{?eZ>zZ Z%Smlu*t+S(om`-444$rjF6*2UngE*sGzI_w diff --git a/graphics/tiles/cave.png b/graphics/tiles/cave.png index 8f023e833accd120fab1e4a754ac6c4dc45cae83..b0bcbde4c9f14a5daa72e4dabbdb2c032dd6a094 100644 GIT binary patch delta 1586 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 V7C*kkXDTR|5YNM#TeLVb?LS&gn)v_# diff --git a/maps/cave_scholar.tscn b/maps/cave_scholar.tscn index 4ab3c53..b14c4e7 100644 --- a/maps/cave_scholar.tscn +++ b/maps/cave_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=28 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] @@ -6,12 +6,19 @@ [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=5] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] +[ext_resource path="res://objects/enemy/snail.tscn" type="PackedScene" id=7] [ext_resource path="res://graphics/backgrounds/cave.png" type="Texture" id=8] +[ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=9] +[ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=10] [ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://audio/music/smokestack.ogg" type="AudioStream" id=12] +[ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=13] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=14] +[ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=17] +[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://tilesets/t_ladders.tres" type="TileSet" id=22] +[ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=23] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=24] [ext_resource path="res://shaders/can_stain.tres" type="Material" id=25] [ext_resource path="res://objects/lore/hills/catbat.tscn" type="PackedScene" id=26] @@ -51,7 +58,7 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 1114121, 2, 1, 1114122, 2, 2, 1114123, 2, 2, 1114124, 2, 2, 1114125, 2, 2, 1114126, 2, 2, 1114127, 2, 3, 1507327, 1, 1, 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, 2, 1441803, 1, 2, 1441804, 1, 2, 1441805, 1, 2, 1441806, 1, 2, 1441807, 1, 2, 1441808, 1, 2, 1441809, 1, 2, 1441810, 1, 2, 1441811, 1, 2, 1441812, 1, 2, 1441813, 1, 2, 1441814, 1, 2, 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, 2, 1441831, 1, 2, 1441832, 1, 2, 1441833, 1, 2, 1441834, 1, 2, 1441835, 1, 2, 1441836, 1, 2, 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, 2, 1441846, 1, 2, 1441847, 1, 2, 1441848, 1, 2, 1441849, 1, 2, 1441850, 1, 2, 1441851, 1, 2, 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, 1572863, 1, 65537, 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, 65538, 1507367, 1, 65538, 1507368, 1, 65538, 1507369, 1, 65538, 1507370, 1, 65538, 1507371, 1, 65538, 1507372, 1, 65538, 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, 65538, 1507382, 1, 65538, 1507383, 1, 65538, 1507384, 1, 65538, 1507385, 1, 65538, 1507386, 1, 65538, 1507387, 1, 65538, 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, 1638399, 1, 131073, 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, 131074, 1572903, 1, 131074, 1572904, 1, 131074, 1572905, 1, 131074, 1572906, 1, 131074, 1572907, 1, 131074, 1572908, 1, 131074, 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, 131074, 1572918, 1, 131074, 1572919, 1, 131074, 1572920, 1, 131074, 1572921, 1, 131074, 1572922, 1, 131074, 1572923, 1, 131074, 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( 65536, 1, 196609, 65537, 1, 196610, 65538, 1, 196610, 65539, 1, 196610, 65540, 1, 196610, 65541, 1, 196610, 65542, 1, 196610, 65543, 1, 196610, 65544, 1, 196610, 65545, 1, 196610, 65546, 1, 196610, 65547, 1, 196610, 65548, 1, 196610, 65549, 1, 196610, 65550, 1, 196610, 65551, 1, 196610, 65552, 1, 196610, 65553, 1, 196610, 65554, 1, 196610, 65555, 1, 196610, 65556, 1, 196610, 65557, 1, 196610, 65558, 1, 196610, 65559, 1, 196610, 65560, 1, 196610, 65561, 1, 196610, 65562, 1, 196610, 65563, 1, 196610, 65564, 1, 196610, 65565, 1, 196610, 65566, 1, 196610, 65567, 1, 196610, 65568, 1, 196610, 65569, 1, 196610, 65570, 1, 196610, 65571, 1, 196610, 65572, 1, 196610, 65573, 1, 196610, 65574, 1, 196610, 65575, 1, 196610, 65576, 1, 196610, 65577, 1, 196610, 65578, 1, 196610, 65579, 1, 196610, 65580, 1, 196610, 65581, 1, 196610, 65582, 1, 196610, 65583, 1, 196610, 65584, 1, 196610, 65585, 1, 196610, 65586, 1, 196610, 65587, 1, 196610, 65588, 1, 196610, 65589, 1, 196610, 65590, 1, 196610, 65591, 1, 196610, 65592, 1, 196610, 65593, 1, 196610, 65594, 1, 196610, 65595, 1, 196610, 65596, 1, 196610, 65597, 1, 196610, 65598, 1, 196610, 65599, 1, 196610, 65600, 1, 196610, 65601, 1, 196610, 65602, 1, 196610, 65603, 1, 196610, 65604, 1, 196610, 65605, 1, 196610, 65606, 1, 196610, 65607, 1, 196610, 65608, 1, 196610, 65609, 1, 196610, 65610, 1, 196610, 65611, 1, 196610, 65612, 1, 196610, 65613, 1, 196610, 65614, 1, 196610, 65615, 1, 196610, 65616, 1, 196610, 65617, 1, 196610, 65618, 1, 196610, 65619, 1, 196610, 65620, 1, 196610, 65621, 1, 196610, 65622, 1, 196610, 65623, 1, 196610, 65624, 1, 196610, 65625, 1, 196610, 65626, 1, 196610, 65627, 1, 196610, 65628, 1, 196610, 65629, 1, 196610, 65630, 1, 196610, 65631, 1, 196611, 393221, 1, 196609, 393222, 1, 196610, 393223, 1, 196610, 393224, 1, 196610, 393225, 1, 196610, 393226, 1, 196611, 458765, 1, 196609, 458766, 1, 196610, 458767, 1, 196610, 458768, 1, 196610, 458769, 1, 196610, 458770, 1, 196611, 458775, 1, 196609, 458776, 1, 196610, 458777, 1, 196611, 458780, 1, 1, 458781, 1, 196610, 458782, 1, 196610, 458783, 1, 196610, 458784, 1, 196610, 458785, 1, 196610, 458786, 1, 196610, 458787, 1, 196610, 458788, 1, 196610, 458789, 1, 196610, 458790, 1, 196611, 524316, 1, 65536, 589839, 1, 1, 589840, 1, 196610, 589841, 1, 196610, 589842, 1, 196611, 589851, 1, 1, 589852, 1, 65539, 655364, 1, 196609, 655365, 1, 196611, 655369, 1, 196609, 655370, 1, 196611, 655375, 1, 65536, 655387, 1, 65537, 655388, 1, 65539, 720911, 1, 65536, 720916, 1, 1, 720917, 1, 196610, 720918, 1, 196610, 720919, 1, 196610, 720920, 1, 196610, 720921, 1, 196610, 720922, 1, 196610, 720923, 1, 131074, 720924, 1, 131075, 786447, 1, 131073, 786448, 1, 196610, 786449, 1, 196610, 786450, 1, 196610, 786451, 1, 196610, 786452, 1, 131075, 786487, 1, 0, 852021, 1, 196608, 852023, 1, 65536, 917510, 0, 262147, 917514, 0, 262146, 917541, 1, 1, 917542, 1, 196610, 917543, 1, 196610, 917544, 1, 196610, 917545, 1, 196610, 917546, 1, 196610, 917547, 1, 196610, 917548, 1, 196610, 917549, 1, 196611, 917553, 1, 196609, 917554, 1, 196610, 917555, 1, 196611, 917559, 1, 131072, 1048575, 1, 196609, 983040, 1, 196611, 983043, 1, 1, 983044, 1, 196610, 983045, 1, 196610, 983046, 1, 196610, 983047, 1, 196610, 983048, 1, 196610, 983049, 1, 196610, 983050, 1, 196610, 983051, 1, 196611, 983077, 1, 65536, 1048579, 1, 65536, 1048591, 1, 196609, 1048592, 1, 196610, 1048593, 1, 196610, 1048594, 1, 196610, 1048595, 1, 196610, 1048596, 1, 196610, 1048597, 1, 196610, 1048598, 1, 196610, 1048599, 1, 196610, 1048600, 1, 196610, 1048601, 1, 196610, 1048602, 1, 196610, 1048603, 1, 196610, 1048604, 1, 196610, 1048605, 1, 196610, 1048606, 1, 196610, 1048607, 1, 196610, 1048608, 1, 196610, 1048609, 1, 196610, 1048610, 1, 196610, 1048611, 1, 196610, 1048612, 1, 196610, 1048613, 1, 131075, 1114115, 1, 65536, 1179649, 1, 196609, 1179650, 1, 196610, 1179651, 1, 131075, 1245191, 1, 196609, 1245192, 1, 196610, 1245193, 1, 196610, 1245194, 1, 196611, 1376263, 0, 262146, 1507327, 1, 1, 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, 2, 1441803, 1, 2, 1441804, 1, 2, 1441805, 1, 2, 1441806, 1, 2, 1441807, 1, 2, 1441808, 1, 2, 1441809, 1, 2, 1441810, 1, 2, 1441811, 1, 2, 1441812, 1, 2, 1441813, 1, 2, 1441814, 1, 2, 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, 2, 1441831, 1, 2, 1441832, 1, 2, 1441833, 1, 2, 1441834, 1, 2, 1441835, 1, 2, 1441836, 1, 2, 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, 2, 1441846, 1, 2, 1441847, 1, 2, 1441848, 1, 2, 1441849, 1, 2, 1441850, 1, 2, 1441851, 1, 2, 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, 1572863, 1, 65537, 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, 65538, 1507367, 1, 65538, 1507368, 1, 65538, 1507369, 1, 65538, 1507370, 1, 65538, 1507371, 1, 65538, 1507372, 1, 65538, 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, 65538, 1507382, 1, 65538, 1507383, 1, 65538, 1507384, 1, 65538, 1507385, 1, 65538, 1507386, 1, 65538, 1507387, 1, 65538, 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, 1638399, 1, 131073, 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, 131074, 1572903, 1, 131074, 1572904, 1, 131074, 1572905, 1, 131074, 1572906, 1, 131074, 1572907, 1, 131074, 1572908, 1, 131074, 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, 131074, 1572918, 1, 131074, 1572919, 1, 131074, 1572920, 1, 131074, 1572921, 1, 131074, 1572922, 1, 131074, 1572923, 1, 131074, 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, 176 ) @@ -61,6 +68,7 @@ tile_set = ExtResource( 22 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 +tile_data = PoolIntArray( 786445, 0, 65536, 851981, 0, 65537, 917517, 0, 65537, 983053, 0, 65537, 1048589, 0, 65537, 1114125, 0, 65537, 1179661, 0, 65537, 1245197, 0, 65537 ) [node name="Death" type="TileMap" parent="." groups=["death"]] light_mask = 0 @@ -69,17 +77,105 @@ cell_size = Vector2( 8, 8 ) collision_layer = 32 format = 1 -[node name="Platforms" type="Node2D" parent="."] +[node name="Environment" type="Node2D" parent="."] -[node name="Stalactite" parent="Platforms" instance=ExtResource( 3 )] -position = Vector2( 80, 144 ) +[node name="FallingBlock" parent="Environment" instance=ExtResource( 18 )] +position = Vector2( 0, 144 ) + +[node name="FallingBlock2" parent="Environment" instance=ExtResource( 18 )] +position = Vector2( 64, 80 ) + +[node name="FallingBlock3" parent="Environment" instance=ExtResource( 18 )] +position = Vector2( 56, 80 ) + +[node name="FallingBlock6" parent="Environment" instance=ExtResource( 18 )] +position = Vector2( 168, 56 ) + +[node name="FallingBlock5" parent="Environment" instance=ExtResource( 18 )] +position = Vector2( 16, 64 ) + +[node name="FallingBlock4" parent="Environment" instance=ExtResource( 18 )] +position = Vector2( 48, 80 ) + +[node name="Ladder" parent="Environment" instance=ExtResource( 9 )] +position = Vector2( 104, 96 ) +scale = Vector2( 1, 8 ) + +[node name="Stalactite" parent="Environment" instance=ExtResource( 3 )] +position = Vector2( 64, 16 ) + +[node name="Stalactite2" parent="Environment" instance=ExtResource( 3 )] +position = Vector2( 120, 16 ) + +[node name="Stalactite4" parent="Environment" instance=ExtResource( 3 )] +position = Vector2( 136, 136 ) + +[node name="Stalactite5" parent="Environment" instance=ExtResource( 3 )] +position = Vector2( 176, 136 ) + +[node name="Stalactite3" parent="Environment" instance=ExtResource( 3 )] +position = Vector2( 192, 16 ) + +[node name="Barrier" parent="Environment" instance=ExtResource( 23 )] +position = Vector2( 144, 80 ) +scale = Vector2( 1, 16 ) +cost = 20 [node name="Enemies" type="Node2D" parent="."] +[node name="Bat2" parent="Enemies" instance=ExtResource( 10 )] +position = Vector2( 16, 120 ) +left_up_boundary = 3.0 +right_down_boundary = 3.0 +speed = 60 + +[node name="Bat3" parent="Enemies" instance=ExtResource( 10 )] +position = Vector2( 20, 64 ) +left_up_boundary = 3.0 +right_down_boundary = 4.0 +speed = 60 + +[node name="RollingFiend" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 64, 144 ) + +[node name="RollingFiend2" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 112, 48 ) + +[node name="Snail" parent="Enemies" instance=ExtResource( 7 )] +position = Vector2( 64, 112 ) +left_up_boundary = 3.0 +right_down_boundary = 3.0 + +[node name="Snail2" parent="Enemies" instance=ExtResource( 7 )] +position = Vector2( 192, 168 ) +left_up_boundary = 3.0 +right_down_boundary = 3.0 + [node name="Collectibles" type="Node2D" parent="."] -[node name="Arrow" parent="Collectibles" instance=ExtResource( 20 )] -position = Vector2( 49, 165 ) +[node name="Shard" parent="Collectibles" instance=ExtResource( 17 )] +position = Vector2( 8, 136 ) + +[node name="Key" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 56, 144 ) + +[node name="Key3" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 48, 168 ) + +[node name="Key4" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 80, 168 ) + +[node name="Key5" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 88, 112 ) + +[node name="Key6" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 24, 112 ) + +[node name="Key7" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 56, 112 ) + +[node name="Key2" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 80, 144 ) [node name="StaticBody2D" type="StaticBody2D" parent="."] diff --git a/objects/environment/stalactite/stalactite.gd b/objects/environment/stalactite/stalactite.gd index 1f0ac23..8d1b986 100644 --- a/objects/environment/stalactite/stalactite.gd +++ b/objects/environment/stalactite/stalactite.gd @@ -1,7 +1,7 @@ extends Node2D onready var cast = $RayCast2D -export var fall_speed = 80 +export var fall_speed = 60 var fall = false onready var refresh_timer = $RefreshTimer onready var anims = $AnimationPlayer diff --git a/objects/lore/abyss/turchin.tscn b/objects/lore/abyss/turchin.tscn index c0650f4..a33a61d 100644 --- a/objects/lore/abyss/turchin.tscn +++ b/objects/lore/abyss/turchin.tscn @@ -12,7 +12,7 @@ shader_param/border_corners = false [sub_resource type="AtlasTexture" id=2] atlas = ExtResource( 4 ) -region = Rect2( 0, 33, 23, 12 ) +region = Rect2( 0, 33, 24, 12 ) [node name="Lore" type="HBoxContainer"] anchor_right = 1.0 diff --git a/objects/lore/boss/dr_intelli.tscn b/objects/lore/boss/dr_intelli.tscn index 2b2523b..8b5728c 100644 --- a/objects/lore/boss/dr_intelli.tscn +++ b/objects/lore/boss/dr_intelli.tscn @@ -9,11 +9,12 @@ texture = ExtResource( 2 ) [node name="Control" parent="." index="1"] -margin_top = 55.0 -margin_bottom = 136.0 +margin_top = 49.0 +margin_bottom = 143.0 [node name="Label" parent="Control" index="0"] margin_top = 3.0 -margin_bottom = 78.0 +margin_bottom = 91.0 text = "Dr.Intelli: -born 03/23/2051, despite working with him, he does not think fondly of fami, and wants to establish his own dystopia one day." +born 03/23/2051, sg's boss and head of edizon inc. +despite working with him, he does not think fondly of fami, and wants to establish his own dystopia one day." diff --git a/objects/lore/station/famicop.tscn b/objects/lore/station/famicop.tscn index 5fc455a..a06dd3e 100644 --- a/objects/lore/station/famicop.tscn +++ b/objects/lore/station/famicop.tscn @@ -16,11 +16,11 @@ material = SubResource( 1 ) texture = ExtResource( 3 ) [node name="Control" parent="." index="1"] -margin_top = 62.0 -margin_bottom = 130.0 +margin_top = 55.0 +margin_bottom = 136.0 [node name="Label" parent="Control" index="0"] margin_top = 3.0 -margin_bottom = 65.0 +margin_bottom = 78.0 text = "Famicop: -These bastards are responsible for fami staying in power. Their prime objective is to protect fami's hoard of money." +These bastards are responsible for fami staying in power. Their prime objective is to protect fami's hoard of wealth."