Consolidated combat trait events

Also changed the flag "demoted" to "cte_demoted" to eliminate chance of
a collission ever happening