fix #H4333 - angry god vs pacifist conduct
When you're swallowed, an angry god trying to zap you will kill the engulfer and hero gets credit (experience) and blame (possible loss of luck and/or alignment if engulfer is peaceful or tame) for the act. But hero didn't actually kill the critter, so don't increment the kill counter that monitors pacifism. I think there are other circumstances where hero gets credit and/or blame for something he or she didn't directly do, but offhand I can't think of them. They might warrant similar treatment. Tidying of xkilled() triggered by malformed block comment which is actually a hybrid of an end of line comment (the boulder one, not the 'dest' parameter one)....
This commit is contained in:
@@ -231,6 +231,9 @@ Vlad's tower2 and tower3 didn't show up in wizard-mode ^O output or ^V? menu
|
||||
remove extra space from "All of your <stack-of-potions> boil and explode."
|
||||
(also applies to potions freezing and to scrolls burning)
|
||||
effects of cursed potion of levitation were skipped if already levitating
|
||||
when engulfed, having swallower be killed by angry deity trying to zap hero
|
||||
no longer violates pacifist conduct (other penalties--reduced luck or
|
||||
alignment--still apply if target is something you shouldn't kill)
|
||||
|
||||
|
||||
Fixes to Post-3.6.0 Problems that Were Exposed Via git Respository
|
||||
|
||||
Reference in New Issue
Block a user