Let draconians grow up.

They will now be able to mature into whatever drac type they can
(i.e. white scorchers will still be disallowed) upon reaching the
appropriate HD. The goal is mostly to make draconian mercenaries
more attractive, since if they can survive they can become rather
strong.

1 files changed, 13 insertions, 5 deletions

diff --git a/crawl-ref/source/mon-grow.cc b/crawl-ref/source/mon-grow.cc
index 63e75cdf9c..0a3ae59e7a 100644
--- a/crawl-ref/source/mon-grow.cc
+++ b/crawl-ref/source/mon-grow.cc
@@ -97,14 +97,19 @@ static const monster_level_up *_monster_level_up_target(monster_type type,
 {
     for (unsigned i = 0; i < ARRAYSZ(mon_grow); ++i)
     {
-        const monster_level_up &mlup(mon_grow[i]);
-        if (mlup.before == type)
+        const monster_level_up *mlup = &mon_grow[i];
+        // XXX: A hack to let draconians level up wihout specifying every
+        // single possible combination.
+        bool upgrade_drac = mons_is_base_draconian(type);
+        if (mlup->before == type || upgrade_drac)
         {
-            const monsterentry *me = get_monster_data(mlup.after);
+            if (upgrade_drac)
+               mlup = new monster_level_up(type, resolve_monster_type(RANDOM_NONBASE_DRACONIAN, type));
+            const monsterentry *me = get_monster_data(mlup->after);
             if (static_cast<int>(me->hpdice[0]) == hit_dice
-                && x_chance_in_y(mlup.chance, 1000))
+                && x_chance_in_y(mlup->chance, 1000))
             {
-                return &mlup;
+                return mlup;
             }
         }
     }
@@ -114,6 +119,9 @@ static const monster_level_up *_monster_level_up_target(monster_type type,
 void monster::upgrade_type(monster_type after, bool adjust_hd,
                             bool adjust_hp)
 {
+    // Needed for draconians growing into non-base ones.
+    base_monster = type;
+
     const monsterentry *orig = get_monster_data(type);
     // Ta-da!
     type   = after;