diff options
| author | Chris Oelmueller <chris.oelmueller@gmail.com> | 2014-04-10 01:06:32 +0200 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-13 23:41:47 -0700 |
| commit | 6537abdd850278128eb7b5d4954eba2d7d0a5526 (patch) | |
| tree | 527c10ebda198a195aa04a4692427aec6b9d3c85 /crawl-ref/source/l_item.cc | |
| parent | 1b4b79b5505598c32d5aabc183851e8b556b74dd (diff) | |
| download | crawl-ref-6537abdd850278128eb7b5d4954eba2d7d0a5526.tar.gz crawl-ref-6537abdd850278128eb7b5d4954eba2d7d0a5526.zip | |
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.]
Diffstat (limited to 'crawl-ref/source/l_item.cc')
| -rw-r--r-- | crawl-ref/source/l_item.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc index 9e512bc513..c0620cb0d8 100644 --- a/crawl-ref/source/l_item.cc +++ b/crawl-ref/source/l_item.cc @@ -682,13 +682,8 @@ IDEF(plus2) if (!item || !item->defined()) return 0; - if (item_ident(*item, ISFLAG_KNOW_PLUSES) - && (item->base_type == OBJ_WEAPONS - || item->base_type == OBJ_JEWELLERY - && item->sub_type == RING_SLAYING)) - { + if (item_ident(*item, ISFLAG_KNOW_PLUSES) && item->base_type == OBJ_WEAPONS) lua_pushnumber(ls, item->plus2); - } else lua_pushnil(ls); |