sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-19 12:37:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Allow simultaneous hitobjects

Browse Source
This commit is contained in:
smoogipoo 2020-03-19 17:44:32 +09:00
parent 1d680b7a00
commit f285b43a74
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu.Tests/TestSceneNoteLock.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Tests
new OsuReplayFrame { Time = time_first_circle, Position = position_second_circle, Actions = { OsuAction.LeftButton } } new OsuReplayFrame { Time = time_first_circle, Position = position_second_circle, Actions = { OsuAction.LeftButton } }
}); });
addJudgementAssert(HitResult.Miss, HitResult.Miss); addJudgementAssert(HitResult.Miss, HitResult.Great);
} }
/// <summary> /// <summary>

5
osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
View File

@ -94,8 +94,9 @@ namespace osu.Game.Rulesets.Osu.UI
if (lastObject == null) if (lastObject == null)
return true; return true;
// Ensure that either the last object has received a judgement or the hit time occurs after the last object's start time. // Ensure that either the last object has received a judgement or the hit time occurs at or after the last object's start time.
if (lastObject.Judged || Time.Current > lastObject.HitObject.StartTime) // Simultaneous hitobjects are allowed to be hit at the same time value to account for edge-cases such as Centipede.
if (lastObject.Judged || Time.Current >= lastObject.HitObject.StartTime)
return true; return true;
return false; return false;