diff options
| author | pubby <pubby8@gmail.com> | 2013-06-23 06:40:26 -0500 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-09-22 00:30:08 +0200 |
| commit | 7d7ec048610b4177ede422a42ae9c0ca2752132a (patch) | |
| tree | 6c60e738306038c873f032c2e46b82067e448cfe /crawl-ref/source/command.cc | |
| parent | 20b3437a0c17333189fe5000d03041a3f7b53fda (diff) | |
| download | crawl-ref-7d7ec048610b4177ede422a42ae9c0ca2752132a.tar.gz crawl-ref-7d7ec048610b4177ede422a42ae9c0ca2752132a.zip | |
Macabre Finger Necklace
A warding amulet that provides you with another ring slot.
I rewrote some of the jewellery code, but never re-added the
TOUCH_UI code I removed in _prompt_ring_to_remove. Note that octopodes
never had TOUCH_UI code for their jewellery in the first place. This
should probably be looked at.
Also, the player dumps do not show the amulet
ring on the top, but I do not consider this a problem.
Diffstat (limited to 'crawl-ref/source/command.cc')
| -rw-r--r-- | crawl-ref/source/command.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index 49f469c30a..c1ab8a01f2 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -547,18 +547,19 @@ void list_jewellery(void) int colour = MSGCOL_BLACK; const char *slot = - (i == EQ_LEFT_RING) ? "Left ring" : - (i == EQ_RIGHT_RING) ? "Right ring" : - (i == EQ_AMULET) ? "Amulet" : - (i == EQ_RING_ONE) ? "1st ring" : - (i == EQ_RING_TWO) ? "2nd ring" : - (i == EQ_RING_THREE) ? "3rd ring" : - (i == EQ_RING_FOUR) ? "4th ring" : - (i == EQ_RING_FIVE) ? "5th ring" : - (i == EQ_RING_SIX) ? "6th ring" : - (i == EQ_RING_SEVEN) ? "7th ring" : - (i == EQ_RING_EIGHT) ? "8th ring" - : "unknown"; + (i == EQ_LEFT_RING) ? "Left ring" : + (i == EQ_RIGHT_RING) ? "Right ring" : + (i == EQ_AMULET) ? "Amulet" : + (i == EQ_RING_ONE) ? "1st ring" : + (i == EQ_RING_TWO) ? "2nd ring" : + (i == EQ_RING_THREE) ? "3rd ring" : + (i == EQ_RING_FOUR) ? "4th ring" : + (i == EQ_RING_FIVE) ? "5th ring" : + (i == EQ_RING_SIX) ? "6th ring" : + (i == EQ_RING_SEVEN) ? "7th ring" : + (i == EQ_RING_EIGHT) ? "8th ring" : + (i == EQ_RING_AMULET) ? "Amulet ring" + : "unknown"; string item; if (jewellery_id != -1 && !you_tran_can_wear(you.inv[jewellery_id]) |