Added Weapon Categories

Enums change to be English.  The NPC change is a test for enum casting
and toString().  (They work).