From 38cee7a5098ed1c6e6920df98370128a28df8e06 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Fri, 20 Nov 2009 00:28:53 -0600 Subject: Fix the last missing instances of the unclean/chaotic split. --- crawl-ref/source/attitude-change.cc | 12 ++++++------ crawl-ref/source/attitude-change.h | 2 +- crawl-ref/source/mon-place.cc | 2 +- crawl-ref/source/religion.cc | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index 27b71ecfcf..fcfcf2d2a9 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -230,24 +230,24 @@ bool unholy_and_evil_beings_attitude_change() return (apply_to_all_dungeons(_unholy_and_evil_beings_on_level_attitude_change)); } -static bool _chaotic_beings_on_level_attitude_change() +static bool _unclean_and_chaotic_beings_on_level_attitude_change() { bool success = false; for (monster_iterator mi; mi; ++mi) { - if (!mi->is_chaotic()) + if (!mi->is_unclean() && !mi->is_chaotic()) continue; #ifdef DEBUG_DIAGNOSTICS - mprf(MSGCH_DIAGNOSTICS, "Chaotic attitude changing: %s on level %d, branch %d", + mprf(MSGCH_DIAGNOSTICS, "Unclean/chaotic attitude changing: %s on level %d, branch %d", mi->name(DESC_PLAIN).c_str(), static_cast(you.your_level), static_cast(you.where_are_you)); #endif // If you worship Zin, you make all friendly and good neutral - // chaotic beings hostile. + // unclean and chaotic beings hostile. if (you.religion == GOD_ZIN && mi->wont_attack()) { mi->attitude = ATT_HOSTILE; @@ -261,9 +261,9 @@ static bool _chaotic_beings_on_level_attitude_change() return (success); } -bool chaotic_beings_attitude_change() +bool unclean_and_chaotic_beings_attitude_change() { - return (apply_to_all_dungeons(_chaotic_beings_on_level_attitude_change)); + return (apply_to_all_dungeons(_unclean_and_chaotic_beings_on_level_attitude_change)); } static bool _spellcasters_on_level_attitude_change() diff --git a/crawl-ref/source/attitude-change.h b/crawl-ref/source/attitude-change.h index c422ac9a7c..4a52730aed 100644 --- a/crawl-ref/source/attitude-change.h +++ b/crawl-ref/source/attitude-change.h @@ -8,7 +8,7 @@ void beogh_follower_convert(monsters *monster, bool orc_hit = false); void slime_convert(monsters *monster); bool holy_beings_attitude_change(); bool unholy_and_evil_beings_attitude_change(); -bool chaotic_beings_attitude_change(); +bool unclean_and_chaotic_beings_attitude_change(); bool spellcasters_attitude_change(); bool yred_slaves_abandon_you(); bool beogh_followers_abandon_you(); diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc index de6b5718e8..4dbd5957a8 100644 --- a/crawl-ref/source/mon-place.cc +++ b/crawl-ref/source/mon-place.cc @@ -2697,7 +2697,7 @@ bool player_will_anger_monster(monsters *mon, bool *holy, const bool isUnholy = (is_evil_god(you.religion) && mon->is_holy()); const bool isLawful = - (you.religion == GOD_ZIN && mon->is_chaotic()); + (you.religion == GOD_ZIN && (mon->is_unclean() || mon->is_chaotic())); const bool isAntimagical = (you.religion == GOD_TROG && mon->is_actual_spellcaster()); diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 86225c5dd2..ef41b8e9fb 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -5013,14 +5013,14 @@ void god_pitch(god_type which_god) // When you start worshipping a good god, you make all non-hostile // unholy and evil beings hostile; when you start worshipping Zin, - // you make all non-hostile chaotic beings hostile; and when you - // start worshipping Trog, you make all non-hostile magic users - // hostile. + // you make all non-hostile unclean and chaotic beings hostile; and + // when you start worshipping Trog, you make all non-hostile magic + // users hostile. if (is_good_god(you.religion) && unholy_and_evil_beings_attitude_change()) mpr("Your unholy and evil allies forsake you.", MSGCH_MONSTER_ENCHANT); - if (you.religion == GOD_ZIN && chaotic_beings_attitude_change()) - mpr("Your chaotic allies forsake you.", MSGCH_MONSTER_ENCHANT); + if (you.religion == GOD_ZIN && unclean_and_chaotic_beings_attitude_change()) + mpr("Your unclean and chaotic allies forsake you.", MSGCH_MONSTER_ENCHANT); else if (you.religion == GOD_TROG && spellcasters_attitude_change()) mpr("Your magic-using allies forsake you.", MSGCH_MONSTER_ENCHANT); -- cgit v1.2.3-54-g00ecf