diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-19 17:49:56 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-19 17:49:56 +0000 |
commit | 710d9c281052573fbd29d280f06e621b03b843f3 (patch) | |
tree | c75a13dd1caa8039112c67b314faa2ceaa6cad85 /crawl-ref | |
parent | dccd64f85173ad6a490b16d7b8ad83529114d401 (diff) | |
download | crawl-ref-710d9c281052573fbd29d280f06e621b03b843f3.tar.gz crawl-ref-710d9c281052573fbd29d280f06e621b03b843f3.zip |
Demonspawn control demon power was ridiculously overpowered, fixed (Juha).
Orbs of fire are now hellfire resistant (Juha).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1063 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/beam.cc | 5 | ||||
-rw-r--r-- | crawl-ref/source/mon-data.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 7063ee21a4..484e0926c5 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3798,8 +3798,11 @@ static int affect_monster_enchantment(struct bolt &beam, struct monsters *mon) mpr( info, MSGCH_DIAGNOSTICS ); #endif - if (mon->hit_dice * 4 >= random2(beam.ench_power)) + if (mon->hit_dice * 7 >= random2(beam.ench_power) + || mons_is_unique(mon->type)) + { return (MON_RESIST); + } simple_monster_message(mon, " is enslaved."); beam.obvious_effect = true; diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 1f1b0a1409..79f63c0807 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -3855,7 +3855,7 @@ { MONS_ORB_OF_FIRE, '*', RED, "orb of fire", M_SPELLCASTER | M_FLIES | M_SEE_INVIS, - MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, + MR_RES_ELEC | MR_RES_FIRE | MR_RES_HELLFIRE | MR_RES_COLD | MR_RES_POISON, 0, 10, MONS_ORB_OF_FIRE, MONS_ORB_OF_FIRE, MH_NONLIVING, MAG_IMMUNE, { {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} }, { 30, 0, 0, 150 }, |