summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-chimera.cc
diff options
context:
space:
mode:
authorPete Hurst <pete@streamuniverse.tv>2013-06-23 03:34:47 +0100
committerPete Hurst <pete@streamuniverse.tv>2013-06-23 03:34:47 +0100
commitc8ffa77dd4fada4dd85c5007889014b8c295b204 (patch)
tree16dda641ad17e56e5107dff82f3be484fcc86aca /crawl-ref/source/mon-chimera.cc
parent1bc6fd00ee49aee610d6ca9654457aa5969819c5 (diff)
downloadcrawl-ref-c8ffa77dd4fada4dd85c5007889014b8c295b204.tar.gz
crawl-ref-c8ffa77dd4fada4dd85c5007889014b8c295b204.zip
Let chimera wings affect its speed
If parts 2 or 3 have wings, take an average of the winged monster's speed and the base monster's speed.
Diffstat (limited to 'crawl-ref/source/mon-chimera.cc')
-rw-r--r--crawl-ref/source/mon-chimera.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-chimera.cc b/crawl-ref/source/mon-chimera.cc
index 4819c4cab7..ec7ed07dcb 100644
--- a/crawl-ref/source/mon-chimera.cc
+++ b/crawl-ref/source/mon-chimera.cc
@@ -50,6 +50,13 @@ void define_chimera(monster* mon, monster_type parts[])
apply_chimera_part(mon,parts[0],1);
apply_chimera_part(mon,parts[1],2);
apply_chimera_part(mon,parts[2],3);
+
+ // If one part has wings, take an average of base speed and the
+ // speed of the winged monster.
+ monster_type wings = get_chimera_wings(mon);
+ if (wings != MONS_NO_MONSTER && wings != parts[0])
+ mon->speed = (mons_class_base_speed(parts[0])
+ + mons_class_base_speed(wings))/2;
}
// Randomly pick depth-appropriate chimera parts