EI: more improvements to S5

wesnoth · Mar 30, 2015 · 01e1c4c · 01e1c4c
1 parent 54701ba
commit 01e1c4c
Showing 1 changed file with 49 additions and 14 deletions.
diff --git a/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg b/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
@@ -8,9 +8,9 @@
     victory_when_enemies_defeated=no
     {DEFAULT_SCHEDULE}
 
-    {INTRO_AND_SCENARIO_MUSIC traveling_minstrels.ogg loyalists.ogg}
-    {EXTRA_SCENARIO_MUSIC battle.ogg}
-    {EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
+    {INTRO_AND_SCENARIO_MUSIC transience.ogg wanderer.ogg}
+    {EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}
+    {EXTRA_SCENARIO_MUSIC loyalists.ogg}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
@@ -20,7 +20,7 @@
     [side]
         side=1
         controller=human
-        {GOLD 200 150 150}
+        {GOLD 150 130 100}
         team_name=good
         user_team_name=_"Wesnothians"
         {FLAG_VARIANT loyalist}
@@ -59,25 +59,31 @@
         side=3
         canrecruit=yes
         facing=sw
-        recruit=Skeleton,Skeleton Archer
+        recruit=Skeleton,Skeleton Archer,Skeleton Rider
         team_name=undead
         user_team_name=_"Undead"
         {INCOME 5 10 15}
         {GOLD 30 40 50}
         {FLAG_VARIANT undead}
         [ai]
             aggression=-0.1
-            recruitment_pattern=archer,fighter
+            caution=0.25
+            grouping=defensive
+            recruitment_pattern=archer,archer,fighter,fighter,scout
+            passive_leader=yes
         [/ai]
     [/side]
 
     [side]
         side=4
         no_leader=yes
         team_name=bad
-        user_team_name=_"Evil"
+        hidden=yes
         [ai]
             grouping=no
+            aggression=0.7
+            leader_aggression=0.7
+            grouping=offensive
         [/ai]
     [/side]
 
@@ -90,12 +96,31 @@
         [objectives]
             side=1
             [objective]
-                description= _ "Find the outlaw leader and defeat him"
+                description= _ "Find the outlaw leader"
                 condition=win
+                [show_if]
+                    {VARIABLE_CONDITIONAL shodrano_found not_equals yes}
+                [/show_if]
+            [/objective]
+            [objective]
+                description= _ "Kill Shodrano"
+                condition=win
+                [show_if]
+                    [have_unit]
+                        side=4
+                        id=Shodrano
+                    [/have_unit]
+                [/show_if]
             [/objective]
             [objective]
                 description= _ "Defeat the undead leader"
                 condition=win
+                [show_if]
+                    [have_unit]
+                        side=3
+                        canrecruit=yes
+                    [/have_unit]
+                [/show_if]
             [/objective]
             [objective]
                 description= _ "Death of Gweddry"
@@ -113,8 +138,8 @@
             {TURNS_RUN_OUT}
 
             [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
+                bonus=no
+                carryover_percentage=70
             [/gold_carryover]
 
             {AI_CONTROLLER_NOTE}
@@ -424,6 +449,9 @@
                             name= _ "Shodrano"
                             canrecruit=yes
                         [/unit]
+
+                        {INCIDENTAL_MUSIC battle-epic.ogg}
+
                         [message]
                             speaker=Shodrano
                             message= _ "So, you have found my hiding place. Very well, I guess I will have to kill you!"
@@ -434,6 +462,8 @@
                         [/message]
 
                         {VARIABLE shodrano_found yes}
+
+                        [show_objectives][/show_objectives]
                     [/then]
                 [/if]
             [/then]
@@ -511,12 +541,14 @@
                     speaker=Owaec
                     message= _ "We still need to defeat these undead for the villagers to be safe."
                 [/message]
+
+                [show_objectives][/show_objectives]
             [/then]
             [else]
                 [endlevel]
                     result=victory
-                    bonus=yes
-                    {NEW_GOLD_CARRYOVER 40}
+                    bonus=no
+                    {NEW_GOLD_CARRYOVER 70}
                 [/endlevel]
             [/else]
         [/if]
@@ -529,6 +561,7 @@
         [/filter]
         [if]
             [have_unit]
+                side=4
                 id=Shodrano
             [/have_unit]
             [or]
@@ -539,12 +572,14 @@
                     speaker=Owaec
                     message= _ "There are still these outlaws to take care of — we must continue fighting here."
                 [/message]
+
+                [show_objectives][/show_objectives]
             [/then]
             [else]
                 [endlevel]
                     result=victory
-                    bonus=yes
-                    {NEW_GOLD_CARRYOVER 40}
+                    bonus=no
+                    {NEW_GOLD_CARRYOVER 70}
                 [/endlevel]
             [/else]
         [/if]