Skip to content

Commit

Permalink
Bump osugame
Browse files Browse the repository at this point in the history
  • Loading branch information
EVAST9919 committed Oct 8, 2023
1 parent 41f3bcb commit 9b5d540
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions osu.Game.Rulesets.Touhosu/Extensions/ConversionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ public static IEnumerable<TouhosuHitObject> ConvertDefaultSlider(HitObject obj,
var velocity = scoringDistance / timingPoint.BeatLength;
var tickDistance = scoringDistance / difficulty.SliderTickRate;

double legacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0;

foreach (var e in SliderEventGenerator.Generate(obj.StartTime, spanDuration, velocity, tickDistance, curve.Path.Distance, curve.RepeatCount + 1, legacyLastTickOffset, new CancellationToken()))
foreach (var e in SliderEventGenerator.Generate(obj.StartTime, spanDuration, velocity, tickDistance, curve.Path.Distance, curve.RepeatCount + 1, new CancellationToken()))
{
var curvePosition = curve.CurvePositionAt(e.PathProgress / (curve.RepeatCount + 1)) + originalPosition;
var sliderEventPosition = toPlayfieldSpace(curvePosition * new Vector2(1, 0.4f));
Expand Down Expand Up @@ -95,9 +93,7 @@ public static IEnumerable<TouhosuHitObject> ConvertBuzzSlider(HitObject obj, Vec
var velocity = scoringDistance / timingPoint.BeatLength;
var tickDistance = scoringDistance / difficulty.SliderTickRate;

double legacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0;

var slider = SliderEventGenerator.Generate(obj.StartTime, spanDuration, velocity, tickDistance, curve.Path.Distance, curve.RepeatCount + 1, legacyLastTickOffset, new CancellationToken());
var slider = SliderEventGenerator.Generate(obj.StartTime, spanDuration, velocity, tickDistance, curve.Path.Distance, curve.RepeatCount + 1, new CancellationToken());

var buzzPosition = toPlayfieldSpace(originalPosition * new Vector2(1, 0.4f));
var repeats = slider.Select(e => e.Type == SliderEventType.Repeat);
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Touhosu/osu.Game.Rulesets.Touhosu.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<EmbeddedResource Include="Resources\**\*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2023.301.0"/>
<PackageReference Include="ppy.osu.Game" Version="2023.1008.0"/>
</ItemGroup>
</Project>

0 comments on commit 9b5d540

Please sign in to comment.