diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs index cdeaafde10..f63d6c2673 100644 --- a/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs +++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs @@ -16,9 +16,6 @@ public void ApplyToDrawableRuleset(DrawableRuleset drawableRules { var drawableTaikoRuleset = (DrawableTaikoRuleset)drawableRuleset; drawableTaikoRuleset.LockPlayfieldAspectRange.Value = false; - - var playfield = (TaikoPlayfield)drawableRuleset.Playfield; - playfield.ClassicHitTargetPosition.Value = true; } public void ApplyToDrawableHitObject(DrawableHitObject drawable) diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs index 95907bcb8b..0510f08068 100644 --- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs +++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Linq; using osu.Framework.Allocation; -using osu.Framework.Bindables; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Primitives; @@ -33,11 +32,6 @@ public partial class TaikoPlayfield : ScrollingPlayfield public const float INPUT_DRUM_WIDTH = 180f; - /// - /// Whether the hit target should be nudged further towards the left area, matching the stable "classic" position. - /// - public Bindable ClassicHitTargetPosition = new BindableBool(); - public Container UnderlayElements { get; private set; } = null!; private Container hitExplosionContainer = null!; @@ -62,6 +56,7 @@ public partial class TaikoPlayfield : ScrollingPlayfield private void load(OsuColour colours) { const float hit_target_width = BASE_HEIGHT; + const float hit_target_offset = -24f; inputDrum = new InputDrum { @@ -106,6 +101,7 @@ private void load(OsuColour colours) Name = "Elements behind hit objects", RelativeSizeAxes = Axes.Y, Width = hit_target_width, + X = hit_target_offset, Children = new[] { new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.KiaiGlow), _ => Empty()) @@ -126,7 +122,7 @@ private void load(OsuColour colours) { Name = "Bar line content", RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Left = hit_target_width / 2 }, + Padding = new MarginPadding { Left = hit_target_width / 2 + hit_target_offset }, Children = new Drawable[] { UnderlayElements = new Container @@ -140,7 +136,7 @@ private void load(OsuColour colours) { Name = "Masked hit objects content", RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Left = hit_target_width / 2 }, + Padding = new MarginPadding { Left = hit_target_width / 2 + hit_target_offset }, Masking = true, Child = HitObjectContainer, }, @@ -148,7 +144,7 @@ private void load(OsuColour colours) { Name = "Overlay content", RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Left = hit_target_width / 2 }, + Padding = new MarginPadding { Left = hit_target_width / 2 + hit_target_offset }, Children = new Drawable[] { drumRollHitContainer = new DrumRollHitContainer(),