From 5eb82b7b46b569cc0a5dbedc58decf6405a72a5f Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 6 May 2009 17:56:57 +0000
Subject: Increase and randomize the piety cost of Trog's Hand, since it now
 does more.  Also, change the ability name to better reflect what it now does.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9742 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/abl-show.cc | 11 ++++++-----
 crawl-ref/source/abl-show.h  |  2 +-
 crawl-ref/source/enum.h      |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 8be6b565d5..b3f586ae06 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -129,7 +129,7 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
     { ABIL_SIF_MUNA_CHANNEL_ENERGY, ABIL_SIF_MUNA_FORGET_SPELL,
       ABIL_NON_ABILITY, ABIL_NON_ABILITY, ABIL_NON_ABILITY },
     // Trog
-    { ABIL_TROG_BERSERK, ABIL_TROG_REGENERATION, ABIL_NON_ABILITY,
+    { ABIL_TROG_BERSERK, ABIL_TROG_REGEN_MR, ABIL_NON_ABILITY,
       ABIL_TROG_BROTHERS_IN_ARMS, ABIL_NON_ABILITY },
     // Nemelex
     { ABIL_NEMELEX_DRAW_ONE, ABIL_NEMELEX_PEEK_TWO, ABIL_NEMELEX_TRIPLE_DRAW,
@@ -271,7 +271,8 @@ static const ability_def Ability_List[] =
     // Trog
     { ABIL_TROG_BURN_SPELLBOOKS, "Burn Spellbooks", 0, 0, 10, 0, ABFLAG_NONE },
     { ABIL_TROG_BERSERK, "Berserk", 0, 0, 200, 0, ABFLAG_NONE },
-    { ABIL_TROG_REGENERATION, "Trog's Hand", 0, 0, 50, 1, ABFLAG_NONE },
+    { ABIL_TROG_REGEN_MR, "Trog's Hand",
+      0, 0, 50, generic_cost::range(2, 3), ABFLAG_NONE },
     { ABIL_TROG_BROTHERS_IN_ARMS, "Brothers in Arms",
       0, 0, 100, generic_cost::range(5, 6), ABFLAG_NONE },
 
@@ -678,7 +679,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
         failure = 30 - you.piety;       // starts at 0%
         break;
 
-    case ABIL_TROG_REGENERATION:         // piety >= 50
+    case ABIL_TROG_REGEN_MR:            // piety >= 50
         invoc = true;
         failure = 80 - you.piety;       // starts at 30%
         break;
@@ -1680,7 +1681,7 @@ static bool _do_ability(const ability_def& abil)
         go_berserk(true);
         break;
 
-    case ABIL_TROG_REGENERATION:
+    case ABIL_TROG_REGEN_MR:
         // Trog abilities don't use or train invocations.
         cast_regen(you.piety / 2, true);
         break;
@@ -2489,5 +2490,5 @@ static void _lugonu_bends_space()
 
 int generic_cost::cost() const
 {
-    return base + (add > 0 ? random2avg(add, rolls) : 0);
+    return (base + (add > 0 ? random2avg(add, rolls) : 0));
 }
diff --git a/crawl-ref/source/abl-show.h b/crawl-ref/source/abl-show.h
index e8fcedf238..ecd2884be8 100644
--- a/crawl-ref/source/abl-show.h
+++ b/crawl-ref/source/abl-show.h
@@ -20,7 +20,7 @@ struct generic_cost
     int base, add, rolls;
 
     generic_cost(int num)
-        : base(num), add(num == 0? 0 : (num + 1) / 2 + 1), rolls(1)
+        : base(num), add(num == 0 ? 0 : (num + 1) / 2 + 1), rolls(1)
     {
     }
     generic_cost(int num, int _add, int _rolls = 1)
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 74bd3723b9..572535ceae 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -80,7 +80,7 @@ enum ability_type
     ABIL_SIF_MUNA_FORGET_SPELL,
     ABIL_TROG_BURN_SPELLBOOKS = 199,
     ABIL_TROG_BERSERK = 200,                //  200
-    ABIL_TROG_REGENERATION,
+    ABIL_TROG_REGEN_MR,
     ABIL_TROG_BROTHERS_IN_ARMS,
     ABIL_ELYVILON_DESTROY_WEAPONS = 219,
     ABIL_ELYVILON_LESSER_HEALING_SELF = 220, //  220
-- 
cgit v1.2.3-54-g00ecf