summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-14 06:31:26 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-14 06:31:26 +0000
commit8457ded2704858f5d6f7f7db5f7c0c8756f5fd47 (patch)
treeef886d35c8a55f3be9c502ed8742e6ed1da33309
parentc2e5ac10de27cdd04b80c120368b3b53eff5ce9d (diff)
downloadcrawl-ref-8457ded2704858f5d6f7f7db5f7c0c8756f5fd47.tar.gz
crawl-ref-8457ded2704858f5d6f7f7db5f7c0c8756f5fd47.zip
Increase xp modifier for Snorg.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5810 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/docs/changes.stone_soup1
-rw-r--r--crawl-ref/source/mon-data.h5
-rw-r--r--crawl-ref/source/monstuff.cc7
3 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 639ba8ce6a..d8715bba07 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -99,6 +99,7 @@ Monsters
* Angels and Daevas may appear randomly in the Abyss.
* Holy monsters may turn neutral if the player follows a good god.
* Beefed up demon lords.
+* Make Snorg go berserk.
* Unknown mimics are now consistently treated like items.
* Changed monster resists to have several levels, like the player's.
* Removed electricity resistance from several monsters.
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 96bdd4961c..cd0157663e 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -3798,7 +3798,7 @@
MONS_BLORK_THE_ORC, 'o', BROWN, "Blork the orc",
M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
MR_NO_FLAGS,
- 0, 20, MONS_ORC, MONS_ORC, MH_NATURAL, -4,
+ 0, 15, MONS_ORC, MONS_ORC, MH_NATURAL, -4,
{ {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 3, 0, 0, 32 },
0, 9, MST_ORC_WIZARD_III, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,
@@ -3829,10 +3829,11 @@
},
{
+ // Snorg can go berserk.
MONS_SNORG, 'T', GREEN, "Snorg",
M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
MR_NO_FLAGS,
- 0, 20, MONS_TROLL, MONS_TROLL, MH_NATURAL, -6,
+ 0, 25, MONS_TROLL, MONS_TROLL, MH_NATURAL, -6,
{ {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 15},
{AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK },
{ 8, 0, 0, 96 },
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 0facd3ffc8..9e73726428 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -3912,11 +3912,14 @@ static bool _handle_special_ability(monsters *monster, bolt & beem)
if (monster->has_ench(ENCH_CONFUSION))
break;
- if (monster->foe == MHITNOT)
+ if (monster->foe == MHITNOT
+ || monster->foe == MHITYOU && mons_friendly(monster))
+ {
break;
+ }
// There's a 5% chance of Snorg spontaneously going berserk that
- // increases to 20% once Snorg is wounded.
+ // increases to 20% once he is wounded.
if (monster->hit_points == monster->max_hit_points && !one_chance_in(4))
break;