Author: fendrin
Date: Wed Nov 26 23:07:29 2008
New Revision: 31106
URL: http://svn.gna.org/viewcvs/wesnoth?rev=31106&view=rev
Log:
converted a macro into an event that is fired
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg?rev=31106&r1=31105&r2=31106&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg Wed
Nov 26 23:07:29 2008
@@ -21,7 +21,6 @@
delay=4000
{TO_ELVISH_TREASURY}
[/part]
-
[part]
{TO_ELVISH_TREASURY_BATTLE}
show_title=yes
@@ -55,7 +54,7 @@
aggression=0.75
[/ai]
[/side]
-
+
[side]
type=Saurian Ambusher
id=Trigr
@@ -81,13 +80,11 @@
y=11
image=scenery/temple1.png
[/item]
-
[item]
x=11
y=11
image=units/elves-wood/shyde.png~RC(magenta>red)
[/item]
-
[item]
x=11
y=11
@@ -123,10 +120,9 @@
{RECALL_LOYALS}
# wmllint: recognize Landar
# wmllint: recognize Huraldur
-
{CHECK_LANDAR}
[/event]
-
+
# wmllint: directory spelling dastone
[event]
name=start
@@ -152,67 +148,65 @@
message= _ "You will not live to enjoy it!"
[/message]
[/event]
-
-#define FREE_CLEODIL
- [music]
- name=elvish-theme.ogg
- play_once=yes
- [/music]
-
- [unit]
- {CLEODIL}
- # wmllint: recognize Cleodil
- x=11
- y=11
- [/unit]
-
- [unit]
- id=Arkildur
- name= _ "Arkildur"
- side=1
- type=Elvish Fighter
- x=11
- y=11
- [modifications]
- {TRAIT_STRONG}
- {TRAIT_INTELLIGENT}
- {TRAIT_LOYAL}
- [/modifications]
- [/unit]
-
- [unit]
- id=Tameril-Isimeril
- name= _ "Tameril-Isimeril"
- side=1
- type=Elvish Archer
- x=11
- y=11
- [modifications]
- {TRAIT_DEXTROUS}
- {TRAIT_RESILIENT}
- {TRAIT_LOYAL}
- [/modifications]
- [/unit]
+
+ [event]
+ name=free cleodil
+
+ {INCIDENTAL_MUSIC elvish-theme.ogg}
+
+ [unit]
+ {CLEODIL}
+ # wmllint: recognize Cleodil
+ x=11
+ y=11
+ [/unit]
+ [unit]
+ id=Arkildur
+ name= _ "Arkildur"
+ side=1
+ type=Elvish Fighter
+ x=11
+ y=11
+ [modifications]
+ {TRAIT_STRONG}
+ {TRAIT_INTELLIGENT}
+ {TRAIT_LOYAL}
+ [/modifications]
+ [/unit]
+ [unit]
+ id=Tameril-Isimeril
+ name= _ "Tameril-Isimeril"
+ side=1
+ type=Elvish Archer
+ x=11
+ y=11
+ [modifications]
+ {TRAIT_DEXTROUS}
+ {TRAIT_RESILIENT}
+ {TRAIT_LOYAL}
+ [/modifications]
+ [/unit]
#ifdef EASY
- [unit]
- id=Laril
- name= _ "Laril"
- side=1
- type=Elvish Archer
- x=11
- y=11
- [modifications]
- {TRAIT_DEXTROUS}
- {TRAIT_QUICK}
- {TRAIT_LOYAL}
- [/modifications]
- [/unit]
+ [unit]
+ id=Laril
+ name= _ "Laril"
+ side=1
+ type=Elvish Archer
+ x=11
+ y=11
+ [modifications]
+ {TRAIT_DEXTROUS}
+ {TRAIT_QUICK}
+ {TRAIT_LOYAL}
+ [/modifications]
+ [/unit]
#endif
- [message]
- id=Cleodil
- message= _ "We are free! My lord Kalenz, from this day forward we are
your sworn followers. And there is that which you should hear about the
treasure."
- [/message]
-#enddef
+ [message]
+ id=Cleodil
+ message= _ "We are free! My lord Kalenz, from this day forward we
are your sworn followers. And there is that which you should hear about the
treasure."
+ [/message]
+
+ [/event]
[event]
name=moveto
@@ -226,7 +220,9 @@
y=11
[/filter]
- {FREE_CLEODIL}
+ [fire_event]
+ name=free cleodil
+ [/fire_event]
[/event]
[event]
@@ -245,7 +241,9 @@
message= _ "Without their leaders, the saurians flee in
panic. Free the garrison!"
[/message]
- {FREE_CLEODIL}
+ [fire_event]
+ name=free cleodil
+ [/fire_event]
[/then]
[/if]
@@ -253,17 +251,14 @@
id=Kalenz
message= _ "We have defeated the saurians and freed the garrison,
but our gold is gone. "
[/message]
-
[message]
id=Cleodil
message= _ "The saurians have looted our treasury. They were
particularly interested in finding something they called 'dastone'. I am sorry,
my lord Kalenz, I could not understand their distorted speech very well."
[/message]
-
[message]
type=Elvish Archer,Elvish Scout,Elvish Shaman,Elvish
Fighter,Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter
message= _ "The war with the Orcs goes poorly. We are going to
need that gold back!"
[/message]
-
[message]
id=Kalenz
message= _ "We will hunt down those saurians and retrieve our
gold. More, we must teach them that it is lethal folly to raid us, else they
will plague us like rats. Let's hurry. "
@@ -272,4 +267,3 @@
[EMAIL PROTECTED]/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]
-#undef FREE_CLEODIL
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
