diff --git a/audio/sounds/Randomize68.wav b/audio/sounds/Randomize68.wav new file mode 100644 index 0000000..ab91d0d Binary files /dev/null and b/audio/sounds/Randomize68.wav differ diff --git a/audio/sounds/Randomize68.wav.import b/audio/sounds/Randomize68.wav.import new file mode 100644 index 0000000..5d42fbc --- /dev/null +++ b/audio/sounds/Randomize68.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Randomize68.wav-76b4fcda546935881a62126998e12569.sample" + +[deps] + +source_file="res://audio/sounds/Randomize68.wav" +dest_files=[ "res://.import/Randomize68.wav-76b4fcda546935881a62126998e12569.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/audio/sounds/confirm.wav b/audio/sounds/confirm.wav new file mode 100644 index 0000000..f9f0742 Binary files /dev/null and b/audio/sounds/confirm.wav differ diff --git a/audio/sounds/confirm.wav.import b/audio/sounds/confirm.wav.import new file mode 100644 index 0000000..430a1d3 --- /dev/null +++ b/audio/sounds/confirm.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/confirm.wav-5c8ff994a7a1c6a266fac6b1b2333f1f.sample" + +[deps] + +source_file="res://audio/sounds/confirm.wav" +dest_files=[ "res://.import/confirm.wav-5c8ff994a7a1c6a266fac6b1b2333f1f.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/audio/sounds/select.wav b/audio/sounds/select.wav new file mode 100644 index 0000000..feb4cbb Binary files /dev/null and b/audio/sounds/select.wav differ diff --git a/audio/sounds/select.wav.import b/audio/sounds/select.wav.import new file mode 100644 index 0000000..2e3b501 --- /dev/null +++ b/audio/sounds/select.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/select.wav-e46af9b8438415762676b0c812c256fa.sample" + +[deps] + +source_file="res://audio/sounds/select.wav" +dest_files=[ "res://.import/select.wav-e46af9b8438415762676b0c812c256fa.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 da9e2db..9e7359b 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -27,6 +27,8 @@ const a_die_robot = preload("res://audio/sounds/die_robot.wav") const a_gover = preload("res://audio/sounds/gover.wav") const a_boss_hurt = preload("res://audio/sounds/boss_hurt.wav") const a_bubble = preload("res://audio/sounds/bubble.wav") +const a_select = preload("res://audio/sounds/select.wav") +const a_confirm = preload("res://audio/sounds/confirm.wav") #Plays a sound diff --git a/graphics/hud/letter_blocks.png b/graphics/hud/letter_blocks.png index 7bd463e..6d4ab15 100644 Binary files a/graphics/hud/letter_blocks.png and b/graphics/hud/letter_blocks.png differ diff --git a/maps/boss/boss2_arena.tscn b/maps/boss/boss2_arena.tscn index 865c20d..ad8d5e5 100644 --- a/maps/boss/boss2_arena.tscn +++ b/maps/boss/boss2_arena.tscn @@ -37,13 +37,13 @@ __meta__ = { tile_set = ExtResource( 1 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 327693, 0, 0, 327694, 0, 0, 327695, 0, 0, 458763, 0, 131074, 458764, 0, 131074, 458765, 0, 131074, 458766, 0, 131074, 524298, 0, 131074, 524299, 0, 131074, 524300, 0, 131074, 524301, 0, 131074, 524302, 0, 131074, 589830, 0, 0, 589833, 0, 0, 589834, 0, 0, 589835, 0, 0, 589839, 0, 131074, 589840, 0, 131074, 655376, 0, 131074, 720909, 0, 131074, 720910, 0, 131074, 720911, 0, 131074, 720912, 0, 131074, 786447, 0, 131074, 851971, 0, 0, 917504, 0, 0, 917510, 0, 0, 917511, 0, 0, 917512, 0, 0, 917513, 0, 0, 917514, 0, 0, 917515, 0, 0, 917516, 0, 0, 917517, 0, 0, 1048577, 0, 0, 1048578, 0, 0, 1048583, 0, 131074, 1114119, 0, 131074, 1114120, 0, 131074, 1179656, 0, 0, 1310734, 0, 0, 1310735, 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, 3, 1507328, 0, 65536, 1507329, 0, 0, 1507330, 0, 65536, 1507331, 0, 0, 1507332, 0, 65536, 1507333, 0, 0, 1507334, 0, 65536, 1507335, 0, 0, 1507336, 0, 65536, 1507337, 0, 0, 1507338, 0, 65536, 1507339, 0, 0, 1507340, 0, 65536, 1507341, 0, 0, 1507342, 0, 65536, 1507343, 0, 0, 1507344, 0, 65536, 1507345, 0, 0, 1507346, 0, 65536, 1507347, 0, 0, 1507348, 0, 65536, 1507349, 0, 0, 1507350, 0, 65536, 1507351, 0, 0, 1507352, 0, 65536, 1507353, 0, 0, 1507354, 0, 65536, 1507355, 0, 0, 1507356, 0, 65536, 1507357, 0, 0, 1507358, 0, 65536, 1507359, 0, 0 ) +tile_data = PoolIntArray( 327693, 0, 0, 327694, 0, 0, 327695, 0, 0, 458763, 0, 131074, 458764, 0, 131074, 458765, 0, 131074, 458766, 0, 131074, 524298, 0, 131074, 524299, 0, 131074, 524300, 0, 131074, 524301, 0, 131074, 524302, 0, 131074, 589829, 0, 0, 589830, 0, 0, 589832, 0, 0, 589833, 0, 0, 589839, 0, 131074, 589840, 0, 131074, 655376, 0, 131074, 720909, 0, 131074, 720910, 0, 131074, 720911, 0, 131074, 720912, 0, 131074, 786447, 0, 131074, 851971, 0, 0, 917504, 0, 0, 917510, 0, 0, 917511, 0, 0, 917512, 0, 0, 917513, 0, 0, 917514, 0, 0, 917515, 0, 0, 983040, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048583, 0, 131074, 1114112, 0, 0, 1114113, 0, 0, 1114114, 0, 0, 1114119, 0, 131074, 1114120, 0, 131074, 1179656, 0, 0, 1310734, 0, 0, 1310735, 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, 3, 1507328, 0, 65536, 1507329, 0, 0, 1507330, 0, 65536, 1507331, 0, 0, 1507332, 0, 65536, 1507333, 0, 0, 1507334, 0, 65536, 1507335, 0, 0, 1507336, 0, 65536, 1507337, 0, 0, 1507338, 0, 65536, 1507339, 0, 0, 1507340, 0, 65536, 1507341, 0, 0, 1507342, 0, 65536, 1507343, 0, 0, 1507344, 0, 65536, 1507345, 0, 0, 1507346, 0, 65536, 1507347, 0, 0, 1507348, 0, 65536, 1507349, 0, 0, 1507350, 0, 65536, 1507351, 0, 0, 1507352, 0, 65536, 1507353, 0, 0, 1507354, 0, 65536, 1507355, 0, 0, 1507356, 0, 65536, 1507357, 0, 0, 1507358, 0, 65536, 1507359, 0, 0 ) [node name="Ladder" type="TileMap" parent="Ground"] tile_set = ExtResource( 14 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 655374, 0, 196609, 720910, 0, 196609, 786446, 0, 196609, 851982, 0, 196609, 917518, 0, 196609 ) +tile_data = PoolIntArray( 655372, 0, 196609, 720908, 0, 196609, 786444, 0, 196609, 851980, 0, 196609, 917516, 0, 196609 ) [node name="FallingBlock" parent="Ground" instance=ExtResource( 3 )] position = Vector2( 96, 152 ) @@ -75,7 +75,7 @@ use_iframes = true position = Vector2( 48, 216 ) [node name="Ladder2" parent="." instance=ExtResource( 10 )] -position = Vector2( 112, 80 ) +position = Vector2( 96, 80 ) scale = Vector2( 1, 5 ) [node name="DelayedArrow" parent="." instance=ExtResource( 12 )] diff --git a/menus/DeleteButton.gd b/menus/DeleteButton.gd index 4af4968..cac4c5e 100644 --- a/menus/DeleteButton.gd +++ b/menus/DeleteButton.gd @@ -12,3 +12,4 @@ func _process(delta): func _gui_input(event): if event.is_action_pressed("ui_accept"): get_parent().set_kill_mode(!get_parent().kill_mode) + Audio.play_sound(Audio.a_confirm,Audio.ac_collectible) diff --git a/menus/back_button.gd b/menus/back_button.gd index 18327af..9ef8314 100644 --- a/menus/back_button.gd +++ b/menus/back_button.gd @@ -13,3 +13,4 @@ func _process(delta): func _gui_input(event): if event.is_action_pressed("ui_accept"): SceneManager.current_scene = next_scene.instance() + Audio.play_sound(Audio.a_confirm,Audio.ac_collectible) diff --git a/menus/file_create.gd b/menus/file_create.gd index df1e603..aacb994 100644 --- a/menus/file_create.gd +++ b/menus/file_create.gd @@ -76,11 +76,17 @@ func _difficulty_selected() -> void: Fade.fade_in(0.4) func _on_letter_chosen(letter: String) -> void: - file.name += letter + if file.name.length() < 8: + file.name += letter chosen_name.text = file.name if file.name.length() > 0: $"%ExitDoor".frame = 1 +func _on_backspace(): +# file.name.erase(file.name.length() - 1,1) + file.name = file.name.left(file.name.length() - 1) + chosen_name.text = file.name + print(file.name.length()) func _on_Exit_area_entered(area: Area2D) -> void: if file.name.length() > 0: diff --git a/menus/file_create.tscn b/menus/file_create.tscn index ead9ef4..4ac346a 100644 --- a/menus/file_create.tscn +++ b/menus/file_create.tscn @@ -75,6 +75,9 @@ unique_name_in_owner = true anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 2 ) +__meta__ = { +"_edit_lock_": true +} [node name="Label" type="Label" parent="DifficultySelect"] material = ExtResource( 8 ) @@ -258,6 +261,8 @@ tile_data = PoolIntArray( -1, 0, 1, -65536, 0, 196610, -65535, 0, 196610, -65534 [node name="Player" parent="NameEntry" instance=ExtResource( 10 )] unique_name_in_owner = true position = Vector2( 16, 160 ) +walk_speed = 100.0 +climb_speed = 78.0 [node name="Ladders" type="TileMap" parent="NameEntry"] tile_set = ExtResource( 12 ) @@ -298,76 +303,80 @@ glyph = 6 position = Vector2( 200, 128 ) glyph = 7 +[node name="LetterBlock27" parent="NameEntry/Letters" instance=ExtResource( 11 )] +position = Vector2( 224, 128 ) +glyph = 36 + [node name="LetterBlock9" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 32, 72 ) +position = Vector2( 40, 72 ) glyph = 8 [node name="LetterBlock10" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 56, 72 ) +position = Vector2( 64, 72 ) glyph = 9 [node name="LetterBlock11" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 80, 72 ) +position = Vector2( 88, 72 ) glyph = 10 [node name="LetterBlock12" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 104, 72 ) +position = Vector2( 112, 72 ) glyph = 11 [node name="LetterBlock13" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 128, 72 ) +position = Vector2( 136, 72 ) glyph = 12 [node name="LetterBlock14" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 152, 72 ) +position = Vector2( 160, 72 ) glyph = 13 [node name="LetterBlock15" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 176, 72 ) +position = Vector2( 184, 72 ) glyph = 14 [node name="LetterBlock16" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 200, 72 ) +position = Vector2( 208, 72 ) glyph = 15 [node name="LetterBlock17" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 224, 72 ) +position = Vector2( 232, 72 ) glyph = 16 [node name="LetterBlock18" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 32, 16 ) +position = Vector2( 40, 16 ) glyph = 17 [node name="LetterBlock19" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 56, 16 ) +position = Vector2( 64, 16 ) glyph = 18 [node name="LetterBlock20" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 80, 16 ) +position = Vector2( 88, 16 ) glyph = 19 [node name="LetterBlock21" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 104, 16 ) +position = Vector2( 112, 16 ) glyph = 20 [node name="LetterBlock22" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 128, 16 ) +position = Vector2( 136, 16 ) glyph = 21 [node name="LetterBlock23" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 152, 16 ) +position = Vector2( 160, 16 ) glyph = 22 [node name="LetterBlock24" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 176, 16 ) +position = Vector2( 184, 16 ) glyph = 23 [node name="LetterBlock25" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 200, 16 ) +position = Vector2( 208, 16 ) glyph = 24 [node name="LetterBlock26" parent="NameEntry/Letters" instance=ExtResource( 11 )] -position = Vector2( 224, 16 ) +position = Vector2( 232, 16 ) glyph = 25 [node name="Exit" type="Area2D" parent="NameEntry"] @@ -376,12 +385,13 @@ position = Vector2( 229, 148 ) [node name="ExitDoor" type="Sprite" parent="NameEntry/Exit"] unique_name_in_owner = true material = SubResource( 5 ) +position = Vector2( 19, 0 ) texture = ExtResource( 14 ) hframes = 2 region_rect = Rect2( 0, 0, 16, 24 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="NameEntry/Exit"] -position = Vector2( 0, 4 ) +position = Vector2( 19, 4 ) shape = SubResource( 6 ) [node name="Ladder" parent="NameEntry" instance=ExtResource( 15 )] diff --git a/menus/file_select.gd b/menus/file_select.gd index 3248af8..2a5d223 100644 --- a/menus/file_select.gd +++ b/menus/file_select.gd @@ -26,3 +26,9 @@ func set_kill_mode(value): else: description.text = "Select your destiny" flavor_text.text = "Adventure awaits" + +#func play_select_sound(): +# Audio.play_sound(Audio.a_select,Audio.ac_collectible) + +#func play_confirm_sound(): +# Audio.play_sound(Audio.a_confirm,Audio.ac_collectible) diff --git a/menus/file_select_panel.gd b/menus/file_select_panel.gd index 5c12640..9855245 100644 --- a/menus/file_select_panel.gd +++ b/menus/file_select_panel.gd @@ -17,6 +17,7 @@ func _ready(): func select() -> void: + Audio.play_sound(Audio.a_confirm,Audio.ac_collectible) if get_parent().kill_mode == false: # if a file exists, load and play it! if file: diff --git a/menus/main_menu.gd b/menus/main_menu.gd index 03de133..6657b49 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -16,26 +16,32 @@ func _ready(): Vector2( 0.83205, 0.5547 ) +func play_select_sound(): + Audio.play_sound(Audio.a_select,Audio.ac_collectible) func _on_Continue_button_down(): + Audio.play_sound(Audio.a_confirm,Audio.ac_collectible) Fade.fade_out(0.4) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/level_select_scholar.tscn").instance() func _on_FileSelect_button_down(): + Audio.play_sound(Audio.a_confirm,Audio.ac_collectible) Fade.fade_out(0.4) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/file_select.tscn").instance() func _on_Exit_button_down(): + Audio.play_sound(Audio.a_confirm,Audio.ac_collectible) Fade.fade_out(0.4) yield(Fade, "fade_finished") get_tree().quit() func _on_SoundTest_button_down(): + Audio.play_sound(Audio.a_confirm,Audio.ac_collectible) Fade.fade_out(0.4) yield(Fade, "fade_finished") SceneManager.current_scene = load("res://menus/sound_test.tscn").instance() diff --git a/objects/hud/letter_block.gd b/objects/hud/letter_block.gd index 3852bb7..3f49e6e 100644 --- a/objects/hud/letter_block.gd +++ b/objects/hud/letter_block.gd @@ -2,20 +2,21 @@ tool extends "res://objects/enemy/enemy.gd" signal letter_chosen(letter) +signal backspace() enum Glyph { A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, _0, _1, _2, _3, _4, _5, - _6, _7, _8, _9, + _6, _7, _8, _9, Backspace } const GLYPH_STRINGS = [ "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "0", "1", "2", "3", "4", "5", - "6", "7", "8", "9", + "6", "7", "8", "9", "" ] export (Glyph) var glyph: int = 0 setget _set_glyph @@ -34,6 +35,8 @@ func _ready() -> void: for node in get_tree().get_nodes_in_group("gets_letters"): if node.has_method("_on_letter_chosen"): connect("letter_chosen", node, "_on_letter_chosen") + if node.has_method("_on_backspace"): + connect("backspace", node, "_on_backspace") func _process(delta: float) -> void: if Engine.editor_hint: @@ -43,7 +46,11 @@ func _process(delta: float) -> void: func die() -> void: emit_signal("letter_chosen", GLYPH_STRINGS[glyph]) + if glyph == Glyph.Backspace: + emit_signal("backspace") func _on_Hitbox_area_entered(area): emit_signal("letter_chosen", GLYPH_STRINGS[glyph]) + if glyph == Glyph.Backspace: + emit_signal("backspace") ._on_Hitbox_area_entered(area)