Converted EI to the new gold carryover system.

Starting gold still needs to be rebalanced.

data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg

@@ -178,6 +178,8 @@
                 description= _ "Death of Gweddry"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
 #ifdef EASY
         [terrain]
@@ -313,6 +315,8 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
         #you win when you move to the trapdoor
         [item]
@@ -334,6 +338,7 @@
             [endlevel]
                 result=victory
                 bonus=yes
+                {NEW_GOLD_CARRYOVER 40}
             [/endlevel]
         [/event]
     [/event]

data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg

@@ -94,6 +94,8 @@
                 description= _ "Death of Dacyn"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -355,6 +357,7 @@
         [endlevel]
             result=victory
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg

@@ -109,6 +109,8 @@
                 description= _ "Death of Dacyn"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -168,6 +170,7 @@
             result=victory
             next_scenario=Elven_Alliance
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 
@@ -188,6 +191,7 @@
             result=victory
             next_scenario=Undead_Border_Patrol
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg

@@ -83,6 +83,8 @@
                 description= _ "Death of Volas"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -238,7 +240,7 @@
     [/event]
 
     [event]
-        name=victory
+        name=enemies defeated
         [message]
             speaker=Volas
             message= _ "We have defeated the orcs! Now you can rest, and then leave."
@@ -251,5 +253,10 @@
             speaker=Volas
             message= _ "Very well. I will send guides to lead you to your allies."
         [/message]
+        [endlevel]
+            result=victory
+            bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
+        [/endlevel]
     [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg

@@ -84,6 +84,8 @@
                 description= _ "Death of Dacyn"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -123,6 +125,7 @@
             result=victory
             bonus=yes
             next_scenario=Northern_Outpost
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 
@@ -153,6 +156,7 @@
                         result=victory
                         bonus=yes
                         next_scenario=Mal-Ravanals_Capital
+                        {NEW_GOLD_CARRYOVER 40}
                     [/endlevel]
                 [/command]
             [/option]
@@ -195,6 +199,7 @@
                 [endlevel]
                     result=victory
                     next_scenario=Mal-Ravanals_Capital
+                    {NEW_GOLD_CARRYOVER 40}
                 [/endlevel]
             [/else]
         [/if]

data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg

@@ -114,6 +114,8 @@
                 description= _ "Death of Dacyn"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -139,7 +141,6 @@
 
         [message]
             speaker=Mal-Ravanal
-            profile=portraits/mal-ravanal.png
             message= _ "These humans have dared foolishly to come this far into my land. Crush them!"
         [/message]
         #there are 6 prisoner knights you can rescue
@@ -237,7 +238,6 @@
         [/filter_second]
         [message]
             speaker=Mal-Ravanal
-            profile=portraits/mal-ravanal.png
             message= _ "You dare to attack ME?!? Go back to your master!"
         [/message]
         [message]
@@ -263,6 +263,7 @@
         [endlevel]
             result=victory
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 
@@ -274,6 +275,7 @@
         [endlevel]
             result=victory
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 

data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg

@@ -120,6 +120,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -329,6 +331,7 @@
                     variable=dacyn
                     find_vacant=yes
                 [/unstore_unit]
+                {CLEAR_VARIABLE dacyn}
                 [message]
                     speaker=Dacyn
                     message= _ "Good job! Now, we should move onward, north. Tell the villagers to pack their belongings and follow us."
@@ -352,7 +355,9 @@
                 {CLEAR_VARIABLE Owaec_store}
 
                 [endlevel]
+                    result=victory
                     bonus=yes
+                    {NEW_GOLD_CARRYOVER 40}
                 [/endlevel]
             [/else]
         [/if]
@@ -388,6 +393,7 @@
                     variable=dacyn
                     find_vacant=yes
                 [/unstore_unit]
+                {CLEAR_VARIABLE dacyn}
                 [message]
                     speaker=Dacyn
                     message= _ "Good work! Now, we should move onward, north. Tell the villagers to pack their belongings and follow us."
@@ -411,7 +417,9 @@
                 {CLEAR_VARIABLE Owaec_store}
 
                 [endlevel]
+                    result=victory
                     bonus=yes
+                    {NEW_GOLD_CARRYOVER 40}
                 [/endlevel]
             [/else]
         [/if]

data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg

@@ -90,6 +90,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -152,6 +154,7 @@
             result=victory
             next_scenario=Crossing
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 
@@ -172,6 +175,7 @@
             result=victory
             next_scenario=Undead_Crossing
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg

@@ -96,6 +96,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -277,6 +279,7 @@
                         result=victory
                         next_scenario=Xenophobia
                         bonus=yes
+                        {NEW_GOLD_CARRYOVER 40}
                     [/endlevel]
                 [/then]
             [/if]

data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg

@@ -70,6 +70,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -146,4 +148,14 @@
             message= _ "It seems as if in addition to summoning undead this foul sorcerer has learned to call up monsters from the deep!"
         [/message]
     [/event]
+
+    [event]
+        name=enemies defeated
+
+        [endlevel]
+            result=victory
+            bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
+        [/endlevel]
+    [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg

@@ -26,6 +26,7 @@
         id=Gweddry
         name= _ "Gweddry"
         side=1
+        income=-2
         canrecruit=no
         controller=human
     [/side]
@@ -72,6 +73,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={NEW_GOLD_CARRYOVER_NOTE_100}
         [/objectives]
     [/event]
 
@@ -172,6 +175,7 @@
         [endlevel]
             result=victory
             bonus=yes
+            {NEW_GOLD_CARRYOVER 100}
         [/endlevel]
     [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg

@@ -111,6 +111,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -342,4 +344,14 @@
             [/effect]
         [/object]
     [/event]
+
+    [event]
+        name=enemies defeated
+
+        [endlevel]
+            result=victory
+            bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
+        [/endlevel]
+    [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg

@@ -97,6 +97,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -170,7 +172,7 @@
     [/event]
 
     [event]
-        name=victory
+        name=enemies defeated
         [store_unit]
             [filter]
                 id=Gweddry
@@ -230,6 +232,7 @@
         [endlevel]
             result=victory
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/12.Captured.cfg

@@ -198,6 +198,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
         ##############################
         #starting units (like guards)#
@@ -479,6 +481,8 @@
         [/message]
         [endlevel]
             result=victory
+            bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg

@@ -181,7 +181,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
-            note= _ "Note: every unit not on the south side of the river when the bridge is destroyed will be lost (including not recalled units)"
+            note= _ "Note: every unit not on the south side of the river when the bridge is destroyed will be lost (including not recalled units)"+"
+"+{EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -298,6 +299,7 @@
                     [endlevel]
                         result=victory
                         bonus=yes
+                        {NEW_GOLD_CARRYOVER 40}
                     [/endlevel]
                 [/command]
             [/option]
@@ -329,6 +331,12 @@
             speaker=Gweddry
             message= _ "Well, we didn't have to blow up the bridge after all, but we still have to leave the northlands. More orcs will come. But where will we go? There are undead in Wesnoth."
         [/message]
+
+        [endlevel]
+            result=victory
+            bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
+        [/endlevel]
     [/event]
 
     [event]

data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg

@@ -150,6 +150,8 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
 
         # Note: the code for the ambushers is mostly identical to that of
@@ -427,4 +429,14 @@
             message= _ "Aha! I see what they have done. They have raised him as an undead dragon. But he does not appear to be weak to my arcane senses... this is strange magic indeed."
         [/message]
     [/event]
+
+    [event]
+        name=enemies defeated
+
+        [endlevel]
+            result=victory
+            bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
+        [/endlevel]
+    [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg

@@ -142,6 +142,8 @@
                 description= _ "Death of Konrad II"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
         [unit]
             side=5
@@ -223,6 +225,7 @@
         [endlevel]
             result=victory
             bonus=yes
+            {NEW_GOLD_CARRYOVER 40}
         [/endlevel]
     [/event]
 

data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg

@@ -56,6 +56,7 @@
         side=1
         canrecruit=yes
         controller=human
+        gold=0
         team_name=good
         user_team_name=_"Wesnothians"
     [/side]
@@ -165,7 +166,9 @@
             message= _ "Well, that will have to be the end of our council. Let us fight!"
         [/message]
         [endlevel]
-            result=continue
+            result=victory
+            bonus=no
+            {NEW_GOLD_CARRYOVER 100}
         [/endlevel]
     [/event]
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/17.Weldyn_Under_Attack.cfg

@@ -172,6 +172,8 @@
                 description= _ "Death of Konrad II"
                 condition=lose
             [/objective]
+
+            note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
         [/objectives]
     [/event]
 
@@ -299,6 +301,7 @@
                 [endlevel]
                     result=victory
                     next_scenario=Duel
+                    {NEW_GOLD_CARRYOVER 40}
                 [/endlevel]
             [/command]
         [/option]
@@ -315,6 +318,7 @@
                 [endlevel]
                     result=victory
                     next_scenario=Reject
+                    {NEW_GOLD_CARRYOVER 40}
                 [/endlevel]
             [/command]
         [/option]

data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg

@@ -141,7 +141,7 @@ The first leader to fall loses the duel."
             message= _ "I... lose?..."
         [/message]
         [endlevel]
-            result=victory
+            result=continue_no_save
         [/endlevel]
     [/event]
 

data/campaigns/Eastern_Invasion/scenarios/18b.Weldyn_Besieged.cfg

@@ -286,7 +286,7 @@
             message= _ "How did you know...?"
         [/message]
         [endlevel]
-            result=victory
+            result=continue_no_save
         [/endlevel]
     [/event]