Warlock: Changed condition for Abyssal and Doomguards
Warlock: Integrated WarlockCommon to prevent errors
Warlock: Cleaned imports and some code-style