Merged PC and NPC combat models

fixes #140