From c028d8ad299fd62e61e2378e62f27af7917ba48a Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 27 Mar 2025 20:51:45 +0000 Subject: [PATCH] Define ColorShift data for TDHD. --- mods/cnc/maps/blank-shellmap/map.yaml | 7 +++++++ mods/cnc/rules/campaign-palettes.yaml | 20 ++++++++++++++++++++ mods/cnc/rules/palettes.yaml | 17 +++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/mods/cnc/maps/blank-shellmap/map.yaml b/mods/cnc/maps/blank-shellmap/map.yaml index ceb8319b4d..aaccbf4649 100644 --- a/mods/cnc/maps/blank-shellmap/map.yaml +++ b/mods/cnc/maps/blank-shellmap/map.yaml @@ -54,6 +54,7 @@ Rules: # Used for rendering the EVA Database previews ^Palettes: -PlayerColorPalette: + -PlayerColorShift: IndexedPlayerPalette: BasePalette: terrain RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 @@ -61,3 +62,9 @@ Rules: GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120 NodUnits: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 + FixedPlayerColorShift: + BasePalette: player + PlayerIndex: + GDI: 0.777, -0.196, 1, 0.29, 0.37 + Nod: 0.667, 0.185, 1, 0.2892156, 0.37 + NodUnits: 0.306, -0.655, 1, 0.29, 0.37 diff --git a/mods/cnc/rules/campaign-palettes.yaml b/mods/cnc/rules/campaign-palettes.yaml index b1418ae35f..3fda231745 100644 --- a/mods/cnc/rules/campaign-palettes.yaml +++ b/mods/cnc/rules/campaign-palettes.yaml @@ -1,6 +1,8 @@ ^Palettes: -PlayerColorPalette: + -PlayerColorShift: -PlayerColorPalette@derricks: + -PlayerColorShift@derricks: IndexedPlayerPalette: BasePalette: terrain RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 @@ -24,6 +26,24 @@ GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 179, 180, 188, 180 Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120, 124, 122, 42, 122 Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198, 155, 133, 134, 133 + FixedPlayerColorShift: + BasePalette: player + PlayerIndex: + GDI: 0.777, -0.196, 1, 0.29, 0.37 + Nod: 0.667, 0.185, 1, 0.2892156, 0.37 + Neutral: 0.777, -0.196, 1, 0.29, 0.37 + FixedPlayerColorShift@units: + BasePalette: player-units + PlayerIndex: + GDI: 0.777, -0.196, 1, 0.29, 0.37 + Nod: 0.306, -0.655, 1, 0.29, 0.37 + Neutral: 0.777, -0.196, 1, 0.29, 0.37 + FixedPlayerColorShift@derricks: + BasePalette: derrick + PlayerIndex: + GDI: 0.777, -0.196, 1, 0.05, 0.15 + Nod: 0.667, 0.185, 1, 0.05, 0.15 + Neutral: 0.777, -0.196, 1, 0.05, 0.15 ^Vehicle: RenderSprites: diff --git a/mods/cnc/rules/palettes.yaml b/mods/cnc/rules/palettes.yaml index 406b205629..d5bad6b0a0 100644 --- a/mods/cnc/rules/palettes.yaml +++ b/mods/cnc/rules/palettes.yaml @@ -72,6 +72,8 @@ BasePalette: terrain RemapIndex: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190 AllowModifiers: false + ColorPickerColorShift@colorpicker: + BasePalette: colorpicker PaletteFromRGBA@cloak: Name: cloak R: 0 @@ -91,13 +93,28 @@ Name: bluetiberium Color: 89BAFF RemapIndex: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190 + FixedColorShift@BlueTiberium: + BasePalette: bluetiberium + Color: 89BAFF + MinHue: 0.15 + MaxHue: 0.35 + ReferenceHue: 0.23 + ReferenceSaturation: 0.7 PlayerColorPalette: BasePalette: terrain RemapIndex: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190 + PlayerColorShift: + BasePalette: player PlayerColorPalette@derricks: BaseName: derrick BasePalette: terrain RemapIndex: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190, 171, 173, 144, 145 + PlayerColorShift@derricks: + BasePalette: derrick + MinHue: 0.05 + MaxHue: 0.15 + ReferenceHue: 0.1 + ReferenceSaturation: 0.75 MenuPostProcessEffect: MenuEffect: Desaturated CloakPaletteEffect: