h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Code Issues Releases Wiki Activity

CatchSkinConfiguration -> CatchSkinColour

Browse Source
This commit is contained in:
Salman Ahmed 2020-03-30 09:33:47 +03:00
parent e51097da9e
commit 16a4525a9c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
View File

@ -158,15 +158,15 @@ namespace osu.Game.Rulesets.Catch.Tests
public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
{
if (lookup is CatchSkinConfiguration config)
if (lookup is CatchSkinColour config)
{
if (config == CatchSkinConfiguration.HyperDash && customCatcherColour)
if (config == CatchSkinColour.HyperDash && customCatcherColour)
return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashColour));
if (config == CatchSkinConfiguration.HyperDashFruit && customFruitColour)
if (config == CatchSkinColour.HyperDashFruit && customFruitColour)
return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashFruitColour));
if (config == CatchSkinConfiguration.HyperDashAfterImage && customAfterColour)
if (config == CatchSkinColour.HyperDashAfterImage && customAfterColour)
return SkinUtils.As<TValue>(new Bindable<Color4>(CustomHyperDashAfterColour));
}

4
osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
View File

@ -64,8 +64,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
});
var hyperDashColour =
skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDashFruit)?.Value ??
skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDash)?.Value ??
skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
Catcher.DefaultHyperDashColour;
if (hitObject.HyperDash)

2
osu.Game.Rulesets.Catch/Skinning/CatchSkinConfiguration.cs → osu.Game.Rulesets.Catch/Skinning/CatchSkinColour.cs
View File

@ -3,7 +3,7 @@
namespace osu.Game.Rulesets.Catch.Skinning
{
public enum CatchSkinConfiguration
public enum CatchSkinColour
{
/// <summary>
/// The colour to be used for the catcher while on hyper-dashing state.

4
osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
View File

@ -55,8 +55,8 @@ namespace osu.Game.Rulesets.Catch.Skinning
if (drawableCatchObject.HitObject.HyperDash)
{
var hyperDashColour =
skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDashFruit)?.Value ??
skin.GetConfig<CatchSkinConfiguration, Color4>(CatchSkinConfiguration.HyperDash)?.Value ??
skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??
skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
Catcher.DefaultHyperDashColour;
var hyperDash = new Sprite