DM: Use [leader] tag for side 1 throughout

wesnoth · Jul 29, 2019 · 23dd666 · 23dd666
1 parent 887dd1c
commit 23dd666
Show file tree

Hide file tree

Showing 22 changed files with 86 additions and 28 deletions.
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
@@ -17,8 +17,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Mages"
+        side_name= _ "Delfador"
         # wmllint: who YOUNG_DELFADOR is Delfador
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         facing=nw
         [unit]
             # wmllint: who METHOR is Methor

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg
@@ -22,8 +22,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Mages"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         [unit]
             {METHOR}
             x,y=21,16

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
@@ -22,8 +22,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Mages"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
     [/side]
     {STARTING_VILLAGES 1 10}
 

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
@@ -22,8 +22,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Mages"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
     [/side]
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
@@ -19,7 +19,10 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
-        {YOUNG_DELFADOR}
+        side_name= _ "Delfador"
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
     [/side]
 
     [side]

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
@@ -23,8 +23,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT loyalist}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         [unit]
             {LIONEL}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg
@@ -37,8 +37,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT loyalist}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         [unit]
             {LIONEL}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
@@ -23,8 +23,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT loyalist}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         [unit]
             {LIONEL}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
@@ -21,8 +21,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         # Go back to stock flag, since we no longer recruit loyalist units
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
     [/side]
 
     [side]

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg
@@ -18,7 +18,10 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
-        {YOUNG_DELFADOR}
+        side_name= _ "Delfador"
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
     [/side]
     {STARTING_VILLAGES 1 5}
 

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
@@ -24,8 +24,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
     [/side]
     {STARTING_VILLAGES 1 6}
 

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
@@ -25,8 +25,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         [unit]
             {CHANTAL}
             x,y=32,2

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
@@ -38,11 +38,13 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Elves"
+        side_name= _ "Kalenz"
         {FLAG_VARIANT wood-elvish}
         # wmllint: who KALENZ is Kalenz
-        {KALENZ}
-        canrecruit=yes
-        facing=sw
+        [leader]
+            {KALENZ}
+            facing=sw
+        [/leader]
     [/side]
 
     ### Protagonist switching ###

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
@@ -29,9 +29,12 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Elves"
+        side_name= _ "Kalenz"
         {FLAG_VARIANT wood-elvish}
-        {KALENZ}
-        canrecruit=yes
+        [leader]
+            {KALENZ}
+            facing=sw
+        [/leader]
         [unit]
             {CHANTAL}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
@@ -35,8 +35,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         [unit]
             {KALENZ}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
@@ -34,8 +34,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT loyalist}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
     [/side]
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg
@@ -39,8 +39,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT loyalist}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         [unit]
             {ULREK}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
@@ -35,8 +35,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Loyalists"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
-        {YOUNG_DELFADOR}
+        [leader]
+            {YOUNG_DELFADOR}
+        [/leader]
         [unit]
             {ULREK}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
@@ -49,10 +49,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Elves"
+        side_name= _ "Kalenz"
         {FLAG_VARIANT wood-elvish}
-        {KALENZ}
-        canrecruit=yes
-        placement=leader
+        [leader]
+            {KALENZ}
+        [/leader]
     [/side]
     {STARTING_VILLAGES_ALL 1}
     [event]

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
@@ -48,9 +48,12 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Rebels"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
         # wmllint: who OLD_DELFADOR is Delfador
-        {OLD_DELFADOR}
+        [leader]
+            {OLD_DELFADOR}
+        [/leader]
         [unit]
             {KALENZ}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
@@ -33,8 +33,11 @@
         save_id=Player
         team_name=allies
         user_team_name= _ "Rebels"
+        side_name= _ "Delfador"
         {FLAG_VARIANT long}
-        {OLD_DELFADOR}
+        [leader]
+            {OLD_DELFADOR}
+        [/leader]
         [unit]
             {KALENZ}
             placement=leader

diff --git a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
@@ -30,7 +30,6 @@
     type=Journeyman Mage
     profile="portraits/younger_delfador.png"
     unrenamable=yes
-    canrecruit=yes
     [modifications]
         {OBJECT_LOYAL}
         {TRAIT_RESILIENT}
@@ -53,7 +52,6 @@
     type=Elder Mage
     profile="portraits/old_delfador.png"
     unrenamable=yes
-    canrecruit=yes
     [modifications]
         {OBJECT_LOYAL}
         {TRAIT_RESILIENT}