summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/dat/descript/items.txt2
-rw-r--r--crawl-ref/source/fight.cc7
2 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index b9a8e50d0a..728ac39fbb 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -410,6 +410,7 @@ A cloth cloak.
club
A heavy piece of wood, to be held or thrown.
+Coshing someone on the head while they're asleep is a great idea.
%%%%
corpse
@@ -448,6 +449,7 @@ armour. It is somewhat resistant to corrosion.
dagger
A long knife or a very short sword, which can be held or thrown.
+It causes massive damage when used for backstabbing.
%%%%
dart
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index a0edf2bc37..b41ca53319 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1586,6 +1586,12 @@ void melee_attack::player_weapon_auto_id()
int melee_attack::player_stab_weapon_bonus(int damage)
{
+ if (weapon && weapon->base_type == OBJ_WEAPONS
+ && (weapon->sub_type == WPN_CLUB || weapon->sub_type == WPN_SPEAR))
+ {
+ goto ok_weaps;
+ }
+
switch (wpn_skill)
{
case SK_SHORT_BLADES:
@@ -1599,6 +1605,7 @@ int melee_attack::player_stab_weapon_bonus(int damage)
damage += bonus;
}
// fall through
+ ok_weaps:
case SK_LONG_BLADES:
damage *= 10 + you.skills[SK_STABBING] /
(stab_bonus + (wpn_skill == SK_SHORT_BLADES ? 0 : 1));