Merge pull request #9324 from atlimit8/ColorSpacePrefixes

Hex Color Parsing
2015-11-02 20:28:04 +01:00
parent d37e5f0129 a5b93156db
commit 214945a61f
221 changed files with 12295 additions and 11794 deletions
--- a/mods/d2k/chrome/ingame-infostats.yaml
+++ b/mods/d2k/chrome/ingame-infostats.yaml
@@ -1,5 +1,5 @@
 Container@SKIRMISH_STATS:
-	Height:	PARENT_BOTTOM
+	Height: PARENT_BOTTOM
 	Width: PARENT_RIGHT
 	Logic: GameInfoStatsLogic
 	Children:
@@ -24,7 +24,7 @@ Container@SKIRMISH_STATS:
 			Font: Bold
 			Text: Destroy all opposition!
 			Disabled: yes
-			TextColorDisabled: 255,255,255
+			TextColorDisabled: FFFFFF
 		Container@STATS_HEADERS:
 			X: 22
 			Y: 80
--- a/mods/d2k/chrome/tooltips.yaml
+++ b/mods/d2k/chrome/tooltips.yaml
@@ -23,7 +23,7 @@ Background@BUTTON_TOOLTIP:
 			Visible: false
 			Y: 3
 			Height: 23
-			TextColor: 255,255,0
+			TextColor: FFFF00
 			Font: Bold

 Background@WORLD_TOOLTIP:
@@ -128,7 +128,7 @@ Background@PRODUCTION_TOOLTIP:
 			Visible: false
 			Y: 2
 			Height: 23
-			TextColor: 255,255,0
+			TextColor: FFFF00
 			Font: Bold
 		Label@REQUIRES:
 			X: 7
@@ -185,7 +185,7 @@ Background@SUPPORT_POWER_TOOLTIP:
 			Visible: false
 			Y: 2
 			Height: 23
-			TextColor: 255,255,0
+			TextColor: FFFF00
 			Font: Bold
 		Label@TIME:
 			Y: 9
@@ -215,3 +215,4 @@ Background@FACTION_DESCRIPTION_TOOLTIP:
 			Height: 14
 			Font: TinyBold
 			VAlign: Top
+
--- a/mods/d2k/maps/atreides-01a/map.yaml
+++ b/mods/d2k/maps/atreides-01a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 8

 RequiresMod: d2k

@@ -50,14 +50,14 @@ Players:
 		Playable: true
 		Faction: atreides
 		LockFaction: true
-		ColorRamp: 170,255,200
+		Color: 9191FF
 		LockColor: true
 		Enemies: Harkonnen, Creeps
 	PlayerReference@Harkonnen:
 		Name: Harkonnen
 		Faction: harkonnen
 		LockFaction: true
-		ColorRamp: 0,255,127
+		Color: FE0000
 		LockColor: true
 		Enemies: Atreides, Creeps

--- a/mods/d2k/maps/atreides-01b/map.yaml
+++ b/mods/d2k/maps/atreides-01b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 8

 RequiresMod: d2k

@@ -50,14 +50,14 @@ Players:
 		Playable: true
 		Faction: atreides
 		LockFaction: true
-		ColorRamp: 170,255,200
+		Color: 9191FF
 		LockColor: true
 		Enemies: Harkonnen, Creeps
 	PlayerReference@Harkonnen:
 		Name: Harkonnen
 		Faction: harkonnen
 		LockFaction: true
-		ColorRamp: 0,255,127
+		Color: FE0000
 		LockColor: true
 		Enemies: Atreides, Creeps

--- a/mods/d2k/maps/atreides-02a/map.yaml
+++ b/mods/d2k/maps/atreides-02a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 8

 RequiresMod: d2k

@@ -49,14 +49,14 @@ Players:
 		LockFaction: True
 		Faction: atreides
 		LockColor: True
-		ColorRamp: 170,255,200
+		Color: 9191FF
 		Enemies: Harkonnen, Creeps
 	PlayerReference@Harkonnen:
 		Name: Harkonnen
 		LockFaction: True
 		Faction: harkonnen
 		LockColor: True
-		ColorRamp: 0,255,127
+		Color: FE0000
 		Enemies: Atreides, Creeps

 Actors:
--- a/mods/d2k/maps/atreides-02b/map.yaml
+++ b/mods/d2k/maps/atreides-02b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 8

 RequiresMod: d2k

@@ -49,14 +49,14 @@ Players:
 		LockFaction: True
 		Faction: atreides
 		LockColor: True
-		ColorRamp: 170,255,200
+		Color: 9191FF
 		Enemies: Harkonnen, Creeps
 	PlayerReference@Harkonnen:
 		Name: Harkonnen
 		LockFaction: True
 		Faction: harkonnen
 		LockColor: True
-		ColorRamp: 0,255,127
+		Color: FE0000
 		Enemies: Atreides, Creeps

 Actors:
--- a/mods/d2k/maps/battle-for-dune.oramap
+++ b/mods/d2k/maps/battle-for-dune.oramap
--- a/mods/d2k/maps/death-depths.oramap
+++ b/mods/d2k/maps/death-depths.oramap
--- a/mods/d2k/maps/desert-twister.oramap
+++ b/mods/d2k/maps/desert-twister.oramap
--- a/mods/d2k/maps/eyesofthedesert.oramap
+++ b/mods/d2k/maps/eyesofthedesert.oramap
--- a/mods/d2k/maps/imperial-basin.oramap
+++ b/mods/d2k/maps/imperial-basin.oramap
--- a/mods/d2k/maps/kanly.oramap
+++ b/mods/d2k/maps/kanly.oramap
--- a/mods/d2k/maps/mount-idaho/map.yaml
+++ b/mods/d2k/maps/mount-idaho/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 8

 RequiresMod: d2k

--- a/mods/d2k/maps/oasis-conquest/map.yaml
+++ b/mods/d2k/maps/oasis-conquest/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 8

 RequiresMod: d2k

--- a/mods/d2k/maps/pasty-mesa/map.yaml
+++ b/mods/d2k/maps/pasty-mesa/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 8

 RequiresMod: d2k

--- a/mods/d2k/maps/shellmap/map.yaml
+++ b/mods/d2k/maps/shellmap/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 8

 RequiresMod: d2k

@@ -31,13 +31,13 @@ Players:
 	PlayerReference@Atreides:
 		Name: Atreides
 		Faction: atreides
-		ColorRamp: 161,134,200
+		Color: ABB7E4
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
 		Faction: atreides
 		Enemies: Atreides
-		ColorRamp: 210,255,127
+		Color: EF00FE

 Actors:
 	Actor4: spicebloom
--- a/mods/d2k/maps/the-duell.oramap
+++ b/mods/d2k/maps/the-duell.oramap
--- a/mods/d2k/maps/tucks-sietch.oramap
+++ b/mods/d2k/maps/tucks-sietch.oramap
--- a/mods/d2k/maps/venac-ditch.oramap
+++ b/mods/d2k/maps/venac-ditch.oramap
--- a/mods/d2k/maps/vladimirs-folly.oramap
+++ b/mods/d2k/maps/vladimirs-folly.oramap
--- a/mods/d2k/metrics.yaml
+++ b/mods/d2k/metrics.yaml
@@ -3,36 +3,37 @@
 Metrics:
 	ButtonDepth: 1
 	ButtonFont: Regular
-	ButtonTextColor: 255,255,255
-	ButtonTextColorDisabled: 128,128,128
+	ButtonTextColor: FFFFFF
+	ButtonTextColorDisabled: 808080
 	ButtonTextContrast: false
-	ButtonTextContrastColor: 0,0,0
+	ButtonTextContrastColor: 000000
 	ButtonBaseLine: 0
 	CheckboxPressedState: false
 	HotkeyFont: Regular
-	HotkeyColor: 255,255,255
-	HotkeyColorDisabled: 128,128,128
+	HotkeyColor: FFFFFF
+	HotkeyColorDisabled: 808080
 	TextfieldFont: Regular
-	TextfieldColor: 255,255,255
-	TextfieldColorDisabled: 128,128,128
-	TextfieldColorInvalid: 255,192,192
+	TextfieldColor: FFFFFF
+	TextfieldColorDisabled: 808080
+	TextfieldColorInvalid: FFC0C0
 	TextFont: Regular
-	TextColor: 255,255,255
+	TextColor: FFFFFF
 	TextContrast: false
-	TextContrastColor: 0,0,0
+	TextContrastColor: 000000
 	ColorPickerRemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
 	ColorPickerActorType: ^carryall.colorpicker
 	SpawnFont: TinyBold
-	SpawnColor: 255,255,255
-	SpawnContrastColor: 0,0,0
+	SpawnColor: FFFFFF
+	SpawnContrastColor: 000000
 	SpawnLabelOffset: 0,1
-	IncompatibleVersionColor: 255,0,0
-	IncompatibleGameColor: 169,169,169
-	ProtectedGameColor: 255,0,0
-	IncompatibleProtectedGameColor: 139,0,0
-	WaitingGameColor: 0,255,0
-	IncompatibleWaitingGameColor: 50,205,50
-	GameStartedColor: 255,165,0
-	IncompatibleGameStartedColor: 210,105,30
-	GlobalChatTextColor: 255,255,255
-	GlobalChatNotificationColor: 211,211,211
+	IncompatibleVersionColor: FF0000
+	IncompatibleGameColor: A9A9A9
+	ProtectedGameColor: FF0000
+	IncompatibleProtectedGameColor: 8B0000
+	WaitingGameColor: 00FF00
+	IncompatibleWaitingGameColor: 32CD32
+	GameStartedColor: FFA500
+	IncompatibleGameStartedColor: D2691E
+	GlobalChatTextColor: FFFFFF
+	GlobalChatNotificationColor: D3D3D3
+
--- a/mods/d2k/tilesets/arrakis.yaml
+++ b/mods/d2k/tilesets/arrakis.yaml
@@ -10,47 +10,47 @@ Terrain:
 	TerrainType@Clear:
 		Type: Clear
 		TargetTypes: Ground
-		Color: 255,0,0,0
+		Color: 000000
 	TerrainType@Cliff:
 		Type: Cliff
 		TargetTypes: Ground
-		Color: 255,74,41,16
+		Color: 4A2910
 	TerrainType@Concrete:
 		Type: Concrete
 		TargetTypes: Ground
-		Color: 255,232,196,152
+		Color: E8C498
 	TerrainType@Dune:
 		Type: Dune
 		TargetTypes: Ground
-		Color: 255,239,222,140
+		Color: EFDE8C
 	TerrainType@Ice:
 		Type: Ice
 		TargetTypes: Ground
 		IsWater: True
-		Color: 255,255,255,255
+		Color: FFFFFF
 	TerrainType@Rock:
 		Type: Rock
 		TargetTypes: Ground
 		AcceptsSmudgeType: RockCrater
-		Color: 255,206,140,66
+		Color: CE8C42
 	TerrainType@Rough:
 		Type: Rough
 		TargetTypes: Ground
-		Color: 255,88,116,116
+		Color: 587474
 		CustomCursor: move-rough
 	TerrainType@Sand:
 		Type: Sand
 		TargetTypes: Ground
 		AcceptsSmudgeType: SandCrater
-		Color: 255,208,192,160
+		Color: D0C0A0
 	TerrainType@Spice:
 		Type: Spice
 		TargetTypes: Ground
-		Color: 255,239,148,74
+		Color: EF944A
 	TerrainType@Transition:
 		Type: Transition
 		TargetTypes: Ground
-		Color: 255,207,166,100
+		Color: CFA664

 Templates:
 	Template@0: