[Wesnoth-cvs-commits] wesnoth/data maps/Heir_To_The_Throne/Muff_Malal...

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  04/12/22 00:21:44

Modified files:
        data/maps/Heir_To_The_Throne: Muff_Malal_Peninsula 
        data/scenarios/Heir_To_The_Throne: Muff_Malal_Peninsula.cfg 

Log message:
        Put Mr. Malal on a peninsula, give Konrad the option of fleeing from 
the battle, give him bonus if he decides to stand and fight (A contrasting perk 
to that of Isle of the Damned)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/maps/Heir_To_The_Throne/Muff_Malal_Peninsula.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: wesnoth/data/maps/Heir_To_The_Throne/Muff_Malal_Peninsula
diff -u wesnoth/data/maps/Heir_To_The_Throne/Muff_Malal_Peninsula:1.2 
wesnoth/data/maps/Heir_To_The_Throne/Muff_Malal_Peninsula:1.3
--- wesnoth/data/maps/Heir_To_The_Throne/Muff_Malal_Peninsula:1.2       Tue Jun 
15 22:32:38 2004
+++ wesnoth/data/maps/Heir_To_The_Throne/Muff_Malal_Peninsula   Wed Dec 22 
00:21:44 2004
@@ -1,31 +1,31 @@
-mtcssssssssssssssssssssss
-mhsssssssssssssssssssssss
-hmsssscccssssssssssssssss
-dtccccdddccscccscccssssss
-dgddddggtdfcggfcgggcsssss
-cdgdggggggffgfffgggtcssss
-sdddggtgggffgtgtggggdcsss
-scccdgggggggggggggggndcss
-ssscdffffgggghhmgggn1gdcs
-sscdgffffhhmmmhmhggnngdcs
-sscdgfffhmhmhmmthmgggcsss
-ssscdgtmmmmtmmhhmmtggcsss
-ssscdghhmmmhmhhmmhhhggcss
-sscdgggmmhhmhhmmhhhgggccs
-sssdgggmthmmhhhhhhgtgcscs
-sssdgghhhhhhghhgggggdccds
-ssscgggghhhgggggggggcscgc
-sssctfgggghgghgggggdccdgc
-sscsffggfgggghggccccssctc
-scccfffgfftgggggccccssccc
-sdscgftggggcgggcsssssscss
-ctdscfgggtgccgtcsssssscss
-cgcsccCCggccsggcssssscsss
-ccgscc2Cgccssccssssssscss
-ctccgcCCccccscccsssscssss
-sdcsdgdcsssccsscccccdccss
-scsscdtsscsscssscctgtgdcs
-sssssccccccssccsssccddtcs
-sssssssscddcstdcsssstsdcs
-sssssssssctssccssssscscss
-sssssssssscssssssssssssss
+mmhhrrgfgggffhhmmhmmhhgfggg
+mmhtgrggggffffhhhmmhfhffggg
+hhmggrgggggtgfhmmhhghgggggg
+ggggggrrgwwgghhmmhhgggtrrrr
+ddggwggrgwwfgmhmmhhggrrgwgg
+ccdgggggrrgfhhmmhgggrfffggg
+ccdddggtgrgffhmhhggrrgffggg
+sccccdgggrghmtmhgrrggnggdcc
+sscccdffffrrhghrgrggn1gddcc
+ssscdgffffhhrrrhrhgggnndcss
+ssscdgfffhmhmhmmthmgggdccss
+sssscdgtmmmmhmmhhmmgggccsss
+sssccdghhmmmhmhhmmhhhggcsss
+ssccgggghmhhmhhmmhhhgggccss
+ssccggggmthmmhhhhhhgtgccccs
+ssccggghhhhhhghhfwgggdccdcs
+sssccgggcchhggggwwgggcccgcs
+ssssctfwwwghgghggwggdccdgcs
+sssccffggfgggwhggccccscctcs
+sscccfffgfftgwwggccccsscccs
+scdccgftggggwgggcsssssscsss
+sctdscfgggtgccgtcssssssssss
+scgcsscCCggcccggcsssssccsss
+sccgsccC2Cccssccssssssscsss
+sctccgcdCcccssccssssscccsss
+ssdcsmgdccssscsscccccdcccss
+sscsscmtcscsscssscctgthhcss
+sssssscccsccssccsssccfftccs
+ssssssssscddcstdcsssctfgccs
+ssssssssssctssccsssscccccss
+ssssssssssscsssssssssssssss
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.13 
wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.14
--- wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.13     
Mon Nov  1 19:43:05 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg  Wed Dec 
22 00:21:44 2004
@@ -13,12 +13,14 @@
     {SECOND_WATCH}
 
        next_scenario=The_Siege_of_Elensefar
+       victory_when_enemies_defeated=no
 
        music="wesnoth-3.ogg"
 
        objectives= _ "
 Victory:
address@hidden Muff Malal
address@hidden Muff Malal (Bonus)
address@hidden down the road to Elensefar
 Defeat:
 #Death of Konrad
 #Turns run out"
@@ -64,7 +66,19 @@
        [/event]
 
        [event]
-       name=start
+       name=prestart
+               [item]
+               x=8
+               y=2
+               image=items/signpost.png
+               [/item]
+
+               [item]
+               x=5
+               y=1
+               image=misc/foot-left-n.png
+               [/item]
+
                [role]
                type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish 
Hero,Knight,Elvish Rider,Elvish Outrider,Paladin,Mage,White Mage,Red Mage
                role=Advisor
@@ -72,6 +86,10 @@
                [recall]
                role=Advisor
                [/recall]
+       [/event]
+
+       [event]
+       name=start
                [message]
                id=msg4_1
                speaker=narrator
@@ -80,12 +98,12 @@
                [message]
                id=msg4_2
                role=Advisor
-               message= _ "My lord! In yonder ruins there seems to be some 
movement!"
+               message= _ "My lord! On yonder peninsula there seems to be some 
movement!"
                [/message]
                [message]
                id=msg4_3
                description=Konrad
-               message= _ "It looks like there are the undead there! Prepare 
for battle men!"
+               message= _ "It looks like there are the undead there! If we can 
defeat the undead we would have a valuable allies to our rear. But I do not 
know if we have the strength or time to persevere against such a foe. Either 
way it looks like there will be a fight, prepare for battle men!"
                [/message]
                [message]
                id=msg4_4
@@ -101,12 +119,74 @@
 
 
        [event]
-       name=victory
+               name=moveto
+               [filter]
+                       side=1
+                       x=8
+                       y=2
+               [/filter]
+
+               [redraw]
+               [/redraw]
+
+               [message]
+                       speaker=narrator
+                       message= _ "To Elensefar"
+               [/message]
+
+               [allow_undo]
+               [/allow_undo]
+       [/event]
+
+       [event]
+               name=moveto
+               first_time_only=no
+               [filter]
+                       side=1
+                       x=5
+                       y=1
+               [/filter]
+               [if]
+                       [have_unit]
+                               description=Konrad
+                               x=5
+                               y=1
+                       [/have_unit]
+                       [then]
+                               [message]
+                               description=Konrad
+                               message= _ "We do not have time to tarry here! 
On to Elensefar!"
+                               [/message]
+
+                               [endlevel]
+                               bonus=no
+                               result=victory
+                               [/endlevel]
+                       [/then]
+                       [else]
+                               [message]
+                               speaker=Konrad
+                               message= _ "Shirk not your duty! I will decide 
when it is time to leave for Elensefar."
+                               [/message]
+
+                               [allow_undo]
+                               [/allow_undo]
+                       [/else]
+               [/if]
+       [/event]
+
+       [event]
+       name=enemies defeated
                [message]
                id=msg4_12b
                description=Konrad
-               message= _ "Victory is ours! Let us just hope that this delay 
will not hamper our quest to save Elensefar. We must move onward with haste!"
+               message= _ "Victory is ours! Let us hope that this delay will 
not hamper our quest to save Elensefar, but at least we have some new allies in 
our struggle. We must move onward with haste!"
                [/message]
+
+               [endlevel]
+               bonus=yes
+               result=victory
+               [/endlevel]
        [/event]
 
        {scenarios/Heir_To_The_Throne/deaths.cfg}