summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/abl-show.cc19
-rw-r--r--crawl-ref/source/decks.cc2
-rw-r--r--crawl-ref/source/religion.cc2
3 files changed, 20 insertions, 3 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 05a75e815c..e693b3f8da 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -687,6 +687,21 @@ static talent get_talent(ability_type ability, bool check_confused)
failure = 80 - (you.piety / 25) - (you.skills[SK_INVOCATIONS] * 4);
break;
+ case ABIL_NEMELEX_STACK_DECK:
+ invoc = true;
+ failure = 80 - (you.piety / 25) - (4 * you.skills[SK_EVOCATIONS]);
+ break;
+
+ case ABIL_NEMELEX_PEEK:
+ invoc = true;
+ failure = 40 - (you.piety / 20) - (5 * you.skills[SK_EVOCATIONS]);
+ break;
+
+ case ABIL_NEMELEX_TRIPLE_DRAW:
+ invoc = true;
+ failure = 60 - (you.piety / 20) - (5 * you.skills[SK_EVOCATIONS]);
+ break;
+
//jmf: following for to-be-created gods
case ABIL_CHARM_SNAKE:
invoc = true;
@@ -732,7 +747,6 @@ static talent get_talent(ability_type ability, bool check_confused)
result.is_invocation = invoc;
return result;
-
}
std::vector<const char*> get_ability_names()
@@ -1567,16 +1581,19 @@ static bool do_ability(const ability_def& abil)
case ABIL_NEMELEX_TRIPLE_DRAW:
if ( !deck_triple_draw() )
return false;
+ exercise(SK_EVOCATIONS, 3 + random2(3));
break;
case ABIL_NEMELEX_PEEK:
if ( !deck_peek() )
return false;
+ exercise(SK_EVOCATIONS, 2 + random2(2));
break;
case ABIL_NEMELEX_STACK_DECK:
if ( !deck_stack() )
return false;
+ exercise(SK_EVOCATIONS, 5 + random2(5));
break;
case ABIL_BEOGH_SMITING:
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index e69681a6b6..8f56dfdee8 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1108,7 +1108,7 @@ static int card_power(deck_rarity_type rarity)
else if ( you.religion == GOD_NEMELEX_XOBEH && you.duration[DUR_PRAYER] )
{
result = you.piety;
- result *= (you.skills[SK_INVOCATIONS] + 25);
+ result *= (you.skills[SK_EVOCATIONS] + 25);
result /= 27;
}
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 8f155b25f5..cfd0bfd0e1 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2434,7 +2434,7 @@ void offer_items()
{
if (you.religion == GOD_NO_GOD)
return;
-
+
int i = igrd[you.x_pos][you.y_pos];
while (i != NON_ITEM)
{