summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-11 18:35:33 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-11 18:35:33 +0000
commit29ffe55ad8828e8d5d9fb20ae2c2331384f107f0 (patch)
tree1dd5d3b94e079e5c84ec3dd5e089dfdc3c268195
parent357f6f846a84ba771abf9b2610de26adc4e658bb (diff)
downloadcrawl-ref-29ffe55ad8828e8d5d9fb20ae2c2331384f107f0.tar.gz
crawl-ref-29ffe55ad8828e8d5d9fb20ae2c2331384f107f0.zip
TSO Smiting cost drop and monster electricity nerf for 0.3.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2441 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/abl-show.cc3
-rw-r--r--crawl-ref/source/beam.cc6
-rw-r--r--crawl-ref/source/mstuff2.cc2
3 files changed, 7 insertions, 4 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 9090078ec5..90aa4b25c0 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -239,7 +239,8 @@ static const ability_def Ability_List[] =
// The Shining One
{ ABIL_TSO_REPEL_UNDEAD, "Repel Undead", 1, 0, 100, 0, ABFLAG_NONE },
- { ABIL_TSO_SMITING, "Smiting", 3, 0, 50, 2, ABFLAG_NONE },
+ { ABIL_TSO_SMITING, "Smiting",
+ 3, 0, 50, generic_cost::fixed(2), ABFLAG_NONE },
{ ABIL_TSO_ANNIHILATE_UNDEAD, "Annihilate Undead", 3, 0, 50, 2, ABFLAG_NONE },
{ ABIL_TSO_CLEANSING_FLAME, "Cleansing Flame", 5, 0, 100, 2, ABFLAG_NONE },
{ ABIL_TSO_SUMMON_DAEVA, "Summon Daeva", 8, 0, 150, 4, ABFLAG_NONE },
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index cd1269dc41..01e3620354 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3331,8 +3331,10 @@ static int affect_player( bolt &beam )
int roll = hurted;
#endif
- hurted -= random2( 1 + player_AC() );
-
+ int armour_damage_reduction = random2( 1 + player_AC() );
+ if (beam.flavour == BEAM_ELECTRICITY)
+ armour_damage_reduction /= 2;
+ hurted -= armour_damage_reduction;
// shrapnel
if (beam.flavour == BEAM_FRAG && !player_light_armour())
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 8ae340cd7f..55f55cbc41 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -1655,7 +1655,7 @@ bolt mons_spells( int spell_cast, int power )
beam.name = "bolt of lightning";
beam.range = 7;
beam.rangeMax = 16;
- beam.damage = dice_def( 3, 10 + power / 9 );
+ beam.damage = dice_def( 3, 10 + power / 17 );
beam.colour = LIGHTCYAN;
beam.type = SYM_ZAP;
beam.thrower = KILL_MON;