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

Fix color validator issues and increase color picker palette size.

mods/d2k/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: 153
-			Y: 1
+			X: 245
+			Y: 21
 			Width: 80
 			Height: 73
-		Button@RANDOM_BUTTON:
-			Key: tab
-			X: 158
-			Y: 74
-			Width: 70
-			Height: 25
-			Text: Random
+

mods/d2k/mod.yaml

@@ -150,7 +150,6 @@ ServerTraits:
 	PlayerPinger
 	MasterServerPinger
 	LobbySettingsNotification
-	ColorValidator
 
 LobbyDefaults:
 	AllowCheats: false
@@ -218,3 +217,5 @@ GameSpeeds:
 		Name: Fastest
 		Timestep: 20
 		OrderLatency: 6
+
+ColorValidator:

mods/d2k/tilesets/arrakis.yaml

@@ -33,6 +33,7 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: RockCrater
 		Color: CE8C42
+		RestrictPlayerColor: true
 	TerrainType@Rough:
 		Type: Rough
 		TargetTypes: Ground
@@ -43,10 +44,12 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: SandCrater
 		Color: D0C0A0
+		RestrictPlayerColor: true
 	TerrainType@Spice:
 		Type: Spice
 		TargetTypes: Ground
 		Color: EF944A
+		RestrictPlayerColor: true
 	TerrainType@Transition:
 		Type: Transition
 		TargetTypes: Ground