From ba244c786cc7085d9ea596b9fa4cded08e69c4de Mon Sep 17 00:00:00 2001 From: haranp Date: Sun, 1 Jul 2007 22:29:00 +0000 Subject: Ghosts/demons should have dig in slot 5 (misc2), not slot 4 (misc1.) Should fix 1743674: ghosts using dig as an offensive spell. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1711 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/ghost.cc | 8 ++++++-- crawl-ref/source/monstuff.cc | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc index 69de7c6d88..a31158bf59 100644 --- a/crawl-ref/source/ghost.cc +++ b/crawl-ref/source/ghost.cc @@ -203,7 +203,11 @@ void ghost_demon::init_random_demon() values[GVAL_SPELL_3]=RANDOM_ARRAY_ELEMENT(search_order_third); if (coinflip()) + { values[GVAL_SPELL_4]=RANDOM_ARRAY_ELEMENT(search_order_misc); + if ( values[GVAL_SPELL_4] == SPELL_DIG ) + values[GVAL_SPELL_4] = SPELL_NO_SPELL; + } if (coinflip()) values[GVAL_SPELL_5]=RANDOM_ARRAY_ELEMENT(search_order_misc); @@ -395,12 +399,12 @@ void ghost_demon::add_spells( ) values[ GVAL_SPELL_1 ] = search_first_list(SPELL_NO_SPELL); values[ GVAL_SPELL_2 ] = search_first_list(values[GVAL_SPELL_1]); values[ GVAL_SPELL_3 ] = search_second_list(SPELL_NO_SPELL); - values[ GVAL_SPELL_4 ] = search_third_list(SPELL_NO_SPELL); + values[ GVAL_SPELL_4 ] = search_third_list(SPELL_DIG); if (values[ GVAL_SPELL_4 ] == SPELL_NO_SPELL) values[ GVAL_SPELL_4 ] = search_first_list(SPELL_NO_SPELL); - values[ GVAL_SPELL_5 ] = search_first_list(values[GVAL_SPELL_4]); + values[ GVAL_SPELL_5 ] = search_third_list(values[GVAL_SPELL_4]); if (values[ GVAL_SPELL_5 ] == SPELL_NO_SPELL) values[ GVAL_SPELL_5 ] = search_first_list(values[GVAL_SPELL_4]); diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 7a7280f265..51cf2dea9f 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -3093,9 +3093,9 @@ static bool handle_spell( monsters *monster, bolt & beem ) && !one_chance_in(4)) { // Note: There should always be at least some chance we don't - // get here... even if the monster is on it's last HP. That + // get here... even if the monster is on its last HP. That // way we don't have to worry about monsters infinitely casting - // Healing on themselves (ie orc priests). + // Healing on themselves (e.g. orc priests). if (monster->behaviour == BEH_FLEE && ms_low_hitpoint_cast( monster, hspell_pass[5] )) { -- cgit v1.2.3-54-g00ecf