diff --git a/audio/music/bumpy_ride.mp3 b/audio/music/bumpy_ride.mp3 deleted file mode 100644 index 97181d9..0000000 Binary files a/audio/music/bumpy_ride.mp3 and /dev/null differ diff --git a/audio/music/bumpy_ride.mp3.import b/audio/music/bumpy_ride.mp3.import deleted file mode 100644 index aa244e3..0000000 --- a/audio/music/bumpy_ride.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/bumpy_ride.mp3-55d67433bf2f6cadbc5025701c782443.mp3str" - -[deps] - -source_file="res://audio/music/bumpy_ride.mp3" -dest_files=[ "res://.import/bumpy_ride.mp3-55d67433bf2f6cadbc5025701c782443.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/bumpy_ride.ogg b/audio/music/bumpy_ride.ogg new file mode 100644 index 0000000..a03670d Binary files /dev/null and b/audio/music/bumpy_ride.ogg differ diff --git a/audio/music/bumpy_ride.ogg.import b/audio/music/bumpy_ride.ogg.import new file mode 100644 index 0000000..b8f9636 --- /dev/null +++ b/audio/music/bumpy_ride.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/bumpy_ride.ogg-62ed9ac773150c367bf21b6787de62b2.oggstr" + +[deps] + +source_file="res://audio/music/bumpy_ride.ogg" +dest_files=[ "res://.import/bumpy_ride.ogg-62ed9ac773150c367bf21b6787de62b2.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/audio/music/dusk_park.mp3 b/audio/music/dusk_park.mp3 deleted file mode 100644 index 233199d..0000000 Binary files a/audio/music/dusk_park.mp3 and /dev/null differ diff --git a/audio/music/dusk_park.mp3.import b/audio/music/dusk_park.mp3.import deleted file mode 100644 index 63392a3..0000000 --- a/audio/music/dusk_park.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/dusk_park.mp3-4f32391dd5241853bbe02a0e983b8702.mp3str" - -[deps] - -source_file="res://audio/music/dusk_park.mp3" -dest_files=[ "res://.import/dusk_park.mp3-4f32391dd5241853bbe02a0e983b8702.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/dusk_park.ogg b/audio/music/dusk_park.ogg new file mode 100644 index 0000000..447e3d4 Binary files /dev/null and b/audio/music/dusk_park.ogg differ diff --git a/audio/music/dusk_park.ogg.import b/audio/music/dusk_park.ogg.import new file mode 100644 index 0000000..f98c149 --- /dev/null +++ b/audio/music/dusk_park.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/dusk_park.ogg-66b2f58b4fbcb15fb39169e2ef3dc572.oggstr" + +[deps] + +source_file="res://audio/music/dusk_park.ogg" +dest_files=[ "res://.import/dusk_park.ogg-66b2f58b4fbcb15fb39169e2ef3dc572.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/audio/music/klystron.mp3 b/audio/music/klystron.mp3 deleted file mode 100644 index 394a50a..0000000 Binary files a/audio/music/klystron.mp3 and /dev/null differ diff --git a/audio/music/klystron.mp3.import b/audio/music/klystron.mp3.import deleted file mode 100644 index 0aa85d9..0000000 --- a/audio/music/klystron.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/klystron.mp3-602926993b6a74c407f1b84641b06fdd.mp3str" - -[deps] - -source_file="res://audio/music/klystron.mp3" -dest_files=[ "res://.import/klystron.mp3-602926993b6a74c407f1b84641b06fdd.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/klystron.ogg b/audio/music/klystron.ogg new file mode 100644 index 0000000..8ff022b Binary files /dev/null and b/audio/music/klystron.ogg differ diff --git a/audio/music/klystron.ogg.import b/audio/music/klystron.ogg.import new file mode 100644 index 0000000..fc04e18 --- /dev/null +++ b/audio/music/klystron.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/klystron.ogg-2dce5b1690502308cf909f0b9eda8d99.oggstr" + +[deps] + +source_file="res://audio/music/klystron.ogg" +dest_files=[ "res://.import/klystron.ogg-2dce5b1690502308cf909f0b9eda8d99.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/audio/music/moon_trail.mp3 b/audio/music/moon_trail.mp3 deleted file mode 100644 index 0f015dd..0000000 Binary files a/audio/music/moon_trail.mp3 and /dev/null differ diff --git a/audio/music/moon_trail.mp3.import b/audio/music/moon_trail.mp3.import deleted file mode 100644 index 55346de..0000000 --- a/audio/music/moon_trail.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/moon_trail.mp3-e5596d3a9a378d4307b426522ca94d8d.mp3str" - -[deps] - -source_file="res://audio/music/moon_trail.mp3" -dest_files=[ "res://.import/moon_trail.mp3-e5596d3a9a378d4307b426522ca94d8d.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/moon_trail.ogg b/audio/music/moon_trail.ogg new file mode 100644 index 0000000..fbe7cb5 Binary files /dev/null and b/audio/music/moon_trail.ogg differ diff --git a/audio/music/moon_trail.ogg.import b/audio/music/moon_trail.ogg.import new file mode 100644 index 0000000..7bb348a --- /dev/null +++ b/audio/music/moon_trail.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/moon_trail.ogg-8108eb4067344b396b1f232ad37111d0.oggstr" + +[deps] + +source_file="res://audio/music/moon_trail.ogg" +dest_files=[ "res://.import/moon_trail.ogg-8108eb4067344b396b1f232ad37111d0.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/audio/music/rumble_loop.mp3 b/audio/music/rumble_loop.mp3 deleted file mode 100644 index 1523b2a..0000000 Binary files a/audio/music/rumble_loop.mp3 and /dev/null differ diff --git a/audio/music/rumble_loop.mp3.import b/audio/music/rumble_loop.mp3.import deleted file mode 100644 index 1597ad0..0000000 --- a/audio/music/rumble_loop.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/rumble_loop.mp3-8296079a496312740d286c71cb69f818.mp3str" - -[deps] - -source_file="res://audio/music/rumble_loop.mp3" -dest_files=[ "res://.import/rumble_loop.mp3-8296079a496312740d286c71cb69f818.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/rumble_loop.ogg b/audio/music/rumble_loop.ogg new file mode 100644 index 0000000..bef6c0a Binary files /dev/null and b/audio/music/rumble_loop.ogg differ diff --git a/audio/music/rumble_loop.ogg.import b/audio/music/rumble_loop.ogg.import new file mode 100644 index 0000000..3691484 --- /dev/null +++ b/audio/music/rumble_loop.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/rumble_loop.ogg-75748d2cd32c4c0b3bc7d4e36971e0ce.oggstr" + +[deps] + +source_file="res://audio/music/rumble_loop.ogg" +dest_files=[ "res://.import/rumble_loop.ogg-75748d2cd32c4c0b3bc7d4e36971e0ce.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/audio/music/smokestack.mp3 b/audio/music/smokestack.mp3 deleted file mode 100644 index ae6efd0..0000000 Binary files a/audio/music/smokestack.mp3 and /dev/null differ diff --git a/audio/music/smokestack.mp3.import b/audio/music/smokestack.mp3.import deleted file mode 100644 index 3123980..0000000 --- a/audio/music/smokestack.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/smokestack.mp3-27e96096ab30e2a396e177e479e12ab9.mp3str" - -[deps] - -source_file="res://audio/music/smokestack.mp3" -dest_files=[ "res://.import/smokestack.mp3-27e96096ab30e2a396e177e479e12ab9.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/smokestack.ogg b/audio/music/smokestack.ogg new file mode 100644 index 0000000..e64d7cd Binary files /dev/null and b/audio/music/smokestack.ogg differ diff --git a/audio/music/smokestack.ogg.import b/audio/music/smokestack.ogg.import new file mode 100644 index 0000000..3213f4c --- /dev/null +++ b/audio/music/smokestack.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/smokestack.ogg-e5ff6f583a64a996a107e20d41fd576d.oggstr" + +[deps] + +source_file="res://audio/music/smokestack.ogg" +dest_files=[ "res://.import/smokestack.ogg-e5ff6f583a64a996a107e20d41fd576d.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/maps/abyss.tscn b/maps/abyss.tscn index 247e5ec..320cc34 100644 --- a/maps/abyss.tscn +++ b/maps/abyss.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] [ext_resource path="res://graphics/backgrounds/abyss.png" type="Texture" id=3] [ext_resource path="res://shaders/water_ripple.gdshader" type="Shader" id=4] -[ext_resource path="res://audio/music/moon_trail.mp3" type="AudioStream" id=5] +[ext_resource path="res://audio/music/moon_trail.ogg" type="AudioStream" id=5] [ext_resource path="res://graphics/tiles/abyss.png" type="Texture" id=6] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=7] [ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=8] diff --git a/maps/boss/boss1_arena.tscn b/maps/boss/boss1_arena.tscn index 0d845e9..cb8779e 100644 --- a/maps/boss/boss1_arena.tscn +++ b/maps/boss/boss1_arena.tscn @@ -10,7 +10,7 @@ [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=8] [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=10] -[ext_resource path="res://audio/music/klystron.mp3" type="AudioStream" id=11] +[ext_resource path="res://audio/music/klystron.ogg" type="AudioStream" id=11] [ext_resource path="res://objects/delayed_instance.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/environment/death tile/death_tile.tscn" type="PackedScene" id=13] [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=14] diff --git a/maps/canopy.tscn b/maps/canopy.tscn index b50a952..e03e438 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -21,7 +21,7 @@ [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=19] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=20] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=21] -[ext_resource path="res://audio/music/dusk_park.mp3" type="AudioStream" id=22] +[ext_resource path="res://audio/music/dusk_park.ogg" type="AudioStream" id=22] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 128 ) diff --git a/maps/cave.tscn b/maps/cave.tscn index 1f837bc..c59310b 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -11,7 +11,7 @@ [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=10] [ext_resource path="res://maps/map.gd" type="Script" id=11] -[ext_resource path="res://audio/music/smokestack.mp3" type="AudioStream" id=12] +[ext_resource path="res://audio/music/smokestack.ogg" type="AudioStream" id=12] [ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=14] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=15] @@ -28,7 +28,7 @@ [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 96 ) -[node name="Map2" type="Node2D" groups=["map"]] +[node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 script = ExtResource( 11 ) target_time_any = 80 diff --git a/maps/hills.tscn b/maps/hills.tscn index 5d46d90..6414578 100644 --- a/maps/hills.tscn +++ b/maps/hills.tscn @@ -2,6 +2,7 @@ [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] +[ext_resource path="res://audio/music/rumble_loop.ogg" type="AudioStream" id=3] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=4] [ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] @@ -18,7 +19,6 @@ [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=17] [ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=18] [ext_resource path="res://maps/map.gd" type="Script" id=19] -[ext_resource path="res://audio/music/rumble_loop.mp3" type="AudioStream" id=20] [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=21] [ext_resource path="res://objects/lore/hills/bioslime.tscn" type="PackedScene" id=22] [ext_resource path="res://objects/lore/hills/catbat.tscn" type="PackedScene" id=23] @@ -34,7 +34,7 @@ pause_mode = 1 script = ExtResource( 19 ) target_time_any = 70 target_time_100 = 180 -music = ExtResource( 20 ) +music = ExtResource( 3 ) lore_entries = [ ExtResource( 25 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 23 ) ] [node name="CanvasLayer" type="CanvasLayer" parent="."]