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/describe.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/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 7763ebb7b9..1d8f490862 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -247,8 +247,7 @@ static vector<string> _randart_propnames(const item_def& item, { "Str", ARTP_STRENGTH, 0 }, { "Dex", ARTP_DEXTERITY, 0 }, { "Int", ARTP_INTELLIGENCE, 0 }, - { "Acc", ARTP_ACCURACY, 0 }, - { "Dam", ARTP_DAMAGE, 0 }, + { "Slay", ARTP_SLAYING, 0 }, // Qualitative attributes (and Stealth) { "SInv", ARTP_EYESIGHT, 2 }, @@ -445,10 +444,8 @@ static string _randart_descrip(const item_def &item) { ARTP_STRENGTH, "It affects your strength (%d).", false}, { ARTP_INTELLIGENCE, "It affects your intelligence (%d).", false}, { ARTP_DEXTERITY, "It affects your dexterity (%d).", false}, - { ARTP_ACCURACY, "It affects your accuracy with ranged weapons and " - "melee attacks (%d).", false}, - { ARTP_DAMAGE, "It affects your damage with ranged weapons and melee " - "attacks (%d).", false}, + { ARTP_SLAYING, "It affects your accuracy and damage with non-spells.", + false}, { ARTP_FIRE, "fire", true}, { ARTP_COLD, "cold", true}, { ARTP_ELECTRICITY, "It insulates you from electricity.", false}, @@ -1375,8 +1372,7 @@ static string _describe_jewellery(const item_def &item, bool verbose) && item_ident(item, ISFLAG_KNOW_PLUSES)) { // Explicit description of ring power. - if (item.plus != 0 - || item.sub_type == RING_SLAYING && item.plus2 != 0) + if (item.plus != 0) { switch (item.sub_type) { @@ -1411,21 +1407,10 @@ static string _describe_jewellery(const item_def &item, bool verbose) break; case RING_SLAYING: - if (item.plus != 0) - { - description += "\nIt affects your accuracy with ranged " - "weapons and melee attacks ("; - _append_value(description, item.plus, true); - description += ")."; - } - - if (item.plus2 != 0) - { - description += "\nIt affects your damage with ranged " - "weapons and melee attacks ("; - _append_value(description, item.plus2, true); - description += ")."; - } + description += "\nIt affects your accuracy and damage " + "with non-spells ("; + _append_value(description, item.plus, true); + description += ")."; break; default: |