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

Fix color validator issues and increase color picker palette size.

mods/ra/chrome/color-picker.yaml

@@ -1,43 +1,44 @@
 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/ra/mod.yaml

@@ -165,7 +165,6 @@ ServerTraits:
 	PlayerPinger
 	MasterServerPinger
 	LobbySettingsNotification
-	ColorValidator
 
 LobbyDefaults:
 	AllowCheats: false
@@ -242,3 +241,5 @@ GameSpeeds:
 		Name: Fastest
 		Timestep: 20
 		OrderLatency: 6
+
+ColorValidator:

mods/ra/tilesets/desert.yaml

@@ -24,16 +24,19 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 865F45
+		RestrictPlayerColor: true
 	TerrainType@Gems:
 		Type: Gems
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 8470FF
+		RestrictPlayerColor: true
 	TerrainType@Ore:
 		Type: Ore
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 948060
+		RestrictPlayerColor: true
 	TerrainType@River:
 		Type: River
 		TargetTypes: Ground
@@ -66,6 +69,7 @@ Terrain:
 		TargetTypes: Water
 		IsWater: True
 		Color: 5DA5CE
+		RestrictPlayerColor: true
 
 Templates:
 	Template@255:

mods/ra/tilesets/interior.yaml

@@ -19,11 +19,13 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 8470FF
+		RestrictPlayerColor: true
 	TerrainType@Ore:
 		Type: Ore
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 948060
+		RestrictPlayerColor: true
 	TerrainType@Tree:
 		Type: Tree
 		TargetTypes: Ground
@@ -32,6 +34,7 @@ Terrain:
 		Type: Wall
 		TargetTypes: Ground
 		Color: D0C0A0
+		RestrictPlayerColor: true
 
 Templates:
 	Template@255:

mods/ra/tilesets/snow.yaml

@@ -19,16 +19,19 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: C4C4C4
+		RestrictPlayerColor: true
 	TerrainType@Gems:
 		Type: Gems
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 8470FF
+		RestrictPlayerColor: true
 	TerrainType@Ore:
 		Type: Ore
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 948060
+		RestrictPlayerColor: true
 	TerrainType@River:
 		Type: River
 		TargetTypes: Ground
@@ -61,6 +64,7 @@ Terrain:
 		TargetTypes: Water
 		IsWater: True
 		Color: 5C74A4
+		RestrictPlayerColor: true
 
 Templates:
 	Template@255:

mods/ra/tilesets/temperat.yaml

@@ -19,16 +19,19 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 284428
+		RestrictPlayerColor: true
 	TerrainType@Gems:
 		Type: Gems
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 8470FF
+		RestrictPlayerColor: true
 	TerrainType@Ore:
 		Type: Ore
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 948060
+		RestrictPlayerColor: true
 	TerrainType@River:
 		Type: River
 		TargetTypes: Ground
@@ -61,6 +64,7 @@ Terrain:
 		TargetTypes: Water
 		IsWater: True
 		Color: 5C74A4
+		RestrictPlayerColor: true
 
 Templates:
 	Template@255: