Allow Touch notes to have BREAK modifier

osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapProcessor.cs

@@ -32,7 +32,7 @@ public override void PostProcess()
  {
  Color4 noteColor = hitObject.DefaultNoteColour;
 
- if (hitObject is SentakkiLanedHitObject laned && laned.Break)
+ if (hitObject is IBreakNote breakNote && breakNote.Break)
  noteColor = breakColor;
  else if (isTwin)
  noteColor = twinColor;

osu.Game.Rulesets.Sentakki/Mods/SentakkiModRelax.cs

@@ -25,7 +25,8 @@ public class SentakkiModRelax : Mod, IApplicableAfterBeatmapConversion
  public void ApplyToBeatmap(IBeatmap beatmap)
  {
  foreach (SentakkiHitObject ho in beatmap.HitObjects)
- ho.Ex = true;
+ if (ho is IExNote exNote)
+ exNote.Ex = true;
  }
  }
 }

osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiHitObject.cs

@@ -1,12 +1,14 @@
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Sentakki.Judgements;
 using osu.Game.Rulesets.Sentakki.UI;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Sentakki.Objects.Drawables
 {
@@ -25,7 +27,13 @@ public bool Auto
  // Used for the animation update
  protected readonly Bindable<double> AnimationDuration = new Bindable<double>(1000);
 
- protected override float SamplePlaybackPosition => (Position.X / (SentakkiPlayfield.INTERSECTDISTANCE * 2)) + 0.5f;
+ protected override float SamplePlaybackPosition => Position.X / (SentakkiPlayfield.INTERSECTDISTANCE * 2);
+
+ private PausableSkinnableSound breakSample = null!;
+
+ private Container<DrawableScorePaddingObject> scorePaddingObjects = null!;
+
+ private Container<DrawableScoreBonusObject> scoreBonusObjects = null!;
 
  public DrawableSentakkiHitObject()
  : this(null)
@@ -37,6 +45,32 @@ public DrawableSentakkiHitObject(SentakkiHitObject? hitObject = null)
  {
  }
 
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ AddRangeInternal(new Drawable[]
+ {
+ scorePaddingObjects = new Container<DrawableScorePaddingObject>(),
+ scoreBonusObjects = new Container<DrawableScoreBonusObject>(),
+ breakSample = new PausableSkinnableSound(),
+ });
+ }
+
+ protected override void LoadSamples()
+ {
+ base.LoadSamples();
+
+ breakSample.Samples = HitObject.CreateBreakSample();
+ }
+
+ public override void PlaySamples()
+ {
+ base.PlaySamples();
+
+ breakSample.Balance.Value = CalculateSamplePlaybackBalance(SamplePlaybackPosition);
+ breakSample.Play();
+ }
+
  [Resolved]
  protected DrawableSentakkiRuleset? DrawableSentakkiRuleset { get; private set; }
 
@@ -52,7 +86,46 @@ protected override void OnApply()
  {
  base.OnApply();
  AccentColour.BindTo(HitObject.ColourBindable);
- ExBindable.BindTo(HitObject.ExBindable);
+ ExBindable.Value = (HitObject as IExNote)?.Ex ?? false;
+ }
+
+ protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
+ {
+ switch (hitObject)
+ {
+ case ScorePaddingObject p:
+ return new DrawableScorePaddingObject(p);
+
+ case ScoreBonusObject b:
+ return new DrawableScoreBonusObject(b);
+ }
+
+ return base.CreateNestedHitObject(hitObject);
+ }
+
+ protected override void AddNestedHitObject(DrawableHitObject hitObject)
+ {
+ switch (hitObject)
+ {
+ case DrawableScorePaddingObject p:
+ scorePaddingObjects.Add(p);
+ break;
+
+ case DrawableScoreBonusObject b:
+ scoreBonusObjects.Add(b);
+ break;
+
+ default:
+ base.AddNestedHitObject(hitObject);
+ break;
+ }
+ }
+
+ protected override void ClearNestedHitObjects()
+ {
+ base.ClearNestedHitObjects();
+ scorePaddingObjects.Clear(false);
+ scoreBonusObjects.Clear(false);
  }
 
  protected override JudgementResult CreateResult(Judgement judgement) => new SentakkiJudgementResult(HitObject, judgement);
@@ -70,14 +143,22 @@ protected new void ApplyResult(HitResult result)
  SentakkiJudgementResult.Critical = false;
  }
 
+ // Judge the scoreBonus
+ foreach (var bonusObject in scoreBonusObjects)
+ bonusObject.TriggerResult();
+
+ // Also give Break note score padding a judgement
+ for (int i = 0; i < scorePaddingObjects.Count; ++i)
+ scorePaddingObjects[^(i + 1)].ApplyResult(result);
+
  base.ApplyResult(result);
  }
 
  protected override void OnFree()
  {
  base.OnFree();
  AccentColour.UnbindFrom(HitObject.ColourBindable);
- ExBindable.UnbindFrom(HitObject.ExBindable);
+ breakSample.ClearSamples();
  }
 
  protected override void Update()

osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiLanedHitObject.cs

@@ -5,7 +5,6 @@
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Sentakki.UI;
-using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Sentakki.Objects.Drawables
 {
@@ -16,12 +15,6 @@ public partial class DrawableSentakkiLanedHitObject : DrawableSentakkiHitObject
  protected override float SamplePlaybackPosition =>
  (SentakkiExtensions.GetPositionAlongLane(SentakkiPlayfield.INTERSECTDISTANCE, HitObject.Lane).X / (SentakkiPlayfield.INTERSECTDISTANCE * 2)) + .5f;
 
- private PausableSkinnableSound breakSample = null!;
-
- private Container<DrawableScorePaddingObject> scorePaddingObjects = null!;
-
- private Container<DrawableScoreBonusObject> scoreBonusObjects = null!;
-
  public DrawableSentakkiLanedHitObject(SentakkiLanedHitObject? hitObject)
  : base(hitObject)
  {
@@ -30,88 +23,8 @@ public DrawableSentakkiLanedHitObject(SentakkiLanedHitObject? hitObject)
  [BackgroundDependencyLoader]
  private void load()
  {
- AddRangeInternal(new Drawable[]
- {
- scorePaddingObjects = new Container<DrawableScorePaddingObject>(),
- scoreBonusObjects = new Container<DrawableScoreBonusObject>(),
- breakSample = new PausableSkinnableSound(),
- });
-
  if (DrawableSentakkiRuleset is not null)
  AnimationDuration.BindTo(DrawableSentakkiRuleset?.AdjustedAnimDuration);
  }
-
- protected override void LoadSamples()
- {
- base.LoadSamples();
-
- breakSample.Samples = HitObject.CreateBreakSample();
- }
-
- public override void PlaySamples()
- {
- base.PlaySamples();
-
- breakSample.Balance.Value = CalculateSamplePlaybackBalance(SamplePlaybackPosition);
- breakSample.Play();
- }
-
- protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
- {
- switch (hitObject)
- {
- case ScorePaddingObject p:
- return new DrawableScorePaddingObject(p);
-
- case ScoreBonusObject b:
- return new DrawableScoreBonusObject(b);
- }
-
- return base.CreateNestedHitObject(hitObject);
- }
-
- protected override void AddNestedHitObject(DrawableHitObject hitObject)
- {
- switch (hitObject)
- {
- case DrawableScorePaddingObject p:
- scorePaddingObjects.Add(p);
- break;
-
- case DrawableScoreBonusObject b:
- scoreBonusObjects.Add(b);
- break;
-
- default:
- base.AddNestedHitObject(hitObject);
- break;
- }
- }
-
- protected override void ClearNestedHitObjects()
- {
- base.ClearNestedHitObjects();
- scorePaddingObjects.Clear(false);
- scoreBonusObjects.Clear(false);
- }
-
- protected override void OnFree()
- {
- base.OnFree();
- breakSample.ClearSamples();
- }
-
- protected new void ApplyResult(HitResult hitResult)
- {
- // Judge the scoreBonus
- foreach (var bonusObject in scoreBonusObjects)
- bonusObject.TriggerResult();
-
- // Also give Break note score padding a judgement
- for (int i = 0; i < scorePaddingObjects.Count; ++i)
- scorePaddingObjects[^(i + 1)].ApplyResult(hitResult);
-
- base.ApplyResult(hitResult);
- }
  }
 }

osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs

@@ -115,7 +115,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
  if (timeOffset < 0 && result is not HitResult.Perfect)
  return;
 
- if (result < HitResult.Perfect && ExBindable.Value && result.IsHit())
+ if (result < HitResult.Perfect && HitObject.Ex && result.IsHit())
  result = Result.Judgement.MaxResult;
 
  ApplyResult(result);

osu.Game.Rulesets.Sentakki/Objects/IBreakNote.cs

@@ -0,0 +1,14 @@
+using osu.Framework.Bindables;
+
+namespace osu.Game.Rulesets.Sentakki.Objects;
+
+public interface IBreakNote
+{
+ virtual bool NeedBreakSample => true;
+
+ virtual int BreakScoreWeighting => 5;
+
+ BindableBool BreakBindable { get; }
+
+ bool Break { get; set; }
+}

osu.Game.Rulesets.Sentakki/Objects/IExNote.cs

@@ -0,0 +1,6 @@
+namespace osu.Game.Rulesets.Sentakki.Objects;
+
+public interface IExNote
+{
+ bool Ex { get; set; }
+}