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

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/07/27 20:03:32

Modified files:
        .              : changelog 
        data/scenarios/Heir_To_The_Throne: Bay_of_Pearls.cfg 

Log message:
        fix Bugg being resurrected in Bay of Pearls (#13950)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.814&tr2=1.815&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.814 wesnoth/changelog:1.815
--- wesnoth/changelog:1.814     Wed Jul 27 11:23:30 2005
+++ wesnoth/changelog   Wed Jul 27 20:03:32 2005
@@ -15,6 +15,7 @@
    * Eastern Invasion: fixed missing background in intro (#13901)
    * Son of the Black Eye: fixed untranslatable strings in Saving Inarix
    * The Dark Hordes: terminate the campaign at this point as Part 1
+   * Heir to the Throne: stop Bugg being resurrected in Bay of Pearls (#13950)
  * multiplayer:
    * fixed rejoining game as observer but with same nick causing out of synch
      (#12824 and #12997, still subject to confirmation)
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.35 
wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.36
--- wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.35    Mon Jul 
18 19:53:47 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg Wed Jul 27 
20:03:32 2005
@@ -182,6 +182,13 @@
        #comic relief with Bugg becoming a 'sea orc'
        [event]
        name=turn 3
+               # ensure Bugg hasn't been killed
+               [if]
+                       [have_unit]
+                       side=2
+                       description=Bugg
+                       [/have_unit]
+               [then]
                [message]
                description=Bugg
                message= _ "But boss, why are we only using bats and nagas?"
@@ -203,33 +210,40 @@
                image=portraits/core/James_Woo/orc-warlord2.png
                message= _ "Shut up, worm! I'm the boss!"
                [/message]
+               [/then]
+               [/if]
        [/event]
 
-       #we have to put Bugg being killed and him turning into a sea orc
-       #in different events, since normally kills are processed after
-       #units being created if they're in the same event
        [event]
        name=turn 4
-               [kill]
-               description=Bugg
-               [/kill]
-       [/event]
-
-       [event]
-       name=turn 4
-
-               {UNIT (Sea Orc) (Bugg) ( _ "Bugg") 2 16 18}
-
-               [message]
-               description=Bugg
-               message= _ "Ha ha ha! Now orcs will rule over land and sea!"
-               [/message]
-
-               [message]
-               description=Dwaba-Kukai
-               image=portraits/core/James_Woo/orc-warlord2.png
-               message= _ "(Sigh) Will someone kill this idiot for me, please?"
-               [/message]
+               [if]
+                       [have_unit]
+                       side=2
+                       description=Bugg
+                       [/have_unit]
+               [then]
+               #override kills being processed after
+               #units being created if they're in the same event
+               [command]
+                       [kill]
+                       description=Bugg
+                       [/kill]
+
+                       {UNIT (Sea Orc) (Bugg) ( _ "Bugg") 2 16 18}
+
+                       [message]
+                       description=Bugg
+                       message= _ "Ha ha ha! Now orcs will rule over land and 
sea!"
+                       [/message]
+
+                       [message]
+                       description=Dwaba-Kukai
+                       image=portraits/core/James_Woo/orc-warlord2.png
+                       message= _ "(Sigh) Will someone kill this idiot for me, 
please?"
+                       [/message]
+               [/command]
+               [/then]
+               [/if]
        [/event]
 
        [event]