From 0133f9c0869d4ff7123d049a1c1623f9a2c0acee Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 24 Jun 2017 01:19:44 -0300
Subject: [PATCH] Medal sprite, make MedalOverlay auto-show when loaded.

---
 .../Tests/TestCaseMedalOverlay.cs             |  6 ++---
 osu.Game/Overlays/MedalOverlay.cs             |  2 ++
 .../Overlays/MedalSplash/DrawableMedal.cs     | 23 +++++++++++++------
 osu.Game/Users/Medal.cs                       |  2 ++
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs
index 581675e66a..ac983277a4 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs
@@ -15,14 +15,12 @@ namespace osu.Desktop.VisualTests.Tests
         {
             base.Reset();
 
-            MedalOverlay overlay;
-            Add(overlay = new MedalOverlay(new Medal
+            Add(new MedalOverlay(new Medal
             {
                 Name = @"Animations",
+                InternalName = @"all-intro-doubletime",
                 Description = @"More complex than you think.",
             }));
-
-            AddStep(@"show", overlay.Show);
         }
     }
 }
diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs
index ecd9a0af2f..d9c949a0da 100644
--- a/osu.Game/Overlays/MedalOverlay.cs
+++ b/osu.Game/Overlays/MedalOverlay.cs
@@ -168,6 +168,8 @@ namespace osu.Game.Overlays
                 Colour = colours.Blue.Opacity(0.5f),
                 Radius = 50,
             };
+
+            Show();
         }
 
         protected override void Update()
diff --git a/osu.Game/Overlays/MedalSplash/DrawableMedal.cs b/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
index ba2e3964a4..e230b9de9b 100644
--- a/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
+++ b/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
@@ -19,8 +19,9 @@ namespace osu.Game.Overlays.MedalSplash
         private const float scale_when_unlocked = 0.76f;
         private const float scale_when_full = 0.6f;
 
-        private readonly Container medal;
-        private readonly Sprite medalGlow;
+        private readonly Medal medal;
+        private readonly Container medalContainer;
+        private readonly Sprite medalGlow, medalSprite;
         private readonly OsuSpriteText unlocked, name;
         private readonly TextFlowContainer description;
         private readonly FillFlowContainer infoFlow;
@@ -28,11 +29,12 @@ namespace osu.Game.Overlays.MedalSplash
 
         public DrawableMedal(Medal medal)
         {
+            this.medal = medal;
             Position = new Vector2(0f, MedalOverlay.DISC_SIZE / 2);
 
             Children = new Drawable[]
             {
-                this.medal = new Container
+                this.medalContainer = new Container
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.Centre,
@@ -40,6 +42,12 @@ namespace osu.Game.Overlays.MedalSplash
                     Alpha = 0f,
                     Children = new[]
                     {
+                        medalSprite = new Sprite
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Scale = new Vector2(0.81f),
+                        },
                         medalGlow = new Sprite
                         {
                             Anchor = Anchor.Centre,
@@ -102,12 +110,13 @@ namespace osu.Game.Overlays.MedalSplash
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, TextureStore textures)
         {
+            medalSprite.Texture = textures.Get(medal.ImageUrl);
             medalGlow.Texture = textures.Get(@"MedalSplash/medal-glow");
 
             foreach (var s in descriptionSprites)
                 s.Colour = colours.BlueLight;
 
-            var pos = new Vector2(0f, medal.Size.Y / 2 + 10);
+            var pos = new Vector2(0f, medalContainer.Size.Y / 2 + 10);
             unlocked.Position = pos;
             pos.Y += 90;
             infoFlow.Position = pos;
@@ -118,9 +127,9 @@ namespace osu.Game.Overlays.MedalSplash
             switch (newState)
             {
                 case DisplayState.Icon:
-                    medal.Scale = Vector2.Zero;
-                    medal.ScaleTo(1, duration, EasingTypes.OutElastic);
-                    medal.FadeInFromZero(duration);
+                    medalContainer.Scale = Vector2.Zero;
+                    medalContainer.ScaleTo(1, duration, EasingTypes.OutElastic);
+                    medalContainer.FadeInFromZero(duration);
                     break;
                 case DisplayState.MedalUnlocked:
                     ScaleTo(scale_when_unlocked, duration, EasingTypes.OutExpo);
diff --git a/osu.Game/Users/Medal.cs b/osu.Game/Users/Medal.cs
index 5ac6eceddc..aa7382b457 100644
--- a/osu.Game/Users/Medal.cs
+++ b/osu.Game/Users/Medal.cs
@@ -6,6 +6,8 @@ namespace osu.Game.Users
     public class Medal
     {
         public string Name { get; set; }
+        public string InternalName { get; set; }
+        public string ImageUrl => $@"https://s.ppy.sh/images/medals-client/{InternalName}@2x.png";
         public string Description { get; set; }
     }
 }