mirror of
https://github.com/ppy/osu
synced 2024-12-15 11:25:29 +00:00
Merge pull request #827 from smoogipooo/mania-note-input
Implement mania note input
This commit is contained in:
commit
9cb614fee7
@ -1,10 +1,13 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using System;
|
||||||
using OpenTK.Graphics;
|
using OpenTK.Graphics;
|
||||||
using OpenTK.Input;
|
using OpenTK.Input;
|
||||||
using osu.Framework.Configuration;
|
using osu.Framework.Configuration;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Input;
|
||||||
|
using osu.Game.Rulesets.Mania.Judgements;
|
||||||
using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
|
using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
using osu.Game.Rulesets.Objects.Drawables;
|
||||||
|
|
||||||
@ -40,14 +43,53 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Update()
|
protected override void CheckJudgement(bool userTriggered)
|
||||||
{
|
{
|
||||||
if (Time.Current > HitObject.StartTime)
|
if (!userTriggered)
|
||||||
Colour = Color4.Green;
|
{
|
||||||
|
if (Judgement.TimeOffset > HitObject.HitWindows.Bad / 2)
|
||||||
|
Judgement.Result = HitResult.Miss;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
double offset = Math.Abs(Judgement.TimeOffset);
|
||||||
|
|
||||||
|
if (offset > HitObject.HitWindows.Miss / 2)
|
||||||
|
return;
|
||||||
|
|
||||||
|
ManiaHitResult? tmpResult = HitObject.HitWindows.ResultFor(offset);
|
||||||
|
|
||||||
|
if (tmpResult.HasValue)
|
||||||
|
{
|
||||||
|
Judgement.Result = HitResult.Hit;
|
||||||
|
Judgement.ManiaResult = tmpResult.Value;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
Judgement.Result = HitResult.Miss;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void UpdateState(ArmedState state)
|
protected override void UpdateState(ArmedState state)
|
||||||
{
|
{
|
||||||
|
switch (State)
|
||||||
|
{
|
||||||
|
case ArmedState.Hit:
|
||||||
|
Colour = Color4.Green;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
|
||||||
|
{
|
||||||
|
if (Judgement.Result != HitResult.None)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (args.Key != Key)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (args.Repeat)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return UpdateJudgement(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user