From 1572e9c9223b1b45eada6fec2e1a82eb6950ebfd Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 13 Jun 2008 14:19:42 +0000 Subject: Added several new tutorial triggers including information on being caught in a net, specific skills, magic resistance, and which stat to choose. In a given game you'll only ever see a small fraction of all tutorial events (we're at 71 now, and some of them are exclusive). In fact, a lot of the information is so generally useful (esp. on gods, skills and items) that I'm seriously considering opening up the general information (How do I use item x? What does Spellcasting do?) to a wider selection of characters. I don't think we'll want to explain the intricacies of Mummies, Ghouls, or Vampires, but a lot of this stuff even applies to them... (If we overhaul the tutorial, it's certainly not a 0.4 target, though.) Resetting the tutorial version to 8 as we somehow switched from digital version to binary and back to digital. It will take some time until we actually reach 110, and by then, I am sure the base files won't be save compatible anymore. :) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5777 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/effects.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'crawl-ref/source/effects.cc') diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index f391c4520c..bf88181561 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1959,29 +1959,27 @@ void yell(bool force) } mpr("What do you say?", MSGCH_PROMPT); - mprf(" t - %s", cap_shout.c_str()); + mprf(" t - %s!", cap_shout.c_str()); if (!you.duration[DUR_BERSERKER]) { - mpr(" a - Order allies to attack a monster"); - + std::string previous = ""; if (!(you.prev_targ == MHITNOT || you.prev_targ == MHITYOU)) { monsters *target = &menv[you.prev_targ]; if (target->alive() && mons_near(target) && player_monster_visible(target)) { - mpr(" p - Order allies to attack your previous target"); + previous = " p - Attack previous target."; targ_prev = true; } } - mpr(" s - Order allies to stop attacking"); - mpr(" w - Order allies to wait here"); - mpr(" f - Order allies to follow you"); + mprf("Orders for allies: a - Attack new target.%s", previous.c_str()); + mpr( " s - Stop attacking."); + mpr( " w - Wait here. f - Follow me."); } - - mprf(" Anything else - Stay silent%s", + mprf(" Anything else - Stay silent%s.", one_chance_in(20)? " (and be thought a fool)" : ""); unsigned char keyn = get_ch(); -- cgit v1.2.3-54-g00ecf