Merge pull request #5192 from matija-hustic/spawnchoice

Spawnchoice
2014-05-17 17:53:00 +12:00
parent ce7fb707b2 6eac7a3e05
commit 28c0310357
32 changed files with 756 additions and 111 deletions
--- a/OpenRA.Game/Graphics/LineRenderer.cs
+++ b/OpenRA.Game/Graphics/LineRenderer.cs
@@ -90,6 +90,19 @@ namespace OpenRA.Graphics
 				DrawLine(new float2(r.Left, y), new float2(r.Right, y), color, color);
 		}

+		public void FillEllipse(RectangleF r, Color color)
+		{
+			var a = (r.Right - r.Left) / 2;
+			var b = (r.Bottom - r.Top) / 2;
+			var xc = (r.Right + r.Left) / 2;
+			var yc = (r.Bottom + r.Top) / 2;
+			for (var y = r.Top; y <= r.Bottom; y++)
+			{
+				var dx = a * System.Convert.ToSingle(System.Math.Sqrt(1 - (y - yc) * (y - yc) / b / b));
+				DrawLine(new float2(xc - dx, y), new float2(xc + dx, y), color, color);
+			}
+		}
+
 		public void SetViewportParams(Size screen, float zoom, float2 scroll)
 		{
 			shader.SetVec("Scroll", (int)scroll.X, (int)scroll.Y);
--- a/OpenRA.Game/Primitives/float2.cs
+++ b/OpenRA.Game/Primitives/float2.cs
@@ -66,6 +66,7 @@ namespace OpenRA
 		public static float2 operator *(float2 b, float a) { return new float2(a * b.X, a * b.Y); }
 		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
 		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
+		public static float2 operator /(float2 a, float b) { return new float2(a.X / b, a.Y / b); }

 		public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
 		public static bool operator !=(float2 me, float2 other) { return !(me == other); }
--- a/OpenRA.Game/Widgets/MapPreviewWidget.cs
+++ b/OpenRA.Game/Widgets/MapPreviewWidget.cs
@@ -117,14 +117,19 @@ namespace OpenRA.Widgets
 					var owned = colors.ContainsKey(p);
 					var pos = ConvertToPreview(p);
 					var sprite = ChromeProvider.GetImage("lobby-bits", owned ? "spawn-claimed" : "spawn-unclaimed");
-					var offset = new int2(-sprite.bounds.Width/2, -sprite.bounds.Height/2);
+					var offset = new int2(sprite.bounds.Width, sprite.bounds.Height) / 2;

 					if (owned)
-						WidgetUtils.FillRectWithColor(new Rectangle(pos.X + offset.X + 2, pos.Y + offset.Y + 2, 12, 12), colors[p]);
+						WidgetUtils.FillEllipseWithColor(new Rectangle(pos.X - offset.X + 1, pos.Y - offset.Y + 1, sprite.bounds.Width - 2, sprite.bounds.Height - 2), colors[p]);

-					Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos + offset);
+					Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos - offset);
+					var fonts = Game.Renderer.Fonts[ChromeMetrics.Get<string>("SpawnFont")];
+					var number = Convert.ToChar('A' + spawnPoints.IndexOf(p)).ToString();
+					offset = fonts.Measure(number) / 2;
+					offset.Y += 1; // Does not center well vertically for some reason
+					fonts.DrawTextWithContrast(number, pos - offset, ChromeMetrics.Get<Color>("SpawnColor"), ChromeMetrics.Get<Color>("SpawnContrastColor"), 1);

-					if ((pos - Viewport.LastMousePos).LengthSquared < 64)
+					if (((pos - Viewport.LastMousePos).ToFloat2() * offset.ToFloat2()).LengthSquared < 1)
 						TooltipSpawnIndex = spawnPoints.IndexOf(p) + 1;
 				}
 			}
--- a/OpenRA.Game/Widgets/WidgetUtils.cs
+++ b/OpenRA.Game/Widgets/WidgetUtils.cs
@@ -68,6 +68,11 @@ namespace OpenRA.Widgets
 			Game.Renderer.LineRenderer.FillRect(new RectangleF(r.X, r.Y, r.Width, r.Height), c);
 		}

+		public static void FillEllipseWithColor(Rectangle r, Color c)
+		{
+			Game.Renderer.LineRenderer.FillEllipse(new RectangleF(r.X, r.Y, r.Width, r.Height), c);
+		}
+
 		public static int[] GetBorderSizes(string collection)
 		{
 			var images = new[] { "border-t", "border-b", "border-l", "border-r" };
--- a/OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs
@@ -134,8 +134,8 @@ namespace OpenRA.Mods.RA.Widgets
 			Game.Renderer.RgbaSpriteRenderer.DrawSprite(mixerSprite, RenderOrigin, new float2(RenderBounds.Size));

 			var sprite = ChromeProvider.GetImage("lobby-bits", "colorpicker");
-			var pos = RenderOrigin + PxFromValue() - new int2(sprite.bounds.Width/2, sprite.bounds.Height/2);
-			WidgetUtils.FillRectWithColor(new Rectangle(pos.X + 3, pos.Y + 3, 10, 10), Color.RGB);
+			var pos = RenderOrigin + PxFromValue() - new int2(sprite.bounds.Width, sprite.bounds.Height) / 2;
+			WidgetUtils.FillEllipseWithColor(new Rectangle(pos.X + 1, pos.Y + 1, sprite.bounds.Width - 2, sprite.bounds.Height - 2), Color.RGB);
 			Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos);
 		}

--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -614,6 +614,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 					LobbyUtils.SetupEditableColorWidget(template, slot, client, orderManager, colorPreview);
 					LobbyUtils.SetupEditableFactionWidget(template, slot, client, orderManager, countryNames);
 					LobbyUtils.SetupEditableTeamWidget(template, slot, client, orderManager, Map);
+					LobbyUtils.SetupEditableSpawnWidget(template, slot, client, orderManager, Map);
 					LobbyUtils.SetupEditableReadyWidget(template, slot, client, orderManager, Map);
 				}
 				else
@@ -629,6 +630,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 					LobbyUtils.SetupColorWidget(template, slot, client);
 					LobbyUtils.SetupFactionWidget(template, slot, client, countryNames);
 					LobbyUtils.SetupTeamWidget(template, slot, client);
+					LobbyUtils.SetupSpawnWidget(template, slot, client);
 					LobbyUtils.SetupReadyWidget(template, slot, client);
 				}

--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
@@ -88,6 +88,23 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			dropdown.ShowDropDown("TEAM_DROPDOWN_TEMPLATE", 150, options, setupItem);
 		}

+		public static void ShowSpawnDropDown(DropDownButtonWidget dropdown, Session.Client client,
+			OrderManager orderManager, IEnumerable<int> spawnPoints)
+		{
+			Func<int, ScrollItemWidget, ScrollItemWidget> setupItem = (ii, itemTemplate) =>
+			{
+				var spawnPoint = spawnPoints.ToList()[ii];
+				var item = ScrollItemWidget.Setup(itemTemplate,
+					() => client.SpawnPoint == spawnPoint,
+					() => SetSpawnPoint(orderManager, client, spawnPoint));
+				item.Get<LabelWidget>("LABEL").GetText = () => spawnPoint == 0 ? "-" : Convert.ToChar('A' - 1 + spawnPoint).ToString();
+				return item;
+			};
+
+			var options = Exts.MakeArray(spawnPoints.Count(), i => i).ToList();
+			dropdown.ShowDropDown("SPAWN_DROPDOWN_TEMPLATE", 150, options, setupItem);
+		}
+
 		public static void ShowRaceDropDown(DropDownButtonWidget dropdown, Session.Client client,
 			OrderManager orderManager, Dictionary<string, string> countryNames)
 		{
@@ -150,17 +167,20 @@ namespace OpenRA.Mods.RA.Widgets.Logic

 			var selectedSpawn = preview.SpawnPoints
 				.Select((sp, i) => Pair.New(mapPreview.ConvertToPreview(sp), i))
-				.Where(a => (a.First - mi.Location).LengthSquared < 64)
+				.Where(a => ((a.First - mi.Location).ToFloat2() / new float2(ChromeProvider.GetImage("lobby-bits", "spawn-unclaimed").bounds.Width / 2, ChromeProvider.GetImage("lobby-bits", "spawn-unclaimed").bounds.Height / 2)).LengthSquared <= 1)
 				.Select(a => a.Second + 1)
 				.FirstOrDefault();

-			var owned = orderManager.LobbyInfo.Clients.Any(c => c.SpawnPoint == selectedSpawn);
-			if (selectedSpawn == 0 || !owned)
-			{
 			var locals = orderManager.LobbyInfo.Clients.Where(c => c.Index == orderManager.LocalClient.Index || (Game.IsHost && c.Bot != null));
 			var playerToMove = locals.FirstOrDefault(c => ((selectedSpawn == 0) ^ (c.SpawnPoint == 0) && !c.IsObserver));
-				orderManager.IssueOrder(Order.Command("spawn {0} {1}".F((playerToMove ?? orderManager.LocalClient).Index, selectedSpawn)));
+			SetSpawnPoint(orderManager, playerToMove, selectedSpawn);
 		}
+
+		private static void SetSpawnPoint(OrderManager orderManager, Session.Client playerToMove, int selectedSpawn)
+		{
+			var owned = orderManager.LobbyInfo.Clients.Any(c => c.SpawnPoint == selectedSpawn);
+			if (selectedSpawn == 0 || !owned)
+				orderManager.IssueOrder(Order.Command("spawn {0} {1}".F((playerToMove ?? orderManager.LocalClient).Index, selectedSpawn)));
 		}

 		public static Color LatencyColor(int latency)
@@ -384,6 +404,20 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			parent.Get<LabelWidget>("TEAM").GetText = () => (c.Team == 0) ? "-" : c.Team.ToString();
 		}

+		public static void SetupEditableSpawnWidget(Widget parent, Session.Slot s, Session.Client c, OrderManager orderManager, MapPreview map)
+		{
+			var dropdown = parent.Get<DropDownButtonWidget>("SPAWN");
+			dropdown.IsDisabled = () => s.LockSpawn || orderManager.LocalClient.IsReady;
+			dropdown.OnMouseDown = _ => ShowSpawnDropDown(dropdown, c, orderManager, Enumerable.Range(0, map.PlayerCount + 1)
+					.Except(orderManager.LobbyInfo.Clients.Where(client => client != c && client.SpawnPoint != 0).Select(client => client.SpawnPoint)));
+			dropdown.GetText = () => (c.SpawnPoint == 0) ? "-" : Convert.ToChar('A' - 1 + c.SpawnPoint).ToString();
+		}
+
+		public static void SetupSpawnWidget(Widget parent, Session.Slot s, Session.Client c)
+		{
+			parent.Get<LabelWidget>("SPAWN").GetText = () => (c.SpawnPoint == 0) ? "-" : c.SpawnPoint.ToString();
+		}
+
 		public static void SetupEditableReadyWidget(Widget parent, Session.Slot s, Session.Client c, OrderManager orderManager, MapPreview map)
 		{
 			var status = parent.Get<CheckboxWidget>("STATUS_CHECKBOX");
--- a/artsrc/cnc/chrome.svg
+++ b/artsrc/cnc/chrome.svg
@@ -13,9 +13,9 @@
   height="512"
   id="svg2"
   version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.4 r9939"
   sodipodi:docname="chrome.svg"
-   inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/chrome.png"
+   inkscape:export-filename="D:\Documents\Visual Studio 2013\Projects\OpenRA\mods\cnc\uibits\chrome.png"
   inkscape:export-xdpi="90"
   inkscape:export-ydpi="90"
   enable-background="new">
@@ -99,17 +99,17 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="399.83211"
-     inkscape:cy="452.59159"
+     inkscape:zoom="7.9999996"
+     inkscape:cx="465.51623"
+     inkscape:cy="457.58054"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
-     inkscape:window-width="1151"
-     inkscape:window-height="1004"
-     inkscape:window-x="540"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1027"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
     showguides="true"
     inkscape:guide-bbox="true">
    <sodipodi:guide
@@ -201,7 +201,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -696,7 +696,7 @@
       d="m 280,556.36218 -8,8 0,0 8,8 z"
       style="fill:#ffffff;fill-opacity:1;stroke:none" />
    <path
-       style="fill:#2b0000;fill-opacity:1;stroke:#3f0000;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="fill:#2b0000;fill-opacity:1;stroke:#3f0000;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
       d="M 264 32.5 C 259.85786 32.499386 256.50061 35.857864 256.5 40 C 256.49939 44.142136 259.85786 47.499386 264 47.5 C 268.14214 47.500614 271.49939 44.142136 271.5 40 C 271.5 35.858298 268.1417 32.500614 264 32.5 z M 264 34.5 C 267.03725 34.50045 269.5 36.962752 269.5 40 C 269.49955 43.037566 267.03757 45.50045 264 45.5 C 260.96243 45.49955 258.49955 43.037566 258.5 40 C 258.50045 36.962434 260.96243 34.49955 264 34.5 z "
       transform="translate(0,540.3622)"
       id="path4279" />
@@ -1403,6 +1403,49 @@
       id="path4056"
       inkscape:connector-curvature="0"
       sodipodi:nodetypes="csssssssccssssssscc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#3f0000;stroke-width:0.74416702999999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3782"
+       sodipodi:cx="8.1976452"
+       sodipodi:cy="7.9116955"
+       sodipodi:rx="7.8141294"
+       sodipodi:ry="7.8141294"
+       d="m 16.011775,7.9116955 a 7.8141294,7.8141294 0 1 1 -15.62825917,0 7.8141294,7.8141294 0 1 1 15.62825917,0 z"
+       transform="matrix(1.3437227,0,0,1.3437227,484.98464,609.73108)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#2b0000;stroke-width:1.26696873000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3782-1"
+       sodipodi:cx="8.1976452"
+       sodipodi:cy="7.9116955"
+       sodipodi:rx="7.8141294"
+       sodipodi:ry="7.8141294"
+       d="m 16.011775,7.9116955 a 7.8141294,7.8141294 0 1 1 -15.62825917,0 7.8141294,7.8141294 0 1 1 15.62825917,0 z"
+       transform="matrix(1.1837662,0,0,1.1837662,486.2959,610.9966)"
+       inkscape:export-filename="D:\Documents\Visual Studio 2013\Projects\OpenRA\mods\ra\uibits\path3782-1.png"
+       inkscape:export-xdpi="180"
+       inkscape:export-ydpi="180" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#3f0000;stroke-width:0.47360649999999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3782-8"
+       sodipodi:cx="8.1976452"
+       sodipodi:cy="7.9116955"
+       sodipodi:rx="7.8141294"
+       sodipodi:ry="7.8141294"
+       d="m 16.011775,7.9116955 a 7.8141294,7.8141294 0 1 1 -15.62825917,0 7.8141294,7.8141294 0 1 1 15.62825917,0 z"
+       transform="matrix(1.0557288,0,0,1.0557288,487.34552,612.0096)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:0.75294119;stroke:#800000;stroke-width:0.94717479000000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3782-8-9"
+       sodipodi:cx="8.1976452"
+       sodipodi:cy="7.9116955"
+       sodipodi:rx="7.8141294"
+       sodipodi:ry="7.8141294"
+       d="m 16.011775,7.9116955 a 7.8141294,7.8141294 0 1 1 -15.62825917,0 7.8141294,7.8141294 0 1 1 15.62825917,0 z"
+       transform="matrix(1.0557713,0,0,1.0557713,455.34516,612.00926)" />
  </g>
  <g
     inkscape:groupmode="layer"
--- a/artsrc/ra/spawnpoints.psd
+++ b/artsrc/ra/spawnpoints.psd
--- a/artsrc/ra/spawnpoints.svg
+++ b/artsrc/ra/spawnpoints.svg
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   width="128"
+   height="128"
+   sodipodi:docname="spawnpoints.svg"
+   inkscape:export-filename="D:\Documents\Visual Studio 2013\Projects\OpenRA\artsrc\ra\spawnpoints.png"
+   inkscape:export-xdpi="200.42"
+   inkscape:export-ydpi="200.42">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3831"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#868686;stop-opacity:1;"
+         offset="0"
+         id="stop3833" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3834"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#fff200;stop-opacity:1;"
+         offset="0"
+         id="stop3836" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3838" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3822">
+      <stop
+         style="stop-color:#fffa00;stop-opacity:1;"
+         offset="0"
+         id="stop3824" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3826" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3851"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#404040;stop-opacity:1;"
+         offset="0"
+         id="stop3853" />
+      <stop
+         style="stop-color:#6e6e6e;stop-opacity:1;"
+         offset="1"
+         id="stop3855" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3843">
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="0"
+         id="stop3845" />
+      <stop
+         style="stop-color:#2c2c2c;stop-opacity:1;"
+         offset="1"
+         id="stop3847" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3833">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3835" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3837" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3843-3"
+       id="linearGradient3849-2"
+       x1="0.13151181"
+       y1="7.9116955"
+       x2="16.263779"
+       y2="7.9116955"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3843-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3845-1" />
+      <stop
+         style="stop-color:#434343;stop-opacity:1;"
+         offset="1"
+         id="stop3847-6" />
+    </linearGradient>
+    <linearGradient
+       y2="7.9116955"
+       x2="16.263779"
+       y1="7.9116955"
+       x1="0.13151181"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3874-1"
+       xlink:href="#linearGradient3843-3-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3843-3-7"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#313131;stop-opacity:1;"
+         offset="0"
+         id="stop3845-1-4" />
+      <stop
+         style="stop-color:#505050;stop-opacity:1;"
+         offset="1"
+         id="stop3847-6-0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="7.9116955"
+       x2="16.323227"
+       y1="7.9116955"
+       x1="0.072064191"
+       id="linearGradient5394-8"
+       xlink:href="#linearGradient3843-3-0"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.1255808"
+       fy="7.9116955"
+       fx="8.1976452"
+       cy="7.9116955"
+       cx="8.1976452"
+       id="radialGradient5380-7"
+       xlink:href="#linearGradient3843-8"
+       inkscape:collect="always" />
+    <linearGradient
+       osb:paint="gradient"
+       id="linearGradient3843-3-7-9">
+      <stop
+         id="stop3845-1-4-3"
+         offset="0"
+         style="stop-color:#313131;stop-opacity:1;" />
+      <stop
+         id="stop3847-6-0-4"
+         offset="1"
+         style="stop-color:#505050;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3843-3-7-9"
+       id="linearGradient3874-1-7"
+       gradientUnits="userSpaceOnUse"
+       x1="0.13151181"
+       y1="7.9116955"
+       x2="16.263779"
+       y2="7.9116955" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3843-3-0"
+       id="linearGradient3874-6"
+       gradientUnits="userSpaceOnUse"
+       x1="0.13151181"
+       y1="7.9116955"
+       x2="16.263779"
+       y2="7.9116955" />
+    <linearGradient
+       id="linearGradient3843-3-0">
+      <stop
+         id="stop3845-1-5"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3847-6-4"
+         offset="1"
+         style="stop-color:#434343;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="7.9116955"
+       x2="16.263779"
+       y1="7.9116955"
+       x1="0.13151181"
+       id="linearGradient3849-2-6"
+       xlink:href="#linearGradient3843-3-0"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="7.9116955"
+       x2="16.569836"
+       y1="7.9116955"
+       x1="-0.17454553"
+       id="linearGradient3857-2"
+       xlink:href="#linearGradient3851-1"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="7.9116955"
+       x2="16.263779"
+       y1="7.9116955"
+       x1="0.13151181"
+       id="linearGradient3849-1"
+       xlink:href="#linearGradient3843-3-7-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3833-8">
+      <stop
+         id="stop3835-6"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3837-0"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3843-8">
+      <stop
+         id="stop3845-3"
+         offset="0"
+         style="stop-color:#969696;stop-opacity:1;" />
+      <stop
+         id="stop3847-2"
+         offset="1"
+         style="stop-color:#696969;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="gradient"
+       id="linearGradient3851-1">
+      <stop
+         id="stop3853-6"
+         offset="0"
+         style="stop-color:#575757;stop-opacity:1;" />
+      <stop
+         id="stop3855-3"
+         offset="1"
+         style="stop-color:#959595;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3822-1">
+      <stop
+         id="stop3824-3"
+         offset="0"
+         style="stop-color:#fffa00;stop-opacity:1;" />
+      <stop
+         id="stop3826-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="gradient"
+       id="linearGradient3834-6">
+      <stop
+         id="stop3836-4"
+         offset="0"
+         style="stop-color:#fff200;stop-opacity:1;" />
+      <stop
+         id="stop3838-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="7.9116955"
+       x2="16.263779"
+       y1="7.9116955"
+       x1="0.13151181"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3874-7"
+       xlink:href="#linearGradient3843-3-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3843-3-2">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3845-1-3" />
+      <stop
+         style="stop-color:#434343;stop-opacity:1;"
+         offset="1"
+         id="stop3847-6-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3851-5"
+       id="linearGradient3857-8"
+       x1="-0.17454553"
+       y1="7.9116955"
+       x2="16.569836"
+       y2="7.9116955"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3851-5"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#575757;stop-opacity:1;"
+         offset="0"
+         id="stop3853-8" />
+      <stop
+         style="stop-color:#959595;stop-opacity:1;"
+         offset="1"
+         id="stop3855-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3843-3-7-7"
+       id="linearGradient3849-8"
+       x1="0.13151181"
+       y1="7.9116955"
+       x2="16.263779"
+       y2="7.9116955"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3843-3-7-7"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#313131;stop-opacity:1;"
+         offset="0"
+         id="stop3845-1-4-33" />
+      <stop
+         style="stop-color:#505050;stop-opacity:1;"
+         offset="1"
+         id="stop3847-6-0-1" />
+    </linearGradient>
+    <linearGradient
+       y2="7.9116955"
+       x2="16.263779"
+       y1="7.9116955"
+       x1="0.13151181"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5401"
+       xlink:href="#linearGradient3843-3-7-7"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="1027"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="35.896801"
+     inkscape:cy="81.895569"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Layer">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:0.74416703;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3782"
+       sodipodi:cx="8.1976452"
+       sodipodi:cy="7.9116955"
+       sodipodi:rx="7.8141294"
+       sodipodi:ry="7.8141294"
+       d="m 16.011775,7.9116955 a 7.8141294,7.8141294 0 1 1 -15.62825917,0 7.8141294,7.8141294 0 1 1 15.62825917,0 z"
+       transform="matrix(0.67186134,0,0,0.67186135,2.4923191,2.6844376)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#8c8c8c;stroke-width:1.26696873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3782-1"
+       sodipodi:cx="8.1976452"
+       sodipodi:cy="7.9116955"
+       sodipodi:rx="7.8141294"
+       sodipodi:ry="7.8141294"
+       d="m 16.011775,7.9116955 a 7.8141294,7.8141294 0 1 1 -15.62825917,0 7.8141294,7.8141294 0 1 1 15.62825917,0 z"
+       transform="matrix(0.59188312,0,0,0.59188312,3.1479522,3.317201)"
+       inkscape:export-filename="D:\Documents\Visual Studio 2013\Projects\OpenRA\mods\ra\uibits\path3782-1.png"
+       inkscape:export-xdpi="180"
+       inkscape:export-ydpi="180" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:0.4736065;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3782-8"
+       sodipodi:cx="8.1976452"
+       sodipodi:cy="7.9116955"
+       sodipodi:rx="7.8141294"
+       sodipodi:ry="7.8141294"
+       d="m 16.011775,7.9116955 a 7.8141294,7.8141294 0 1 1 -15.62825917,0 7.8141294,7.8141294 0 1 1 15.62825917,0 z"
+       transform="matrix(0.52786438,0,0,0.52786438,3.6727551,3.8236978)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8c8c8c;fill-opacity:1;stroke:#000000;stroke-width:0.94717479000000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3782-8-9"
+       sodipodi:cx="8.1976452"
+       sodipodi:cy="7.9116955"
+       sodipodi:rx="7.8141294"
+       sodipodi:ry="7.8141294"
+       d="m 16.011775,7.9116955 a 7.8141294,7.8141294 0 1 1 -15.62825917,0 7.8141294,7.8141294 0 1 1 15.62825917,0 z"
+       transform="matrix(0.52788567,0,0,0.52788567,19.672581,3.8235293)" />
+  </g>
+  <path
+     style="fill:#ffc000;fill-opacity:1;stroke:none"
+     d="M 32,2.4999999 32,5 l 3.5,0 0,-2.5000001 c -1.061533,1.5364301 -0.432283,0.9889311 -1.747065,0 -1.285013,1.0056631 -0.663467,1.5643641 -1.752935,0 z"
+     id="path3820"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 35.5,7.5 3.5,0 -1.75,-2 z"
+     id="path5356"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc"
+     inkscape:export-filename="D:\Documents\Visual Studio 2013\Projects\OpenRA\mods\ra\uibits\spawnpoints.png"
+     inkscape:export-xdpi="200"
+     inkscape:export-ydpi="200" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="M 35.5,0 39,0 37.25,1.9999999 z"
+     id="path5356-1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc"
+     inkscape:export-filename="D:\Documents\Visual Studio 2013\Projects\OpenRA\mods\ra\uibits\spawnpoints.png"
+     inkscape:export-xdpi="200"
+     inkscape:export-ydpi="200" />
+</svg>
--- a/mods/cnc/chrome.yaml
+++ b/mods/cnc/chrome.yaml
@@ -392,10 +392,10 @@ music: chrome.png
 	slowmo: 416,80,16,16

 lobby-bits: chrome.png
-	spawn-claimed: 256,32,16,16
-	spawn-unclaimed: 256,48,16,16
+	spawn-claimed: 485,69,22,22
+	spawn-unclaimed: 453,69,22,22
 	admin: 340,39,7,5
-	colorpicker: 256,32,16,16
+	colorpicker: 485,69,22,22
 	huepicker: 388,96,7,15
 	kick: 386,115,11,11

--- a/mods/cnc/chrome/dialogs.yaml
+++ b/mods/cnc/chrome/dialogs.yaml
@@ -64,6 +64,22 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
 					Height: 25
 					Align: Center

+ScrollPanel@SPAWN_DROPDOWN_TEMPLATE:
+	Width: DROPDOWN_WIDTH
+	Children:
+		ScrollItem@TEMPLATE:
+			Width: PARENT_RIGHT-27
+			Height: 25
+			X: 2
+			Y: 0
+			Visible: false
+			Children:
+				Label@LABEL:
+					X: 0
+					Width: PARENT_RIGHT
+					Height: 25
+					Align: Center
+
 ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
 	Width: DROPDOWN_WIDTH
 	Background: panel-black
--- a/mods/cnc/chrome/lobby-dialogs.yaml
+++ b/mods/cnc/chrome/lobby-dialogs.yaml
@@ -92,7 +92,7 @@ Background@KICK_SPECTATORS_DIALOG:
 Background@LOBBY_OPTIONS_BIN:
 	X: 15
 	Y: 30
-	Width: 501
+	Width: 556
 	Height: 219
 	Background: scrollpanel-bg
 	Children:
--- a/mods/cnc/chrome/lobby-playerbin.yaml
+++ b/mods/cnc/chrome/lobby-playerbin.yaml
@@ -1,14 +1,14 @@
 ScrollPanel@LOBBY_PLAYER_BIN:
 	X: 15
 	Y: 30
-	Width: 501
+	Width: 556
 	Height: 219
 	ItemSpacing: 5
 	Children:
 		Container@TEMPLATE_EDITABLE_PLAYER:
 			X: 5
 			Y: 0
-			Width: 475
+			Width: 530
 			Height: 25
 			Visible: false
 			Children:
@@ -84,9 +84,14 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Height: 25
 					X: 390
 					Font: Regular
+				DropDownButton@SPAWN:
+					X: 445
+					Width: 50
+					Height: 25
+					Text: Spawn
 				Image@STATUS_IMAGE:
 					Visible: false
-					X: 450
+					X: 495
 					Y: 4
 					Width: 20
 					Height: 20
@@ -94,14 +99,14 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					ImageName: checked
 				Checkbox@STATUS_CHECKBOX:
 					Visible: false
-					X: 446
+					X: 501
 					Y: 2
 					Width: 20
 					Height: 20
 		Container@TEMPLATE_NONEDITABLE_PLAYER:
 			X: 5
 			Y: 0
-			Width: 475
+			Width: 530
 			Height: 25
 			Visible: false
 			Children:
@@ -173,7 +178,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Y: 0
 				Image@STATUS_IMAGE:
 					Visible: false
-					X: 448
+					X: 501
 					Y: 4
 					Width: 20
 					Height: 20
@@ -182,7 +187,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 		Container@TEMPLATE_EMPTY:
 			X: 5
 			Y: 0
-			Width: 475
+			Width: 530
 			Height: 25
 			Visible: false
 			Children:
@@ -202,14 +207,14 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 				Button@JOIN:
 					Text: Play in this slot
 					Font: Regular
-					Width: 257
+					Width: 312
 					Height: 25
 					X: 210
 					Y: 0
 		Container@TEMPLATE_EDITABLE_SPECTATOR:
 			X: 5
 			Y: 0
-			Width: 475
+			Width: 530
 			Height: 25
 			Visible: false
 			Children:
@@ -244,7 +249,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					MaxLength: 16
 				Label@SPECTATOR:
 					Text: Spectator
-					Width: 315-55
+					Width: 315-55+55
 					Height: 25
 					X: 210
 					Y: 0
@@ -253,7 +258,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 		Container@TEMPLATE_NONEDITABLE_SPECTATOR:
 			X: 5
 			Y: 0
-			Width: 475
+			Width: 530
 			Height: 25
 			Visible: false
 			Children:
@@ -294,7 +299,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Font: Bold
 				Label@SPECTATOR:
 					Text: Spectator
-					Width: 315-55
+					Width: 315-55+55
 					Height: 25
 					X: 210
 					Y: 0
@@ -303,7 +308,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 		Container@TEMPLATE_NEW_SPECTATOR:
 			X: 5
 			Y: 0
-			Width: 474
+			Width: 529
 			Height: 25
 			Visible: false
 			Children:
@@ -317,7 +322,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 				Button@SPECTATE:
 					Text: Spectate
 					Font: Regular
-					Width: 257
+					Width: 312
 					Height: 25
 					X: 210
 					Y: 0
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -2,18 +2,18 @@ Container@SERVER_LOBBY:
 	Logic: LobbyLogic
 	X: (WINDOW_RIGHT - WIDTH)/2
 	Y: (WINDOW_BOTTOM - 500)/2
-	Width: 740
+	Width: 800
 	Height: 535
 	Children:
 		ColorPreviewManager@COLOR_MANAGER:
 		Label@SERVER_NAME:
-			Width: 740
+			Width: 800
 			Y: 0-25
 			Font: BigBold
 			Contrast: true
 			Align: Center
 		Background@bg:
-			Width: 740
+			Width: 800
 			Height: 500
 			Background: panel-black
 			Children:
@@ -51,8 +51,15 @@ Container@SERVER_LOBBY:
 							Text: Team
 							Align: Center
 							Font: Bold
+						Label@SPAWN:
+							X: 445
+							Width: 50
+							Height: 25
+							Text: Spawn
+							Align: Left
+							Font: Bold
 						Label@STATUS:
-							X: 446
+							X: 501
 							Width: 20
 							Height: 25
 							Text: Ready
@@ -62,24 +69,24 @@ Container@SERVER_LOBBY:
 				DropDownButton@SLOTS_DROPDOWNBUTTON:
 					X: 15
 					Y: 254
-					Width: 150
+					Width: 166
 					Height: 25
 					Text: Slot Admin
 				Button@OPTIONS_BUTTON:
-					X: 170
+					X: 186
 					Y: 254
-					Width: 112
+					Width: 125
 					Height: 25
 				Button@CHANGEMAP_BUTTON:
-					X: 287
+					X: 316
 					Y: 254
-					Width: 112
+					Width: 125
 					Height: 25
 					Text: Change Map
 				Button@START_GAME_BUTTON:
-					X: 404
+					X: 446
 					Y: 254
-					Width: 112
+					Width: 125
 					Height: 25
 					Text: Start Game
 				ScrollPanel@CHAT_DISPLAY:
--- a/mods/cnc/chrome/mapchooser.yaml
+++ b/mods/cnc/chrome/mapchooser.yaml
@@ -2,7 +2,7 @@ Container@MAPCHOOSER_PANEL:
 	Logic: MapChooserLogic
 	X: (WINDOW_RIGHT - WIDTH)/2
 	Y: (WINDOW_BOTTOM - 500)/2
-	Width: 740
+	Width: 800
 	Height: 535
 	Children:
 		Label@TITLE:
@@ -37,8 +37,8 @@ Container@MAPCHOOSER_PANEL:
 					Height: 440
 					Children:
 						ScrollItem@MAP_TEMPLATE:
-							Width: 168
-							Height: 217
+							Width: 183
+							Height: 232
 							X: 2
 							Y: 0
 							Visible: false
@@ -46,15 +46,15 @@ Container@MAPCHOOSER_PANEL:
 								Background@PREVIEW_PLACEHOLDER:
 									X: (PARENT_RIGHT - WIDTH)/2
 									Y: 4
-									Width: 158
-									Height: 158
+									Width: 173
+									Height: 173
 									Background: panel-black
 									ClickThrough: false
 								MapPreview@PREVIEW:
 									X: (PARENT_RIGHT - WIDTH)/2
 									Y: 4
-									Width: 158
-									Height: 158
+									Width: 173
+									Height: 173
 								Label@TITLE:
 									X: 2
 									Y: PARENT_BOTTOM-48
--- a/mods/cnc/metrics.yaml
+++ b/mods/cnc/metrics.yaml
@@ -19,3 +19,6 @@ Metrics:
 	TextContrast: false
 	TextContrastColor: 0,0,0
 	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
+	SpawnFont: TinyBold
+	SpawnColor: 255,255,255
+	SpawnContrastColor: 0,0,0
--- a/mods/cnc/uibits/chrome.png
+++ b/mods/cnc/uibits/chrome.png
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -225,11 +225,11 @@ dialog4: dialog.png
 	corner-br: 571,446,6,6

 lobby-bits: spawnpoints.png
-	spawn-unclaimed: 16,0,16,16
-	spawn-claimed: 0,0,16,16
-	admin: 37,5,7,5
-	colorpicker: 0,0,16,16
-	huepicker: 45,0,7,15
+	spawn-unclaimed: 37,5,22,22
+	spawn-claimed: 5,5,22,22
+	admin: 64,5,7,5
+	colorpicker: 5,5,22,22
+	huepicker: 71,0,7,15
 	
 strategic: strategic.png
 	unowned: 0,0,32,32
--- a/mods/d2k/chrome/dropdowns.yaml
+++ b/mods/d2k/chrome/dropdowns.yaml
@@ -42,6 +42,22 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
 					Height: 25
 					Align: Center

+ScrollPanel@SPAWN_DROPDOWN_TEMPLATE:
+	Width: DROPDOWN_WIDTH
+	Children:
+		ScrollItem@TEMPLATE:
+			Width: PARENT_RIGHT-27
+			Height: 25
+			X: 2
+			Y: 0
+			Visible: false
+			Children:
+				Label@LABEL:
+					X: 0
+					Width: PARENT_RIGHT
+					Height: 25
+					Align: Center
+
 ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
 	Width: DROPDOWN_WIDTH
 	Children:
--- a/mods/d2k/chrome/lobby-playerbin.yaml
+++ b/mods/d2k/chrome/lobby-playerbin.yaml
@@ -2,7 +2,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 	X: 20
 	Y: 67
 	ItemSpacing: 5
-	Width: 535
+	Width: 593
 	Height: 235
 	Children:
 		Container@TEMPLATE_EDITABLE_PLAYER:
@@ -78,15 +78,20 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Width: 48
 					Height: 25
 					Text: Team
+				DropDownButton@SPAWN:
+					X: 478
+					Width: 48
+					Height: 25
+					Text: Spawn
 				Checkbox@STATUS_CHECKBOX:
-					X: 477
+					X: 535
 					Y: 2
 					Width: 20
 					Height: 20
 					Visible: false
 				Image@STATUS_IMAGE:
 					Visible: false
-					X: 479
+					X: 537
 					Y: 4
 					Width: 20
 					Height: 20
@@ -166,7 +171,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Y: 0
 				Image@STATUS_IMAGE:
 					Visible: false
-					X: 479
+					X: 537
 					Y: 4
 					Width: 20
 					Height: 20
@@ -194,7 +199,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Visible: false
 				Button@JOIN:
 					Text: Play in this slot
-					Width: 278
+					Width: 336
 					Height: 25
 					X: 190
 					Y: 0
@@ -235,7 +240,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					MaxLength: 16
 				Label@SPECTATOR:
 					Text: Spectator
-					Width: 278
+					Width: 336
 					Height: 25
 					X: 190
 					Y: 0
@@ -285,7 +290,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Font: Bold
 				Label@SPECTATOR:
 					Text: Spectator
-					Width: 278
+					Width: 336
 					Height: 25
 					X: 190
 					Y: 0
@@ -308,7 +313,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 				Button@SPECTATE:
 					Text: Spectate
 					Font: Regular
-					Width: 278
+					Width: 336
 					Height: 25
 					X: 190
 					Y: 0
--- a/mods/d2k/metrics.yaml
+++ b/mods/d2k/metrics.yaml
@@ -19,3 +19,6 @@ Metrics:
 	TextContrast: false
 	TextContrastColor: 0,0,0
 	ColorPickerRemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
+	SpawnFont: TinyBold
+	SpawnColor: 255,255,255
+	SpawnContrastColor: 0,0,0
--- a/mods/ra/chrome.yaml
+++ b/mods/ra/chrome.yaml
@@ -169,11 +169,11 @@ dialog4: dialog.png
 	corner-br: 571,446,6,6

 lobby-bits: spawnpoints.png
-	spawn-unclaimed: 16,0,16,16
-	spawn-claimed: 0,0,16,16
-	admin: 37,5,7,5
-	colorpicker: 0,0,16,16
-	huepicker: 45,0,7,15
+	spawn-unclaimed: 37,5,22,22
+	spawn-claimed: 5,5,22,22
+	admin: 64,5,7,5
+	colorpicker: 5,5,22,22
+	huepicker: 71,0,7,15

 strategic: strategic.png
 	unowned: 0,0,32,32
--- a/mods/ra/chrome/dropdowns.yaml
+++ b/mods/ra/chrome/dropdowns.yaml
@@ -42,6 +42,22 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
 					Height: 25
 					Align: Center

+ScrollPanel@SPAWN_DROPDOWN_TEMPLATE:
+	Width: DROPDOWN_WIDTH
+	Children:
+		ScrollItem@TEMPLATE:
+			Width: PARENT_RIGHT-27
+			Height: 25
+			X: 2
+			Y: 0
+			Visible: false
+			Children:
+				Label@LABEL:
+					X: 0
+					Width: PARENT_RIGHT
+					Height: 25
+					Align: Center
+
 ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
 	Width: DROPDOWN_WIDTH
 	Children:
--- a/mods/ra/chrome/lobby-dialogs.yaml
+++ b/mods/ra/chrome/lobby-dialogs.yaml
@@ -91,7 +91,7 @@ Background@KICK_SPECTATORS_DIALOG:
 Background@LOBBY_OPTIONS_BIN:
 	X: 20
 	Y: 67
-	Width: 535
+	Width: 593
 	Height: 235
 	Background: dialog3
 	Children:
--- a/mods/ra/chrome/lobby-playerbin.yaml
+++ b/mods/ra/chrome/lobby-playerbin.yaml
@@ -2,7 +2,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 	X: 20
 	Y: 67
 	ItemSpacing: 5
-	Width: 535
+	Width: 593
 	Height: 235
 	Children:
 		Container@TEMPLATE_EDITABLE_PLAYER:
@@ -78,15 +78,20 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Width: 48
 					Height: 25
 					Text: Team
+				DropDownButton@SPAWN:
+					X: 478
+					Width: 48
+					Height: 25
+					Text: Spawn
 				Checkbox@STATUS_CHECKBOX:
-					X: 477
+					X: 535
 					Y: 2
 					Width: 20
 					Height: 20
 					Visible: false
 				Image@STATUS_IMAGE:
 					Visible: false
-					X: 479
+					X: 537
 					Y: 4
 					Width: 20
 					Height: 20
@@ -166,7 +171,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Y: 0
 				Image@STATUS_IMAGE:
 					Visible: false
-					X: 479
+					X: 537
 					Y: 4
 					Width: 20
 					Height: 20
@@ -194,7 +199,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Visible: false
 				Button@JOIN:
 					Text: Play in this slot
-					Width: 278
+					Width: 336
 					Height: 25
 					X: 190
 					Y: 0
@@ -235,7 +240,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					MaxLength: 16
 				Label@SPECTATOR:
 					Text: Spectator
-					Width: 278
+					Width: 336
 					Height: 25
 					X: 190
 					Y: 0
@@ -285,7 +290,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 					Font: Bold
 				Label@SPECTATOR:
 					Text: Spectator
-					Width: 278
+					Width: 336
 					Height: 25
 					X: 190
 					Y: 0
@@ -308,7 +313,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
 				Button@SPECTATE:
 					Text: Spectate
 					Font: Regular
-					Width: 278
+					Width: 336
 					Height: 25
 					X: 190
 					Y: 0
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -2,7 +2,7 @@ Background@SERVER_LOBBY:
 	Logic: LobbyLogic
 	X: (WINDOW_RIGHT - WIDTH)/2
 	Y: (WINDOW_BOTTOM - HEIGHT)/2
-	Width: 800
+	Width: 858
 	Height: 600
 	Children:
 		ColorPreviewManager@COLOR_MANAGER:
@@ -48,8 +48,15 @@ Background@SERVER_LOBBY:
 					Text: Team
 					Align: Center
 					Font: Bold
+				Label@LABEL_LOBBY_TEAM:
+					X: 478
+					Width: 48
+					Height: 25
+					Text: Spawn
+					Align: Center
+					Font: Bold
 				Label@LABEL_LOBBY_STATUS:
-					X: 477
+					X: 535
 					Width: 20
 					Height: 25
 					Text: Ready
@@ -59,35 +66,35 @@ Background@SERVER_LOBBY:
 		DropDownButton@SLOTS_DROPDOWNBUTTON:
 			X: 20
 			Y: PARENT_BOTTOM - 291
-			Width: 151
+			Width: 167
 			Height: 25
 			Font: Bold
 			Text: Slot Admin
 		Button@OPTIONS_BUTTON:
-			X: 178
+			X: 194
 			Y: PARENT_BOTTOM - 291
-			Width: 121
+			Width: 135
 			Height: 25
 			Font: Bold
 			Text: Game Options
 		Button@CHANGEMAP_BUTTON:
-			X: 306
+			X: 336
 			Y: PARENT_BOTTOM - 291
-			Width: 121
+			Width: 135
 			Height: 25
 			Text: Change Map
 			Font: Bold
 		Button@START_GAME_BUTTON:
-			X: 434
+			X: 478
 			Y: PARENT_BOTTOM - 291
-			Width: 121
+			Width: 135
 			Height: 25
 			Text: Start Game
 			Font: Bold
 		ScrollPanel@CHAT_DISPLAY:
 			X: 20
 			Y: PARENT_BOTTOM - HEIGHT - 52
-			Width: 760
+			Width: 818
 			Height: 210
 			ItemSpacing: 1
 			Children:
--- a/mods/ra/chrome/map-chooser.yaml
+++ b/mods/ra/chrome/map-chooser.yaml
@@ -2,14 +2,14 @@ Background@MAPCHOOSER_PANEL:
 	X: (WINDOW_RIGHT - WIDTH)/2
 	Y: (WINDOW_BOTTOM - HEIGHT)/2
 	Logic: MapChooserLogic
-	Width: 800
+	Width: 858
 	Height: 600
 	Children:
 		Label@MAPCHOOSER_TITLE:
 			X: 0
 			Y: 17
 			Align: Center
-			Width: 800
+			Width: 858
 			Height: 20
 			Text: Choose Map
 			Font: Bold
@@ -20,8 +20,8 @@ Background@MAPCHOOSER_PANEL:
 			Height: 474
 			Children:
 				ScrollItem@MAP_TEMPLATE:
-					Width: 180
-					Height: 229
+					Width: 194
+					Height: 243
 					X: 4
 					Y: 0
 					Visible: false
@@ -29,15 +29,15 @@ Background@MAPCHOOSER_PANEL:
 						Background@PREVIEW_PLACEHOLDER:
 							X: (PARENT_RIGHT - WIDTH)/2
 							Y: 4
-							Width: 170
-							Height: 170
+							Width: 184
+							Height: 184
 							Background: dialog3
 							ClickThrough: true
 						MapPreview@PREVIEW:
 							X: (PARENT_RIGHT - WIDTH)/2
 							Y: 4
-							Width: 170
-							Height: 170
+							Width: 184
+							Height: 184
 						Label@TITLE:
 							X: 2
 							Y: PARENT_BOTTOM-48
--- a/mods/ra/metrics.yaml
+++ b/mods/ra/metrics.yaml
@@ -19,3 +19,6 @@ Metrics:
 	TextContrast: false
 	TextContrastColor: 0,0,0
 	ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
+	SpawnFont: TinyBold
+	SpawnColor: 255,255,255
+	SpawnContrastColor: 0,0,0
--- a/mods/ra/uibits/spawnpoints.png
+++ b/mods/ra/uibits/spawnpoints.png
--- a/mods/ts/chrome.yaml
+++ b/mods/ts/chrome.yaml
@@ -163,11 +163,11 @@ dialog4: dialog.png
 	corner-br: 571,446,6,6

 lobby-bits: spawnpoints.png
-	spawn-unclaimed: 16,0,16,16
-	spawn-claimed: 0,0,16,16
-	admin: 37,5,7,5
-	colorpicker: 0,0,16,16
-	huepicker: 45,0,7,15
+	spawn-unclaimed: 37,5,22,22
+	spawn-claimed: 5,5,22,22
+	admin: 64,5,7,5
+	colorpicker: 5,5,22,22
+	huepicker: 71,0,7,15

 strategic: strategic.png
 	unowned: 0,0,32,32
--- a/mods/ts/metrics.yaml
+++ b/mods/ts/metrics.yaml
@@ -19,3 +19,6 @@ Metrics:
 	TextContrast: false
 	TextContrastColor: 0,0,0
 	ColorPickerRemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+	SpawnFont: TinyBold
+	SpawnColor: 255,255,255
+	SpawnContrastColor: 0,0,0