Rename and change combat model association
Interface combat entity, update test
Recount heal done
Fix effect value matcher