Restore Nym's skirmisher ability.

data/campaigns/Under_the_Burning_Suns/units/Nym.cfg

@@ -24,6 +24,7 @@
     alignment=lawful
     usage=mixed fighter
     die_sound={SOUND_LIST:ELF_FEMALE_HIT}
+    {DEFENSE_ANIM "units/elves-desert/nym-defend.png" units/elves-desert/nym.png {SOUND_LIST:ELF_FEMALE_HIT} }
     [attack]
         name=sword
         description= _"sword"
@@ -44,10 +45,6 @@
             {WEAPON_SPECIAL_SLOW}
         [/specials]
     [/attack]
-#enddef
-
-#define NYM_ANIMATIONS
-    {DEFENSE_ANIM "units/elves-desert/nym-defend.png" units/elves-desert/nym.png {SOUND_LIST:ELF_FEMALE_HIT} }
     [attack_anim]
         [filter_attack]
             name=bolas
@@ -137,7 +134,6 @@
     advances_to=Nym Sentinel
     race=elf
     {NYM_BASE 30 42 1 5 4}
-    {NYM_ANIMATIONS}
 [/unit_type]
 
 [unit_type]
@@ -148,7 +144,9 @@
     advances_to=Nym Prowler
     race=elf
     {NYM_BASE 44 84 2 7 8}
-    {NYM_ANIMATIONS}
+    [abilities]
+        {ABILITY_SKIRMISHER}
+    [/abilities]
 [/unit_type]
 
 [unit_type]
@@ -160,5 +158,7 @@
     advances_to=null
     race=elf
     {NYM_BASE 66 150 3 9 12}
-    {NYM_ANIMATIONS}
+    [abilities]
+        {ABILITY_SKIRMISHER}
+    [/abilities]
 [/unit_type]

data/tools/wmllint

@@ -369,6 +369,7 @@ def sanity_check(filename, lines):
             notes = []
             has_special_notes = False
             in_unit_type = nav.lineno+1
+            hitpoints_specified = False
             continue
         elif nav.element == "[/unit_type]":
             #print '"%s", %d: unit has traits %s and notes %s' \
@@ -388,6 +389,11 @@ def sanity_check(filename, lines):
                         missing_traits.append(nt)
                 if (notes or traits) and not has_special_notes:
                     missing_notes = ["{SPECIAL_NOTES}"] + missing_notes
+                # If the unit didn't specify hitpoints, there is some wacky
+                # stuff going on (possibly psedo-[base_unit] behavior via
+                # macro generation) so disable some of the consistency checks.
+                if not hitpoints_specified:
+                    continue
                 if missing_notes:
                     print '"%s", line %d: unit %s is missing notes +%s' \
                           % (filename, in_unit_type, unit_id, "+".join(missing_notes))
@@ -418,6 +424,8 @@ def sanity_check(filename, lines):
                         unit_types.append(unit_id)
                     if not base_unit and "[base_unit]" in nav.ancestors():
                         base_unit = value
+                elif key == "hitpoints":
+                    hitpoints_specified = True
                 elif key == "usage":
                     assert(unit_id)
                     usage[unit_id] = value