Author: zookeeper
Date: Mon Aug 18 21:18:01 2008
New Revision: 28727

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28727&view=rev
Log:
Cleanups for the final scenario.

Modified:
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg?rev=28727&r1=28726&r2=28727&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
 (original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
 Mon Aug 18 21:18:01 2008
@@ -9,7 +9,14 @@
 
     victory_when_enemies_defeated=yes
 
-    {STORY_FOREVER_AND_EVER_AMEN}
+    [story]
+        [part]
+            story=_ "Years pass. Every summer when the mountain passes become 
clear, the lich sends his soldiers to attack the orcs, removing any human, 
elven, or dwarvish patrols that get in the way. Every year the undead inflict 
some damage before being repelled and retreating to the caves."
+        [/part]
+        [part]
+            story=_ "Rumors circulate of a lich that preys on scouting 
patrols. A hero, gathering his loyal troops to him, decides to put an end to 
the evil."
+        [/part]
+    [/story]
 
     {UNDERGROUND}
 
@@ -72,47 +79,17 @@
             [/variable]
 
             [then]
-                # after the first repetition, we'll let the campaign really end
-                # when Malin dies
-                [event]
-                    name=die
-
-                    [filter]
-                        id="Mal Keshar"
-                    [/filter]
-
-                    [role]
-                        side=2
-                        [not]
-                            canrecruit=yes
-                        [/not]
-                        role=second
-                    [/role]
-                    [music]
-                        name=elvish-theme.ogg
-                        immediate=yes
-                        append=no
-                    [/music]
-                    {DIALOGUE_FAEA_END}
-                    [endlevel]
-                        result=continue_no_save
-                        next_scenario=null
-                    [/endlevel]
-                [/event]
-
+                {VARIABLE previous_previous_randomHero $previous_randomHero}
                 {VARIABLE previous_randomHero $randomHero}
             [/then]
 
             [else]
-                # Normal defeat condition on the first repeat
-                {MAL_DEATH}
-
                 {VARIABLE previous_randomHero -1}
             [/else]
         [/if]
 
         # let's pick a random hero type...
-        {VARIABLE_OP randomHero random (0..4)}
+        {VARIABLE_OP randomHero random (human,bandit,elf,dwarf,orc)}
 
         # and make sure it's not the same as last time
         [while]
@@ -121,15 +98,22 @@
                 equals=$previous_randomHero
             [/variable]
 
+            [or]
+                [variable]
+                    name=randomHero
+                    equals=$previous_previous_randomHero
+                [/variable]
+            [/or]
+
             [do]
-                {VARIABLE_OP randomHero random (0..4)}
+                {VARIABLE_OP randomHero random (human,bandit,elf,dwarf,orc)}
             [/do]
         [/while]
 
         [if]
             [variable]
                 name=randomHero
-                numerical_equals=0
+                equals=human
             [/variable]
             [then]
                 [unit]
@@ -156,7 +140,7 @@
         [if]
             [variable]
                 name=randomHero
-                numerical_equals=1
+                equals=bandit
             [/variable]
             [then]
                 [unit]
@@ -178,7 +162,7 @@
         [if]
             [variable]
                 name=randomHero
-                numerical_equals=2
+                equals=elf
             [/variable]
             [then]
                 [unit]
@@ -205,7 +189,7 @@
         [if]
             [variable]
                 name=randomHero
-                numerical_equals=3
+                equals=dwarf
             [/variable]
             [then]
                 [unit]
@@ -232,7 +216,7 @@
         [if]
             [variable]
                 name=randomHero
-                numerical_equals=4
+                equals=orc
             [/variable]
             [then]
                 [unit]
@@ -296,46 +280,89 @@
         [if]
             [variable]
                 name=randomHero
-                numerical_equals=0
-            [/variable]
-            [then]
-                {DIALOGUE_FAEA_START0}
-            [/then]
-        [/if]
-        [if]
-            [variable]
-                name=randomHero
-                numerical_equals=1
-            [/variable]
-            [then]
-                {DIALOGUE_FAEA_START1}
-            [/then]
-        [/if]
-        [if]
-            [variable]
-                name=randomHero
-                numerical_equals=2
-            [/variable]
-            [then]
-                {DIALOGUE_FAEA_START2}
-            [/then]
-        [/if]
-        [if]
-            [variable]
-                name=randomHero
-                numerical_equals=3
-            [/variable]
-            [then]
-                {DIALOGUE_FAEA_START3}
-            [/then]
-        [/if]
-        [if]
-            [variable]
-                name=randomHero
-                numerical_equals=4
-            [/variable]
-            [then]
-                {DIALOGUE_FAEA_START4}
+                equals=human
+            [/variable]
+            [then]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "Your doom is at hand, foul lich! I shall bring 
you down by my own hand."
+                [/message]
+                [message]
+                    speaker=Mal Keshar
+                    message=_ "The only doom at hand is yours, if you do not 
leave now. Go back to your manors and taverns, and do not trouble me further."
+                [/message]
+            [/then]
+        [/if]
+        [if]
+            [variable]
+                name=randomHero
+                equals=bandit
+            [/variable]
+            [then]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "You have preyed on too many of my boys. I have 
come here to end this, once and for all."
+                [/message]
+                [message]
+                    speaker=Mal Keshar
+                    message=_ "Not even real soldiers. I will sweep you aside."
+                [/message]
+            [/then]
+        [/if]
+        [if]
+            [variable]
+                name=randomHero
+                equals=elf
+            [/variable]
+            [then]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "Your kind is an abomination. I am here to see 
that you inflict no more harm on the spirits that have passed on."
+                [/message]
+                [message]
+                    speaker=Mal Keshar
+                    message=_ "Fool! By leaving your forests and coming into 
my domain, you have sacrificed your own spirits."
+                [/message]
+            [/then]
+        [/if]
+        [if]
+            [variable]
+                name=randomHero
+                equals=dwarf
+            [/variable]
+            [then]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "I've been itching for a chance to break some 
bones with my hammer, and now you've given me cause. Goodness knows you've got 
plenty of bones over there."
+                [/message]
+                [message]
+                    speaker=Mal Keshar
+                    message=_ "Go back to your tunnels and your mines, and do 
not trouble me unless you want your hammers to work for me once you are dead."
+                [/message]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "Hear that boys, he's threatening us! It's time 
he learned what real dwarves are made of."
+                [/message]
+            [/then]
+        [/if]
+        [if]
+            [variable]
+                name=randomHero
+                equals=orc
+            [/variable]
+            [then]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "So, I've finally found your lair, Lich. You, 
who have been attacking the orcs for years and have destroyed many of our 
tribes."
+                [/message]
+                [message]
+                    speaker=Mal Keshar
+                    message=_ "Orcs? It is you who have forced me to choose 
the dark path, and it is you who ended my mortal life and made me turn into a 
Lich. I am actually grateful to you for coming here, foolish hero. My hatred 
toward your race makes me stronger and I again get a chance to kill orcs!"
+                [/message]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "Nothing will stop me from taking revenge for my 
father who died at your hand and for the rest of my people you and your minions 
have killed, Lich. Orcs, attack! The one who brings me his scull gets a bag of 
gold."
+                [/message]
             [/then]
         [/if]
 
@@ -343,11 +370,72 @@
         [if]
             [variable]
                 name=timesForever
-                numerical_equals=7
-            [/variable]
-            [then]
-                {DIALOGUE_FAEA_SASS1}
-            [/then]
+                numerical_equals=5
+            [/variable]
+            [then]
+                [message]
+                    speaker=Mal Keshar
+                    message=_ "Is there an endless supply of foolish heroes 
with deathwishes? Honestly, where do you all come from?"
+                [/message]
+            [/then]
+        [/if]
+    [/event]
+
+    [event]
+        name=die
+
+        [filter]
+            id="Mal Keshar"
+        [/filter]
+
+        [if]
+            [variable]
+                name=timesForever
+                greater_than=0
+            [/variable]
+
+            # after the first repetition, we'll let the campaign really end
+            # when Malin dies
+            [then]
+                [role]
+                    side=2
+                    [not]
+                        canrecruit=yes
+                    [/not]
+                    role=second
+                [/role]
+                [music]
+                    name=elvish-theme.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "Well, that is the end of his evil ways."
+                [/message]
+                [message]
+                    role=second
+                    message=_ "I wonder who he was in life, before fell into 
the evil ways that led him to today."
+                [/message]
+                [message]
+                    speaker=Foolish Hero
+                    message=_ "Once he chose this un-life for himself and his 
soldiers, he forfeited any claim to our compassion. Does it even matter who he 
was?"
+                [/message]
+                [message]
+                    role=second
+                    message=_ "No, I suppose it does not."
+                [/message]
+
+                [endlevel]
+                    result=continue_no_save
+                    next_scenario=null
+                [/endlevel]
+            [/then]
+
+            # Normal defeat condition on the first repeat
+            [else]
+                {MAL_DEATH}
+            [/else]
         [/if]
     [/event]
 


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to