Djinni

Multiattack. The djinni makes three Scimitar or Storm Bolt attacks.

Scimitar. _Melee Weapon Attack:_ +9 to hit, reach 5 ft., one target. _Hit:_ 12 (2d6+5) slashing damage plus 14 (4d6) lightning damage or thunder damage (the djinni's choice).

Storm Bolt. _Ranged Spell Attack:_ +9 to hit, range 120 ft., one target. _Hit:_ 18 (3d8+5) lightning damage plus 7 (2d6) thunder damage.

Create Air Elemental (1/Day). The djinni magically creates one air-based Elemental of CR 5 or lower in an unoccupied space the djinni can see within 30 feet of it. The elemental acts as an ally of the djinni, obeying its spoken commands. The elemental remains for 1 hour, until the djinni dies, or until the djinni dismisses it as a bonus action.

Travel the Planes (1/Day). The djinni transports itself to a different plane of existence. This works like the plane shift spell, except it can affect only itself and can't use this action to banish an unwilling creature.

Create Whirlwind. The djinni creates whirlwinds of air around up to two creatures it can see within 60 feet of it. Each target must succeed on a DC 17 STR check or be restrained by a whirlwind. A creature, including the target, can take its action to free the restrained target by succeeding on a DC 17 STR check.<br>While at least one creature is restrained by one of these whirlwinds, the djinni can use this bonus action to move the whirlwind up to 30 feet, and the restrained target moves with it.

Genie Shape. The djinni magically transforms into a Medium cloud of sparkling, blue air or back into its bipedal form. Its statistics are the same in each form. Any equipment it is wearing or carrying transforms with it. It reverts to its bipedal form if it dies. The djinni can't use this bonus action to transform into its bipedal form while inside a Medium or smaller container.