Apply more missed cases

ppy · Apr 1, 2019 · c39c37a · c39c37a
1 parent 612db31
commit c39c37a
Show file tree

Hide file tree

Showing 95 changed files with 250 additions and 0 deletions.
diff --git a/osu.Desktop/Updater/SimpleUpdateManager.cs b/osu.Desktop/Updater/SimpleUpdateManager.cs
@@ -78,6 +78,7 @@ private string getBestUrl(GitHubRelease release)
                 case RuntimeInfo.Platform.Windows:
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".exe"));
                     break;
+
                 case RuntimeInfo.Platform.MacOsx:
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip"));
                     break;

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -36,11 +36,13 @@ protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObj
                         yield return new ConvertValue((CatchHitObject)nested);
 
                     break;
+
                 case BananaShower shower:
                     foreach (var nested in shower.NestedHitObjects)
                         yield return new ConvertValue((CatchHitObject)nested);
 
                     break;
+
                 default:
                     yield return new ConvertValue((CatchHitObject)hitObject);
 

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -87,6 +87,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                         new CatchModNoFail(),
                         new MultiMod(new CatchModHalfTime(), new CatchModDaycore())
                     };
+
                 case ModType.DifficultyIncrease:
                     return new Mod[]
                     {
@@ -96,17 +97,20 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                         new CatchModHidden(),
                         new CatchModFlashlight(),
                     };
+
                 case ModType.Automation:
                     return new Mod[]
                     {
                         new MultiMod(new CatchModAutoplay(), new ModCinema()),
                         new CatchModRelax(),
                     };
+
                 case ModType.Fun:
                     return new Mod[]
                     {
                         new MultiMod(new ModWindUp<CatchHitObject>(), new ModWindDown<CatchHitObject>())
                     };
+
                 default:
                     return new Mod[] { };
             }

diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs
@@ -16,6 +16,7 @@ protected override int NumericResultFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 1100;
             }
@@ -27,6 +28,7 @@ protected override double HealthIncreaseFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 8;
             }

diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
@@ -13,6 +13,7 @@ protected override int NumericResultFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 30;
             }
@@ -24,6 +25,7 @@ protected override double HealthIncreaseFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 7;
             }

diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
@@ -17,6 +17,7 @@ protected override int NumericResultFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 300;
             }
@@ -28,6 +29,7 @@ protected override double HealthIncreaseFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 10.2;
             }

diff --git a/osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs b/osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs
@@ -15,6 +15,7 @@ protected override int NumericResultFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 10;
             }
@@ -26,6 +27,7 @@ protected override double HealthIncreaseFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 4;
             }

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
@@ -84,6 +84,7 @@ protected override void UpdateState(ArmedState state)
                     case ArmedState.Miss:
                         this.FadeOut(250).RotateTo(Rotation * 2, 250, Easing.Out).Expire();
                         break;
+
                     case ArmedState.Hit:
                         this.FadeOut().Expire();
                         break;

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -95,6 +95,7 @@ protected override void CreateNestedHitObjects()
                             X = X + Path.PositionAt(e.PathProgress).X / CatchPlayfield.BASE_WIDTH,
                         });
                         break;
+
                     case SliderEventType.Head:
                     case SliderEventType.Tail:
                     case SliderEventType.Repeat:

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -46,14 +46,19 @@ public override DrawableHitObject<CatchHitObject> CreateDrawableRepresentation(C
             {
                 case Banana banana:
                     return new DrawableBanana(banana);
+
                 case Fruit fruit:
                     return new DrawableFruit(fruit);
+
                 case JuiceStream stream:
                     return new DrawableJuiceStream(stream, CreateDrawableRepresentation);
+
                 case BananaShower shower:
                     return new DrawableBananaShower(shower, CreateDrawableRepresentation);
+
                 case TinyDroplet tiny:
                     return new DrawableTinyDroplet(tiny);
+
                 case Droplet droplet:
                     return new DrawableDroplet(droplet);
             }

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -38,9 +38,11 @@ private Pattern generate()
                 case 8 when HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_FINISH) && endTime - HitObject.StartTime < 1000:
                     addToPattern(pattern, 0, generateHold);
                     break;
+
                 case 8:
                     addToPattern(pattern, FindAvailableColumn(GetRandomColumn(), PreviousPattern), generateHold);
                     break;
+
                 default:
                     if (TotalColumns > 0)
                         addToPattern(pattern, GetRandomColumn(), generateHold);

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -65,6 +65,7 @@ public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObjec
             {
                 case DrawableNote note:
                     return new NoteSelectionBlueprint(note);
+
                 case DrawableHoldNote holdNote:
                     return new HoldNoteSelectionBlueprint(holdNote);
             }

diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
@@ -14,12 +14,16 @@ protected override int NumericResultFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Meh:
                     return 50;
+
                 case HitResult.Ok:
                     return 100;
+
                 case HitResult.Good:
                     return 200;
+
                 case HitResult.Great:
                 case HitResult.Perfect:
                     return 300;

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -65,6 +65,7 @@ protected override void UpdateState(ArmedState state)
                 case ArmedState.Miss:
                     this.FadeOut(150, Easing.In).Expire();
                     break;
+
                 case ArmedState.Hit:
                     this.FadeOut(150, Easing.OutQuint).Expire();
                     break;

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -140,18 +140,23 @@ protected override void ApplyResult(JudgementResult result)
                     case HitResult.Miss:
                         Health.Value += hpMissMultiplier * hp_increase_miss;
                         break;
+
                     case HitResult.Meh:
                         Health.Value += hpMultiplier * hp_increase_bad;
                         break;
+
                     case HitResult.Ok:
                         Health.Value += hpMultiplier * hp_increase_ok;
                         break;
+
                     case HitResult.Good:
                         Health.Value += hpMultiplier * hp_increase_good;
                         break;
+
                     case HitResult.Great:
                         Health.Value += hpMultiplier * hp_increase_great;
                         break;
+
                     case HitResult.Perfect:
                         Health.Value += hpMultiplier * hp_increase_perfect;
                         break;

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -35,6 +35,7 @@ protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObj
                         yield return createConvertValue(nested);
 
                     break;
+
                 default:
                     yield return createConvertValue(hitObject);
 

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
@@ -37,6 +37,7 @@ protected override void UpdatePosition()
                 case SliderPosition.Start:
                     Position = slider.StackedPosition + slider.Path.PositionAt(0);
                     break;
+
                 case SliderPosition.End:
                     Position = slider.StackedPosition + slider.Path.PositionAt(1);
                     break;

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -41,8 +41,10 @@ public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObjec
             {
                 case DrawableHitCircle circle:
                     return new HitCircleSelectionBlueprint(circle);
+
                 case DrawableSlider slider:
                     return new SliderSelectionBlueprint(slider);
+
                 case DrawableSpinner spinner:
                     return new SpinnerSelectionBlueprint(spinner);
             }

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
@@ -16,10 +16,13 @@ protected override int NumericResultFor(HitResult result)
             {
                 default:
                     return 0;
+
                 case HitResult.Meh:
                     return 50;
+
                 case HitResult.Good:
                     return 100;
+
                 case HitResult.Great:
                     return 300;
             }

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -59,11 +59,13 @@ protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState
                         circle.FadeOut(fadeOutDuration);
 
                     break;
+
                 case DrawableSlider slider:
                     using (slider.BeginAbsoluteSequence(fadeOutStartTime, true))
                         slider.Body.FadeOut(longFadeDuration, Easing.Out);
 
                     break;
+
                 case DrawableSliderTick sliderTick:
                     // slider ticks fade out over up to one second
                     var tickFadeOutDuration = Math.Min(sliderTick.HitObject.TimePreempt - DrawableSliderTick.ANIM_DURATION, 1000);
@@ -72,6 +74,7 @@ protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState
                         sliderTick.FadeOut(tickFadeOutDuration);
 
                     break;
+
                 case DrawableSpinner spinner:
                     // hide elements we don't care about.
                     spinner.Disc.Hide();

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
@@ -64,9 +64,11 @@ protected override void UpdateCurrentState(ArmedState state)
                 case ArmedState.Idle:
                     this.Delay(HitObject.TimePreempt).FadeOut();
                     break;
+
                 case ArmedState.Miss:
                     this.FadeOut(animDuration);
                     break;
+
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.OutQuint)
                         .ScaleTo(Scale * 1.5f, animDuration, Easing.Out);

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -67,10 +67,12 @@ protected override void UpdateCurrentState(ArmedState state)
                 case ArmedState.Idle:
                     this.Delay(HitObject.TimePreempt).FadeOut();
                     break;
+
                 case ArmedState.Miss:
                     this.FadeOut(ANIM_DURATION);
                     this.FadeColour(Color4.Red, ANIM_DURATION / 2);
                     break;
+
                 case ArmedState.Hit:
                     this.FadeOut(ANIM_DURATION, Easing.OutQuint);
                     this.ScaleTo(Scale * 1.5f, ANIM_DURATION, Easing.Out);

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -222,9 +222,11 @@ protected override void UpdateCurrentState(ArmedState state)
                 case ArmedState.Idle:
                     Expire(true);
                     break;
+
                 case ArmedState.Hit:
                     sequence.ScaleTo(Scale * 1.2f, 320, Easing.Out);
                     break;
+
                 case ArmedState.Miss:
                     sequence.ScaleTo(Scale * 0.8f, 320, Easing.In);
                     break;

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -183,6 +183,7 @@ protected override void CreateNestedHitObjects()
                             Samples = sampleList
                         });
                         break;
+
                     case SliderEventType.Head:
                         AddNested(HeadCircle = new SliderCircle
                         {
@@ -194,6 +195,7 @@ protected override void CreateNestedHitObjects()
                             ComboIndex = ComboIndex,
                         });
                         break;
+
                     case SliderEventType.LegacyLastTick:
                         // we need to use the LegacyLastTick here for compatibility reasons (difficulty).
                         // it is *okay* to use this because the TailCircle is not used for any meaningful purpose in gameplay.
@@ -206,6 +208,7 @@ protected override void CreateNestedHitObjects()
                             ComboIndex = ComboIndex,
                         });
                         break;
+
                     case SliderEventType.Repeat:
                         AddNested(new RepeatPoint
                         {

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -104,6 +104,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                         new MultiMod(new OsuModHalfTime(), new OsuModDaycore()),
                         new OsuModSpunOut(),
                     };
+
                 case ModType.DifficultyIncrease:
                     return new Mod[]
                     {
@@ -113,18 +114,21 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                         new OsuModHidden(),
                         new MultiMod(new OsuModFlashlight(), new OsuModBlinds()),
                     };
+
                 case ModType.Conversion:
                     return new Mod[]
                     {
                         new OsuModTarget(),
                     };
+
                 case ModType.Automation:
                     return new Mod[]
                     {
                         new MultiMod(new OsuModAutoplay(), new ModCinema()),
                         new OsuModRelax(),
                         new OsuModAutopilot(),
                     };
+
                 case ModType.Fun:
                     return new Mod[]
                     {
@@ -133,6 +137,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                         new OsuModGrow(),
                         new MultiMod(new ModWindUp<OsuHitObject>(), new ModWindDown<OsuHitObject>()),
                     };
+
                 default:
                     return new Mod[] { };
             }

diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -40,8 +40,10 @@ public override DrawableHitObject<OsuHitObject> CreateDrawableRepresentation(Osu
             {
                 case HitCircle circle:
                     return new DrawableHitCircle(circle);
+
                 case Slider slider:
                     return new DrawableSlider(slider);
+
                 case Spinner spinner:
                     return new DrawableSpinner(spinner);
             }