From c5f83d2896c317b5dc34e010f4e3fcea3dd195b5 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Sat, 24 Feb 2007 14:09:06 +0000 Subject: We're not quite ready for engulfing monsters yet, changed AT_ENGULF to AT_HIT. Corrected command-line summary of the -macro option. Player aux unarmed was reusing the primary attack damage, fixed. Ghosts and pandemonium demons were getting 4 attacks where they should get only 1, fixed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@960 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mon-util.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/mon-util.cc') diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 2a74cef64b..e1c4f33fe7 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -633,7 +633,12 @@ mon_attack_def mons_attack_spec(const monsters *mons, int attk_number) attk_number = 0; if (mc == MONS_PLAYER_GHOST || mc == MONS_PANDEMONIUM_DEMON) - return mon_attack_def::attk(ghost.values[GVAL_DAMAGE]); + { + if (attk_number == 0) + return mon_attack_def::attk(ghost.values[GVAL_DAMAGE]); + else + return mon_attack_def::attk(0, AT_NONE); + } if (zombified) mc = mons_zombie_base(mons); -- cgit v1.2.3-54-g00ecf