Skip to content

Commit

Permalink
bump osu version
Browse files Browse the repository at this point in the history
  • Loading branch information
Flutterish committed Jun 16, 2022
1 parent f81b568 commit 9b3b639
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 13 deletions.
6 changes: 5 additions & 1 deletion Hitokori/Difficulty/HitokoriDifficultyCalculator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@ protected override DifficultyAttributes CreateDifficultyAttributes ( IBeatmap be

protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects ( IBeatmap beatmap, double clockRate ) {
HitObject last = beatmap.HitObjects.First();
List<DifficultyHitObject> objects = new();
int index = 0;
foreach ( HitObject hitObject in beatmap.HitObjects.Skip( 1 ) ) {
TimingControlPoint timingControlPoint = beatmap.ControlPointInfo.TimingPointAt( hitObject.StartTime );
yield return new HitokoriDifficultyHitObject( hitObject, last, timingControlPoint.BPM, clockRate );
objects.Add( new HitokoriDifficultyHitObject( hitObject, last, timingControlPoint.BPM, clockRate, objects, index++ ) );
last = hitObject;
}

return objects;
}

protected override Skill[] CreateSkills ( IBeatmap beatmap, Mod[] mods, double clockRate ) {
Expand Down
5 changes: 4 additions & 1 deletion Hitokori/Difficulty/HitokoriDifficultyHitObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using osu.Game.Rulesets.Hitokori.Objects;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Objects;
using System.Collections.Generic;

namespace osu.Game.Rulesets.Hitokori.Difficulty {
public class HitokoriDifficultyHitObject : DifficultyHitObject {
Expand All @@ -22,7 +23,9 @@ public class HitokoriDifficultyHitObject : DifficultyHitObject {
/// </summary>
public double? HoldAngle { get; private set; }

public HitokoriDifficultyHitObject ( HitObject hitObject, HitObject lastObject, double bpm, double clockRate ) : base( hitObject, lastObject, clockRate ) {
public HitokoriDifficultyHitObject ( HitObject hitObject, HitObject lastObject, double bpm, double clockRate,
List<DifficultyHitObject> objects, int index ) : base( hitObject, lastObject, clockRate, objects, index ) {

HitokoriTileObject hitokoriObject = (HitokoriTileObject)hitObject;
HitokoriTileObject lastHitokoriObject = (HitokoriTileObject)lastObject;

Expand Down
4 changes: 3 additions & 1 deletion Hitokori/Difficulty/Skills/Reading.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ private double CalculateAngleStrain ( double angle ) {
return Math.Abs( ( Math.Abs( angle ) - Math.PI ) / ( Math.PI * 3 / 2 ) );
}

protected override double CalculateInitialStrain ( double time ) => 0;

protected override double CalculateInitialStrain ( double time, DifficultyHitObject current )
=> 0;
}
}
3 changes: 2 additions & 1 deletion Hitokori/Difficulty/Skills/Speed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ protected override double StrainValueAt ( DifficultyHitObject current ) {
return Math.Pow( bpm / BASE_BPM, 0.6 );
}

protected override double CalculateInitialStrain ( double time ) => 0;
protected override double CalculateInitialStrain ( double time, DifficultyHitObject current )
=> 0;
}
}
13 changes: 5 additions & 8 deletions Hitokori/Mods/HitokoriModAuto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,11 @@ public class HitokoriModAuto : ModAutoplay {
"Merg"
};

public override Score CreateReplayScore ( IBeatmap beatmap, IReadOnlyList<Mod> mods)
{
var score = new Score
{
ScoreInfo = new ScoreInfo {User = new APIUser {Username = BotNames.Random()}},
Replay = new HitokoriAutoGenerator(beatmap as HitokoriBeatmap).Generate()
};
return score;
public override ModReplayData CreateReplayData ( IBeatmap beatmap, IReadOnlyList<Mod> mods ) {
var replay = new HitokoriAutoGenerator( beatmap as HitokoriBeatmap ).Generate();
return new ModReplayData( replay, new ModCreatedUser {
Username = BotNames.Random()
} );
}
}
}
2 changes: 1 addition & 1 deletion Hitokori/osu.Game.Rulesets.Hitokori.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2022.523.0" />
<PackageReference Include="ppy.osu.Game" Version="2022.615.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 9b3b639

Please sign in to comment.