Vajra Safahr (Remake for WDH)

Special Equipment. Vajra wields the Blackstaff, accounted for in her statistics. Roll 2d10 to determine how many charges the staff has remaining.

Magic Resistance. Vajra has advantage on saving throws against spells and other magical effects.

Staff Spells. While holding the blackstaff, Vajra can use an action to expend 1 or more of its charges to cast one of the following spells from it, using her spell save DC and spell attack bonus: cone of cold (5 charges), fireball (5th-level version, 5 charges), globe of invulnerability (6 charges), hold monster (5 charges), levitate (2 charges), lightning bolt (5th-level version, 5 charges), magic missile (1 charge), ray of enfeeblement (1 charge), or wall of force (5 charges).

Spellcasting. Vajra is a 18th-level spellcaster. Its spellcasting ability is Intelligence (spell save DC 18, +12 to hit with spell attacks). Vajra has the following Wizard spells prepared:
Cantrips (at will): Fire Bolt, Message, Prestidigitation, Mage Hand 
1st level (4 slots): Mage Armor, Thunderwave, Magic Missile, Detect Magic 
2nd level (3 slots): Misty Step, Mirror Image, Invisibility
3rd level (3 slots): Magic Circle, Fly, Sending
4th level (3 slots): Banishment, Fire Shield, Stoneskin
5th level (3 slots): Bigby's Hand, Geas, Telekinesis
6th level (1 slot): Globe of Invulnerability, Chain Lightning
7th level (1 slot): Prismatic Spray, Crown of Stars
8th level (1 slot):  Antimagic Field, Power Word Stun
9th level (1 slot): Invulnerability

Blackstaff. Melee Weapon Attack: +7 to hit, range 5 ft., 1 target. Hit: 5 (1d6 + 2) bludgeoning magic damage, or 6(1d8 + 2) bludgeoning magic damage when used with 2 hands. Vajra can expend 1 of the staff's charges to deal an extra 3 (1d6) force damage on a hit.