EI: changed scenario 14 to fit the new map, and added some more encam…

…pment for side 2's units
wesnoth · Oct 23, 2014 · d98ebbc · d98ebbc
1 parent a9721b4
commit d98ebbc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 39 deletions.
diff --git a/data/campaigns/Eastern_Invasion/maps/14_Approaching_Weldyn.map b/data/campaigns/Eastern_Invasion/maps/14_Approaching_Weldyn.map
@@ -21,15 +21,15 @@ Gs^Fdf, Gg, Gg, Ce, Ce, Gg, Gg^Vl, Ce, 3 Ke, Rr, Rr, Gg, Gg, Gll, Gd, Gg, Gg, Gs
 Gll^Fdw, Gll, Gg, Gg, Gs, Gg, Ce, Ce, Gg, Gg, Gg, Rr, Rr, Gg, Gg, Gg^Efm, Gs, Gg^Efm, Gg^Efm, Gg, Gg, Re^Gvs, Rr, Gg, Gs, Gs, Hh, Hh, Gg, Gll^Fdf, Gg, Gg^Es, Gg, Gg, Gg, Hh, Gg, Gg
 Gs^Fdf, Gll^Fdf, Gll^Fdw, Gs, Gs, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Gg, Re^Gvs, Rr, Rr, Gg, Gs, Gs^Efm, Gs, Gg, Gg, Gg, Rr, Gg, Gg, Hh, Hh, Hh, Gg^Gvs, Gg, Gg^Efm, Gg, Gg, Gg^Efm, Gg, Gg, Rr, Rr
 Gg, Gll, Gg, Gg, Gg, Gg, Gll, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Vh, Rr, Rr, Gg, Ce, Ce, Gs, Gg^Vhc, Rr, Gg, Gs, Gg, Ce, Gg^Gvs, Gs^Gvs, Gg^Gvs, Gg, Gg, Rr, Rr, Rr, Rr, Gg, Gg
-Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gll^Fdf, Gll, Gs, Gg, Gg, Gs^Fdf, Re^Gvs, Gg, Gg, Gg, Rr, Gg^Vhc, Gs, Rrc, Rrc, Ww^Bsb|, Rrc, Rrc, Gg^Vhc, Gg, Ce, Gs, Gs, Rr, Rr, Gg, Gg, Gg, Gg, Hh, Hh
-Gg, Gs^Es, Gg, Hh, Hh, Gg, Gg^Vl, Gll^Fdw, Gll^Fdf, Gs, Gg, Gg, Gg, Gg, Hh, Gg, Gg^Vhc, Rrc, Rrc, Rrc, Ww, Ww, Rrc, Ww, Ww, Rrc, Rrc, Gs, Rr, Rr, Gg, Gg, Gg, Gs^Efm, Gg, Gg, Hh, Hh
+Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gll^Fdf, Gll, Gs, Gg, Gg, Gs^Fdf, Re^Gvs, Gg, Gg, Ce, Rr, Gg^Vhc, Gs, Rrc, Rrc, Ww^Bsb|, Rrc, Rrc, Gg^Vhc, Gg, Ce, Gs, Gs, Rr, Rr, Gg, Gg, Gg, Gg, Hh, Hh
+Gg, Gs^Es, Gg, Hh, Hh, Gg, Gg^Vl, Gll^Fdw, Gll^Fdf, Gs, Gg, Gg, Gg, Gg, Hh, Ce, Gg^Vhc, Rrc, Rrc, Rrc, Ww, Ww, Rrc, Ww, Ww, Rrc, Rrc, Gs, Rr, Rr, Gg, Gg, Gg, Gs^Efm, Gg, Gg, Hh, Hh
 Gs, Gg, Gg, Hh, Re^Gvs, Re^Gvs, Re^Gvs, Gll^Fdf, Gll^Fdw, Gll, Gll^Fdw, Gg, Gg^Efm, Gg, Hh, Gg, Gs, Rrc, Ww, Ww^Bsb\, Rrc, Rrc, Gg^Efm, Rrc^Vhc, Rrc, Ww, Ww^Bsb/, Rrc, Gg, Gg, Gg, Gd, Gg, Gs, Gg^Vl, Gg, Gs, Gg
 Gs, Gs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gll^Fdf, Gll, Gll, Gg, Gg, Gs, Gg, Gg, Gg, Gg^Vhc, Rrc, Ww, Rrc^Vhc, Gg^Efm, Gg^Efm, Ch, Gg^Efm, Gg^Efm, Rrc, Ww, Rrc, Gg^Vhc, Ce, Gg, Gs, Gs^Fdw, Gg, Gg, Gg, Gs, Gs
 Gg, Gs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg^Efm, Gg, Gg^Efm, Gg^Efm, Gg, Gs^Es, Gg, Ce, Gg^Vhc, Rrc, Ww, Rrc, Rrc^Vhc, Ch, 5 Kh, Ch, Rrc, Rrc^Vhc, Ww, Rrc, Gg, Ce, Gg, Gg, Gll^Fdf, Gll, Gg, Gg, Gs, Gs
 Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gs^Efm, Gg, Gd, Gg, Hh, Gg, Gg, Ce, Gs, Rrc, Ww, Ww, Rrc, Ch, Ch, Ch, Rrc, Ww, Ww, Rrc, Gg^Vhc, Ce, Gg, Gg, Gll^Fdf, Hh, Gll, Gg, Gll^Fdf, Gs^Fdw
 Gg, Gg, Gg^Vh, Re^Gvs, Gg, Gg, Gg, Gs, Gs, Gs, Gg, Hh, Hh, Hh, Gg, Ce, Gg^Vhc, Rrc, Ww^Bsb/, Ww^Bsb/, Ww, Rrc, Gg^Efm, Rrc, Ww, Ww^Bsb\, Ww^Bsb\, Rrc, Gs, Gg, Gs, Gg, Gg, Gll, Gll^Fdw, Gll^Fdf, Gll^Fdw, Gs^Fdf
 Gg, Gg, Gs, Gg, Gg^Es, Gg, Gg, Gg, Gg, Gg^Efm, Gg^Efm, Gg, Gg, Gg, Gg, Gg, Rrc, Rrc, Rrc, Ww, Ww, Rrc^Vhc, Rrc, Rr^Vhc, Ww, Ww, Ww, Rrc, Rr, Rr, Rr, Gg, Gg^Efm, Gg, Gg, Gll^Fdf, Gg, Gll
-Gll^Fdf, Gg, Gg, Gg, Gg, Gll^Fdw, Gg, Ce, Ce, Gg, Gg, Gg^Efm, Rr, Gg, Rr, Rr, Gg, Rrc^Vhc, Rrc, Rrc^Vhc, Rrc, Ww, Ww^Bsb|, Ww, Rrc, Rrc^Vhc, Ww, Gs^Vhc, Ww, Gg, Gs, Rr, Rr, Gg, Ds, Gg, Ww, Ww
+Gll^Fdf, Gg, Gg, Gg, Gg, Gll^Fdw, Gg, Ce, Ce, Gg, Gg, Gg^Efm, Rr, Gg, Rr, Rr, Ce, Rrc^Vhc, Rrc, Rrc^Vhc, Rrc, Ww, Ww^Bsb|, Ww, Rrc, Rrc^Vhc, Ww, Gs^Vhc, Ww, Gg, Gs, Rr, Rr, Gg, Ds, Gg, Ww, Ww
 Gs^Fdf, Gll^Fdw, Gll^Fdf, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg^Vl, 4 Ke, Ce, Rr, Rr, Gg, Rr, Gg, Gg, Gg, Gg, Gg, Rrc, Rrc^Vhc, Rrc, Rrc, Rrc, Rrc, Rrc, Rrc^Es, Ww, Ww, Ww, Ww, Gg, Ww, Ww^Bsb\, Ww^Bsb\, Ww, Wo, Wo
 Gg, Gll, Gg, Gll, Gg, Re^Gvs, Gg^Vh, Rr, Rr, Rr, Gg^Vhc, Gg, Re^Gvs, Gg, Re^Gvs, Gg, Gg, Ds, Ww, Rrc, Rrc, Rrc, Ch, Rrc, Rrc, Rrc, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo^Bsb\, Ww^Bsb\, Ww
 Gg, Gg, Gg, Gll^Fdw, Gg, Gg, Gg, Ce, Rr, Gg^Vh, Ce, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Hh, Gg, Ww, Ww, Ds, Ww, Ww, Ww, Ww, Ww, Ww^Bsb|, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gg^Vhc, Gg, Rr

diff --git a/data/campaigns/Eastern_Invasion/scenarios/14_Approaching_Weldyn.cfg b/data/campaigns/Eastern_Invasion/scenarios/14_Approaching_Weldyn.cfg
@@ -154,42 +154,12 @@
                 carryover_percentage=40
             [/gold_carryover]
         [/objectives]
-        [unit]
-            side=5
-            type=Swordsman
-            x,y=16,31
-            ai_special=guardian
-        [/unit]
-        [unit]
-            side=5
-            type=Swordsman
-            x,y=15,28
-            ai_special=guardian
-        [/unit]
-        [unit]
-            side=5
-            type=Swordsman
-            x,y=16,24
-            ai_special=guardian
-        [/unit]
-        [unit]
-            side=5
-            type=Swordsman
-            x,y=21,22
-            ai_special=guardian
-        [/unit]
-        [unit]
-            side=5
-            type=Swordsman
-            x,y=25,23
-            ai_special=guardian
-        [/unit]
-        [unit]
-            side=5
-            type=Swordsman
-            x,y=28,26
-            ai_special=guardian
-        [/unit]
+        {GENERIC_UNIT 5 (Swordsman) 16 31} {GUARDIAN}
+        {GENERIC_UNIT 5 (Swordsman) 15 28} {GUARDIAN}
+        {GENERIC_UNIT 5 (Swordsman) 15 24} {GUARDIAN}
+        {GENERIC_UNIT 5 (Swordsman) 19 22} {GUARDIAN}
+        {GENERIC_UNIT 5 (Swordsman) 26 22} {GUARDIAN}
+        {GENERIC_UNIT 5 (Swordsman) 29 27} {GUARDIAN}
     [/event]
 
     [event]