From 61fca12c44d0bf3760a21a494d7a9734a5f14538 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 18 Jul 2009 21:15:50 +0000 Subject: Add still more cleanups. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10283 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 10 +++++----- crawl-ref/source/enum.h | 4 ++-- crawl-ref/source/religion.cc | 4 ++-- crawl-ref/source/religion.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index c8f0922db8..3bd2be8fe6 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -146,7 +146,7 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] = ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS, ABIL_NON_ABILITY }, // Jiyva { ABIL_JIYVA_CALL_JELLY, ABIL_NON_ABILITY, ABIL_NON_ABILITY, - ABIL_JIYVA_SLIMIFY, ABIL_JIYVA_CURE_BAD_MUTATIONS } + ABIL_JIYVA_SLIMIFY, ABIL_JIYVA_CURE_BAD_MUTATION } }; // The description screen was way out of date with the actual costs. @@ -325,7 +325,7 @@ static const ability_def Ability_List[] = { ABIL_JIYVA_CALL_JELLY, "Request Jelly", 2, 0, 20, 1, ABFLAG_NONE }, { ABIL_JIYVA_JELLY_SHIELD, "Jelly Shield", 0, 0, 0, 0, ABFLAG_PIETY }, { ABIL_JIYVA_SLIMIFY, "Slimify", 4, 0, 100, 3, ABFLAG_NONE }, - { ABIL_JIYVA_CURE_BAD_MUTATIONS, "Cure Bad Mutations", + { ABIL_JIYVA_CURE_BAD_MUTATION, "Cure Bad Mutation", 8, 0, 200, 15, ABFLAG_NONE }, { ABIL_HARM_PROTECTION, "Protection From Harm", 0, 0, 0, 0, ABFLAG_NONE }, @@ -759,7 +759,7 @@ static talent _get_talent(ability_type ability, bool check_confused) case ABIL_YRED_ENSLAVE_SOUL: case ABIL_ELYVILON_DIVINE_VIGOUR: case ABIL_LUGONU_ABYSS_ENTER: - case ABIL_JIYVA_CURE_BAD_MUTATIONS: + case ABIL_JIYVA_CURE_BAD_MUTATION: invoc = true; failure = 80 - (you.piety / 25) - (you.skills[SK_INVOCATIONS] * 4); break; @@ -1934,8 +1934,8 @@ static bool _do_ability(const ability_def& abil) exercise(SK_INVOCATIONS, 3 + random2(5)); break; - case ABIL_JIYVA_CURE_BAD_MUTATIONS: - if (jiyva_remove_bad_mutations()) + case ABIL_JIYVA_CURE_BAD_MUTATION: + if (jiyva_remove_bad_mutation()) exercise(SK_INVOCATIONS, 5 + random2(5)); break; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index b86bcb354c..8ee1835ff3 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -104,9 +104,9 @@ enum ability_type ABIL_BEOGH_SMITING, ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS, ABIL_JIYVA_CALL_JELLY, - ABIL_JIYVA_JELLY_SHIELD, // 240 + ABIL_JIYVA_JELLY_SHIELD, // 240 ABIL_JIYVA_SLIMIFY, - ABIL_JIYVA_CURE_BAD_MUTATIONS, + ABIL_JIYVA_CURE_BAD_MUTATION, ABIL_TRAN_BAT = 244, ABIL_HARM_PROTECTION, diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 50b83e1cc4..8dbf81b5c9 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -930,7 +930,7 @@ bool jiyva_grant_jelly(bool actual) && (!actual || you.duration[DUR_PRAYER])); } -bool jiyva_remove_bad_mutations() +bool jiyva_remove_bad_mutation() { if (!how_mutated()) { @@ -957,7 +957,7 @@ bool jiyva_remove_bad_mutations() mutation_type mutat = RANDOM_ELEMENT(bad_muts); if (you.mutation[mutat] > 0) - done = delete_mutation(mutat); + done = delete_mutation(mutat, true, false, true); } if (!done) diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 833e842276..950ea5fd0a 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -104,7 +104,7 @@ bool zin_sustenance(bool actual = true); bool zin_remove_all_mutations(); bool yred_injury_mirror(bool actual = true); bool jiyva_grant_jelly(bool actual = true); -bool jiyva_remove_bad_mutations(); +bool jiyva_remove_bad_mutation(); bool beogh_water_walk(); void good_god_holy_attitude_change(monsters *holy); void good_god_holy_fail_attitude_change(monsters *holy); -- cgit v1.2.3-54-g00ecf