Adjusted monster beam to-hit numbers.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1053 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 27 insertions, 39 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index b47c2eb040..7063ee21a4 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3087,7 +3087,7 @@ static int affect_player( struct bolt &beam )
 
 
                 // miss message
-                if (!test_hit(beamHit, dodge) || you.duration[DUR_DEFLECT_MISSILES])
+                if (!test_hit(beamHit, dodge))
                 {
                     mprf("The %s misses you.", beam.name.c_str());
                     return (0);
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 0d741668c5..ac77cda8d7 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -99,18 +99,6 @@ static void mons_lose_attack_energy(monsters *attacker, int wpn_speed,
  **************************************************
 */
 
-#if 0
-#define GUARANTEED_HIT_PERCENTAGE       5
-
-bool test_hit( int to_hit, int ev, int bonus )
-{
-    if (random2(100) < 2 * GUARANTEED_HIT_PERCENTAGE)
-        return (coinflip());
-
-    return (random2( to_hit ) + bonus >= ev);
-}
-#endif
-
 // This function returns the "extra" stats the player gets because of
 // choice of weapon... it's used only for giving warnings when a player
 // weilds a less than ideal weapon.
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 1ee5cdeff7..2294ce549c 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -1340,7 +1340,7 @@ bolt mons_spells( int spell_cast, int power )
         // high to-hit value, so these should do more damage -- bwr
         beam.damage = dice_def( 3, 5 + (power / 40) );
 
-        beam.hit = 60;
+        beam.hit = 25 + power / 40;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_FIRE;
@@ -1357,7 +1357,7 @@ bolt mons_spells( int spell_cast, int power )
         // see MS_FLAME -- bwr
         beam.damage = dice_def( 3, 5 + (power / 40) );
 
-        beam.hit = 60;
+        beam.hit = 25 + power / 40;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_COLD;
@@ -1413,7 +1413,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_POISON;
-        beam.hit = 11 + power / 20;
+        beam.hit = 19 + power / 20;
         beam.is_beam = true;
         break;
 
@@ -1424,7 +1424,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_MISSILE;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_POISON_ARROW;
-        beam.hit = 16 + power / 25;
+        beam.hit = 20 + power / 25;
         beam.range = beam.rangeMax = 8;
         break;
 
@@ -1437,7 +1437,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_LAVA;
-        beam.hit = 14 + power / 25;
+        beam.hit = 17 + power / 25;
         beam.is_beam = true;
         break;
         
@@ -1450,7 +1450,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_FIRE;
-        beam.hit = 14 + power / 25;
+        beam.hit = 17 + power / 25;
         beam.is_beam = true;
         break;
 
@@ -1463,7 +1463,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_ICE;
-        beam.hit     = 14 + power / 25;
+        beam.hit     = 17 + power / 25;
         beam.is_beam = true;
         break;
         
@@ -1476,7 +1476,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_COLD;
-        beam.hit = 14 + power / 25;
+        beam.hit = 17 + power / 25;
         beam.is_beam = true;
         break;
 
@@ -1489,7 +1489,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type   = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_ELECTRICITY;
-        beam.hit = 14 + power / 20;
+        beam.hit = 17 + power / 20;
         beam.is_beam = true;
         break;
         
@@ -1502,7 +1502,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_ELECTRICITY;
-        beam.hit = 10 + power / 40;
+        beam.hit = 16 + power / 40;
         beam.is_beam = true;
         break;
 
@@ -1537,7 +1537,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = 0;
         beam.flavour = BEAM_HEALING;
         beam.thrower = KILL_MON;
-        beam.hit = 5 + (power / 5);
+        beam.hit = 25 + (power / 5);
         beam.is_beam = true;
         break;
 
@@ -1574,7 +1574,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_MISSILE;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_MMISSILE;
-        beam.hit = 18 + power / 20;
+        beam.hit = 22 + power / 20;
         beam.is_beam = false;
         break;
 
@@ -1597,7 +1597,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_NEG;
-        beam.hit = 13 + power / 35;
+        beam.hit = 16 + power / 35;
         beam.is_beam = true;
         break;
 
@@ -1609,7 +1609,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 6;
         beam.rangeMax = 10;
         beam.damage = dice_def( 3, 7 + (power / 14) );
-        beam.hit = 16 + (power / 20);
+        beam.hit = 20 + (power / 20);
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_MMISSILE;
@@ -1624,7 +1624,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 6;
         beam.rangeMax = 10;
         beam.damage = dice_def( 3, 7 + (power / 15) );
-        beam.hit = 15 + power / 20;
+        beam.hit = 20 + power / 20;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_STEAM;
@@ -1655,7 +1655,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 6;
         beam.rangeMax = 10;
         beam.damage = dice_def( 3, 3 + power / 50 );
-        beam.hit = 13 + power / 15;
+        beam.hit = 18 + power / 15;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_FIRE;
@@ -1671,7 +1671,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_POISON;
-        beam.hit = 13 + power / 25;
+        beam.hit = 18 + power / 25;
         beam.is_beam = true;
         beam.is_big_cloud = true;
         break;
@@ -1682,7 +1682,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 6;
         beam.rangeMax = 10;
         beam.damage = dice_def( 3, 10 + power / 15 );
-        beam.hit = 16 + power / 25;
+        beam.hit = 20 + power / 25;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_MMISSILE;
@@ -1696,7 +1696,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 9;
         beam.rangeMax = 23;
         beam.damage = dice_def( 3, 20 );
-        beam.hit = 13 + power / 30;
+        beam.hit = 15 + power / 30;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_NUKE;     // a magical missile which destroys walls
@@ -1722,7 +1722,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 4;
         beam.rangeMax = 8;
         beam.damage = dice_def( 3, 8 + (power / 9) );
-        beam.hit = 16 + (power / 25);
+        beam.hit = 20 + (power / 25);
         beam.type = SYM_MISSILE;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_MMISSILE;   // similarly unresisted thing
@@ -1735,7 +1735,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 8;
         beam.rangeMax = 12;
         beam.damage = dice_def( 3, 5 + (power / 10) );
-        beam.hit = 10 + power / 35;
+        beam.hit = 14 + power / 35;
         beam.type = SYM_MISSILE;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_MMISSILE;   // similarly unresisted thing
@@ -1748,7 +1748,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 5;
         beam.rangeMax = 10;
         beam.damage = dice_def( 1, 4 + power / 10 );
-        beam.hit = 11 + power / 20;
+        beam.hit = 16 + power / 20;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_POISON;
@@ -1789,7 +1789,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_MIASMA;
-        beam.hit = 14 + power / 20;
+        beam.hit = 17 + power / 20;
         beam.is_beam = true;
         beam.is_big_cloud = true;
         beam.range = beam.rangeMax = 8;
@@ -1801,7 +1801,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 9;
         beam.rangeMax = 23;
         beam.damage = dice_def( 3, 25 );
-        beam.hit = 12 + power / 25;
+        beam.hit = 16 + power / 25;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON_MISSILE;
         beam.flavour = BEAM_MMISSILE;
@@ -1814,7 +1814,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.range = 4;
         beam.rangeMax = 13;
         beam.damage = dice_def( 3, 25 );
-        beam.hit = 20;
+        beam.hit = 24;
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_HELLFIRE;
@@ -1831,7 +1831,7 @@ bolt mons_spells( int spell_cast, int power )
         beam.type = SYM_ZAP;
         beam.thrower = KILL_MON;
         beam.flavour = BEAM_FRAG;
-        beam.hit = 15 + power / 30;
+        beam.hit = 19 + power / 30;
         beam.is_beam = true;
         break;