sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo

Browse Source
This commit is contained in:
Dean Herbert
2019-03-20 11:22:34 +09:00
parent e0ab40b082
commit 3b7a76aa4e
13 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
View File

@ -21,10 +21,10 @@ namespace osu.Game.Rulesets.Catch.Mods
private CatchPlayfield playfield; private CatchPlayfield playfield;
public override void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> rrawableRuleset) public override void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
{ {
playfield = (CatchPlayfield)rrawableRuleset.Playfield; playfield = (CatchPlayfield)drawableRuleset.Playfield;
base.ApplyToDrawableRuleset(rrawableRuleset); base.ApplyToDrawableRuleset(drawableRuleset);
} }
private class CatchFlashlight : Flashlight private class CatchFlashlight : Flashlight

4
osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
View File

@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Catch.Scoring
{ {
public class CatchScoreProcessor : ScoreProcessor<CatchHitObject> public class CatchScoreProcessor : ScoreProcessor<CatchHitObject>
{ {
public CatchScoreProcessor(DrawableRuleset<CatchHitObject> rrawableRuleset) public CatchScoreProcessor(DrawableRuleset<CatchHitObject> drawableRuleset)
: base(rrawableRuleset) : base(drawableRuleset)
{ {
} }

4
osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
View File

@ -92,8 +92,8 @@ namespace osu.Game.Rulesets.Mania.Scoring
{ {
} }
public ManiaScoreProcessor(DrawableRuleset<ManiaHitObject> rrawableRuleset) public ManiaScoreProcessor(DrawableRuleset<ManiaHitObject> drawableRuleset)
: base(rrawableRuleset) : base(drawableRuleset)
{ {
} }

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

@ -32,9 +32,9 @@ namespace osu.Game.Rulesets.Osu.Mods
public override double ScoreMultiplier => 1.12; public override double ScoreMultiplier => 1.12;
private DrawableOsuBlinds blinds; private DrawableOsuBlinds blinds;
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> rrawableRuleset) public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
{ {
rrawableRuleset.Overlays.Add(blinds = new DrawableOsuBlinds(rrawableRuleset.Playfield.HitObjectContainer, rrawableRuleset.Beatmap)); drawableRuleset.Overlays.Add(blinds = new DrawableOsuBlinds(drawableRuleset.Playfield.HitObjectContainer, drawableRuleset.Beatmap));
} }
public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor) public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)

4
osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
View File

@ -79,10 +79,10 @@ namespace osu.Game.Rulesets.Osu.Mods
state.Apply(osuInputManager.CurrentState, osuInputManager); state.Apply(osuInputManager.CurrentState, osuInputManager);
} }
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> rrawableRuleset) public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
{ {
// grab the input manager for future use. // grab the input manager for future use.
osuInputManager = (OsuInputManager)rrawableRuleset.KeyBindingInputManager; osuInputManager = (OsuInputManager)drawableRuleset.KeyBindingInputManager;
osuInputManager.AllowUserPresses = false; osuInputManager.AllowUserPresses = false;
} }
} }

4
osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
View File

@ -15,8 +15,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
{ {
internal class OsuScoreProcessor : ScoreProcessor<OsuHitObject> internal class OsuScoreProcessor : ScoreProcessor<OsuHitObject>
{ {
public OsuScoreProcessor(DrawableRuleset<OsuHitObject> rrawableRuleset) public OsuScoreProcessor(DrawableRuleset<OsuHitObject> drawableRuleset)
: base(rrawableRuleset) : base(drawableRuleset)
{ {
} }

6
osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
View File

@ -22,10 +22,10 @@ namespace osu.Game.Rulesets.Taiko.Mods
private TaikoPlayfield playfield; private TaikoPlayfield playfield;
public override void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> rrawableRuleset) public override void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> drawableRuleset)
{ {
playfield = (TaikoPlayfield)rrawableRuleset.Playfield; playfield = (TaikoPlayfield)drawableRuleset.Playfield;
base.ApplyToDrawableRuleset(rrawableRuleset); base.ApplyToDrawableRuleset(drawableRuleset);
} }
private class TaikoFlashlight : Flashlight private class TaikoFlashlight : Flashlight

4
osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
View File

@ -32,8 +32,8 @@ namespace osu.Game.Rulesets.Taiko.Scoring
/// </summary> /// </summary>
private double hpMissMultiplier; private double hpMissMultiplier;
public TaikoScoreProcessor(DrawableRuleset<TaikoHitObject> rrawableRuleset) public TaikoScoreProcessor(DrawableRuleset<TaikoHitObject> drawableRuleset)
: base(rrawableRuleset) : base(drawableRuleset)
{ {
} }

24
osu.Game/Rulesets/Edit/EditDrawableRuleset.cs
View File

@ -41,18 +41,18 @@ namespace osu.Game.Rulesets.Edit
public class EditDrawableRuleset<TObject> : EditDrawableRuleset public class EditDrawableRuleset<TObject> : EditDrawableRuleset
where TObject : HitObject where TObject : HitObject
{ {
public override Playfield Playfield => rrawableRuleset.Playfield; public override Playfield Playfield => drawableRuleset.Playfield;
private Ruleset ruleset => rrawableRuleset.Ruleset; private Ruleset ruleset => drawableRuleset.Ruleset;
private Beatmap<TObject> beatmap => rrawableRuleset.Beatmap; private Beatmap<TObject> beatmap => drawableRuleset.Beatmap;
private readonly DrawableRuleset<TObject> rrawableRuleset; private readonly DrawableRuleset<TObject> drawableRuleset;
public EditDrawableRuleset(DrawableRuleset<TObject> rrawableRuleset) public EditDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
{ {
this.rrawableRuleset = rrawableRuleset; this.drawableRuleset = drawableRuleset;
InternalChild = rrawableRuleset; InternalChild = drawableRuleset;
Playfield.DisplayJudgements.Value = false; Playfield.DisplayJudgements.Value = false;
} }
@ -73,10 +73,10 @@ namespace osu.Game.Rulesets.Edit
processor?.PostProcess(); processor?.PostProcess();
// Add visual representation // Add visual representation
var drawableObject = rrawableRuleset.GetVisualRepresentation(tObject); var drawableObject = drawableRuleset.GetVisualRepresentation(tObject);
rrawableRuleset.Playfield.Add(drawableObject); drawableRuleset.Playfield.Add(drawableObject);
rrawableRuleset.Playfield.PostProcess(); drawableRuleset.Playfield.PostProcess();
return drawableObject; return drawableObject;
} }
@ -97,8 +97,8 @@ namespace osu.Game.Rulesets.Edit
// Remove visual representation // Remove visual representation
var drawableObject = Playfield.AllHitObjects.Single(d => d.HitObject == hitObject); var drawableObject = Playfield.AllHitObjects.Single(d => d.HitObject == hitObject);
rrawableRuleset.Playfield.Remove(drawableObject); drawableRuleset.Playfield.Remove(drawableObject);
rrawableRuleset.Playfield.PostProcess(); drawableRuleset.Playfield.PostProcess();
return drawableObject; return drawableObject;
} }

4
osu.Game/Rulesets/Mods/IApplicableToDrawableRuleset.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mods
/// <summary> /// <summary>
/// Applies this <see cref="IApplicableToDrawableRuleset{TObject}"/> to a <see cref="DrawableRuleset{TObject}"/>. /// Applies this <see cref="IApplicableToDrawableRuleset{TObject}"/> to a <see cref="DrawableRuleset{TObject}"/>.
/// </summary> /// </summary>
/// <param name="rrawableRuleset">The <see cref="DrawableRuleset{TObject}"/> to apply to.</param> /// <param name="drawableRuleset">The <see cref="DrawableRuleset{TObject}"/> to apply to.</param>
void ApplyToDrawableRuleset(DrawableRuleset<TObject> rrawableRuleset); void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset);
} }
} }

2
osu.Game/Rulesets/Mods/ModAutoplay.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
public abstract class ModAutoplay<T> : ModAutoplay, IApplicableToDrawableRuleset<T> public abstract class ModAutoplay<T> : ModAutoplay, IApplicableToDrawableRuleset<T>
where T : HitObject where T : HitObject
{ {
public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> rrawableRuleset) => rrawableRuleset.SetReplayScore(CreateReplayScore(rrawableRuleset.Beatmap)); public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset) => drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap));
} }
public abstract class ModAutoplay : Mod, IApplicableFailOverride public abstract class ModAutoplay : Mod, IApplicableFailOverride

6
osu.Game/Rulesets/Mods/ModFlashlight.cs
View File

@ -45,15 +45,15 @@ namespace osu.Game.Rulesets.Mods
Combo.BindTo(scoreProcessor.Combo); Combo.BindTo(scoreProcessor.Combo);
} }
public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> rrawableRuleset) public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
{ {
var flashlight = CreateFlashlight(); var flashlight = CreateFlashlight();
flashlight.Combo = Combo; flashlight.Combo = Combo;
flashlight.RelativeSizeAxes = Axes.Both; flashlight.RelativeSizeAxes = Axes.Both;
flashlight.Colour = Color4.Black; flashlight.Colour = Color4.Black;
rrawableRuleset.KeyBindingInputManager.Add(flashlight); drawableRuleset.KeyBindingInputManager.Add(flashlight);
flashlight.Breaks = rrawableRuleset.Beatmap.Breaks; flashlight.Breaks = drawableRuleset.Beatmap.Breaks;
} }
public abstract Flashlight CreateFlashlight(); public abstract Flashlight CreateFlashlight();

10
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -210,15 +210,15 @@ namespace osu.Game.Rulesets.Scoring
{ {
} }
public ScoreProcessor(DrawableRuleset<TObject> rrawableRuleset) public ScoreProcessor(DrawableRuleset<TObject> drawableRuleset)
{ {
Debug.Assert(base_portion + combo_portion == 1.0); Debug.Assert(base_portion + combo_portion == 1.0);
rrawableRuleset.OnNewResult += applyResult; drawableRuleset.OnNewResult += applyResult;
rrawableRuleset.OnRevertResult += revertResult; drawableRuleset.OnRevertResult += revertResult;
ApplyBeatmap(rrawableRuleset.Beatmap); ApplyBeatmap(drawableRuleset.Beatmap);
SimulateAutoplay(rrawableRuleset.Beatmap); SimulateAutoplay(drawableRuleset.Beatmap);
Reset(true); Reset(true);
if (maxBaseScore == 0 || maxHighestCombo == 0) if (maxBaseScore == 0 || maxHighestCombo == 0)