Traits

Elemental Demise: If the djinni dies, its body disintegrates into a warm breeze, leaving behind only Equipment the djinni was wearing or carrying.

Innate Spellcasting: The djinni's Innate Spellcasting ability is Charisma (spell save DC 17, +9 to hit with spell attacks). It can innately cast the following Spells, requiring no material components:

• At will: Detect Evil and Good, Detect Magic, Thunderwave
• 3/day each: Create Food and Water (can create wine instead of water), Tongues, Wind Walk
• 1/day each: Conjure Elemental (air elemental only), Creation, Gaseous Form, Invisibility, Major Image, Plane Shift

Variant: Genie Powers: Genies have a variety of magical capabilities, including Spells. A few have even greater powers that allow them to alter their appearance or the Nature of reality.

Disguises.
Some genies can veil themselves in Illusion to pass as other similarly shaped creatures. Such genies can innately cast the Disguise Self spell at will, often with a longer Duration than is normal for that spell. Mightier genies can cast the True Polymorph spell one to three times per day, possibly with a longer Duration than normal. Such genies can change only their own shape, but a rare few can use the spell on other creatures and Objects as well.
Wishes.
The genie power to grant wishes is legendary among mortals. Only the most potent genies, such as those among the nobility, can do so. A particular genie that has this power can grant one to three wishes to a creature that isn't a genie. Once a genie has granted its limit of wishes, it can't grant wishes again for some amount of time (usually 1 year). and cosmic law dictates that the same genie can expend its limit of wishes on a specific creature only once in that creature's existence.
To be granted a wish, a creature within 60 feet of the genie states a desired effect to it. The genie can then cast the wish spell on the creature's behalf to bring about the effect. Depending on the genie's Nature, the genie might try to pervert the intent of the wish by exploiting the wish's poor wording. The perversion of the wording is usually crafted to be to the genie's benefit.

Actions

Multiattack: The djinni makes three Scimitar attacks.

Scimitar: Melee Weapon Attack: +9 to hit, reach 5 ft., one target. Hit: 12 (2d6 + 5) slashing damage plus 3 (1d6) lightning or thunder damage (djinni's choice).

Create Whirlwind: A 5-foot-radius, 30-foot-tall Cylinder of swirling air magically forms on a point the djinni can see within 120 feet of it. The Whirlwind lasts as long as the djinni maintains Concentration (as if concentrating on a spell). Any creature but the djinni that enters the Whirlwind must succeed on a DC 18 Strength saving throw or be Restrained by it. The djinni can move the Whirlwind up to 60 feet as an action, and creatures Restrained by the Whirlwind move with it. The Whirlwind ends if the djinni loses sight of it.
A creature can use its action to free a creature Restrained by the Whirlwind, including itself, by succeeding on a DC 18 Strength check. If the check succeeds, the creature is no longer Restrained and moves to the nearest space outside the Whirlwind.