diff options
| author | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
|---|---|---|
| committer | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
| commit | 2057b86a740fdaf7c9879ee9c9bd7dd296685c73 (patch) | |
| tree | c1d9b88b860230dce07aa81a1ecd3a0b6c5917a1 /crawl-ref/source/tilepick-p.cc | |
| parent | 65c58ed6ccd53a9a080255ee37e131123ac65e96 (diff) | |
| parent | e7b95c8c9b3bd68a43ba0da89221226cd41dcc80 (diff) | |
| download | crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.tar.gz crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.zip | |
Merge branch 'master' into dwants
Conflicts:
crawl-ref/source/dat/des/variable/mini_monsters.des
crawl-ref/source/enum.h
crawl-ref/source/itemprop.cc
crawl-ref/source/main.cc
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/newgame.cc
crawl-ref/source/ng-restr.cc
crawl-ref/source/rltiles/dc-player.txt
crawl-ref/source/spl-selfench.cc
crawl-ref/source/throw.cc
crawl-ref/source/tilepick-p.cc
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/tilepick-p.cc')
| -rw-r--r-- | crawl-ref/source/tilepick-p.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index 3839464766..79a15b279d 100644 --- a/crawl-ref/source/tilepick-p.cc +++ b/crawl-ref/source/tilepick-p.cc @@ -42,7 +42,7 @@ tileidx_t tilep_equ_weapon(const item_def &item) } if (item.base_type == OBJ_RODS) - return _mon_mod(TILEP_HAND1_ROD_BROWN, item.rnd); + return _mon_mod(TILEP_HAND1_ROD_FIRST, item.rnd); if (item.base_type == OBJ_MISCELLANY) { @@ -756,7 +756,7 @@ void tilep_race_default(int sp, int level, dolls_data *doll) hair = 0; break; case SP_TROLL: - hair = 0; + hair = TILEP_HAIR_TROLL; break; case SP_BASE_DRACONIAN: case SP_RED_DRACONIAN: @@ -786,8 +786,9 @@ void tilep_race_default(int sp, int level, dolls_data *doll) result = you.fishtail ? TILEP_BASE_MERFOLK_WATER : TILEP_BASE_MERFOLK; hair = TILEP_HAIR_GREEN; - beard = TILEP_BEARD_SHORT_GREEN; break; + case SP_NAGA: + hair = TILEP_HAIR_PART2_RED; case SP_VAMPIRE: hair = TILEP_HAIR_ARWEN; break; @@ -815,6 +816,9 @@ void tilep_race_default(int sp, int level, dolls_data *doll) / ANTENNAE_EXTEND_TIME); } break; + case SP_DJINNI: + hair = TILEP_HAIR_DJINN2; + break; default: // nothing to do break; @@ -1093,6 +1097,7 @@ void tilep_calc_flags(const dolls_data &doll, int flag[]) flag[TILEP_PART_BOOTS] = TILEP_FLAG_HIDE; flag[TILEP_PART_LEG] = TILEP_FLAG_HIDE; flag[TILEP_PART_SHADOW] = TILEP_FLAG_HIDE; + flag[TILEP_PART_BODY] = TILEP_FLAG_CUT_NAGA; // Do they need their own flag? } else if (doll.parts[TILEP_PART_BASE] >= TILEP_BASE_DRACONIAN_FIRST && doll.parts[TILEP_PART_BASE] <= TILEP_BASE_DRACONIAN_LAST) |