diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-19 00:05:50 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-19 00:05:50 -0700 |
| commit | 39358eb848675a5bb10cffc35a8b73543470f2b1 (patch) | |
| tree | 75901f260c9207c4d593652495d36c26659ae511 /crawl-ref/source/godconduct.cc | |
| parent | 20f17586caff37b9dc6f1d4d32abf6f9684a25ae (diff) | |
| download | crawl-ref-39358eb848675a5bb10cffc35a8b73543470f2b1.tar.gz crawl-ref-39358eb848675a5bb10cffc35a8b73543470f2b1.zip | |
Don't make TSO mad when attacking an illusion (RoboCicero)
Specifically, a Mara-spawned illusion of an angel.
Diffstat (limited to 'crawl-ref/source/godconduct.cc')
| -rw-r--r-- | crawl-ref/source/godconduct.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc index 701ad0b1c9..d6563156cf 100644 --- a/crawl-ref/source/godconduct.cc +++ b/crawl-ref/source/godconduct.cc @@ -1178,7 +1178,7 @@ void set_attack_conducts(god_conduct_trigger conduct[3], const monster* mon, _first_attack_was_unchivalric.set(midx); } - if (mon->is_holy()) + if (mon->is_holy() && !mon->is_illusion()) conduct[2].set(DID_ATTACK_HOLY, mon->hit_dice, known, mon); _first_attack_conduct.set(midx); |