Author: esr
Date: Mon Mar 10 09:49:33 2008
New Revision: 24467
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24467&view=rev
Log:
Fix some minor WML errors. This change can be backported to 1.4.
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg?rev=24467&r1=24466&r2=24467&view=diff
==============================================================================
--- trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
(original)
+++ trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg Mon
Mar 10 09:49:33 2008
@@ -168,6 +168,64 @@
{WILDTHING 27 14}
[/event]
+#define RATHELN_ENCOUNTER
+ [if]
+ [have_unit]
+ description=Ratheln
+ [/have_unit]
+ [else]
+ [unit]
+ type=Arch Mage
+ description=Ratheln
+ profile=portraits/ratheln.png
+ user_description= _ "Ratheln"
+ side=1
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_STRONG}
+ [/modifications]
+ x=19
+ y=11
+ [/unit]
+
+ [message]
+ speaker="Ratheln"
+ message=_"Hail, I am Ratheln. If you're traveling down the
pass, please take me with you. I am near freezing and starving to death up
here."
+ [/message]
+
+ [message]
+ speaker="Angarthing"
+ message=_"Pardon my curiosity, but what is a firemage doing
freezing to death?"
+ [/message]
+
+ [message]
+ speaker="Ratheln"
+ message=_"In case you haven't noticed, there is a serious
shortage of both firewood and food in this gods-forsaken slot. And the damned
gryphons descend on me whenever I stir out of this shack. I've had nothing to
eat but flash-roasted gryphon for the last three weeks."
+ [/message]
+
+ [message]
+ speaker="Aiglondur"
+ message=_"Where were you bound when you got stuck here?"
+ [/message]
+
+ [message]
+ speaker="Ratheln"
+ message=_"There is a school of mages near the east end of the
pass. They've an opening for an instructor, and they're expecting me."
+ [/message]
+
+ [message]
+ speaker="Angarthing"
+ message=_"Let's take him with us, Aiglondur. We know little
about the country beyond to the east; we've had few reports on it since before
the orcs took Knalga. Those mages should know at least rumors."
+ [/message]
+
+ [message]
+ speaker="Aiglondur"
+ message=_"Aye. And I'd not leave anyone who had done my kin no
harm stranded to starve."
+ [/message]
+ [/else]
+ [/if]
+#enddef
+
[event]
name=moveto
first_time_only=yes
@@ -177,55 +235,15 @@
y=10
[/filter]
- [unit]
- type=Arch Mage
- description=Ratheln
- profile=portraits/ratheln.png
- user_description= _ "Ratheln"
- side=1
- [modifications]
- {TRAIT_LOYAL}
- {TRAIT_STRONG}
- [/modifications]
- x=19
- y=11
- [/unit]
-
- [message]
- speaker="Ratheln"
- message=_"Hail, I am Ratheln. If you're traveling down the pass,
please take me with you. I am near freezing and starving to death up here."
- [/message]
-
- [message]
- speaker="Angarthing"
- message=_"Pardon my curiosity, but what is a firemage doing
freezing to death?"
- [/message]
-
- [message]
- speaker="Ratheln"
- message=_"In case you haven't noticed, there is a serious shortage
of both firewood and food in this gods-forsaken slot. And the damned gryphons
descend on me whenever I stir out of this shack. I've had nothing to eat but
flash-roasted gryphon for the last three weeks."
- [/message]
-
- [message]
- speaker="Aiglondur"
- message=_"Where were you bound when you got stuck here?"
- [/message]
-
- [message]
- speaker="Ratheln"
- message=_"There is a school of mages near the east end of the
pass. They've an opening for an instructor, and they're expecting me."
- [/message]
-
- [message]
- speaker="Angarthing"
- message=_"Let's take him with us, Aiglondur. We know little about
the country beyond to the east; we've had few reports on it since before the
orcs took Knalga. Those mages should know at least rumors."
- [/message]
-
- [message]
- speaker="Aiglondur"
- message=_"Aye. And I'd not leave anyone who had done my kin no
harm stranded to starve."
- [/message]
- [/event]
+ {RATHELN_ENCOUNTER}
+ [/event]
+
+ [event]
+ name=turn 12
+
+ {RATHELN_ENCOUNTER}
+ [/event]
+#undef RATHELN_ENCOUNTER
[event]
name=turn 9
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg?rev=24467&r1=24466&r2=24467&view=diff
==============================================================================
---
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
(original)
+++
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
Mon Mar 10 09:49:33 2008
@@ -368,7 +368,7 @@
[/message]
[message]
- speaker=unit
+ speaker=second_unit
message= _ "We'll see about that!"
[/message]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
