diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-13 15:57:55 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-13 15:57:55 +0000 |
| commit | e6525c83826d150eb2a283ce5bf23218cb75f82e (patch) | |
| tree | b16a09028c1468efa825975fb1e85a3e4d722bf5 /crawl-ref/source/food.cc | |
| parent | 674a9e64697629cc3266564ea4f8dc7eb2616b50 (diff) | |
| download | crawl-ref-e6525c83826d150eb2a283ce5bf23218cb75f82e.tar.gz crawl-ref-e6525c83826d150eb2a283ce5bf23218cb75f82e.zip | |
* Add Cannibalism to list of forbidded actions for good gods.
* Add simple warning message (god "did not appreciate that!")
when using unID'd items that would otherwise be penalized.
* Change protection from harm to be independent of prayer.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2849 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 3ee75ea83d..43d8e18915 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -55,7 +55,7 @@ #include "xom.h" static int determine_chunk_effect(int which_chunk_type, bool rotten_chunk); -static void eat_chunk( int chunk_effect ); +static void eat_chunk( int chunk_effect, bool cannibal ); static void eating(unsigned char item_class, int item_type); static void describe_food_change(int hunger_increment); static bool food_change(bool suppress_message); @@ -670,13 +670,14 @@ void eat_from_inventory(int which_inventory_slot) // this is a bit easier to read... most compilers should // handle this the same -- bwr const int mons_type = you.inv[ which_inventory_slot ].plus; + const bool cannibal = is_player_same_species(mons_type); const int chunk_type = mons_corpse_effect( mons_type ); const bool rotten = (you.inv[which_inventory_slot].special < 100); if (!prompt_eat_chunk(you.inv[which_inventory_slot], rotten)) return; - eat_chunk( determine_chunk_effect( chunk_type, rotten ) ); + eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal ); } else { @@ -718,10 +719,11 @@ void eat_floor_item(int item_link) else if (mitm[item_link].sub_type == FOOD_CHUNK) { const int chunk_type = mons_corpse_effect( mitm[item_link].plus ); + const bool cannibal = is_player_same_species( mitm[item_link].plus ); const bool rotten = (mitm[item_link].special < 100); if (!prompt_eat_chunk(mitm[item_link], rotten)) return; - eat_chunk( determine_chunk_effect( chunk_type, rotten ) ); + eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal ); } else { @@ -854,7 +856,7 @@ static void say_chunk_flavour(bool likes_chunks) // never called directly - chunk_effect values must pass // through food::determine_chunk_effect() first {dlb}: -static void eat_chunk( int chunk_effect ) +static void eat_chunk( int chunk_effect, bool cannibal ) { bool likes_chunks = (you.omnivorous() || @@ -936,6 +938,9 @@ static void eat_chunk( int chunk_effect ) } } + if (cannibal) + did_god_conduct( DID_CANNIBALISM, 10 ); + if (do_eat) { start_delay( DELAY_EAT, 2, (suppress_msg) ? 0 : nutrition ); |