diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/fight.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 63239719cb..9819f6485c 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1473,7 +1473,7 @@ int melee_attack::player_stab(int damage) exercise(SK_STABBING, 1 + random2avg(5, 4)); - did_god_conduct(DID_STABBING, 4); + did_god_conduct(DID_STABBING, 4, true, def); } else { @@ -2885,7 +2885,7 @@ void melee_attack::player_stab_check() cancel_attack = true; } else - did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5); + did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, def); } } diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index b3b106ab1c..00cd805673 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1895,10 +1895,14 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known, case DID_UNCHIVALRIC_ATTACK: case DID_POISON: - if (you.religion == GOD_SHINING_ONE - && (thing_done != DID_UNCHIVALRIC_ATTACK - || tso_unchivalric_attack_safe_monster(victim))) + if (you.religion == GOD_SHINING_ONE) { + if (thing_done == DID_UNCHIVALRIC_ATTACK + && tso_unchivalric_attack_safe_monster(victim)) + { + break; + } + ret = true; piety_change = -level; penance = level * 2; |