From 960f8292214da1b0ac5b4756c238e93941736c88 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Wed, 8 Mar 2023 10:52:53 +0300 Subject: [PATCH] Move `Soviets` palette index definition to `campaign-palettes.yaml`. --- mods/ra/maps/desert-shellmap/rules.yaml | 6 ------ mods/ra/maps/evacuation/rules.yaml | 1 - mods/ra/maps/exodus/rules.yaml | 1 - mods/ra/maps/infiltration/rules.yaml | 1 - mods/ra/maps/intervention/rules.yaml | 8 -------- mods/ra/maps/survival01/rules.yaml | 1 - mods/ra/maps/survival02/rules.yaml | 1 - mods/ra/rules/campaign-palettes.yaml | 1 + 8 files changed, 1 insertion(+), 19 deletions(-) diff --git a/mods/ra/maps/desert-shellmap/rules.yaml b/mods/ra/maps/desert-shellmap/rules.yaml index d2b0ebc956..daf2c9591d 100644 --- a/mods/ra/maps/desert-shellmap/rules.yaml +++ b/mods/ra/maps/desert-shellmap/rules.yaml @@ -20,12 +20,6 @@ World: Scripts: desert-shellmap.lua -StartGameNotification: -^Palettes: - IndexedPlayerPalette: - PlayerIndex: - Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 - Allies: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 - ^ExistsInWorld: GivesExperience: ActorExperienceModifier: 0 diff --git a/mods/ra/maps/evacuation/rules.yaml b/mods/ra/maps/evacuation/rules.yaml index c483d68f2c..d39b1c1a59 100644 --- a/mods/ra/maps/evacuation/rules.yaml +++ b/mods/ra/maps/evacuation/rules.yaml @@ -23,7 +23,6 @@ World: ^Palettes: IndexedPlayerPalette: PlayerIndex: - Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 Allies1: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 Allies2: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 diff --git a/mods/ra/maps/exodus/rules.yaml b/mods/ra/maps/exodus/rules.yaml index 6c29fef6e9..b6ef4b9b79 100644 --- a/mods/ra/maps/exodus/rules.yaml +++ b/mods/ra/maps/exodus/rules.yaml @@ -22,7 +22,6 @@ World: ^Palettes: IndexedPlayerPalette: PlayerIndex: - Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 Allies1: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 Allies2: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 diff --git a/mods/ra/maps/infiltration/rules.yaml b/mods/ra/maps/infiltration/rules.yaml index f904223635..1f68621f24 100644 --- a/mods/ra/maps/infiltration/rules.yaml +++ b/mods/ra/maps/infiltration/rules.yaml @@ -27,7 +27,6 @@ World: Color: FE1100 IndexedPlayerPalette: PlayerIndex: - Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 Allies1: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 Allies2: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 diff --git a/mods/ra/maps/intervention/rules.yaml b/mods/ra/maps/intervention/rules.yaml index 2c7e370f50..628b5a47b8 100644 --- a/mods/ra/maps/intervention/rules.yaml +++ b/mods/ra/maps/intervention/rules.yaml @@ -16,14 +16,6 @@ World: hard: Hard Default: normal -^Palettes: - IndexedPlayerPalette: - PlayerIndex: - Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 - Allies: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 - Allies1: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 - Allies2: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 - CAMERA: RevealsShroud: Range: 18c0 diff --git a/mods/ra/maps/survival01/rules.yaml b/mods/ra/maps/survival01/rules.yaml index d2da032060..6ee393bdd8 100644 --- a/mods/ra/maps/survival01/rules.yaml +++ b/mods/ra/maps/survival01/rules.yaml @@ -20,7 +20,6 @@ World: ^Palettes: IndexedPlayerPalette: PlayerIndex: - Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 powerproxy.paratroopers: diff --git a/mods/ra/maps/survival02/rules.yaml b/mods/ra/maps/survival02/rules.yaml index 7437354cfa..25c1cfe4ba 100644 --- a/mods/ra/maps/survival02/rules.yaml +++ b/mods/ra/maps/survival02/rules.yaml @@ -11,7 +11,6 @@ World: ^Palettes: IndexedPlayerPalette: PlayerIndex: - Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 SovietSquad: diff --git a/mods/ra/rules/campaign-palettes.yaml b/mods/ra/rules/campaign-palettes.yaml index 005e27625f..a8f13f3730 100644 --- a/mods/ra/rules/campaign-palettes.yaml +++ b/mods/ra/rules/campaign-palettes.yaml @@ -6,6 +6,7 @@ BaseName: player RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95 PlayerIndex: + Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 USSR: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 Ukraine: 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223 Greece: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175