diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/beam.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 9ce54bb120..cd12ea1dc0 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4442,9 +4442,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item) { if (YOU_KILL(beam.thrower) && hurt_final > 0) { - const bool okay = - (beam.aux_source == "reading a scroll of immolation" - && !beam.effect_known); + const bool okay = !beam.effect_known; if (is_sanctuary(mon->x, mon->y) || is_sanctuary(you.x_pos, you.y_pos)) diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 0c8d8c94fc..eeee25e9a4 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1897,12 +1897,17 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known, case DID_POISON: if (you.religion == GOD_SHINING_ONE) { - if (thing_done == DID_UNCHIVALRIC_ATTACK - && tso_unchivalric_attack_safe_monster(victim)) + if (thing_done == DID_UNCHIVALRIC_ATTACK) { - break; - } + if (tso_unchivalric_attack_safe_monster(victim)) + break; + if (!known) + { + simple_god_message(" did not appreciate that!"); + break; + } + } ret = true; piety_change = -level; penance = level * 2; |