sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15798 from mk56-spn/Approach-different-fix-

Browse Source 
Add "linear" animation style to "approach different" mod
This commit is contained in:
Dean Herbert
2021-11-29 00:07:41 +09:00
committed by GitHub
parent 7983bdbf08 5001412a0d
commit a08a3ef2c9
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game.Rulesets.Osu/Mods/OsuModApproachDifferent.cs
View File

@ -1,4 +1,4 @@
// 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; using System;
@ -26,12 +26,12 @@ namespace osu.Game.Rulesets.Osu.Mods
public BindableFloat Scale { get; } = new BindableFloat(4) public BindableFloat Scale { get; } = new BindableFloat(4)
{ {
Precision = 0.1f, Precision = 0.1f,
MinValue = 2, MinValue = 1.5f,
MaxValue = 10, MaxValue = 10,
}; };
[SettingSource("Style", "Change the animation style of the approach circles.", 1)] [SettingSource("Style", "Change the animation style of the approach circles.", 1)]
public Bindable<AnimationStyle> Style { get; } = new Bindable<AnimationStyle>(); public Bindable<AnimationStyle> Style { get; } = new Bindable<AnimationStyle>(AnimationStyle.Gravity);
public void ApplyToDrawableHitObject(DrawableHitObject drawable) public void ApplyToDrawableHitObject(DrawableHitObject drawable)
{ {
@ -52,9 +52,18 @@ namespace osu.Game.Rulesets.Osu.Mods
{ {
switch (style) switch (style)
{ {
default: case AnimationStyle.Linear:
return Easing.None; return Easing.None;
case AnimationStyle.Gravity:
return Easing.InBack;
case AnimationStyle.InOut1:
return Easing.InOutCubic;
case AnimationStyle.InOut2:
return Easing.InOutQuint;
case AnimationStyle.Accelerate1: case AnimationStyle.Accelerate1:
return Easing.In; return Easing.In;
@ -64,9 +73,6 @@ namespace osu.Game.Rulesets.Osu.Mods
case AnimationStyle.Accelerate3: case AnimationStyle.Accelerate3:
return Easing.InQuint; return Easing.InQuint;
case AnimationStyle.Gravity:
return Easing.InBack;
case AnimationStyle.Decelerate1: case AnimationStyle.Decelerate1:
return Easing.Out; return Easing.Out;
@ -76,16 +82,14 @@ namespace osu.Game.Rulesets.Osu.Mods
case AnimationStyle.Decelerate3: case AnimationStyle.Decelerate3:
return Easing.OutQuint; return Easing.OutQuint;
case AnimationStyle.InOut1: default:
return Easing.InOutCubic; throw new ArgumentOutOfRangeException(nameof(style), style, @"Unsupported animation style");
case AnimationStyle.InOut2:
return Easing.InOutQuint;
} }
} }
public enum AnimationStyle public enum AnimationStyle
{ {
Linear,
Gravity, Gravity,
InOut1, InOut1,
InOut2, InOut2,