diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-28 03:51:23 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-28 03:51:23 +0000 |
| commit | 694c84af36107f773a928bdd0bcf88552cfdd68f (patch) | |
| tree | 22e093e2b37f50c9e7eafdd246926137303ff920 /crawl-ref/source/item_use.cc | |
| parent | 7ebc330b3bd569f9158e66ad3b26e25c40295b67 (diff) | |
| download | crawl-ref-694c84af36107f773a928bdd0bcf88552cfdd68f.tar.gz crawl-ref-694c84af36107f773a928bdd0bcf88552cfdd68f.zip | |
Make dwarves' and orcs' +1 damage bonus for throwing racial gear
(introduced in trunk SVN revision 2444) actually apply, by adding the
bonus to baseDam *after* assigning baseDam the base damage of the thrown
item.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2918 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 173001a6ef..ffcb07b5fa 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2085,13 +2085,6 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, if (get_equip_race(item) == ISFLAG_ELVEN && player_genus(GENPC_ELVEN)) baseHit += 1; - if ( (get_equip_race(item) == ISFLAG_DWARVEN - && player_genus(GENPC_DWARVEN)) || - (get_equip_race(item) == ISFLAG_ORCISH - && you.species == SP_HILL_ORC)) - { - baseDam += 1; - } // give an appropriate 'tohit' - // hand axes and clubs are -5 @@ -2117,6 +2110,16 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, exHitBonus = you.skills[SK_THROWING] * 2; baseDam = property( item, PWPN_DAMAGE ); + + // dwarves/orcs with dwarven/orcish weapons + if ( (get_equip_race(item) == ISFLAG_DWARVEN + && player_genus(GENPC_DWARVEN)) || + (get_equip_race(item) == ISFLAG_ORCISH + && you.species == SP_HILL_ORC)) + { + baseDam += 1; + } + exDamBonus = (10 * (you.skills[SK_THROWING] / 2 + you.strength - 10)) / 12; |