DiD: set colors for each faction

wesnoth · Oct 19, 2019 · 34ef228 · 34ef228
1 parent 49f4656
commit 34ef228
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 3 deletions.
diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
@@ -74,6 +74,7 @@
         team_name=town guard
         user_team_name= _ "Defenders"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         # wmllint: recognize Malin Keshar
         {CHARACTER_STATS_MALIN_KESHAR}
@@ -96,6 +97,7 @@
         team_name=orcs
         user_team_name= _ "Orcs"
         {FLAG_VARIANT6 ragged}
+        color=white
 
         type=Orcish Warrior
         id=Kreg'a'shar Trr
@@ -121,6 +123,7 @@
         team_name=town guard
         user_team_name= _ "Defenders"
         {FLAG_VARIANT loyalist}
+        color=green
 
         type=Sergeant
         id=Drogan

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
@@ -37,6 +37,7 @@
         team_name=good
         user_team_name= _ "Malin Keshar"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         # wmllint: recognize Malin Keshar
         {CHARACTER_STATS_MALIN_KESHAR}
@@ -63,6 +64,7 @@
         team_name=goblins
         user_team_name= _ "Goblins"
         {FLAG_VARIANT6 ragged}
+        color=white
 
         type=Goblin Knight
         id="T'shar Lggi"

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
@@ -45,6 +45,7 @@
         team_name=good
         user_team_name= _ "Malin Keshar"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         # wmllint: recognize Malin Keshar
         {CHARACTER_STATS_MALIN_KESHAR}

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
@@ -37,6 +37,7 @@
         team_name=good
         user_team_name= _ "Malin Keshar"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         # wmllint: recognize Malin Keshar
         {CHARACTER_STATS_MALIN_KESHAR}
@@ -56,6 +57,7 @@
         team_name=orcs
         user_team_name= _ "Orcs"
         {FLAG_VARIANT6 ragged}
+        color=white
 
         type=Orcish Warlord
         id="Gron'r Hronk"
@@ -84,6 +86,7 @@
         team_name=orcs
         user_team_name= _ "Orcs"
         {FLAG_VARIANT6 ragged}
+        color=white
 
         type=Orcish Warlord
         id="K'rrlar Oban"

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
@@ -48,6 +48,7 @@
         team_name=good
         user_team_name= _ "Malin Keshar"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         # wmllint: recognize Malin Keshar
         {CHARACTER_STATS_MALIN_KESHAR}
@@ -65,6 +66,7 @@
         team_name=orcs
         user_team_name=_"Orcs"
         {FLAG_VARIANT6 ragged}
+        color=white
 
         type=Orcish Warlord
         id=Borth
@@ -103,6 +105,7 @@
         team_name=orcs
         user_team_name= _ "Orcs"
         {FLAG_VARIANT6 ragged}
+        color=white
 
         type=Orcish Warlord
         id="P'Gareth"
@@ -141,6 +144,7 @@
         team_name=orcs
         user_team_name= _ "Orcs"
         {FLAG_VARIANT6 ragged}
+        color=white
 
         type=Orcish Warlord
         id="K'Vark"

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
@@ -42,6 +42,7 @@
         team_name=good
         user_team_name= _ "Malin Keshar"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         # wmllint: recognize Malin Keshar
         {CHARACTER_STATS_MALIN_KESHAR}
@@ -66,6 +67,7 @@
         team_name=orcs
         user_team_name= _ "Orcs"
         {FLAG_VARIANT6 ragged}
+        color=white
 
         type=Orcish Warlord
         id=Borth
@@ -91,6 +93,7 @@
         team_name=guardsmen
         user_team_name= _ "Guardsmen"
         {FLAG_VARIANT loyalist}
+        color=green
 
         type=Lieutenant
         id=Drogan
@@ -121,6 +124,7 @@
         team_name=guardsmen
         user_team_name= _ "Defenders"
         {FLAG_VARIANT loyalist}
+        color=green
 
         # wmllint: recognize Dela Keshar
         {CHARACTER_STATS_DELA_KESHAR}

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
@@ -121,6 +121,7 @@
         team_name=intruders
         user_team_name= _ "Intruders"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         village_gold=2
         village_support=1
@@ -141,6 +142,7 @@
         team_name=defenders
         user_team_name= _ "Defenders"
         {FLAG_VARIANT loyalist}
+        color=gold
 
         village_gold=0
         income=-2
@@ -152,7 +154,6 @@
 
         fog=yes
         share_vision=none
-        color=green
         facing=se
 
         # Place city guards

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
@@ -29,6 +29,7 @@
         team_name=intruders
         user_team_name= _ "Intruders"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         income=-2
 
@@ -48,6 +49,7 @@
         user_team_name= _ "Defenders"
         no_leader=yes
         hidden=yes
+        color=purple
 
         [ai]
             village_value=0
@@ -63,7 +65,8 @@
         user_team_name= _ "Defenders"
         no_leader=yes
         hidden=yes
-        color=green
+        {FLAG_VARIANT loyalist}
+        color=gold
         [ai]
             village_value=0
             aggression=0.8

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
@@ -23,6 +23,7 @@
         team_name=intruders
         user_team_name= _ "Intruders"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         income=-2
 
@@ -42,6 +43,7 @@
         user_team_name= _ "Defenders"
         no_leader=yes
         hidden=yes
+        color=purple
 
         # Book guards
         {NAMED_NOTRAIT_UNIT 2 (Silver Mage) 11 9 ("") ( _ "Guardian")} {GUARDIAN}
@@ -93,7 +95,8 @@
         user_team_name= _ "Defenders"
         no_leader=yes
         hidden=yes
-        color=green
+        {FLAG_VARIANT loyalist}
+        color=gold
         [ai]
             village_value=0
             aggression=0.8

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
@@ -40,6 +40,7 @@
         team_name=good
         user_team_name= _ "Malin Keshar"
         {FLAG_VARIANT undead}
+        color=darkblue
         village_gold=2
         village_support=1
 
@@ -94,6 +95,7 @@
         team_name=wesnothians
         user_team_name= _ "Wesnothians"
         {FLAG_VARIANT loyalist}
+        color=gold
 
         income=-2
         no_leader=yes
@@ -130,6 +132,7 @@
         team_name=wesnothians
         user_team_name= _ "Wesnothians"
         {FLAG_VARIANT loyalist}
+        color=green
 
         income=-2
         no_leader=yes

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
@@ -64,6 +64,7 @@
         village_support=4
         user_team_name= _ "Malin Keshar"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         income=-2
 

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
@@ -114,6 +114,7 @@
         village_gold=1
         user_team_name= _ "Mal Keshar"
         {FLAG_VARIANT undead}
+        color=darkblue
 
         # wmllint: recognize Mal Keshar
         {CHARACTER_STATS_MAL_KESHAR}
@@ -130,6 +131,7 @@
         no_leader=yes
         gold=0
         {NO_INCOME}
+        color=brown
         # Set ai values later
     [/side]
 
@@ -142,6 +144,7 @@
         hidden=yes
         gold=0
         {NO_INCOME}
+        color=brown
         # Set ai values later
     [/side]
 
@@ -398,6 +401,7 @@
                                 side=3
                                 user_team_name= _ "Humans"
                                 {FLAG_VARIANT loyalist}
+                                color=gold
                                 recruit=Spearman,Swordsman,Pikeman,Bowman,Longbowman,Heavy Infantryman,Shock Trooper,Mage,Red Mage,White Mage,Horseman,Knight,Lancer
                             [/modify_side]
 
@@ -638,6 +642,7 @@
                                 side=3
                                 user_team_name= _ "Orcs"
                                 {FLAG_VARIANT6 ragged}
+                                color=white
                                 recruit=Orcish Warrior,Orcish Slayer,Orcish Crossbowman,Troll,Troll Rocklobber
                             [/modify_side]
 
@@ -706,6 +711,7 @@
                     side=2
                     user_team_name= _ "Humans"
                     {FLAG_VARIANT loyalist}
+                    color=gold
                     recruit=Spearman,Swordsman,Pikeman,Bowman,Longbowman,Heavy Infantryman,Shock Trooper,Mage,Red Mage,White Mage,Horseman,Knight,Lancer
                 [/modify_side]
 
@@ -794,6 +800,7 @@
                     side=2
                     user_team_name= _ "Orcs"
                     {FLAG_VARIANT6 ragged}
+                    color=white
                     recruit=Orcish Warrior,Orcish Slayer,Orcish Crossbowman,Troll,Troll Rocklobber
                 [/modify_side]
 

diff --git a/data/campaigns/Descent_Into_Darkness/utils/team-colors.cfg b/data/campaigns/Descent_Into_Darkness/utils/team-colors.cfg
@@ -0,0 +1,7 @@
+#textdomain wesnoth-did
+
+[color_range]
+    id=darkblue
+    rgb=33147B,FFFFFF,110021,33147B
+    name= _ "Dark blue"
+[/color_range]