changed war focus name to combat

because it makes far fore more sense