diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-06-13 19:26:13 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-06-13 19:27:00 +0100 |
| commit | c271eae8558a0457b7fe8865c1ccba8503030758 (patch) | |
| tree | 46dabe4ee43dac355cb04e1c6bfb0e28a6710d92 /crawl-ref/source/monster.cc | |
| parent | fb6485e608f093954707c56fbd04560e5022df4e (diff) | |
| download | crawl-ref-c271eae8558a0457b7fe8865c1ccba8503030758.tar.gz crawl-ref-c271eae8558a0457b7fe8865c1ccba8503030758.zip | |
Make spriggan riders ride wasps instead of mosquitos
Since mixing holinesses on a single monster has some weird results.
Diffstat (limited to 'crawl-ref/source/monster.cc')
| -rw-r--r-- | crawl-ref/source/monster.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index f0f974e9b0..a7bb804664 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -3466,10 +3466,6 @@ bool monster::is_evil(bool check_spells) const return true; } - // They ride on top of evil monsters. - if (type == MONS_SPRIGGAN_RIDER) - return true; - return false; } @@ -5837,7 +5833,7 @@ void monster::react_to_damage(const actor *oppressor, int damage, if (!fly_died) monster_drop_things(this, mons_aligned(oppressor, &you)); - type = fly_died ? MONS_SPRIGGAN : MONS_VAMPIRE_MOSQUITO; + type = fly_died ? MONS_SPRIGGAN : MONS_YELLOW_WASP; define_monster(this); hit_points = min(old_hp, hit_points); flags = old_flags; @@ -5848,7 +5844,7 @@ void monster::react_to_damage(const actor *oppressor, int damage, if (!old_name.empty()) mname = old_name; - mounted_kill(this, fly_died ? MONS_VAMPIRE_MOSQUITO : MONS_SPRIGGAN, + mounted_kill(this, fly_died ? MONS_YELLOW_WASP : MONS_SPRIGGAN, !oppressor ? KILL_MISC : (oppressor->is_player()) ? KILL_YOU : KILL_MON, |