Move combo colours completely out of beatmap

osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs

@@ -16,11 +16,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
     {
         public override void PostProcess(Beatmap<CatchHitObject> beatmap)
         {
-            if (beatmap.ComboColours.Count == 0)
-                return;
-
             int index = 0;
-            int colourIndex = 0;
 
             CatchHitObject lastObj = null;
 
@@ -31,11 +27,9 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 if (obj.NewCombo)
                 {
                     if (lastObj != null) lastObj.LastInCombo = true;
-                    colourIndex = (colourIndex + 1) % beatmap.ComboColours.Count;
                 }
 
                 obj.IndexInBeatmap = index++;
-                obj.ComboColour = beatmap.ComboColours[colourIndex];
 
                 lastObj = obj;
             }

osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs

@@ -14,22 +14,16 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
         {
             applyStacking(beatmap);
 
-            if (beatmap.ComboColours.Count == 0)
-                return;
-
             int comboIndex = 0;
-            int colourIndex = 0;
 
             foreach (var obj in beatmap.HitObjects)
             {
                 if (obj.NewCombo)
                 {
                     comboIndex = 0;
-                    colourIndex = (colourIndex + 1) % beatmap.ComboColours.Count;
                 }
 
                 obj.IndexInCurrentCombo = comboIndex++;
-                obj.ComboColour = beatmap.ComboColours[colourIndex];
             }
         }
 

osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs

@@ -11,6 +11,7 @@ using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Beatmaps.Formats
 {
@@ -163,7 +164,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         [Test]
         public void TestDecodeBeatmapColors()
         {
-            var decoder = new LegacyBeatmapDecoder();
+            var decoder = new LegacySkinDecoder();
             using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {

osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs

@@ -12,7 +12,6 @@ using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Tests.Resources;
 using OpenTK;
-using OpenTK.Graphics;
 
 namespace osu.Game.Tests.Beatmaps.Formats
 {
@@ -89,24 +88,6 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.AreEqual(2, difficulty.SliderTickRate);
         }
 
-        [Test]
-        public void TestDecodeColors()
-        {
-            var beatmap = decodeAsJson(normal);
-            Color4[] expected =
-            {
-                new Color4(142, 199, 255, 255),
-                new Color4(255, 128, 128, 255),
-                new Color4(128, 255, 255, 255),
-                new Color4(128, 255, 128, 255),
-                new Color4(255, 187, 255, 255),
-                new Color4(255, 177, 140, 255),
-            };
-            Assert.AreEqual(expected.Length, beatmap.ComboColours.Count);
-            for (int i = 0; i < expected.Length; i++)
-                Assert.AreEqual(expected[i], beatmap.ComboColours[i]);
-        }
-
         [Test]
         public void TestDecodeHitObjects()
         {

osu.Game/Beatmaps/Beatmap.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Graphics;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Objects;
 using System.Collections.Generic;
@@ -9,7 +8,6 @@ using System.Linq;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.IO.Serialization;
 using Newtonsoft.Json;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.IO.Serialization.Converters;
 
 namespace osu.Game.Beatmaps
@@ -17,21 +15,13 @@ namespace osu.Game.Beatmaps
     /// <summary>
     /// A Beatmap containing converted HitObjects.
     /// </summary>
-    public class Beatmap<T> : IJsonSerializable, IHasComboColours
+    public class Beatmap<T> : IJsonSerializable
         where T : HitObject
     {
         public BeatmapInfo BeatmapInfo = new BeatmapInfo();
         public ControlPointInfo ControlPointInfo = new ControlPointInfo();
         public List<BreakPeriod> Breaks = new List<BreakPeriod>();
 
-        public List<Color4> ComboColours { get; set; } = new List<Color4>
-        {
-            new Color4(17, 136, 170, 255),
-            new Color4(102, 136, 0, 255),
-            new Color4(204, 102, 0, 255),
-            new Color4(121, 9, 13, 255)
-        };
-
         [JsonIgnore]
         public BeatmapMetadata Metadata => BeatmapInfo?.Metadata ?? BeatmapInfo?.BeatmapSet?.Metadata;
 
@@ -56,7 +46,6 @@ namespace osu.Game.Beatmaps
             BeatmapInfo = original?.BeatmapInfo.DeepClone() ?? BeatmapInfo;
             ControlPointInfo = original?.ControlPointInfo ?? ControlPointInfo;
             Breaks = original?.Breaks ?? Breaks;
-            ComboColours = original?.ComboColours ?? ComboColours;
             HitObjects = original?.HitObjects ?? HitObjects;
 
             if (original == null && Metadata == null)

osu.Game/Beatmaps/BeatmapConverter.cs

@@ -57,7 +57,6 @@ namespace osu.Game.Beatmaps
             beatmap.ControlPointInfo = original.ControlPointInfo;
             beatmap.HitObjects = original.HitObjects.SelectMany(h => convert(h, original)).ToList();
             beatmap.Breaks = original.Breaks;
-            beatmap.ComboColours = original.ComboColours;
 
             return beatmap;
         }