Refactored warlock cards

Fixes some bugs when card_lookup tries to find these cards.