Adjust NPC types and WARRIOR graphics, etc.

Removed a couple of NPC types, adjusted the weapon portion of the
WARRIOR graphic, and rearranged some of the NPC graphics code in
general. Also deleted the already commented-out function
"get_midair_center_point".