diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-04 11:19:30 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-04 11:19:30 +0000 |
commit | 6945b9d587b894371ba4d6d99f9ee1b8ee3beb86 (patch) | |
tree | dd06afe37a53435e851d05733e68cbc4693fb3c5 /crawl-ref | |
parent | faa0373f540fe6d160df6a7e95a0da21db6af1c6 (diff) | |
download | crawl-ref-6945b9d587b894371ba4d6d99f9ee1b8ee3beb86.tar.gz crawl-ref-6945b9d587b894371ba4d6d99f9ee1b8ee3beb86.zip |
Update tutorial information, inscription warnings and tooltips for wands
and misc. items.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9732 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/invent.cc | 11 | ||||
-rw-r--r-- | crawl-ref/source/tilereg.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/tutorial.cc | 36 |
3 files changed, 33 insertions, 16 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index bb9ef1f4c8..f392c9d429 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -1324,9 +1324,9 @@ static int _digit_to_index( char digit, operation_types oper ) { const std::string& r(you.inv[i].inscription); // Note that r.size() is unsigned. - for ( unsigned int j = 0; j + 2 < r.size(); ++j ) + for (unsigned int j = 0; j + 2 < r.size(); ++j) { - if ( r[j] == '@' + if (r[j] == '@' && (r[j+1] == iletter || r[j+1] == '*') && r[j+2] == digit ) { @@ -1344,7 +1344,7 @@ bool has_warning_inscription(const item_def& item, const char iletter = static_cast<char>(oper); const std::string& r(item.inscription); - for ( unsigned int i = 0; i + 1 < r.size(); ++i ) + for (unsigned int i = 0; i + 1 < r.size(); ++i) { if (r[i] == '!') { @@ -1352,6 +1352,11 @@ bool has_warning_inscription(const item_def& item, return (true); else if (oper == OPER_ZAP && r[i+1] == 'z') // for the 0.3.4. keys return (true); + else if (oper == OPER_EVOKE + && (r[i+1] == 'V' || tolower(r[i+1]) == 'z')) + { + return (true); + } } } diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 01518e0739..0e809328b2 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -1739,7 +1739,7 @@ bool InventoryRegion::update_tip_text(std::string& tip) } break; case OBJ_WANDS: - tip += "Zap (Z)"; + tip += "Evoke (V)"; if (wielded) tip += "\n[Ctrl-L-Click] Unwield (w-)"; break; diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 4d6e541721..e66d659c63 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -21,6 +21,7 @@ REVISION("$Rev$"); #include "abl-show.h" #include "cloud.h" #include "command.h" +#include "decks.h" #include "describe.h" #include "food.h" #include "format.h" @@ -176,12 +177,14 @@ bool pick_tutorial() // Did the player recently see a monster turn invisible? Options.tut_seen_invisible = 0; - Options.random_pick = true; // random choice of starting spellbook + Options.random_pick = false; + if (!Options.book || Options.book == SBT_SUMM) + Options.book = SBT_RANDOM; Options.weapon = WPN_HAND_AXE; // easiest choice for fighters return (true); } - if (keyn == CK_BKSP || keyn == ' ') + if (keyn == CK_BKSP || keyn == ' ' || keyn == ESCAPE) { // In this case, undo previous choices. you.species = SP_UNKNOWN; @@ -1489,7 +1492,7 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc) ". Simply click on it with your <w>left mouse button</w>, or " "type " #endif - "<w>Z</w> to zap it."; + "<w>V</w> to evoke it."; break; case TUT_SEEN_SPBOOK: @@ -1716,13 +1719,13 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc) text << "This is a curious object indeed. You can play around with " "it to find out what it does by " #ifdef USE_TILE - "clicking on it once to <w>w</w>ield it, and a second time " - "to e<w>v</w>oke " + "clicking on it to e<w>V</w>oke " #else - "<w>w</w>ielding and e<w>v</w>oking " + "e<w>v</w>oking " #endif - "it. As usually, selecting it from your <w>i</w>nventory " - "might give you more information."; + "it. Some items need to be wielded first before you can " + "e<w>v</w>oke them. As usually, selecting it from your " + "<w>i</w>nventory might give you more information."; break; case TUT_SEEN_STAFF: @@ -3436,12 +3439,21 @@ void tutorial_describe_item(const item_def &item) break; case OBJ_MISCELLANY: - ostr << "Miscellaneous items sometimes harbour magical powers. Try " - "<w>w</w>ielding and e<w>v</w>oking it" + if (is_deck(item)) + { + ostr << "Decks of cards are powerful magical items. Try " + "<w>w</w>ielding and e<w>v</w>oking it" #ifdef USE_TILE - ", either of which can be done by clicking on it" + ", either of which can be done by clicking on it" #endif - "."; + ". You can read about the effect of a card by " + "searching the game's database with <w>?/c</w>."; + } + else + { + ostr << "Miscellaneous items sometimes harbour magical powers " + "that can be harnessed by e<w>V</w>oking the item."; + } Options.tutorial_events[TUT_SEEN_MISC] = false; break; |