[Wesnoth-cvs-commits] wesnoth/data scenarios/Eastern_Invasion/The_Dro...

[Joseph Simmons]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Joseph Simmons <address@hidden> 05/05/23 01:16:18

Modified files:
        data/scenarios/Eastern_Invasion: The_Drowned_Plains.cfg 
        data/maps/Eastern_Invasion: Drowned_Plains 

Log message:
        Made Drowned Plains map smaller (so there's not so much empty space), 
added some stuff to the .cfg file.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/maps/Eastern_Invasion/Drowned_Plains.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: wesnoth/data/maps/Eastern_Invasion/Drowned_Plains
diff -u wesnoth/data/maps/Eastern_Invasion/Drowned_Plains:1.5 
wesnoth/data/maps/Eastern_Invasion/Drowned_Plains:1.6
--- wesnoth/data/maps/Eastern_Invasion/Drowned_Plains:1.5       Fri Apr 29 
01:37:46 2005
+++ wesnoth/data/maps/Eastern_Invasion/Drowned_Plains   Mon May 23 01:16:18 2005
@@ -1,42 +1,32 @@
-gggggggggggggggggggggggggggJJJgggggggggggngEEg
-gggwggggggIIIwggJJJgggggggJggJwwJgggIIggn1nwgg
-ggwJwgggggIIwwgggJJJgIIgggggIJwwgggwIwIwnnnwww
-gwJJwggwIIIggggIJJMJgIgggwwwJIwIgwJwwIIIwgwwww
-gwJwwwwwIwgggIIIgwJggIggwwIIggIwwJJgggwwIIggwg
-wwwcwcwwwwggggIgwwwggwIgIwwwIwgwwJJJgwIEIIIggg
-IwwwwccwwwgIIgggwwwwwIIIIwgwwggwwwJwJwEwwgwgIg
-wwwwwwwwwIgggJggwccwIIwIgwIwggggwgwcwwEwwwwIII
-ggggwwwwIIggJJggwwcwwIIwIIwwwggJggwccwwgwcwwgI
-ggggwwwgIgggJJJggwwwwwwwwwwwwwJJJgwwwEEgwccwww
-gIggggggggggggggggwgwgwIggwwwwJJJggEgIIwwwwgIw
-gIgIIggggwggggwwgggggIgIIwwwwggJgEEwggIggJJJJg
-gIwwIggIwwwgggwwgggwwwIIgwwwgEgEwwwwwwwggggMMJ
-IwwwIIIJwwwwwwwggwwwwwwgggwgEIEgwwwcwwwwggJJJg
-gwwwIggJggwwgwwggwwggwwwgwwwEIIIgwwccwwwgwwwwg
-gwwwwgJggJwwwwgwggwwgwwwwEEwwgIwwwwwwwwgggwwgg
-IgwcwwJJJIggwwgwgggwwwwEwcccwgwwcwwggggwwwggII
-IgwwwwwggIIIwwwcwwgwwwwEwwcwwgwwwggggwwwwwggIg
-ggggwwwggIIwwwwcwwggwEEgwwcwwggggwggJJJJwwwggg
-ggIgwIwgIgggwwwwwgggJJJJgccwwcggwwwgJJJJwwwgww
-ggIIIgIIIJggwwwwwEEwwwJccscsccccwwwgwJMJJwgIww
-IIggJJgIIJJgwwcwEgwwwwgcsscsscsccggJJwJMJwwIII
-IgIIIIIggJJgggwwEggggwcsccg3gssscgJMMwwJJcwwII
-gggwIIwwwwggwwgggwwwwgwcscggsssccgJJJwJwwwcwII
-ggwwwwwwwwIIgIIIEgwwgwwcsssscccgggIwgwwwwgwwwg
-IgwwwwwwwggIIwgIEggwwwwgccsccggIggggwwwwJgwwwg
-IIggggwwwwggwwIgEgggwwwggcscggIwIwgwgwJJJggIgg
-ggggggwwwwgggIwEgggwwwgJgccgggIwwwwcwwJwJwgIIg
-ggggIggIwggggIgEJwgwwwwJgccgggIIwwccwwwwwwwIII
-ggggIIIIgJggIgEJgwwwwwJggccgggggwwcwwwwIwwwIwI
-gggwgggIJJJIIwEwwwwwwJgggccggggIIIwwwggIwwwwwg
-gwwwwwgIgIIgwwwwwwwJgJJgccgggIIggwwwwIIIwwwwwg
-gwwwwwwwIgIgwwEIIwJIJggccggggIIwwwgggIIwwwwwwg
-gwwwwwwwwwwwgwwwwIwIggcwwgwggIIwwggwgJIgwgwggI
-gwwwggwwwwwwwwEEwgIggccwgwwgIgIwwwwwgJJJgwwgIw
-gwwwwwggwwwwwwwJJggcccggwggIIgwwwwgwgJJgwwwIgg
-gIwwwIIIggggwJwEJggccggIIggIggwwwwgwwggwcwwIgg
-gIIgwIggIggJJwwEggccgIIgIIIwgIwwwwwwwgwwcwIgIg
-gIgIgIIwwJJJJwwIggccgIggwIwwwgIIwggIwwwwwwgwww
-IggIIIIIwgJJIEEIIgccIIggJJIJgggIgggIwwwIggwJJw
-gggIIIwgwwgwIIIIwccgIIIgJJgJggggIgIIgggIIgJJJw
-ggggggIgwgwEEgggwccgIIIgggJggwwgwwwgIIwwwwggwI
+gggggggggggggggggggggggggggJJJgggggggggggngEE
+gggwggggggIIIwggJJJgggggggJggJwwJgggIIggn1nwg
+ggwJwgggggIIwwgggJJJgIIgggggIJwwgggwIwIwnnnww
+gwJJwggwIIIggggIJJMJgIgggwwwJIwIgwJwwIIIwgwww
+gwJwwwwwIwgggIIIgwJggIggwwIIggIwwJJgggwwIIggw
+wwwcwcwwwwggggIgwwwggwIgIwwwIwgwwJJJgwIEIIIgg
+IwwwwccwwwgIIgggwwwwwIIIIwgwwggwwwJwJwEwwgwgI
+wwwwwwwwwIgggJggwccwIIwIgwIwggggwgwcwwEwwwwII
+ggggwwwwIIggJJggwwcwwIIwIIwwwggJggwccwwgwcwwg
+ggggwwwgIgggJJJggwwwwwwwwwwwwwJJJgwwwEEgwccww
+gIggggggggggggggggwgwgwIggwwwwJJJggEgIIwwwwgI
+gIgIIggggwggggwwgggggIgIIwwwwggJgEEwggIggJJJJ
+gIwwIggIwwwgggwwgggwwwIIgwwwgEgEwwwwwwwggggMM
+IwwwIIIJwwwwwwwggwwwwwwgggwgEIEgwwwcwwwwggJJJ
+gwwwIggJggwwgwwggwwggwwwgwwwEIIIgwwccwwwgwwww
+gwwwwgJggJwwwwgwggwwgwwwwEEwwgIwwwwwwwwgggwwg
+IgwcwwJJJIggwwgwgggwwwwEwcccwgwwcwwggggwwwggI
+IgwwwwwggIIIwwwcwwgwwwwEwwcwwgwwwggggwwwwwggI
+ggggwwwggIIwwwwcwwggwEEgwwcwwggggwggJJJJwwwgg
+ggIgwIwgIgggwwwwwgggJJJJgccwwcggwwwgJJJJwwwgw
+ggIIIgIIIJggwwwwwEEwwwJccscsccccwwwgwJMJJwgIw
+IIggJJgIIJJgwwcwEgwwwwgcsscsscsccggJJwJMJwwII
+IgIIIIIggJJgggwwEggggwcsccg3gssscgJMMwwJJcwwI
+gggwIIwwwwggwwgggwwwwgwcscggsssccgJJJwJwwwcwI
+ggwwwwwwwwIIgIIIEgwwgwwcsssscccgggIwgwwwwgwww
+IgwwwwwwwggIIwgIEggwwwwgccsccggIggggwwwwJgwww
+IIggggwwwwggwwIgEgggwwwggcscggIwIwgwgwJJJggIg
+ggggggwwwwgggIwEgggwwwgJgccgggIwwwwcwwJwJwgII
+ggggIggIwggggIgEJwgwwwwJgccgggIIwwccwwwwwwwII
+ggggIIIIgJggIgEJgwwwwwJggccgggggwwcwwwwIwwwIw
+gggwgggIJJJIIwEwwwwwwJgggccggggIIIwwwggIwwwww
+gwwwwwgIgIIgwEwwwwwJgJJgccgggIIggwwwwIIIwwwww
Index: wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.16 
wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.17
--- wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.16 Mon May 
23 00:42:48 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg      Mon May 
23 01:16:18 2005
@@ -109,7 +109,7 @@
                [/ai]
                [ai]
                [leader_goal]
-               x,y=32,45
+               x,y=32,32
                [/leader_goal]
                time_of_day=dusk
                [/ai]
@@ -121,7 +121,7 @@
                [/ai]
                [ai]
                [leader_goal]
-               x,y=14-45
+               x,y=14,32
                [/leader_goal]
                time_of_day=second_watch
                [/ai]
@@ -137,20 +137,60 @@
        gold=0
        [/side]
 
-#define UNDEAD X Y
-[set_variable]
-name=type
-{QUANTITY random (Bone Shooter,Revenant,Shadow,Wraith,Necrophage,Bone 
Shooter,Revenant,Shadow,Wraith,Necrophage,Soul Shooter) (Bone 
Shooter,Revenant,Shadow,Wraith,Necrophage,Bone 
Shooter,Revenant,Shadow,Wraith,Necrophage,Soul Shooter,Spectre,Nightgaunt) 
(Bone Shooter,Revenant,Shadow,Wraith,Necrophage,Soul 
Shooter,Spectre,Nightgaunt)}
-[/set_variable]
-[unit]
-x={X}
-y={Y}
-type=$type
-side=2
-[/unit]
-[clear_variable]
-name=type
-[/clear_variable]
+#define FAKE_VILLAGE X Y
+{RANDOM 1,1,2}
+[if]
+       [variable]
+       name=random
+       value=1
+       [/variable]
+       [then]
+               [terrain]
+               x,y={X},{Y}
+               type=v
+               [/terrain]
+               [event]
+               name=moveto
+                       [message]
+                       speaker=unit
+                       message= _ "There are still humans in this village! 
They can help us."
+                       [/message]
+                       [unit]
+                       x,y={X},{Y}
+                       type=Peasant
+                       side=1
+                       description=Villager
+                       user_description= _ "Villager"
+                       [/unit]
+                       [unit]
+                       x,y={X},{Y}
+                       type=Peasant
+                       side=1
+                       description=Villager
+                       user_description= _ "Villager"
+                       [/unit]
+
+               [/event]
+       [/then]
+       [else]
+               [item]
+               x={X}
+               y={Y}
+               image=terrain/village.png
+               [/item]
+               [event]
+               name=moveto
+                       [message]
+                       speaker=unit
+                       message= _ "The undead have killed all the villagers 
here, but they left their valuables."
+                       [/message]
+                       [gold]
+                       side=1
+                       amount=20
+                       [/gold]
+               [/event]
+       [/else]
+[/if]
 #enddef
 
        [event]
@@ -188,8 +228,40 @@
                description=Dacyn
                message= _ "I do not know, but it sounded like the dragon 
Khrakrahs. When it was alive, it was the most powerful creature ever, living in 
the Eastern Mountains. It must have fled when the Undead came."
                [/message]
+
+               {FAKE_VILLAGE 42 4}
+               {FAKE_VILLAGE 40 9}
+               {FAKE_VILLAGE 37 12}
+               {FAKE_VILLAGE 33 12}
+               {FAKE_VILLAGE 33 15}
+               {FAKE_VILLAGE 28 14}
+               {FAKE_VILLAGE 41 13}
+               {FAKE_VILLAGE 21 15}
+#ifdef NORMAL
+               {FAKE_VILLAGE 17 24}
+#endif
+#ifdef EASY
+               {FAKE_VILLAGE 17 24}
+               {FAKE_VILLAGE 36 20}
+#endif
        [/event]
 
+#define UNDEAD X Y
+[set_variable]
+name=type
+{QUANTITY random (Bone Shooter,Revenant,Shadow,Wraith,Necrophage,Bone 
Shooter,Revenant,Shadow,Wraith,Necrophage,Soul Shooter) (Bone 
Shooter,Revenant,Shadow,Wraith,Necrophage,Bone 
Shooter,Revenant,Shadow,Wraith,Necrophage,Soul Shooter,Spectre,Nightgaunt) 
(Bone Shooter,Revenant,Shadow,Wraith,Necrophage,Soul 
Shooter,Spectre,Nightgaunt)}
+[/set_variable]
+[unit]
+x={X}
+y={Y}
+type=$type
+side=2
+[/unit]
+[clear_variable]
+name=type
+[/clear_variable]
+#enddef
+
        [event]
        name=moveto
        first_time_only=no