diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-06 13:37:03 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-06 13:37:52 -0600 |
| commit | f858cfc60235a5cfb86dd2a2c510dde5e130a4bf (patch) | |
| tree | d961eaf5b7122e52a9250e3381d93b1e9c80c88b /crawl-ref/source/tutorial.cc | |
| parent | 79d8c3044d2bb75d7f1e8ebad5cf6e3692fb7605 (diff) | |
| download | crawl-ref-f858cfc60235a5cfb86dd2a2c510dde5e130a4bf.tar.gz crawl-ref-f858cfc60235a5cfb86dd2a2c510dde5e130a4bf.zip | |
Move checks for the berserk state into actor::berserk().
Diffstat (limited to 'crawl-ref/source/tutorial.cc')
| -rw-r--r-- | crawl-ref/source/tutorial.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 978ba69c17..c8d46ca4c3 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -1052,7 +1052,7 @@ void tutorial_healing_reminder() #endif "."; - if (you.religion == GOD_TROG && !you.duration[DUR_BERSERKER] + if (you.religion == GOD_TROG && !you.berserk() && !you.duration[DUR_EXHAUSTED] && you.hunger_state >= HS_SATIATED) { @@ -1276,7 +1276,7 @@ void tutorial_first_monster(const monsters &mon) if (mon.friendly()) learned_something_new(TUT_MONSTER_FRIENDLY, mon.pos()); - if (you.religion == GOD_TROG && !you.duration[DUR_BERSERKER] + if (you.religion == GOD_TROG && !you.berserk() && !you.duration[DUR_EXHAUSTED] && you.hunger_state >= HS_SATIATED && one_chance_in(4)) { @@ -2849,7 +2849,7 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc) "you come back, so you might want to use a different set of " "stairs when you return."; - if (you.religion == GOD_TROG && !you.duration[DUR_BERSERKER] + if (you.religion == GOD_TROG && !you.berserk() && !you.duration[DUR_EXHAUSTED] && you.hunger_state >= HS_SATIATED) { @@ -4524,7 +4524,7 @@ void tutorial_describe_monster(const monsters *mons) } } - if (mons->has_ench(ENCH_BERSERK)) + if (mons->berserk()) { ostr << "A berserking monster is bloodthirsty and fighting madly. " "Such a blood rage makes it particularly dangerous!\n\n"; @@ -4566,7 +4566,7 @@ void tutorial_describe_monster(const monsters *mons) { ostr << "This might be a good time to run away"; - if (you.religion == GOD_TROG && !you.duration[DUR_BERSERKER] + if (you.religion == GOD_TROG && !you.berserk() && !you.duration[DUR_EXHAUSTED] && you.hunger_state >= HS_SATIATED) { |