From b50418d0c9cd6551df4d2420f78d130473d691ae Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Sun, 8 Oct 2023 15:17:15 +0200 Subject: [PATCH] Add extended mod info Only challenge and HR for now due to limited space. --- .../Mods/SentakkiModChallenge.cs | 2 ++ osu.Game.Rulesets.Sentakki/Mods/SentakkiModHardRock.cs | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs index 1326f3c25..d23117a50 100644 --- a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs +++ b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs @@ -23,6 +23,8 @@ public class SentakkiModChallenge : ModFailCondition, IApplicableToDrawableRules public override LocalisableString Description => SentakkiModChallengeStrings.ModDescription; public override string Acronym => "C"; + public override string ExtendedIconInformation => $"{(int)LiveSetting.Value}♥"; + public override IconUsage? Icon => FontAwesome.Solid.HeartBroken; public override ModType Type => ModType.DifficultyIncrease; diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModHardRock.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModHardRock.cs index 5b514b489..13d1a90f9 100644 --- a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModHardRock.cs +++ b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModHardRock.cs @@ -14,6 +14,8 @@ public class SentakkiModHardRock : ModHardRock, IApplicableToHitObject { public override double ScoreMultiplier => 1; + public override string ExtendedIconInformation => $"{(JudgementMode.Value == SentakkiJudgementMode.Normal ? string.Empty : JudgementMode.Value)}"; + public override void ApplyToDifficulty(BeatmapDifficulty difficulty) { // This is a no-op since we don't use beatmap difficulty @@ -21,10 +23,10 @@ public override void ApplyToDifficulty(BeatmapDifficulty difficulty) } [SettingSource(typeof(SentakkiModHardRockStrings), nameof(SentakkiModHardRockStrings.JudgementMode), nameof(SentakkiModHardRockStrings.JudgementModeDescription))] - public Bindable judgementMode { get; } = new Bindable(SentakkiJudgementMode.Maji); + public Bindable JudgementMode { get; } = new Bindable(SentakkiJudgementMode.Maji); [SettingSource(typeof(SentakkiModHardRockStrings), nameof(SentakkiModHardRockStrings.MinimumResult), nameof(SentakkiModHardRockStrings.MinimumResultDescription))] - public Bindable minimumValidResult { get; } = new Bindable(SentakkiHitResult.Good); + public Bindable MinimumValidResult { get; } = new Bindable(SentakkiHitResult.Good); public void ApplyToHitObject(HitObject hitObject) { @@ -35,8 +37,8 @@ public void ApplyToHitObject(HitObject hitObject) if (hitObject.HitWindows is not SentakkiHitWindows shw) return; - shw.MinimumHitResult = (HitResult)minimumValidResult.Value; - shw.JudgementMode = judgementMode.Value; + shw.MinimumHitResult = (HitResult)MinimumValidResult.Value; + shw.JudgementMode = JudgementMode.Value; } public enum SentakkiHitResult