Merge pull request #84 from LumpBloom7/dependabot/nuget/ppy.osu.Game-…

…2020.714.0 Bump ppy.osu.Game from 2020.710.0 to 2020.714.0
LumpBloom7 · Jul 14, 2020 · d8907ce · d8907ce
2 parents 9a7293e + 0e48ee8
commit d8907ce
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiJudgement.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiJudgement.cs
@@ -17,6 +17,8 @@ public class DrawableSentakkiJudgement : DrawableJudgement
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private OsuSpriteText sentakkiJudgementText;
+
         public DrawableSentakkiJudgement(JudgementResult result, DrawableSentakkiHitObject judgedObject)
             : base(result, judgedObject)
         {
@@ -25,40 +27,35 @@ public DrawableSentakkiJudgement(JudgementResult result, DrawableSentakkiHitObje
         [BackgroundDependencyLoader(true)]
         private void load(SentakkiRulesetConfigManager settings)
         {
-            InternalChild = JudgementBody = new Container
+            JudgementBody.Child = sentakkiJudgementText = new OsuSpriteText
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Child = JudgementText = new OsuSpriteText
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Text = Result.Type.GetDescription().ToUpperInvariant(),
-                    Font = OsuFont.Numeric.With(size: 20),
-                    Colour = colours.ForHitResult(Result.Type),
-                    Scale = new Vector2(0.85f, 1),
-                }
+                Text = Result.Type.GetDescription().ToUpperInvariant(),
+                Font = OsuFont.Numeric.With(size: 20),
+                Colour = colours.ForHitResult(Result.Type),
+                Scale = new Vector2(0.85f, 1),
             };
+
             if (settings != null && settings.Get<bool>(SentakkiRulesetSettings.MaimaiJudgements))
             {
                 switch (Result.Type)
                 {
                     case HitResult.Perfect:
-                        JudgementText.Text = "Critical";
-                        JudgementText.Colour = Color4.Yellow;
+                        sentakkiJudgementText.Text = "Critical";
+                        sentakkiJudgementText.Colour = Color4.Yellow;
                         break;
 
                     case HitResult.Great:
-                        JudgementText.Text = "Perfect";
+                        sentakkiJudgementText.Text = "Perfect";
                         break;
 
                     case HitResult.Good:
-                        JudgementText.Text = "Great";
+                        sentakkiJudgementText.Text = "Great";
                         break;
 
                     case HitResult.Meh:
-                        JudgementText.Text = "Good";
+                        sentakkiJudgementText.Text = "Good";
                         break;
                 }
             }

diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj
@@ -10,6 +10,6 @@
     <AssemblyName>osu.Game.Rulesets.Sentakki</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2020.710.0"/>
+    <PackageReference Include="ppy.osu.Game" Version="2020.714.0"/>
   </ItemGroup>
 </Project>