Author: wintermute
Date: Thu May 24 20:24:02 2007
New Revision: 17830

URL: http://svn.gna.org/viewcvs/wesnoth?rev=17830&view=rev
Log:
bugfix: better, but still not "fixed"

Modified:
    trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

Modified: trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg?rev=17830&r1=17829&r2=17830&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg Thu May 
24 20:24:02 2007
@@ -410,11 +410,11 @@
                        equals=yes
                [/variable]
                [then]
-                       [kill]
-                               type=Elvish Ranger,Elvish Avenger
-                               animate=no
-                               fire_event=no
-                       [/kill]
+#                      [kill]
+#                              type=Elvish Ranger,Elvish Avenger
+#                              animate=no
+#                              fire_event=no
+#                      [/kill]
 
                        {CLEAR_VARIABLE mebrin_found}
                        {CLEAR_VARIABLE undead_defeated}
@@ -461,11 +461,11 @@
                        equals=yes
                [/variable]
                [then]
-                       [kill]
-                               type=Elvish Ranger,Elvish Avenger
-                               animate=no
-                               fire_event=no
-                       [/kill]
+#                      [kill]
+#                              type=Elvish Ranger,Elvish Avenger
+#                              animate=no
+#                              fire_event=no
+#                      [/kill]
 
                        {CLEAR_VARIABLE mebrin_found}
                        {CLEAR_VARIABLE undead_defeated}

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg?rev=17830&r1=17829&r2=17830&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg Thu 
May 24 20:24:02 2007
@@ -86,7 +86,7 @@
        #endif
 
        #ifdef NORMAL
-               recruit=Footpad, Thug, Poacher
+               recruit=Footpad, Thug
        #endif
 
        #ifdef HARD
@@ -123,7 +123,7 @@
                recruit=Walking Corpse, Soulless
        #endif
        #ifdef HARD
-               recruit=Walking Corpse, Soulless
+               recruit=Walking Corpse, Soulless, Ghoul
        #endif
 
 [/side]
@@ -151,13 +151,13 @@
                {ATTACK_DEPTH 3 4 5}
        [/ai]
        #ifdef EASY
-               recruit=Skeleton, Skeleton Archer, Walking Corpse, Soulless
+               recruit=Skeleton, Skeleton Archer, Ghoul
        #endif
        #ifdef NORMAL
-               recruit=Skeleton, Revenant, Deathblade, Skeleton Archer, 
Soulless
+               recruit=Skeleton, Revenant, Deathblade, Skeleton Archer, Ghoul
        #endif
        #ifdef HARD
-               recruit=Skeleton, Revenant, Deathblade, Skeleton Archer, Bone 
Shooter, Soulless, Vampire Bat, Bloodbat
+               recruit=Skeleton, Revenant, Deathblade, Skeleton Archer, Bone 
Shooter, Ghoul
        #endif
 
 [/side]
@@ -262,30 +262,6 @@
 
 [/event]
 
-# The adventurers locate a fortress in the supposedly empty woods.
-
-[event]
-       name=sighted
-       [filter]
-               x,y=13,16
-       [/filter]
-
-       [message]
-               description=Sir Gerrick
-               message= _ "If the elves do not venture this far south, who has 
built these forts? The marks on the logs were made with some sword or axe!"
-       [/message]
-
-       [message]
-               description=Ethiliel
-               message= _ "If not elves, perhaps some of you menfolk built 
them?"
-       [/message]
-
-       [message]
-               description=Sir Gerrick
-               message= _ "Indeed. But not loyal men of Wesnoth, I venture."
-       [/message]
-[/event]
-
 # The adventurers defeat the zombie leader
 
 [event]
@@ -300,7 +276,7 @@
        [/message]
 
        [message]
-               description=Ethiliel
+               description=Dorean
                message= _ "No. I fear there is still much evil present. That 
must have been merely a servant of a darker master."
        [/message]
 
@@ -314,6 +290,9 @@
                description=Urza Afalas
        [/filter]
 
+       [redraw]
+       [/redraw]
+       
        [music]
                immediate=yes
                name=knolls.ogg
@@ -398,29 +377,47 @@
                        id=accept_bandits
                        message= _ "Very well. All men must unite against the 
undead."
                        [command]
-
-                               [store_unit]
-                                       variable=afalas_store
-                                       [filter]
-                                               description=Urza Afalas
-                                       [/filter]
-                                       kill=no
-                               [/store_unit]
-                               {VARIABLE afalas_store.canrecruit 0}
-                               {VARIABLE afalas_store.side 1}
-                               {VARIABLE afalas_store.profile 
("portraits/urza-afalas.png")}
-                               [unit_overlay]
-                                       x=$afalas_store.x
-                                       y=$afalas_store.y
-                                       image="misc/hero-icon.png"
-                               [/unit_overlay]
-                               [unstore_unit]
-                                       variable=afalas_store
-                               [/unstore_unit]
+                               [kill]
+                                       side=2
+                                       description=Urza Afalas
+                                       animate=no
+                                       fire_event=no
+                               [/kill]
+
+                               [scroll_to]
+                                       x,y=40,20
+                               [/scroll_to]
+
+                               [sound]
+                                       name=fanfare-short.wav
+                               [/sound]
+
+                               [move_unit_fake]
+                                       type=Outlaw
+                                       x=40,30
+                                       y=20,28
+                               [/move_unit_fake]
+
+                               [unit]
+                                       description=Urza Afalas
+                                       user_description= _ "Urza Afalas"
+                                       type=Outlaw
+                                       side=1
+                                       {IS_HERO}
+                                       x=30
+                                       y=28
+                                       [modifications]
+                                               {TRAIT_RESILIENT}
+                                               {TRAIT_INTELLIGENT}
+                                       [/modifications]
+                               [/unit]
+
+                               [redraw]
+                               [/redraw]
 
                                [message]
                                        description=Urza Afalas
-                                       message= _ "We will now fight alongside 
you, and I will place my thugs and footpads at your service."
+                                       message= _ "We will now fight alongside 
you, come my thugs and footpads, rally to me!"
                                [/message]
 
                                [message]
@@ -451,17 +448,17 @@
                                        value=yes
                                [/set_variable]
 
-
                                [allow_recruit]
                                        side=1
                                        type=Thug,Footpad
                                [/allow_recruit]
+
                                [disallow_recruit]
                                        side=1
                                        type=Elvish Shaman,Elvish Fighter
                                [/disallow_recruit]
 
-                               # switch the outlaws to your direct control
+# switch the outlaws to your direct control
                                [while]
                                        [have_unit]
                                                side=2
@@ -492,6 +489,7 @@
                                        side=1
                                        x,y=1-60,1-50
                                [/remove_shroud]
+
                                [objectives]
                                        side=1
                                        [objective]


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

Reply via email to