EI: First set of updates to S4c

wesnoth · Mar 23, 2015 · 0971e91 · 0971e91
1 parent efbefc6
commit 0971e91
Showing 1 changed file with 18 additions and 52 deletions.
diff --git a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
@@ -26,11 +26,9 @@
     {EI_TRACK {JOURNEY_04C_NEW} }
 
     [side]
-        type=Lieutenant
-        id=Gweddry
-        name= _ "Gweddry"
+        {CHARACTER_STATS_GWEDDRY}
+
         side=1
-        canrecruit=yes
         controller=human
         team_name=wesnothians
         user_team_name=_"Wesnothians"
@@ -44,7 +42,7 @@
         name= _ "Mal-Marak"
         side=2
         canrecruit=yes
-        recruit=Walking Corpse,Skeleton,Skeleton Archer
+        recruit=Ghoul,Skeleton,Skeleton Archer,Walking Corpse
         [ai]
             {NO_SCOUTS}
             recruitment_pattern=fighter,archer,fighter
@@ -55,8 +53,8 @@
         user_team_name=_"Undead"
     [/side]
 
-    {LIMIT_CONTEMPORANEOUS_RECRUITS 2 Skeleton 3}
     {LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Skeleton Archer" 2}
+    {LIMIT_CONTEMPORANEOUS_RECRUITS 2 Ghoul 2}
 
     [side]
         type=Dark Sorcerer
@@ -82,7 +80,7 @@
         type=Death Knight
         id=Ravanal-Guard
         name= _ "Rava-Krodaz"
-        recruit=Revenant,Bone Shooter
+        recruit=Skeleton,Revenant,Skeleton Archer,Bone Shooter,Ghoul,Ghost
         side=4
         canrecruit=yes
         facing=sw
@@ -92,20 +90,20 @@
         user_team_name=_"Undead"
         [ai]
             aggression=-0.2
+            grouping=defensive
+            recruitment_ignore_bad_combat=yes
+            recruitment_pattern=fighter,fighter,fighter,archer,scout
         [/ai]
     [/side]
 
     {STARTING_VILLAGES 4 9}
 
     [side]
-        type=Ancient Lich
-        id=Mal-Ravanal
-        name= _ "Mal-Ravanal"
-        recruit=Dark Adept,Bone Shooter,Revenant,Wraith,Shadow
+        {CHARACTER_STATS_RAVANAL}
+        recruit=Dark Adept,Bone Shooter,Deathblade,Wraith,Shadow,Necrophage
         side=5
         canrecruit=yes
         facing=sw
-        profile=portraits/mal-ravanal.png
         {GOLD 400 500 600}
         {FLAG_VARIANT undead}
         team_name=undead
@@ -118,24 +116,20 @@
     {STARTING_VILLAGES 5 16}
 
     {LIMIT_CONTEMPORANEOUS_RECRUITS 5 Shadow 1}
+    {LIMIT_CONTEMPORANEOUS_RECRUITS 5 Deathblade 2}
 
     # the prisoners' side
     [side]
         side=6
         no_leader=yes
-        team_name=wesnothians
+        controller=null
+        team_name=wesnothians,undead
         user_team_name= _ "Wesnothians"
-        [ai]
-            ai_algorithm=idle_ai
-        [/ai]
-        {FLAG_VARIANT loyalist}
     [/side]
 
     [event]
         name=prestart
 
-        {TEAM_COLOR_OVERRIDE id=Mal-Ravanal blue}
-
         [objectives]
             side=1
             [objective]
@@ -159,10 +153,10 @@
             [/gold_carryover]
         [/objectives]
 
-        # initializing of the knight prisoners: per each Rr^Xo hex, create one
+        # initializing of the knight prisoners: per each ^Xo hex, create one
         # imprisoned knight (one of them a paladin)
         [store_locations]
-            terrain=Rr^Xo
+            terrain=*^Xo
 
             variable=prison_locations
         [/store_locations]
@@ -176,7 +170,9 @@
             [/item]
 
             [store_locations]
-                terrain=Re
+                [not]
+                    terrain=S*
+                [/not]
 
                 [filter_adjacent_location]
                     x,y=$prison_locations[$i].x,$prison_locations[$i].y
@@ -307,36 +303,6 @@
                 {MODIFY_UNIT (role=prison guard) moves 0}
             [/then]
         [/if]
-
-        [if]
-            [variable]
-                name=side_number
-                equals=6
-            [/variable]
-
-            [then]
-                [store_unit]
-                    [filter]
-                        side=6
-                    [/filter]
-
-                    kill=yes
-                    variable=prisoners
-                [/store_unit]
-
-                {FOREACH prisoners i}
-                    {VARIABLE prisoners[$i].moves 0}
-                    {VARIABLE prisoners[$i].attacks_left 0}
-
-                    [unstore_unit]
-                        variable=prisoners[$i]
-                        find_vacant=no
-                    [/unstore_unit]
-                {NEXT i}
-
-                {CLEAR_VARIABLE prisoners}
-            [/then]
-        [/if]
     [/event]
 
     [event]