From b2a0f789b94558ed467b25ac5355eaf8b6558077 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sat, 31 May 2008 23:33:49 +0000 Subject: Fix 1962147: Move the comments on the food you eat at the end of DELAY_EAT. Fix 1971216: Kills by confused undead use LIVING_KILLED_BY_SERVANT instead because the message ("collateral kill") fits better and, though it's basically a hack, the distinction does fit somehow. Fix 1914948: Tweak message when you resist a spell cast by an invisible monster. Fix 1946608: Print "Nothing appears to happen." if reading ?EWI when unarmed. I guess that's it, plus probably some more cleanup. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5378 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/tutorial.cc | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/tutorial.cc') diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index c7ef5a6782..a182e2bb0e 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -3306,26 +3306,47 @@ void tutorial_inscription_info(bool autoinscribe) std::ostringstream text; text << "<" << colour_to_str(channel_to_colour(MSGCH_TUTORIAL)) << ">"; + bool longtext = false; if (!autoinscribe || wherey() <= get_number_of_lines() - 10) { text << EOL "Inscriptions are a powerful concept of Dungeon Crawl." EOL "You can inscribe items to differentiate them, or to comment on them, " EOL "but also to set rules for item interaction. If you are new to Crawl, " EOL - "you can safely ignore this feature, though." EOL; + "you can safely ignore this feature, though."; + + longtext = true; } if (autoinscribe && wherey() <= get_number_of_lines() - 6) { - text << EOL EOL + text << EOL "Artefacts can be autoinscribed to give a brief overview of their " EOL "known properties. Here, doing a left mouse click will autoinscribe " EOL - "this item." EOL; + "this item."; + + longtext = true; } - text << "(In the main screen, press ?6 for more information.)" EOL; + text << EOL + "(In the main screen, press ?6 for more information.)" EOL; text << ""; formatted_string::parse_string(text.str()).display(); + + if (longtext && wherey() <= get_number_of_lines() - 2) + { + if (autoinscribe) + { + formatted_string::parse_string( + "So, do you wish to inscribe this item? " + "('a' to autoinscribe) ").display(); + } + else + { + formatted_string::parse_string( + "So, do you wish to inscribe this item? ").display(); + } + } } bool tutorial_pos_interesting(int x, int y) -- cgit v1.2.3-54-g00ecf