First round of wmllint glitch fixes for LoW.

This commit is contained in:
Eric S. Raymond 2008-10-07 03:29:44 +00:00
parent 2af228e177
commit 5a3fe76339
15 changed files with 30 additions and 51 deletions

View file

@ -1,4 +1,5 @@
This is the history of LoW commit comments from the wesnoth-umc-dev repository.
LoW was mainlained in version 1.5.9
------------------------------------------------------------------------
r2001 | esr | 2008-10-06 13:36:52 -0400 (Mon, 06 Oct 2008) | 2 lines

View file

@ -20,29 +20,6 @@
# wmlscope: set export=no
#ifdef VERSION_LEGEND_OF_WESMERE_MAJOR
#undef VERSION_LEGEND_OF_WESMERE_MAJOR
#endif
#ifdef VERSION_LEGEND_OF_WESMERE_MINOR
#undef VERSION_LEGEND_OF_WESMERE_MINOR
#endif
#ifdef VERSION_LEGEND_OF_WESMERE_REVISION
#undef VERSION_LEGEND_OF_WESMERE_REVISION
#endif
#
# Versioning facilities; DO NOT REMOVE unless this
# revision is being mainlined
#
# wmlindent: start ignoring
#define VERSION_LEGEND_OF_WESMERE_MAJOR
1#enddef
#define VERSION_LEGEND_OF_WESMERE_MINOR
5#enddef
#define VERSION_LEGEND_OF_WESMERE_REVISION
9#enddef
# wmlindent: stop ignoring
#define KALENZ_COLOUR
brown#enddef
@ -71,16 +48,13 @@
[campaign]
#textdomain wesnoth-low
id=LOW
define=CAMPAIGN_LOW
# rank?
rank=40
rank=125
#difficulty rating
version={VERSION_LEGEND_OF_WESMERE_MAJOR}.{VERSION_LEGEND_OF_WESMERE_MINOR}.{VERSION_LEGEND_OF_WESMERE_REVISION}
difficulties=EASY,NORMAL,HARD
# icon="units/elves-wood/high-lord.png~RC(magenta>red)"
icon="units/elves-wood/high-lord.png~RC(magenta>{KALENZ_COLOUR})"
image="kalenztofoolhttt.png"
name=_ "Legend of Wesmere"
@ -89,10 +63,9 @@
abbrev= _ "LOW"
name=_ "Legend of Wesmere"
description=_ "Follow the story of Kalenz and the Elves in Wesnoth and their fight for survival from the second orcish invasion to the times of Konrad and Delfador."+"
"+_"(Intermediate level, 32 scenarios)"+"
<128,128,128>"+_"Version:"+" {VERSION_LEGEND_OF_WESMERE_MAJOR}.{VERSION_LEGEND_OF_WESMERE_MINOR}.{VERSION_LEGEND_OF_WESMERE_REVISION}"+"
<128,128,128>"+_"(for Battle for Wesnoth 1.5.5 or greater (or svn HEAD))"
description=_ "The tale of Kalenz, the High Lord who rallied his people after the second orcish invasion of the Great Continent and became the most renowned hero in the recorded history of the Elves.
(Intermediate level, 24 scenarios.)"
difficulty_descriptions={MENU_IMG_TXT2 "units/elves-wood/fighter.png~RC(magenta>{KALENZ_COLOUR})" _"Soldier" _"(Easy)"} +
";*" + {MENU_IMG_TXT2 "units/elves-wood/lord.png~RC(magenta>{KALENZ_COLOUR})" _"Lord" _"(Normal)"} +
";" + {MENU_IMG_TXT2 "units/elves-wood/high-lord.png~RC(magenta>{KALENZ_COLOUR})" _"High Lord" _"(Hard)"}

View file

@ -24,7 +24,7 @@
{CROSS 1001 250}
[/part]
[part]
story=_ "The great elvish hero Kalenz was born in a quiet green forest just north of the young kingdom of Wesnoth. Though not of noble birth, he showed early promise in the arts of his people. His quick intelligence gained him more than usual respect among elders normally inclined to pay little heed to anyone less than a century old."
story=_ "The great elvish hero Kalenz was born in a quiet green forest just north of the young kingdom of Wesnoth. Though not of noble birth, he showed early promise in the arts of his people. His quick intelligence gained him more than usual respect among elders normally inclined to pay little heed to anyone younger than a century old."
delay=4000
background="story/portraits/kalenz-nude.png"
[/part]
@ -34,12 +34,12 @@
background="story/portraits/kalenz-nude.png"
[/part]
[part]
story=_ "Some changes were good. The Elves, awakened as from a long dream, began to increase in population. But some were very bad, and the worst of those was the coming of the orcs, the wreckers, the tree-killers. The years of Kalenz's long childhood were a golden age, and the last time of peace."
story=_ "Some changes were good. The Elves, awakened as from a long dream, began to increase in population. But some were very bad, and the worst of those was the coming of the orcs, the wreckers, the tree-killers. The years of Kalenz's long childhood were a golden age, and the last time of peace."
delay=4000
background="story/portraits/kalenz-nude.png"
[/part]
[part]
story="The elves had never been a martial people, and they were not prepared for the inevitable war with the orcs. Kalenz came of age in the very year that Erlornas of Wesmere fought the first orcish raiders. Within the next decade orcish raids gradually increased, and their shadow loomed ever greater over the elves.
story=_ "The elves had never been a martial people, and they were not prepared for the inevitable war with the orcs. Kalenz came of age in the very year that Erlornas of Wesmere fought the first orcish raiders. Within the next decade orcish raids greatly increased, and their shadow loomed ever greater over the elves.
This is the story of Kalenz, and of the Elves in the days of the humans in Wesnoth."
delay=8000
@ -374,7 +374,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
[message]
id=Velon
message= _ "Kalenz was right and I was wrong. Go; join Kalenz while yet you can. I and the remaining elders will cover your retreat as best we may."
message= _ "Kalenz was right and I was wrong. Go; join Kalenz while yet you can. I and the remaining elders will cover your retreat as best we may."
[/message]
{MODIFY_UNIT (side=2) side 1 }
@ -423,7 +423,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
[/filter]
[music]
name="sad.ogg"
name="nr-sad.ogg"
play_once=yes
immediate=yes
[/music]

View file

@ -142,11 +142,11 @@
[/message]
[message]
id=Olurf
message= _ "Not even in yer dreams, elf. These are dwarviah lands, and troubles we want no part of nip at yer heels. Get out and stay out!"
message= _ "Not even in yer dreams, elf. These are dwarviah lands, and troubles we want no part of nip at yer heels. Get out and stay out!"
[/message]
[message]
id=Landar
message= _ "Our troubles will be yours, too, whether either of us will it or not. The orcs have come down from the north like a flood; if we squabble among ourselves they will feast on our discord."
message= _ "Our troubles will be yours, too, whether either of us will it or not. The orcs have come down from the north like a flood; if we squabble among ourselves they will feast on our discord."
[/message]
[message]
id=Olurf

View file

@ -16,7 +16,7 @@
[story]
# music=underground.ogg
[part]
story= _ "Elvish scouts found the trail of the Saurian war party without difficulty. The way back to the Saurians' treasury was clear..."
story= _ "Elvish scouts found the trail of the Saurian war party without difficulty. The way back to the Saurians' treasury was clear..."
delay=4000
background="maps/wesnoth.png"
{DOT 280 240}

View file

@ -245,6 +245,7 @@
#Santi, added story here
[message]
speaker=narrator
image=wesnoth-icon.png
message= _ "Before Kalenz left the Ka'lian he had ordered $left_behind to stay and guard it. Kalenz is from now on able to recruit Dwarves."
[/message]
####

View file

@ -108,7 +108,7 @@
type=Orcish Warlord
id=Tan-Grub
name=_ "Tan-Grub"
profile="portraits/orcish_leader_191.png"
profile="portraits/James_Woo/orc-warlord.png"
side=4
canrecruit=yes
#ifdef EASY
@ -514,6 +514,7 @@
[/endlevel]
[/event]
#wmllint: recognize Cleodil
[event]
name=victory
[message]

View file

@ -230,6 +230,7 @@
[event]
name=prestart
# wmllint: recognize Cleodil
[message]
id=Cleodil
message= _ "I have taught you all that I dare. My lord...Kalenz...I pray you come back safely. My heart aches when I think of you going into such danger as this. It is peril not merely to your body, but to the essence of yourself."
@ -247,7 +248,7 @@
[message]
id=Kalenz
message= _ "My eyes are open. To the danger, and...to you. You glow like a star in the night, Cleodil. You will be my guide out of darkness."
message= _ "My eyes are open. To the danger, and...to you. You glow like a star in the night, Cleodil. You will be my guide out of darkness."
[/message]
[objectives]

View file

@ -200,6 +200,7 @@
{WINTER_MASK 17_Breaking_the_siege.mask}
[/event]
#wmllint: recognize Uraderia
[event]
name=start
[message]

View file

@ -19,7 +19,7 @@
{INTRO_AND_SCENARIO_MUSIC revelation.ogg the_dangerous_symphony.ogg}
{EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
{EXTRA_SCENARIO_MUSIC sad.ogg}
{EXTRA_SCENARIO_MUSIC nr-sad.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
{DEFAULT_SCHEDULE}
@ -42,7 +42,7 @@
delay=8000
[/part]
[part]
story= _ "But their peace was not to last. In the outer world, the blood tides were rising. And in the heart of Landar who had once been their friend, evil was not vanquished, but festered and grew..."
story= _ "But their peace was not to last. In the outer world, the blood tides were rising. And in the heart of Landar, who had once been their friend, evil was not vanquished, but festered and grew..."
delay=8000
[/part]
[/story]

View file

@ -32,10 +32,10 @@
background="maps/wesnoth.png"
[/part]
[part]
story= _ "Cleodil bore Kalenz children who were tall, and beautiful, and inherited in full measure both their mother's healing gifts and their father's talented and searching mind. In the fullness of time, after a long life full of accomplishment and love and laughter, Cleodil died after the manner of Elves,aging swiftly to a peaceful end."
story= _ "Cleodil bore Kalenz children who were tall, and beautiful, and inherited in full measure both their mother's healing gifts and their father's talented and searching mind. In the fullness of time, after a long life full of accomplishment and love and laughter, Cleodil died after the manner of Elves,aging swiftly to a peaceful end."
[/part]
[part]
story= _ "But Kalenz's story was not yet over. Aquagar's curse was fulfilled; prolonged in life by Crelanu's philter, he outlived not only his beloved but their children. Sundered from his kin by their mortality, seeing in their eyes a painful reflection of his lost beloved, he left his home and wandered for many a year across the Great Continent. Oft did he arrive unexpected at times and places when his people were in dire straits, and succour them with wisdom or magic or his bright keen blade."
story= _ "But Kalenz's story was not yet over. Aquagar's curse was fulfilled; prolonged in life by Crelanu's philter, he outlived not only his beloved but their children. Sundered from his kin by their mortality, fleeing the relections in their eyes of his lost beloved, he left his home and wandered for many a year across the Great Continent. Oft did he arrive unexpected at times and places when his people were in dire straits, and succour them with wisdom or magic or his bright keen blade."
[/part]
[part]
story= _ "To learn of Kalenz's last and perhaps greatest deeds, and those in which he was most alone, seek ye the tale of Delfador the Great and the fall of the usurping Queen Asheviere."

View file

@ -1,3 +1,4 @@
#textdomain wesnoth-low
{STARTING_VILLAGES 2 12}
{STARTING_VILLAGES_AREA 2 38 25 12}
{STARTING_VILLAGES_AREA 2 55 36 7}

View file

@ -57,7 +57,7 @@
damage=9
number=4
[/attack]
{DEFENSE_ANIM "units/undead-demilich-defend.png" "lich/undead-demilich.png" {SOUND_LIST:LICH_HIT} }
{DEFENSE_ANIM "units/undead-demilich-defend.png" "units/undead-demilich.png" {SOUND_LIST:LICH_HIT} }
[death]
[frame]
begin=0

View file

@ -159,8 +159,8 @@
[/attack]
[attack]
name=ice shot
description=_"ice shot"
name=iceball
description=_"iceball"
type=cold
range=ranged
damage=10
@ -183,8 +183,8 @@
[missile_frame]
begin=-100
end=0
image=projectiles/magicmissile-n.png
image_diagonal=projectiles/magicmissile-ne.png
image=projectiles/missile-n.png
image_diagonal=projectiles/missile-ne.png
[/missile_frame]
[/attack]
[/unit_type]

View file

@ -237,7 +237,7 @@
#enddef
#define VILLAGE_KALENZ X Y
{VILLAGE_SIDE 1 X Y}
{VILLAGE_SIDE 1 {X} {Y}}
#enddef
# Thanks to Shadow Master for this macro