SotBE: Update role tag usage

wesnoth · Oct 18, 2018 · a73656a · a73656a
1 parent 7b77d5f
commit a73656a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 80 deletions.
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
@@ -115,22 +115,14 @@
             role=Helper
             type=Wolf Rider, Orcish Archer, Orcish Grunt, Orcish Warrior, Orcish Crossbowman, Goblin Knight, Goblin Pillager, Orcish Warlord, Orcish Slurbow, Direwolf Rider
             side=1
+            search_recall_list=no
             [not]
                 id="Kapou'e,Vrag"
             [/not]
-            x=1-99
-        [/role]
-
-        [if]
-            [not]
-                [have_unit]
-                    role=Helper
-                [/have_unit]
-            [/not]
-            [then]
+            [else]
                 {UNIT 1 (Orcish Grunt) 16 3 (role=Helper)}
-            [/then]
-        [/if]
+            [/else]
+        [/role]
 
         [if]
             [have_unit]

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
@@ -127,22 +127,12 @@
         [role]
             type=Orcish Warlord, Orcish Slurbow, Direwolf Rider, Orcish Warrior, Orcish Crossbowman, Goblin Knight, Goblin Pillager, Orcish Grunt, Orcish Archer, Wolf Rider
             role=Helper
-        [/role]
-
-        [if]
-            [have_unit]
-                role=Helper
-                search_recall_list=yes
-            [/have_unit]
-            [then]
-                [recall]
-                    role=Helper
-                [/recall]
-            [/then]
+            [auto_recall]
+            [/auto_recall]
             [else]
                 {UNIT 1 (Orcish Grunt) 35 23 (role=Helper)}
             [/else]
-        [/if]
+        [/role]
 
         [message]
             speaker="Kapou'e"

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg
@@ -216,6 +216,11 @@
         [role]
             type=Direwolf Rider,Goblin Knight,Goblin Pillager,Wolf Rider
             role=Scout
+            [auto_recall]
+            [/auto_recall]
+            [else]
+                {UNIT 1 "Wolf Rider" 36 3 role="Scout"}
+            [/else]
         [/role]
 
         [store_unit]
@@ -225,28 +230,6 @@
             variable=scout
         [/store_unit]
 
-        [if]
-            [variable]
-                name=scout.length
-                greater_than=0
-            [/variable]
-
-            [then]
-                [recall]
-                    role=Scout
-                    x,y=36,3
-                [/recall]
-            [/then]
-
-            [else]
-                {GENERIC_UNIT 1 "Wolf Rider" 36 3}
-                [+unit]
-                    role=Scout
-                    to_variable=scout
-                [/unit]
-            [/else]
-        [/if]
-
         [message]
             speaker=narrator
             message= _ "When the party finally reached Barag Gór, they were met with a most startling sight."

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg
@@ -216,22 +216,18 @@
         [role]
             type=Orcish Warlord,Troll Warrior,Orcish Warrior,Troll,Orcish Grunt
             role=cannonfodder
+            [auto_recall]
+                x,y=18,11
+            [/auto_recall]
         [/role]
-        [recall]
-            role=cannonfodder
-            x=18
-            y=11
-        [/recall]
 
         [role]
             role=cannonfodder2
             type=Orcish Crossbowman,Orcish Slayer,Orcish Archer,Orcish Assassin
+            [auto_recall]
+                x,y=20,11
+            [/auto_recall]
         [/role]
-        [recall]
-            role=cannonfodder2
-            x=20
-            y=11
-        [/recall]
 
         {RENAME_IF_DEAD thelarion_dead Thelarion (_"Telamir")}
         {RENAME_IF_DEAD darstang_dead Darstang (_"Angthur")}

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg
@@ -172,15 +172,8 @@
             [/have_unit]
 
             [else]
-                [role]
-                    side=1
-                    x,y=recall,recall
-                    type=Orcish Warlord,Orcish Slurbow,Saurian Flanker,Troll Warrior,Orcish Warrior,Orcish Crossbowman,Saurian Oracle,Saurian Soothsayer,Saurian Ambusher,Troll,Troll Rocklobber,Orcish Slayer
-                    role=initial_backup
-                [/role]
-
                 [recall]
-                    role=initial_backup
+                    type=Orcish Warlord,Orcish Slurbow,Saurian Flanker,Troll Warrior,Orcish Warrior,Orcish Crossbowman,Saurian Oracle,Saurian Soothsayer,Saurian Ambusher,Troll,Troll Rocklobber,Orcish Slayer
                     x,y=44,9
                 [/recall]
             [/else]
@@ -192,15 +185,8 @@
             [/have_unit]
 
             [else]
-                [role]
-                    side=1
-                    x,y=recall,recall
-                    type=Orcish Warlord,Orcish Slurbow,Saurian Flanker,Troll Warrior,Orcish Warrior,Orcish Crossbowman,Saurian Oracle,Saurian Soothsayer,Saurian Ambusher,Troll,Troll Rocklobber,Orcish Slayer
-                    role=initial_backup2
-                [/role]
-
                 [recall]
-                    role=initial_backup2
+                    type=Orcish Warlord,Orcish Slurbow,Saurian Flanker,Troll Warrior,Orcish Warrior,Orcish Crossbowman,Saurian Oracle,Saurian Soothsayer,Saurian Ambusher,Troll,Troll Rocklobber,Orcish Slayer
                     x,y=44,10
                 [/recall]
             [/else]

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
@@ -229,14 +229,8 @@
             x,y=23,6
         [/recall]
 
-        [role]
-            type=Orcish Warlord,Orcish Slurbow,Troll Warrior,Direwolf Rider,Goblin Pillager,Orcish Crossbowman,Orcish Warrior,Goblin Knight
-            side=1
-            role=bodyguard
-        [/role]
-
         [recall]
-            role=bodyguard
+            type=Orcish Warlord,Orcish Slurbow,Troll Warrior,Direwolf Rider,Goblin Pillager,Orcish Crossbowman,Orcish Warrior,Goblin Knight
             x,y=43,21
         [/recall]