diff --git a/audio/sounds/key.wav b/audio/sounds/key.wav new file mode 100644 index 0000000..e00ec2f Binary files /dev/null and b/audio/sounds/key.wav differ diff --git a/audio/sounds/key.wav.import b/audio/sounds/key.wav.import new file mode 100644 index 0000000..7d35b4a --- /dev/null +++ b/audio/sounds/key.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/key.wav-f64ed6eabdf317ae60d3d7fb51bcbd89.sample" + +[deps] + +source_file="res://audio/sounds/key.wav" +dest_files=[ "res://.import/key.wav-f64ed6eabdf317ae60d3d7fb51bcbd89.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index e5b72e0..da9e2db 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -10,7 +10,7 @@ onready var ac_cheat = $CodeEntrySound onready var ac_boss = $BossSound onready var ac_shard = $ShardSound #Sounds -const a_gold = preload("res://audio/sounds/key.ogg") +const a_gold = preload("res://audio/sounds/key.wav") const a_arrow = preload("res://audio/sounds/a_egg_collect.ogg") const a_jump = preload("res://audio/sounds/jump.ogg") const a_star = preload("res://audio/sounds/star.ogg") diff --git a/autoloads/game.gd b/autoloads/game.gd index 62e7a51..d7a876a 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -7,6 +7,8 @@ enum Difficulty { PUNGENT, # faster enemies, 3 lives } +const DIFFICULTY_NAMES = ["Sweet","Salty","Spicy","Pungent"] + var resolution = Vector2(256,192) var current_sector = Vector2(0,0) #Onreadys diff --git a/autoloads/level_data.tscn b/autoloads/level_data.tscn index 55662ea..8cef918 100644 --- a/autoloads/level_data.tscn +++ b/autoloads/level_data.tscn @@ -16,7 +16,7 @@ resource_name = "Verdant Hills" script = ExtResource( 5 ) title = "Verdant Hills" -shard_titles = [ "Climb to the top", "Dodge the bioslime", "Avoid the Catbat", "Energetic eviscerator", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] +shard_titles = [ "Climb to the top", "The obstacle course", "The smallest platform", "Energetic eviscerator", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] save_id = "hills" scene = ExtResource( 2 ) diff --git a/graphics/hud/delete.png b/graphics/hud/delete.png new file mode 100644 index 0000000..4029e0f Binary files /dev/null and b/graphics/hud/delete.png differ diff --git a/graphics/hud/delete.png.import b/graphics/hud/delete.png.import new file mode 100644 index 0000000..6c1e3df --- /dev/null +++ b/graphics/hud/delete.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/delete.png-9117bf6c631defbca88858287a9f5ad3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/hud/delete.png" +dest_files=[ "res://.import/delete.png-9117bf6c631defbca88858287a9f5ad3.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/graphics/hud/delete_dim.png b/graphics/hud/delete_dim.png new file mode 100644 index 0000000..3771d8e Binary files /dev/null and b/graphics/hud/delete_dim.png differ diff --git a/graphics/hud/delete_dim.png.import b/graphics/hud/delete_dim.png.import new file mode 100644 index 0000000..2e0219e --- /dev/null +++ b/graphics/hud/delete_dim.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/delete_dim.png-0fe030b64fef9e199335b59b8477cc54.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/hud/delete_dim.png" +dest_files=[ "res://.import/delete_dim.png-0fe030b64fef9e199335b59b8477cc54.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/maps/hills_scholar.tscn b/maps/hills_scholar.tscn index 33d7e00..02784a7 100644 --- a/maps/hills_scholar.tscn +++ b/maps/hills_scholar.tscn @@ -57,7 +57,7 @@ format = 1 tile_set = ExtResource( 8 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 65535, 3, 0, 96, 3, 0, 131071, 3, 65536, 65632, 3, 65536, 196607, 3, 65536, 131168, 3, 65536, 262143, 3, 65536, 196635, 2, 2, 196695, 2, 1, 196698, 3, 1, 196699, 3, 3, 196704, 3, 65536, 327679, 3, 65536, 262159, 3, 196609, 262160, 3, 196611, 262171, 3, 1, 262172, 3, 196610, 262173, 3, 196611, 262187, 2, 1, 262227, 2, 2, 262230, 3, 1, 262231, 3, 3, 262234, 3, 65537, 262235, 3, 65539, 262236, 2, 2, 262240, 3, 65536, 393215, 3, 65536, 327683, 3, 1, 327684, 3, 2, 327685, 3, 3, 327690, 3, 196609, 327691, 3, 196610, 327692, 3, 196610, 327693, 3, 196610, 327694, 3, 196611, 327707, 3, 65536, 327711, 3, 0, 327719, 3, 196609, 327720, 3, 196610, 327721, 3, 196610, 327722, 3, 196610, 327723, 3, 196610, 327724, 3, 196610, 327725, 3, 196610, 327726, 3, 196610, 327727, 3, 196610, 327728, 3, 196611, 327736, 3, 196609, 327737, 3, 196610, 327738, 3, 196611, 327762, 3, 1, 327763, 3, 2, 327764, 3, 2, 327765, 3, 2, 327766, 3, 65538, 327767, 3, 65538, 327768, 3, 2, 327769, 3, 2, 327770, 3, 65538, 327771, 3, 65538, 327772, 3, 3, 327776, 3, 65536, 458751, 3, 65536, 393219, 3, 131073, 393220, 3, 131074, 393221, 3, 131075, 393242, 3, 1, 393243, 3, 65539, 393247, 3, 65536, 393291, 2, 1, 393295, 2, 0, 393298, 3, 65537, 393299, 3, 65538, 393300, 3, 65538, 393301, 3, 131074, 393302, 3, 131074, 393303, 3, 131074, 393304, 3, 131074, 393305, 3, 131074, 393306, 3, 131074, 393307, 3, 131074, 393308, 3, 131075, 393312, 3, 65536, 524287, 3, 65536, 458770, 3, 1, 458771, 3, 2, 458772, 3, 2, 458773, 3, 2, 458774, 3, 3, 458777, 3, 196609, 458778, 3, 131074, 458779, 3, 131074, 458780, 3, 196610, 458781, 3, 196610, 458782, 3, 196610, 458783, 3, 131075, 458787, 3, 196609, 458788, 3, 196610, 458789, 3, 196611, 458827, 3, 1, 458828, 3, 196610, 458829, 3, 196610, 458830, 3, 196610, 458831, 3, 196610, 458832, 3, 196610, 458833, 3, 196610, 458834, 3, 131074, 458835, 3, 131074, 458836, 3, 65539, 458848, 3, 65536, 589823, 3, 65536, 524306, 3, 65537, 524307, 3, 65538, 524308, 3, 65538, 524309, 3, 65538, 524310, 3, 65539, 524334, 2, 3, 524341, 2, 1, 524348, 2, 2, 524349, 3, 1, 524350, 3, 196610, 524351, 3, 196610, 524352, 3, 196610, 524353, 3, 196610, 524354, 3, 196610, 524355, 3, 3, 524359, 2, 3, 524363, 3, 65536, 524372, 3, 65536, 524384, 3, 65536, 655359, 3, 65536, 589835, 2, 3, 589842, 3, 65537, 589843, 3, 131074, 589844, 3, 131074, 589845, 3, 131074, 589846, 3, 131074, 589847, 3, 3, 589858, 2, 1, 589860, 2, 0, 589863, 3, 0, 589870, 3, 196609, 589871, 3, 196610, 589872, 3, 196610, 589873, 3, 196610, 589874, 3, 196610, 589875, 3, 196610, 589876, 3, 196610, 589877, 3, 196610, 589878, 3, 2, 589879, 3, 196610, 589880, 3, 196610, 589881, 3, 196610, 589882, 3, 196610, 589883, 3, 196610, 589884, 3, 196610, 589885, 3, 131075, 589891, 3, 131073, 589892, 3, 196610, 589893, 3, 196610, 589894, 3, 196610, 589895, 3, 196610, 589896, 3, 196610, 589897, 3, 196610, 589898, 3, 196610, 589899, 3, 131075, 589908, 3, 65536, 589919, 3, 1, 589920, 3, 65539, 720895, 3, 65536, 655366, 3, 196609, 655367, 3, 196610, 655368, 3, 196610, 655369, 3, 196610, 655370, 3, 196610, 655371, 3, 196610, 655372, 3, 196611, 655374, 3, 196609, 655375, 3, 196610, 655376, 3, 196610, 655377, 3, 196610, 655378, 3, 131075, 655383, 3, 65536, 655385, 2, 1, 655390, 3, 1, 655391, 3, 2, 655392, 3, 196610, 655393, 3, 196610, 655394, 3, 196610, 655395, 3, 196610, 655396, 3, 196610, 655397, 3, 196610, 655398, 3, 196610, 655399, 3, 131075, 655414, 3, 65536, 655444, 3, 65536, 655449, 2, 1, 655452, 2, 2, 655455, 3, 65537, 655456, 3, 65539, 786431, 3, 65536, 720919, 3, 131073, 720920, 3, 196610, 720921, 3, 196610, 720922, 3, 196610, 720923, 3, 196610, 720924, 3, 196611, 720926, 3, 131073, 720927, 3, 131075, 720950, 3, 65536, 720977, 3, 1, 720978, 3, 2, 720979, 3, 2, 720980, 3, 131075, 720982, 3, 196609, 720983, 3, 196610, 720984, 3, 196610, 720985, 3, 196610, 720986, 3, 196610, 720987, 3, 196610, 720988, 3, 196610, 720989, 3, 196610, 720990, 3, 196610, 720991, 3, 131074, 720992, 3, 65539, 851967, 3, 65536, 786486, 3, 65536, 786513, 3, 131073, 786514, 3, 131074, 786515, 3, 131075, 786528, 3, 65536, 917503, 3, 65537, 851968, 3, 2, 851969, 3, 2, 851970, 3, 2, 851971, 3, 3, 851981, 3, 196609, 851982, 3, 196610, 851983, 3, 196611, 852012, 2, 2, 852015, 2, 0, 852022, 3, 131072, 852037, 2, 2, 852040, 2, 1, 852044, 3, 1, 852045, 3, 2, 852046, 3, 3, 852064, 3, 65536, 983039, 3, 65537, 917504, 3, 131074, 917505, 3, 131074, 917506, 3, 131074, 917507, 3, 131075, 917516, 3, 0, 917522, 3, 0, 917531, 2, 3, 917548, 3, 196609, 917549, 3, 196610, 917550, 3, 196610, 917551, 3, 196611, 917554, 3, 196609, 917555, 3, 196610, 917556, 3, 196611, 917573, 3, 1, 917574, 3, 2, 917575, 3, 2, 917576, 3, 3, 917580, 3, 131073, 917581, 3, 131074, 917582, 3, 131075, 917600, 3, 65536, 1048575, 3, 65536, 983051, 2, 1, 983052, 3, 65536, 983058, 3, 65537, 983059, 3, 2, 983060, 3, 2, 983061, 3, 2, 983062, 3, 3, 983065, 3, 196609, 983066, 3, 196610, 983067, 3, 196610, 983068, 3, 196610, 983069, 3, 3, 983078, 2, 2, 983109, 3, 131073, 983110, 3, 131074, 983111, 3, 131074, 983112, 3, 131075, 983134, 3, 196609, 983135, 3, 196610, 983136, 3, 65539, 1114111, 3, 65536, 1048587, 3, 196609, 1048588, 3, 131074, 1048589, 3, 196610, 1048590, 3, 196610, 1048591, 3, 196610, 1048592, 3, 196610, 1048593, 3, 196610, 1048594, 3, 131074, 1048595, 3, 131074, 1048596, 3, 131074, 1048597, 3, 131074, 1048598, 3, 131075, 1048605, 3, 131073, 1048606, 3, 196610, 1048607, 3, 196610, 1048608, 3, 196610, 1048609, 3, 196611, 1048612, 3, 196609, 1048613, 3, 196610, 1048614, 3, 196610, 1048615, 3, 196610, 1048616, 3, 196611, 1048636, 3, 1, 1048637, 3, 2, 1048638, 3, 2, 1048639, 3, 2, 1048640, 3, 2, 1048641, 3, 2, 1048642, 3, 3, 1048659, 3, 1, 1048660, 3, 2, 1048661, 3, 2, 1048662, 3, 3, 1048665, 3, 196608, 1048668, 3, 196608, 1048672, 3, 65536, 1179647, 3, 65536, 1114168, 2, 3, 1114172, 3, 131073, 1114173, 3, 131074, 1114174, 3, 131074, 1114175, 3, 131074, 1114176, 3, 131074, 1114177, 3, 131074, 1114178, 3, 131075, 1114194, 3, 1, 1114195, 3, 65538, 1114196, 3, 65538, 1114197, 3, 131074, 1114198, 3, 131075, 1114208, 3, 65536, 1245183, 3, 65537, 1179648, 3, 196610, 1179649, 3, 196610, 1179650, 3, 196611, 1179653, 3, 196609, 1179654, 3, 196610, 1179655, 3, 196610, 1179656, 3, 196611, 1179702, 3, 196609, 1179703, 3, 196610, 1179704, 3, 196610, 1179705, 3, 196610, 1179706, 3, 196611, 1179728, 3, 1, 1179729, 3, 2, 1179730, 3, 65538, 1179731, 3, 131074, 1179732, 3, 131075, 1179744, 3, 65536, 1310719, 3, 65536, 1245225, 2, 0, 1245228, 2, 1, 1245264, 3, 131073, 1245265, 3, 131074, 1245266, 3, 131075, 1245280, 3, 65536, 1376255, 3, 65536, 1310731, 3, 1, 1310732, 3, 2, 1310733, 3, 2, 1310734, 3, 2, 1310735, 3, 3, 1310761, 3, 1, 1310762, 3, 2, 1310763, 3, 2, 1310764, 3, 3, 1310816, 3, 65536, 1441791, 3, 65536, 1376261, 2, 3, 1376264, 2, 1, 1376266, 3, 1, 1376267, 3, 65538, 1376268, 3, 65538, 1376269, 3, 65538, 1376270, 3, 65538, 1376271, 3, 65538, 1376272, 3, 3, 1376283, 2, 0, 1376287, 2, 1, 1376289, 2, 2, 1376293, 2, 1, 1376297, 3, 65537, 1376298, 3, 65538, 1376299, 3, 65538, 1376300, 3, 65539, 1376309, 2, 3, 1376312, 2, 0, 1376316, 2, 2, 1376319, 2, 1, 1376322, 2, 0, 1376331, 2, 3, 1376335, 2, 2, 1376339, 2, 0, 1376343, 2, 1, 1376352, 3, 65536, 1507327, 3, 65537, 1441792, 3, 2, 1441793, 3, 2, 1441794, 3, 2, 1441795, 3, 2, 1441796, 3, 2, 1441797, 3, 2, 1441798, 3, 2, 1441799, 3, 2, 1441800, 3, 2, 1441801, 3, 2, 1441802, 3, 65538, 1441803, 3, 65538, 1441804, 3, 65538, 1441805, 3, 65538, 1441806, 3, 65538, 1441807, 3, 65538, 1441808, 3, 65538, 1441809, 3, 2, 1441810, 3, 2, 1441811, 3, 2, 1441812, 3, 2, 1441813, 3, 3, 1441817, 3, 1, 1441818, 3, 2, 1441819, 3, 2, 1441820, 3, 2, 1441821, 3, 2, 1441822, 3, 2, 1441823, 3, 2, 1441824, 3, 2, 1441825, 3, 2, 1441826, 3, 2, 1441827, 3, 2, 1441828, 3, 2, 1441829, 3, 2, 1441830, 3, 2, 1441831, 3, 2, 1441832, 3, 2, 1441833, 3, 65538, 1441834, 3, 65538, 1441835, 3, 65538, 1441836, 3, 65539, 1441845, 3, 1, 1441846, 3, 2, 1441847, 3, 2, 1441848, 3, 2, 1441849, 3, 2, 1441850, 3, 2, 1441851, 3, 2, 1441852, 3, 2, 1441853, 3, 2, 1441854, 3, 2, 1441855, 3, 2, 1441856, 3, 2, 1441857, 3, 2, 1441858, 3, 2, 1441859, 3, 2, 1441860, 3, 2, 1441861, 3, 2, 1441862, 3, 2, 1441863, 3, 3, 1441867, 3, 1, 1441868, 3, 2, 1441869, 3, 2, 1441870, 3, 2, 1441871, 3, 2, 1441872, 3, 2, 1441873, 3, 2, 1441874, 3, 2, 1441875, 3, 2, 1441876, 3, 2, 1441877, 3, 2, 1441878, 3, 2, 1441879, 3, 2, 1441880, 3, 2, 1441881, 3, 2, 1441882, 3, 2, 1441883, 3, 2, 1441884, 3, 2, 1441885, 3, 2, 1441886, 3, 2, 1441887, 3, 2, 1441888, 3, 65539, 1572863, 3, 65537, 1507328, 3, 65538, 1507329, 3, 65538, 1507330, 3, 65538, 1507331, 3, 65538, 1507332, 3, 65538, 1507333, 3, 65538, 1507334, 3, 65538, 1507335, 3, 65538, 1507336, 3, 65538, 1507337, 3, 65538, 1507338, 3, 65538, 1507339, 3, 65538, 1507340, 3, 65538, 1507341, 3, 65538, 1507342, 3, 65538, 1507343, 3, 65538, 1507344, 3, 65538, 1507345, 3, 65538, 1507346, 3, 65538, 1507347, 3, 65538, 1507348, 3, 65538, 1507349, 3, 65539, 1507353, 3, 65537, 1507354, 3, 65538, 1507355, 3, 65538, 1507356, 3, 65538, 1507357, 3, 65538, 1507358, 3, 65538, 1507359, 3, 65538, 1507360, 3, 65538, 1507361, 3, 65538, 1507362, 3, 65538, 1507363, 3, 65538, 1507364, 3, 65538, 1507365, 3, 65538, 1507366, 3, 65538, 1507367, 3, 65538, 1507368, 3, 65538, 1507369, 3, 65538, 1507370, 3, 65538, 1507371, 3, 65538, 1507372, 3, 65539, 1507381, 3, 65537, 1507382, 3, 65538, 1507383, 3, 65538, 1507384, 3, 65538, 1507385, 3, 65538, 1507386, 3, 65538, 1507387, 3, 65538, 1507388, 3, 65538, 1507389, 3, 65538, 1507390, 3, 65538, 1507391, 3, 65538, 1507392, 3, 65538, 1507393, 3, 65538, 1507394, 3, 65538, 1507395, 3, 65538, 1507396, 3, 65538, 1507397, 3, 65538, 1507398, 3, 65538, 1507399, 3, 65539, 1507403, 3, 65537, 1507404, 3, 65538, 1507405, 3, 65538, 1507406, 3, 65538, 1507407, 3, 65538, 1507408, 3, 65538, 1507409, 3, 65538, 1507410, 3, 65538, 1507411, 3, 65538, 1507412, 3, 65538, 1507413, 3, 65538, 1507414, 3, 65538, 1507415, 3, 65538, 1507416, 3, 65538, 1507417, 3, 65538, 1507418, 3, 65538, 1507419, 3, 65538, 1507420, 3, 65538, 1507421, 3, 65538, 1507422, 3, 65538, 1507423, 3, 65538, 1507424, 3, 65539, 1638399, 3, 131073, 1572864, 3, 131074, 1572865, 3, 131074, 1572866, 3, 131074, 1572867, 3, 131074, 1572868, 3, 131074, 1572869, 3, 131074, 1572870, 3, 131074, 1572871, 3, 131074, 1572872, 3, 131074, 1572873, 3, 131074, 1572874, 3, 131074, 1572875, 3, 131074, 1572876, 3, 131074, 1572877, 3, 131074, 1572878, 3, 131074, 1572879, 3, 131074, 1572880, 3, 131074, 1572881, 3, 131074, 1572882, 3, 131074, 1572883, 3, 131074, 1572884, 3, 131074, 1572885, 3, 131075, 1572889, 3, 131073, 1572890, 3, 131074, 1572891, 3, 131074, 1572892, 3, 131074, 1572893, 3, 131074, 1572894, 3, 131074, 1572895, 3, 131074, 1572896, 3, 131074, 1572897, 3, 131074, 1572898, 3, 131074, 1572899, 3, 131074, 1572900, 3, 131074, 1572901, 3, 131074, 1572902, 3, 131074, 1572903, 3, 131074, 1572904, 3, 131074, 1572905, 3, 131074, 1572906, 3, 131074, 1572907, 3, 131074, 1572908, 3, 131075, 1572917, 3, 131073, 1572918, 3, 131074, 1572919, 3, 131074, 1572920, 3, 131074, 1572921, 3, 131074, 1572922, 3, 131074, 1572923, 3, 131074, 1572924, 3, 131074, 1572925, 3, 131074, 1572926, 3, 131074, 1572927, 3, 131074, 1572928, 3, 131074, 1572929, 3, 131074, 1572930, 3, 131074, 1572931, 3, 131074, 1572932, 3, 131074, 1572933, 3, 131074, 1572934, 3, 131074, 1572935, 3, 131075, 1572939, 3, 131073, 1572940, 3, 131074, 1572941, 3, 131074, 1572942, 3, 131074, 1572943, 3, 131074, 1572944, 3, 131074, 1572945, 3, 131074, 1572946, 3, 131074, 1572947, 3, 131074, 1572948, 3, 131074, 1572949, 3, 131074, 1572950, 3, 131074, 1572951, 3, 131074, 1572952, 3, 131074, 1572953, 3, 131074, 1572954, 3, 131074, 1572955, 3, 131074, 1572956, 3, 131074, 1572957, 3, 131074, 1572958, 3, 131074, 1572959, 3, 131074, 1572960, 3, 131075 ) +tile_data = PoolIntArray( 65535, 3, 0, 96, 3, 0, 131071, 3, 65536, 65632, 3, 65536, 196607, 3, 65536, 131168, 3, 65536, 262143, 3, 65536, 196635, 2, 2, 196695, 2, 1, 196698, 3, 1, 196699, 3, 3, 196704, 3, 65536, 327679, 3, 65536, 262159, 3, 196609, 262160, 3, 196611, 262171, 3, 1, 262172, 3, 196610, 262173, 3, 196611, 262187, 2, 1, 262196, 3, 196609, 262197, 3, 196611, 262200, 3, 196609, 262201, 3, 196610, 262202, 3, 196611, 262227, 2, 2, 262230, 3, 1, 262231, 3, 3, 262234, 3, 65537, 262235, 3, 65539, 262236, 2, 2, 262240, 3, 65536, 393215, 3, 65536, 327683, 3, 1, 327684, 3, 2, 327685, 3, 3, 327690, 3, 196609, 327691, 3, 196610, 327692, 3, 196610, 327693, 3, 196610, 327694, 3, 196611, 327707, 3, 65536, 327711, 3, 0, 327719, 3, 196609, 327720, 3, 196610, 327721, 3, 196610, 327722, 3, 196610, 327723, 3, 196610, 327724, 3, 196610, 327725, 3, 196610, 327726, 3, 196610, 327727, 3, 196610, 327728, 3, 196611, 327762, 3, 1, 327763, 3, 2, 327764, 3, 2, 327765, 3, 2, 327766, 3, 65538, 327767, 3, 65538, 327768, 3, 2, 327769, 3, 2, 327770, 3, 65538, 327771, 3, 65538, 327772, 3, 3, 327776, 3, 65536, 458751, 3, 65536, 393219, 3, 131073, 393220, 3, 131074, 393221, 3, 131075, 393242, 3, 1, 393243, 3, 65539, 393247, 3, 65536, 393291, 2, 1, 393295, 2, 0, 393298, 3, 65537, 393299, 3, 65538, 393300, 3, 65538, 393301, 3, 131074, 393302, 3, 131074, 393303, 3, 131074, 393304, 3, 131074, 393305, 3, 131074, 393306, 3, 131074, 393307, 3, 131074, 393308, 3, 131075, 393312, 3, 65536, 524287, 3, 65536, 458770, 3, 1, 458771, 3, 2, 458772, 3, 2, 458773, 3, 2, 458774, 3, 3, 458777, 3, 196609, 458778, 3, 131074, 458779, 3, 131074, 458780, 3, 196610, 458781, 3, 196610, 458782, 3, 196610, 458783, 3, 131075, 458787, 3, 196609, 458788, 3, 196610, 458789, 3, 196611, 458827, 3, 1, 458828, 3, 196610, 458829, 3, 196610, 458830, 3, 196610, 458831, 3, 196610, 458832, 3, 196610, 458833, 3, 196610, 458834, 3, 131074, 458835, 3, 131074, 458836, 3, 65539, 458848, 3, 65536, 589823, 3, 65536, 524306, 3, 65537, 524307, 3, 65538, 524308, 3, 65538, 524309, 3, 65538, 524310, 3, 65539, 524334, 2, 3, 524341, 2, 1, 524348, 2, 2, 524349, 3, 1, 524350, 3, 196610, 524351, 3, 196610, 524352, 3, 196610, 524353, 3, 196610, 524354, 3, 196610, 524355, 3, 3, 524359, 2, 3, 524363, 3, 65536, 524372, 3, 65536, 524384, 3, 65536, 655359, 3, 65536, 589835, 2, 3, 589842, 3, 65537, 589843, 3, 131074, 589844, 3, 131074, 589845, 3, 131074, 589846, 3, 131074, 589847, 3, 3, 589858, 2, 1, 589860, 2, 0, 589863, 3, 0, 589870, 3, 196609, 589871, 3, 196610, 589872, 3, 196610, 589873, 3, 196610, 589874, 3, 196610, 589875, 3, 196610, 589876, 3, 196610, 589877, 3, 196610, 589878, 3, 2, 589879, 3, 196610, 589880, 3, 196610, 589881, 3, 196610, 589882, 3, 196610, 589883, 3, 196610, 589884, 3, 196610, 589885, 3, 131075, 589891, 3, 131073, 589892, 3, 196610, 589893, 3, 196610, 589894, 3, 196610, 589895, 3, 196610, 589896, 3, 196610, 589897, 3, 196610, 589898, 3, 196610, 589899, 3, 131075, 589908, 3, 65536, 589919, 3, 1, 589920, 3, 65539, 720895, 3, 65536, 655366, 3, 196609, 655367, 3, 196610, 655368, 3, 196610, 655369, 3, 196610, 655370, 3, 196610, 655371, 3, 196610, 655372, 3, 196611, 655374, 3, 196609, 655375, 3, 196610, 655376, 3, 196610, 655377, 3, 196610, 655378, 3, 131075, 655383, 3, 65536, 655385, 2, 1, 655390, 3, 1, 655391, 3, 2, 655392, 3, 196610, 655393, 3, 196610, 655394, 3, 196610, 655395, 3, 196610, 655396, 3, 196610, 655397, 3, 196610, 655398, 3, 196610, 655399, 3, 131075, 655414, 3, 65536, 655444, 3, 65536, 655449, 2, 1, 655452, 2, 2, 655455, 3, 65537, 655456, 3, 65539, 786431, 3, 65536, 720919, 3, 131073, 720920, 3, 196610, 720921, 3, 196610, 720922, 3, 196610, 720923, 3, 196610, 720924, 3, 196611, 720926, 3, 131073, 720927, 3, 131075, 720950, 3, 65536, 720977, 3, 1, 720978, 3, 2, 720979, 3, 2, 720980, 3, 131075, 720982, 3, 196609, 720983, 3, 196610, 720984, 3, 196610, 720985, 3, 196610, 720986, 3, 196610, 720987, 3, 196610, 720988, 3, 196610, 720989, 3, 196610, 720990, 3, 196610, 720991, 3, 131074, 720992, 3, 65539, 851967, 3, 65536, 786486, 3, 65536, 786513, 3, 131073, 786514, 3, 131074, 786515, 3, 131075, 786528, 3, 65536, 917503, 3, 65537, 851968, 3, 2, 851969, 3, 2, 851970, 3, 2, 851971, 3, 3, 851981, 3, 196609, 851982, 3, 196610, 851983, 3, 196611, 852012, 2, 2, 852015, 2, 0, 852022, 3, 131072, 852037, 2, 2, 852040, 2, 1, 852044, 3, 1, 852045, 3, 2, 852046, 3, 3, 852064, 3, 65536, 983039, 3, 65537, 917504, 3, 131074, 917505, 3, 131074, 917506, 3, 131074, 917507, 3, 131075, 917516, 3, 0, 917522, 3, 0, 917531, 2, 3, 917548, 3, 196609, 917549, 3, 196610, 917550, 3, 196610, 917551, 3, 196611, 917554, 3, 196609, 917555, 3, 196610, 917556, 3, 196611, 917573, 3, 1, 917574, 3, 2, 917575, 3, 2, 917576, 3, 3, 917580, 3, 131073, 917581, 3, 131074, 917582, 3, 131075, 917600, 3, 65536, 1048575, 3, 65536, 983051, 2, 1, 983052, 3, 65536, 983058, 3, 65537, 983059, 3, 2, 983060, 3, 2, 983061, 3, 2, 983062, 3, 3, 983065, 3, 196609, 983066, 3, 196610, 983067, 3, 196610, 983068, 3, 196610, 983069, 3, 3, 983078, 2, 2, 983109, 3, 131073, 983110, 3, 131074, 983111, 3, 131074, 983112, 3, 131075, 983134, 3, 196609, 983135, 3, 196610, 983136, 3, 65539, 1114111, 3, 65536, 1048587, 3, 196609, 1048588, 3, 131074, 1048589, 3, 196610, 1048590, 3, 196610, 1048591, 3, 196610, 1048592, 3, 196610, 1048593, 3, 196610, 1048594, 3, 131074, 1048595, 3, 131074, 1048596, 3, 131074, 1048597, 3, 131074, 1048598, 3, 131075, 1048605, 3, 131073, 1048606, 3, 196610, 1048607, 3, 196610, 1048608, 3, 196610, 1048609, 3, 196611, 1048612, 3, 196609, 1048613, 3, 196610, 1048614, 3, 196610, 1048615, 3, 196610, 1048616, 3, 196611, 1048636, 3, 1, 1048637, 3, 2, 1048638, 3, 2, 1048639, 3, 2, 1048640, 3, 2, 1048641, 3, 2, 1048642, 3, 3, 1048659, 3, 1, 1048660, 3, 2, 1048661, 3, 2, 1048662, 3, 3, 1048665, 3, 196608, 1048668, 3, 196608, 1048672, 3, 65536, 1179647, 3, 65536, 1114168, 2, 3, 1114172, 3, 131073, 1114173, 3, 131074, 1114174, 3, 131074, 1114175, 3, 131074, 1114176, 3, 131074, 1114177, 3, 131074, 1114178, 3, 131075, 1114194, 3, 1, 1114195, 3, 65538, 1114196, 3, 65538, 1114197, 3, 131074, 1114198, 3, 131075, 1114208, 3, 65536, 1245183, 3, 65537, 1179648, 3, 196610, 1179649, 3, 196610, 1179650, 3, 196611, 1179653, 3, 196609, 1179654, 3, 196610, 1179655, 3, 196610, 1179656, 3, 196611, 1179702, 3, 196609, 1179703, 3, 196610, 1179704, 3, 196610, 1179705, 3, 196610, 1179706, 3, 196611, 1179728, 3, 1, 1179729, 3, 2, 1179730, 3, 65538, 1179731, 3, 131074, 1179732, 3, 131075, 1179744, 3, 65536, 1310719, 3, 65536, 1245225, 2, 0, 1245228, 2, 1, 1245264, 3, 131073, 1245265, 3, 131074, 1245266, 3, 131075, 1245280, 3, 65536, 1376255, 3, 65536, 1310731, 3, 1, 1310732, 3, 2, 1310733, 3, 2, 1310734, 3, 2, 1310735, 3, 3, 1310761, 3, 1, 1310762, 3, 2, 1310763, 3, 2, 1310764, 3, 3, 1310816, 3, 65536, 1441791, 3, 65536, 1376261, 2, 3, 1376264, 2, 1, 1376266, 3, 1, 1376267, 3, 65538, 1376268, 3, 65538, 1376269, 3, 65538, 1376270, 3, 65538, 1376271, 3, 65538, 1376272, 3, 3, 1376283, 2, 0, 1376287, 2, 1, 1376289, 2, 2, 1376293, 2, 1, 1376297, 3, 65537, 1376298, 3, 65538, 1376299, 3, 65538, 1376300, 3, 65539, 1376309, 2, 3, 1376312, 2, 0, 1376316, 2, 2, 1376319, 2, 1, 1376322, 2, 0, 1376331, 2, 3, 1376335, 2, 2, 1376339, 2, 0, 1376343, 2, 1, 1376352, 3, 65536, 1507327, 3, 65537, 1441792, 3, 2, 1441793, 3, 2, 1441794, 3, 2, 1441795, 3, 2, 1441796, 3, 2, 1441797, 3, 2, 1441798, 3, 2, 1441799, 3, 2, 1441800, 3, 2, 1441801, 3, 2, 1441802, 3, 65538, 1441803, 3, 65538, 1441804, 3, 65538, 1441805, 3, 65538, 1441806, 3, 65538, 1441807, 3, 65538, 1441808, 3, 65538, 1441809, 3, 2, 1441810, 3, 2, 1441811, 3, 2, 1441812, 3, 2, 1441813, 3, 3, 1441817, 3, 1, 1441818, 3, 2, 1441819, 3, 2, 1441820, 3, 2, 1441821, 3, 2, 1441822, 3, 2, 1441823, 3, 2, 1441824, 3, 2, 1441825, 3, 2, 1441826, 3, 2, 1441827, 3, 2, 1441828, 3, 2, 1441829, 3, 2, 1441830, 3, 2, 1441831, 3, 2, 1441832, 3, 2, 1441833, 3, 65538, 1441834, 3, 65538, 1441835, 3, 65538, 1441836, 3, 65539, 1441845, 3, 1, 1441846, 3, 2, 1441847, 3, 2, 1441848, 3, 2, 1441849, 3, 2, 1441850, 3, 2, 1441851, 3, 2, 1441852, 3, 2, 1441853, 3, 2, 1441854, 3, 2, 1441855, 3, 2, 1441856, 3, 2, 1441857, 3, 2, 1441858, 3, 2, 1441859, 3, 2, 1441860, 3, 2, 1441861, 3, 2, 1441862, 3, 2, 1441863, 3, 3, 1441867, 3, 1, 1441868, 3, 2, 1441869, 3, 2, 1441870, 3, 2, 1441871, 3, 2, 1441872, 3, 2, 1441873, 3, 2, 1441874, 3, 2, 1441875, 3, 2, 1441876, 3, 2, 1441877, 3, 2, 1441878, 3, 2, 1441879, 3, 2, 1441880, 3, 2, 1441881, 3, 2, 1441882, 3, 2, 1441883, 3, 2, 1441884, 3, 2, 1441885, 3, 2, 1441886, 3, 2, 1441887, 3, 2, 1441888, 3, 65539, 1572863, 3, 65537, 1507328, 3, 65538, 1507329, 3, 65538, 1507330, 3, 65538, 1507331, 3, 65538, 1507332, 3, 65538, 1507333, 3, 65538, 1507334, 3, 65538, 1507335, 3, 65538, 1507336, 3, 65538, 1507337, 3, 65538, 1507338, 3, 65538, 1507339, 3, 65538, 1507340, 3, 65538, 1507341, 3, 65538, 1507342, 3, 65538, 1507343, 3, 65538, 1507344, 3, 65538, 1507345, 3, 65538, 1507346, 3, 65538, 1507347, 3, 65538, 1507348, 3, 65538, 1507349, 3, 65539, 1507353, 3, 65537, 1507354, 3, 65538, 1507355, 3, 65538, 1507356, 3, 65538, 1507357, 3, 65538, 1507358, 3, 65538, 1507359, 3, 65538, 1507360, 3, 65538, 1507361, 3, 65538, 1507362, 3, 65538, 1507363, 3, 65538, 1507364, 3, 65538, 1507365, 3, 65538, 1507366, 3, 65538, 1507367, 3, 65538, 1507368, 3, 65538, 1507369, 3, 65538, 1507370, 3, 65538, 1507371, 3, 65538, 1507372, 3, 65539, 1507381, 3, 65537, 1507382, 3, 65538, 1507383, 3, 65538, 1507384, 3, 65538, 1507385, 3, 65538, 1507386, 3, 65538, 1507387, 3, 65538, 1507388, 3, 65538, 1507389, 3, 65538, 1507390, 3, 65538, 1507391, 3, 65538, 1507392, 3, 65538, 1507393, 3, 65538, 1507394, 3, 65538, 1507395, 3, 65538, 1507396, 3, 65538, 1507397, 3, 65538, 1507398, 3, 65538, 1507399, 3, 65539, 1507403, 3, 65537, 1507404, 3, 65538, 1507405, 3, 65538, 1507406, 3, 65538, 1507407, 3, 65538, 1507408, 3, 65538, 1507409, 3, 65538, 1507410, 3, 65538, 1507411, 3, 65538, 1507412, 3, 65538, 1507413, 3, 65538, 1507414, 3, 65538, 1507415, 3, 65538, 1507416, 3, 65538, 1507417, 3, 65538, 1507418, 3, 65538, 1507419, 3, 65538, 1507420, 3, 65538, 1507421, 3, 65538, 1507422, 3, 65538, 1507423, 3, 65538, 1507424, 3, 65539, 1638399, 3, 131073, 1572864, 3, 131074, 1572865, 3, 131074, 1572866, 3, 131074, 1572867, 3, 131074, 1572868, 3, 131074, 1572869, 3, 131074, 1572870, 3, 131074, 1572871, 3, 131074, 1572872, 3, 131074, 1572873, 3, 131074, 1572874, 3, 131074, 1572875, 3, 131074, 1572876, 3, 131074, 1572877, 3, 131074, 1572878, 3, 131074, 1572879, 3, 131074, 1572880, 3, 131074, 1572881, 3, 131074, 1572882, 3, 131074, 1572883, 3, 131074, 1572884, 3, 131074, 1572885, 3, 131075, 1572889, 3, 131073, 1572890, 3, 131074, 1572891, 3, 131074, 1572892, 3, 131074, 1572893, 3, 131074, 1572894, 3, 131074, 1572895, 3, 131074, 1572896, 3, 131074, 1572897, 3, 131074, 1572898, 3, 131074, 1572899, 3, 131074, 1572900, 3, 131074, 1572901, 3, 131074, 1572902, 3, 131074, 1572903, 3, 131074, 1572904, 3, 131074, 1572905, 3, 131074, 1572906, 3, 131074, 1572907, 3, 131074, 1572908, 3, 131075, 1572917, 3, 131073, 1572918, 3, 131074, 1572919, 3, 131074, 1572920, 3, 131074, 1572921, 3, 131074, 1572922, 3, 131074, 1572923, 3, 131074, 1572924, 3, 131074, 1572925, 3, 131074, 1572926, 3, 131074, 1572927, 3, 131074, 1572928, 3, 131074, 1572929, 3, 131074, 1572930, 3, 131074, 1572931, 3, 131074, 1572932, 3, 131074, 1572933, 3, 131074, 1572934, 3, 131074, 1572935, 3, 131075, 1572939, 3, 131073, 1572940, 3, 131074, 1572941, 3, 131074, 1572942, 3, 131074, 1572943, 3, 131074, 1572944, 3, 131074, 1572945, 3, 131074, 1572946, 3, 131074, 1572947, 3, 131074, 1572948, 3, 131074, 1572949, 3, 131074, 1572950, 3, 131074, 1572951, 3, 131074, 1572952, 3, 131074, 1572953, 3, 131074, 1572954, 3, 131074, 1572955, 3, 131074, 1572956, 3, 131074, 1572957, 3, 131074, 1572958, 3, 131074, 1572959, 3, 131074, 1572960, 3, 131075 ) [node name="Player" parent="." instance=ExtResource( 26 )] position = Vector2( 24, 176 ) @@ -73,7 +73,7 @@ tile_data = PoolIntArray( -1179648, 0, 0, 65515, 11, 0, 131050, 11, 0, 131052, 1 tile_set = ExtResource( 21 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 131125, 0, 0, 196661, 0, 0, 262164, 0, 0, 262197, 0, 0, 262218, 0, 0, 327700, 0, 0, 327749, 0, 0, 327754, 0, 0, 327775, 0, 0, 393236, 0, 0, 393285, 0, 0, 393290, 0, 0, 393311, 0, 0, 458821, 0, 0, 458847, 0, 0, 524383, 0, 0, 655362, 0, 0, 720898, 0, 0, 786434, 0, 0, 983046, 0, 0, 1048582, 0, 0, 1048618, 0, 0, 1114118, 0, 0, 1114154, 0, 0 ) +tile_data = PoolIntArray( 262164, 0, 0, 262218, 0, 0, 327700, 0, 0, 327749, 0, 0, 327754, 0, 0, 327775, 0, 0, 393236, 0, 0, 393285, 0, 0, 393290, 0, 0, 393311, 0, 0, 458821, 0, 0, 458847, 0, 0, 524383, 0, 0, 655362, 0, 0, 720898, 0, 0, 786434, 0, 0, 983046, 0, 0, 1048582, 0, 0, 1048618, 0, 0, 1114118, 0, 0, 1114154, 0, 0 ) [node name="Environment" type="Node2D" parent="."] @@ -87,10 +87,6 @@ scale = Vector2( 1, 3 ) position = Vector2( 160, 32 ) scale = Vector2( 1, 3 ) -[node name="Ladder4" parent="Environment/Ladders" instance=ExtResource( 1 )] -position = Vector2( 424, 16 ) -scale = Vector2( 1, 3 ) - [node name="Ladder8" parent="Environment/Ladders" instance=ExtResource( 1 )] position = Vector2( 336, 128 ) scale = Vector2( 1, 2 ) @@ -310,12 +306,12 @@ position = Vector2( 200, 112 ) position = Vector2( 32, 32 ) [node name="Shard4" parent="Collectibles" instance=ExtResource( 17 )] -position = Vector2( 224, 48 ) -number = 1 +position = Vector2( 648, 80 ) +number = 2 [node name="Shard2" parent="Collectibles" instance=ExtResource( 17 )] -position = Vector2( 456, 32 ) -number = 2 +position = Vector2( 456, 24 ) +number = 1 [node name="Shard3" parent="Collectibles" instance=ExtResource( 17 )] position = Vector2( 688, 80 ) @@ -323,7 +319,7 @@ number = 3 [node name="Star3" parent="Collectibles" instance=ExtResource( 4 )] position = Vector2( 416, 104 ) -color = 2 +color = 3 [node name="Arrow" parent="Collectibles" instance=ExtResource( 27 )] position = Vector2( 176, 112 ) @@ -336,8 +332,8 @@ position = Vector2( 760, 112 ) color = 4 [node name="Star5" parent="Collectibles" instance=ExtResource( 4 )] -position = Vector2( 656, 80 ) -color = 3 +position = Vector2( 224, 48 ) +color = 2 [node name="Enemies" type="Node2D" parent="."] diff --git a/menus/DeleteButton.gd b/menus/DeleteButton.gd new file mode 100644 index 0000000..4af4968 --- /dev/null +++ b/menus/DeleteButton.gd @@ -0,0 +1,14 @@ +extends TextureButton + +onready var sprite = $AnimatedSprite + +func _process(delta): + if has_focus(): + sprite.playing = true + else: + sprite.playing = false + sprite.frame = 0 + +func _gui_input(event): + if event.is_action_pressed("ui_accept"): + get_parent().set_kill_mode(!get_parent().kill_mode) diff --git a/menus/back_button.tscn b/menus/back_button.tscn index 6547abc..533d19f 100644 --- a/menus/back_button.tscn +++ b/menus/back_button.tscn @@ -18,7 +18,7 @@ animations = [ { "speed": 5.0 } ] -[node name="Button" type="TextureButton"] +[node name="Back" type="TextureButton"] margin_right = 52.0 margin_bottom = 33.0 theme = SubResource( 1 ) diff --git a/menus/file_create.gd b/menus/file_create.gd index 91829ae..df1e603 100644 --- a/menus/file_create.gd +++ b/menus/file_create.gd @@ -3,13 +3,29 @@ extends Node const DESCRIPTIONS := [ # sweet mode - {"enemies": "*slower enemies", "lives": "*unlimited lives"}, + { + "enemies": "*slower enemies", + "lives": "*unlimited lives", + "description": "*Difficulty for\n beginners", + }, # salty mode - {"enemies": "*normal enemies", "lives": "*unlimited lives"}, + { + "enemies": "*normal enemies", + "lives": "*unlimited lives", + "description": "*Difficulty for\n skilled players", + }, # spicy mode - {"enemies": "*normal enemies", "lives": "*limited lives"}, + { + "enemies": "*normal enemies", + "lives": "*limited lives", + "description": "*Difficulty for\n retro players", + }, # pungent mode - {"enemies": "*faster enemies", "lives": "*limited lives"}, + { + "enemies": "*faster enemies", + "lives": "*limited lives", + "description": "*Difficulty for\n insane players", + }, ] var file: Save.SaveFile = null @@ -19,6 +35,7 @@ onready var face: Sprite = $"%Face" onready var chosen_name: Label = $"%ChosenName" onready var enemies: Label = $"%Enemies" onready var lives: Label = $"%Lives" +onready var description: Label = $"%Description" func _ready() -> void: @@ -45,6 +62,8 @@ func _set_difficulty(value: int) -> void: face.frame = difficulty enemies.text = DESCRIPTIONS[difficulty].enemies lives.text = DESCRIPTIONS[difficulty].lives + description.text = DESCRIPTIONS[difficulty].description + func _difficulty_selected() -> void: diff --git a/menus/file_create.tscn b/menus/file_create.tscn index 5f6e441..ead9ef4 100644 --- a/menus/file_create.tscn +++ b/menus/file_create.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1] [ext_resource path="res://ui/theme.tres" type="Theme" id=2] @@ -14,6 +14,7 @@ [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=12] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=13] [ext_resource path="res://graphics/exit/exit.png" type="Texture" id=14] +[ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=15] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) @@ -78,17 +79,30 @@ theme = ExtResource( 2 ) [node name="Label" type="Label" parent="DifficultySelect"] material = ExtResource( 8 ) margin_left = 8.0 -margin_top = 40.0 -margin_right = 134.0 -margin_bottom = 54.0 -text = "Select Difficulty:" +margin_top = 8.0 +margin_right = 253.0 +margin_bottom = 44.0 +text = "Select the difficulty of the +future, sg loves hot chips but that +doesn't mean you have to" + +[node name="Label2" type="Label" parent="DifficultySelect"] +material = ExtResource( 8 ) +margin_left = 92.0 +margin_top = 56.0 +margin_right = 176.0 +margin_bottom = 105.0 +text = "Feel free +to start +anew if you +have trouble" [node name="ButtonsPanel" type="Panel" parent="DifficultySelect"] material = SubResource( 2 ) margin_left = 16.0 -margin_top = 64.0 +margin_top = 48.0 margin_right = 88.0 -margin_bottom = 128.0 +margin_bottom = 112.0 theme = ExtResource( 2 ) [node name="Body" type="Label" parent="DifficultySelect/ButtonsPanel"] @@ -146,9 +160,9 @@ texture_focused = ExtResource( 6 ) [node name="DescriptionPanel" type="Panel" parent="DifficultySelect"] material = SubResource( 2 ) margin_left = 16.0 -margin_top = 136.0 +margin_top = 120.0 margin_right = 144.0 -margin_bottom = 176.0 +margin_bottom = 184.0 theme = ExtResource( 2 ) [node name="Enemies" type="Label" parent="DifficultySelect/DescriptionPanel"] @@ -174,6 +188,16 @@ margin_bottom = -8.0 text = "*limited lives" autowrap = true +[node name="Description" type="Label" parent="DifficultySelect/DescriptionPanel"] +unique_name_in_owner = true +material = SubResource( 2 ) +margin_left = 8.0 +margin_top = 37.0 +margin_right = 113.0 +margin_bottom = 69.0 +text = "*Difficulty for + retro players" + [node name="SG" type="TextureRect" parent="DifficultySelect"] margin_left = 176.0 margin_top = 40.0 @@ -360,6 +384,9 @@ region_rect = Rect2( 0, 0, 16, 24 ) position = Vector2( 0, 4 ) shape = SubResource( 6 ) +[node name="Ladder" parent="NameEntry" instance=ExtResource( 15 )] +scale = Vector2( 1, 20 ) + [connection signal="focus_entered" from="DifficultySelect/ButtonsPanel/Sweet" to="." method="_set_difficulty" binds= [ 0 ]] [connection signal="pressed" from="DifficultySelect/ButtonsPanel/Sweet" to="." method="_difficulty_selected"] [connection signal="focus_entered" from="DifficultySelect/ButtonsPanel/Salty" to="." method="_set_difficulty" binds= [ 1 ]] diff --git a/menus/file_select.gd b/menus/file_select.gd index ea107af..3248af8 100644 --- a/menus/file_select.gd +++ b/menus/file_select.gd @@ -2,7 +2,10 @@ extends Node export var next_scene: PackedScene - +var kill_mode = false +onready var description = $Description +onready var flavor_text = $FlavorText +onready var delete_background = $DeleteBackground func _ready() -> void: Fade.fade_in(0.4) @@ -13,3 +16,13 @@ func _on_file_loaded() -> void: Fade.fade_out(0.4) yield(Fade, "fade_finished") SceneManager.current_scene = next_scene.instance() + +func set_kill_mode(value): + delete_background.visible = value + kill_mode = value + if value == true: + description.text = "KILL MODE" + flavor_text.text = "Eviscerate an old friend" + else: + description.text = "Select your destiny" + flavor_text.text = "Adventure awaits" diff --git a/menus/file_select.tscn b/menus/file_select.tscn index 7694be0..f597492 100644 --- a/menus/file_select.tscn +++ b/menus/file_select.tscn @@ -1,11 +1,18 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://menus/file_select_panel.tscn" type="PackedScene" id=1] [ext_resource path="res://menus/level_select_scholar.tscn" type="PackedScene" id=2] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=3] +[ext_resource path="res://ui/theme.tres" type="Theme" id=4] +[ext_resource path="res://menus/back_button.tscn" type="PackedScene" id=5] +[ext_resource path="res://graphics/hud/delete_dim.png" type="Texture" id=6] +[ext_resource path="res://graphics/hud/delete.png" type="Texture" id=7] [ext_resource path="res://graphics/borders/skaborder.png" type="Texture" id=8] [ext_resource path="res://graphics/hud/file_select_arrow.png" type="Texture" id=9] [ext_resource path="res://menus/file_select.gd" type="Script" id=10] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=11] +[ext_resource path="res://menus/DeleteButton.gd" type="Script" id=12] +[ext_resource path="res://menus/main_menu.tscn" type="PackedScene" id=13] [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 11 ) @@ -27,6 +34,14 @@ shader_param/cycle_speed = Vector2( -8, 32 ) shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform2D( 1, 1.582, 1, 2, 0, 0 ) +[sub_resource type="SpriteFrames" id=4] +animations = [ { +"frames": [ ExtResource( 7 ), ExtResource( 6 ) ], +"loop": true, +"name": "default", +"speed": 5.0 +} ] + [node name="FileSelect" type="Node"] script = ExtResource( 10 ) next_scene = ExtResource( 2 ) @@ -52,20 +67,20 @@ margin_bottom = 192.0 [node name="Panel" parent="." instance=ExtResource( 1 )] margin_left = 12.0 -margin_top = 64.0 +margin_top = 48.0 margin_right = 84.0 margin_bottom = 136.0 [node name="Panel2" parent="." instance=ExtResource( 1 )] margin_left = 92.0 -margin_top = 64.0 +margin_top = 48.0 margin_right = 164.0 margin_bottom = 136.0 number = 2 [node name="Panel3" parent="." instance=ExtResource( 1 )] margin_left = 172.0 -margin_top = 64.0 +margin_top = 48.0 margin_right = 244.0 margin_bottom = 136.0 number = 3 @@ -77,6 +92,7 @@ margin_right = 84.0 margin_bottom = 146.0 focus_neighbour_left = NodePath("../SelectFile3") focus_neighbour_right = NodePath("../SelectFile2") +focus_neighbour_bottom = NodePath("../Back") texture_focused = ExtResource( 9 ) expand = true stretch_mode = 3 @@ -88,6 +104,7 @@ margin_right = 164.0 margin_bottom = 146.0 focus_neighbour_left = NodePath("../SelectFile1") focus_neighbour_right = NodePath("../SelectFile3") +focus_neighbour_bottom = NodePath("../Back") texture_focused = ExtResource( 9 ) expand = true stretch_mode = 3 @@ -99,10 +116,53 @@ margin_right = 244.0 margin_bottom = 146.0 focus_neighbour_left = NodePath("../SelectFile2") focus_neighbour_right = NodePath("../SelectFile1") +focus_neighbour_bottom = NodePath("../Back") texture_focused = ExtResource( 9 ) expand = true stretch_mode = 3 +[node name="Back" parent="." instance=ExtResource( 5 )] +margin_left = 8.0 +margin_top = 144.0 +margin_right = 60.0 +margin_bottom = 177.0 +focus_neighbour_top = NodePath("../SelectFile1") +focus_neighbour_right = NodePath("../DeleteButton") +next_scene = ExtResource( 13 ) + +[node name="Description" type="Label" parent="."] +material = ExtResource( 3 ) +margin_top = 8.0 +margin_right = 256.0 +margin_bottom = 22.0 +theme = ExtResource( 4 ) +text = "Select your destiny" +align = 1 + +[node name="DeleteButton" type="TextureButton" parent="."] +margin_left = 212.0 +margin_top = 144.0 +margin_right = 237.0 +margin_bottom = 178.0 +focus_neighbour_left = NodePath("../Back") +focus_neighbour_top = NodePath("../SelectFile1") +texture_normal = ExtResource( 7 ) +script = ExtResource( 12 ) + +[node name="AnimatedSprite" type="AnimatedSprite" parent="DeleteButton"] +position = Vector2( 13, 17 ) +frames = SubResource( 4 ) + +[node name="FlavorText" type="Label" parent="."] +material = ExtResource( 3 ) +margin_left = 40.0 +margin_top = 152.0 +margin_right = 208.0 +margin_bottom = 168.0 +theme = ExtResource( 4 ) +text = "Adventure awaits" +align = 1 + [connection signal="file_loaded" from="Panel" to="." method="_on_file_loaded"] [connection signal="file_loaded" from="Panel2" to="." method="_on_file_loaded"] [connection signal="file_loaded" from="Panel3" to="." method="_on_file_loaded"] diff --git a/menus/file_select_panel.gd b/menus/file_select_panel.gd index 114c948..5c12640 100644 --- a/menus/file_select_panel.gd +++ b/menus/file_select_panel.gd @@ -9,9 +9,45 @@ export var number = 1 var file: Save.SaveFile = null +onready var splatter = $DeathSplatter func _ready(): $FileNumber.text = "FILE%d" % number + refresh() + + +func select() -> void: + if get_parent().kill_mode == false: + # if a file exists, load and play it! + if file: + # set current file and difficulty + Save.current_file = file + Game.difficulty = file.difficulty + # update last-played file for continue button + Options.last_file = number + Options.save_options() + # let file select scene know a file has been loaded + emit_signal("file_loaded") + # empty file, so go to file creation screen + else: + # wait for fade + Fade.fade_out(0.4) + yield(Fade, "fade_finished") + # create new file and give it to the file create screen + var file_create = FileCreate.instance() + file_create.file = Save.SaveFile.new("user://file%d.pr" % number) + SceneManager.current_scene = file_create + else: + #Delete file + if file: + var dir = Directory.new() + dir.remove(file.file_path) + splatter.emitting = true + Audio.play_sound(Audio.a_die,Audio.ac_die) + refresh() + + +func refresh(): # check if the file exists if File.new().file_exists("user://file%d.pr" % number): # load file and fill in information @@ -21,28 +57,7 @@ func _ready(): $"%KeyCounter".text = "%03d" % file.get_total_keys() $"%DeathCounter".text = "%04d" % file.get_total_deaths() $"%TimeCounter".text = "%02d:%02d" % [file.play_time / 3600.0, fmod(file.play_time / 60.0, 60.0)] + $"%Difficulty".text = Game.DIFFICULTY_NAMES[file.difficulty] else: $FileExists.visible = false $FileDoesNotExist.visible = true - - -func select() -> void: - # if a file exists, load and play it! - if file: - # set current file and difficulty - Save.current_file = file - Game.difficulty = file.difficulty - # update last-played file for continue button - Options.last_file = number - Options.save_options() - # let file select scene know a file has been loaded - emit_signal("file_loaded") - # empty file, so go to file creation screen - else: - # wait for fade - Fade.fade_out(0.4) - yield(Fade, "fade_finished") - # create new file and give it to the file create screen - var file_create = FileCreate.instance() - file_create.file = Save.SaveFile.new("user://file%d.pr" % number) - SceneManager.current_scene = file_create diff --git a/menus/file_select_panel.tscn b/menus/file_select_panel.tscn index 4993b2e..f68eb55 100644 --- a/menus/file_select_panel.tscn +++ b/menus/file_select_panel.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=1] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=2] @@ -9,6 +9,7 @@ [ext_resource path="res://graphics/hud/deaths_head.png" type="Texture" id=7] [ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=8] [ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=9] +[ext_resource path="res://objects/enemy/death_particles.tscn" type="PackedScene" id=10] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) @@ -18,7 +19,7 @@ shader_param/palette = ExtResource( 9 ) [node name="Panel" type="Panel"] margin_right = 72.0 -margin_bottom = 72.0 +margin_bottom = 88.0 theme = ExtResource( 4 ) script = ExtResource( 6 ) @@ -95,6 +96,15 @@ position = Vector2( 32, 34 ) position = Vector2( 21, 52 ) texture = ExtResource( 7 ) +[node name="Difficulty" type="Label" parent="FileExists"] +unique_name_in_owner = true +margin_left = 8.0 +margin_top = 72.0 +margin_right = 65.0 +margin_bottom = 82.0 +text = "Spicy" +align = 1 + [node name="FileDoesNotExist" type="Control" parent="."] visible = false @@ -105,3 +115,13 @@ margin_right = 69.0 margin_bottom = 36.0 text = "Empty!!!" align = 1 + +[node name="DeathSplatter" parent="." instance=ExtResource( 10 )] +position = Vector2( 36, 47 ) +amount = 64 +lifetime = 1.0 +speed_scale = 3.0 +explosiveness = 1.0 +randomness = 0.34 +initial_velocity = 100.0 +scale_amount = 2.0 diff --git a/menus/main_menu.gd b/menus/main_menu.gd index 1e435df..03de133 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -33,3 +33,9 @@ func _on_Exit_button_down(): Fade.fade_out(0.4) yield(Fade, "fade_finished") get_tree().quit() + + +func _on_SoundTest_button_down(): + Fade.fade_out(0.4) + yield(Fade, "fade_finished") + SceneManager.current_scene = load("res://menus/sound_test.tscn").instance() diff --git a/menus/main_menu.tscn b/menus/main_menu.tscn index 1e91520..aa2ffda 100644 --- a/menus/main_menu.tscn +++ b/menus/main_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=1] [ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://menus/main_menu.gd" type="Script" id=5] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=6] [ext_resource path="res://graphics/hud/sg_menu_blink.png" type="Texture" id=7] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=8] [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 6 ) @@ -103,9 +104,9 @@ hframes = 3 [node name="Panel" type="Panel" parent="."] material = SubResource( 6 ) margin_left = 16.0 -margin_top = 32.0 +margin_top = 28.0 margin_right = 136.0 -margin_bottom = 120.0 +margin_bottom = 132.0 theme = ExtResource( 1 ) [node name="Body" type="Label" parent="Panel"] @@ -119,6 +120,7 @@ file select marathon mode augmentations options +sound test exit" [node name="GreyedContinue" type="Label" parent="Panel/Body"] @@ -176,16 +178,26 @@ margin_top = 61.0 margin_right = 16.0 margin_bottom = 69.0 focus_neighbour_top = NodePath("../Augmentations") -focus_neighbour_bottom = NodePath("../Exit") +focus_neighbour_bottom = NodePath("../SoundTest") texture_focused = ExtResource( 4 ) -[node name="Exit" type="TextureButton" parent="Panel"] +[node name="SoundTest" type="TextureButton" parent="Panel"] material = SubResource( 4 ) margin_left = 8.0 margin_top = 74.0 margin_right = 16.0 margin_bottom = 82.0 focus_neighbour_top = NodePath("../Options") +focus_neighbour_bottom = NodePath("../Exit") +texture_focused = ExtResource( 4 ) + +[node name="Exit" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) +margin_left = 8.0 +margin_top = 87.0 +margin_right = 16.0 +margin_bottom = 95.0 +focus_neighbour_top = NodePath("../SoundTest") focus_neighbour_bottom = NodePath("../Continue") texture_focused = ExtResource( 4 ) @@ -193,6 +205,29 @@ texture_focused = ExtResource( 4 ) autoplay = "blink" anims/blink = SubResource( 5 ) +[node name="Label" type="Label" parent="."] +material = ExtResource( 8 ) +margin_left = 8.0 +margin_top = 140.0 +margin_right = 183.0 +margin_bottom = 189.0 +theme = ExtResource( 1 ) +text = "REvolution - +The forcible overthrow of +a social order in favor +of a new future" + +[node name="Label2" type="Label" parent="."] +material = ExtResource( 8 ) +margin_top = 3.0 +margin_right = 175.0 +margin_bottom = 52.0 +theme = ExtResource( 1 ) +text = "Welcome to the future... +2083" +align = 1 + [connection signal="button_down" from="Panel/Continue" to="." method="_on_Continue_button_down"] [connection signal="button_down" from="Panel/FileSelect" to="." method="_on_FileSelect_button_down"] +[connection signal="button_down" from="Panel/SoundTest" to="." method="_on_SoundTest_button_down"] [connection signal="button_down" from="Panel/Exit" to="." method="_on_Exit_button_down"] diff --git a/menus/sound_test.gd b/menus/sound_test.gd index a36a593..443128e 100644 --- a/menus/sound_test.gd +++ b/menus/sound_test.gd @@ -1,4 +1,4 @@ extends Control -func _process(delta): - print(get_focus_owner()) +func _ready(): + Fade.fade_in(0.4) diff --git a/menus/sound_test.tscn b/menus/sound_test.tscn index 7aea2b1..0fa22ff 100644 --- a/menus/sound_test.tscn +++ b/menus/sound_test.tscn @@ -5,6 +5,7 @@ [ext_resource path="res://graphics/hud/listen_to_the_future.png" type="Texture" id=3] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4] [ext_resource path="res://ui/theme.tres" type="Theme" id=5] +[ext_resource path="res://audio/sounds/key.wav" type="AudioStream" id=6] [ext_resource path="res://graphics/hud/sound_test_title.png" type="Texture" id=11] [ext_resource path="res://graphics/player/sg_headphones.png" type="Texture" id=12] [ext_resource path="res://menus/music_select.gd" type="Script" id=13] @@ -33,7 +34,6 @@ [ext_resource path="res://audio/sounds/die_robot.wav" type="AudioStream" id=36] [ext_resource path="res://audio/sounds/boss_hurt.wav" type="AudioStream" id=37] [ext_resource path="res://audio/sounds/sword.ogg" type="AudioStream" id=38] -[ext_resource path="res://audio/sounds/key.ogg" type="AudioStream" id=39] [ext_resource path="res://audio/sounds/a_egg_collect.ogg" type="AudioStream" id=40] [ext_resource path="res://audio/sounds/a_bmilc.ogg" type="AudioStream" id=41] [ext_resource path="res://audio/sounds/a_climb.ogg" type="AudioStream" id=42] @@ -107,6 +107,7 @@ material = SubResource( 12 ) position = Vector2( 72, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite3" type="AnimatedSprite" parent="."] @@ -114,6 +115,7 @@ material = SubResource( 12 ) position = Vector2( 112, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite4" type="AnimatedSprite" parent="."] @@ -121,6 +123,7 @@ material = SubResource( 12 ) position = Vector2( 152, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite5" type="AnimatedSprite" parent="."] @@ -128,6 +131,7 @@ material = SubResource( 12 ) position = Vector2( 192, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="Music" type="TextureButton" parent="."] @@ -163,7 +167,7 @@ margin_left = 8.0 margin_top = 14.0 margin_right = 152.0 margin_bottom = 32.0 -text = "Rumble" +text = "Get Shard" align = 1 valign = 1 @@ -177,7 +181,7 @@ focus_neighbour_top = NodePath("../Music") texture_focused = ExtResource( 27 ) script = ExtResource( 16 ) titles = [ "Jump", "Double Jump", "Die", "Climb Down", "Climb Up", "Shoot Arrow", "Game Over", "Collect Key", "Collect Star", "Collect Arrow", "Bone Rattle", "Scrump Hurt", "Scrump Die", "Explosion", "Bubble", "Button", "Sword" ] -sounds = [ ExtResource( 25 ), ExtResource( 34 ), ExtResource( 30 ), ExtResource( 41 ), ExtResource( 42 ), ExtResource( 32 ), ExtResource( 35 ), ExtResource( 39 ), ExtResource( 43 ), ExtResource( 40 ), ExtResource( 33 ), ExtResource( 37 ), ExtResource( 31 ), ExtResource( 36 ), ExtResource( 24 ), ExtResource( 29 ), ExtResource( 38 ) ] +sounds = [ ExtResource( 25 ), ExtResource( 34 ), ExtResource( 30 ), ExtResource( 41 ), ExtResource( 42 ), ExtResource( 32 ), ExtResource( 35 ), ExtResource( 6 ), ExtResource( 43 ), ExtResource( 40 ), ExtResource( 33 ), ExtResource( 37 ), ExtResource( 31 ), ExtResource( 36 ), ExtResource( 24 ), ExtResource( 29 ), ExtResource( 38 ) ] [node name="SoundLabel" type="Label" parent="Sound"] material = ExtResource( 4 ) diff --git a/project.godot b/project.godot index 6016dc0..b121f54 100644 --- a/project.godot +++ b/project.godot @@ -71,12 +71,12 @@ config/icon="res://icon.png" [autoload] Border="*res://autoloads/border.tscn" -Options="*res://autoloads/options.gd" Save="*res://autoloads/save.gd" Game="*res://autoloads/game.gd" Audio="*res://autoloads/audio.tscn" LevelData="*res://autoloads/level_data.tscn" Debug="*res://autoloads/debug.tscn" +Options="*res://autoloads/options.gd" TouchControls="*res://autoloads/touch_controls.tscn" SceneManager="*res://autoloads/scene_manager.tscn" Console="*res://autoloads/console.tscn"