From 6530b38987980938a3403377014a1e9473efd570 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2020 10:29:26 +0000 Subject: [PATCH 1/3] Bump ppy.osu.Game from 2020.1031.0 to 2020.1114.0 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2020.1031.0 to 2020.1114.0. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2020.1031.0...2020.1114.0) Signed-off-by: dependabot[bot] --- osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj b/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj index a216c6a..7ef4407 100644 --- a/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj +++ b/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj @@ -10,6 +10,6 @@ osu.Game.Rulesets.Hishigata - + From 82e78f086de275977feb23a3f4564c67ffa8e9c4 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Sat, 14 Nov 2020 12:16:35 +0100 Subject: [PATCH 2/3] Fix breaking changes --- .../Objects/Drawables/DrawableHishigataHitObject.cs | 8 +++++++- osu.Game.Rulesets.Hishigata/UI/Lane.cs | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Hishigata/Objects/Drawables/DrawableHishigataHitObject.cs b/osu.Game.Rulesets.Hishigata/Objects/Drawables/DrawableHishigataHitObject.cs index 80d5deb..f767447 100644 --- a/osu.Game.Rulesets.Hishigata/Objects/Drawables/DrawableHishigataHitObject.cs +++ b/osu.Game.Rulesets.Hishigata/Objects/Drawables/DrawableHishigataHitObject.cs @@ -52,6 +52,12 @@ protected override void CheckForResult(bool userTriggered, double timeOffset) ApplyResult(r => r.Type = r.Judgement.MinResult); } + protected override void LoadComplete() + { + base.LoadComplete(); + LifetimeStart = HitObject.StartTime - InitialLifetimeOffset; + } + protected override void UpdateInitialTransforms() { if (HitObject.IsFeign) @@ -63,7 +69,7 @@ protected override void UpdateInitialTransforms() note.MoveTo(new Vector2(0, -80), HitObject.TimePreempt); } - protected override void UpdateStateTransforms(ArmedState state) + protected override void UpdateHitStateTransforms(ArmedState state) { double animationDuration = HitObject.TimePreempt / 6; diff --git a/osu.Game.Rulesets.Hishigata/UI/Lane.cs b/osu.Game.Rulesets.Hishigata/UI/Lane.cs index e62dce3..b95be49 100644 --- a/osu.Game.Rulesets.Hishigata/UI/Lane.cs +++ b/osu.Game.Rulesets.Hishigata/UI/Lane.cs @@ -1,3 +1,4 @@ +using System; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Pooling; @@ -39,6 +40,7 @@ private void onNewResult(DrawableHitObject h, JudgementResult judgement) { if (judgement.IsHit) hitExplosionContainer.Add(hitExplosionPool.Get(e => e.Apply(h as DrawableHishigataHitObject))); + Console.WriteLine(judgement.Type.ToString()); } public class LaneReceptor : CompositeDrawable From f3f3182787618283dce8cabfe0ee5fda303d9a68 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Sat, 14 Nov 2020 12:32:02 +0100 Subject: [PATCH 3/3] Add Lanes as a nested playfield as well --- osu.Game.Rulesets.Hishigata/UI/HishigataPlayfield.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game.Rulesets.Hishigata/UI/HishigataPlayfield.cs b/osu.Game.Rulesets.Hishigata/UI/HishigataPlayfield.cs index 0d49562..939839e 100644 --- a/osu.Game.Rulesets.Hishigata/UI/HishigataPlayfield.cs +++ b/osu.Game.Rulesets.Hishigata/UI/HishigataPlayfield.cs @@ -43,6 +43,7 @@ public HishigataPlayfield() }; lanes.Add(lane); playfieldContainer.Add(lane); + AddNested(lane); } }