Skip to content
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 Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup Label="C#">
<LangVersion>8.0</LangVersion>
<LangVersion>12.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup Label="Package References">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="NUnit" Version="4.5.0" />
<PackageReference Include="NUnit" Version="4.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
</ItemGroup>
<PropertyGroup Label="Project">
Expand Down
5 changes: 1 addition & 4 deletions osu.Game.Rulesets.Rush/Mods/RushModDaycore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@

namespace osu.Game.Rulesets.Rush.Mods
{
public class RushModDaycore : ModDaycore
{
public override double ScoreMultiplier => 0.3;
}
public class RushModDaycore : ModDaycore { }
}
5 changes: 1 addition & 4 deletions osu.Game.Rulesets.Rush/Mods/RushModDoubleTime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@

namespace osu.Game.Rulesets.Rush.Mods
{
public class RushModDoubleTime : ModDoubleTime
{
public override double ScoreMultiplier => 1.12;
}
public class RushModDoubleTime : ModDoubleTime { }
}
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ namespace osu.Game.Rulesets.Rush.Mods
{
public partial class RushModFlashlight : ModFlashlight<RushHitObject>
{
public override double ScoreMultiplier => 1.12;

public override float DefaultFlashlightSize => 330;

[SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
Expand Down
5 changes: 1 addition & 4 deletions osu.Game.Rulesets.Rush/Mods/RushModHalfTime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@

namespace osu.Game.Rulesets.Rush.Mods
{
public class RushModHalfTime : ModHalfTime
{
public override double ScoreMultiplier => 0.3;
}
public class RushModHalfTime : ModHalfTime { }
}
5 changes: 1 addition & 4 deletions osu.Game.Rulesets.Rush/Mods/RushModNightcore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,5 @@

namespace osu.Game.Rulesets.Rush.Mods
{
public class RushModNightcore : ModNightcore<RushHitObject>
{
public override double ScoreMultiplier => 1.12;
}
public class RushModNightcore : ModNightcore<RushHitObject> { }
}
13 changes: 5 additions & 8 deletions osu.Game.Rulesets.Rush/RushDifficultyCalculator.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// Copyright (c) Shane Woolcock. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

using System;
using System.Collections.Generic;
using System.Linq;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Difficulty.Preprocessing;
Expand All @@ -19,13 +17,12 @@ public RushDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
{
}

protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
{
return new DifficultyAttributes(mods, 0) { StarRating = beatmap.BeatmapInfo.StarRating };
}

protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills)
=> new DifficultyAttributes(mods, 0) { StarRating = beatmap.BeatmapInfo.StarRating };

protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, Mod[] mods) => [];

protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => [];
}
}
33 changes: 33 additions & 0 deletions osu.Game.Rulesets.Rush/Scoring/RushScoreMultiplierCalculator.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright (c) Shane Woolcock. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

using osu.Game.Rulesets.Rush.Mods;
using osu.Game.Rulesets.Scoring;

namespace osu.Game.Rulesets.Rush.Scoring
{
public class RushScoreMultiplierCalculator : ScoreMultiplierCalculator
{
public RushScoreMultiplierCalculator(ScoreMultiplierContext context) : base(context)
{
#region Difficulty Reduction
Single<RushModDaycore>(hasMultiplier: 0.3);
Single<RushModHalfTime>(hasMultiplier: 0.3);
// No-fail
#endregion

#region Difficulty Increase
Single<RushModDoubleTime>(hasMultiplier: 1.12);
Single<RushModFlashlight>(hasMultiplier: 1.12);
Single<RushModNightcore>(hasMultiplier: 1.12);
// Perfect
// Sudden death
#endregion

#region Automation
// Autoplay
// Cinema
#endregion
}
}
}
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="2026.303.0" />
<PackageReference Include="ppy.osu.Game" Version="2026.702.1" />
</ItemGroup>
</Project>
Loading