Tweak mega-scale labels

inexorabletash · Feb 2, 2017 · 072eea8 · 072eea8
1 parent faa4711
commit 072eea8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/server/RenderContext.cs b/server/RenderContext.cs
@@ -87,13 +87,13 @@ private class MapLabel
         private static readonly MapLabel[] megaLabels =
         {
             new MapLabel("Charted Space", 0, 400, true),
-            new MapLabel("Zhodani Core Expeditions", 0, -2000, true),
-            new MapLabel("Core Sophonts", 0, -10000),
-            new MapLabel("Abyssals", -12000, -8500),
-            new MapLabel("Denizens", -7000, -7000),
-            new MapLabel("Essaray", 6000, -12000),
-            new MapLabel("Dushis Khurisi", 0, -19000, true),
-            new MapLabel("The Barren Arm", 8000, -4500, true),
+            new MapLabel("Zhodani\nCore\nExpeditions", 0, -3500, true),
+            new MapLabel("Core Sophonts", 0, -12500),
+            new MapLabel("Abyssals", -13000, -10000),
+            new MapLabel("Denizens", -7500, -7500),
+            new MapLabel("Essaray", 6000, -16000),
+            new MapLabel("Dushis Khurisi", 0, -22000, true),
+            new MapLabel("The\nBarren\nArm", 8000, -4500, true),
         };
 
         private static readonly string[] borderFiles = {

diff --git a/server/Stylesheet.cs b/server/Stylesheet.cs
@@ -332,10 +332,10 @@ public Stylesheet(double scale, MapOptions options, Style style)
             macroNames.smallFontInfo = new FontInfo(DEFAULT_FONT, 5f / 1.4f, FontStyle.Regular);
             macroNames.mediumFontInfo = new FontInfo(DEFAULT_FONT, 6.5f / 1.4f, FontStyle.Italic);
 
-            float megaNameScaleFactor = 1.0f * onePixel;
+            float megaNameScaleFactor = Math.Min(35f, 0.75f * onePixel);
             megaNames.fontInfo = new FontInfo(DEFAULT_FONT, 24f * megaNameScaleFactor, FontStyle.Bold);
             megaNames.mediumFontInfo = new FontInfo(DEFAULT_FONT, 22f * megaNameScaleFactor, FontStyle.Regular);
-            megaNames.smallFontInfo = new FontInfo(DEFAULT_FONT, 20f * megaNameScaleFactor, FontStyle.Italic);
+            megaNames.smallFontInfo = new FontInfo(DEFAULT_FONT, 18f * megaNameScaleFactor, FontStyle.Italic);
 
             capitals.fillColor = Color.Wheat;
             capitals.textColor = Color.Red;