From e20109bd3a594055ca8c8512e965056e6a554c75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2020 14:37:47 +0000 Subject: [PATCH 1/2] Bump ppy.osu.Game from 2020.710.0 to 2020.714.0 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2020.710.0 to 2020.714.0. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2020.710.0...2020.714.0) Signed-off-by: dependabot[bot] --- osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj index 9aab54da5..5207a8277 100644 --- a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj +++ b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj @@ -10,6 +10,6 @@ osu.Game.Rulesets.Sentakki - + \ No newline at end of file From 0e48ee837aedc170d362f66a0b13ac89c13e5fa8 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Tue, 14 Jul 2020 23:33:35 +0800 Subject: [PATCH 2/2] Fix osu side changes breaking judgements Why the hell is JudgementBody and JudgementText a private set???? --- .../Drawables/DrawableSentakkiJudgement.cs | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiJudgement.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiJudgement.cs index b09d8bd97..ddbcf7440 100644 --- 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(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; } }