diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-03 12:56:58 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-03 12:56:58 +0000 |
commit | df343eb48f7d3a85d7cc1275d4e804019bbdf21b (patch) | |
tree | b9b72e2adb1f9b3d307f89d97e7b039ad2ef94dd | |
parent | 63199a9ac44a4e029eb1195554bf7bdc1142d442 (diff) | |
download | crawl-ref-df343eb48f7d3a85d7cc1275d4e804019bbdf21b.tar.gz crawl-ref-df343eb48f7d3a85d7cc1275d4e804019bbdf21b.zip |
r80@xenon: dshaligram | 2006-09-03 18:28:36 +051800
Check if player is wearing gloves before allowing claw damage.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@29 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/player.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 149185ed6b..91ee0dea54 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -377,11 +377,12 @@ int player_damage_type( void ) { return (damage_type(you.inv[wpn])); } - else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS + else if (you.equip[EQ_GLOVES] == -1 && + (you.attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS || you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON || you.mutation[MUT_CLAWS] || you.species == SP_TROLL - || you.species == SP_GHOUL) + || you.species == SP_GHOUL)) { return (DVORP_SLICING); } |