diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-13 14:19:42 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-13 14:19:42 +0000 |
| commit | 1572e9c9223b1b45eada6fec2e1a82eb6950ebfd (patch) | |
| tree | 722a3bd7d205b8ade2d81b39e5c68ddf77c7c099 /crawl-ref/source/describe.cc | |
| parent | 71c47c6d4e6a0b05f439f08dfabf6a83f481fa2f (diff) | |
| download | crawl-ref-1572e9c9223b1b45eada6fec2e1a82eb6950ebfd.tar.gz crawl-ref-1572e9c9223b1b45eada6fec2e1a82eb6950ebfd.zip | |
Added several new tutorial triggers including information on being caught
in a net, specific skills, magic resistance, and which stat to choose.
In a given game you'll only ever see a small fraction of all tutorial
events (we're at 71 now, and some of them are exclusive). In fact, a lot
of the information is so generally useful (esp. on gods, skills and items)
that I'm seriously considering opening up the general information (How do I
use item x? What does Spellcasting do?) to a wider selection of characters.
I don't think we'll want to explain the intricacies of Mummies, Ghouls,
or Vampires, but a lot of this stuff even applies to them... (If we
overhaul the tutorial, it's certainly not a 0.4 target, though.)
Resetting the tutorial version to 8 as we somehow switched from digital
version to binary and back to digital. It will take some time until we
actually reach 110, and by then, I am sure the base files won't be save
compatible anymore. :)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5777 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 120f9de79c..379ca1f684 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1641,7 +1641,7 @@ std::string get_item_description( const item_def &item, bool verbose, break; // intentional fall-through case OBJ_FOOD: - if (item.sub_type == FOOD_CHUNK) + if (item.base_type == OBJ_CORPSES || item.sub_type == FOOD_CHUNK) { if (food_is_rotten(item)) { @@ -1682,13 +1682,14 @@ std::string get_item_description( const item_def &item, bool verbose, case CE_CONTAMINATED: if (player_mutation_level(MUT_SAPROVOROUS) < 3) { - description << "$$Chunks like this may occasionally cause " + description << "$$Meat like this may occasionally cause " "sickness."; } break; default: break; } + if (is_good_god(you.religion) && is_player_same_species(item.plus) || you.religion == GOD_ZIN && mons_intel(item.plus) >= I_NORMAL) |