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

Fix color validator issues and increase color picker palette size.
2016-01-29 23:57:46 +01:00
parent 42711dbe7b dd963b75f5
commit c19383472f
27 changed files with 387 additions and 330 deletions
--- a/mods/cnc/chrome/color-picker.yaml
+++ b/mods/cnc/chrome/color-picker.yaml
@@ -1,45 +1,44 @@
 Background@COLOR_CHOOSER:
 	Logic: ColorPickerLogic
 	Background: panel-black
-	Width: 234
-	Height: 105
+	Width: 311
+	Height: 140
 	Children:
-		LogicTicker@ANIMATE_PREVIEW:
+		Button@RANDOM_BUTTON:
+			Key: tab
+			X: 235
+			Y: 109
+			Width: 70
+			Height: 25
+			Text: Random
 		Background@HUEBG:
 			Background: panel-black
 			X: 5
 			Y: 5
-			Width: 148
-			Height: 13
+			Width: 225
+			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: panel-black
 			X: 5
-			Y: 23
-			Width: 148
-			Height: 76
+			Y: 27
+			Width: 225
+			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: 230
+			Y: 21
 			Width: 80
 			Height: 73
-			Animate: true
-		Button@RANDOM_BUTTON:
-			Key: tab
-			X: 158
-			Y: 74
-			Width: 70
-			Height: 25
-			Text: Random
+			Animate: true
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -162,7 +162,6 @@ ServerTraits:
 	PlayerPinger
 	MasterServerPinger
 	LobbySettingsNotification
-	ColorValidator

 LobbyDefaults:
 	AllowCheats: false
@@ -240,3 +239,5 @@ GameSpeeds:
 		Name: Fastest
 		Timestep: 20
 		OrderLatency: 6
+
+ColorValidator:
--- a/mods/cnc/tilesets/desert.yaml
+++ b/mods/cnc/tilesets/desert.yaml
@@ -14,11 +14,13 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 54FCFC
+		RestrictPlayerColor: true
 	TerrainType@Clear:
 		Type: Clear
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 865F45
+		RestrictPlayerColor: true
 	TerrainType@River:
 		Type: River
 		TargetTypes: Ground
@@ -42,6 +44,7 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: A1E21C
+		RestrictPlayerColor: true
 	TerrainType@Tree:
 		Type: Tree
 		TargetTypes: Ground
@@ -56,6 +59,7 @@ Terrain:
 		TargetTypes: Water
 		IsWater: True
 		Color: 5DA5CE
+		RestrictPlayerColor: true

 Templates:
 	Template@255:
--- a/mods/cnc/tilesets/jungle.yaml
+++ b/mods/cnc/tilesets/jungle.yaml
@@ -14,11 +14,13 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 54FCFC
+		RestrictPlayerColor: true
 	TerrainType@Clear:
 		Type: Clear
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 285C30
+		RestrictPlayerColor: true
 	TerrainType@River:
 		Type: River
 		TargetTypes: Ground
@@ -42,6 +44,7 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: A1E21C
+		RestrictPlayerColor: true
 	TerrainType@Tree:
 		Type: Tree
 		TargetTypes: Ground
@@ -56,6 +59,7 @@ Terrain:
 		TargetTypes: Water
 		IsWater: True
 		Color: 5C74A4
+		RestrictPlayerColor: true

 Templates:
 	Template@255:
--- a/mods/cnc/tilesets/snow.yaml
+++ b/mods/cnc/tilesets/snow.yaml
@@ -14,11 +14,13 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 54FCFC
+		RestrictPlayerColor: true
 	TerrainType@Clear:
 		Type: Clear
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: C4C4C4
+		RestrictPlayerColor: true
 	TerrainType@River:
 		Type: River
 		TargetTypes: Ground
@@ -42,6 +44,7 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: A1E21C
+		RestrictPlayerColor: true
 	TerrainType@Tree:
 		Type: Tree
 		TargetTypes: Ground
@@ -56,6 +59,7 @@ Terrain:
 		TargetTypes: Water
 		IsWater: True
 		Color: 5C74A4
+		RestrictPlayerColor: true

 Templates:
 	Template@255:
--- a/mods/cnc/tilesets/temperat.yaml
+++ b/mods/cnc/tilesets/temperat.yaml
@@ -14,11 +14,13 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 54FCFC
+		RestrictPlayerColor: true
 	TerrainType@Clear:
 		Type: Clear
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 284428
+		RestrictPlayerColor: true
 	TerrainType@River:
 		Type: River
 		TargetTypes: Ground
@@ -42,6 +44,7 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: A1E21C
+		RestrictPlayerColor: true
 	TerrainType@Tree:
 		Type: Tree
 		TargetTypes: Ground
@@ -56,6 +59,7 @@ Terrain:
 		TargetTypes: Water
 		IsWater: True
 		Color: 5C74A4
+		RestrictPlayerColor: true

 Templates:
 	Template@255:
--- a/mods/cnc/tilesets/winter.yaml
+++ b/mods/cnc/tilesets/winter.yaml
@@ -14,11 +14,13 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 54FCFC
+		RestrictPlayerColor: true
 	TerrainType@Clear:
 		Type: Clear
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: 284428
+		RestrictPlayerColor: true
 	TerrainType@River:
 		Type: River
 		TargetTypes: Ground
@@ -42,6 +44,7 @@ Terrain:
 		TargetTypes: Ground
 		AcceptsSmudgeType: Crater, Scorch
 		Color: A1E21C
+		RestrictPlayerColor: true
 	TerrainType@Tree:
 		Type: Tree
 		TargetTypes: Ground
@@ -56,6 +59,7 @@ Terrain:
 		TargetTypes: Water
 		IsWater: True
 		Color: 5C74A4
+		RestrictPlayerColor: true

 Templates:
 	Template@255: