diff --git a/mods/d2k/maps/atreides-01a/map.yaml b/mods/d2k/maps/atreides-01a/map.yaml index 3748938f65..ac7e49a8e5 100644 --- a/mods/d2k/maps/atreides-01a/map.yaml +++ b/mods/d2k/maps/atreides-01a/map.yaml @@ -111,4 +111,4 @@ Actors: Location: 13,13 Owner: Neutral -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-01b/map.yaml b/mods/d2k/maps/atreides-01b/map.yaml index 3124826659..7ab45dcd6c 100644 --- a/mods/d2k/maps/atreides-01b/map.yaml +++ b/mods/d2k/maps/atreides-01b/map.yaml @@ -110,4 +110,4 @@ Actors: Location: 22,20 Owner: Neutral -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-02a/map.yaml b/mods/d2k/maps/atreides-02a/map.yaml index 2bf55b88f3..c2363bd503 100644 --- a/mods/d2k/maps/atreides-02a/map.yaml +++ b/mods/d2k/maps/atreides-02a/map.yaml @@ -168,4 +168,4 @@ Actors: Owner: Neutral Location: 30,28 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-02b/map.yaml b/mods/d2k/maps/atreides-02b/map.yaml index 0ef4f56dc7..dc5ef47b43 100644 --- a/mods/d2k/maps/atreides-02b/map.yaml +++ b/mods/d2k/maps/atreides-02b/map.yaml @@ -138,4 +138,4 @@ Actors: Owner: Neutral Location: 30,28 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-03a/map.yaml b/mods/d2k/maps/atreides-03a/map.yaml index d529d9196e..a295ef86f7 100644 --- a/mods/d2k/maps/atreides-03a/map.yaml +++ b/mods/d2k/maps/atreides-03a/map.yaml @@ -135,4 +135,4 @@ Actors: Owner: Neutral Location: 39,30 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-03b/map.yaml b/mods/d2k/maps/atreides-03b/map.yaml index 825dc30763..99eab7e024 100644 --- a/mods/d2k/maps/atreides-03b/map.yaml +++ b/mods/d2k/maps/atreides-03b/map.yaml @@ -132,4 +132,4 @@ Actors: Owner: Neutral Location: 15,34 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-04/map.yaml b/mods/d2k/maps/atreides-04/map.yaml index c565a710a8..20a0854b79 100644 --- a/mods/d2k/maps/atreides-04/map.yaml +++ b/mods/d2k/maps/atreides-04/map.yaml @@ -410,6 +410,6 @@ Actors: Owner: Neutral Location: 5,23 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml Sequences: sequences.yaml diff --git a/mods/d2k/maps/atreides-05/map.yaml b/mods/d2k/maps/atreides-05/map.yaml index 22461cfc35..ae389a7772 100644 --- a/mods/d2k/maps/atreides-05/map.yaml +++ b/mods/d2k/maps/atreides-05/map.yaml @@ -363,4 +363,4 @@ Actors: Owner: Neutral Location: 49,4 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-01a/map.yaml b/mods/d2k/maps/harkonnen-01a/map.yaml index 8590dba5b0..545f7fedb2 100644 --- a/mods/d2k/maps/harkonnen-01a/map.yaml +++ b/mods/d2k/maps/harkonnen-01a/map.yaml @@ -106,4 +106,4 @@ Actors: Owner: Neutral Location: 29,7 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-01b/map.yaml b/mods/d2k/maps/harkonnen-01b/map.yaml index 3e5b07b12c..2e07bbdc1b 100644 --- a/mods/d2k/maps/harkonnen-01b/map.yaml +++ b/mods/d2k/maps/harkonnen-01b/map.yaml @@ -106,4 +106,4 @@ Actors: Owner: Neutral Location: 28,2 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-02a/map.yaml b/mods/d2k/maps/harkonnen-02a/map.yaml index 5c22a78b4e..d8ae0ce32f 100644 --- a/mods/d2k/maps/harkonnen-02a/map.yaml +++ b/mods/d2k/maps/harkonnen-02a/map.yaml @@ -162,4 +162,4 @@ Actors: Owner: Neutral Location: 47,4 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-02b/map.yaml b/mods/d2k/maps/harkonnen-02b/map.yaml index 86be21676f..5564cf741a 100644 --- a/mods/d2k/maps/harkonnen-02b/map.yaml +++ b/mods/d2k/maps/harkonnen-02b/map.yaml @@ -144,4 +144,4 @@ Actors: Owner: Neutral Location: 23,16 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-03a/map.yaml b/mods/d2k/maps/harkonnen-03a/map.yaml index b1ac67df63..016127c22e 100644 --- a/mods/d2k/maps/harkonnen-03a/map.yaml +++ b/mods/d2k/maps/harkonnen-03a/map.yaml @@ -177,4 +177,4 @@ Actors: Owner: Neutral Location: 29,2 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-03b/map.yaml b/mods/d2k/maps/harkonnen-03b/map.yaml index 886989db8e..9db34676ce 100644 --- a/mods/d2k/maps/harkonnen-03b/map.yaml +++ b/mods/d2k/maps/harkonnen-03b/map.yaml @@ -207,4 +207,4 @@ Actors: Owner: Neutral Location: 65,45 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-04/map.yaml b/mods/d2k/maps/harkonnen-04/map.yaml index cd6e527b48..697abc930c 100644 --- a/mods/d2k/maps/harkonnen-04/map.yaml +++ b/mods/d2k/maps/harkonnen-04/map.yaml @@ -379,4 +379,4 @@ Actors: Owner: Neutral Location: 22,91 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-01a/map.yaml b/mods/d2k/maps/ordos-01a/map.yaml index dacd34c526..c507bdef89 100644 --- a/mods/d2k/maps/ordos-01a/map.yaml +++ b/mods/d2k/maps/ordos-01a/map.yaml @@ -101,4 +101,4 @@ Actors: Owner: Neutral Location: 29,15 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-01b/map.yaml b/mods/d2k/maps/ordos-01b/map.yaml index 29deeaf184..cd494f5b3e 100644 --- a/mods/d2k/maps/ordos-01b/map.yaml +++ b/mods/d2k/maps/ordos-01b/map.yaml @@ -101,4 +101,4 @@ Actors: Owner: Neutral Location: 24,2 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-02a/map.yaml b/mods/d2k/maps/ordos-02a/map.yaml index 3cde25a582..d17f788ea1 100644 --- a/mods/d2k/maps/ordos-02a/map.yaml +++ b/mods/d2k/maps/ordos-02a/map.yaml @@ -152,4 +152,4 @@ Actors: Owner: Neutral Location: 25,17 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-02b/map.yaml b/mods/d2k/maps/ordos-02b/map.yaml index bc78c293ce..01f49257bf 100644 --- a/mods/d2k/maps/ordos-02b/map.yaml +++ b/mods/d2k/maps/ordos-02b/map.yaml @@ -137,4 +137,4 @@ Actors: Owner: Neutral Location: 9,8 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-03a/map.yaml b/mods/d2k/maps/ordos-03a/map.yaml index 7d65d94ba0..97f551ed28 100644 --- a/mods/d2k/maps/ordos-03a/map.yaml +++ b/mods/d2k/maps/ordos-03a/map.yaml @@ -143,4 +143,4 @@ Actors: Owner: Harkonnen Location: 4,60 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-03b/map.yaml b/mods/d2k/maps/ordos-03b/map.yaml index 9338de82e3..604d67beb1 100644 --- a/mods/d2k/maps/ordos-03b/map.yaml +++ b/mods/d2k/maps/ordos-03b/map.yaml @@ -254,4 +254,4 @@ Actors: Owner: Neutral Location: 2,20 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-04/map.yaml b/mods/d2k/maps/ordos-04/map.yaml index 510ffe276a..39b69e3b2a 100644 --- a/mods/d2k/maps/ordos-04/map.yaml +++ b/mods/d2k/maps/ordos-04/map.yaml @@ -523,4 +523,4 @@ Actors: Owner: Smugglers Location: 49,19 -Rules: d2k|rules/campaign-rules.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml index 8b444cfee4..8b019de56f 100644 --- a/mods/d2k/maps/shellmap/map.yaml +++ b/mods/d2k/maps/shellmap/map.yaml @@ -1030,4 +1030,4 @@ Actors: Owner: Neutral Location: 50,65 -Rules: rules.yaml +Rules: d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/rules/campaign-palettes.yaml b/mods/d2k/rules/campaign-palettes.yaml new file mode 100644 index 0000000000..140ea3f3f2 --- /dev/null +++ b/mods/d2k/rules/campaign-palettes.yaml @@ -0,0 +1,27 @@ +^Palettes: + -PlayerColorPalette: + -PaletteFromPlayerPaletteWithAlpha@deviatorgas: + -PaletteFromPlayerPaletteWithAlpha@cloak: + IndexedPlayerPalette: + BasePalette: d2k + BaseName: player + RemapIndex: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240 + PlayerIndex: + Atreides: 143, 142, 141, 140, 139, 138, 137, 136, 135, 134, 133, 132, 131, 130, 129, 128 + Harkonnen: 159, 158, 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, 144 + Ordos: 175, 174, 173, 172, 171, 170, 169, 168, 167, 166, 165, 164, 163, 162, 161, 160 + Corrino: 191, 190, 189, 188, 187, 186, 185, 184, 183, 182, 181, 180, 179, 178, 177, 176 + Fremen: 207, 206, 205, 204, 203, 202, 201, 200, 199, 198, 197, 196, 195, 194, 193, 192 + Smugglers: 223, 222, 221, 220, 219, 218, 217, 216, 215, 214, 213, 212, 211, 210, 209, 208 + Mercenaries: 239, 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224 + Neutral: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240 + Creeps: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240 + PaletteFromPlayerPaletteWithAlpha@DeviatorGas: + BaseName: deviatorgas + BasePalette: player + Alpha: 0.68 + Premultiply: false + PaletteFromPlayerPaletteWithAlpha@Cloak: + BaseName: cloak + BasePalette: player + Alpha: 0.55