From 26f4800dbef2e4fe0ed7b820c848827cbfc35b76 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 24 Mar 2008 02:08:24 +0000 Subject: Since it's difficult to display TSO's halo-fading messages at the right times (since e.g. old piety is lost on excommunication), just remove the halo silently. The fact that you're no longer glowing should be evidence enough. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3848 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/religion.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'crawl-ref/source/religion.cc') diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index ca060dbc78..a4aeb10da9 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -468,12 +468,9 @@ void inc_penance(god_type god, int val) // orcish bonuses don't apply under penance if (god == GOD_BEOGH) you.redraw_armour_class = true; - // nor does TSO's halo or divine shield + // nor does TSO's halo (which silently fades) or divine shield else if (god == GOD_SHINING_ONE) { - if (you.piety >= piety_breakpoint(0)) - mpr("Your divine halo starts to fade."); - if (you.duration[DUR_DIVINE_SHIELD]) { mpr("Your divine shield disappears!"); @@ -2392,12 +2389,6 @@ void lose_piety(int pgn) } } - if (you.religion == GOD_SHINING_ONE) - { - if (i == 0) - mpr("Your divine halo starts to fade."); - } - if ( need_water_walking() && !beogh_water_walk() ) { fall_into_a_pool( you.x_pos, you.y_pos, true, @@ -4271,7 +4262,7 @@ void god_pitch(god_type which_god) // Are you switching between good gods? const bool good_god_switch = is_good_god(you.religion) && is_good_god(which_god); - + // Leave your prior religion first. if (you.religion != GOD_NO_GOD) excommunication(which_god); -- cgit v1.2.3-54-g00ecf