diff --git a/audio/music/BBBBBBBB.ogg b/audio/music/BBBBBBBB.ogg index 4febba0..ae462db 100644 Binary files a/audio/music/BBBBBBBB.ogg and b/audio/music/BBBBBBBB.ogg differ diff --git a/audio/music/BBBBBBBB.ogg.import b/audio/music/BBBBBBBB.ogg.import index f4ef435..73adf81 100644 --- a/audio/music/BBBBBBBB.ogg.import +++ b/audio/music/BBBBBBBB.ogg.import @@ -12,4 +12,4 @@ dest_files=[ "res://.import/BBBBBBBB.ogg-cc9e6a4bb1b385b89207987440a19675.oggstr [params] loop=true -loop_offset=0 +loop_offset=12.091 diff --git a/audio/music/bumpy_ride.ogg b/audio/music/bumpy_ride.ogg deleted file mode 100644 index a03670d..0000000 Binary files a/audio/music/bumpy_ride.ogg and /dev/null differ diff --git a/audio/music/bumpy_ride.ogg.import b/audio/music/bumpy_ride.ogg.import deleted file mode 100644 index b8f9636..0000000 --- a/audio/music/bumpy_ride.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[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/burnt_in.ogg b/audio/music/burnt_in.ogg deleted file mode 100644 index 4feaf4f..0000000 Binary files a/audio/music/burnt_in.ogg and /dev/null differ diff --git a/audio/music/burnt_in.ogg.import b/audio/music/burnt_in.ogg.import deleted file mode 100644 index b8ed081..0000000 --- a/audio/music/burnt_in.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/burnt_in.ogg-5771350ae6e2877e32aaf932b22c784c.oggstr" - -[deps] - -source_file="res://audio/music/burnt_in.ogg" -dest_files=[ "res://.import/burnt_in.ogg-5771350ae6e2877e32aaf932b22c784c.oggstr" ] - -[params] - -loop=true -loop_offset=0 diff --git a/audio/music/burnt_out.ogg b/audio/music/burnt_out.ogg new file mode 100644 index 0000000..188b46c Binary files /dev/null and b/audio/music/burnt_out.ogg differ diff --git a/audio/music/burnt_out.ogg.import b/audio/music/burnt_out.ogg.import new file mode 100644 index 0000000..d216c73 --- /dev/null +++ b/audio/music/burnt_out.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/burnt_out.ogg-330f5bc87b626c0f8fed84e8c4c6a359.oggstr" + +[deps] + +source_file="res://audio/music/burnt_out.ogg" +dest_files=[ "res://.import/burnt_out.ogg-330f5bc87b626c0f8fed84e8c4c6a359.oggstr" ] + +[params] + +loop=true +loop_offset=42.507 diff --git a/audio/music/cryokiller.ogg b/audio/music/cryokiller.ogg index 00f88bc..3ec9294 100644 Binary files a/audio/music/cryokiller.ogg and b/audio/music/cryokiller.ogg differ diff --git a/audio/music/cryokiller.ogg.import b/audio/music/cryokiller.ogg.import index b477662..b630930 100644 --- a/audio/music/cryokiller.ogg.import +++ b/audio/music/cryokiller.ogg.import @@ -12,4 +12,4 @@ dest_files=[ "res://.import/cryokiller.ogg-d287a2f5c24b6c8114a93e405fe3c292.oggs [params] loop=true -loop_offset=0 +loop_offset=71.924 diff --git a/audio/music/cryokiller0.ogg.import b/audio/music/cryokiller0.ogg.import deleted file mode 100644 index 9ff360b..0000000 --- a/audio/music/cryokiller0.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/cryokiller0.ogg-2bd75e8d9f0865d8cc54c203db8d22fd.oggstr" - -[deps] - -source_file="res://audio/music/cryokiller0.ogg" -dest_files=[ "res://.import/cryokiller0.ogg-2bd75e8d9f0865d8cc54c203db8d22fd.oggstr" ] - -[params] - -loop=false -loop_offset=0 diff --git a/audio/music/dusk_park.ogg b/audio/music/dusk_park.ogg index 447e3d4..c866cf2 100644 Binary files a/audio/music/dusk_park.ogg and b/audio/music/dusk_park.ogg differ diff --git a/audio/music/dusk_park.ogg.import b/audio/music/dusk_park.ogg.import index f98c149..d17042e 100644 --- a/audio/music/dusk_park.ogg.import +++ b/audio/music/dusk_park.ogg.import @@ -12,4 +12,4 @@ dest_files=[ "res://.import/dusk_park.ogg-66b2f58b4fbcb15fb39169e2ef3dc572.oggst [params] loop=true -loop_offset=0 +loop_offset=14.25 diff --git a/audio/music/klystron.ogg b/audio/music/klystron.ogg index 8ff022b..8afe493 100644 Binary files a/audio/music/klystron.ogg and b/audio/music/klystron.ogg differ diff --git a/audio/music/klystron.ogg.import b/audio/music/klystron.ogg.import index fc04e18..90dc0bb 100644 --- a/audio/music/klystron.ogg.import +++ b/audio/music/klystron.ogg.import @@ -12,4 +12,4 @@ dest_files=[ "res://.import/klystron.ogg-2dce5b1690502308cf909f0b9eda8d99.oggstr [params] loop=true -loop_offset=0 +loop_offset=6.775 diff --git a/audio/music/precision_parasite.ogg b/audio/music/precision_parasite.ogg index 32b968e..88c0e9f 100644 Binary files a/audio/music/precision_parasite.ogg and b/audio/music/precision_parasite.ogg differ diff --git a/audio/music/precision_parasite.ogg.import b/audio/music/precision_parasite.ogg.import index ccfae23..f6c1480 100644 --- a/audio/music/precision_parasite.ogg.import +++ b/audio/music/precision_parasite.ogg.import @@ -12,4 +12,4 @@ dest_files=[ "res://.import/precision_parasite.ogg-48c1edc2a47c76aa62b0460e1c855 [params] loop=true -loop_offset=0 +loop_offset=16.684 diff --git a/audio/music/smokestack.ogg b/audio/music/smokestack.ogg index e64d7cd..9139f96 100644 Binary files a/audio/music/smokestack.ogg and b/audio/music/smokestack.ogg differ diff --git a/audio/music/smokestack.ogg.import b/audio/music/smokestack.ogg.import index 3213f4c..959bbe7 100644 --- a/audio/music/smokestack.ogg.import +++ b/audio/music/smokestack.ogg.import @@ -12,4 +12,4 @@ dest_files=[ "res://.import/smokestack.ogg-e5ff6f583a64a996a107e20d41fd576d.oggs [params] loop=true -loop_offset=0 +loop_offset=10.519 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index 485fdc1..6a1d210 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -10,6 +10,7 @@ onready var ac_cheat = $CodeEntrySound onready var ac_boss = $BossSound onready var ac_shard = $ShardSound onready var ac_pause_music = $PauseMusic +onready var ac_looping_music = $LoopingMusic #Sounds const a_gold = preload("res://audio/sounds/key.wav") const a_arrow = preload("res://audio/sounds/arrow_collect.ogg") @@ -40,6 +41,9 @@ const a_shard_results = preload("res://audio/sounds/shard_results.ogg") const a_fail_shard = preload("res://audio/sounds/fail_shard.ogg") const a_final_score = preload("res://audio/sounds/final_score.ogg") +var loop_section = null +var has_looped = false + #Plays a sound func play_sound(snd,player): player.set_stream(snd) diff --git a/maps/mountain.tscn b/maps/mountain.tscn index 0168cfe..2d8d978 100644 --- a/maps/mountain.tscn +++ b/maps/mountain.tscn @@ -26,7 +26,7 @@ [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=24] [ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=25] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=26] -[ext_resource path="res://audio/music/burnt_in.ogg" type="AudioStream" id=27] +[ext_resource path="res://audio/music/burnt_out.ogg" type="AudioStream" id=27] [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 24, 20 ) diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 073d9d5..1442dcc 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] @@ -13,6 +13,7 @@ [ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13] +[ext_resource path="res://audio/music/BBBBBBBB.ogg" type="AudioStream" id=15] [ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=16] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=17] [ext_resource path="res://objects/environment/switches/button.tscn" type="PackedScene" id=19] @@ -48,6 +49,7 @@ animations = [ { [node name="Map3" type="Node2D" groups=["map"]] pause_mode = 1 script = ExtResource( 11 ) +music = ExtResource( 15 ) [node name="Sprite" type="Sprite" parent="."] position = Vector2( 128, 96 )