From 4b58c5647332e78044137c7091aba9d4ecf81f27 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Fri, 13 Oct 2023 14:38:37 -0400 Subject: [PATCH] repair broken references to .wav files --- audio/sounds/Randomize68.wav.import | 23 --------------------- audio/sounds/a_bree.wav.import | 23 --------------------- audio/sounds/boss_hurt.wav.import | 23 --------------------- audio/sounds/bubble.wav.import | 23 --------------------- audio/sounds/collapse_block_fall.wav.import | 23 --------------------- audio/sounds/confirm.wav.import | 23 --------------------- audio/sounds/die.wav.import | 23 --------------------- audio/sounds/die_robot.wav.import | 23 --------------------- audio/sounds/die_skeleton.wav.import | 23 --------------------- audio/sounds/die_skeleton0.wav.import | 23 --------------------- audio/sounds/gover.wav.import | 23 --------------------- audio/sounds/key.wav.import | 23 --------------------- audio/sounds/scrump_die.wav.import | 23 --------------------- audio/sounds/select.wav.import | 23 --------------------- audio/sounds/shard.wav.import | 23 --------------------- audio/sounds/star.wav.import | 23 --------------------- audio/sounds/whitenoise.wav.import | 23 --------------------- autoloads/audio.tscn | 2 +- menus/sound_test.tscn | 22 ++++++++++---------- objects/enemy/boss/scrump.tscn | 4 ++-- objects/enemy/enemy.gd | 2 +- objects/hud/menu_sounds.tscn | 4 ++-- 22 files changed, 17 insertions(+), 408 deletions(-) delete mode 100644 audio/sounds/Randomize68.wav.import delete mode 100644 audio/sounds/a_bree.wav.import delete mode 100644 audio/sounds/boss_hurt.wav.import delete mode 100644 audio/sounds/bubble.wav.import delete mode 100644 audio/sounds/collapse_block_fall.wav.import delete mode 100644 audio/sounds/confirm.wav.import delete mode 100644 audio/sounds/die.wav.import delete mode 100644 audio/sounds/die_robot.wav.import delete mode 100644 audio/sounds/die_skeleton.wav.import delete mode 100644 audio/sounds/die_skeleton0.wav.import delete mode 100644 audio/sounds/gover.wav.import delete mode 100644 audio/sounds/key.wav.import delete mode 100644 audio/sounds/scrump_die.wav.import delete mode 100644 audio/sounds/select.wav.import delete mode 100644 audio/sounds/shard.wav.import delete mode 100644 audio/sounds/star.wav.import delete mode 100644 audio/sounds/whitenoise.wav.import diff --git a/audio/sounds/Randomize68.wav.import b/audio/sounds/Randomize68.wav.import deleted file mode 100644 index 5d42fbc..0000000 --- a/audio/sounds/Randomize68.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[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/a_bree.wav.import b/audio/sounds/a_bree.wav.import deleted file mode 100644 index c7fc368..0000000 --- a/audio/sounds/a_bree.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.sample" - -[deps] - -source_file="res://audio/sounds/a_bree.wav" -dest_files=[ "res://.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.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/boss_hurt.wav.import b/audio/sounds/boss_hurt.wav.import deleted file mode 100644 index c9742eb..0000000 --- a/audio/sounds/boss_hurt.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/boss_hurt.wav-cf46fafb5d349a0fb70c8579bf3872a7.sample" - -[deps] - -source_file="res://audio/sounds/boss_hurt.wav" -dest_files=[ "res://.import/boss_hurt.wav-cf46fafb5d349a0fb70c8579bf3872a7.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/bubble.wav.import b/audio/sounds/bubble.wav.import deleted file mode 100644 index b178bd5..0000000 --- a/audio/sounds/bubble.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/bubble.wav-a98a00dfb7436d513676d9e46828bcbe.sample" - -[deps] - -source_file="res://audio/sounds/bubble.wav" -dest_files=[ "res://.import/bubble.wav-a98a00dfb7436d513676d9e46828bcbe.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/collapse_block_fall.wav.import b/audio/sounds/collapse_block_fall.wav.import deleted file mode 100644 index 5f7e94d..0000000 --- a/audio/sounds/collapse_block_fall.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/collapse_block_fall.wav-704a0337fd7b28cea85887f1caf3648b.sample" - -[deps] - -source_file="res://audio/sounds/collapse_block_fall.wav" -dest_files=[ "res://.import/collapse_block_fall.wav-704a0337fd7b28cea85887f1caf3648b.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.import b/audio/sounds/confirm.wav.import deleted file mode 100644 index 430a1d3..0000000 --- a/audio/sounds/confirm.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[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/die.wav.import b/audio/sounds/die.wav.import deleted file mode 100644 index 83c6a8f..0000000 --- a/audio/sounds/die.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/die.wav-bed4faf3cb9c725fe22ee38040ba1e8d.sample" - -[deps] - -source_file="res://audio/sounds/die.wav" -dest_files=[ "res://.import/die.wav-bed4faf3cb9c725fe22ee38040ba1e8d.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/die_robot.wav.import b/audio/sounds/die_robot.wav.import deleted file mode 100644 index 88d7774..0000000 --- a/audio/sounds/die_robot.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/die_robot.wav-0427c625164396232ce1323d11ec4e7e.sample" - -[deps] - -source_file="res://audio/sounds/die_robot.wav" -dest_files=[ "res://.import/die_robot.wav-0427c625164396232ce1323d11ec4e7e.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/die_skeleton.wav.import b/audio/sounds/die_skeleton.wav.import deleted file mode 100644 index 06c0e7a..0000000 --- a/audio/sounds/die_skeleton.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/die_skeleton.wav-5ebafbb57bab56e76a09d94d4eb83665.sample" - -[deps] - -source_file="res://audio/sounds/die_skeleton.wav" -dest_files=[ "res://.import/die_skeleton.wav-5ebafbb57bab56e76a09d94d4eb83665.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/die_skeleton0.wav.import b/audio/sounds/die_skeleton0.wav.import deleted file mode 100644 index ebb2b98..0000000 --- a/audio/sounds/die_skeleton0.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/die_skeleton0.wav-eab6b1776a44d2159a1e34d3f8ac0cdf.sample" - -[deps] - -source_file="res://audio/sounds/die_skeleton0.wav" -dest_files=[ "res://.import/die_skeleton0.wav-eab6b1776a44d2159a1e34d3f8ac0cdf.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/gover.wav.import b/audio/sounds/gover.wav.import deleted file mode 100644 index c6270d2..0000000 --- a/audio/sounds/gover.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/gover.wav-fb994db7cb276d7598aad5c659b45fb3.sample" - -[deps] - -source_file="res://audio/sounds/gover.wav" -dest_files=[ "res://.import/gover.wav-fb994db7cb276d7598aad5c659b45fb3.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/key.wav.import b/audio/sounds/key.wav.import deleted file mode 100644 index 7d35b4a..0000000 --- a/audio/sounds/key.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[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/audio/sounds/scrump_die.wav.import b/audio/sounds/scrump_die.wav.import deleted file mode 100644 index 68ba5bb..0000000 --- a/audio/sounds/scrump_die.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/scrump_die.wav-93f5cb13b5531416f8704d98fcf005e0.sample" - -[deps] - -source_file="res://audio/sounds/scrump_die.wav" -dest_files=[ "res://.import/scrump_die.wav-93f5cb13b5531416f8704d98fcf005e0.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.import b/audio/sounds/select.wav.import deleted file mode 100644 index 2e3b501..0000000 --- a/audio/sounds/select.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[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/audio/sounds/shard.wav.import b/audio/sounds/shard.wav.import deleted file mode 100644 index 61b3dd6..0000000 --- a/audio/sounds/shard.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/shard.wav-cf382615000aa13776497b1971c06315.sample" - -[deps] - -source_file="res://audio/sounds/shard.wav" -dest_files=[ "res://.import/shard.wav-cf382615000aa13776497b1971c06315.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/star.wav.import b/audio/sounds/star.wav.import deleted file mode 100644 index 573ca51..0000000 --- a/audio/sounds/star.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/star.wav-ec5381e4c3b71647d3c29a14f3588eff.sample" - -[deps] - -source_file="res://audio/sounds/star.wav" -dest_files=[ "res://.import/star.wav-ec5381e4c3b71647d3c29a14f3588eff.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/whitenoise.wav.import b/audio/sounds/whitenoise.wav.import deleted file mode 100644 index 70cfe6d..0000000 --- a/audio/sounds/whitenoise.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/whitenoise.wav-792881147f3893a05a8858d72873c529.sample" - -[deps] - -source_file="res://audio/sounds/whitenoise.wav" -dest_files=[ "res://.import/whitenoise.wav-792881147f3893a05a8858d72873c529.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.tscn b/autoloads/audio.tscn index c31197e..e9effd1 100644 --- a/autoloads/audio.tscn +++ b/autoloads/audio.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://autoloads/audio.gd" type="Script" id=1] -[ext_resource path="res://audio/sounds/shard.wav" type="AudioStream" id=2] +[ext_resource path="res://audio/sounds/shard.ogg" type="AudioStream" id=2] [ext_resource path="res://audio/music/pause.ogg" type="AudioStream" id=3] [node name="Audio" type="Node"] diff --git a/menus/sound_test.tscn b/menus/sound_test.tscn index e1b28f6..5dbcbd8 100644 --- a/menus/sound_test.tscn +++ b/menus/sound_test.tscn @@ -5,12 +5,12 @@ [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://audio/sounds/key.ogg" 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] [ext_resource path="res://audio/music/rumble_loop.ogg" type="AudioStream" id=14] -[ext_resource path="res://audio/sounds/shard.wav" type="AudioStream" id=15] +[ext_resource path="res://audio/sounds/shard.ogg" type="AudioStream" id=15] [ext_resource path="res://menus/sound_select.gd" type="Script" id=16] [ext_resource path="res://audio/music/burnt_out.ogg" type="AudioStream" id=17] [ext_resource path="res://audio/music/dusk_park.ogg" type="AudioStream" id=18] @@ -19,20 +19,20 @@ [ext_resource path="res://audio/music/spine_v2.ogg" type="AudioStream" id=21] [ext_resource path="res://audio/music/klystron.ogg" type="AudioStream" id=22] [ext_resource path="res://audio/music/precision_parasite.ogg" type="AudioStream" id=23] -[ext_resource path="res://audio/sounds/bubble.wav" type="AudioStream" id=24] +[ext_resource path="res://audio/sounds/bubble.ogg" type="AudioStream" id=24] [ext_resource path="res://audio/sounds/jump.ogg" type="AudioStream" id=25] [ext_resource path="res://menus/sound_test.gd" type="Script" id=26] [ext_resource path="res://graphics/hud/sound_test_arrow.png" type="Texture" id=27] [ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=28] [ext_resource path="res://audio/sounds/button.ogg" type="AudioStream" id=29] -[ext_resource path="res://audio/sounds/die.wav" type="AudioStream" id=30] -[ext_resource path="res://audio/sounds/scrump_die.wav" type="AudioStream" id=31] -[ext_resource path="res://audio/sounds/a_egg_shoot.ogg" type="AudioStream" id=32] -[ext_resource path="res://audio/sounds/die_skeleton.wav" type="AudioStream" id=33] -[ext_resource path="res://audio/sounds/a_bree.wav" type="AudioStream" id=34] -[ext_resource path="res://audio/sounds/gover.wav" type="AudioStream" id=35] -[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/die.ogg" type="AudioStream" id=30] +[ext_resource path="res://audio/sounds/scrump_die.ogg" type="AudioStream" id=31] +[ext_resource path="res://audio/sounds/shoot_arrow.ogg" type="AudioStream" id=32] +[ext_resource path="res://audio/sounds/die_skeleton.ogg" type="AudioStream" id=33] +[ext_resource path="res://audio/sounds/double_jump.ogg" type="AudioStream" id=34] +[ext_resource path="res://audio/sounds/gover.ogg" type="AudioStream" id=35] +[ext_resource path="res://audio/sounds/explosion.ogg" type="AudioStream" id=36] +[ext_resource path="res://audio/sounds/scrump_hurt.ogg" type="AudioStream" id=37] [ext_resource path="res://audio/sounds/sword.ogg" type="AudioStream" id=38] [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] diff --git a/objects/enemy/boss/scrump.tscn b/objects/enemy/boss/scrump.tscn index 8407e6d..725a9b9 100644 --- a/objects/enemy/boss/scrump.tscn +++ b/objects/enemy/boss/scrump.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=11 format=2] [ext_resource path="res://objects/enemy/boss/scrump.gd" type="Script" id=1] -[ext_resource path="res://audio/sounds/gover.wav" type="AudioStream" id=2] -[ext_resource path="res://audio/sounds/die.wav" type="AudioStream" id=3] +[ext_resource path="res://audio/sounds/gover.ogg" type="AudioStream" id=2] +[ext_resource path="res://audio/sounds/die.ogg" type="AudioStream" id=3] [ext_resource path="res://graphics/enemy/boss/the_scrump.png" type="Texture" id=4] [ext_resource path="res://audio/sounds/scrump_shot.ogg" type="AudioStream" id=5] diff --git a/objects/enemy/enemy.gd b/objects/enemy/enemy.gd index daae74e..db51571 100644 --- a/objects/enemy/enemy.gd +++ b/objects/enemy/enemy.gd @@ -20,7 +20,7 @@ signal died() export var blood = true -export var death_sound: AudioStream = preload("res://audio/sounds/die.wav") +export var death_sound: AudioStream = preload("res://audio/sounds/die.ogg") var death_blood_offset = Vector2.ZERO func _on_Hitbox_area_entered(area): diff --git a/objects/hud/menu_sounds.tscn b/objects/hud/menu_sounds.tscn index dda7581..6217b8c 100644 --- a/objects/hud/menu_sounds.tscn +++ b/objects/hud/menu_sounds.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://objects/hud/menu_sounds.gd" type="Script" id=1] -[ext_resource path="res://audio/sounds/confirm.wav" type="AudioStream" id=2] -[ext_resource path="res://audio/sounds/select.wav" type="AudioStream" id=3] +[ext_resource path="res://audio/sounds/confirm.ogg" type="AudioStream" id=2] +[ext_resource path="res://audio/sounds/select.ogg" type="AudioStream" id=3] [node name="MenuSounds" type="Node"] script = ExtResource( 1 )