mirror of
https://github.com/osukey/osukey.git
synced 2025-07-02 08:49:59 +09:00
Add ability to adjust to BPM changes
fix first hitcircle being off time Bpm changes not working fix
This commit is contained in:
@ -26,7 +26,6 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
public override ModType Type => ModType.Fun;
|
public override ModType Type => ModType.Fun;
|
||||||
|
|
||||||
public override IconUsage? Icon => FontAwesome.Solid.Camera;
|
public override IconUsage? Icon => FontAwesome.Solid.Camera;
|
||||||
|
|
||||||
public override Type[] IncompatibleMods => new[] { typeof(OsuModTarget), typeof(OsuModStrictTracking) };
|
public override Type[] IncompatibleMods => new[] { typeof(OsuModTarget), typeof(OsuModStrictTracking) };
|
||||||
|
|
||||||
[SettingSource("Beat divisor")]
|
[SettingSource("Beat divisor")]
|
||||||
@ -48,13 +47,17 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
|
|
||||||
foreach (var obj in beatmap.HitObjects.OfType<OsuHitObject>())
|
foreach (var obj in beatmap.HitObjects.OfType<OsuHitObject>())
|
||||||
{
|
{
|
||||||
var point = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
|
var lastTimingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime + 1);
|
||||||
double newPreempt = obj.TimePreempt + (obj.StartTime +5) % (point.BeatLength * BeatDivisor.Value);
|
double controlPointDifference = obj.StartTime + 1 - lastTimingPoint.Time;
|
||||||
|
double remainder = controlPointDifference % (lastTimingPoint.BeatLength * BeatDivisor.Value);
|
||||||
|
|
||||||
|
double finalPreempt = obj.TimePreempt + remainder;
|
||||||
|
obj.TimePreempt = finalPreempt;
|
||||||
applyFadeInAdjustment(obj);
|
applyFadeInAdjustment(obj);
|
||||||
|
|
||||||
void applyFadeInAdjustment(OsuHitObject osuObject)
|
void applyFadeInAdjustment(OsuHitObject osuObject)
|
||||||
{
|
{
|
||||||
osuObject.TimePreempt = newPreempt;
|
osuObject.TimePreempt = finalPreempt;
|
||||||
foreach (var nested in osuObject.NestedHitObjects.OfType<OsuHitObject>())
|
foreach (var nested in osuObject.NestedHitObjects.OfType<OsuHitObject>())
|
||||||
applyFadeInAdjustment(nested);
|
applyFadeInAdjustment(nested);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user