Merge pull request #2458 from 4ppleCracker/patch-1

Use more inheritance for UserStatus
ppy · May 2, 2018 · 6fe09ee · 6fe09ee
2 parents 6779384 + 0ad0499
commit 6fe09ee
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/osu.Game/Users/UserStatus.cs b/osu.Game/Users/UserStatus.cs
@@ -12,12 +12,13 @@ public abstract class UserStatus
         public abstract Color4 GetAppropriateColour(OsuColour colours);
     }
 
-    public abstract class UserStatusAvailable : UserStatus
+    public class UserStatusOnline : UserStatus
     {
+        public override string Message => @"Online";
         public override Color4 GetAppropriateColour(OsuColour colours) => colours.BlueDarker;
     }
 
-    public abstract class UserStatusBusy : UserStatus
+    public abstract class UserStatusBusy : UserStatusOnline
     {
         public override Color4 GetAppropriateColour(OsuColour colours) => colours.YellowDark;
     }
@@ -28,17 +29,12 @@ public class UserStatusOffline : UserStatus
         public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray7;
     }
 
-    public class UserStatusOnline : UserStatusAvailable
-    {
-        public override string Message => @"Online";
-    }
-
-    public class UserStatusSpectating : UserStatusAvailable
+    public class UserStatusSpectating : UserStatusOnline
     {
         public override string Message => @"Spectating a game";
     }
 
-    public class UserStatusInLobby : UserStatusAvailable
+    public class UserStatusInLobby : UserStatusOnline
     {
         public override string Message => @"in Multiplayer Lobby";
     }
@@ -53,13 +49,13 @@ public class UserStatusMultiplayerGame : UserStatusBusy
         public override string Message => @"Multiplaying";
     }
 
-    public class UserStatusModding : UserStatus
+    public class UserStatusModding : UserStatusOnline
     {
         public override string Message => @"Modding a map";
         public override Color4 GetAppropriateColour(OsuColour colours) => colours.PurpleDark;
     }
 
-    public class UserStatusDoNotDisturb : UserStatus
+    public class UserStatusDoNotDisturb : UserStatusBusy
     {
         public override string Message => @"Do not disturb";
         public override Color4 GetAppropriateColour(OsuColour colours) => colours.RedDark;