From c9098d522e7305432753b737468e80253df3b414 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Sun, 3 Sep 2023 14:27:35 +0200 Subject: [PATCH] Rename all field relating to Ex to be consistent --- osu.Game.Rulesets.Sentakki/Mods/SentakkiModRelax.cs | 2 +- .../Objects/Drawables/DrawableHoldHead.cs | 2 +- .../Objects/Drawables/DrawableSentakkiHitObject.cs | 6 +++--- .../Objects/Drawables/DrawableTap.cs | 2 +- .../Objects/Drawables/DrawableTouch.cs | 2 +- .../Objects/Drawables/Pieces/ShadowPiece.cs | 8 ++++---- .../Objects/Drawables/Pieces/Slides/StarPiece.cs | 6 +++--- .../Objects/Drawables/Pieces/Touches/TouchGlowPiece.cs | 6 +++--- osu.Game.Rulesets.Sentakki/Objects/Hold.cs | 2 +- osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs | 8 ++++---- osu.Game.Rulesets.Sentakki/Objects/Slide.cs | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModRelax.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModRelax.cs index bc3922ba2..9e4e73b5e 100644 --- a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModRelax.cs +++ b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModRelax.cs @@ -24,7 +24,7 @@ public class SentakkiModRelax : Mod, IApplicableAfterBeatmapConversion public void ApplyToBeatmap(IBeatmap beatmap) { foreach (SentakkiHitObject ho in beatmap.HitObjects) - ho.ExState = true; + ho.Ex = true; } } } diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHoldHead.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHoldHead.cs index 57633f5ae..4671fb3d4 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHoldHead.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHoldHead.cs @@ -34,7 +34,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset) if (result == HitResult.None) return; - if (HitObject.ExState && result.IsHit()) + if (HitObject.Ex && result.IsHit()) result = Result.Judgement.MaxResult; ApplyResult(result); diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiHitObject.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiHitObject.cs index 84df6bd09..fe49679c0 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiHitObject.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiHitObject.cs @@ -48,13 +48,13 @@ protected override void LoadAsyncComplete() AnimationDuration.BindValueChanged(_ => queueTransformReset(), true); } - public Bindable ExModifierBindable = new Bindable(); + public Bindable ExBindable = new Bindable(); protected override void OnApply() { base.OnApply(); AccentColour.BindTo(HitObject.ColourBindable); - ExModifierBindable.BindTo(HitObject.ExStateBindable); + ExBindable.BindTo(HitObject.ExBindable); } protected void ApplyResult(HitResult result) @@ -67,7 +67,7 @@ protected override void OnFree() { base.OnFree(); AccentColour.UnbindFrom(HitObject.ColourBindable); - ExModifierBindable.UnbindFrom(HitObject.ExStateBindable); + ExBindable.UnbindFrom(HitObject.ExBindable); } protected override void Update() diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs index f37a7c5f1..3e557a3fb 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs @@ -91,7 +91,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset) if (result == HitResult.None) return; - if (HitObject.ExState && result.IsHit()) + if (HitObject.Ex && result.IsHit()) result = Result.Judgement.MaxResult; ApplyResult(result); diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs index 1170244e2..ac8b4cbb3 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs @@ -116,7 +116,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset) if (timeOffset < 0 && result != Result.Judgement.MaxResult) return; - if (ExModifierBindable.Value && result.IsHit()) + if (ExBindable.Value && result.IsHit()) result = Result.Judgement.MaxResult; ApplyResult(result); diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/ShadowPiece.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/ShadowPiece.cs index 90c79bc24..74d227050 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/ShadowPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/ShadowPiece.cs @@ -12,7 +12,7 @@ public partial class ShadowPiece : Container { private CircularContainer glowContainer; - private Bindable ExNoteBindable = new Bindable(true); + private Bindable ExBindable = new Bindable(true); private Bindable AccentColour = new Bindable(); private static readonly EdgeEffectParameters shadow_parameters = new EdgeEffectParameters @@ -43,16 +43,16 @@ public ShadowPiece() private void load(DrawableHitObject hitObject) { // Bind exnote - ExNoteBindable.BindTo(((DrawableSentakkiHitObject)hitObject).ExModifierBindable); + ExBindable.BindTo(((DrawableSentakkiHitObject)hitObject).ExBindable); AccentColour.BindTo(hitObject.AccentColour); AccentColour.BindValueChanged(_ => updateGlow()); - ExNoteBindable.BindValueChanged(_ => updateGlow(), true); + ExBindable.BindValueChanged(_ => updateGlow(), true); } private void updateGlow() { - if (!ExNoteBindable.Value) + if (!ExBindable.Value) { glowContainer.EdgeEffect = shadow_parameters; return; diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/StarPiece.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/StarPiece.cs index 356daefa9..ffee0e2c2 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/StarPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/StarPiece.cs @@ -13,7 +13,7 @@ public partial class StarPiece : CompositeDrawable { private Sprite glowTexture = null!; - private Bindable ExNoteBindable = new Bindable(); + private Bindable ExBindable = new Bindable(); public StarPiece() { @@ -44,8 +44,8 @@ private void load(TextureStore textures, DrawableHitObject? hitObject) return; // Bind exnote - ExNoteBindable.BindTo(((DrawableSentakkiHitObject)hitObject).ExModifierBindable); - ExNoteBindable.BindValueChanged(v => glowTexture.Colour = v.NewValue ? Color4.White : Color4.Black, true); + ExBindable.BindTo(((DrawableSentakkiHitObject)hitObject).ExBindable); + ExBindable.BindValueChanged(v => glowTexture.Colour = v.NewValue ? Color4.White : Color4.Black, true); } } } diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchGlowPiece.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchGlowPiece.cs index d3d04fea0..b94f52888 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchGlowPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchGlowPiece.cs @@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Touches { public partial class TouchGlowPiece : CompositeDrawable { - private Bindable ExNoteBindable = new Bindable(); + private Bindable ExBindable = new Bindable(); public TouchGlowPiece() { @@ -42,8 +42,8 @@ private void load(TextureStore textures, DrawableHitObject? hitObject) return; // Bind exnote - ExNoteBindable.BindTo(((DrawableSentakkiHitObject)hitObject).ExModifierBindable); - ExNoteBindable.BindValueChanged(v => Colour = v.NewValue ? Color4.White : Color4.Black, true); + ExBindable.BindTo(((DrawableSentakkiHitObject)hitObject).ExBindable); + ExBindable.BindValueChanged(v => Colour = v.NewValue ? Color4.White : Color4.Black, true); } } } diff --git a/osu.Game.Rulesets.Sentakki/Objects/Hold.cs b/osu.Game.Rulesets.Sentakki/Objects/Hold.cs index 581ad6497..0e06cca52 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Hold.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Hold.cs @@ -43,7 +43,7 @@ protected override void CreateNestedHitObjects(CancellationToken cancellationTok Lane = Lane, Samples = nodeSamples.Any() ? nodeSamples.First() : new List(), ColourBindable = ColourBindable.GetBoundCopy(), - ExState = ExState + Ex = Ex }); } diff --git a/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs b/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs index 3eb0dc4e7..4a354cc89 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs @@ -35,12 +35,12 @@ public Color4 NoteColour set => ColourBindable.Value = value; } - public Bindable ExStateBindable = new Bindable(); + public Bindable ExBindable = new Bindable(); - public bool ExState + public bool Ex { - get => ExStateBindable.Value; - set => ExStateBindable.Value = value; + get => ExBindable.Value; + set => ExBindable.Value = value; } [JsonIgnore] diff --git a/osu.Game.Rulesets.Sentakki/Objects/Slide.cs b/osu.Game.Rulesets.Sentakki/Objects/Slide.cs index e3789850f..9759e85b1 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Slide.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Slide.cs @@ -47,7 +47,7 @@ protected override void CreateNestedHitObjects(CancellationToken cancellationTok StartTime = StartTime, Samples = NodeSamples.Any() ? NodeSamples.First() : new List(), Break = Break, - ExState = ExState + Ex = Ex }); createSlideBodies(); }