Move a unit declaration that was dodgy because...

...(a) a macro it used was questionable within [side], and (b) wmllint
got confused.
This commit is contained in:
Eric S. Raymond 2008-11-23 11:34:09 +00:00
parent 3bd7078f8d
commit 832e523669
2 changed files with 27 additions and 24 deletions

View file

@ -63,29 +63,6 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
x=17
y=14
[/unit]
#TODO I don't believe that this macro is working inside a [side]
{INIT_LANDAR}
[unit]
{LANDAR}
# wmllint: recognize Landar
x,y=16,15
[/unit]
#TODO make the loyals in debug mode available
[unit]
type=Elvish Fighter
id=Anduilas
name=_ "Anduilas"
unrenamable=yes
side=1
x,y=19,15
[modifications]
{TRAIT_INTELLIGENT}
{TRAIT_STRONG}
{TRAIT_LOYAL}
[/modifications]
[/unit]
[/side]
#wmllint: validate-on
@ -293,6 +270,30 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
logger=warn
[/debug_message]
#wmllint: validate-off
{INIT_LANDAR}
[unit]
{LANDAR}
# wmllint: recognize Landar
x,y=16,15
[/unit]
#wmllint: validate-on
#TODO make the loyals in debug mode available
[unit]
type=Elvish Fighter
id=Anduilas
name=_ "Anduilas"
unrenamable=yes
side=1
x,y=19,15
[modifications]
{TRAIT_INTELLIGENT}
{TRAIT_STRONG}
{TRAIT_LOYAL}
[/modifications]
[/unit]
[objectives]
side=1
[objective]

View file

@ -1,7 +1,6 @@
#textdomain wesnoth-utbs
#define NYM_BASE HP EXP LEVEL SWORD_POWER BOLAS_POWER
race=elf
gender=female
image=units/elves-desert/nym.png
profile=portraits/nym.png
@ -136,6 +135,7 @@
description= _ "Nym is Kaleh's childhood friend who follows the tradition of a family of Desert Hunters, as much as that can be said about a young, rebellious lady with quick wits and strong will. Her high spirits are a great boon in dark times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
cost=20
advances_to=Nym Sentinel
race=elf
{NYM_BASE 30 42 1 5 4}
{NYM_ANIMATIONS}
[/unit_type]
@ -146,6 +146,7 @@
description= _ "Nym is Kaleh's childhood friend who follows the tradition of a family of Desert Hunters, as much as that can be said about a young, rebellious lady with quick wits and strong will. Her high spirits are a great boon in dark times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_SKIRMISHER}
cost=35
advances_to=Nym Prowler
race=elf
{NYM_BASE 44 84 2 7 8}
{NYM_ANIMATIONS}
[/unit_type]
@ -157,6 +158,7 @@
description= _ "Nym is Kaleh's childhood friend who follows the tradition of a family of Desert Hunters, as much as that can be said about a young, rebellious lady with quick wits and strong will. Her high spirits are a great boon in dark times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_SKIRMISHER}
cost=90
advances_to=null
race=elf
{NYM_BASE 66 150 3 9 12}
{NYM_ANIMATIONS}
[/unit_type]