From aeb45c8442b34e8ef485ee3d2b5d91befd9d7095 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 19 Feb 2020 14:31:43 +0900 Subject: [PATCH] Fix ordering of fruits to match stable --- osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 +- osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs index 4abb9e61aa..02979f8aa0 100644 --- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs +++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs @@ -100,8 +100,8 @@ namespace osu.Game.Rulesets.Catch.Objects { Pear, Grape, - Raspberry, Pineapple, + Raspberry, Banana // banananananannaanana } } diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs index 2befb5dfd0..edcb5eb13d 100644 --- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs +++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs @@ -52,12 +52,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable case FruitVisualRepresentation.Grape: return CatchSkinComponents.FruitGrapes; - case FruitVisualRepresentation.Raspberry: - return CatchSkinComponents.FruitOrange; - case FruitVisualRepresentation.Pineapple: return CatchSkinComponents.FruitApple; + case FruitVisualRepresentation.Raspberry: + return CatchSkinComponents.FruitOrange; + case FruitVisualRepresentation.Banana: return CatchSkinComponents.FruitBananas;