diff --git a/project/music/at_the_lake.ogg b/project/music/at_the_lake.ogg new file mode 100644 index 0000000..603670f Binary files /dev/null and b/project/music/at_the_lake.ogg differ diff --git a/project/music/at_the_lake.ogg.import b/project/music/at_the_lake.ogg.import new file mode 100644 index 0000000..dde85e8 --- /dev/null +++ b/project/music/at_the_lake.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/at_the_lake.ogg-3c70c4f6fe0d2145ba5ad822bf6ed2f5.oggstr" + +[deps] + +source_file="res://music/at_the_lake.ogg" +dest_files=[ "res://.import/at_the_lake.ogg-3c70c4f6fe0d2145ba5ad822bf6ed2f5.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/project/music/reminiscing.ogg b/project/music/reminiscing.ogg new file mode 100644 index 0000000..87520de Binary files /dev/null and b/project/music/reminiscing.ogg differ diff --git a/project/music/reminiscing.ogg.import b/project/music/reminiscing.ogg.import new file mode 100644 index 0000000..80adf53 --- /dev/null +++ b/project/music/reminiscing.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/reminiscing.ogg-6bf8281e49868f20b0ba3bd1070a62ac.oggstr" + +[deps] + +source_file="res://music/reminiscing.ogg" +dest_files=[ "res://.import/reminiscing.ogg-6bf8281e49868f20b0ba3bd1070a62ac.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/project/music/song.ogg b/project/music/song.ogg deleted file mode 100644 index 9947e30..0000000 Binary files a/project/music/song.ogg and /dev/null differ diff --git a/project/music/song.ogg.import b/project/music/song.ogg.import deleted file mode 100644 index 8e54875..0000000 --- a/project/music/song.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/song.ogg-e028209760e5df62f8d96269815a3497.oggstr" - -[deps] - -source_file="res://music/song.ogg" -dest_files=[ "res://.import/song.ogg-e028209760e5df62f8d96269815a3497.oggstr" ] - -[params] - -loop=true -loop_offset=0 diff --git a/project/music/together_again.ogg b/project/music/together_again.ogg new file mode 100644 index 0000000..ffdef7b Binary files /dev/null and b/project/music/together_again.ogg differ diff --git a/project/music/together_again.ogg.import b/project/music/together_again.ogg.import new file mode 100644 index 0000000..63b6667 --- /dev/null +++ b/project/music/together_again.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/together_again.ogg-c77c286a1667edafef4b34790b5d2995.oggstr" + +[deps] + +source_file="res://music/together_again.ogg" +dest_files=[ "res://.import/together_again.ogg-c77c286a1667edafef4b34790b5d2995.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/project/scn/ModernScn.tscn b/project/scn/ModernScn.tscn index 17ad3b7..7fc5b58 100644 --- a/project/scn/ModernScn.tscn +++ b/project/scn/ModernScn.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://src/GameScn.gd" type="Script" id=1] [ext_resource path="res://sprites/icrazy_frame.png" type="Texture" id=2] [ext_resource path="res://scn/Clothes.tscn" type="PackedScene" id=3] [ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/Soundtrack.gd" type="Script" id=5] [node name="GameScreen" type="Node"] script = ExtResource( 1 ) @@ -15,3 +16,6 @@ texture = ExtResource( 2 ) [node name="Clothes" parent="." instance=ExtResource( 3 )] [node name="WinDialogs" parent="." instance=ExtResource( 4 )] + +[node name="Music" type="AudioStreamPlayer" parent="."] +script = ExtResource( 5 ) diff --git a/project/scn/TitleScn.tscn b/project/scn/TitleScn.tscn index d139a09..9022cc8 100644 --- a/project/scn/TitleScn.tscn +++ b/project/scn/TitleScn.tscn @@ -1,20 +1,21 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://src/TitleScn.gd" type="Script" id=1] [ext_resource path="res://sprites/title.svg" type="Texture" id=2] [ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/Soundtrack.gd" type="Script" id=4] [node name="Start" type="Node"] script = ExtResource( 1 ) [node name="Title" type="Sprite" parent="."] -position = Vector2( 526.047, 150.148 ) +position = Vector2( 522.047, 150.148 ) texture = ExtResource( 2 ) [node name="MenuRf" type="ReferenceRect" parent="."] -margin_left = 315.292 +margin_left = 311.292 margin_top = 72.2924 -margin_right = 734.292 +margin_right = 730.292 margin_bottom = 523.292 [node name="StartVbox" type="VBoxContainer" parent="MenuRf"] @@ -82,10 +83,13 @@ margin_bottom = 62.0 text = "KCLS" [node name="WinDialogs" parent="." instance=ExtResource( 3 )] -margin_left = 113.0 +margin_left = 97.0 margin_top = 37.0 -margin_right = 113.0 +margin_right = 97.0 margin_bottom = 37.0 + +[node name="Music" type="AudioStreamPlayer" parent="."] +script = ExtResource( 4 ) [connection signal="pressed" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_pressed"] [connection signal="pressed" from="MenuRf/StartVbox/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] [connection signal="pressed" from="MenuRf/StartVbox/LicenseBtn" to="." method="_on_LicenseBtn_pressed"] diff --git a/project/scn/WinDialogs.tscn b/project/scn/WinDialogs.tscn index dcbe1da..bf80dac 100644 --- a/project/scn/WinDialogs.tscn +++ b/project/scn/WinDialogs.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] [ext_resource path="res://src/WinDialogs.gd" type="Script" id=1] -[ext_resource path="res://music/song.ogg" type="AudioStream" id=2] [node name="WinDialogs" type="Control"] anchor_left = 0.5 @@ -10,9 +9,6 @@ anchor_right = 0.5 anchor_bottom = 0.5 script = ExtResource( 1 ) -[node name="Music" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 2 ) - [node name="PauseWin" type="PopupDialog" parent="."] pause_mode = 2 editor/display_folded = true @@ -58,7 +54,6 @@ margin_bottom = 86.0 text = "KEXT" [node name="CreditsWin" type="AcceptDialog" parent="."] -editor/display_folded = true anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -73,13 +68,17 @@ resizable = true [node name="CreditsTxt" type="RichTextLabel" parent="CreditsWin"] anchor_right = 1.0 anchor_bottom = 1.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = -8.0 +margin_bottom = -36.0 focus_mode = 2 bbcode_enabled = true bbcode_text = "[center]Created by Anthony Wilcox Music by -Augmentality +Michael Carey Clothing inspired by Megawolf77 @@ -93,7 +92,7 @@ text = "Created by Anthony Wilcox Music by -Augmentality +Michael Carey Clothing inspired by Megawolf77 @@ -107,7 +106,6 @@ selection_enabled = true [node name="SettingsWin" type="AcceptDialog" parent="."] pause_mode = 2 -editor/display_folded = true anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -161,8 +159,9 @@ resizable = true anchor_left = 0.5 anchor_right = 0.5 margin_left = -194.0 +margin_top = 8.0 margin_right = 194.0 -margin_bottom = 231.0 +margin_bottom = 239.0 bbcode_enabled = true bbcode_text = "Nathan's Dress Up is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. @@ -194,7 +193,6 @@ Attribution-ShareAlike 4.0 International License. You should have received a copy of the license along with this work. If not, see ." - [connection signal="pressed" from="PauseWin/PauseVbox/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] [connection signal="pressed" from="PauseWin/PauseVbox/ResumeBtn" to="." method="_on_ResumeBtn_pressed"] [connection signal="pressed" from="PauseWin/PauseVbox/ExitBtn" to="." method="_on_ExitBtn_pressed"] diff --git a/project/src/Soundtrack.gd b/project/src/Soundtrack.gd new file mode 100644 index 0000000..d385d7b --- /dev/null +++ b/project/src/Soundtrack.gd @@ -0,0 +1,22 @@ +extends AudioStreamPlayer + +const tracks = [ + 'reminiscing', + 'together_again', + 'at_the_lake', +] +# Called when the node enters the scene tree for the first time. +func _ready(): + connect("finished", self, "play_random_song") + play_random_song() + +func play_random_song(): + randomize() + + var rand_db = randi() % tracks.size() + var audiostream = load('res://music/' + tracks[rand_db] + '.ogg') + set_stream(audiostream) + play() + + + \ No newline at end of file