Skip to content

Commit

Permalink
Merge pull request #127 from LumpBloom7/RemovePerfectJudgment
Browse files Browse the repository at this point in the history 
Remove perfect judgement
  • Loading branch information
@LumpBloom7
LumpBloom7 authored Oct 2, 2020
2 parents 8a12b89 + 0d0d153 commit 168d366
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 37 deletions.
20 changes: 10 additions & 10 deletions osu.Game.Rulesets.Sentakki.Tests/Statistics/TestSceneJudgementChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public class TestSceneJudgementChart : OsuTestScene
private List<HitEvent> testevents = new List<HitEvent>
{
// Tap
new HitEvent(0,HitResult.Perfect,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Perfect,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Perfect,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Perfect,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Perfect,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Perfect,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Good,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Good,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Good,new Tap(),new Tap(), null),
Expand All @@ -30,7 +30,7 @@ public class TestSceneJudgementChart : OsuTestScene
new HitEvent(0,HitResult.Miss,new Tap(),new Tap(), null),
new HitEvent(0,HitResult.Miss,new Tap(),new Tap(), null),
// Holds
new HitEvent(0,HitResult.Perfect,new Hold(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Hold(),new Tap(), null),
// Touch
new HitEvent(0,HitResult.Good,new Touch(),new Tap(), null),
new HitEvent(0,HitResult.Good,new Touch(),new Tap(), null),
Expand All @@ -41,10 +41,10 @@ public class TestSceneJudgementChart : OsuTestScene
new HitEvent(0,HitResult.Meh,new Touch(),new Tap(), null),
new HitEvent(0,HitResult.Miss,new Touch(),new Tap(), null),
new HitEvent(0,HitResult.Miss,new Touch(),new Tap(), null),
new HitEvent(0,HitResult.Perfect,new Touch(),new Tap(), null),
new HitEvent(0,HitResult.Perfect,new Touch(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Touch(),new Tap(), null),
new HitEvent(0,HitResult.Great,new Touch(),new Tap(), null),
// Breaks
new HitEvent(0,HitResult.Perfect,new Tap(){IsBreak = true},new Tap(), null),
new HitEvent(0,HitResult.Great,new Tap(){IsBreak = true},new Tap(), null),
new HitEvent(0,HitResult.Good,new Tap(){IsBreak = true},new Tap(), null),
new HitEvent(0,HitResult.Good,new Tap(){IsBreak = true},new Tap(), null),
new HitEvent(0,HitResult.Good,new Tap(){IsBreak = true},new Tap(), null),
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/Judgements/SentakkiJudgement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ namespace osu.Game.Rulesets.Sentakki.Judgements
{
public class SentakkiJudgement : Judgement
{
public override HitResult MaxResult => HitResult.Perfect;
public override HitResult MaxResult => HitResult.Great;
}
}
8 changes: 3 additions & 5 deletions osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHold.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,12 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
double totalHoldRatio = TotalHoldTime / ((IHasDuration)HitObject).Duration;
HitResult result;

if (totalHoldRatio >= .9)
result = HitResult.Perfect;
else if (totalHoldRatio >= .75)
if (totalHoldRatio >= .75)
result = HitResult.Great;
else if (totalHoldRatio >= .5)
result = HitResult.Good;
else if (totalHoldRatio >= .25)
result = HitResult.Ok;
result = HitResult.Meh;
else
result = HitResult.Miss;

Expand All @@ -157,7 +155,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
if (!headContainer.First().Result.HasResult)
headContainer.First().MissForcefully();

if (Auto) result = HitResult.Perfect;
if (Auto) result = HitResult.Great;
ApplyResult(r => r.Type = result);
}
}
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHoldHead.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
if (!userTriggered)
{
if (Auto && timeOffset > 0)
ApplyResult(r => r.Type = HitResult.Perfect);
ApplyResult(r => r.Type = HitResult.Great);

if (!HitObject.HitWindows.CanBeHit(timeOffset))
ApplyResult(r => r.Type = HitResult.Miss);
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiHitObject.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ protected virtual void InvalidateTransforms()
public override void PlaySamples()
{
base.PlaySamples();
if (PlayBreakSample && breakSound != null && Result.Type == HitResult.Perfect && breakEnabled.Value && (!gameplayClock?.IsSeeking ?? false))
if (PlayBreakSample && breakSound != null && Result.Type == HitResult.Great && breakEnabled.Value && (!gameplayClock?.IsSeeking ?? false))
{
const float balance_adjust_amount = 0.4f;
breakSound.Balance.Value = balance_adjust_amount * (userPositionalHitSounds.Value ? SamplePlaybackPosition - 0.5f : 0);
Expand Down
5 changes: 0 additions & 5 deletions osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiJudgement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ private void load(SentakkiRulesetConfigManager settings)
{
switch (Result.Type)
{
case HitResult.Perfect:
sentakkiJudgementText.Text = "Critical";
sentakkiJudgementText.Colour = Color4.Yellow;
break;

case HitResult.Great:
sentakkiJudgementText.Text = "Perfect";
break;
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideBody.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
{
SlideNodes.Last().ForceJudgement(false);
if (SlideNodes.Count(node => !node.Result.IsHit) <= 2)
ApplyResult(r => r.Type = HitResult.Good);
ApplyResult(r => r.Type = HitResult.Meh);
else
ApplyResult(r => r.Type = HitResult.Miss);
}
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideNode.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected override void LoadComplete()

OnNewResult += (DrawableHitObject hitObject, JudgementResult result) =>
{
hitPreviousNodes(result.Type >= HitResult.Perfect);
hitPreviousNodes(result.Type >= HitResult.Great);
if (result.IsHit)
Slide.Slidepath.Progress = (HitObject as SlideBody.SlideNode).Progress;
};
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
if (!userTriggered)
{
if (Auto && timeOffset > 0)
ApplyResult(r => r.Type = HitResult.Perfect);
ApplyResult(r => r.Type = HitResult.Great);

if (!HitObject.HitWindows.CanBeHit(timeOffset))
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
if (!userTriggered || AutoTouch)
{
if ((Auto || AutoTouch) && timeOffset > 0)
ApplyResult(r => r.Type = HitResult.Perfect);
ApplyResult(r => r.Type = HitResult.Great);

if (!HitObject.HitWindows.CanBeHit(timeOffset))
ApplyResult(r => r.Type = HitResult.Miss);
Expand Down
6 changes: 2 additions & 4 deletions osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouchHold.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,12 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)

HitResult resultType;

if (result >= .9)
resultType = HitResult.Perfect;
else if (result >= .75)
if (result >= .75)
resultType = HitResult.Great;
else if (result >= .5)
resultType = HitResult.Good;
else if (result >= .25)
resultType = HitResult.Ok;
resultType = HitResult.Meh;
else
resultType = HitResult.Miss;

Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Sentakki/Scoring/SentakkiHitWindows.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ public override bool IsHitResultAllowed(HitResult result)
{
switch (result)
{
case HitResult.Perfect:
case HitResult.Great:
case HitResult.Good:
case HitResult.Meh:
Expand All @@ -24,7 +23,6 @@ public override bool IsHitResultAllowed(HitResult result)
new DifficultyRange(HitResult.Meh, 144, 144, 144),
new DifficultyRange(HitResult.Good, 96, 96, 96),
new DifficultyRange(HitResult.Great, 48, 48, 48),
new DifficultyRange(HitResult.Perfect, 16, 16, 16)
};
}
}
3 changes: 1 addition & 2 deletions osu.Game.Rulesets.Sentakki/Scoring/SentakkiSlideHitWindows.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ public class SentakkiSlideHitWindows : SentakkiHitWindows
new DifficultyRange(HitResult.Miss, 576, 576, 576),
new DifficultyRange(HitResult.Meh, 576, 576, 576),
new DifficultyRange(HitResult.Good, 416, 416, 416),
new DifficultyRange(HitResult.Great, 288, 288, 288),
new DifficultyRange(HitResult.Perfect, 224, 224, 224)
new DifficultyRange(HitResult.Great, 288, 288, 288)
};
}
}
1 change: 0 additions & 1 deletion osu.Game.Rulesets.Sentakki/Scoring/SentakkiTouchHitWindows.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ public class SentakkiTouchHitWindows : SentakkiHitWindows
new DifficultyRange(HitResult.Meh, 288, 288, 288),
new DifficultyRange(HitResult.Good, 240, 240, 240),
new DifficultyRange(HitResult.Great, 192, 192, 192),
new DifficultyRange(HitResult.Perfect, 144, 144, 144)
};
}
}
1 change: 0 additions & 1 deletion osu.Game.Rulesets.Sentakki/Statistics/JudgementChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ private void load(OsuColour colours)
{
switch (e.Result)
{
case HitResult.Perfect:
case HitResult.Great:
++GreatCount;
goto case HitResult.Good;
Expand Down

0 comments on commit 168d366

Please sign in to comment.