NR S13a: Clean up side 9 handling to match previous commit

[ci skip]

data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg

@@ -340,13 +340,13 @@
         team_name=knalgans
         user_team_name=_"Alliance"
         save_id=Elves
-        persistent=yes
         controller=human
         no_leader=yes
+        defeat_condition=never
         {FLAG_VARIANT wood-elvish}
     [/side]
-    # Plain STARTING_VILLAGES fails here because side has no leader
-    {STARTING_VILLAGES_AREA 9 31 54 10}
+    # STARTING_VILLAGES works due to defeat_condition & having a starting location
+    {STARTING_VILLAGES 9 10}
 
     [event]
         name=prestart
@@ -441,13 +441,14 @@
                 [/modify_side]
             [/then]
             [else]
-                [kill]
-                    race=Elves
-                [/kill]
                 {TELEPORT_UNIT id="Ro'Sothian" $side_nine_starts_at.x $side_nine_starts_at.y}
                 {MODIFY_UNIT id="Ro'Sothian" canrecruit yes}
                 {MODIFY_UNIT id="Ro'Sothian" side 9}
                 {UNMAKE_HERO "Ro'Sothian"}
+                [kill]
+                    side=9
+                    race=elf
+                [/kill]
                 [disallow_recruit]
                     side=9
                     type=Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Rider,Elvish Druid,Elvish Sorceress
@@ -467,6 +468,10 @@
                 {CLEAR_VARIABLE place_second_lich_at}
             [/else]
         [/if]
+        [modify_side]
+            side=9
+            defeat_condition=no_leader_left
+        [/modify_side]
 
         # Hide leader of side 9, Hamel and Tallin for great entrance
         [hide_unit]
@@ -677,13 +682,6 @@
             image=wesnoth-icon.png
         [/message]
 
-        # Now that side 9 has a leader, give them some villages
-        [capture_village]
-            side=9
-            x=21-40
-            y=50-60
-        [/capture_village]
-
         # Recall heroes
         {RECALL_SUPPORTER}
         [recall]