Combine plus/plus2 for rings of slaying, and Acc+/Dam+ on artefacts

Phase out ARTP_ACCURACY, rename ARTP_DAMAGE to ARTP_SLAYING which now
combines both Acc+ and Dam+ bonuses.

Bracers of archery are +4 now instead of +5,+3.

[Committer's note: fixed a description and cleaned up various other
small issues.]

1 files changed, 5 insertions, 7 deletions

diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc
index 7d2622f2de..563896943f 100644
--- a/crawl-ref/source/attack.cc
+++ b/crawl-ref/source/attack.cc
@@ -217,8 +217,7 @@ int attack::calc_to_hit(bool random)
         }
 
         // slaying bonus
-        mhit += slaying_bonus(PWPN_HIT,
-                              wpn_skill == SK_THROWING
+        mhit += slaying_bonus(wpn_skill == SK_THROWING
                               || (weapon && is_range_weapon(*weapon)
                                          && using_weapon()));
 
@@ -258,7 +257,7 @@ int attack::calc_to_hit(bool random)
             mhit += mitm[jewellery].plus;
         }
 
-        mhit += attacker->scan_artefacts(ARTP_ACCURACY);
+        mhit += attacker->scan_artefacts(ARTP_SLAYING);
 
         if (using_weapon() && weapon->base_type == OBJ_RODS)
             mhit += weapon->special;
@@ -1325,8 +1324,7 @@ int attack::player_apply_slaying_bonuses(int damage, bool aux)
         if (you.duration[DUR_CORROSION])
             damage_plus -= 3 * you.props["corrosion_amount"].get_int();
     }
-    damage_plus += slaying_bonus(PWPN_DAMAGE,
-                                 !weapon && wpn_skill == SK_THROWING
+    damage_plus += slaying_bonus(!weapon && wpn_skill == SK_THROWING
                                  || (weapon && is_range_weapon(*weapon)
                                             && using_weapon()));
 
@@ -1467,10 +1465,10 @@ int attack::calc_damage()
                 && mitm[jewellery].base_type == OBJ_JEWELLERY
                 && mitm[jewellery].sub_type == RING_SLAYING)
             {
-                wpn_damage_plus += mitm[jewellery].plus2;
+                wpn_damage_plus += mitm[jewellery].plus;
             }
 
-            wpn_damage_plus += attacker->scan_artefacts(ARTP_DAMAGE);
+            wpn_damage_plus += attacker->scan_artefacts(ARTP_SLAYING);
 
             if (wpn_damage_plus >= 0)
                 damage += random2(wpn_damage_plus);