epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix color validator issues and increase color picker palette size.
This commit is contained in:
reaperrr
2016-01-29 23:57:46 +01:00
parent 42711dbe7b dd963b75f5
commit c19383472f
27 changed files with 387 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mods/cnc/chrome/color-picker.yaml
View File

@@ -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

3
mods/cnc/mod.yaml
View File

@@ -162,7 +162,6 @@ ServerTraits:
PlayerPinger
MasterServerPinger
LobbySettingsNotification
ColorValidator
LobbyDefaults:
AllowCheats: false
@@ -240,3 +239,5 @@ GameSpeeds:
Name: Fastest
Timestep: 20
OrderLatency: 6
ColorValidator:

4
mods/cnc/tilesets/desert.yaml
View File

@@ -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:

4
mods/cnc/tilesets/jungle.yaml
View File

@@ -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:

4
mods/cnc/tilesets/snow.yaml
View File

@@ -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:

4
mods/cnc/tilesets/temperat.yaml
View File

@@ -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:

4
mods/cnc/tilesets/winter.yaml
View File

@@ -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:

42
mods/d2k/chrome/color-picker.yaml
View File

@@ -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

3
mods/d2k/mod.yaml
View File

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

3
mods/d2k/tilesets/arrakis.yaml
View File

@@ -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

41
mods/ra/chrome/color-picker.yaml
View File

@@ -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

3
mods/ra/mod.yaml
View File

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

4
mods/ra/tilesets/desert.yaml
View File

@@ -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:

3
mods/ra/tilesets/interior.yaml
View File

@@ -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:

4
mods/ra/tilesets/snow.yaml
View File

@@ -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:

4
mods/ra/tilesets/temperat.yaml
View File

@@ -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:

42
mods/ts/chrome/color-picker.yaml
View File

@@ -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

3
mods/ts/mod.yaml
View File

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

4
mods/ts/tilesets/snow.yaml
View File

@@ -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

4
mods/ts/tilesets/temperate.yaml
View File

@@ -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