Author: zookeeper
Date: Sat Mar  8 20:30:32 2008
New Revision: 24426

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24426&view=rev
Log:
Ported r24404 to 1.4.

Modified:
    
branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg

Modified: 
branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg?rev=24426&r1=24425&r2=24426&view=diff
==============================================================================
--- 
branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
 (original)
+++ 
branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
 Sat Mar  8 20:30:32 2008
@@ -53,11 +53,6 @@
 
         # {SCATTER_IMAGE (terrain=Uu) 3 scenery/rubble.png}
 
-        [music]
-            name=knolls.ogg
-            ms_after=5000
-        [/music]
-
         [objectives]
             side=1
             [objective]
@@ -69,8 +64,68 @@
                 description=_ "Destruction of Mal Keshar"
             [/objective]
         [/objectives]
-
+        
+        [if]
+            [variable]
+                name=timesForever
+                greater_than=0
+            [/variable]
+            
+            [then]
+                # after the first repetition, we'll let the campaign really end
+                # when Malin dies
+                [event]
+                    name=die
+
+                    [filter]
+                        description="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_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)}
+        
+        # and make sure it's not the same as last time
+        [while]
+            [variable]
+                name=randomHero
+                equals=$previous_randomHero
+            [/variable]
+            
+            [do]
+                {VARIABLE_OP randomHero random (0..4)}
+            [/do]
+        [/while]
+        
         [if]
             [variable]
                 name=randomHero
@@ -86,6 +141,16 @@
                     canrecruit=yes
                 [/unit]
                 {ALLOW_RECRUIT 
(Spearman,Swordsman,Pikeman,Bowman,Longbowman,Heavy Infantry,Shock 
Trooper,Mage,Red Mage,White Mage,Horseman,Knight,Lancer)}
+
+                [music]
+                    name=loyalists.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=the_city_falls.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
         [if]
@@ -103,6 +168,11 @@
                     canrecruit=yes
                 [/unit]
                 {ALLOW_RECRUIT 
(Thug,Bandit,Footpad,Outlaw,Poacher,Trapper,Thief,Rogue)}
+
+                [music]
+                    name=battle.ogg
+                    append=no
+                [/music]
             [/then]
         [/if]
         [if]
@@ -120,6 +190,16 @@
                     canrecruit=yes
                 [/unit]
                 {ALLOW_RECRUIT (Elvish Figher,Elvish Hero,Elvish 
Captain,Elvish Archer,Elvish Ranger,Elvish Marksman,Elvish Shaman,Elvish 
Sorceress,Elvish Druid,Elvish Scout,Elvish Rider,Wose)}
+
+                [music]
+                    name=knolls.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=the_city_falls.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
         [if]
@@ -137,6 +217,16 @@
                     canrecruit=yes
                 [/unit]
                 {ALLOW_RECRUIT (Dwarvish Figher,Dwarvish Steelclad,Dwarvish 
Thunderer,Dwarvish Thunderguard,Dwarvish Stalwart,Dwarvish Guardsman,Dwarvish 
Ulfserker,Dwarvish Berserker,Gryphon Rider,Gryphon Master)}
+
+                [music]
+                    name=battle.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=underground.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
         [if]
@@ -154,6 +244,16 @@
                     canrecruit=yes
                 [/unit]
                 {ALLOW_RECRUIT (Orcish Warrior,Orcish Slayer,Orcish 
Crossbowman,Troll,Troll Rocklobber)}
+
+                [music]
+                    name=northerners.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=battle.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
 
@@ -167,49 +267,26 @@
         [/gold]
         {CLEAR_VARIABLE heroGold}
 
+        # play only sad music after a few repetitions
         [if]
             [variable]
                 name=timesForever
-                greater_than=0
-            [/variable]
-            [then]
-                [event]
-                    name=attack_end
-                    first_time_only=no
-                    [store_unit]
-                        variable=deathTest
-                        [filter]
-                            description="Mal Keshar"
-                        [/filter]
-                        kill=no
-                    [/store_unit]
-                    [if]
-                        [variable]
-                            name=deathTest.hitpoints
-                            less_than_equal_to=0
-                        [/variable]
-                        [then]
-                            [role]
-                                side=2
-                                [not]
-                                    canrecruit=yes
-                                [/not]
-                                role=second
-                            [/role]
-                            [music]
-                                name=elf-land.ogg
-                                play_once=yes
-                                immediate=yes
-                                ms_after=10000
-                            [/music]
-                            {DIALOGUE_FAEA_END}
-                            [endlevel]
-                                result=victory
-                                next_scenario=null
-                            [/endlevel]
-                        [/then]
-                    [/if]
-                [/event]
+                greater_than=4
+            [/variable]
+            [then]
+                [music]
+                    name=the_king_is_dead.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=elvish-theme.ogg
+                    append=yes
+                [/music]
+                [music]
+                    name=nunc_dimittis.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
     [/event]
@@ -275,14 +352,10 @@
     [/event]
 
     # In-scenario events defined within the prestart event
-
-    # Defeat Conditions
-    {MAL_DEATH}
 
     [event]
         name=victory
         {VARIABLE_OP timesForever add 1}
-        {CLEAR_VARIABLE randomHero}
     [/event]
 
     [EMAIL PROTECTED]/Descent_Into_Darkness/utils/global-events.cfg}


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

Reply via email to