diff --git a/mods/cnc/metrics.yaml b/mods/cnc/metrics.yaml index f3c52d3ffd..eba2223b0a 100644 --- a/mods/cnc/metrics.yaml +++ b/mods/cnc/metrics.yaml @@ -4,5 +4,5 @@ Metrics: ButtonDepth: 0 ButtonFont: Bold CheckboxPressedState: true - ColorPickerActorType: ^fact.colorpicker + ColorPickerActorType: fact.colorpicker ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190 diff --git a/mods/cnc/rules/misc.yaml b/mods/cnc/rules/misc.yaml index d10b0cfb72..341a4f0c7e 100644 --- a/mods/cnc/rules/misc.yaml +++ b/mods/cnc/rules/misc.yaml @@ -73,8 +73,10 @@ waypoint: EditorTilesetFilter: Categories: System -^fact.colorpicker: +fact.colorpicker: Inherits: FACT + -Buildable: + -EditorTilesetFilter: RenderSprites: Image: fact Palette: colorpicker diff --git a/mods/d2k/metrics.yaml b/mods/d2k/metrics.yaml index c785265b8f..913609c8d1 100644 --- a/mods/d2k/metrics.yaml +++ b/mods/d2k/metrics.yaml @@ -1,6 +1,6 @@ # General dumping-ground for UI element sizes, etc. Metrics: - ColorPickerActorType: ^carryall.colorpicker + ColorPickerActorType: carryall.colorpicker ColorPickerRemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240 FactionSuffix-fremen: atreides FactionSuffix-corrino: harkonnen diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index e2eefdc98b..5129c1178a 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -167,11 +167,12 @@ waypoint: EditorTilesetFilter: Categories: System -^carryall.colorpicker: +carryall.colorpicker: Inherits: carryall - -Health: Aircraft: InitialFacing: 104 + -Buildable: + -EditorTilesetFilter: RenderSprites: Image: carryall Palette: colorpicker diff --git a/mods/ra/metrics.yaml b/mods/ra/metrics.yaml index d791f29c31..0bb45fcffa 100644 --- a/mods/ra/metrics.yaml +++ b/mods/ra/metrics.yaml @@ -1,7 +1,7 @@ # General dumping-ground for UI element sizes, etc. Metrics: - ColorPickerActorType: ^fact.colorpicker + ColorPickerActorType: fact.colorpicker ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95 FactionSuffix-allies: allies FactionSuffix-england: allies diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index e0a0ebb729..077f254aec 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -388,8 +388,10 @@ waypoint: EditorTilesetFilter: Categories: System -^fact.colorpicker: +fact.colorpicker: Inherits: FACT + -Buildable: + -EditorTilesetFilter: RenderSprites: Image: fact Palette: colorpicker diff --git a/mods/ts/metrics.yaml b/mods/ts/metrics.yaml index 5edf30b1a1..35fe75f1b1 100644 --- a/mods/ts/metrics.yaml +++ b/mods/ts/metrics.yaml @@ -1,4 +1,4 @@ # General dumping-ground for UI element sizes, etc. Metrics: - ColorPickerActorType: ^mmch.colorpicker + ColorPickerActorType: mmch.colorpicker ColorPickerRemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml index ab145e28e8..fe98bda41d 100644 --- a/mods/ts/rules/misc.yaml +++ b/mods/ts/rules/misc.yaml @@ -26,15 +26,16 @@ waypoint: EditorTilesetFilter: Categories: System -^mmch.colorpicker: +mmch.colorpicker: Inherits: MMCH - -Health: Mobile: InitialFacing: 160 Turreted: InitialFacing: 160 WithFacingSpriteBody: Sequence: walk + -Buildable: + -EditorTilesetFilter: RenderVoxels: Image: mmch Palette: colorpicker