diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-14 19:23:10 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-14 19:23:10 +0000 |
| commit | 5db5426d5582062f0279b52aeb709ab5b305a3b7 (patch) | |
| tree | cfd59cb063dec58668621af4263b1def8aee4136 /crawl-ref/source/fight.cc | |
| parent | 528f1a17029220a1fdb35b335c6352bebe50903a (diff) | |
| download | crawl-ref-5db5426d5582062f0279b52aeb709ab5b305a3b7.tar.gz crawl-ref-5db5426d5582062f0279b52aeb709ab5b305a3b7.zip | |
Switched confusing touch success calc to the 4.1.2 model, where it's a simple
no-spell-skill roll against HD (ignoring monster MR). This makes confusing
touch more useful to part-time casters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1864 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index b647428c04..527aececd5 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1741,11 +1741,12 @@ bool melee_attack::apply_damage_brand() break; emit_nodmg_hit_message(); - + // FIXME Currently Confusing Touch is the *only* way to get // here. Generalise. - const int pow = calc_spell_power(SPELL_CONFUSING_TOUCH, true, false); - if (!check_mons_resist_magic(def, pow)) + const int hdcheck = + (defender->holiness() == MH_NATURAL? random2(30) : random2(22)); + if (hdcheck >= def->hit_dice) { // declaring these just to pass to the enchant function bolt beam_temp; @@ -1753,8 +1754,7 @@ bool melee_attack::apply_damage_brand() beam_temp.flavour = BEAM_CONFUSION; mons_ench_f2( def, beam_temp ); } - - you.duration[DUR_CONFUSING_TOUCH] -= random2(20); + you.duration[DUR_CONFUSING_TOUCH] -= roll_dice(3, 5); if (you.duration[DUR_CONFUSING_TOUCH] < 1) you.duration[DUR_CONFUSING_TOUCH] = 1; |