[Wesnoth-cvs-commits] wesnoth/data scenarios/Heir_To_The_Throne/The_S...

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  05/03/22 03:55:15

Modified files:
        data/scenarios/Heir_To_The_Throne: The_Siege_of_Elensefar.cfg 
        data           : terrain.cfg terrain-graphics.cfg 

Log message:
        Added Ford, Scott's Update to Siege of Elensefar (that uses it), and as 
an added bonus I made units on the sunken keeps submerge

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain.cfg.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.56&tr2=1.57&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
diff -u 
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.30 
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.31
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.30   
Sun Mar 20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg        
Tue Mar 22 03:55:15 2005
@@ -45,7 +45,6 @@
        [side]
        type=Commander
        description=Konrad
-       user_description= _ "Konrad"
        unrenamable=yes
        side=1
        canrecruit=1
@@ -57,7 +56,6 @@
        [side]
        type=Orcish Warlord
        description=Agadla
-       user_description= _ "Agadla"
        side=2
        canrecruit=1
        recruit=Orcish Warrior,Orcish Assassin,Orcish Crossbowman
@@ -90,7 +88,6 @@
        [side]
        type=Necromancer
        description=Muff Jaanal
-       user_description= _ "Muff Jaanal"
        side=3
        canrecruit=1
 
@@ -165,7 +162,7 @@
        [/event]
 
        [event]
-       name=turn 5
+       name=turn 4
                [move_unit_fake]
                        type=Thief
                        x=24,24,23
@@ -173,27 +170,27 @@
                [/move_unit_fake]
                [unit]
                description=Reglok
-               user_description= _ "Reglok"
-               type=Thief
+               type=Rogue
                side=1
                x=23
                y=40
+               gender=male
                [/unit]
                [unit]
                description=Gelgar
-               user_description= _ "Gelgar"
                type=Thief
                side=1
                x=22
                y=39
+               gender=male
                [/unit]
                [unit]
                description=Gamlel
-               user_description= _ "Gamlel"
                type=Thief
                side=1
                x=24
                y=40
+               gender=male
                [/unit]
 
                [redraw]
@@ -201,7 +198,7 @@
 
                [message]
                speaker=narrator
-               message= _ "In the night, three dark figures creep out of the 
forest."
+               message= _ "As night began to fall, three dark figures crept 
out of the forest."
                [/message]
                [message]
                description=Konrad
@@ -221,15 +218,35 @@
                [/message]
                [message]
                description=Konrad
+               message= _ "Very well. You may join us."
+               [/message]
+               [message]
+               description=Reglok
+               message= _ "We will serve you well, for we respect the help you 
are providing to our city. You shall find that there is honor, even among 
thieves."
+               [/message]
+               [message]
+               description=Konrad
+               message= _ "Yes, but where is your fighting force? How can you 
help us?"
+               [/message]
+               [message]
+               description=Gelgar
+               message= _ "We survive by stealth.  We can help you sneak into 
the city and surround the orcs.  Alternatively, we can lay in wait until you 
give us a signal then ambush the orcs' rear."
+               [/message]
+               [message]
+               description=Konrad
                message= _ "Hmm...I have to consider this..."
                        [option]
-                       message= _ "Very well. You may join us."
+                       message= _ "Help us infiltrate the city.  We can do the 
rest."
                                [command]
                                        [message]
-                                       description=Gamlel
-                                       message= _ "We will serve you well, for 
we respect the help you are providing to our city. You shall find that there is 
honor, even among thieves."
+                                       description=Reglok
+                                       message= _ "Excellent.  Two hours past 
midnight meet us on the west bank of the river, across from Elensefar's docks."
                                        [/message]
                                        [set_variable]
+                                       name=thieves_ford
+                                       value=yes
+                                       [/set_variable]
+                                       [set_variable]
                                        name=have_thieves
                                        value=yes
                                        [/set_variable]
@@ -239,18 +256,174 @@
                                [/command]
                        [/option]
                        [option]
-                       message= _ "We cannot trust your motives. We shall 
rescue the city on our own!"
+                       message= _ "I want you to reinforce us once we break 
through their line."
                                [command]
                                        [message]
-                                       description=Gamlel
-                                       message= _ "Very well, we shall be gone 
then. You shall have to recapture the city without our help!"
+                                       description=Reglok
+                                       message= _ "Very well.  When you raise 
your red banner over any building in the city proper, we will see the sign and 
attack from the city's northern gate."
+                                       [/message]
+                                       [message]
+                                       description=Konrad
+                                       message= _ "Agreed.  But, will you be 
able to see our flag if it's dark?"
+                                       [/message]
+                                       [message]
+                                       description=Reglok
+                                       message= _ "Yes, we will see it.  In 
fact, we prefer to fight at night.  I pray you do not lead us into slaughter."
+                                       [/message]
+                                       [message]
+                                       description=Konrad
+                                       message= _ "Do not fear, friends.  
There will be a slaughter here, but it will be orcish blood staining the 
streets."
                                        [/message]
-                                       [kill]
+                                       [set_variable]
+                                       name=thieves_ambush
+                                       value=yes
+                                       [/set_variable]
+                                       [set_variable]
+                                       name=have_thieves
+                                       value=yes
+                                       [/set_variable]
+                                       [allow_recruit]
                                        type=Thief
-                                       [/kill]
+                                       [/allow_recruit]
                                [/command]
                        [/option]
                [/message]
+               [kill]
+               type=Thief
+               [/kill]
+               [kill]
+               type=Rogue
+               [/kill]
+       [/event]
+
+#
+# Special event - if you chose to have the thieves help you across the river,
+# on turn 6 the ford appears
+#
+       [event]
+       name=turn 6
+
+       [if]
+       [variable]
+       name=thieves_ford
+       equals=yes
+       [/variable]
+       [then]
+
+               [message]
+               speaker=narrator
+               message= _ "On the banks of Elensefar's port district, three 
shadowy figures appeared."
+               [/message]
+               [message]
+               speaker=narrator
+               message= _ "To Konrad's surprise, they quickly made their way 
across the river's mouth.  The turbulent waters hid a nearly invisible ford, 
wide enough for two soldiers to march shoulder-to-shoulder."
+               [/message]
+       #create units
+               [unit]
+               description=Reglok
+               type=Rogue
+               side=1
+               x=7
+               y=30
+               gender=male
+               [/unit]
+               [unit]
+               description=Gelgar
+               type=Thief
+               side=1
+               x=6
+               y=30
+               gender=male
+               [/unit]
+               [unit]
+               description=Gamlel
+               type=Thief
+               side=1
+               x=6
+               y=31
+               gender=male
+               [/unit]
+       #create terrain
+               [terrain]
+               letter=k
+               x=7-8
+               y=30-32
+               [/terrain]
+       #dialog
+               [message]
+               description=Reglok
+               message= _ "Very few people know that the river can be forded 
here.  The orcs have yet to discover this place.  Bring your forces into the 
city, quickly now, and you can flank them."
+               [/message]
+
+       [/then]
+       [/if]
+
+       [/event]
+
+#
+# Special event - if you chose to have the thieves ambush the orcs,
+# they appear when you capture one of the Elensefar villages
+#
+       [event]
+       name=moveto
+               [filter]
+               x=14,15,18,19,13,14,18,20,21
+               y=28,30,30,27,24,22,23,23,25
+               side=1
+               [/filter]
+
+       [if]
+       [variable]
+       name=thieves_ambush
+       equals=yes
+       [/variable]
+       [then]
+
+               [message]
+               speaker=narrator
+               message= _ "As the banner was raised, sounds of fighting could 
be heard from across the city."
+               [/message]
+       #create units
+               [unit]
+               description=Reglok
+               type=Rogue
+               side=1
+               x=16
+               y=22
+               gender=male
+               [/unit]
+               [unit]
+               description=Gelgar
+               type=Thief
+               side=1
+               x=14
+               y=22
+               gender=male
+               [/unit]
+               [unit]
+               description=Gamlel
+               type=Thief
+               side=1
+               x=20
+               y=23
+               gender=male
+               [/unit]
+               [unit]
+               description=Darglen
+               type=Thief
+               side=1
+               x=18
+               y=23
+               [/unit]
+       #dialog
+               [message]
+               description=Reglok
+               message= _ "Let's expel these invaders!  Today, the city is 
ours again!"
+               [/message]
+
+       [/then]
+       [/if]
+
        [/event]
 
        [event]
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.56 
wesnoth/data/terrain-graphics.cfg:1.57
--- wesnoth/data/terrain-graphics.cfg:1.56      Thu Mar  3 17:01:47 2005
+++ wesnoth/data/terrain-graphics.cfg   Tue Mar 22 03:55:15 2005
@@ -457,5 +457,10 @@
 {TERRAIN_ADJACENT          -203        Q      !QN     coast}
 {TERRAIN_ADJACENT          -204        !N     N       grassland}
 
-{TERRAIN_BASE_DEFAULT void}
+#River Ford
+{TERRAIN_BASE                 k ford}
+{TERRAIN_ADJACENT          -201        k      !k      ford}
+# don't know if this one's really necessary
+{TERRAIN_ADJACENT          -188        ftgvX kcZp\|/  grassland-to-water}
 
+{TERRAIN_BASE_DEFAULT void}
Index: wesnoth/data/terrain.cfg
diff -u wesnoth/data/terrain.cfg:1.55 wesnoth/data/terrain.cfg:1.56
--- wesnoth/data/terrain.cfg:1.55       Thu Mar  3 17:01:47 2005
+++ wesnoth/data/terrain.cfg    Tue Mar 22 03:55:15 2005
@@ -448,6 +448,7 @@
 name= _ "sunken ruin"
 char=Q
 aliasof=Cc
+submerge=0.4
 unit_height_adjust=3
 recruit_onto=true
 [/terrain]
@@ -458,7 +459,19 @@
 name= _ "swamp ruin"
 char=q
 aliasof=Cw
+submerge=0.4
 unit_height_adjust=3
 recruit_onto=true
 [/terrain]
 
+[terrain]
+symbol_image=ford
+id=ford
+name= _ "River Ford"
+char=k
+aliasof=gc
+submerge=0.3
+unit_height_adjust=-4
+[/terrain]
+
+