diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-06 16:47:06 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-06 16:47:06 +0000 |
| commit | 200b4c0e08504a7c8df898d77a9d72b3fa573c04 (patch) | |
| tree | b6cf73c902a55861ab60656e0225f0385c2c3a59 /crawl-ref/source/spells1.cc | |
| parent | 7f2ded93231941b48fba24bcc9a55602295f72bd (diff) | |
| download | crawl-ref-200b4c0e08504a7c8df898d77a9d72b3fa573c04.tar.gz crawl-ref-200b4c0e08504a7c8df898d77a9d72b3fa573c04.zip | |
Add a function x_chance_in_y(x,y) to replace the various
random2(y) < x checks, e.g. x_chance_in_y(weight, totalweight). This
should make things a bit more readable. Apply it to a number of files.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6428 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells1.cc')
| -rw-r--r-- | crawl-ref/source/spells1.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 9df1997998..6c8be52d3c 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -1181,10 +1181,8 @@ bool cast_revivification(int pow) loss = 2; for (loopy = 0; loopy < 9; loopy++) - { - if (random2(pow) < 8) + if (x_chance_in_y(8, pow)) loss++; - } dec_max_hp(loss); set_hp(you.hp_max, false); @@ -1242,7 +1240,8 @@ void cast_deaths_door(int pow) set_hp( allowed_deaths_door_hp(), false ); deflate_hp( you.hp_max, false ); - you.duration[DUR_DEATHS_DOOR] = 10 + random2avg(13, 3) + (random2(pow) / 10); + you.duration[DUR_DEATHS_DOOR] = 10 + random2avg(13, 3) + + (random2(pow) / 10); if (you.duration[DUR_DEATHS_DOOR] > 25) you.duration[DUR_DEATHS_DOOR] = 23 + random2(5); @@ -1334,7 +1333,7 @@ void antimagic() if ( you.duration[dur_list[i]] > 1 ) you.duration[dur_list[i]] = 1; - contaminate_player( -1 * (1+random2(5))); + contaminate_player( -1 * (1 + random2(5))); } // end antimagic() void extension(int pow) @@ -1691,7 +1690,7 @@ bool cast_sure_blade(int power) } return (success); -} // end cast_sure_blade() +} void manage_fire_shield(void) { @@ -1703,7 +1702,6 @@ void manage_fire_shield(void) char stx = 0, sty = 0; for (stx = -1; stx < 2; stx++) - { for (sty = -1; sty < 2; sty++) { if (sty == 0 && stx == 0) @@ -1718,5 +1716,4 @@ void manage_fire_shield(void) 1 + random2(6), KC_YOU ); } } - } -} // end manage_fire_shield() +} |