h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 07:43:00 +08:00
Code Issues Releases Wiki Activity

Merge pull request #25100 from bdach/large-tick-mania-begone

Browse Source 
Remove remaining usages of `LargeTick{Hit,Miss}` in mania
This commit is contained in:
Dean Herbert 2023-10-12 19:13:10 +09:00 committed by GitHub
commit 45db4ab412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
View File

@ -12,12 +12,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
{
switch (result)
{
case HitResult.LargeTickHit:
return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
case HitResult.LargeTickMiss:
return -DEFAULT_MAX_HEALTH_INCREASE * 0.1;
case HitResult.Meh:
return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;

13
osu.Game.Rulesets.Mania/ManiaRuleset.cs
View File

@ -385,22 +385,9 @@ namespace osu.Game.Rulesets.Mania
HitResult.Good,
HitResult.Ok,
HitResult.Meh,
HitResult.LargeTickHit,
};
}
public override LocalisableString GetDisplayNameForHitResult(HitResult result)
{
switch (result)
{
case HitResult.LargeTickHit:
return "hold tick";
}
return base.GetDisplayNameForHitResult(result);
}
public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
{
new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)

4
osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
View File

@ -11,8 +11,8 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Testing;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Judgements;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play.HUD.JudgementCounter;
@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
};
});
protected override Ruleset CreateRuleset() => new ManiaRuleset();
protected override Ruleset CreateRuleset() => new OsuRuleset();
private void applyOneJudgement(HitResult result)
{