Updated C4 to use new avoidable damage system

Updated C4 to use more flexible avoidable damage system