summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-06 01:07:16 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-06 01:07:16 +0000
commit7ddac74599b51e7af9f9ca635ec7b7b037ce0f03 (patch)
tree4116e57bc78ca6f7bf80b882338fa9e71c3d6600
parenta7b2e921730de47a8c3a60898af8ddeb75d7bada (diff)
downloadcrawl-ref-7ddac74599b51e7af9f9ca635ec7b7b037ce0f03.tar.gz
crawl-ref-7ddac74599b51e7af9f9ca635ec7b7b037ce0f03.zip
After some thought, make quarterstaves and lajatangs large again, and
put the wielding exception for them back in, since it's in multiple places already. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8917 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/item_use.cc1
-rw-r--r--crawl-ref/source/itemprop.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 266d4fef52..c2e12a86d1 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -136,6 +136,7 @@ bool can_wield(item_def *weapon, bool say_reason,
// Small species wielding large weapons...
if (player_size(PSIZE_BODY) < SIZE_MEDIUM
+ && weapon_skill(*weapon) != SK_STAVES
&& !check_weapon_wieldable_size(*weapon, player_size(PSIZE_BODY)))
{
SAY(mpr("That's too large for you to wield."));
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index c8804b94fa..35d4dfeacb 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -330,10 +330,10 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
// Staves
{ WPN_QUARTERSTAFF, "quarterstaff", 7, 6, 12, 180, 7,
- SK_STAVES, HANDS_DOUBLE, SIZE_MEDIUM, MI_NONE, false,
+ SK_STAVES, HANDS_DOUBLE, SIZE_LARGE, MI_NONE, false,
DAMV_CRUSHING, 10 },
{ WPN_LAJATANG, "lajatang", 14, -3, 14, 200, 3,
- SK_STAVES, HANDS_DOUBLE, SIZE_MEDIUM, MI_NONE, false,
+ SK_STAVES, HANDS_DOUBLE, SIZE_LARGE, MI_NONE, false,
DAMV_SLICING, 2 },
// Range weapons