h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 04:17:25 +08:00
Code Issues Releases Wiki Activity

Merge pull request #27784 from bdach/double-skip-yet-again

Browse Source 
Fix some maps requiring multiple intro skips that weren't there on stable
This commit is contained in:
Dean Herbert 2024-04-04 04:14:03 +08:00 committed by GitHub
commit 2f64c16088
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 90 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithIntro.cs Normal file
View File

@ -0,0 +1,89 @@
// 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 System.Linq;
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Play;
using osu.Game.Storyboards;
using osuTK;
namespace osu.Game.Tests.Visual.Gameplay
{
public partial class TestSceneStoryboardWithIntro : PlayerTestScene
{
protected override bool HasCustomSteps => true;
protected override bool AllowFail => true;
protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
{
var beatmap = new Beatmap();
beatmap.HitObjects.Add(new HitCircle { StartTime = firstObjectStartTime });
return beatmap;
}
protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
{
return base.CreateWorkingBeatmap(beatmap, createStoryboard(storyboardStartTime));
}
private Storyboard createStoryboard(double startTime)
{
var storyboard = new Storyboard();
var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
sprite.TimelineGroup.Alpha.Add(Easing.None, startTime, 0, 0, 1);
storyboard.GetLayer("Background").Add(sprite);
return storyboard;
}
private double firstObjectStartTime;
private double storyboardStartTime;
[SetUpSteps]
public override void SetUpSteps()
{
base.SetUpSteps();
AddStep("enable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, true));
AddStep("set dim level to 0", () => LocalConfig.SetValue<double>(OsuSetting.DimLevel, 0));
AddStep("reset first hitobject time", () => firstObjectStartTime = 0);
AddStep("reset storyboard start time", () => storyboardStartTime = 0);
}
[TestCase(-5000, 0)]
[TestCase(-5000, 30000)]
public void TestStoryboardSingleSkip(double storyboardStart, double firstObject)
{
AddStep($"set storyboard start time to {storyboardStart}", () => storyboardStartTime = storyboardStart);
AddStep($"set first object start time to {firstObject}", () => firstObjectStartTime = firstObject);
CreateTest();
AddStep("skip", () => InputManager.Key(osuTK.Input.Key.Space));
AddAssert("skip performed", () => Player.ChildrenOfType<SkipOverlay>().Any(s => s.SkipCount == 1));
AddUntilStep("gameplay clock advanced", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(firstObject - 2000));
}
[Test]
public void TestStoryboardDoubleSkip()
{
AddStep("set storyboard start time to -11000", () => storyboardStartTime = -11000);
AddStep("set first object start time to 11000", () => firstObjectStartTime = 11000);
CreateTest();
AddStep("skip", () => InputManager.Key(osuTK.Input.Key.Space));
AddAssert("skip performed", () => Player.ChildrenOfType<SkipOverlay>().Any(s => s.SkipCount == 1));
AddUntilStep("gameplay clock advanced", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
AddStep("skip", () => InputManager.Key(osuTK.Input.Key.Space));
AddAssert("skip performed", () => Player.ChildrenOfType<SkipOverlay>().Any(s => s.SkipCount == 2));
AddUntilStep("gameplay clock advanced", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(9000));
}
}
}

2
osu.Game/Screens/Play/MasterGameplayClockContainer.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Screens.Play
double skipTarget = skipTargetTime - MINIMUM_SKIP_TIME;
if (GameplayClock.CurrentTime < 0 && skipTarget > 6000)
if (StartTime < -10000 && GameplayClock.CurrentTime < 0 && skipTarget > 6000)
// double skip exception for storyboards with very long intros
skipTarget = 0;