From 26d141721f5ddb63c6d79189eed65a826a783b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A4r=20Halberkamp?= <fledaway@gmail.com>
Date: Wed, 18 Mar 2015 12:26:40 +0100
Subject: [PATCH] EI: Improvements to S4a

---
 .../scenarios/04a_An_Elven_Alliance.cfg       | 91 +++++++++++++++----
 1 file changed, 72 insertions(+), 19 deletions(-)

diff --git a/data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg b/data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
index a55dee63f262..d738915b8ea0 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
@@ -47,13 +47,17 @@
         controller=ai
         recruit=Elvish Fighter,Elvish Shaman,Elvish Scout
         {GOLD 150 100 75}
+        income=-2
         team_name=good
         user_team_name=_"Allies"
         [ai]
             passive_leader=yes
         [/ai]
-        {FLAG_VARIANT long}
+        {FLAG_VARIANT wood-elvish}
     [/side]
+
+    {STARTING_VILLAGES 2 999}
+
     [side]
         type=Orcish Warrior
         id=Gruga-Har
@@ -61,16 +65,37 @@
         side=3
         canrecruit=yes
         controller=ai
+#ifdef EASY
         recruit=Troll Whelp,Wolf Rider,Orcish Grunt,Orcish Archer
-        {GOLD 125 150 175}
-        team_name=monster
-        user_team_name=_"Monsters"
+#else
+        recruit=Troll Whelp,Wolf Rider,Orcish Grunt,Orcish Archer,Goblin Pillager
+#endif
+        {GOLD 180 220 270}
+        team_name=orcs
+        user_team_name=_"Orcs"
         {FLAG_VARIANT6 ragged}
+
+        [ai]
+            aggression=0.7
+            leader_value=5
+        [/ai]
     [/side]
 
+    {STARTING_VILLAGES 3 3}
+
+#ifndef EASY
+    {LIMIT_RECRUITS 3 (Goblin Pillager) 2}
+#endif
+
     [event]
         name=prestart
 
+        [micro_ai]
+            side=3
+            ai_type=recruit_rushers
+            action=add
+        [/micro_ai]
+
         [objectives]
             side=1
             [objective]
@@ -170,13 +195,21 @@
             message= _ "Bring forth the assassins, we may be able to poison them!"
         [/message]
         [move_unit_fake]
+#ifdef HARD
+            type=Orcish Nightblade
+#else
             type=Orcish Slayer
+#endif
             side=3
             x=18,18,18
             y=1,2,3
         [/move_unit_fake]
         [unit]
+#ifdef HARD
+            type=Orcish Nightblade
+#else
             type=Orcish Slayer
+#endif
             id=Nafga
             name= _ "Nafga"
             side=3
@@ -192,11 +225,15 @@
             speaker=Gruga-Har
             message= _ "Perfect! Go, into the forest!"
         [/message]
-        [kill]
-            id=Nafga
-        [/kill]
+        [store_unit]
+            [filter]
+                id=Nafga
+            [/filter]
+            kill=yes
+            variable=nafga_store
+        [/store_unit]
         [move_unit_fake]
-            type=Orcish Slayer
+            type=$nafga_store.type
             side=3
             x=18,18,18,18
             y=3,4,5,6
@@ -209,14 +246,17 @@
 
     [event]
         name=turn 6
-        [unit]
-            type=Orcish Slayer
-            id=Nafga
-            name= _ "Nafga"
-            side=3
-            x=20
-            y=16
-        [/unit]
+
+        {VARIABLE nafga_store.x 20}
+        {VARIABLE nafga_store.y 16}
+
+        [unstore_unit]
+            variable=nafga_store
+            find_vacant=yes
+        [/unstore_unit]
+
+        {CLEAR_VARIABLE nafga_store}
+
         [message]
             speaker=Nafga
             message= _ "Hahaha! Nafga will kill the elves!"
@@ -232,10 +272,14 @@
             speaker=Nafga
             message= _ "No! This is the first time I have failed a mission, and it will be my last!"
         [/message]
-        [kill]
+    [/event]
+
+    [event]
+        name=die
+        [filter]
             id=Nafga
-            animate=yes
-        [/kill]
+        [/filter]
+
         [message]
             speaker=Gruga-Har
             message= _ "My assassin is dead! The elves must pay, not for his death, but for stopping him in his mission!"
@@ -251,10 +295,19 @@
         [filter]
             id=Volas
         [/filter]
+
         [message]
             speaker=Volas
             message= _ "You have failed me, man of Wesnoth..."
         [/message]
+    [/event]
+
+    [event]
+        name=die
+        [filter]
+            id=Volas
+        [/filter]
+
         [endlevel]
             result=defeat
         [/endlevel]