added placeholder reset function for combatant and fixed typo where NPC passed npc:false to Combatant