Add more consistency fixes: the conduct for melee attacks on holy beings

now uses their hit dice, as beams do, and conducts for stabbing and 
unchivalrous attacks give 4 points instead of 5 again, for consistency 
with e.g. necromancy and unholy attacks.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5135 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 2 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 9044391b84..d6fe38358a 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3775,7 +3775,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
                         conduct.set(DID_ATTACK_NEUTRAL, 5, true, mon);
 
                     if (is_unchivalric_attack(&you, mon, mon))
-                        conduct.set(DID_UNCHIVALRIC_ATTACK, 5, true, mon);
+                        conduct.set(DID_UNCHIVALRIC_ATTACK, 4, true, mon);
                 }
 
                 if (mons_is_holy(mon))
@@ -3954,7 +3954,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
                 conduct.set(DID_ATTACK_NEUTRAL, 5, !okay, mon);
 
             if (is_unchivalric_attack(&you, mon, mon))
-                conduct.set(DID_UNCHIVALRIC_ATTACK, 5, !okay, mon);
+                conduct.set(DID_UNCHIVALRIC_ATTACK, 4, !okay, mon);
 
             if (mons_is_holy(mon))
                 conduct.set(DID_ATTACK_HOLY, mon->hit_dice, !okay, mon);