diff options
| author | ontoclasm <yokomeshi@gmail.com> | 2012-11-15 21:53:30 -0600 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-01-08 04:00:28 +0100 |
| commit | af44d5ed3a4f1c48834bbfd36d49d91f1bd6baca (patch) | |
| tree | 9ec758b44b62fd334b74436ea7d3d0c7f7895a3d /crawl-ref/source/tilepick-p.cc | |
| parent | fcc2f92457fd555194b11171c1901723fee421ea (diff) | |
| download | crawl-ref-af44d5ed3a4f1c48834bbfd36d49d91f1bd6baca.tar.gz crawl-ref-af44d5ed3a4f1c48834bbfd36d49d91f1bd6baca.zip | |
Lava orc tiles.
Diffstat (limited to 'crawl-ref/source/tilepick-p.cc')
| -rw-r--r-- | crawl-ref/source/tilepick-p.cc | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index 5fdba46998..0fca2d220b 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" @@ -492,8 +493,9 @@ tileidx_t tilep_species_to_base_tile(int sp, int level) case SP_HALFLING: return TILEP_BASE_HALFLING; case SP_HILL_ORC: - case SP_LAVA_ORC: // Intentional fallthrough... for now. return TILEP_BASE_ORC; + case SP_LAVA_ORC: + return TILEP_BASE_LAVA_ORC; case SP_KOBOLD: return TILEP_BASE_KOBOLD; case SP_MUMMY: @@ -590,7 +592,34 @@ void tilep_race_default(int sp, int level, dolls_data *doll) beard = TILEP_BEARD_FULL_RED; break; 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: |