-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove osu!mania hold note ticks #25062
Merged
Merged
Changes from 13 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
5241634
Add one more test
smoogipoo c60f13d
Remove mania hold note ticks
smoogipoo 0fd445f
Adjust test to fail
smoogipoo 5362902
Merge branch 'master' into remove-hold-note-ticks
smoogipoo b2d9c95
Remove HoldNoteTickJudgement
smoogipoo 9415fe4
Add mania hold note body + combo break judgement
smoogipoo 65ac617
Actually validate judgements
smoogipoo d988ef9
Revert functional change
smoogipoo f0da7f0
Actually use the judgement
smoogipoo 3267021
Update HitResult helpers with new judgement
smoogipoo b65c700
Add test for the result
smoogipoo e874ec8
Remove unused usings
smoogipoo 7211c88
Make combo assertion actually work as expected
smoogipoo 594bcc2
Apply suggestion to condense method
smoogipoo 89a3be1
Add validation test
smoogipoo 04ce223
Remove pairings that shouldn't be valid
smoogipoo 9419264
Fix tests
smoogipoo 8dc9453
Apply some xmldoc and structural changes
peppy 18d20ca
Adjust xmldoc for readability
smoogipoo a1a46e5
Move validation to DHO.ApplyResult()
smoogipoo 3f29f27
Assign empty hit windows to `HoldNoteBody`
bdach 041318e
Assign red colour to `ComboBreak` hit result
bdach 063623b
Merge branch 'master' into remove-hold-note-ticks
bdach File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
osu.Game.Rulesets.Mania/Judgements/HoldNoteBodyJudgement.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
// See the LICENCE file in the repository root for full licence text. | ||
|
||
using osu.Game.Rulesets.Scoring; | ||
|
||
namespace osu.Game.Rulesets.Mania.Judgements | ||
{ | ||
public class HoldNoteBodyJudgement : ManiaJudgement | ||
{ | ||
public override HitResult MaxResult => HitResult.IgnoreHit; | ||
public override HitResult MinResult => HitResult.ComboBreak; | ||
} | ||
} |
12 changes: 0 additions & 12 deletions
12
osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
// See the LICENCE file in the repository root for full licence text. | ||
|
||
#nullable disable | ||
|
||
namespace osu.Game.Rulesets.Mania.Objects.Drawables | ||
{ | ||
public partial class DrawableHoldNoteBody : DrawableManiaHitObject<HoldNoteBody> | ||
{ | ||
public bool HasHoldBreak => AllJudged && !IsHit; | ||
|
||
public override bool DisplayResult => false; | ||
|
||
public DrawableHoldNoteBody() | ||
: this(null) | ||
{ | ||
} | ||
|
||
public DrawableHoldNoteBody(HoldNoteBody hitObject) | ||
: base(hitObject) | ||
{ | ||
} | ||
|
||
internal void TriggerResult(bool hit) | ||
{ | ||
if (!AllJudged) | ||
ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult); | ||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider this temporary for now.
DrawableHitObject
is not properly annotated for its nullable ctor argument, and I don't want to usenull!
in this case.