summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-util.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-11 01:38:10 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-11 01:38:10 +0100
commit3294e3da732ee0bc4e38573b6f26df1d44f56c7e (patch)
treed2c7358bf4ec3946ccbd76ee27fd88931972d024 /crawl-ref/source/mon-util.cc
parent9e885d6d1378b4053054d16d435c319997348d84 (diff)
downloadcrawl-ref-3294e3da732ee0bc4e38573b6f26df1d44f56c7e.tar.gz
crawl-ref-3294e3da732ee0bc4e38573b6f26df1d44f56c7e.zip
A blank "statue" monster, to be redefined by vaults.
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
-rw-r--r--crawl-ref/source/mon-util.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index d5b4a54201..e86602e9c9 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1081,6 +1081,14 @@ mon_attack_def mons_attack_spec(const monsters *mon, int attk_number)
attk.flavour = RANDOM_ELEMENT(flavours);
}
+ if (attk.flavour == AF_WEAP_ONLY)
+ {
+ if (mon->inv[MSLOT_WEAPON] != NON_ITEM) // not mon->weapon() !
+ attk.flavour = AF_PLAIN;
+ else
+ return (mon_attack_def::attk(0, AT_NONE));
+ }
+
// Slime creature attacks are multiplied by the number merged.
if (mon->type == MONS_SLIME_CREATURE && mon->number > 1)
attk.damage *= mon->number;