diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-22 21:57:35 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-22 21:57:35 +0000 |
| commit | ea78e3b88da2c70285b09f34c9c5d8230280405b (patch) | |
| tree | b4de694fd30792e67bf1ebde5e3f770794992949 /crawl-ref/source/acr.cc | |
| parent | f7cb474e41b75c37273b79d4fe5e7e24da81950d (diff) | |
| download | crawl-ref-ea78e3b88da2c70285b09f34c9c5d8230280405b.tar.gz crawl-ref-ea78e3b88da2c70285b09f34c9c5d8230280405b.zip | |
Swap '.' and '!' in the targetting interface.
Forbid bats wearing hats/caps or rings. (That makes amulets the only
type of equipment Vampires can keep on when transforming.) To make up
for it, increase their damage stats again. Also fix it being possible to
(un)equip the allowed items in Tiles while in bat form.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6055 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 067db5d042..58ce26362c 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1856,8 +1856,9 @@ void process_command( command_type cmd ) case CMD_REST: if (i_feel_safe()) { - if ( you.hp == you.hp_max - && you.magic_points == you.max_magic_points ) + if ((you.hp == you.hp_max || you.species == SP_VAMPIRE + && you.hunger_state == HS_STARVING) + && you.magic_points == you.max_magic_points ) { mpr("You start searching."); } @@ -2075,6 +2076,11 @@ void process_command( command_type cmd ) case CMD_REMOVE_ARMOUR: { + if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT) + { + mpr("You can't wear or remove anything in your present form."); + break; + } int index = 0; if (armour_prompt("Take off which item?", &index, OPER_TAKEOFF)) @@ -2083,20 +2089,10 @@ void process_command( command_type cmd ) break; case CMD_REMOVE_JEWELLERY: - if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT) - { - canned_msg(MSG_PRESENT_FORM); - break; - } remove_ring(); break; case CMD_WEAR_JEWELLERY: - if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT) - { - canned_msg(MSG_PRESENT_FORM); - break; - } puton_ring(-1, false); break; |