mail[Wesnoth-commits] r14066 - in /branches/1.2/data/campaigns/Heir_To_The_Throne: scenarios/26_Battle_for_Wesnoth.cfg units/Dark_Queen.cfg


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by lari . nieminen on October 25, 2006 - 16:15:
Author: zookeeper
Date: Wed Oct 25 16:14:44 2006
New Revision: 14066

URL: http://svn.gna.org/viewcvs/wesnoth?rev=14066&view=rev
Log:
A few more little WML fixes to how Asheviere dies, also ixing a bug that 
might cause the scenario not end when she is killed (and had Konrad use his 
angry portrait when chopping off her head).

Modified:
    
branches/1.2/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
    branches/1.2/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg

Modified: 
branches/1.2/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.2/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg?rev=14066&r1=14065&r2=14066&view=diff
==============================================================================
--- 
branches/1.2/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
 (original)
+++ 
branches/1.2/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
 Wed Oct 25 16:14:44 2006
@@ -301,7 +301,7 @@
                [/message]
                [kill]
                        description=Asheviere
-                       animate=no
+                       animate=yes
                        fire_event=no
                [/kill]
        [/event]
@@ -340,6 +340,7 @@
                [message]
                description=Konrad
                message= _ "Oh, wretched lady, I am very real. The land burns 
from your greed and ambition. You will now be held to account for your 
misdeeds. For the young prince Konrad! For WESNOTH!"
+               image=portraits/konrad-angry.png
                [/message]
                [message]
                speaker=narrator
@@ -348,9 +349,12 @@
                [/message]
                [kill]
                        description=Asheviere
-                       animate=no
+                       animate=yes
                        fire_event=no
                [/kill]
+               [endlevel]
+               result=continue
+               [/endlevel]
        [/event]
        [event]
        name=die
@@ -435,7 +439,7 @@
                [/sound]
                [kill]
                        description=Asheviere
-                       animate=no
+                       animate=yes
                        fire_event=no
                [/kill]
                [colour_adjust]
@@ -448,6 +452,9 @@
                green=0
                blue=0
                [/colour_adjust]
+               [endlevel]
+               result=continue
+               [/endlevel]
        [/event]
 
        [event]
@@ -459,13 +466,25 @@
                description=Asheviere
                message= _ "Treason! The evil ones have slain me!"
                [/message]
+               [object]
+               name= _ "The Queen is Dead"
+               duration=forever
+               silent=yes
+                       [filter]
+                       type=Dark Queen
+                       [/filter]
+                       [effect]
+                       apply_to=variation
+                       name=dead_queen
+                       [/effect]
+               [/object]
                [music]
                name="main_menu_new.ogg"
                immediate=yes
                [/music]
                [kill]
                        description=Asheviere
-                       animate=no
+                       animate=yes
                        fire_event=no
                [/kill]
                [message]

Modified: branches/1.2/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.2/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg?rev=14066&r1=14065&r2=14066&view=diff
==============================================================================
--- branches/1.2/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg 
(original)
+++ branches/1.2/data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg Wed 
Oct 25 16:14:44 2006
@@ -17,19 +17,6 @@
        usage=fighter
        unit_description= _ "The evil queen mother Asheviere has terrorized 
Wesnoth for many years. Her knowledge of magic makes her a worthy foe in 
combat, although her power is mostly derived from those she commands."
        get_hit_sound={SOUND_LIST:HUMAN_FEMALE_HIT}
-       die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
-       [death]
-               [frame]
-                       begin=0
-                       end=200
-                       image="human-queen-die-1.png"
-               [/frame]
-               [frame]
-                       begin=200
-                       end=400
-                       image="human-queen-die-2.png"
-               [/frame]
-       [/death]
        [attack]
                name=scepter
                icon=attacks/staff-magic.png
@@ -40,16 +27,24 @@
                [animation]
                        hits=yes
                        [frame]
+                               begin=-200
+                               end=-100
+                       [/frame]
+                       [frame]
                                begin=-100
-                               end=0
+                               end=200
                                sound=staff.wav
                        [/frame]
                [/animation]
                [animation]
                        hits=no
                        [frame]
+                               begin=-200
+                               end=-100
+                       [/frame]
+                       [frame]
                                begin=-100
-                               end=0
+                               end=200
                                sound={SOUND_LIST:MISS}
                        [/frame]
                [/animation]
@@ -97,7 +92,7 @@
                name= _ "female^Dark Queen"
                gender=female
                race=human
-               image="human-queen-die-2.png"
+               image="human-queen.png"
                profile=portraits/asheviere.png
                hitpoints=48
                movement_type=smallfoot
@@ -110,12 +105,25 @@
                cost=35
                usage=fighter
                unit_description= _ "The evil queen mother Asheviere has 
terrorized Wesnoth for many years. Her knowledge of magic makes her a worthy 
foe in combat, although her power is mostly derived from those she commands."
+               die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
                [attack]
-                       name=sword
-                       type=blade
+                       name=scepter
+                       type=impact
                        range=melee
                        damage=1
                        number=1
                [/attack]
+               [death]
+                       [frame]
+                               begin=0
+                               end=200
+                               image="human-queen-die-1.png"
+                       [/frame]
+                       [frame]
+                               begin=200
+                               end=400
+                               image="human-queen-die-2.png"
+                       [/frame]
+               [/death]
        [/variation]
 [/unit]




Related Messages


Powered by MHonArc, Updated Wed Oct 25 19:01:22 2006