diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-27 12:39:28 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-27 12:39:28 +0000 |
| commit | d80b2858a02272181c42f6efc027713820fc0f09 (patch) | |
| tree | 70052aca8909b535f98ad9a6afcf9a7357951b80 | |
| parent | e96b82e8da0cac34290d98e9172db2dce90b5ed0 (diff) | |
| download | crawl-ref-d80b2858a02272181c42f6efc027713820fc0f09.tar.gz crawl-ref-d80b2858a02272181c42f6efc027713820fc0f09.zip | |
* Change rElec mutation description to "resistant" rather than "immune".
* Make monsters of I_ANIMAL or higher and vulnerable to a cloud type
avoid to enter such clouds. For example, for fire clouds, this affects
ice beasts and mummies.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10426 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 15 | ||||
| -rw-r--r-- | crawl-ref/source/mutation.cc | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 47845a0c19..446c4f119b 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -5300,6 +5300,9 @@ bool mons_avoids_cloud(const monsters *monster, cloud_type cl_type, if (extra_careful) return (true); + if (mons_intel(monster) >= I_ANIMAL && mons_res_fire(monster) < 0) + return (true); + if (monster->hit_points >= 15 + random2avg(46, 5)) return (false); break; @@ -5307,10 +5310,16 @@ bool mons_avoids_cloud(const monsters *monster, cloud_type cl_type, case CLOUD_STINK: if (mons_res_poison(monster) > 0) return (false); + if (extra_careful) return (true); + + if (mons_intel(monster) >= I_ANIMAL && mons_res_poison(monster) < 0) + return (true); + if (x_chance_in_y(monster->hit_dice - 1, 5)) return (false); + if (monster->hit_points >= random2avg(19, 2)) return (false); break; @@ -5322,6 +5331,9 @@ bool mons_avoids_cloud(const monsters *monster, cloud_type cl_type, if (extra_careful) return (true); + if (mons_intel(monster) >= I_ANIMAL && mons_res_cold(monster) < 0) + return (true); + if (monster->hit_points >= 15 + random2avg(46, 5)) return (false); break; @@ -5333,6 +5345,9 @@ bool mons_avoids_cloud(const monsters *monster, cloud_type cl_type, if (extra_careful) return (true); + if (mons_intel(monster) >= I_ANIMAL && mons_res_poison(monster) < 0) + return (true); + if (monster->hit_points >= random2avg(37, 4)) return (false); break; diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 4d9ea1e480..e9f0337dca 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -276,7 +276,7 @@ mutation_def mutation_defs[] = { "cold resistance" }, { MUT_SHOCK_RESISTANCE, 2, 1, false, false, - {"You are immune to electric shocks.", "", ""}, + {"You are resistant to electric shocks.", "", ""}, {"You feel insulated.", "", ""}, {"You feel conductive.", "", ""}, |