Move color picker actor type from metrics to ColorPickerManager.

2021-05-09 15:09:20 +01:00
parent f65de2dd43
commit 9d62ce214c
10 changed files with 41 additions and 19 deletions
--- a/mods/cnc/metrics.yaml
+++ b/mods/cnc/metrics.yaml
@@ -4,5 +4,4 @@ Metrics:
 	ButtonDepth: 0
 	ButtonFont: Bold
 	CheckboxPressedState: true
-	ColorPickerActorType: fact.colorpicker
 	TextfieldColorHighlight: 800000
--- a/mods/cnc/rules/world.yaml
+++ b/mods/cnc/rules/world.yaml
@@ -255,6 +255,7 @@ World:
 	ScriptTriggers:
 	TimeLimitManager:
 	ColorPickerManager:
+		PreviewActor: fact.colorpicker
 		RemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 		TeamColorPresets: f70606, ff7a22, f8d3b3, f8e947, 94b319, f335a0, a64d6c, ce08f9, f5b2db, 12b572, 502048, 1d06f7, 328dff, 78dbf8, cef6b1, 391d1d

--- a/mods/d2k/metrics.yaml
+++ b/mods/d2k/metrics.yaml
@@ -1,6 +1,5 @@
 # General dumping-ground for UI element sizes, etc.
 Metrics:
-	ColorPickerActorType: carryall.colorpicker
 	FactionSuffix-fremen: atreides
 	FactionSuffix-corrino: harkonnen
 	FactionSuffix-smuggler: ordos
--- a/mods/d2k/rules/world.yaml
+++ b/mods/d2k/rules/world.yaml
@@ -236,6 +236,7 @@ World:
 	StartGameNotification:
 	TimeLimitManager:
 	ColorPickerManager:
+		PreviewActor: carryall.colorpicker
 		RemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
 		TeamColorPresets: 9023cd, f53333, ffae00, fff830, 87f506, f872ad, da06f3, ddb8ff, def7b2, 39c46f, 200738, 280df6, 2f86f2, 76d2f8, 498221, 392929

--- a/mods/ra/metrics.yaml
+++ b/mods/ra/metrics.yaml
@@ -1,7 +1,6 @@
 # General dumping-ground for UI element sizes, etc.

 Metrics:
-	ColorPickerActorType: fact.colorpicker
 	FactionSuffix-allies: allies
 	FactionSuffix-england: allies
 	FactionSuffix-france: allies
--- a/mods/ra/rules/world.yaml
+++ b/mods/ra/rules/world.yaml
@@ -281,6 +281,7 @@ World:
 			2: WarningTwoMinutesRemaining
 			1: WarningOneMinuteRemaining
 	ColorPickerManager:
+		PreviewActor: fact.colorpicker
 		RemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
 		TeamColorPresets: f7b3b3, f50606, 98331f, f57606, f7bb06, f861a4, da06f3, ddb8ff, 06f739, cef7b2, 200738, 280df6, 2f86f2, 76d2f8, 34ba93, 391d1d

--- a/mods/ts/metrics.yaml
+++ b/mods/ts/metrics.yaml
@@ -1,4 +1,3 @@
 # General dumping-ground for UI element sizes, etc.
 Metrics:
-	ColorPickerActorType: mmch.colorpicker
 	TextfieldColorHighlight: 1a1a1a
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -381,6 +381,7 @@ World:
 	ScriptTriggers:
 	TimeLimitManager:
 	ColorPickerManager:
+		PreviewActor: mmch.colorpicker
 		RemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
 		TeamColorPresets: f70606, ff7a22, f8d3b3, f8e947, 94b319, f335a0, a64d6c, ce08f9, f5b2db, 12b572, 4A1948, 1d06f7, 328dff, 78dbf8, cef6b1, 391d1d