Un-passivied Darken but prevented suicidal behavior

wesnoth · Jul 5, 2014 · c5de1c4 · c5de1c4
1 parent 982d868
commit c5de1c4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/data/campaigns/Descent_Into_Darkness/maps/10_Alone_at_Last.map b/data/campaigns/Descent_Into_Darkness/maps/10_Alone_at_Last.map
@@ -9,8 +9,8 @@ Mm          , Mm          , Mm          , Mm          , Mm          , Mm
 Mm          , Mm          , Mm          , Mm          , Hh          , Mm          , Gg          , Mm          , Gg^Fet      , Hh          , Gg          , Hh          , Gs^Fms      , Gs^Fp       , Gs^Fms      , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Ww^Bw\      , Ww          , Ww          , Ww          , Ww          , Ww          , Gg          , Gg^Efm      , Gg          , Gg          , Gg          
 Mm          , Mm          , Mm          , Mm          , Gg          , Gg          , Gg          , Gs^Fms      , Gs^Fds      , Gg          , Gg          , Gs^Fds      , Gs^Fds      , Gg          , Gs^Fds      , Gs^Fds      , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Ww          , Ww          , Ww          , Ww^Bw\      , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg^Fet      , Gs^Fms      , Gs^Fms      
 Mm          , Mm          , Mm          , Mm          , Gg^Fet      , Gg          , Gg          , Gs^Fms      , Gs^Fds      , Gs^Fds      , Gs^Fds      , Gs^Fds      , Gs^Fds      , Gs^Fds      , Gs^Fds      , Gg^Fet      , Gg          , Gg          , Ww          , Ww          , Ww          , Ww          , Ww          , Ww          , Ww          , Ww          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gs^Fds      , Gg          , Gs^Fds      , Gs^Fms      , Gs^Fms      
-Mm          , Mm          , Mm          , Gs^Fp       , Mm          , Gg          , Hh          , Gg          , Gg          , Gg          , Gs^Fds      , Gg^Fet      , Gs^Fds      , Gs^Fds      , Gg          , Gg          , Ww          , Ww          , Ww          , Ww          , Gg          , Ww          , Gg          , Ww          , Gg          , Gs^Fds      , Gg          , Gg          , Gg          , Gg^Vh       , Gs^Fds      , Gg          , Gg          , Gg          , Gs^Fds      , Gg          , Gg          
-Mm          , Mm          , Mm          , Mm          , Mm          , Mm          , Hh          , Hh          , Gs^Fp       , Gg          , Gs^Fds      , Gs^Fds      , Gs^Fds      , Gg          , Gg^Vh       , Ww          , Ww          , Ww          , Gg          , Gg          , Gs^Fds      , Gs^Fds      , Gg          , Gg          , Gg          , Gg          , Re^Gvs      , Gg          , Re^Gvs      , Re^Gvs      , Gg          , Gg          , Gg          , Gg          , Gs^Fms      , Gs^Fms      , Gs^Fp       
+Mm          , Mm          , Mm          , Gs^Fp       , Mm          , Gg          , Hh          , Gg          , Gg          , Gg          , Gs^Fds      , Gg^Fet      , Gs^Fds      , Gs^Fds      , Gg          , Gg          , Ww          , Ww          , Ww          , Ww          , Gg          , Ww          , Gg          , Ww          , Gg          , Gs^Fds      , Gg          , Gg          , Gg          , Gg          , Gs^Fds      , Gg          , Gg          , Gg          , Gs^Fds      , Gg          , Gg          
+Mm          , Mm          , Mm          , Mm          , Mm          , Mm          , Hh          , Hh          , Gs^Fp       , Gg          , Gs^Fds      , Gs^Fds      , Gs^Fds      , Gg          , Gg^Vh       , Ww          , Ww          , Ww          , Gg          , Gg          , Gs^Fds      , Gs^Fds      , Gg          , Gg          , Gg          , Gg          , Re^Gvs      , Gg^Vh       , Re^Gvs      , Re^Gvs      , Gg          , Gg          , Gg          , Gg          , Gs^Fms      , Gs^Fms      , Gs^Fp       
 Mm          , Mm          , Mm          , Mm          , Mm          , Mm          , Gg          , Gg          , Gg          , Gs^Fms      , Gs^Fms      , Gg          , Gs^Fms      , Gg          , Gg          , Ww          , Ww          , Gg          , Gs^Fds      , Gg^Fet      , Gs^Fds      , Gg^Ve       , Gg          , Gg          , Re^Gvs      , Re^Gvs      , Re^Gvs      , Re^Gvs      , Re^Gvs      , Re^Gvs      , Gg          , Gg^Fet      , Gg          , Gs^Fds      , Gg          , Gs^Fms      , Gs^Fds      
 Mm          , Mm          , Mm          , Mm          , Mm          , Mm          , Mm          , Gg          , Gs^Fp       , Gs^Fms      , Gg          , Gs^Fms      , Gg          , Gg          , Gg          , Ww          , Ww^Bw/      , Gg          , Gg          , Gs^Fds      , Re          , Gg          , Gg          , Gg          , Gg          , Re^Gvs      , Re^Gvs      , Re^Gvs      , Re^Gvs      , Re^Gvs      , Gg          , Gg          , Gg          , Gg          , Gs^Fms      , Gs^Fms      , Gs^Fds      
 Gg          , Gg          , Gg          , Mm          , Mm          , Mm          , Mm          , Hh^Vhh      , Hh          , Gg          , Gg          , Gg          , Gg^Efm      , Gg          , Gg          , Ww^Bw/      , Ww          , Gg          , Gg          , Gg          , Gg          , Gg          , Gs^Fds      , Gg          , Gg          , Gg^Efm      , Gg          , Re^Gvs      , Gg^Wm       , Gg          , Gg          , Gg          , Gg          , Gs^Fds      , Gg          , Gs^Fds      , Gs^Fds      

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
@@ -53,7 +53,6 @@
         recruit=Blood Bat,Ghost,Wraith,Necrophage,Skeleton Archer,Bone Shooter,Skeleton,Revenant,Deathblade,Dark Adept DiD,Dark Sorcerer DiD
         {FLAG_VARIANT undead}
         [ai]
-            passive_leader=yes
             village_value=0.2
             villages_per_scout=10
             [goal]
@@ -375,6 +374,37 @@
         [/if]
     [/event]
 
+    # This helps prevent Darken from getting himself killed easily by preventing
+    # him from leaving his castle
+    [event]
+        name=side 2 turn refresh
+        first_time_only=no
+
+        [modify_unit]
+            [filter]
+                id=Darken Volk
+            [/filter]
+
+            [movement_costs]
+                flat=99
+            [/movement_costs]
+        [/modify_unit]
+
+        [event]
+            name=side turn end
+
+            [modify_unit]
+                [filter]
+                    id=Darken Volk
+                [/filter]
+
+                [movement_costs]
+                    flat=1
+                [/movement_costs]
+            [/modify_unit]
+        [/event]
+    [/event]
+
     [event]
         name=attack
         [filter]