mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 05:32:54 +08:00
Add shared base class for both mod imlpementations
This commit is contained in:
parent
e95586857e
commit
cc9a28afa8
@ -1,17 +1,11 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Game.Rulesets.Mods;
|
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
|
||||||
using osu.Game.Rulesets.Osu.Objects;
|
|
||||||
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Osu.Mods
|
namespace osu.Game.Rulesets.Osu.Mods
|
||||||
{
|
{
|
||||||
public class OsuModDeflate : Mod, IApplicableToDrawableHitObjects
|
public class OsuModDeflate : OsuModeObjectScaleTween
|
||||||
{
|
{
|
||||||
public override string Name => "Deflate";
|
public override string Name => "Deflate";
|
||||||
|
|
||||||
@ -19,58 +13,8 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
|
|
||||||
public override IconUsage Icon => FontAwesome.Solid.CompressArrowsAlt;
|
public override IconUsage Icon => FontAwesome.Solid.CompressArrowsAlt;
|
||||||
|
|
||||||
public override ModType Type => ModType.Fun;
|
public override string Description => "Hit them at the right size!";
|
||||||
|
|
||||||
public override string Description => "Become one with the approach circle...";
|
protected override float StartScale => 2f;
|
||||||
|
|
||||||
public override double ScoreMultiplier => 1;
|
|
||||||
|
|
||||||
public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
|
|
||||||
{
|
|
||||||
foreach (var drawable in drawables)
|
|
||||||
{
|
|
||||||
switch (drawable)
|
|
||||||
{
|
|
||||||
case DrawableSpinner _:
|
|
||||||
continue;
|
|
||||||
|
|
||||||
default:
|
|
||||||
drawable.ApplyCustomUpdateState += ApplyCustomState;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void ApplyCustomState(DrawableHitObject drawable, ArmedState state)
|
|
||||||
{
|
|
||||||
var h = (OsuHitObject)drawable.HitObject;
|
|
||||||
|
|
||||||
// apply grow effect
|
|
||||||
switch (drawable)
|
|
||||||
{
|
|
||||||
case DrawableSliderHead _:
|
|
||||||
case DrawableSliderTail _:
|
|
||||||
// special cases we should *not* be scaling.
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DrawableSlider _:
|
|
||||||
case DrawableHitCircle _:
|
|
||||||
{
|
|
||||||
using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
|
|
||||||
drawable.ScaleTo(2f).Then().ScaleTo(1f, h.TimePreempt); // sole difference to grow mod
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// remove approach circles
|
|
||||||
switch (drawable)
|
|
||||||
{
|
|
||||||
case DrawableHitCircle circle:
|
|
||||||
// we don't want to see the approach circle
|
|
||||||
using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
|
|
||||||
circle.ApproachCircle.Hide();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,20 +1,11 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using osu.Framework.Bindables;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Rulesets.Mods;
|
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
|
||||||
using osu.Game.Rulesets.Osu.Objects;
|
|
||||||
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Osu.Mods
|
namespace osu.Game.Rulesets.Osu.Mods
|
||||||
{
|
{
|
||||||
internal class OsuModGrow : Mod, IReadFromConfig, IApplicableToDrawableHitObjects
|
internal class OsuModGrow : OsuModeObjectScaleTween
|
||||||
{
|
{
|
||||||
public override string Name => "Grow";
|
public override string Name => "Grow";
|
||||||
|
|
||||||
@ -22,65 +13,8 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
|
|
||||||
public override IconUsage Icon => FontAwesome.Solid.ArrowsAltV;
|
public override IconUsage Icon => FontAwesome.Solid.ArrowsAltV;
|
||||||
|
|
||||||
public override ModType Type => ModType.Fun;
|
|
||||||
|
|
||||||
public override string Description => "Hit them at the right size!";
|
public override string Description => "Hit them at the right size!";
|
||||||
|
|
||||||
public override double ScoreMultiplier => 1;
|
protected override float StartScale => 0.5f;
|
||||||
|
|
||||||
private Bindable<bool> increaseFirstObjectVisibility = new Bindable<bool>();
|
|
||||||
|
|
||||||
public void ReadFromConfig(OsuConfigManager config)
|
|
||||||
{
|
|
||||||
increaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
|
|
||||||
{
|
|
||||||
foreach (var drawable in drawables.Skip(increaseFirstObjectVisibility.Value ? 1 : 0))
|
|
||||||
{
|
|
||||||
switch (drawable)
|
|
||||||
{
|
|
||||||
case DrawableSpinner _:
|
|
||||||
continue;
|
|
||||||
|
|
||||||
default:
|
|
||||||
drawable.ApplyCustomUpdateState += ApplyCustomState;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void ApplyCustomState(DrawableHitObject drawable, ArmedState state)
|
|
||||||
{
|
|
||||||
var h = (OsuHitObject)drawable.HitObject;
|
|
||||||
|
|
||||||
// apply grow effect
|
|
||||||
switch (drawable)
|
|
||||||
{
|
|
||||||
case DrawableSliderHead _:
|
|
||||||
case DrawableSliderTail _:
|
|
||||||
// special cases we should *not* be scaling.
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DrawableSlider _:
|
|
||||||
case DrawableHitCircle _:
|
|
||||||
{
|
|
||||||
using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
|
|
||||||
drawable.ScaleTo(0.5f).Then().ScaleTo(1, h.TimePreempt, Easing.OutSine);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// remove approach circles
|
|
||||||
switch (drawable)
|
|
||||||
{
|
|
||||||
case DrawableHitCircle circle:
|
|
||||||
// we don't want to see the approach circle
|
|
||||||
using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
|
|
||||||
circle.ApproachCircle.Hide();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
84
osu.Game.Rulesets.Osu/Mods/OsuModeObjectScaleTween.cs
Normal file
84
osu.Game.Rulesets.Osu/Mods/OsuModeObjectScaleTween.cs
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using osu.Framework.Bindables;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Game.Configuration;
|
||||||
|
using osu.Game.Rulesets.Mods;
|
||||||
|
using osu.Game.Rulesets.Objects.Drawables;
|
||||||
|
using osu.Game.Rulesets.Osu.Objects;
|
||||||
|
using osu.Game.Rulesets.Osu.Objects.Drawables;
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.Osu.Mods
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Adjusts the size of hit objects during their fade in animation.
|
||||||
|
/// </summary>
|
||||||
|
public abstract class OsuModeObjectScaleTween : Mod, IReadFromConfig, IApplicableToDrawableHitObjects
|
||||||
|
{
|
||||||
|
public override ModType Type => ModType.Fun;
|
||||||
|
|
||||||
|
public override double ScoreMultiplier => 1;
|
||||||
|
|
||||||
|
protected virtual float StartScale => 1;
|
||||||
|
|
||||||
|
protected virtual float EndScale => 1;
|
||||||
|
|
||||||
|
private Bindable<bool> increaseFirstObjectVisibility = new Bindable<bool>();
|
||||||
|
|
||||||
|
public void ReadFromConfig(OsuConfigManager config)
|
||||||
|
{
|
||||||
|
increaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
|
||||||
|
{
|
||||||
|
foreach (var drawable in drawables.Skip(increaseFirstObjectVisibility.Value ? 1 : 0))
|
||||||
|
{
|
||||||
|
switch (drawable)
|
||||||
|
{
|
||||||
|
case DrawableSpinner _:
|
||||||
|
continue;
|
||||||
|
|
||||||
|
default:
|
||||||
|
drawable.ApplyCustomUpdateState += ApplyCustomState;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void ApplyCustomState(DrawableHitObject drawable, ArmedState state)
|
||||||
|
{
|
||||||
|
var h = (OsuHitObject)drawable.HitObject;
|
||||||
|
|
||||||
|
// apply grow effect
|
||||||
|
switch (drawable)
|
||||||
|
{
|
||||||
|
case DrawableSliderHead _:
|
||||||
|
case DrawableSliderTail _:
|
||||||
|
// special cases we should *not* be scaling.
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DrawableSlider _:
|
||||||
|
case DrawableHitCircle _:
|
||||||
|
{
|
||||||
|
using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
|
||||||
|
drawable.ScaleTo(StartScale).Then().ScaleTo(EndScale, h.TimePreempt, Easing.OutSine);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove approach circles
|
||||||
|
switch (drawable)
|
||||||
|
{
|
||||||
|
case DrawableHitCircle circle:
|
||||||
|
// we don't want to see the approach circle
|
||||||
|
using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
|
||||||
|
circle.ApproachCircle.Hide();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user