Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ppy.osu.Game from 2023.717.0 to 2023.1008.0 #325

Merged
merged 4 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ dotnet_diagnostic.IDE0068.severity = none
dotnet_diagnostic.IDE0069.severity = none

#Redundant usings
dotnet_diagnostic.IDE0005.severity = error
dotnet_diagnostic.IDE0005.severity = silent

# Banned APIs
dotnet_diagnostic.RS0030.severity = error
Expand Down
5 changes: 4 additions & 1 deletion osu.Game.Rulesets.Rush/Judgements/RushJudgement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public class RushJudgement : Judgement
/// <returns>The numeric health points increase of <paramref name="result"/> and <paramref name="playerCollided"/>.</returns>
protected virtual double HealthPointIncreaseFor(HitResult result, bool playerCollided) => 0.0;

protected sealed override double HealthIncreaseFor(HitResult result) => throw new NotSupportedException($"Use the Rush!-specific version: {nameof(HealthPointIncreaseFor)}");
// Temporary measure to prevent crashes due to HealthDisplay using this method
// No miss animation though.
protected sealed override double HealthIncreaseFor(HitResult result) => 0.0;
// protected sealed override double HealthIncreaseFor(HitResult result) => throw new NotSupportedException($"Use the Rush!-specific version: {nameof(HealthPointIncreaseFor)}");
}
}
3 changes: 1 addition & 2 deletions osu.Game.Rulesets.Rush/UI/DrawableRushRuleset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,12 @@ public partial class DrawableRushRuleset : DrawableScrollingRuleset<RushHitObjec

protected override bool UserScrollSpeedAdjustment => true;

protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Constant;

public DrawableRushRuleset(RushRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
: base(ruleset, beatmap, mods)
{
Direction.Value = ScrollingDirection.Left;
TimeRange.Value = 800;
VisualisationMethod = ScrollVisualisationMethod.Constant;
}

protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Rush/UI/Ground/DefaultGround.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ protected override void UpdateAfterChildren()
// Tests don't have scrolling info yet
if (scrollingInfo is null) return;

var groundX = scrollingInfo.Algorithm.PositionAt(0f, Time.Current, scrollingInfo.TimeRange.Value, DrawWidth - RushPlayfield.HIT_TARGET_OFFSET) % slats_spacing;
var groundX = scrollingInfo.Algorithm.Value.PositionAt(0f, Time.Current, scrollingInfo.TimeRange.Value, DrawWidth - RushPlayfield.HIT_TARGET_OFFSET) % slats_spacing;

// This is to ensure that the ground is still visible before the start of the track
if (groundX > 0)
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2023.717.0" />
<PackageReference Include="ppy.osu.Game" Version="2023.1008.0" />
</ItemGroup>
</Project>
Loading