Rename all field relating to Ex to be consistent

LumpBloom7 · Sep 3, 2023 · c9098d5 · c9098d5
1 parent 224b32e
commit c9098d5
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git 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
@@ -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
@@ -48,13 +48,13 @@ protected override void LoadAsyncComplete()
             AnimationDuration.BindValueChanged(_ => queueTransformReset(), true);
         }
 
-        public Bindable<bool> ExModifierBindable = new Bindable<bool>();
+        public Bindable<bool> ExBindable = new Bindable<bool>();
 
         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
@@ -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
@@ -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
@@ -12,7 +12,7 @@ public partial class ShadowPiece : Container
     {
         private CircularContainer glowContainer;
 
-        private Bindable<bool> ExNoteBindable = new Bindable<bool>(true);
+        private Bindable<bool> ExBindable = new Bindable<bool>(true);
         private Bindable<Color4> AccentColour = new Bindable<Color4>();
 
         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
@@ -13,7 +13,7 @@ public partial class StarPiece : CompositeDrawable
     {
         private Sprite glowTexture = null!;
 
-        private Bindable<bool> ExNoteBindable = new Bindable<bool>();
+        private Bindable<bool> ExBindable = new Bindable<bool>();
 
         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
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Touches
 {
     public partial class TouchGlowPiece : CompositeDrawable
     {
-        private Bindable<bool> ExNoteBindable = new Bindable<bool>();
+        private Bindable<bool> ExBindable = new Bindable<bool>();
 
         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
@@ -43,7 +43,7 @@ protected override void CreateNestedHitObjects(CancellationToken cancellationTok
                 Lane = Lane,
                 Samples = nodeSamples.Any() ? nodeSamples.First() : new List<HitSampleInfo>(),
                 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
@@ -35,12 +35,12 @@ public Color4 NoteColour
             set => ColourBindable.Value = value;
         }
 
-        public Bindable<bool> ExStateBindable = new Bindable<bool>();
+        public Bindable<bool> ExBindable = new Bindable<bool>();
 
-        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
@@ -47,7 +47,7 @@ protected override void CreateNestedHitObjects(CancellationToken cancellationTok
                 StartTime = StartTime,
                 Samples = NodeSamples.Any() ? NodeSamples.First() : new List<HitSampleInfo>(),
                 Break = Break,
-                ExState = ExState
+                Ex = Ex
             });
             createSlideBodies();
         }