Skip to content

Commit

Permalink
bump osu version
Browse files Browse the repository at this point in the history
  • Loading branch information
Flutterish committed Jan 27, 2022
1 parent fc9667c commit 2fca27a
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Solosu.Tests/VisualTestRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace osu.Game.Rulesets.Solosu.Tests {
public static class VisualTestRunner {
[STAThread]
public static int Main ( string[] args ) {
using ( DesktopGameHost host = Host.GetSuitableHost( @"osu", true ) ) {
using ( DesktopGameHost host = Host.GetSuitableDesktopHost( @"osu", new() { BindIPC = true } ) ) {
host.Run( new OsuTestBrowser() );
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Solosu/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static Vector2 LerpTo ( this Vector2 from, Vector2 to, double progress )
=> from + ( to - from ) * (float)progress;

public static Random Random ( this IBeatmap beatmap )
=> new Random( (int)( beatmap.BeatmapInfo.Length + beatmap.BeatmapInfo.ID + beatmap.BeatmapInfo.AudioLeadIn * beatmap.BeatmapInfo.BeatDivisor / beatmap.BeatmapInfo.BPM ) );
=> new Random( (int)( beatmap.BeatmapInfo.Length + beatmap.BeatmapInfo.ID.GetHashCode() + beatmap.BeatmapInfo.AudioLeadIn * beatmap.BeatmapInfo.BeatDivisor / beatmap.BeatmapInfo.BPM ) );

public delegate void Mutator<T> ( ref T value );
public static IEnumerable<T> Mutate<T> ( this IEnumerable<T> self, Mutator<T> mutator ) {
Expand Down
1 change: 0 additions & 1 deletion osu.Game.Rulesets.Solosu/Mods/SolosuModAutopilot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public class SolosuModAutopilot : Mod {
public override string Name => "Autopilot";
public override string Acronym => "AP";
public override double ScoreMultiplier => 1;
public override bool Ranked => false;
public override Type[] IncompatibleMods => new[] { typeof( ModRelax ), typeof( ModAutoplay ) };
public override bool HasImplementation => true;
}
Expand Down
3 changes: 2 additions & 1 deletion osu.Game.Rulesets.Solosu/Mods/SolosuModAutoplay.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using osu.Game.Beatmaps;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Solosu.Replays;
using osu.Game.Scoring;
Expand All @@ -9,7 +10,7 @@ namespace osu.Game.Rulesets.Solosu.Mods {
public class SolosuModAutoplay : ModAutoplay {
public override Score CreateReplayScore ( IBeatmap beatmap, IReadOnlyList<Mod> mods ) => new Score {
ScoreInfo = new ScoreInfo {
User = new User { Username = "Autosu" },
User = new APIUser { Username = "Autosu" },
},
Replay = new SolosuAutoGenerator( beatmap ).Generate(),
};
Expand Down
1 change: 0 additions & 1 deletion osu.Game.Rulesets.Solosu/Mods/SolosuModRelax.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ public class SolosuModRelax : ModRelax {
public override string Description => "No need to click, just follow the path";
public override Type[] IncompatibleMods => new[] { typeof( SolosuModAutopilot ), typeof( ModAutoplay ) };
public override bool HasImplementation => true;
public override bool Ranked => false;
}
}
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Solosu/Objects/MultiLaneStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public IEnumerable<FlowObject> CreateFlowObjects () {
}

public double BonusInterval { get; private set; }
protected override void ApplyDefaultsToSelf ( ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty ) {
protected override void ApplyDefaultsToSelf ( ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty ) {
base.ApplyDefaultsToSelf( controlPointInfo, difficulty );
BonusInterval = controlPointInfo.TimingPointAt( StartTime ).BeatLength;
}
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Solosu/Objects/Stream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public IEnumerable<FlowObject> CreateFlowObjects () {
}

public double BonusInterval { get; private set; }
protected override void ApplyDefaultsToSelf ( ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty ) {
protected override void ApplyDefaultsToSelf ( ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty ) {
base.ApplyDefaultsToSelf( controlPointInfo, difficulty );
BonusInterval = controlPointInfo.TimingPointAt( StartTime ).BeatLength;
}
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Solosu/SolosuDifficultyCalculator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
namespace osu.Game.Rulesets.Solosu {
public class SolosuDifficultyCalculator : DifficultyCalculator {
// TODO SolosuDifficultyCalculator
public SolosuDifficultyCalculator ( Ruleset ruleset, WorkingBeatmap beatmap )
public SolosuDifficultyCalculator ( IRulesetInfo ruleset, IWorkingBeatmap beatmap )
: base( ruleset, beatmap ) {
}

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

protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects ( IBeatmap beatmap, double clockRate ) => Enumerable.Empty<DifficultyHitObject>();
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Solosu/SolosuRuleset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class SolosuRuleset : Ruleset {
public override IBeatmapConverter CreateBeatmapConverter ( IBeatmap beatmap ) => new SolosuBeatmapConverter( beatmap, this );
public override IBeatmapProcessor CreateBeatmapProcessor ( IBeatmap beatmap ) => new SolosuBeatmapProcessor( beatmap );

public override DifficultyCalculator CreateDifficultyCalculator ( WorkingBeatmap beatmap ) => new SolosuDifficultyCalculator( this, beatmap );
public override DifficultyCalculator CreateDifficultyCalculator ( IWorkingBeatmap beatmap ) => new SolosuDifficultyCalculator( RulesetInfo, beatmap );
public override IConvertibleReplayFrame CreateConvertibleReplayFrame ()
=> new SolosuReplayFrame();

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

0 comments on commit 2fca27a

Please sign in to comment.