Simplify spell script further by handling threat and combat in script even