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

Rename IgnoreJudgement -> OnlyJudgeNestedObjects

Browse Source
This commit is contained in:
smoogipoo 2021-02-10 18:46:26 +09:00
parent 9519b7f7c1
commit 2fcc4213e1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Mods
switch (hitObject) switch (hitObject)
{ {
case Slider slider: case Slider slider:
slider.IgnoreJudgement = !NoSliderHeadAccuracy.Value; slider.OnlyJudgeNestedObjects = !NoSliderHeadAccuracy.Value;
foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>()) foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
head.JudgeAsNormalHitCircle = !NoSliderHeadAccuracy.Value; head.JudgeAsNormalHitCircle = !NoSliderHeadAccuracy.Value;

4
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
public SliderBall Ball { get; private set; } public SliderBall Ball { get; private set; }
public SkinnableDrawable Body { get; private set; } public SkinnableDrawable Body { get; private set; }
public override bool DisplayResult => !HitObject.IgnoreJudgement; public override bool DisplayResult => !HitObject.OnlyJudgeNestedObjects;
private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody; private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
@ -250,7 +250,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
if (userTriggered || Time.Current < HitObject.EndTime) if (userTriggered || Time.Current < HitObject.EndTime)
return; return;
if (HitObject.IgnoreJudgement) if (HitObject.OnlyJudgeNestedObjects)
{ {
ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult); ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
return; return;

8
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -115,10 +115,10 @@ namespace osu.Game.Rulesets.Osu.Objects
public double TickDistanceMultiplier = 1; public double TickDistanceMultiplier = 1;
/// <summary> /// <summary>
/// Whether this <see cref="Slider"/>'s judgement should be ignored. /// Whether this <see cref="Slider"/>'s judgement is fully handled by its nested <see cref="HitObject"/>s.
/// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of ticks hit. /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of nested <see cref="HitObject"/>s hit.
/// </summary> /// </summary>
public bool IgnoreJudgement = true; public bool OnlyJudgeNestedObjects = true;
[JsonIgnore] [JsonIgnore]
public SliderHeadCircle HeadCircle { get; protected set; } public SliderHeadCircle HeadCircle { get; protected set; }
@ -239,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects
HeadCircle.Samples = this.GetNodeSamples(0); HeadCircle.Samples = this.GetNodeSamples(0);
} }
public override Judgement CreateJudgement() => IgnoreJudgement ? new OsuIgnoreJudgement() : new OsuJudgement(); public override Judgement CreateJudgement() => OnlyJudgeNestedObjects ? new OsuIgnoreJudgement() : new OsuJudgement();
protected override HitWindows CreateHitWindows() => HitWindows.Empty; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }