Finished refactoring combat to work with (de)buffs and vulnerabilities
and resistances. Some bugs remain.