Smaller spawns+letters. Map dialog width. Unavailable spawns disabled.

OpenRA.Game/Widgets/MapPreviewWidget.cs

@@ -124,7 +124,7 @@ namespace OpenRA.Widgets
 
 					Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos - offset);
 					var fonts = Game.Renderer.Fonts[ChromeMetrics.Get<string>("SpawnFont")];
-					var number = Convert.ToString(spawnPoints.IndexOf(p) + 1);
+					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);

OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs

@@ -89,18 +89,19 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		}
 
 		public static void ShowSpawnDropDown(DropDownButtonWidget dropdown, Session.Client client,
-			OrderManager orderManager, int teamCount)
+			OrderManager orderManager, IEnumerable<int> spawnPoints)
 		{
 			Func<int, ScrollItemWidget, ScrollItemWidget> setupItem = (ii, itemTemplate) =>
 			{
+				var spawnPoint = spawnPoints.ToList()[ii];
 				var item = ScrollItemWidget.Setup(itemTemplate,
-					() => client.SpawnPoint == ii,
+					() => client.SpawnPoint == spawnPoint,
-					() => SetSpawnPoint(orderManager, client, ii));
+					() => SetSpawnPoint(orderManager, client, spawnPoint));
-				item.Get<LabelWidget>("LABEL").GetText = () => ii == 0 ? "-" : ii.ToString();
+				item.Get<LabelWidget>("LABEL").GetText = () => spawnPoint == 0 ? "-" : Convert.ToChar('A' - 1 + spawnPoint).ToString();
 				return item;
 			};
 
-			var options = Exts.MakeArray(teamCount + 1, i => i).ToList();
+			var options = Exts.MakeArray(spawnPoints.Count(), i => i).ToList();
 			dropdown.ShowDropDown("SPAWN_DROPDOWN_TEMPLATE", 150, options, setupItem);
 		}
 
@@ -407,8 +408,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		{
 			var dropdown = parent.Get<DropDownButtonWidget>("SPAWN");
 			dropdown.IsDisabled = () => s.LockSpawn || orderManager.LocalClient.IsReady;
-			dropdown.OnMouseDown = _ => ShowSpawnDropDown(dropdown, c, orderManager, map.PlayerCount);
+			dropdown.OnMouseDown = _ => ShowSpawnDropDown(dropdown, c, orderManager, Enumerable.Range(0, map.PlayerCount + 1)
-			dropdown.GetText = () => (c.SpawnPoint == 0) ? "-" : c.SpawnPoint.ToString();
+					.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)

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:zoom="7.9999996"
-     inkscape:cx="399.83211"
+     inkscape:cx="465.51623"
-     inkscape:cy="452.59159"
+     inkscape:cy="457.58054"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1151"
+     inkscape:window-width="1680"
-     inkscape:window-height="1004"
+     inkscape:window-height="1027"
-     inkscape:window-x="540"
+     inkscape:window-x="-8"
-     inkscape:window-y="22"
+     inkscape:window-y="-8"
-     inkscape:window-maximized="0"
+     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"

artsrc/ra/spawnpoints.svg

@@ -140,16 +140,6 @@
          offset="1"
          id="stop3847-6-0" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3843"
-       id="radialGradient5380"
-       cx="8.1976452"
-       cy="7.9116955"
-       fx="8.1976452"
-       fy="7.9116955"
-       r="8.1255808"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
        y2="7.9116955"
@@ -379,9 +369,9 @@
      inkscape:window-height="1027"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="8.94932"
+     inkscape:zoom="4"
-     inkscape:cx="15.532246"
+     inkscape:cx="35.896801"
-     inkscape:cy="99.440441"
+     inkscape:cy="81.895569"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -394,44 +384,47 @@
      inkscape:label="Layer">
     <path
        sodipodi:type="arc"
-       style="fill:none;stroke:#4b4b4b;stroke-width:0.50400807999999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
+       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.99204758,0,0,0.99204758,-0.13245406,0.15122163)" />
+       transform="matrix(0.67186134,0,0,0.67186135,2.4923191,2.6844376)" />
     <path
        sodipodi:type="arc"
-       style="fill:none;stroke:#bebebe;stroke-width:1.11612278000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
+       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.89595878,0,0,0.89595878,0.6563856,0.91030919)" />
+       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:#4b4b4b;stroke-width:0.62324654999999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
+       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.80225069,0,0,0.80225069,1.4234335,1.6339462)" />
+       transform="matrix(0.52786438,0,0,0.52786438,3.6727551,3.8236978)" />
     <path
        sodipodi:type="arc"
-       style="fill:url(#radialGradient5380);stroke:#383838;stroke-width:0.6229033;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
+       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.79987958,0,0,0.80229708,17.442871,1.6335792)" />
+       transform="matrix(0.52788567,0,0,0.52788567,19.672581,3.8235293)" />
   </g>
   <path
      style="fill:#ffc000;fill-opacity:1;stroke:none"

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-claimed: 485,69,22,22
-	spawn-unclaimed: 256,48,16,16
+	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
 

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:
@@ -38,8 +38,8 @@ Container@MAPCHOOSER_PANEL:
 					ScrollVelocity: 40
 					Children:
 						ScrollItem@MAP_TEMPLATE:
-							Width: 168
+							Width: 183
-							Height: 217
+							Height: 232
 							X: 2
 							Y: 0
 							Visible: false
@@ -47,15 +47,15 @@ Container@MAPCHOOSER_PANEL:
 								Background@PREVIEW_PLACEHOLDER:
 									X: (PARENT_RIGHT - WIDTH)/2
 									Y: 4
-									Width: 158
+									Width: 173
-									Height: 158
+									Height: 173
 									Background: panel-black
 									ClickThrough: false
 								MapPreview@PREVIEW:
 									X: (PARENT_RIGHT - WIDTH)/2
 									Y: 4
-									Width: 158
+									Width: 173
-									Height: 158
+									Height: 173
 								Label@TITLE:
 									X: 2
 									Y: PARENT_BOTTOM-48

mods/cnc/metrics.yaml

@@ -19,6 +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: Bold
+	SpawnFont: TinyBold
 	SpawnColor: 255,255,255
 	SpawnContrastColor: 0,0,0

mods/d2k/chrome.yaml

@@ -225,10 +225,10 @@ dialog4: dialog.png
 	corner-br: 571,446,6,6
 
 lobby-bits: spawnpoints.png
-	spawn-unclaimed: 32,0,32,32
+	spawn-unclaimed: 37,5,22,22
-	spawn-claimed: 0,0,32,32
+	spawn-claimed: 5,5,22,22
 	admin: 64,5,7,5
-	colorpicker: 0,0,32,32
+	colorpicker: 5,5,22,22
 	huepicker: 71,0,7,15
 	
 strategic: strategic.png

mods/d2k/metrics.yaml

@@ -19,6 +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: Bold
+	SpawnFont: TinyBold
 	SpawnColor: 255,255,255
 	SpawnContrastColor: 0,0,0

mods/ra/chrome.yaml

@@ -169,10 +169,10 @@ dialog4: dialog.png
 	corner-br: 571,446,6,6
 
 lobby-bits: spawnpoints.png
-	spawn-unclaimed: 32,0,32,32
+	spawn-unclaimed: 37,5,22,22
-	spawn-claimed: 0,0,32,32
+	spawn-claimed: 5,5,22,22
 	admin: 64,5,7,5
-	colorpicker: 0,0,32,32
+	colorpicker: 5,5,22,22
 	huepicker: 71,0,7,15
 
 strategic: strategic.png

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
@@ -21,8 +21,8 @@ Background@MAPCHOOSER_PANEL:
 			ScrollVelocity: 40
 			Children:
 				ScrollItem@MAP_TEMPLATE:
-					Width: 180
+					Width: 194
-					Height: 229
+					Height: 243
 					X: 4
 					Y: 0
 					Visible: false
@@ -30,15 +30,15 @@ Background@MAPCHOOSER_PANEL:
 						Background@PREVIEW_PLACEHOLDER:
 							X: (PARENT_RIGHT - WIDTH)/2
 							Y: 4
-							Width: 170
+							Width: 184
-							Height: 170
+							Height: 184
 							Background: dialog3
 							ClickThrough: true
 						MapPreview@PREVIEW:
 							X: (PARENT_RIGHT - WIDTH)/2
 							Y: 4
-							Width: 170
+							Width: 184
-							Height: 170
+							Height: 184
 						Label@TITLE:
 							X: 2
 							Y: PARENT_BOTTOM-48

mods/ra/metrics.yaml

@@ -19,6 +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: Bold
+	SpawnFont: TinyBold
 	SpawnColor: 255,255,255
 	SpawnContrastColor: 0,0,0

mods/ts/chrome.yaml

@@ -163,10 +163,10 @@ dialog4: dialog.png
 	corner-br: 571,446,6,6
 
 lobby-bits: spawnpoints.png
-	spawn-unclaimed: 32,0,32,32
+	spawn-unclaimed: 37,5,22,22
-	spawn-claimed: 0,0,32,32
+	spawn-claimed: 5,5,22,22
 	admin: 64,5,7,5
-	colorpicker: 0,0,32,32
+	colorpicker: 5,5,22,22
 	huepicker: 71,0,7,15
 
 strategic: strategic.png

mods/ts/metrics.yaml

@@ -19,6 +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: Bold
+	SpawnFont: TinyBold
 	SpawnColor: 255,255,255
 	SpawnContrastColor: 0,0,0