improve test for attrib::nexttype correctness.
Bug 2032: rename FIGHT back to COMBAT
Merge pull request #45 from badgerman/master

Bug 2032: Rename FIGHT -> COMBAT, again