summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-chimera.cc
diff options
context:
space:
mode:
authorPete Hurst <pete@streamuniverse.tv>2013-06-24 23:24:53 +0100
committerPete Hurst <pete@streamuniverse.tv>2013-06-24 23:24:53 +0100
commit1da42668075a587b5dfe618a458b01bb9bacc356 (patch)
tree32bfc1d7749aebb6f19141e7c0f585b93cdd90d9 /crawl-ref/source/mon-chimera.cc
parent2dedd9c6207047427a2cb7f27084428891b70b4d (diff)
downloadcrawl-ref-1da42668075a587b5dfe618a458b01bb9bacc356.tar.gz
crawl-ref-1da42668075a587b5dfe618a458b01bb9bacc356.zip
Give chimera proper AC/EV
Previously it was taking the (dummy) AC/EV from the MONS_CHIMERA base class. Now it takes it from the first part and possibly the EV from spider legs.
Diffstat (limited to 'crawl-ref/source/mon-chimera.cc')
-rw-r--r--crawl-ref/source/mon-chimera.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-chimera.cc b/crawl-ref/source/mon-chimera.cc
index 35aba3601f..497715a1d4 100644
--- a/crawl-ref/source/mon-chimera.cc
+++ b/crawl-ref/source/mon-chimera.cc
@@ -142,14 +142,19 @@ static void apply_chimera_part(monster* mon, monster_type part, int partnum)
if (dummy.is_jumpy()
|| (dummy.can_cling_to_walls() && !mon->props.exists("chimera_legs")))
{
+ mon->ev == dummy.ev;
mon->props["chimera_legs"].get_int() = partnum;
}
// Apply spells but only for 2nd and 3rd parts since 1st part is
// already supported by the original define_monster call
if (partnum == 1)
+ {
+ // Always AC/EV on the first part
+ mon->ac == dummy.ac;
+ mon->ev == dummy.ev;
return;
-
+ }
// Make sure resulting chimera can use spells
// TODO: Spell usage might still be a bit of a mess, especially with
// things like human/animal hybrids. Could perhaps do with some kind