summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-04 21:15:40 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-04 21:15:40 +0000
commita6ed54f4d646157c90186c4d423fa0820c5748c0 (patch)
tree64a740f1bc83cf5bf604cfaf4b4d06ef00241dee
parent0db561d39a8d614d72cf0c75eaf0b7681ea84901 (diff)
downloadcrawl-ref-a6ed54f4d646157c90186c4d423fa0820c5748c0.tar.gz
crawl-ref-a6ed54f4d646157c90186c4d423fa0820c5748c0.zip
Send wizards into the Dungeon wearing a proper wizard hat. David is
right in that should not be too powerful for this comparatively weak class, and that it is immensely flavourful. :) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6397 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/monplace.cc5
-rw-r--r--crawl-ref/source/newgame.cc3
-rw-r--r--crawl-ref/source/tutorial.cc7
3 files changed, 7 insertions, 8 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index ab7b6112f4..ed491e5efd 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -230,11 +230,6 @@ void spawn_random_monsters()
return;
}
- mprf(MSGCH_DIAGNOSTICS, "dungeon? %s, temple? %s, descending? %s",
- you.level_type == LEVEL_DUNGEON ? "true" : "false",
- player_in_branch(BRANCH_ECUMENICAL_TEMPLE) ? "true" : "false",
- you.char_direction == GDT_DESCENDING ? "true" : "false");
-
// Place normal dungeon monsters, but not in player LOS.
if (you.level_type == LEVEL_DUNGEON
&& !player_in_branch( BRANCH_ECUMENICAL_TEMPLE )
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index f4d8d8a779..4a93276ba3 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -4643,8 +4643,9 @@ bool _give_items_skills()
_newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);
_newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE);
+ _newgame_make_item(2, EQ_HELMET, OBJ_ARMOUR, ARM_WIZARD_HAT);
- if (!_choose_book( you.inv[2], BOOK_MINOR_MAGIC_I, 3 ))
+ if (!_choose_book( you.inv[3], BOOK_MINOR_MAGIC_I, 3 ))
return (false);
you.skills[SK_DODGING] = 2;
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 55d73eadcb..5637961f94 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -532,11 +532,11 @@ static formatted_string _tutorial_stats_intro()
"and meaning current \n"
"out of maximum health points. When \n"
"Health drops to zero, you die. \n"
- "<w>Magic: " << you.magic_points << "/" << you.max_magic_points
+ "<w>Magic: " << you.magic_points << "/" << you.max_magic_points
<< "</w> represents your energy \n"
"for casting spells, although other \n"
"actions often draw from Magic, too. \n"
- "<w>Str</w>ength, <w>Int</w>elligence, <w>Dex</w>terity \n"
+ "<w>Str</w>ength, <w>Int</w>elligence, <w>Dex</w>terity \n"
"below provide an all-around account \n"
"of the character's attributes. \n"
"Don't worry about the rest for now. \n"
@@ -2559,6 +2559,9 @@ void learned_something_new(tutorial_event_type seen_what, int x, int y)
break;
case TUT_FLEEING_MONSTER:
+ if (Options.tutorial_type != TUT_BERSERK_CHAR)
+ break;
+
text << "Now that monster is scared of you! Note that you do not "
"absolutely have to follow it. Rather, you can let it run "
"away. Sometimes, though, it can be useful to attack a "