summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-12-17 10:39:32 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-12-17 10:39:32 +0000
commita1c989cf73a5995231dab2ab283efa77e3a66f0a (patch)
treefa57351776419d5de9496277df5577182673d019
parent2aa90440dae5dcabd7e48618888d8bc697b3f2d9 (diff)
downloadcrawl-ref-a1c989cf73a5995231dab2ab283efa77e3a66f0a.tar.gz
crawl-ref-a1c989cf73a5995231dab2ab283efa77e3a66f0a.zip
Made the Hat of the Alchemist a wizard hat. (Haran)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.1.6@652 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/monstuff.cc7
-rw-r--r--crawl-ref/source/unrand.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 170f5bcef4..11838f43c5 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1307,7 +1307,7 @@ void behaviour_event( struct monsters *mon, int event, int src,
if (mon->behaviour == BEH_SLEEP)
mon->behaviour = BEH_WANDER;
- // A bit of code to make Project Noise actually so
+ // A bit of code to make Project Noise actually do
// something again. Basically, dumb monsters and
// monsters who aren't otherwise occupied will at
// least consider the (apparent) source of the noise
@@ -1322,8 +1322,9 @@ void behaviour_event( struct monsters *mon, int event, int src,
case ME_WHACK:
case ME_ANNOY:
// will turn monster against <src>, unless they
- // are BOTH friendly and stupid. Hitting someone
- // over the head, of course, always triggers this code.
+ // are BOTH friendly and stupid, or else fleeing anyway.
+ // Hitting someone over the head, of course,
+ // always triggers this code.
if ( event == ME_WHACK ||
((isFriendly != sourceFriendly || isSmart) &&
(mon->behaviour != BEH_FLEE && mon->behaviour != BEH_PANIC)))
diff --git a/crawl-ref/source/unrand.h b/crawl-ref/source/unrand.h
index 30bfa5a1be..4fe07456ad 100644
--- a/crawl-ref/source/unrand.h
+++ b/crawl-ref/source/unrand.h
@@ -1058,7 +1058,7 @@
/* 50 */
{
"hat of the Alchemist", "dirty hat",
- OBJ_ARMOUR, ARM_HELMET, +2, THELM_SPECIAL, MAGENTA,
+ OBJ_ARMOUR, ARM_HELMET, +2, THELM_WIZARD_HAT, MAGENTA,
{
0, 0, 0, 0, 0, 0,
1, 1, 1, 0, 0, 30, // res fire, cold, elec, magic