Merge branch 'lava_orcs' into lava_djinn

Waiting for Grotesks and the Forest to go live!

1 files changed, 31 insertions, 0 deletions

diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc
index 1ac43cf715..5b6379f513 100644
--- a/crawl-ref/source/tilepick-p.cc
+++ b/crawl-ref/source/tilepick-p.cc
@@ -9,6 +9,7 @@
 #include "describe.h"
 #include "itemname.h"
 #include "itemprop.h"
+#include "mon-stuff.h"
 #include "player.h"
 #include "tiledef-player.h"
 #include "tiledef-unrand.h"
@@ -623,6 +624,8 @@ tileidx_t tilep_species_to_base_tile(int sp, int level)
         return TILEP_BASE_HALFLING;
     case SP_HILL_ORC:
         return TILEP_BASE_ORC;
+    case SP_LAVA_ORC:
+        return TILEP_BASE_LAVA_ORC;
     case SP_KOBOLD:
         return TILEP_BASE_KOBOLD;
     case SP_MUMMY:
@@ -723,6 +726,34 @@ void tilep_race_default(int sp, int level, dolls_data *doll)
         case SP_HILL_ORC:
             hair = 0;
             break;
+        case SP_LAVA_ORC:
+            // This should respect the player's choice of base tile, if possible.
+            switch (temperature_colour(you.temperature))
+            {
+                case LIGHTRED:
+                    result = TILEP_BASE_LAVA_ORC_HEAT + 5;
+                    break;
+                case RED:
+                    result = TILEP_BASE_LAVA_ORC_HEAT + 4;
+                    break;
+                case YELLOW:
+                    result = TILEP_BASE_LAVA_ORC_HEAT + 3;
+                    break;
+                case WHITE:
+                    result = TILEP_BASE_LAVA_ORC_HEAT + 2;
+                    break;
+                case LIGHTCYAN:
+                    result = TILEP_BASE_LAVA_ORC_HEAT + 1;
+                    break;
+                case LIGHTBLUE:
+                    result = TILEP_BASE_LAVA_ORC_HEAT;
+                    break;
+                default:
+                    result = TILEP_BASE_LAVA_ORC;
+                    break;
+            }
+            hair = 0;
+            break;
         case SP_KOBOLD:
             hair = 0;
             break;