Djinn: their life is magic.

HP and MP are unified as "essence".  Per elliptic's suggestion, 1MP=2EP,
to avoid chain-casting 30 Fire Storms (15 is still pretty good...).  If
that's not enough, the rate can be modified easily.

The display looks iffy with a two-line bar, having it in one line would
require shifting the HUD -- and that would require massive changes to HUD
code (long overdue, though).

Balancing the healer god (and I'm not talking about Elyvilon) is another
issue.  If messing with glow is not enough, perhaps MP gains should give
EP at 1:1 rather than 1:2?

1 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 94a6c98ab6..908390f8f1 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -473,11 +473,19 @@ void init_skill_order(void)
 void calc_hp()
 {
     you.hp_max = get_real_hp(true, false);
+    if (you.species == SP_DJINNI)
+        you.hp_max += get_real_mp(true);
     deflate_hp(you.hp_max, false);
 }
 
 void calc_mp()
 {
+    if (you.species == SP_DJINNI)
+    {
+        you.magic_points = you.max_magic_points = 0;
+        return calc_hp();
+    }
+
     you.max_magic_points = get_real_mp(true);
     you.magic_points = min(you.magic_points, you.max_magic_points);
     you.redraw_magic_points = true;