mirror of
https://github.com/ppy/osu.git
synced 2025-02-20 04:23:14 +08:00
Fix typo
This commit is contained in:
parent
e0ab40b082
commit
3b7a76aa4e
@ -21,10 +21,10 @@ namespace osu.Game.Rulesets.Catch.Mods
|
||||
|
||||
private CatchPlayfield playfield;
|
||||
|
||||
public override void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> rrawableRuleset)
|
||||
public override void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
|
||||
{
|
||||
playfield = (CatchPlayfield)rrawableRuleset.Playfield;
|
||||
base.ApplyToDrawableRuleset(rrawableRuleset);
|
||||
playfield = (CatchPlayfield)drawableRuleset.Playfield;
|
||||
base.ApplyToDrawableRuleset(drawableRuleset);
|
||||
}
|
||||
|
||||
private class CatchFlashlight : Flashlight
|
||||
|
@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Catch.Scoring
|
||||
{
|
||||
public class CatchScoreProcessor : ScoreProcessor<CatchHitObject>
|
||||
{
|
||||
public CatchScoreProcessor(DrawableRuleset<CatchHitObject> rrawableRuleset)
|
||||
: base(rrawableRuleset)
|
||||
public CatchScoreProcessor(DrawableRuleset<CatchHitObject> drawableRuleset)
|
||||
: base(drawableRuleset)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -92,8 +92,8 @@ namespace osu.Game.Rulesets.Mania.Scoring
|
||||
{
|
||||
}
|
||||
|
||||
public ManiaScoreProcessor(DrawableRuleset<ManiaHitObject> rrawableRuleset)
|
||||
: base(rrawableRuleset)
|
||||
public ManiaScoreProcessor(DrawableRuleset<ManiaHitObject> drawableRuleset)
|
||||
: base(drawableRuleset)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -32,9 +32,9 @@ namespace osu.Game.Rulesets.Osu.Mods
|
||||
public override double ScoreMultiplier => 1.12;
|
||||
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)
|
||||
|
@ -79,10 +79,10 @@ namespace osu.Game.Rulesets.Osu.Mods
|
||||
state.Apply(osuInputManager.CurrentState, osuInputManager);
|
||||
}
|
||||
|
||||
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> rrawableRuleset)
|
||||
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
|
||||
{
|
||||
// grab the input manager for future use.
|
||||
osuInputManager = (OsuInputManager)rrawableRuleset.KeyBindingInputManager;
|
||||
osuInputManager = (OsuInputManager)drawableRuleset.KeyBindingInputManager;
|
||||
osuInputManager.AllowUserPresses = false;
|
||||
}
|
||||
}
|
||||
|
@ -15,8 +15,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
|
||||
{
|
||||
internal class OsuScoreProcessor : ScoreProcessor<OsuHitObject>
|
||||
{
|
||||
public OsuScoreProcessor(DrawableRuleset<OsuHitObject> rrawableRuleset)
|
||||
: base(rrawableRuleset)
|
||||
public OsuScoreProcessor(DrawableRuleset<OsuHitObject> drawableRuleset)
|
||||
: base(drawableRuleset)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -22,10 +22,10 @@ namespace osu.Game.Rulesets.Taiko.Mods
|
||||
|
||||
private TaikoPlayfield playfield;
|
||||
|
||||
public override void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> rrawableRuleset)
|
||||
public override void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> drawableRuleset)
|
||||
{
|
||||
playfield = (TaikoPlayfield)rrawableRuleset.Playfield;
|
||||
base.ApplyToDrawableRuleset(rrawableRuleset);
|
||||
playfield = (TaikoPlayfield)drawableRuleset.Playfield;
|
||||
base.ApplyToDrawableRuleset(drawableRuleset);
|
||||
}
|
||||
|
||||
private class TaikoFlashlight : Flashlight
|
||||
|
@ -32,8 +32,8 @@ namespace osu.Game.Rulesets.Taiko.Scoring
|
||||
/// </summary>
|
||||
private double hpMissMultiplier;
|
||||
|
||||
public TaikoScoreProcessor(DrawableRuleset<TaikoHitObject> rrawableRuleset)
|
||||
: base(rrawableRuleset)
|
||||
public TaikoScoreProcessor(DrawableRuleset<TaikoHitObject> drawableRuleset)
|
||||
: base(drawableRuleset)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -41,18 +41,18 @@ namespace osu.Game.Rulesets.Edit
|
||||
public class EditDrawableRuleset<TObject> : EditDrawableRuleset
|
||||
where TObject : HitObject
|
||||
{
|
||||
public override Playfield Playfield => rrawableRuleset.Playfield;
|
||||
public override Playfield Playfield => drawableRuleset.Playfield;
|
||||
|
||||
private Ruleset ruleset => rrawableRuleset.Ruleset;
|
||||
private Beatmap<TObject> beatmap => rrawableRuleset.Beatmap;
|
||||
private Ruleset ruleset => drawableRuleset.Ruleset;
|
||||
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;
|
||||
}
|
||||
@ -73,10 +73,10 @@ namespace osu.Game.Rulesets.Edit
|
||||
processor?.PostProcess();
|
||||
|
||||
// Add visual representation
|
||||
var drawableObject = rrawableRuleset.GetVisualRepresentation(tObject);
|
||||
var drawableObject = drawableRuleset.GetVisualRepresentation(tObject);
|
||||
|
||||
rrawableRuleset.Playfield.Add(drawableObject);
|
||||
rrawableRuleset.Playfield.PostProcess();
|
||||
drawableRuleset.Playfield.Add(drawableObject);
|
||||
drawableRuleset.Playfield.PostProcess();
|
||||
|
||||
return drawableObject;
|
||||
}
|
||||
@ -97,8 +97,8 @@ namespace osu.Game.Rulesets.Edit
|
||||
// Remove visual representation
|
||||
var drawableObject = Playfield.AllHitObjects.Single(d => d.HitObject == hitObject);
|
||||
|
||||
rrawableRuleset.Playfield.Remove(drawableObject);
|
||||
rrawableRuleset.Playfield.PostProcess();
|
||||
drawableRuleset.Playfield.Remove(drawableObject);
|
||||
drawableRuleset.Playfield.PostProcess();
|
||||
|
||||
return drawableObject;
|
||||
}
|
||||
|
@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mods
|
||||
/// <summary>
|
||||
/// Applies this <see cref="IApplicableToDrawableRuleset{TObject}"/> to a <see cref="DrawableRuleset{TObject}"/>.
|
||||
/// </summary>
|
||||
/// <param name="rrawableRuleset">The <see cref="DrawableRuleset{TObject}"/> to apply to.</param>
|
||||
void ApplyToDrawableRuleset(DrawableRuleset<TObject> rrawableRuleset);
|
||||
/// <param name="drawableRuleset">The <see cref="DrawableRuleset{TObject}"/> to apply to.</param>
|
||||
void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset);
|
||||
}
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
|
||||
public abstract class ModAutoplay<T> : ModAutoplay, IApplicableToDrawableRuleset<T>
|
||||
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
|
||||
|
@ -45,15 +45,15 @@ namespace osu.Game.Rulesets.Mods
|
||||
Combo.BindTo(scoreProcessor.Combo);
|
||||
}
|
||||
|
||||
public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> rrawableRuleset)
|
||||
public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
|
||||
{
|
||||
var flashlight = CreateFlashlight();
|
||||
flashlight.Combo = Combo;
|
||||
flashlight.RelativeSizeAxes = Axes.Both;
|
||||
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();
|
||||
|
@ -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);
|
||||
|
||||
rrawableRuleset.OnNewResult += applyResult;
|
||||
rrawableRuleset.OnRevertResult += revertResult;
|
||||
drawableRuleset.OnNewResult += applyResult;
|
||||
drawableRuleset.OnRevertResult += revertResult;
|
||||
|
||||
ApplyBeatmap(rrawableRuleset.Beatmap);
|
||||
SimulateAutoplay(rrawableRuleset.Beatmap);
|
||||
ApplyBeatmap(drawableRuleset.Beatmap);
|
||||
SimulateAutoplay(drawableRuleset.Beatmap);
|
||||
Reset(true);
|
||||
|
||||
if (maxBaseScore == 0 || maxHighestCombo == 0)
|
||||
|
Loading…
Reference in New Issue
Block a user