Skip to content

Commit

Permalink
Merge pull request #215 from naoei/dependabot/nuget/ppy.osu.Game-2021…
Browse files Browse the repository at this point in the history
….1006.1

Bump ppy.osu.Game from 2021.916.0 to 2021.1006.1
  • Loading branch information
LumpBloom7 authored Oct 6, 2021
2 parents df23426 + 0c1ae2c commit de8bae5
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Tau.Tests/TestScenePaddleDistribution.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void TestManyDistributionEvents()
public void TestAroundCentre()
{
var beatmap = new TestBeatmap(new TauRuleset().RulesetInfo);
var angleRange = (float)BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);
var angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);
createTest(Enumerable.Range(0, (int)angleRange).Select(i => new HitEvent(i / 50f, HitResult.Perfect, new Beat(), new Beat(), new Vector2((i - (angleRange / 2)), 0))).ToList());
}

Expand Down Expand Up @@ -64,7 +64,7 @@ public static List<HitEvent> CreateDistributedHitEvents()
{
var hitEvents = new List<HitEvent>();
var beatmap = new TestBeatmap(new TauRuleset().RulesetInfo);
var angleRange = (float)BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);
var angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);

for (int i = 0; i < 100; i++)
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected override IEnumerable<TauHitObject> ConvertHitObject(HitObject original
if (!CanConvertToSliders)
goto default;

if (pathData.Duration < BeatmapDifficulty.DifficultyRange(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / 2)
if (pathData.Duration < IBeatmapDifficultyInfo.DifficultyRange(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / 2)
goto default;

var nodes = new List<SliderNode>();
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Tau/Objects/TauHitObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ public bool LastInCombo

protected override HitWindows CreateHitWindows() => new TauHitWindows();

protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
{
base.ApplyDefaultsToSelf(controlPointInfo, difficulty);

TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
TimeFadeIn = 100;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public PaddleDistributionGraph(IReadOnlyList<HitEvent> hitEvents, IBeatmap beatm
{
this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.HitObject is Beat && e.Result.IsHit()).ToList();

angleRange = (float)BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);
angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);
}

[BackgroundDependencyLoader]
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Tau/UI/Cursor/TauCursor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class TauCursor : CompositeDrawable

public TauCursor(BeatmapDifficulty difficulty)
{
angleRange = (float)BeatmapDifficulty.DifficultyRange(difficulty.CircleSize, 75, 25, 10);
angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.CircleSize, 75, 25, 10);

Origin = Anchor.Centre;
Anchor = Anchor.Centre;
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class TauResumeOverlay : ResumeOverlay

public TauResumeOverlay(BeatmapDifficulty difficulty)
{
angleRange = (float)BeatmapDifficulty.DifficultyRange(difficulty.CircleSize, 75, 25, 10);
angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.CircleSize, 75, 25, 10);
}

[BackgroundDependencyLoader]
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<EmbeddedResource Include="Resources\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2021.916.0" />
<PackageReference Include="ppy.osu.Game" Version="2021.1006.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\Samples\Gameplay" />
Expand Down

0 comments on commit de8bae5

Please sign in to comment.