diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-22 15:11:32 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-22 15:11:32 +0000 |
| commit | af45612708d4fddee3ec3a5d31053624d7658c1a (patch) | |
| tree | 2b4b27bd20d7e2ce382cc1175e8d76666cfe1906 /crawl-ref/source/player.cc | |
| parent | f00872b7a53d4b7d0aa8eb8b769f88b9abe5f830 (diff) | |
| download | crawl-ref-af45612708d4fddee3ec3a5d31053624d7658c1a.tar.gz crawl-ref-af45612708d4fddee3ec3a5d31053624d7658c1a.zip | |
* Fix Sif Muna occasionally gifting manuals.
* Change innate gourmand eating behaviour to MUT_GOURMAND (innate only).
* Only bother prompting to eat chunks if the player has the gourmand mutation
or the carnivorous mutation at level 3, or is wearing an amulet of the
gourmand or an unidentified amulet.
* Remove gourmand behaviour from Ogres, i.e. only Trolls get the
mutation.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9149 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index f5eee7b98a..2bf3a2170f 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1294,7 +1294,8 @@ bool player_can_smell() bool player_likes_chunks() { - return (you.omnivorous() || player_mutation_level(MUT_CARNIVOROUS) > 0); + return (player_mutation_level(MUT_GOURMAND) + || player_mutation_level(MUT_CARNIVOROUS) > 0); } // If temp is set to false, temporary sources or resistance won't be counted. @@ -4401,7 +4402,7 @@ int player_mental_clarity(bool calc_unid, bool items) // from a non-amulet source. bool extrinsic_amulet_effect(jewellery_type amulet) { - switch ( amulet ) + switch (amulet) { case AMU_CONTROLLED_FLIGHT: return (you.duration[DUR_CONTROLLED_FLIGHT] @@ -4424,7 +4425,7 @@ bool wearing_amulet(jewellery_type amulet, bool calc_unid) if (extrinsic_amulet_effect(amulet)) return (true); - if (you.equip[EQ_AMULET] == -1) + if (!player_wearing_slot(EQ_AMULET)) return (false); const item_def& amu(you.inv[you.equip[EQ_AMULET]]); @@ -6886,11 +6887,6 @@ bool player::slowable() const return (!wearing_amulet(AMU_RESIST_SLOW)); } -bool player::omnivorous() const -{ - return (species == SP_TROLL || species == SP_OGRE); -} - flight_type player::flight_mode() const { if (attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON |