diff --git a/audio/music/sleet.ogg b/audio/music/sleet.ogg new file mode 100644 index 0000000..0a40398 Binary files /dev/null and b/audio/music/sleet.ogg differ diff --git a/audio/music/sleet.ogg.import b/audio/music/sleet.ogg.import new file mode 100644 index 0000000..203cd8a --- /dev/null +++ b/audio/music/sleet.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/sleet.ogg-dfb9adcbe69bd6791c93c0f86b073746.oggstr" + +[deps] + +source_file="res://audio/music/sleet.ogg" +dest_files=[ "res://.import/sleet.ogg-dfb9adcbe69bd6791c93c0f86b073746.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/audio/music/sleet0.ogg.import b/audio/music/sleet0.ogg.import new file mode 100644 index 0000000..b987856 --- /dev/null +++ b/audio/music/sleet0.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/sleet0.ogg-89329c21f9cd934500ba65a259d96b96.oggstr" + +[deps] + +source_file="res://audio/music/sleet0.ogg" +dest_files=[ "res://.import/sleet0.ogg-89329c21f9cd934500ba65a259d96b96.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/music/vitreous_squares.ogg b/audio/music/vitreous_squares.ogg new file mode 100644 index 0000000..bbbe63c Binary files /dev/null and b/audio/music/vitreous_squares.ogg differ diff --git a/audio/music/vitreous_squares.ogg.import b/audio/music/vitreous_squares.ogg.import new file mode 100644 index 0000000..773e0e1 --- /dev/null +++ b/audio/music/vitreous_squares.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/vitreous_squares.ogg-524c15223b7d282c1532fe2fa5032ad4.oggstr" + +[deps] + +source_file="res://audio/music/vitreous_squares.ogg" +dest_files=[ "res://.import/vitreous_squares.ogg-524c15223b7d282c1532fe2fa5032ad4.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/autoloads/level_data.tscn b/autoloads/level_data.tscn index 5510407..b71b57b 100644 --- a/autoloads/level_data.tscn +++ b/autoloads/level_data.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://autoloads/level_data.gd" type="Script" id=1] [ext_resource path="res://maps/hills_scholar.tscn" type="PackedScene" id=2] @@ -13,6 +13,8 @@ [ext_resource path="res://maps/graveyard.tscn" type="PackedScene" id=11] [ext_resource path="res://maps/lab.tscn" type="PackedScene" id=12] [ext_resource path="res://maps/boss/boss2_arena.tscn" type="PackedScene" id=13] +[ext_resource path="res://maps/cave_scholar.tscn" type="PackedScene" id=14] +[ext_resource path="res://maps/hills.tscn" type="PackedScene" id=15] [sub_resource type="Resource" id=1] resource_name = "Verdant Hills" @@ -62,12 +64,12 @@ scene = ExtResource( 8 ) resource_name = "Blue Ray Cavern" script = ExtResource( 5 ) title = "Blue Ray Cavern" -shard_titles = [ "Star-Crossed Lovers", "The Snail Cave", "Members Only!", "OverHead Obstacle Course", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] +shard_titles = [ "Dynamic Duo", "Stalactite Scramble", "OverHead Obstacle Course", "Sneaky Snail", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] save_id = "cave" boss = false scores_id = 13264 times_id = 13271 -scene = ExtResource( 4 ) +scene = ExtResource( 14 ) [sub_resource type="Resource" id=10] resource_name = "Crater of the Abyss" @@ -135,6 +137,28 @@ scores_id = 13269 times_id = 13276 scene = ExtResource( 12 ) +[sub_resource type="Resource" id=13] +resource_name = "Beta Verdant Hills" +script = ExtResource( 5 ) +title = "Beta Verdant Hills" +shard_titles = [ "Climb the Big Vine", "Next to the Lone Tree", "Slime's Treasure", "The Snake Pit", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] +save_id = "beta_hills" +boss = false +scores_id = -1 +times_id = -1 +scene = ExtResource( 15 ) + +[sub_resource type="Resource" id=14] +resource_name = "Beta Blue Ray Cavern" +script = ExtResource( 5 ) +title = "Beta Blue Ray Cavern" +shard_titles = [ "Star-Crossed Lovers", "The Snail Cave", "Members Only!", "OverHead Obstacle Course", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] +save_id = "beta_cave" +boss = false +scores_id = -1 +times_id = -1 +scene = ExtResource( 4 ) + [node name="LevelData" type="Node"] script = ExtResource( 1 ) -levels = [ SubResource( 1 ), SubResource( 2 ), SubResource( 4 ), SubResource( 6 ), SubResource( 3 ), SubResource( 10 ), SubResource( 9 ), SubResource( 12 ), SubResource( 8 ), SubResource( 7 ), SubResource( 11 ) ] +levels = [ SubResource( 1 ), SubResource( 2 ), SubResource( 4 ), SubResource( 6 ), SubResource( 3 ), SubResource( 10 ), SubResource( 9 ), SubResource( 12 ), SubResource( 8 ), SubResource( 7 ), SubResource( 11 ), SubResource( 13 ), SubResource( 14 ) ] diff --git a/maps/cave_scholar.tscn b/maps/cave_scholar.tscn index be71ee7..476b9d1 100644 --- a/maps/cave_scholar.tscn +++ b/maps/cave_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=31 format=2] +[gd_scene load_steps=32 format=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] @@ -11,6 +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/sleet.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] @@ -36,6 +37,7 @@ extents = Vector2( 4, 96 ) [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 script = ExtResource( 11 ) +music = ExtResource( 12 ) lore_entries = [ ExtResource( 29 ), ExtResource( 27 ), ExtResource( 28 ), ExtResource( 30 ), ExtResource( 26 ) ] [node name="ParallaxBackground" type="ParallaxBackground" parent="."] diff --git a/menus/title_screen.gd b/menus/title_screen.gd index ad260bf..9546d2a 100644 --- a/menus/title_screen.gd +++ b/menus/title_screen.gd @@ -14,6 +14,8 @@ func _ready(): $Night.visible = true else: $Day.visible = true + Audio.play_music(load("res://audio/music/vitreous_squares.ogg")) + func _on_AudioStreamPlayer_finished(): Fade.fade_out(0.4)