[Wesnoth-cvs-commits] wesnoth ./changelog data/scenarios/The_Dark_Hor...

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/09/11 15:10:55

Modified files:
        .              : changelog 
        data/scenarios/The_Dark_Hordes: Underground_Pool.cfg 

Log message:
        fix 14495 scenario glitches

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.924&tr2=1.925&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.924 wesnoth/changelog:1.925
--- wesnoth/changelog:1.924     Sun Sep 11 14:55:43 2005
+++ wesnoth/changelog   Sun Sep 11 15:10:55 2005
@@ -3,12 +3,15 @@
    * updated translations: Afrikaans, Bulgarian, Finnish, German, Hungarian,
      Slovenian, Spanish, Turkish
  * campaigns:
-   * The Dark Hordes: Crelanu's Book no longer ends if the enemies are killed
+   * The Dark Hordes
+     * Crelanu's Book no longer ends if enemy leaders are killed
+     * Underground Pool no longer ends if enemy leaders are killed
+     * Underground Pool can now only be won with Gwiti or Tanar (#14495)
    * Son of the Black Eye
      * Watch Towers can no longer be recalled in Clash of Armies
-     * Saving Inarix no longer ends if the enemies are killed
+     * Saving Inarix no longer ends if enemy leaders are killed
  * fixed long filenames overflowing editor file chooser dialog (#13855)
- * fixed filenames with spaces causing garbled errors 
+ * fixed filenames with spaces causing garbled errors (#14494)
 
 Version 0.9.7:
  * language and i18n:
Index: wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg:1.14 
wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg:1.15
--- wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg:1.14    Tue Sep 
 6 13:31:36 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg Sun Sep 11 
15:10:55 2005
@@ -4,12 +4,73 @@
        name= _ "Underground Pool"
        map_data="{maps/The_Dark_Hordes/Underground_Pool}"
        {TURNS 54 52 48}
+       victory_when_enemies_defeated=no
 
        {UNDERGROUND}
 
        next_scenario=null
        music="underground.ogg"
 
+#define END_UNDERGROUND_POOL
+       [message]
+       description=Tanar
+       message= _ "We have come to a flooded part of the cave. If we forge 
ahead, the Dwarves should be delayed quite a bit."
+       [/message]
+
+       # Pinched this off Delfador
+       [command]
+       [sound]
+       name=lightning.wav
+       [/sound]
+       [/command]
+       [command]
+       [colour_adjust]
+       red=100
+       green=100
+       blue=100
+       [/colour_adjust]
+       [/command]
+       [command]
+       [delay]
+       time=10
+       [/delay]
+       [/command]
+       [command]
+       [colour_adjust]
+       red=0
+       green=0
+       blue=0
+       [/colour_adjust]
+       [/command]
+
+       [message]
+       description=Tanar
+       image=portraits/The_Dark_Hordes/tanar.png
+       message= _ "ARGH! What was that?"
+       [/message]
+       [message]
+       description=Gwiti Ha'atel
+       message= _ "I do not know. I guess, however, that some magic is at work 
in these caverns. Can you tell me anything of them?"
+       [/message]
+       [message]
+       description=Tanar
+       image=portraits/The_Dark_Hordes/tanar.png
+       message= _ "Nay, Lord. These passages were flooded higher last time I 
was here. The Dwarves did not delve here, and we shunned the nameless dread we 
felt."
+       [/message]
+       [message]
+       description=Gwiti Ha'atel
+       message= _ "If there is anything to dread here, it is me. Now, onward!"
+       [/message]
+       [message]
+       speaker=Gwiti Ha'atel
+       caption= _ "End of Part 1"
+       message= _ "Gwiti's adventures will continue in another installment of 
The Dark Hordes."
+       [/message]
+       [endlevel]
+       result=victory
+       [/endlevel]
+#enddef
+
        [event]
        name=prestart
                [objectives]
@@ -164,68 +225,21 @@
        [event]
        name=moveto
                [filter]
-               side=1
+               description=Tanar
                y=1
                x=8-12
                [/filter]
-               [message]
-               description=Tanar
-               message= _ "We have come to a flooded part of the cave. If we 
forge ahead, the Dwarves should be delayed quite a bit."
-               [/message]
-
-
-               #Pinched this off Delfador
-               [command]
-               [sound]
-               name=lightning.wav
-               [/sound]
-               [/command]
-               [command]
-               [colour_adjust]
-               red=100
-               green=100
-               blue=100
-               [/colour_adjust]
-               [/command]
-               [command]
-               [delay]
-               time=10
-               [/delay]
-               [/command]
-               [command]
-               [colour_adjust]
-               red=0
-               green=0
-               blue=0
-               [/colour_adjust]
-               [/command]
+               {END_UNDERGROUND_POOL}
+       [/event]
 
-               [message]
-               description=Tanar
-               image=portraits/The_Dark_Hordes/tanar.png
-               message= _ "ARGH! What was that?"
-               [/message]
-               [message]
-               description=Gwiti Ha'atel
-               message= _ "I do not know. I guess, however, that some magic is 
at work in these caverns. Can you tell me anything of them?"
-               [/message]
-               [message]
-               description=Tanar
-               image=portraits/The_Dark_Hordes/tanar.png
-               message= _ "Nay, Lord. These passages were flooded higher last 
time I was here. The Dwarves did not delve here, and we shunned the nameless 
dread we felt."
-               [/message]
-               [message]
+       [event]
+       name=moveto
+               [filter]
                description=Gwiti Ha'atel
-               message= _ "If there is anything to dread here, it is me. Now, 
onward!"
-               [/message]
-               [message]
-               speaker=Gwiti Ha'atel
-               caption= _ "End of Part 1"
-               message= _ "Gwiti's adventures will continue in another 
installment of The Dark Hordes."
-               [/message]
-               [endlevel]
-               result=victory
-               [/endlevel]
+               y=1
+               x=8-12
+               [/filter]
+               {END_UNDERGROUND_POOL}
        [/event]
 
        #a chest of treasure if you bother to go down here