From db56fb57594ad14d1713c68778d207c21a3892e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 22:28:47 +0900
Subject: [PATCH 1/3] Fix venera font usage

---
 osu.Game/Graphics/OsuFont.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 54a25875bf..113816a14a 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics
         /// </summary>
         public static FontUsage Default => GetFont();
 
-        public static FontUsage Numeric => GetFont(Typeface.Venera, weight: FontWeight.Regular);
+        public static FontUsage Numeric => GetFont(Typeface.Venera);
 
         public static FontUsage Torus => GetFont(Typeface.Torus, weight: FontWeight.Regular);
 

From 4294ed4b6495e40bcb9c2eb9664f9e369cd949d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 11:21:37 +0900
Subject: [PATCH 2/3] Better align fonts to weights

---
 osu.Game/Graphics/OsuFont.cs                 | 37 ++++++++++++++++----
 osu.Game/Online/Leaderboards/DrawableRank.cs |  2 +-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 113816a14a..4dd7bcdf31 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics
         /// </summary>
         public static FontUsage Default => GetFont();
 
-        public static FontUsage Numeric => GetFont(Typeface.Venera);
+        public static FontUsage Numeric => GetFont(Typeface.Venera, weight: FontWeight.Bold);
 
         public static FontUsage Torus => GetFont(Typeface.Torus, weight: FontWeight.Regular);
 
@@ -103,11 +103,34 @@ namespace osu.Game.Graphics
 
     public enum FontWeight
     {
-        Light,
-        Regular,
-        Medium,
-        SemiBold,
-        Bold,
-        Black
+        /// <summary>
+        /// equivalent to weight 300
+        /// </summary>
+        Light = 300,
+
+        /// <summary>
+        /// equivalent to weight 400
+        /// </summary>
+        Regular = 400,
+
+        /// <summary>
+        /// equivalent to weight 500
+        /// </summary>
+        Medium = 500,
+
+        /// <summary>
+        /// equivalent to weight 600
+        /// </summary>
+        SemiBold = 600,
+
+        /// <summary>
+        /// equivalent to weight 700
+        /// </summary>
+        Bold = 700,
+
+        /// <summary>
+        /// equivalent to weight 900
+        /// </summary>
+        Black = 900
     }
 }
diff --git a/osu.Game/Online/Leaderboards/DrawableRank.cs b/osu.Game/Online/Leaderboards/DrawableRank.cs
index 50cb58c6ab..20bda4601f 100644
--- a/osu.Game/Online/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Online/Leaderboards/DrawableRank.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Online.Leaderboards
                             Spacing = new Vector2(-3, 0),
                             Padding = new MarginPadding { Top = 5 },
                             Colour = getRankNameColour(),
-                            Font = OsuFont.GetFont(Typeface.Venera, 25),
+                            Font = OsuFont.Numeric.With(size: 25),
                             Text = getRankName(),
                             ShadowColour = Color4.Black.Opacity(0.3f),
                             ShadowOffset = new Vector2(0, 0.08f),

From 75968fb4baa8657c49f0bf9865a83c842553279b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 11:46:48 +0900
Subject: [PATCH 3/3] Update resources once more

---
 osu.Android.props        | 2 +-
 osu.Game/OsuGameBase.cs  | 4 ++--
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index d62011bf1d..1c4a6ffe75 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.302.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 676b4b6c7a..a890331f05 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -162,9 +162,9 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Torus-Regular");
             AddFont(Resources, @"Fonts/Torus-Light");
 
-            AddFont(Resources, @"Fonts/Venera");
             AddFont(Resources, @"Fonts/Venera-Light");
-            AddFont(Resources, @"Fonts/Venera-Medium");
+            AddFont(Resources, @"Fonts/Venera-Bold");
+            AddFont(Resources, @"Fonts/Venera-Black");
 
             runMigrations();
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e407fca8b7..4d59b709aa 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index cc0b8074bb..6897d3e625 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.302.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->