Renamed skilled_combatant to combatant_c.