New wmllint test and some minor cleanliness fixes to go with it.

This commit is contained in:
Eric S. Raymond 2008-03-05 22:36:00 +00:00
parent 500f4acd9f
commit 512c996f22
7 changed files with 50 additions and 45 deletions

View file

@ -180,12 +180,10 @@
x=15,14,13,12,11
y=12,12,12,12,12
[/move_unit_fake]
{NOTRAIT_UNIT 9 "Blood Bat" 11 12}
[+unit]
description=Bat
[/unit]
{NOTRAIT_UNIT 9 "Blood Bat" 11 12}
# wmllint: recognize Blood Bat
[message]
description=Bat
description=Blood Bat
message= _ "Neep Neep!"
[/message]
[message]

View file

@ -588,46 +588,47 @@
name=turn 21
{NOTRAIT_UNIT 2 Ghoul 13 11}
{NOTRAIT_UNIT 2 Ghoul 15 11}
{NOTRAIT_UNIT 2 Ghoul 15 10}
{NOTRAIT_UNIT 2 Ghoul 16 9}
{NOTRAIT_UNIT 2 Ghoul 17 10}
{NOTRAIT_UNIT 2 Ghoul 19 10}
{NOTRAIT_UNIT 2 Ghoul 20 9}
{NOTRAIT_UNIT 2 Ghoul 21 10}
{NOTRAIT_UNIT 2 Ghoul 22 9}
{NOTRAIT_UNIT 2 Ghoul 23 10}
{NOTRAIT_UNIT 2 Ghoul 25 10}
{NOTRAIT_UNIT 2 Ghoul 26 9}
{NOTRAIT_UNIT 2 Ghoul 27 10}
{NOTRAIT_UNIT 2 Ghoul 30 9}
{NOTRAIT_UNIT 2 Ghoul 30 10}
{NOTRAIT_UNIT 2 Ghoul 29 11}
{NOTRAIT_UNIT 2 Ghoul 30 6}
{NOTRAIT_UNIT 2 Ghoul 29 6}
{NOTRAIT_UNIT 2 Ghoul 29 12}
{NOTRAIT_UNIT 2 Ghoul 29 13}
{NOTRAIT_UNIT 2 Ghoul 29 14}
{NOTRAIT_UNIT 2 Ghoul 29 15}
{NOTRAIT_UNIT 2 Ghoul 29 16}
{NOTRAIT_UNIT 2 Ghoul 29 18}
{NOTRAIT_UNIT 2 Ghoul 28 18}
{NOTRAIT_UNIT 2 Ghoul 27 19}
{NOTRAIT_UNIT 2 Ghoul 27 20}
{NOTRAIT_UNIT 2 Ghoul 26 21}
{NOTRAIT_UNIT 2 Ghoul 25 22}
{NOTRAIT_UNIT 2 Ghoul 25 23}
{NOTRAIT_UNIT 2 Ghoul 25 24}
{NOTRAIT_UNIT 2 Necrophage 25 25}
{NOTRAIT_UNIT 2 Necrophage 14 11}
{NOTRAIT_UNIT 2 Necrophage 18 10}
{NOTRAIT_UNIT 2 Necrophage 24 10}
{NOTRAIT_UNIT 2 Necrophage 30 8}
{NOTRAIT_UNIT 2 Necrophage 30 7}
{NOTRAIT_UNIT 2 Necrophage 29 17}
{NOTRAIT_UNIT 2 Necrophage 27 21}
{NOTRAIT_UNIT 2 Necrophage 24 21}
{NOTRAIT_UNIT 2 Necrophage 28 10}
{NOTRAIT_UNIT 2 Ghoul 15 11}
{NOTRAIT_UNIT 2 Ghoul 15 10}
{NOTRAIT_UNIT 2 Ghoul 16 9}
{NOTRAIT_UNIT 2 Ghoul 17 10}
{NOTRAIT_UNIT 2 Ghoul 19 10}
{NOTRAIT_UNIT 2 Ghoul 20 9}
{NOTRAIT_UNIT 2 Ghoul 21 10}
{NOTRAIT_UNIT 2 Ghoul 22 9}
{NOTRAIT_UNIT 2 Ghoul 23 10}
{NOTRAIT_UNIT 2 Ghoul 25 10}
{NOTRAIT_UNIT 2 Ghoul 26 9}
{NOTRAIT_UNIT 2 Ghoul 27 10}
{NOTRAIT_UNIT 2 Ghoul 30 9}
{NOTRAIT_UNIT 2 Ghoul 30 10}
{NOTRAIT_UNIT 2 Ghoul 29 11}
{NOTRAIT_UNIT 2 Ghoul 30 6}
{NOTRAIT_UNIT 2 Ghoul 29 6}
{NOTRAIT_UNIT 2 Ghoul 29 12}
{NOTRAIT_UNIT 2 Ghoul 29 13}
{NOTRAIT_UNIT 2 Ghoul 29 14}
{NOTRAIT_UNIT 2 Ghoul 29 15}
{NOTRAIT_UNIT 2 Ghoul 29 16}
{NOTRAIT_UNIT 2 Ghoul 29 18}
{NOTRAIT_UNIT 2 Ghoul 28 18}
{NOTRAIT_UNIT 2 Ghoul 27 19}
{NOTRAIT_UNIT 2 Ghoul 27 20}
{NOTRAIT_UNIT 2 Ghoul 26 21}
{NOTRAIT_UNIT 2 Ghoul 25 22}
{NOTRAIT_UNIT 2 Ghoul 25 23}
{NOTRAIT_UNIT 2 Ghoul 25 24}
{NOTRAIT_UNIT 2 Necrophage 25 25}
{NOTRAIT_UNIT 2 Necrophage 14 11}
{NOTRAIT_UNIT 2 Necrophage 18 10}
{NOTRAIT_UNIT 2 Necrophage 24 10}
{NOTRAIT_UNIT 2 Necrophage 30 8}
{NOTRAIT_UNIT 2 Necrophage 30 7}
{NOTRAIT_UNIT 2 Necrophage 29 17}
{NOTRAIT_UNIT 2 Necrophage 27 21}
{NOTRAIT_UNIT 2 Necrophage 24 21}
{NOTRAIT_UNIT 2 Necrophage 28 10}
# wmllint: recognize Necrophage
[message]
description=Necrophage

View file

@ -22,6 +22,7 @@
{DEFENSE_ANIM "units/dwarves/sentinel-defend.png" "units/dwarves/sentinel.png" {SOUND_LIST:DWARF_HIT} }
[defense]
grassland=60
road=60
forest=60
sand=60
mountains=40

View file

@ -21,6 +21,7 @@
{DEFENSE_ANIM "units/dwarves/stalwart-defend.png" "units/dwarves/stalwart.png" {SOUND_LIST:DWARF_HIT} }
[defense]
grassland=60
road=60
forest=60
sand=60
mountains=40

View file

@ -22,6 +22,7 @@
{DEFENSE_ANIM "units/nagas/myrmidon-defend.png" "units/nagas/myrmidon.png" {SOUND_LIST:NAGA_HIT} }
[defense]
grassland=50
road=50
sand=40
[/defense]
[attack]

View file

@ -21,6 +21,7 @@
{DEFENSE_ANIM "units/nagas/warrior-defend.png" "units/nagas/warrior.png" {SOUND_LIST:NAGA_HIT} }
[defense]
grassland=60
road=60
sand=50
[/defense]
[attack]

View file

@ -522,6 +522,8 @@ def validate_on_pop(tagstack, closer, filename, lineno):
# to deserialize an empty unit.
if closer == "side" and "type" not in attributes and ("no_leader" not in attributes or attributes["no_leader"] != "yes") and "multiplayer" not in ancestors:
print '"%s", line %d: [side] without type attribute' % (filename, lineno)
if closer in ('movement_costs', 'defense') and 'grassland' in attributes and 'road' not in attributes:
print '"%s", line %d: [%s] without road attribute' % (filename, lineno, closer)
def within(tag):
"Did the specified tag lead one of our enclosing contexts?"