Warlock Macro V0.2

Simplified first loop
Fixed comparisons