reorganize player and NPC classes to inherit from a common parent, partially rework combat