From 2aadb9deba79800cbbbc22ce0a960dd6c709cfe6 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 2 Jun 2020 11:04:56 +0200
Subject: [PATCH] Implement welcome and seeya samples

---
 osu.Game/Screens/Menu/IntroCircles.cs   |  2 +-
 osu.Game/Screens/Menu/IntroFallback.cs  | 16 ++++++++++++----
 osu.Game/Screens/Menu/IntroScreen.cs    |  4 ++--
 osu.Game/Screens/Menu/IntroTriangles.cs |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index aa9cee969c..08a170f606 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio)
         {
             if (MenuVoice.Value)
-                welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"Intro/welcome-lazer");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
diff --git a/osu.Game/Screens/Menu/IntroFallback.cs b/osu.Game/Screens/Menu/IntroFallback.cs
index bc01e9c502..ea3c4fb040 100644
--- a/osu.Game/Screens/Menu/IntroFallback.cs
+++ b/osu.Game/Screens/Menu/IntroFallback.cs
@@ -13,15 +13,22 @@ namespace osu.Game.Screens.Menu
     {
         protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
         protected override string BeatmapFile => "welcome.osz";
-        private const double delay_step_two = 3000;
+        private const double delay_step_two = 2142;
 
         private SampleChannel welcome;
 
+        private SampleChannel pianoReverb;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
+            seeya = audio.Samples.Get(@"Intro/seeya-fallback");
+            
             if (MenuVoice.Value)
-                welcome = audio.Samples.Get(@"welcome");
+            {
+                welcome = audio.Samples.Get(@"Intro/welcome-fallback");
+                pianoReverb = audio.Samples.Get(@"Intro/welcome_piano");
+            }
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -31,14 +38,15 @@ namespace osu.Game.Screens.Menu
             if (!resuming)
             {
                 welcome?.Play();
-
+                pianoReverb?.Play();
                 Scheduler.AddDelayed(delegate
                 {
                     StartTrack();
 
                     PrepareMenuLoad();
 
-                    Scheduler.AddDelayed(LoadMenu, 0);
+                    Scheduler.Add(LoadMenu);
+                    
                 }, delay_step_two);
 
                 logo.ScaleTo(1);
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 0d5f3d1142..20cd9671a0 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Menu
 
         private const int exit_delay = 3000;
 
-        private SampleChannel seeya;
+        protected SampleChannel seeya { get; set; }
 
         private LeasedBindable<WorkingBeatmap> beatmap;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Menu
             MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
             MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
 
-            seeya = audio.Samples.Get(@"seeya");
+            seeya = audio.Samples.Get(@"Intro/seeya-lazer");
 
             BeatmapSetInfo setInfo = null;
 
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 188a49c147..b44fea99e8 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
         private void load()
         {
             if (MenuVoice.Value && !MenuMusic.Value)
-                welcome = audio.Samples.Get(@"welcome");
+                welcome = audio.Samples.Get(@"Intro/welcome-lazer");
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)