Don't penalize a priest's alignment if they try to use a bladed artifact weapon.

Now that priests can receive slashing/piercing artifact weapons again,
make it so they don't take a hit to their alignment if they try and use
it. Right now this covers all artifacts, not just gifted ones. The
to-hit penalty is still in effect.

Author: k21971

doc/evilhack-changelog.md

@@ -3988,4 +3988,6 @@ The following changes to date are:
 - Add healing spellbook descriptions to the in-game encyclopedia
 - Revert commit 0f42eff (priest altar sacrifice artifact restrictions)
 - Add clerical spellbook descriptions to the in-game encyclopedia
+- Don't penalize a priest's alignment if they try to use a bladed
+  artifact weapon
 

src/uhitm.c

@@ -393,13 +393,13 @@ int *attk_count, *role_roll_penalty;
        chance to hit, inferior ones not so much */
     if (uwep) {
         if (uwep->forged_qual == FQ_EXCEPTIONAL
-                || (u.twoweap
-                    && uswapwep->forged_qual == FQ_EXCEPTIONAL)) {
+            || (u.twoweap
+                && uswapwep->forged_qual == FQ_EXCEPTIONAL)) {
             tmp += 1;
         }
         if (uwep->forged_qual == FQ_INFERIOR
-                || (u.twoweap
-                    && uswapwep->forged_qual == FQ_INFERIOR)) {
+            || (u.twoweap
+                && uswapwep->forged_qual == FQ_INFERIOR)) {
             tmp -= 2;
         }
     }
@@ -580,9 +580,19 @@ register struct monst *mtmp;
                   is_slash(uwep) ? "edged" : "piercing", ansimpleoname(uwep));
         exercise(A_WIS, FALSE);
         if (!rn2(10)) {
-            Your("behavior has displeased %s.",
-                 align_gname(u.ualign.type));
-            adjalign(-1);
+            if (!uwep->oartifact) {
+                /* priests can receive bladed weapons via altar
+                   sacrifice. don't punish them if they try to
+                   use them.
+
+                   TODO: create a bitfield in struct artifact to
+                   flag artifacts that are actually gifted, so we
+                   can check against that instead of making all
+                   artifacts ok to try and use */
+                Your("behavior has displeased %s.",
+                     align_gname(u.ualign.type));
+                adjalign(-1);
+            }
         }
     }
 

src/weapon.c

@@ -250,15 +250,16 @@ botl_hitbonus()
     if (!uwep && Role_if(PM_DRUID)
         && all_druid_forms(monsndx(youmonst.data)))
         tmp += (u.ulevel / 3) + 5;
+
     if (uwep) {
         if (uwep->forged_qual == FQ_EXCEPTIONAL
-                || (u.twoweap
-                    && uswapwep->forged_qual == FQ_EXCEPTIONAL)) {
+            || (u.twoweap
+                && uswapwep->forged_qual == FQ_EXCEPTIONAL)) {
             tmp += 1;
         }
         if (uwep->forged_qual == FQ_INFERIOR
-                || (u.twoweap
-                    && uswapwep->forged_qual == FQ_INFERIOR)) {
+            || (u.twoweap
+                && uswapwep->forged_qual == FQ_INFERIOR)) {
             tmp -= 2;
         }
     }
@@ -2197,7 +2198,7 @@ struct obj *weapon;
         && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep))
         && (is_pierce(uwep) || is_slash(uwep) || is_ammo(uwep))) {
         /* feedback handled in attack() */
-        bonus = -30;
+        bonus = -40;
     }
     return bonus;
 }