diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/acr.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/command.cc | 15 | ||||
| -rw-r--r-- | crawl-ref/source/message.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monspeak.cc | 10 |
4 files changed, 25 insertions, 7 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index e584530dae..f56c16776d 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2505,7 +2505,12 @@ void process_command( command_type cmd ) { // Kind of a hacky way to get quiver to change. you.m_quiver->on_item_fired(you.inv[next], true); + + if (next == cur) + mpr("No other missiles available. Use F to throw any item."); } + else if (cur == -1) + mpr("No missiles available. Use F to throw any item."); break; } diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index 5c4cb1573e..96c9b25c3c 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -2161,15 +2161,22 @@ static void _add_formatted_keyhelp(column_composer &cols) 1, interact, true, true, _cmdhelp_textfilter); - cols.add_formatted( - 1, + interact = "<h>Item Interaction (floor):\n" "<w>,</w> : pick up items (also <w>g</w>) \n" " (press twice for pick up menu) \n" "<w>d</w> : Drop an item\n" "<w>d#</w>: Drop exact number of items \n" - "<w>c</w> : Chop up a corpse \n" - "<w>e</w> : Eat food from floor \n", + "<w>c</w> : Chop up a corpse "; + + if (you.species == SP_VAMPIRE && you.experience >= 6) + interact += "or bottle its blood "; + + interact += + "\n<w>e</w> : Eat food from floor \n"; + + cols.add_formatted( + 1, interact, true, true, _cmdhelp_textfilter); cols.add_formatted( diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index af313b319b..0fd2787973 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -478,7 +478,7 @@ void mpr(const char *inf, msg_channel_type channel, int param) char mbuf[400]; size_t i = 0; - const int stepsize = get_number_of_cols() - 1; + const int stepsize = get_number_of_cols() - 1; const size_t msglen = strlen(inf); const int lookback_size = (stepsize < 12 ? 0 : 12); diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index e0e863b3d5..6bdbfec5e6 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -533,14 +533,18 @@ bool mons_speaks(const monsters *monster) else { if (!monster->mname.empty() && _polyd_can_speak(monster)) + { msg = _get_speak_string(prefixes, monster->name(DESC_PLAIN), monster, no_player, no_foe, no_foe_name, no_god, unseen); + } if (msg.empty()) + { msg = _get_speak_string(prefixes, monster->base_name(DESC_PLAIN), monster, no_player, no_foe, no_foe_name, no_god, unseen); + } } // The exact name brought no results, try monster genus. @@ -636,9 +640,11 @@ bool mons_speaks(const monsters *monster) } if (msg.empty() || msg == "__NEXT") + { msg = _get_speak_string(prefixes, get_mon_shape_str(shape), monster, no_player, no_foe, no_foe_name, no_god, unseen); + } if (msg == "__NONE") { @@ -751,7 +757,7 @@ void mons_speaks_msg(const monsters *monster, const std::string &msg, // intent, we're falsely categorizing various things in the // function as spells and danger warning... everything else // just goes into the talk channel -- bwr - // [jpeg] Added MSGCH_TALK_VISUAL for silent "chatter" + // [jpeg] Added MSGCH_TALK_VISUAL for silent "chatter". msg_channel_type msg_type = def_chan; std::string param = ""; @@ -791,7 +797,7 @@ void mons_speaks_msg(const monsters *monster, const std::string &msg, line = line.substr(pos + 1); } - // except for VISUAL none of the above influence these + // Except for VISUAL none of the above influence these. if (line == "__YOU_RESIST" && (!silence || param == "VISUAL")) { canned_msg( MSG_YOU_RESIST ); |