sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-09 23:57:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

readded approach circles

Browse Source
This commit is contained in:
Mk-56spn 2022-09-08 15:17:22 +02:00
parent 4a6c8785af
commit e416c87970
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Rulesets.Osu/Mods/OsuModFlash.cs → osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
View File

@ -8,13 +8,12 @@ using osu.Game.Configuration;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables;
using osu.Game.Rulesets.Osu.UI; using osu.Game.Rulesets.Osu.UI;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
namespace osu.Game.Rulesets.Osu.Mods namespace osu.Game.Rulesets.Osu.Mods
{ {
public class OsuModFlash : ModWithVisibilityAdjustment, IHidesApproachCircles, IApplicableToDrawableRuleset<OsuHitObject> public class OsuModFreezeFrame : ModWithVisibilityAdjustment, IHidesApproachCircles, IApplicableToDrawableRuleset<OsuHitObject>
{ {
public override string Name => "Freeze frame"; public override string Name => "Freeze frame";
@ -26,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Mods
public override ModType Type => ModType.Fun; public override ModType Type => ModType.Fun;
public override IconUsage? Icon => FontAwesome.Solid.Fire; 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) };
@ -38,7 +37,6 @@ namespace osu.Game.Rulesets.Osu.Mods
Precision = .25f Precision = .25f
}; };
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset) public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
{ {
(drawableRuleset.Playfield as OsuPlayfield)?.FollowPoints.Hide(); (drawableRuleset.Playfield as OsuPlayfield)?.FollowPoints.Hide();
@ -69,23 +67,8 @@ namespace osu.Game.Rulesets.Osu.Mods
protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyFrozenState(hitObject, state); protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyFrozenState(hitObject, state);
private void applyFrozenState(DrawableHitObject drawable, ArmedState state) private void applyFrozenState(DrawableHitObject drawableObject, ArmedState state)
{ {
if (drawable is DrawableSpinner)
return;
var h = (OsuHitObject)drawable.HitObject;
/*
switch (drawable)
{
case DrawableHitCircle circle:
using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
{
circle.ApproachCircle.Hide();
}
break;
}*/
} }
} }
} }

2
osu.Game.Rulesets.Osu/OsuRuleset.cs
View File

@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Osu
new OsuModNoScope(), new OsuModNoScope(),
new MultiMod(new OsuModMagnetised(), new OsuModRepel()), new MultiMod(new OsuModMagnetised(), new OsuModRepel()),
new ModAdaptiveSpeed(), new ModAdaptiveSpeed(),
new OsuModFlash() new OsuModFreezeFrame()
}; };
case ModType.System: case ModType.System: