diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-16 17:11:06 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-16 17:11:06 +0000 |
| commit | b8ba267261e0586c01fad1c5f280d1fd16cd44ca (patch) | |
| tree | dad33a9139ffe9c7bba93005f95f053e8a939340 /crawl-ref/source/player.cc | |
| parent | 5a01c6b4c075124a30e6ede371ba74bc58b504f8 (diff) | |
| download | crawl-ref-b8ba267261e0586c01fad1c5f280d1fd16cd44ca.tar.gz crawl-ref-b8ba267261e0586c01fad1c5f280d1fd16cd44ca.zip | |
FR 1836617: Add item brand for plants (and mimics) in Tiles.
FR 1870291: Give a message when gaining exp for killing monsters
outside LOS.
(This is something the player can find out by checking
their xp pool, anyway, so it's not like it gives
anything away. Currently does not happen for pet kills,
should it?)
Implement 1829910: Make Daevas fully resist negative energy, with the
reasoning that TSO will protect them.
Also, fix dragon slaying to actually have an effect on draconian
players (whoops!) as well as on characters in Dragon Form.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3282 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 056ed3a3c2..1bf82f069e 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -164,7 +164,7 @@ bool move_player_to_grid( int x, int y, bool stepped, bool allow_shift, "onto" : "into"); prompt += " that "; prompt += feature_description(new_grid, trap_type_at_xy(x,y), - DESC_BASENAME, false); + false, DESC_BASENAME, false); prompt += '?'; // Zot traps require capital confirmation @@ -6067,6 +6067,9 @@ bool player::travelling_light() const int player::mons_species() const { + if (player_genus(GENPC_DRACONIAN)) + return (MONS_DRACONIAN); + switch (species) { case SP_HILL_ORC: @@ -6074,6 +6077,7 @@ int player::mons_species() const case SP_HIGH_ELF: case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: return (MONS_ELF); + default: return (MONS_HUMAN); } |