diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-19 14:08:58 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-19 14:08:58 +0000 |
| commit | 9cce2935d8da7147bebe3d4aeb4a4283b779f798 (patch) | |
| tree | f3064a5c4daf169919d8e4b0335abfbd76bd05a0 /crawl-ref/source/acr.cc | |
| parent | 6a93b55183ada2559d026ae0dd57a295ae1807f4 (diff) | |
| download | crawl-ref-9cce2935d8da7147bebe3d4aeb4a4283b779f798.tar.gz crawl-ref-9cce2935d8da7147bebe3d4aeb4a4283b779f798.zip | |
A number of tutorial improvements, including reintroducing info on spellbooks.
Also:
Fix 1832819. (Horn mutation not making helmet slot show as "restricted")
Fix 1831983. (Autobutcher now ignores weapons inscribed with !w)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2872 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index cb5995b75f..5127bb33a6 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1279,15 +1279,19 @@ static void input() { tutorial_healing_reminder(); } - else if (!you.running && - Options.tutorial_events[TUT_SHIFT_RUN] && - you.num_turns >= 200) + else if (!you.running + && Options.tutorial_events[TUT_SHIFT_RUN] + && you.num_turns >= 200 + && you.hp == you.hp_max + && you.magic_points == you.max_magic_points) { learned_something_new(TUT_SHIFT_RUN); } - else if (!you.running && - Options.tutorial_events[TUT_MAP_VIEW] && - you.num_turns >= 500) + else if (!you.running + && Options.tutorial_events[TUT_MAP_VIEW] + && you.num_turns >= 500 + && you.hp == you.hp_max + && you.magic_points == you.max_magic_points) { learned_something_new(TUT_MAP_VIEW); } |