Merge pull request #10624 from pchote/overhaul-color-validator

Fix color validator issues and increase color picker palette size.

mods/ts/chrome/color-picker.yaml

@@ -1,43 +1,45 @@
 Background@COLOR_CHOOSER:
 	Logic: ColorPickerLogic
 	Background: dialog2
-	Width: 234
-	Height: 105
+	Width: 326
+	Height: 140
 	Children:
+		Button@RANDOM_BUTTON:
+			Key: tab
+			X: 250
+			Y: 109
+			Width: 70
+			Height: 25
+			Text: Random
+			Font: Bold
 		Background@HUEBG:
 			Background: dialog3
 			X: 5
 			Y: 5
-			Width: 148
-			Height: 13
+			Width: 240
+			Height: 17
 			Children:
 				HueSlider@HUE:
 					X: 2
 					Y: 2
-					Width: 144
-					Height: 9
+					Width: PARENT_RIGHT - 4
+					Height: PARENT_BOTTOM - 4
 					Ticks: 5
 		Background@MIXERBG:
 			Background: dialog3
 			X: 5
-			Y: 23
-			Width: 148
-			Height: 76
+			Y: 27
+			Width: 240
+			Height: 107
 			Children:
 				ColorMixer@MIXER:
 					X: 2
 					Y: 2
-					Width: 144
-					Height: 72
+					Width: PARENT_RIGHT - 4
+					Height: PARENT_BOTTOM - 4
 		ActorPreview@PREVIEW:
-			X: 163
+			X: 245
+			Y: 11
 			Width: 80
 			Height: 74
-			Animate: true
-		Button@RANDOM_BUTTON:
-			Key: tab
-			X: 158
-			Y: 74
-			Width: 70
-			Height: 25
-			Text: Random
+			Animate: true

mods/ts/mod.yaml

@@ -211,7 +211,6 @@ ServerTraits:
 	PlayerPinger
 	MasterServerPinger
 	LobbySettingsNotification
-	ColorValidator
 
 LobbyDefaults:
 	AllowCheats: true
@@ -281,3 +280,5 @@ GameSpeeds:
 		Name: Fastest
 		Timestep: 20
 		OrderLatency: 6
+
+ColorValidator:

mods/ts/tilesets/snow.yaml

@@ -13,6 +13,7 @@ Terrain:
 		AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch
 		Color: C7C9FA
 		TargetTypes: Ground
+		RestrictPlayerColor: true
 	TerrainType@Road:
 		Type: Road
 		Color: 2D2B28
@@ -30,6 +31,7 @@ Terrain:
 		Color: 3D4148
 		TargetTypes: Water
 		IsWater: True
+		RestrictPlayerColor: true
 	TerrainType@DirtRoad:
 		Type: DirtRoad
 		Color: 82838F
@@ -47,11 +49,13 @@ Terrain:
 		AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch
 		Color: 009000
 		TargetTypes: Ground
+		RestrictPlayerColor: true
 	TerrainType@BlueTiberium:
 		Type: BlueTiberium
 		AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch
 		Color: 202080
 		TargetTypes: Ground
+		RestrictPlayerColor: true
 	TerrainType@Veins:
 		Type: Veins
 		Color: 000000

mods/ts/tilesets/temperate.yaml

@@ -13,6 +13,7 @@ Terrain:
 		AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch
 		Color: 745537
 		TargetTypes: Ground
+		RestrictPlayerColor: true
 	TerrainType@Road:
 		Type: Road
 		Color: 745537
@@ -30,6 +31,7 @@ Terrain:
 		Color: 745537
 		TargetTypes: Water
 		IsWater: True
+		RestrictPlayerColor: true
 	TerrainType@DirtRoad:
 		Type: DirtRoad
 		Color: 745537
@@ -47,11 +49,13 @@ Terrain:
 		AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch
 		Color: 009000
 		TargetTypes: Ground
+		RestrictPlayerColor: true
 	TerrainType@BlueTiberium:
 		Type: BlueTiberium
 		AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch
 		Color: 202080
 		TargetTypes: Ground
+		RestrictPlayerColor: true
 	TerrainType@Veins:
 		Type: Veins
 		Color: 000000