From 5dccaa20a756b9e9c205e7538bdbf59a492ab63f Mon Sep 17 00:00:00 2001
From: ln-zookeeper <lari.nieminen@iki.fi>
Date: Mon, 30 Jun 2014 22:59:49 +0300
Subject: [PATCH] Fixed various income issues

---
 changelog                                     |  3 ++
 .../scenarios/11_Descent_into_Darkness.cfg    | 29 +++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index a2941c8d5d47..09c4d6693997 100644
--- a/changelog
+++ b/changelog
@@ -24,6 +24,9 @@ Version 1.13.0-dev:
    * Fix bug in Return Guardian Micro AI when there is no path to the return hex
  * Campaigns:
    * Changed all occurrences of {FLAG_VARIANT ragged} to {FLAG_VARIANT6 ragged}
+   * Descent into Darkness:
+     * Fixed various issues with player and enemy gold and income in
+       'Descent into Darkness'.
    * Eastern Invasion:
      * In 'Captured', stolen gold won't be mentioned if the player had no
        carryover gold.
diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
index cf480329500b..45c41dd3851d 100644
--- a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
@@ -50,7 +50,7 @@
         unrenamable=yes
         canrecruit=yes
         recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton,Dark Adept DiD
-        income=0
+        income=-2
         gold=100
         fog=yes
         shroud=yes
@@ -65,6 +65,7 @@
         controller=ai
         # place leader later
         no_leader=yes
+        income=-2
         gold=60
         recruit=Troll Whelp,Troll,Troll Rocklobber,Troll Warrior,Troll Shaman
         [ai]
@@ -96,6 +97,8 @@
         user_team_name=_"Trolls"
         controller=ai
         no_leader=yes
+        income=-2
+        gold=0
         [ai]
             # Avoid the spiders, the wose, and the beginning area
             [avoid]
@@ -114,6 +117,8 @@
         user_team_name=_"Trolls"
         controller=ai
         no_leader=yes
+        income=-2
+        gold=0
         [ai]
             # Avoid the spiders, the wose, and the beginning area
             [avoid]
@@ -130,6 +135,8 @@
         side=5
         controller=ai
         no_leader=yes
+        income=-2
+        gold=0
         [ai]
             # This is mostly for the Wose -- the others are guardians
             [goal]
@@ -252,6 +259,8 @@
             name= _"Dumdumbadoom"
             ai_special=guardian
         [/unit]
+
+        {MODIFY_UNIT side=2,3,4,5 upkeep loyal}
     [/event]
 
     [event]
@@ -610,10 +619,12 @@
     [event]
         # Set the troll enemy and return income to normal when you reach your keep
         name=moveto
+
         [filter]
             id=Mal Keshar
             x,y=30,25
         [/filter]
+
         [unit]
             # Troll leader
             type=Troll Hero
@@ -622,9 +633,23 @@
             x,y=10,6
             canrecruit=yes
         [/unit]
+        
+        [modify_side]
+            side=2
+            income=0
+        [/modify_side]
+
+        {MODIFY_UNIT side=2 upkeep full}
+        
+        [capture_village]
+            side=2
+            x=1-13
+            y=1-10
+        [/capture_village]
+
         [modify_side]
             side=1
-            income=2
+            income=0
         [/modify_side]
     [/event]