diff --git a/audio/sounds/Randomize68.wav b/audio/sounds/Randomize68.wav deleted file mode 100644 index ab91d0d..0000000 Binary files a/audio/sounds/Randomize68.wav and /dev/null differ diff --git a/audio/sounds/a_bree.wav b/audio/sounds/a_bree.wav deleted file mode 100644 index 9934ee5..0000000 Binary files a/audio/sounds/a_bree.wav and /dev/null differ diff --git a/audio/sounds/bone_rattle.ogg.import b/audio/sounds/bone_rattle.ogg.import new file mode 100644 index 0000000..d0e5a5e --- /dev/null +++ b/audio/sounds/bone_rattle.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/bone_rattle.ogg-1b9b692b16f9996980feab0fd8c6899b.oggstr" + +[deps] + +source_file="res://audio/sounds/bone_rattle.ogg" +dest_files=[ "res://.import/bone_rattle.ogg-1b9b692b16f9996980feab0fd8c6899b.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/boss_hurt.ogg.import b/audio/sounds/boss_hurt.ogg.import new file mode 100644 index 0000000..c6a1258 --- /dev/null +++ b/audio/sounds/boss_hurt.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/boss_hurt.ogg-aff6332a4546cc6c13d1adec8be22161.oggstr" + +[deps] + +source_file="res://audio/sounds/boss_hurt.ogg" +dest_files=[ "res://.import/boss_hurt.ogg-aff6332a4546cc6c13d1adec8be22161.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/boss_hurt.wav b/audio/sounds/boss_hurt.wav deleted file mode 100644 index 10fc2a4..0000000 Binary files a/audio/sounds/boss_hurt.wav and /dev/null differ diff --git a/audio/sounds/bubble.ogg b/audio/sounds/bubble.ogg new file mode 100644 index 0000000..adb231f Binary files /dev/null and b/audio/sounds/bubble.ogg differ diff --git a/audio/sounds/bubble.ogg.import b/audio/sounds/bubble.ogg.import new file mode 100644 index 0000000..fdd6860 --- /dev/null +++ b/audio/sounds/bubble.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/bubble.ogg-3cff0ff1f116f556089f132bc827c01b.oggstr" + +[deps] + +source_file="res://audio/sounds/bubble.ogg" +dest_files=[ "res://.import/bubble.ogg-3cff0ff1f116f556089f132bc827c01b.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/bubble.wav b/audio/sounds/bubble.wav deleted file mode 100644 index 784f7f0..0000000 Binary files a/audio/sounds/bubble.wav and /dev/null differ diff --git a/audio/sounds/collapse_block_fall.ogg b/audio/sounds/collapse_block_fall.ogg new file mode 100644 index 0000000..0d0b48d Binary files /dev/null and b/audio/sounds/collapse_block_fall.ogg differ diff --git a/audio/sounds/collapse_block_fall.ogg.import b/audio/sounds/collapse_block_fall.ogg.import new file mode 100644 index 0000000..c137810 --- /dev/null +++ b/audio/sounds/collapse_block_fall.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/collapse_block_fall.ogg-19fc12e4158496504199681c63b367f9.oggstr" + +[deps] + +source_file="res://audio/sounds/collapse_block_fall.ogg" +dest_files=[ "res://.import/collapse_block_fall.ogg-19fc12e4158496504199681c63b367f9.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/collapse_block_fall.wav b/audio/sounds/collapse_block_fall.wav deleted file mode 100644 index 4f1bb16..0000000 Binary files a/audio/sounds/collapse_block_fall.wav and /dev/null differ diff --git a/audio/sounds/confirm.ogg b/audio/sounds/confirm.ogg new file mode 100644 index 0000000..3ed670b Binary files /dev/null and b/audio/sounds/confirm.ogg differ diff --git a/audio/sounds/confirm.ogg.import b/audio/sounds/confirm.ogg.import new file mode 100644 index 0000000..d49e766 --- /dev/null +++ b/audio/sounds/confirm.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/confirm.ogg-74399903930640aa54bc9194bf595362.oggstr" + +[deps] + +source_file="res://audio/sounds/confirm.ogg" +dest_files=[ "res://.import/confirm.ogg-74399903930640aa54bc9194bf595362.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/confirm.wav b/audio/sounds/confirm.wav deleted file mode 100644 index b759e9b..0000000 Binary files a/audio/sounds/confirm.wav and /dev/null differ diff --git a/audio/sounds/die.ogg b/audio/sounds/die.ogg new file mode 100644 index 0000000..c48216b Binary files /dev/null and b/audio/sounds/die.ogg differ diff --git a/audio/sounds/die.ogg.import b/audio/sounds/die.ogg.import new file mode 100644 index 0000000..bc71efb --- /dev/null +++ b/audio/sounds/die.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/die.ogg-7c9b7bae34312e63da8e060aed19e984.oggstr" + +[deps] + +source_file="res://audio/sounds/die.ogg" +dest_files=[ "res://.import/die.ogg-7c9b7bae34312e63da8e060aed19e984.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/die.wav b/audio/sounds/die.wav deleted file mode 100644 index e0d3233..0000000 Binary files a/audio/sounds/die.wav and /dev/null differ diff --git a/audio/sounds/die_robot.wav b/audio/sounds/die_robot.wav deleted file mode 100644 index 4a4b28f..0000000 Binary files a/audio/sounds/die_robot.wav and /dev/null differ diff --git a/audio/sounds/die_skeleton.ogg b/audio/sounds/die_skeleton.ogg new file mode 100644 index 0000000..1a0b0ec Binary files /dev/null and b/audio/sounds/die_skeleton.ogg differ diff --git a/audio/sounds/die_skeleton.ogg.import b/audio/sounds/die_skeleton.ogg.import new file mode 100644 index 0000000..154ac05 --- /dev/null +++ b/audio/sounds/die_skeleton.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/die_skeleton.ogg-b5f6dc4a23c68bf3a4e3144ce631922a.oggstr" + +[deps] + +source_file="res://audio/sounds/die_skeleton.ogg" +dest_files=[ "res://.import/die_skeleton.ogg-b5f6dc4a23c68bf3a4e3144ce631922a.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/die_skeleton.wav b/audio/sounds/die_skeleton.wav deleted file mode 100644 index f9df5ff..0000000 Binary files a/audio/sounds/die_skeleton.wav and /dev/null differ diff --git a/audio/sounds/double_jump.ogg b/audio/sounds/double_jump.ogg new file mode 100644 index 0000000..2497ec6 Binary files /dev/null and b/audio/sounds/double_jump.ogg differ diff --git a/audio/sounds/double_jump.ogg.import b/audio/sounds/double_jump.ogg.import new file mode 100644 index 0000000..aeef054 --- /dev/null +++ b/audio/sounds/double_jump.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/double_jump.ogg-267703e555e75324b81d37d5d92308da.oggstr" + +[deps] + +source_file="res://audio/sounds/double_jump.ogg" +dest_files=[ "res://.import/double_jump.ogg-267703e555e75324b81d37d5d92308da.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/explosion.ogg b/audio/sounds/explosion.ogg new file mode 100644 index 0000000..bf89fb9 Binary files /dev/null and b/audio/sounds/explosion.ogg differ diff --git a/audio/sounds/explosion.ogg.import b/audio/sounds/explosion.ogg.import new file mode 100644 index 0000000..cb20a51 --- /dev/null +++ b/audio/sounds/explosion.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/explosion.ogg-390c0c53733d8d0ae861fc04f953f471.oggstr" + +[deps] + +source_file="res://audio/sounds/explosion.ogg" +dest_files=[ "res://.import/explosion.ogg-390c0c53733d8d0ae861fc04f953f471.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/gover.ogg b/audio/sounds/gover.ogg new file mode 100644 index 0000000..7211771 Binary files /dev/null and b/audio/sounds/gover.ogg differ diff --git a/audio/sounds/gover.ogg.import b/audio/sounds/gover.ogg.import new file mode 100644 index 0000000..87a4a9f --- /dev/null +++ b/audio/sounds/gover.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/gover.ogg-71eb4d076c82a3c9c030a4b6d2063858.oggstr" + +[deps] + +source_file="res://audio/sounds/gover.ogg" +dest_files=[ "res://.import/gover.ogg-71eb4d076c82a3c9c030a4b6d2063858.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/gover.wav b/audio/sounds/gover.wav deleted file mode 100644 index f0b5ae3..0000000 Binary files a/audio/sounds/gover.wav and /dev/null differ diff --git a/audio/sounds/key.wav b/audio/sounds/key.wav deleted file mode 100644 index e00ec2f..0000000 Binary files a/audio/sounds/key.wav and /dev/null differ diff --git a/audio/sounds/scrump_die.ogg b/audio/sounds/scrump_die.ogg new file mode 100644 index 0000000..f2d9d61 Binary files /dev/null and b/audio/sounds/scrump_die.ogg differ diff --git a/audio/sounds/scrump_die.ogg.import b/audio/sounds/scrump_die.ogg.import new file mode 100644 index 0000000..ab882d0 --- /dev/null +++ b/audio/sounds/scrump_die.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/scrump_die.ogg-425a95c5992a12c9f1281ba34b4cd7ab.oggstr" + +[deps] + +source_file="res://audio/sounds/scrump_die.ogg" +dest_files=[ "res://.import/scrump_die.ogg-425a95c5992a12c9f1281ba34b4cd7ab.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/scrump_die.wav b/audio/sounds/scrump_die.wav deleted file mode 100644 index 873abce..0000000 Binary files a/audio/sounds/scrump_die.wav and /dev/null differ diff --git a/audio/sounds/scrump_hurt.ogg b/audio/sounds/scrump_hurt.ogg new file mode 100644 index 0000000..918b1fb Binary files /dev/null and b/audio/sounds/scrump_hurt.ogg differ diff --git a/audio/sounds/scrump_hurt.ogg.import b/audio/sounds/scrump_hurt.ogg.import new file mode 100644 index 0000000..8bdc818 --- /dev/null +++ b/audio/sounds/scrump_hurt.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/scrump_hurt.ogg-d92e1294569fcd24edb105aac58b82ae.oggstr" + +[deps] + +source_file="res://audio/sounds/scrump_hurt.ogg" +dest_files=[ "res://.import/scrump_hurt.ogg-d92e1294569fcd24edb105aac58b82ae.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/select.ogg b/audio/sounds/select.ogg new file mode 100644 index 0000000..a80ee45 Binary files /dev/null and b/audio/sounds/select.ogg differ diff --git a/audio/sounds/select.ogg.import b/audio/sounds/select.ogg.import new file mode 100644 index 0000000..4996483 --- /dev/null +++ b/audio/sounds/select.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/select.ogg-55c0c25b1ed1eb06fe4396684087acc9.oggstr" + +[deps] + +source_file="res://audio/sounds/select.ogg" +dest_files=[ "res://.import/select.ogg-55c0c25b1ed1eb06fe4396684087acc9.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/select.wav b/audio/sounds/select.wav deleted file mode 100644 index 2550b87..0000000 Binary files a/audio/sounds/select.wav and /dev/null differ diff --git a/audio/sounds/shard.ogg b/audio/sounds/shard.ogg new file mode 100644 index 0000000..037880f Binary files /dev/null and b/audio/sounds/shard.ogg differ diff --git a/audio/sounds/shard.ogg.import b/audio/sounds/shard.ogg.import new file mode 100644 index 0000000..d5173d4 --- /dev/null +++ b/audio/sounds/shard.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/shard.ogg-4d6798bd7bde9aa4a9982bb512a37701.oggstr" + +[deps] + +source_file="res://audio/sounds/shard.ogg" +dest_files=[ "res://.import/shard.ogg-4d6798bd7bde9aa4a9982bb512a37701.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/shard.wav b/audio/sounds/shard.wav deleted file mode 100644 index 75d2cfa..0000000 Binary files a/audio/sounds/shard.wav and /dev/null differ diff --git a/audio/sounds/star.wav b/audio/sounds/star.wav deleted file mode 100644 index 313694c..0000000 Binary files a/audio/sounds/star.wav and /dev/null differ diff --git a/audio/sounds/whitenoise.wav b/audio/sounds/whitenoise.wav deleted file mode 100644 index 74fef42..0000000 Binary files a/audio/sounds/whitenoise.wav and /dev/null differ diff --git a/autoloads/audio.gd b/autoloads/audio.gd index ecf0ba6..27de5d7 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -12,25 +12,25 @@ onready var ac_shard = $ShardSound onready var ac_pause_music = $PauseMusic onready var ac_menu = $MenuSound #Sounds -const a_gold = preload("res://audio/sounds/key.wav") +const a_key = preload("res://audio/sounds/key.ogg") const a_arrow = preload("res://audio/sounds/arrow_collect.ogg") const a_jump = preload("res://audio/sounds/jump.ogg") const a_star = preload("res://audio/sounds/star.ogg") -const a_shard = preload("res://audio/sounds/shard.wav") +const a_shard = preload("res://audio/sounds/shard.ogg") const a_climb_up = preload("res://audio/sounds/a_climb.ogg") const a_climb_down = preload("res://audio/sounds/a_bmilc.ogg") const a_sword = preload("res://audio/sounds/sword.ogg") -const a_doublejump = preload("res://audio/sounds/a_bree.wav") +const a_doublejump = preload("res://audio/sounds/double_jump.ogg") const a_shoot = preload("res://audio/sounds/shoot_arrow.ogg") -const a_die = preload("res://audio/sounds/die.wav") -const a_die_skeleton = preload("res://audio/sounds/die_skeleton.wav") -const a_scrump_die = preload("res://audio/sounds/scrump_die.wav") -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") +const a_die = preload("res://audio/sounds/die.ogg") +const a_die_skeleton = preload("res://audio/sounds/die_skeleton.ogg") +const a_scrump_die = preload("res://audio/sounds/scrump_die.ogg") +const a_explosion = preload("res://audio/sounds/explosion.ogg") +const a_game_over = preload("res://audio/sounds/gover.ogg") +const a_scrump_hurt = preload("res://audio/sounds/scrump_hurt.ogg") +const a_bubble = preload("res://audio/sounds/bubble.ogg") +const a_select = preload("res://audio/sounds/select.ogg") +const a_confirm = preload("res://audio/sounds/confirm.ogg") const a_bullet_barrage = preload("res://audio/sounds/bullet_barrage.ogg") const a_rainbow_laser = preload("res://audio/sounds/rainbow_laser.ogg") const a_spaghetti = preload("res://audio/sounds/spaghetti.ogg") diff --git a/autoloads/game.gd b/autoloads/game.gd index 52f43c0..15438ba 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -237,7 +237,7 @@ func has_collection_bonus(): func _on_player_died() -> void: deaths += 1 if lives <= 0 and use_lives: - Audio.play_sound(Audio.a_gover, Audio.ac_die) + Audio.play_sound(Audio.a_game_over, Audio.ac_die) get_tree().get_nodes_in_group("player")[0].queue_free() var time_tween = create_tween() time_tween.tween_property(Engine, "time_scale", 0.1, 0.3) diff --git a/objects/collectibles/key.gd b/objects/collectibles/key.gd index f15569a..53857c9 100644 --- a/objects/collectibles/key.gd +++ b/objects/collectibles/key.gd @@ -10,5 +10,5 @@ func _on_Area2D_body_entered(body: Node) -> void: if body.is_in_group("player"): Game.keys += 1 Game.score += 5 - Audio.play_sound(Audio.a_gold,Audio.ac_collectible) + Audio.play_sound(Audio.a_key,Audio.ac_collectible) queue_free() diff --git a/objects/enemy/boss/collapse_blocks.tscn b/objects/enemy/boss/collapse_blocks.tscn index cea66a3..78edf94 100644 --- a/objects/enemy/boss/collapse_blocks.tscn +++ b/objects/enemy/boss/collapse_blocks.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://objects/environment/collapse_block/collapse_block.tscn" type="PackedScene" id=1] -[ext_resource path="res://audio/sounds/collapse_block_fall.wav" type="AudioStream" id=2] +[ext_resource path="res://audio/sounds/collapse_block_fall.ogg" type="AudioStream" id=2] [sub_resource type="PhysicsMaterial" id=2] bounce = 0.07 diff --git a/objects/enemy/boss/scrump.gd b/objects/enemy/boss/scrump.gd index 99b9058..740e9b6 100644 --- a/objects/enemy/boss/scrump.gd +++ b/objects/enemy/boss/scrump.gd @@ -39,7 +39,7 @@ func _on_ShootTimer_timeout(): func die(): hp -= 1 - Audio.play_sound(Audio.a_boss_hurt,Audio.ac_boss) + Audio.play_sound(Audio.a_scrump_hurt,Audio.ac_boss) match hp: 2: emit_signal("entered_phase", 2) diff --git a/objects/enemy/cop.gd b/objects/enemy/cop.gd index 71bd07e..47e0f9d 100644 --- a/objects/enemy/cop.gd +++ b/objects/enemy/cop.gd @@ -60,7 +60,7 @@ func _physics_process(delta): collider.get_parent().die() # play sound - Audio.play_sound(Audio.a_die_robot, Audio.ac_boss) + Audio.play_sound(Audio.a_explosion, Audio.ac_boss) # muzzle flash muzzle_flash.emitting = true diff --git a/objects/enemy/enemy_move_diagonal.gd b/objects/enemy/enemy_move_diagonal.gd index fb12536..e718565 100644 --- a/objects/enemy/enemy_move_diagonal.gd +++ b/objects/enemy/enemy_move_diagonal.gd @@ -12,7 +12,7 @@ export(int, "/", "\\") var move_direction onready var startpos = position func _ready(): - death_sound = Audio.a_die_robot + death_sound = Audio.a_explosion up_boundary *= 8 down_boundary *= 8 #Move in direction selected diff --git a/objects/enemy/explosion.gd b/objects/enemy/explosion.gd index b357993..24c36a6 100644 --- a/objects/enemy/explosion.gd +++ b/objects/enemy/explosion.gd @@ -2,7 +2,7 @@ extends "res://objects/enemy/enemy.gd" func _ready(): $AnimatedSprite.play("explode") - Audio.play_sound(Audio.a_die_robot,Audio.ac_die) + Audio.play_sound(Audio.a_explosion,Audio.ac_die) func _on_animation_finished(): queue_free() diff --git a/objects/enemy/roboturret.gd b/objects/enemy/roboturret.gd index fc9f7d8..0a5b222 100644 --- a/objects/enemy/roboturret.gd +++ b/objects/enemy/roboturret.gd @@ -13,7 +13,7 @@ const ArrowProjectile = preload("res://objects/enemy/roboturret_proj.tscn") func _ready(): timer.start(shoot_time) - death_sound = Audio.a_die_robot + death_sound = Audio.a_explosion # adjust to difficulty shoot_time /= Game.enemy_speed_factor arrow_speed *= Game.enemy_speed_factor