Edited Combat System to support future changes