0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up after some wmllint warnings.

Browse source
This commit is contained in:
Eric S. Raymond 2008-01-21 18:02:15 +00:00
parent 5940ee4b87
commit 937f600c90
9 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
View file

@ -18,7 +18,7 @@
usage=mixed fighter
experience=80
advanceto=Dwarvish Loremaster
{AMLA_TOUGH 3}
{AMLA_DEFAULT}
unit_description= _ "Dwarvish Annalists are the historians of this ancient and proud race. They are few in number, and their very existence is not generally known to the other peoples of the Great Continent. To the abilities of the Witness they add, through the study of herb and mineral lore, the ability to cure poison."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_UNPOISON}+{SPECIAL_NOTES_LEADERSHIP}+_ "SPECIAL_NOTES^ This unit can exert leadership on units of his own level."+{SPECIAL_NOTES_MAGICAL}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}

2
data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
View file

@ -16,7 +16,7 @@
alignment=neutral
cost=50
usage=mixed fighter
{AMLA_TOUGH 3}
{AMLA_DEFAULT}
unit_description= _ "Loremasters are the sages of the dwarvish race. Their counsel is greatly valued by war-leaders and chieftains, and they are viewed with awe by ordinary dwarves, for they alone have plumbed the deepest and most closely-held secrets of dwarven knowledge. It is said that where a loremaster stands, there is the soul of the dwarves. To the abilities of the Annalist they add a limited ability to heal."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_UNPOISON}+{SPECIAL_NOTES_LEADERSHIP}+_ "SPECIAL_NOTES^ This unit can exert leadership on units of his own level."+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HEALS}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_4}

14
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night_alt.cfg
View file

@ -101,16 +101,4 @@
{ELYSSA_DEATH}#
#!-- We could use some cleanup, couldn't we :P
#undef STORY_CHAPTER_3
#undef SIDES_SETUP
#undef PRESTART
#undef SCENARIO_START
#undef WAR_CRY
#undef ELF_CORPSE
#undef DESTROY_TENT
#undef CHALLENGE
#undef POSSESION
#undef ORC_PARTY
#undef CREEP_DEATH
[/scenario]
[/scenario]

3
data/campaigns/Under_the_Burning_Suns/scenarios/scen3_alt/possesion.cfg
View file

@ -138,6 +138,7 @@
[message]
speaker=narrator
message=_"Garak colapses to the ground with own blade sticking form his chest."
image=wesnoth-icon.png
[/message]
[kill]
description=Garak
@ -587,6 +588,7 @@
[message]
speaker=narrator
message=_"Garak colapses to the ground with own blade sticking form his chest."
image=wesnoth-icon.png
[/message]
[kill]
description=Garak
@ -876,6 +878,7 @@
[message]
speaker=narrator
message=_"Garak colapses to the ground with own blade sticking form his chest."
image=wesnoth-icon.png
[/message]
[kill]
description=Garak

4
data/core/units/bats/Bat_Blood.cfg
View file

@ -271,7 +271,7 @@
[frame]
duration=30
image="units/undead/bloodbat-se-1.png"
sound=bloodbat-flapping.wav
sound=bat-flapping.wav
[/frame]
[frame]
duration=30
@ -329,7 +329,7 @@
[frame]
duration=30
image="units/undead/bloodbat-ne-1.png"
sound=bloodbat-flapping.wav
sound=bat-flapping.wav
[/frame]
[frame]
duration=30

2
data/core/units/elves/Champion.cfg
View file

@ -4,7 +4,7 @@
name= _ "Elvish Champion"
race=elf
image="units/elves-wood/champion.png"
profile="portraits/Kitty/elvish-fighter.png"
profile="portraits/Kitty/elvish-fighter.png" # wmllint: noconvert
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=70
movement_type=woodland

2
data/core/units/elves/Fighter.cfg
View file

@ -4,7 +4,7 @@
name= _ "Elvish Fighter"
race=elf
image="units/elves-wood/fighter.png"
profile="portraits/Kitty/elvish-fighter.png"
profile="portraits/Kitty/elvish-fighter.png" # wmllint: noconvert
ellipse="misc/ellipse"
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=33

2
data/core/units/elves/Hero.cfg
View file

@ -4,7 +4,7 @@
name= _ "Elvish Hero"
race=elf
image="units/elves-wood/hero.png"
profile="portraits/Kitty/elvish-fighter.png"
profile="portraits/Kitty/elvish-fighter.png" # wmllint: noconvert
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=51
movement_type=woodland

10
data/tools/wmllint
View file

@ -39,6 +39,9 @@
# You can disable stack-based malformation checks with a comment
# containing "wmllint: validate-off" and re-enable with "wmllint: validate-on".
#
# You can prevent file conversions with a comment containing
# "wmllint: noconvert" on the same line as the filename.
#
# You can skip checks on unbalanced WML (e.g. in a macro definition) by
# bracketing it with "wmllint: unbalanced-on" and "wmllint: unbalanced-off".
# Note that this will also disable stack-based validation on the span
@ -1612,9 +1615,10 @@ if __name__ == '__main__':
"Resource-name transformation on text lines."
transformed = line
# First, do resource-file moves
for step in fileconversions:
for (old, new) in step:
transformed = old.sub(new, transformed)
if "wmllint: noconvert" not in line:
for step in fileconversions:
for (old, new) in step:
transformed = old.sub(new, transformed)
# Handle terrain_liked=, terrain=, valid_terrain=, letter=
spaceless = transformed.replace(" ", "").replace("\t", "")
if spaceless and spaceless[0] != "#" and ("terrain_liked=" in spaceless or "terrain=" in spaceless or 'letter=' in spaceless) and "wmllint:ignore" not in spaceless: