[crawl-ref-commits] SF.net SVN: crawl-ref: [1174] trunk/crawl-ref/source

[<dsh...@us...>]

Revision: 1174
          http://svn.sourceforge.net/crawl-ref/?rev=1174&view=rev
Author:   dshaligram
Date:     2007-04-01 13:06:57 -0700 (Sun, 01 Apr 2007)

Log Message:
-----------
Fixed super-electric-golems.

Modified Paths:
--------------
    trunk/crawl-ref/source/fight.cc
    trunk/crawl-ref/source/mon-data.h
    trunk/crawl-ref/source/player.cc

Modified: trunk/crawl-ref/source/fight.cc
===================================================================
--- trunk/crawl-ref/source/fight.cc	2007-04-01 19:06:14 UTC (rev 1173)
+++ trunk/crawl-ref/source/fight.cc	2007-04-01 20:06:57 UTC (rev 1174)
@@ -2760,8 +2760,10 @@
 
     case AF_ELEC:
         special_damage =
-            resist_adjust_damage(defender->res_elec(),
-                                 atk->hit_dice + random2( 2 * atk->hit_dice ));
+            resist_adjust_damage(
+                defender->res_elec(),
+                atk->hit_dice + random2( atk->hit_dice / 2 ));
+
         if (defender->levitates())
             special_damage = special_damage * 2 / 3;
 
@@ -2770,6 +2772,10 @@
                  attacker->name(DESC_CAP_THE).c_str(),
                  attacker->conj_verb("shock").c_str(),
                  defender->name(DESC_NOCAP_THE).c_str());
+
+#ifdef DEBUG_DIAGNOSTICS
+        mprf(MSGCH_DIAGNOSTICS, "Shock damage: %d", special_damage);
+#endif
         break;
 
     case AF_VAMPIRIC:

Modified: trunk/crawl-ref/source/mon-data.h
===================================================================
--- trunk/crawl-ref/source/mon-data.h	2007-04-01 19:06:14 UTC (rev 1173)
+++ trunk/crawl-ref/source/mon-data.h	2007-04-01 20:06:57 UTC (rev 1174)
@@ -3833,7 +3833,7 @@
     M_SPELLCASTER | M_SEE_INVIS,
     MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
     0, 10, MONS_CLAY_GOLEM, MONS_ELECTRIC_GOLEM, MH_NONLIVING, -8,
-    { {AT_HIT, AF_ELEC, 12}, {AT_HIT, AF_ELEC, 12}, {AT_HIT, AF_ELEC, 12}, {AT_HIT, AF_PLAIN, 12} },
+    { {AT_HIT, AF_ELEC, 15}, {AT_HIT, AF_ELEC, 15}, {AT_HIT, AF_PLAIN, 18}, {AT_HIT, AF_PLAIN, 18} },
     { 15, 7, 4, 0 },
     5, 20, 20, 7, MST_ELECTRIC_GOLEM, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
     MONUSE_OPEN_DOORS, SIZE_LARGE

Modified: trunk/crawl-ref/source/player.cc
===================================================================
--- trunk/crawl-ref/source/player.cc	2007-04-01 19:06:14 UTC (rev 1173)
+++ trunk/crawl-ref/source/player.cc	2007-04-01 20:06:57 UTC (rev 1174)
@@ -5080,7 +5080,7 @@
 
 int player::res_elec() const
 {
-    return (player_res_electricity());
+    return (player_res_electricity() * 2);
 }
 
 int player::res_poison() const


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.