RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary base class

This commit is contained in:
Dean Herbert 2018-12-07 20:12:56 +09:00
parent 808f02b51d
commit d379d02761
2 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Linq;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables;
@ -9,30 +11,29 @@
namespace osu.Game.Rulesets.Osu.Mods
{
public class OsuModBlinds : ModBlinds<OsuHitObject>
public class OsuModBlinds : Mod, IApplicableToRulesetContainer<OsuHitObject>, IApplicableToScoreProcessor
{
public override string Name => "Blinds";
public override string Acronym => "BL";
public override FontAwesome Icon => FontAwesome.fa_adjust;
public override ModType Type => ModType.DifficultyIncrease;
public override string Description => "Play with blinds on your screen.";
public override bool Ranked => false;
public override double ScoreMultiplier => 1.12;
private DrawableOsuBlinds flashlight;
public override void ApplyToRulesetContainer(RulesetContainer<OsuHitObject> rulesetContainer)
public void ApplyToRulesetContainer(RulesetContainer<OsuHitObject> rulesetContainer)
{
bool hasEasy = false;
bool hasHardrock = false;
foreach (var mod in rulesetContainer.ActiveMods)
{
if (mod is ModEasy)
hasEasy = true;
if (mod is ModHardRock)
hasHardrock = true;
}
bool hasEasy = rulesetContainer.ActiveMods.Any(m => m is ModEasy);
bool hasHardrock = rulesetContainer.ActiveMods.Any(m => m is ModHardRock);
rulesetContainer.Overlays.Add(flashlight = new DrawableOsuBlinds(rulesetContainer.Playfield.HitObjectContainer, hasEasy, hasHardrock, rulesetContainer.Beatmap));
}
public override void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
{
scoreProcessor.Health.ValueChanged += val => {
flashlight.AnimateTarget((float)val);
};
scoreProcessor.Health.ValueChanged += val => { flashlight.AnimateTarget((float)val); };
}
}
}

24
osu.Game/Rulesets/Mods/ModBlinds.cs
View File

@ -1,24 +0,0 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI;
namespace osu.Game.Rulesets.Mods
{
public abstract class ModBlinds<T> : Mod, IApplicableToRulesetContainer<T>, IApplicableToScoreProcessor
where T : HitObject
{
public override string Name => "Blinds";
public override string Acronym => "BL";
public override FontAwesome Icon => FontAwesome.fa_adjust;
public override ModType Type => ModType.DifficultyIncrease;
public override string Description => "Play with blinds on your screen.";
public override bool Ranked => false;
public abstract void ApplyToRulesetContainer(RulesetContainer<T> rulesetContainer);
public abstract void ApplyToScoreProcessor(ScoreProcessor scoreProcessor);
}
}