sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename more judgement-related methods to "result"

Browse Source
This commit is contained in:
smoogipoo
2018-08-06 11:31:46 +09:00
parent ab642b563f
commit 741ec0021e
23 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
View File

@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
MainPiece.FadeAccent(newColour, 100);
}
protected override void CheckForJudgements(bool userTriggered, double timeOffset)
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
if (userTriggered)
return;
@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
{
}
protected override void CheckForJudgements(bool userTriggered, double timeOffset)
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
if (!MainObject.Judged)
return;

8
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
View File

@ -17,14 +17,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
FillMode = FillMode.Fit;
}
public override bool DisplayJudgement => false;
public override bool DisplayResult => false;
protected override TaikoPiece CreateMainPiece() => new TickPiece
{
Filled = HitObject.FirstTick
};
protected override void CheckForJudgements(bool userTriggered, double timeOffset)
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
if (!userTriggered)
{
@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
}
}
public override bool OnPressed(TaikoAction action) => UpdateJudgement(true);
public override bool OnPressed(TaikoAction action) => UpdateResult(true);
protected override DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => new StrongHandler(hitObject, this);
@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
{
}
protected override void CheckForJudgements(bool userTriggered, double timeOffset)
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
if (!MainObject.Judged)
return;

10
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
FillMode = FillMode.Fit;
}
protected override void CheckForJudgements(bool userTriggered, double timeOffset)
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
if (!userTriggered)
{
@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
validActionPressed = HitActions.Contains(action);
// Only count this as handled if the new judgement is a hit
var result = UpdateJudgement(true);
var result = UpdateResult(true);
if (IsHit)
HitAction = action;
@ -144,11 +144,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
{
}
protected override void CheckForJudgements(bool userTriggered, double timeOffset)
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
if (!MainObject.Result.HasResult)
{
base.CheckForJudgements(userTriggered, timeOffset);
base.CheckForResult(userTriggered, timeOffset);
return;
}
@ -183,7 +183,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
if (!MainObject.HitActions.Contains(action))
return false;
return UpdateJudgement(true);
return UpdateResult(true);
}
}
}

2
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongHandler.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
/// </summary>
public abstract class DrawableStrongHandler : DrawableTaikoHitObject
{
public override bool DisplayJudgement => false;
public override bool DisplayResult => false;
public readonly DrawableHitObject MainObject;

4
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
View File

@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
Width *= Parent.RelativeChildSize.X;
}
protected override void CheckForJudgements(bool userTriggered, double timeOffset)
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
if (userTriggered)
{
@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
return false;
lastWasCentre = isCentre;
UpdateJudgement(true);
UpdateResult(true);
return true;
}

4
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
{
public class DrawableSwellTick : DrawableTaikoHitObject
{
public override bool DisplayJudgement => false;
public override bool DisplayResult => false;
public DrawableSwellTick(TaikoHitObject hitObject)
: base(hitObject)
@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
public void TriggerResult(HitResult type) => ApplyResult(r => r.Type = type);
protected override void CheckForJudgements(bool userTriggered, double timeOffset)
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
}