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/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
@@ -18,4 +18,7 @@ Metrics:
 	TextColor: 255,255,255
 	TextContrast: false
 	TextContrastColor: 0,0,0
-	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
+	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,12 +225,12 @@ 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
 	critical_unowned: 0,32,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