diff --git a/assets/music & sfx/music/8_bit_dungeon.mp3.import b/assets/music & sfx/music/8_bit_dungeon.mp3.import deleted file mode 100644 index c23ef25..0000000 --- a/assets/music & sfx/music/8_bit_dungeon.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://tevbt3p1f7ue" -path="res://.godot/imported/8_bit_dungeon.mp3-08978af324a5dc25a34c2e80bf68e0ff.mp3str" - -[deps] - -source_file="res://assets/music & sfx/music/8_bit_dungeon.mp3" -dest_files=["res://.godot/imported/8_bit_dungeon.mp3-08978af324a5dc25a34c2e80bf68e0ff.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/assets/music & sfx/music/ashveil-355633.mp3.import b/assets/music & sfx/music/ashveil-355633.mp3.import deleted file mode 100644 index 5b10c9b..0000000 --- a/assets/music & sfx/music/ashveil-355633.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://dkwud8e6w8cne" -path="res://.godot/imported/ashveil-355633.mp3-7f583d816a489a87146b865dbf9c3e79.mp3str" - -[deps] - -source_file="res://assets/music & sfx/music/ashveil-355633.mp3" -dest_files=["res://.godot/imported/ashveil-355633.mp3-7f583d816a489a87146b865dbf9c3e79.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/assets/music & sfx/music/chiptune-nu-metal-216243.mp3.import b/assets/music & sfx/music/chiptune-nu-metal-216243.mp3.import deleted file mode 100644 index c530616..0000000 --- a/assets/music & sfx/music/chiptune-nu-metal-216243.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://df47mpp8jojqf" -path="res://.godot/imported/chiptune-nu-metal-216243.mp3-a6a5f24b0fa2887faefe73a72dd9dd68.mp3str" - -[deps] - -source_file="res://assets/music & sfx/music/chiptune-nu-metal-216243.mp3" -dest_files=["res://.godot/imported/chiptune-nu-metal-216243.mp3-a6a5f24b0fa2887faefe73a72dd9dd68.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/assets/music & sfx/music/digital-dreamscape-193900.mp3.import b/assets/music & sfx/music/digital-dreamscape-193900.mp3.import deleted file mode 100644 index ee9c83a..0000000 --- a/assets/music & sfx/music/digital-dreamscape-193900.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://dphh6vqb3hy8" -path="res://.godot/imported/digital-dreamscape-193900.mp3-c52e9403dc1656a741fcc3a21a2e9021.mp3str" - -[deps] - -source_file="res://assets/music & sfx/music/digital-dreamscape-193900.mp3" -dest_files=["res://.godot/imported/digital-dreamscape-193900.mp3-c52e9403dc1656a741fcc3a21a2e9021.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/assets/music & sfx/music/8_bit_dungeon.mp3 b/assets/music&sfx/music/8_bit_dungeon.mp3 similarity index 100% rename from assets/music & sfx/music/8_bit_dungeon.mp3 rename to assets/music&sfx/music/8_bit_dungeon.mp3 diff --git a/assets/music&sfx/music/8_bit_dungeon.mp3.import b/assets/music&sfx/music/8_bit_dungeon.mp3.import new file mode 100644 index 0000000..d7dd140 --- /dev/null +++ b/assets/music&sfx/music/8_bit_dungeon.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://tevbt3p1f7ue" +path="res://.godot/imported/8_bit_dungeon.mp3-004e8755f33d3898c21767fbfbb34afd.mp3str" + +[deps] + +source_file="res://assets/music&sfx/music/8_bit_dungeon.mp3" +dest_files=["res://.godot/imported/8_bit_dungeon.mp3-004e8755f33d3898c21767fbfbb34afd.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/music & sfx/music/ashveil-355633.mp3 b/assets/music&sfx/music/ashveil-355633.mp3 similarity index 100% rename from assets/music & sfx/music/ashveil-355633.mp3 rename to assets/music&sfx/music/ashveil-355633.mp3 diff --git a/assets/music&sfx/music/ashveil-355633.mp3.import b/assets/music&sfx/music/ashveil-355633.mp3.import new file mode 100644 index 0000000..c4277e1 --- /dev/null +++ b/assets/music&sfx/music/ashveil-355633.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dkwud8e6w8cne" +path="res://.godot/imported/ashveil-355633.mp3-cebb2fea1180ef9e2098d66f52c50e8a.mp3str" + +[deps] + +source_file="res://assets/music&sfx/music/ashveil-355633.mp3" +dest_files=["res://.godot/imported/ashveil-355633.mp3-cebb2fea1180ef9e2098d66f52c50e8a.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/music & sfx/music/chiptune-nu-metal-216243.mp3 b/assets/music&sfx/music/chiptune-nu-metal-216243.mp3 similarity index 100% rename from assets/music & sfx/music/chiptune-nu-metal-216243.mp3 rename to assets/music&sfx/music/chiptune-nu-metal-216243.mp3 diff --git a/assets/music&sfx/music/chiptune-nu-metal-216243.mp3.import b/assets/music&sfx/music/chiptune-nu-metal-216243.mp3.import new file mode 100644 index 0000000..f63d03c --- /dev/null +++ b/assets/music&sfx/music/chiptune-nu-metal-216243.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://df47mpp8jojqf" +path="res://.godot/imported/chiptune-nu-metal-216243.mp3-c5abcb5016e4dec9065fd12f180bea38.mp3str" + +[deps] + +source_file="res://assets/music&sfx/music/chiptune-nu-metal-216243.mp3" +dest_files=["res://.godot/imported/chiptune-nu-metal-216243.mp3-c5abcb5016e4dec9065fd12f180bea38.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/music & sfx/music/digital-dreamscape-193900.mp3 b/assets/music&sfx/music/digital-dreamscape-193900.mp3 similarity index 100% rename from assets/music & sfx/music/digital-dreamscape-193900.mp3 rename to assets/music&sfx/music/digital-dreamscape-193900.mp3 diff --git a/assets/music&sfx/music/digital-dreamscape-193900.mp3.import b/assets/music&sfx/music/digital-dreamscape-193900.mp3.import new file mode 100644 index 0000000..13080cb --- /dev/null +++ b/assets/music&sfx/music/digital-dreamscape-193900.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dphh6vqb3hy8" +path="res://.godot/imported/digital-dreamscape-193900.mp3-25eea5c0365215b499f6447178b174da.mp3str" + +[deps] + +source_file="res://assets/music&sfx/music/digital-dreamscape-193900.mp3" +dest_files=["res://.godot/imported/digital-dreamscape-193900.mp3-25eea5c0365215b499f6447178b174da.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/music & sfx/sfx/fireball_hit.wav b/assets/music&sfx/sfx/fireball_hit.wav similarity index 100% rename from assets/music & sfx/sfx/fireball_hit.wav rename to assets/music&sfx/sfx/fireball_hit.wav diff --git a/assets/music & sfx/sfx/fireball_hit.wav.import b/assets/music&sfx/sfx/fireball_hit.wav.import similarity index 53% rename from assets/music & sfx/sfx/fireball_hit.wav.import rename to assets/music&sfx/sfx/fireball_hit.wav.import index fdd52ac..21679ad 100644 --- a/assets/music & sfx/sfx/fireball_hit.wav.import +++ b/assets/music&sfx/sfx/fireball_hit.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dyd1oajlyth1l" -path="res://.godot/imported/fireball_hit.wav-361b6388d1466a2cfaf6fdbdb58463c2.sample" +path="res://.godot/imported/fireball_hit.wav-f52e8a7737decfb3c17927bc3a2ebf84.sample" [deps] -source_file="res://assets/music & sfx/sfx/fireball_hit.wav" -dest_files=["res://.godot/imported/fireball_hit.wav-361b6388d1466a2cfaf6fdbdb58463c2.sample"] +source_file="res://assets/music&sfx/sfx/fireball_hit.wav" +dest_files=["res://.godot/imported/fireball_hit.wav-f52e8a7737decfb3c17927bc3a2ebf84.sample"] [params] diff --git a/assets/music & sfx/sfx/hit.wav b/assets/music&sfx/sfx/hit.wav similarity index 100% rename from assets/music & sfx/sfx/hit.wav rename to assets/music&sfx/sfx/hit.wav diff --git a/assets/music & sfx/sfx/hit.wav.import b/assets/music&sfx/sfx/hit.wav.import similarity index 56% rename from assets/music & sfx/sfx/hit.wav.import rename to assets/music&sfx/sfx/hit.wav.import index efff5ba..b8f6d13 100644 --- a/assets/music & sfx/sfx/hit.wav.import +++ b/assets/music&sfx/sfx/hit.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://yohax5uj566" -path="res://.godot/imported/hit.wav-68f50106aeba7a81870b09df21551565.sample" +path="res://.godot/imported/hit.wav-257d6b5b3b3f5da8237664e1dad83537.sample" [deps] -source_file="res://assets/music & sfx/sfx/hit.wav" -dest_files=["res://.godot/imported/hit.wav-68f50106aeba7a81870b09df21551565.sample"] +source_file="res://assets/music&sfx/sfx/hit.wav" +dest_files=["res://.godot/imported/hit.wav-257d6b5b3b3f5da8237664e1dad83537.sample"] [params] diff --git a/assets/music & sfx/sfx/hit2.wav b/assets/music&sfx/sfx/hit2.wav similarity index 100% rename from assets/music & sfx/sfx/hit2.wav rename to assets/music&sfx/sfx/hit2.wav diff --git a/assets/music & sfx/sfx/hit2.wav.import b/assets/music&sfx/sfx/hit2.wav.import similarity index 56% rename from assets/music & sfx/sfx/hit2.wav.import rename to assets/music&sfx/sfx/hit2.wav.import index 1bae86d..ff77a31 100644 --- a/assets/music & sfx/sfx/hit2.wav.import +++ b/assets/music&sfx/sfx/hit2.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://d01afcc0uluw8" -path="res://.godot/imported/hit2.wav-09febd1a6c1c47c3da7dd4dd41e3ebf0.sample" +path="res://.godot/imported/hit2.wav-25aa5c3271de6727ca7f4701c1cdbfa9.sample" [deps] -source_file="res://assets/music & sfx/sfx/hit2.wav" -dest_files=["res://.godot/imported/hit2.wav-09febd1a6c1c47c3da7dd4dd41e3ebf0.sample"] +source_file="res://assets/music&sfx/sfx/hit2.wav" +dest_files=["res://.godot/imported/hit2.wav-25aa5c3271de6727ca7f4701c1cdbfa9.sample"] [params] diff --git a/assets/music & sfx/sfx/hit3.wav b/assets/music&sfx/sfx/hit3.wav similarity index 100% rename from assets/music & sfx/sfx/hit3.wav rename to assets/music&sfx/sfx/hit3.wav diff --git a/assets/music & sfx/sfx/hit3.wav.import b/assets/music&sfx/sfx/hit3.wav.import similarity index 56% rename from assets/music & sfx/sfx/hit3.wav.import rename to assets/music&sfx/sfx/hit3.wav.import index 9aaf4c1..7ac0048 100644 --- a/assets/music & sfx/sfx/hit3.wav.import +++ b/assets/music&sfx/sfx/hit3.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://b7lddrkrm8qy0" -path="res://.godot/imported/hit3.wav-8e99c8865a9fb0da973f06a04ac268bb.sample" +path="res://.godot/imported/hit3.wav-e4018b807d77c2804ef1d3b4b132a8e1.sample" [deps] -source_file="res://assets/music & sfx/sfx/hit3.wav" -dest_files=["res://.godot/imported/hit3.wav-8e99c8865a9fb0da973f06a04ac268bb.sample"] +source_file="res://assets/music&sfx/sfx/hit3.wav" +dest_files=["res://.godot/imported/hit3.wav-e4018b807d77c2804ef1d3b4b132a8e1.sample"] [params] diff --git a/assets/music & sfx/sfx/levelup.wav b/assets/music&sfx/sfx/levelup.wav similarity index 100% rename from assets/music & sfx/sfx/levelup.wav rename to assets/music&sfx/sfx/levelup.wav diff --git a/assets/music & sfx/sfx/levelup.wav.import b/assets/music&sfx/sfx/levelup.wav.import similarity index 55% rename from assets/music & sfx/sfx/levelup.wav.import rename to assets/music&sfx/sfx/levelup.wav.import index f28aac8..7b738aa 100644 --- a/assets/music & sfx/sfx/levelup.wav.import +++ b/assets/music&sfx/sfx/levelup.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://bhqgrgry7rwf1" -path="res://.godot/imported/levelup.wav-8cbe8d27297b36b2d44126de69c9232d.sample" +path="res://.godot/imported/levelup.wav-1dd178b060e5b1377e00bd506ee7b254.sample" [deps] -source_file="res://assets/music & sfx/sfx/levelup.wav" -dest_files=["res://.godot/imported/levelup.wav-8cbe8d27297b36b2d44126de69c9232d.sample"] +source_file="res://assets/music&sfx/sfx/levelup.wav" +dest_files=["res://.godot/imported/levelup.wav-1dd178b060e5b1377e00bd506ee7b254.sample"] [params] diff --git a/assets/music & sfx/sfx/levelup2.wav b/assets/music&sfx/sfx/levelup2.wav similarity index 100% rename from assets/music & sfx/sfx/levelup2.wav rename to assets/music&sfx/sfx/levelup2.wav diff --git a/assets/music & sfx/sfx/levelup2.wav.import b/assets/music&sfx/sfx/levelup2.wav.import similarity index 54% rename from assets/music & sfx/sfx/levelup2.wav.import rename to assets/music&sfx/sfx/levelup2.wav.import index 878e163..15c15a4 100644 --- a/assets/music & sfx/sfx/levelup2.wav.import +++ b/assets/music&sfx/sfx/levelup2.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://cjdd2pfnkqvkv" -path="res://.godot/imported/levelup2.wav-96d72c6390ba89072cfbdb57e9800f5e.sample" +path="res://.godot/imported/levelup2.wav-dcca62b69a819320b250a8506bc894d4.sample" [deps] -source_file="res://assets/music & sfx/sfx/levelup2.wav" -dest_files=["res://.godot/imported/levelup2.wav-96d72c6390ba89072cfbdb57e9800f5e.sample"] +source_file="res://assets/music&sfx/sfx/levelup2.wav" +dest_files=["res://.godot/imported/levelup2.wav-dcca62b69a819320b250a8506bc894d4.sample"] [params] diff --git a/assets/music & sfx/sfx/levelup3.wav b/assets/music&sfx/sfx/levelup3.wav similarity index 100% rename from assets/music & sfx/sfx/levelup3.wav rename to assets/music&sfx/sfx/levelup3.wav diff --git a/assets/music & sfx/sfx/levelup3.wav.import b/assets/music&sfx/sfx/levelup3.wav.import similarity index 54% rename from assets/music & sfx/sfx/levelup3.wav.import rename to assets/music&sfx/sfx/levelup3.wav.import index 9b735d8..de50616 100644 --- a/assets/music & sfx/sfx/levelup3.wav.import +++ b/assets/music&sfx/sfx/levelup3.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://eyh0fillwv0g" -path="res://.godot/imported/levelup3.wav-83d273967083589a5242307c970d9d61.sample" +path="res://.godot/imported/levelup3.wav-f91f31c92c7a24042ede68e14c703aba.sample" [deps] -source_file="res://assets/music & sfx/sfx/levelup3.wav" -dest_files=["res://.godot/imported/levelup3.wav-83d273967083589a5242307c970d9d61.sample"] +source_file="res://assets/music&sfx/sfx/levelup3.wav" +dest_files=["res://.godot/imported/levelup3.wav-f91f31c92c7a24042ede68e14c703aba.sample"] [params] diff --git a/assets/music & sfx/sfx/pickup.wav b/assets/music&sfx/sfx/pickup.wav similarity index 100% rename from assets/music & sfx/sfx/pickup.wav rename to assets/music&sfx/sfx/pickup.wav diff --git a/assets/music & sfx/sfx/pickup.wav.import b/assets/music&sfx/sfx/pickup.wav.import similarity index 55% rename from assets/music & sfx/sfx/pickup.wav.import rename to assets/music&sfx/sfx/pickup.wav.import index 9612ed6..86df054 100644 --- a/assets/music & sfx/sfx/pickup.wav.import +++ b/assets/music&sfx/sfx/pickup.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://btdd1hy6kgtia" -path="res://.godot/imported/pickup.wav-2911a2506e67fa1f34ef8a83bea98c4d.sample" +path="res://.godot/imported/pickup.wav-06cc95539317241c140502395f996e77.sample" [deps] -source_file="res://assets/music & sfx/sfx/pickup.wav" -dest_files=["res://.godot/imported/pickup.wav-2911a2506e67fa1f34ef8a83bea98c4d.sample"] +source_file="res://assets/music&sfx/sfx/pickup.wav" +dest_files=["res://.godot/imported/pickup.wav-06cc95539317241c140502395f996e77.sample"] [params] diff --git a/assets/music & sfx/sfx/pickup2.wav b/assets/music&sfx/sfx/pickup2.wav similarity index 100% rename from assets/music & sfx/sfx/pickup2.wav rename to assets/music&sfx/sfx/pickup2.wav diff --git a/assets/music & sfx/sfx/pickup2.wav.import b/assets/music&sfx/sfx/pickup2.wav.import similarity index 55% rename from assets/music & sfx/sfx/pickup2.wav.import rename to assets/music&sfx/sfx/pickup2.wav.import index 6e51818..8f52e88 100644 --- a/assets/music & sfx/sfx/pickup2.wav.import +++ b/assets/music&sfx/sfx/pickup2.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://620mgxqpjjrm" -path="res://.godot/imported/pickup2.wav-660623c74a806c3409416193fd1180e3.sample" +path="res://.godot/imported/pickup2.wav-e34643704d1c389b5bc31e5c1d4d03da.sample" [deps] -source_file="res://assets/music & sfx/sfx/pickup2.wav" -dest_files=["res://.godot/imported/pickup2.wav-660623c74a806c3409416193fd1180e3.sample"] +source_file="res://assets/music&sfx/sfx/pickup2.wav" +dest_files=["res://.godot/imported/pickup2.wav-e34643704d1c389b5bc31e5c1d4d03da.sample"] [params] diff --git a/options.gd b/options.gd index f22943c..f7e5375 100644 --- a/options.gd +++ b/options.gd @@ -1,6 +1,6 @@ extends CanvasLayer -var sfx_preview = preload("res://assets/music & sfx/sfx/hit2.wav") +var sfx_preview = preload("res://assets/music&sfx/sfx/hit2.wav") func _ready(): # Music Slider diff --git a/scenes/game.gd b/scenes/game.gd index 97c96be..7ac5837 100644 --- a/scenes/game.gd +++ b/scenes/game.gd @@ -3,7 +3,7 @@ extends Node2D # Called when the node enters the scene tree for the first time. func _ready(): - MusicManager.play(preload("res://assets/music & sfx/music/ashveil-355633.mp3")) + MusicManager.play(preload("res://assets/music&sfx/music/ashveil-355633.mp3")) # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/scripts/enemy_base.gd b/scripts/enemy_base.gd index e4a23e1..97aff93 100644 --- a/scripts/enemy_base.gd +++ b/scripts/enemy_base.gd @@ -7,7 +7,7 @@ var is_dying = false var speed var witch var player -var death_sound = preload("res://assets/music & sfx/sfx/hit2.wav") +var death_sound = preload("res://assets/music&sfx/sfx/hit2.wav") func _ready() -> void: witch = get_node("/root/Game/Witch") diff --git a/scripts/mainmenu.gd b/scripts/mainmenu.gd index 0cfdae8..660f826 100644 --- a/scripts/mainmenu.gd +++ b/scripts/mainmenu.gd @@ -1,7 +1,7 @@ extends CanvasLayer func _ready(): - MusicManager.play(preload("res://assets/music & sfx/music/8_bit_dungeon.mp3")) + MusicManager.play(preload("res://assets/music&sfx/music/8_bit_dungeon.mp3")) func _on_play_button_pressed() -> void: get_tree().change_scene_to_file("res://scenes/game.tscn")