diff options
| -rw-r--r-- | crawl-ref/docs/crawl_manual.txt | 9 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 5 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/quiver.cc | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt index 1efc4ac2fa..f32e9f6928 100644 --- a/crawl-ref/docs/crawl_manual.txt +++ b/crawl-ref/docs/crawl_manual.txt @@ -2663,7 +2663,7 @@ Inscriptions containing the following strings affect the behaviour of some commands: !* prompt before any action using this item !w prompt before wielding and unwielding - !z prompt before zapping + !Z prompt before zapping !e prompt before eating !q prompt before quaffing !r prompt before reading @@ -2672,7 +2672,8 @@ some commands: !T prompt before taking off armour !P prompt before putting on jewelry !R prompt before removing jewelry - !E prompt before evoking an item + !v prompt before evoking an item + !Q prompt before explicitly quivering an item !p prompt Nemelex Xobeh worshippers before sacrificing a stack containing an item with this inscription; if the answer is "No", the whole stack will be skipped, and no item is sacrificed @@ -2685,8 +2686,8 @@ some commands: this inscription) =s If stash tracking is explicit, then dropping this item will cause a stash to automatically be marked. - =f item is excluded when cycling ammunition - +f item is included when cycling ammunition + =f item is excluded when cycling ammunition and from automatic quivering + +f item is included when cycling ammunition and in automatic quivering !D prompt before performing an action that might destroy this item If you're attempting to destroy an item thus inscribed by sacrificing it, destroying a weapon, or burning a book in the diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index aba77bf568..9b1f3023b0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2192,11 +2192,12 @@ enum operation_types OPER_READ = 'r', OPER_MEMORISE = 'M', OPER_ZAP = 'Z', - OPER_EXAMINE = 'v', + OPER_EXAMINE = 'x', OPER_FIRE = 'f', OPER_PRAY = 'p', - OPER_EVOKE = 'E', + OPER_EVOKE = 'v', OPER_DESTROY = 'D', + OPER_QUIVER = 'Q', OPER_ANY = 0 }; diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 2ba2af30b1..7bc3b3732b 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -1245,6 +1245,7 @@ static std::string _operation_verb(operation_types oper) case OPER_PRAY: return "sacrifice"; case OPER_EVOKE: return "evoke"; case OPER_DESTROY: return "destroy"; + case OPER_QUIVER: return "quiver"; case OPER_ANY: default: return "choose"; diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc index aa9f38e768..521923133e 100644 --- a/crawl-ref/source/quiver.cc +++ b/crawl-ref/source/quiver.cc @@ -144,7 +144,7 @@ void choose_item_for_quiver() int slot = prompt_invent_item( "Quiver which item? (- for none, * to show all)", MT_INVLIST, OSEL_THROWABLE, true, true, true, '-', NULL, - OPER_FIRE ); + OPER_QUIVER ); if (slot == PROMPT_ABORT) { |