diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-07 11:58:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-07 11:58:54 +0000 |
| commit | 167ae03b160a0ccadd7934b2bfe557d491f1cb1f (patch) | |
| tree | c1ee0ef626b416c5eee0f62082da72cb9f4137c3 /crawl-ref/source/mon-util.cc | |
| parent | 33dc7cedd5a65d3bd1ce8eff9006e4517a3390dd (diff) | |
| download | crawl-ref-167ae03b160a0ccadd7934b2bfe557d491f1cb1f.tar.gz crawl-ref-167ae03b160a0ccadd7934b2bfe557d491f1cb1f.zip | |
Another clean up, and add some new weapon speech.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6439 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 94a0ffbc2f..ba81b53e8a 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -5689,7 +5689,7 @@ void monsters::apply_enchantment(const mon_enchant &me) int damage = 0; // tiny: 1/6, little: 2/5, small: 3/4, medium and above: always - if (random2(SIZE_GIANT - mon_size) <= mon_size) + if (x_chance_in_y(mon_size + 1, SIZE_GIANT - mon_size)) damage++; // Handled specially to make up for its small size. @@ -5895,7 +5895,7 @@ void monsters::apply_enchantment(const mon_enchant &me) case ENCH_SHAPESHIFTER: // This ench never runs out! if (type == MONS_SHAPESHIFTER - || random2(1000) < ( 1000 / ((15 * hit_dice) / 5))) + || x_chance_in_y(1000 / (15 * hit_dice / 5), 1000)) { monster_polymorph(this, RANDOM_MONSTER, PPT_SAME); } @@ -6381,7 +6381,7 @@ void monsters::react_to_damage(int damage) { // The royal jelly objects to taking damage and will SULK. :-) if (type == MONS_ROYAL_JELLY && alive() - && damage > 8 && random2(50) < damage) + && damage > 8 && x_chance_in_y(damage, 50)) { const int tospawn = 1 + random2avg(1 + std::min((damage - 8) / 8, 5), 2); |