Skip to content

Commit

Permalink
Merge pull request #499 from LumpBloom7/Extended-mod-info
Browse files Browse the repository at this point in the history
Add extended mod info
  • Loading branch information
LumpBloom7 authored Oct 8, 2023
2 parents 9fe65b0 + b50418d commit 9851526
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
10 changes: 6 additions & 4 deletions osu.Game.Rulesets.Sentakki/Mods/SentakkiModHardRock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ 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
// The only reason we still inherit from ModHardRock is to be able to use their localized strings
}

[SettingSource(typeof(SentakkiModHardRockStrings), nameof(SentakkiModHardRockStrings.JudgementMode), nameof(SentakkiModHardRockStrings.JudgementModeDescription))]
public Bindable<SentakkiJudgementMode> judgementMode { get; } = new Bindable<SentakkiJudgementMode>(SentakkiJudgementMode.Maji);
public Bindable<SentakkiJudgementMode> JudgementMode { get; } = new Bindable<SentakkiJudgementMode>(SentakkiJudgementMode.Maji);

[SettingSource(typeof(SentakkiModHardRockStrings), nameof(SentakkiModHardRockStrings.MinimumResult), nameof(SentakkiModHardRockStrings.MinimumResultDescription))]
public Bindable<SentakkiHitResult> minimumValidResult { get; } = new Bindable<SentakkiHitResult>(SentakkiHitResult.Good);
public Bindable<SentakkiHitResult> MinimumValidResult { get; } = new Bindable<SentakkiHitResult>(SentakkiHitResult.Good);

public void ApplyToHitObject(HitObject hitObject)
{
Expand All @@ -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
Expand Down

0 comments on commit 9851526

Please sign in to comment.