diff options
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 7 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 61c87c46a8..1a4d2ae91a 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -114,7 +114,7 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] = { ABIL_ZIN_RECITE, ABIL_ZIN_SMITING, ABIL_ZIN_REVITALISATION, ABIL_NON_ABILITY, ABIL_ZIN_SANCTUARY }, // TSO - { ABIL_TSO_REPEL_UNDEAD, ABIL_TSO_DIVINE_SHIELD, ABIL_TSO_ANNIHILATE_UNDEAD, + { ABIL_NON_ABILITY, ABIL_TSO_DIVINE_SHIELD, ABIL_TSO_ANNIHILATE_UNDEAD, ABIL_TSO_CLEANSING_FLAME, ABIL_TSO_SUMMON_DAEVA }, // Kikubaaqudgha { ABIL_KIKU_RECALL_UNDEAD_SLAVES, ABIL_NON_ABILITY, @@ -239,7 +239,6 @@ static const ability_def Ability_List[] = { ABIL_ZIN_SANCTUARY, "Sanctuary", 7, 0, 150, 15, ABFLAG_NONE }, // The Shining One - { ABIL_TSO_REPEL_UNDEAD, "Repel Undead", 1, 0, 100, 0, ABFLAG_NONE }, { ABIL_TSO_DIVINE_SHIELD, "Divine Shield", 3, 0, 50, 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 }, @@ -633,7 +632,6 @@ static talent get_talent(ability_type ability, bool check_confused) break; case ABIL_ZIN_RECITE: - case ABIL_TSO_REPEL_UNDEAD: case ABIL_KIKU_RECALL_UNDEAD_SLAVES: case ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS: case ABIL_OKAWARU_MIGHT: @@ -1385,7 +1383,6 @@ static bool do_ability(const ability_def& abil) summon_ice_beast_etc(you.skills[SK_INVOCATIONS] * 4, MONS_ANGEL, true); exercise(SK_INVOCATIONS, 8 + random2(10)); break; -*/ case ABIL_TSO_REPEL_UNDEAD: turn_undead(you.piety); @@ -1401,6 +1398,7 @@ static bool do_ability(const ability_def& abil) exercise(SK_INVOCATIONS, 1); break; +*/ case ABIL_TSO_DIVINE_SHIELD: cast_divine_shield(); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index b16392d9f0..6f4695e5fd 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -72,14 +72,13 @@ enum ability_type ABIL_EVOKE_LEVITATE, ABIL_EVOKE_STOP_LEVITATING, ABIL_END_TRANSFORMATION, // 55 - + // Divine abilities ABIL_ZIN_RECITE = 110, // 110 - ABIL_ZIN_SMITING, + ABIL_ZIN_SMITING, ABIL_ZIN_REVITALISATION, ABIL_ZIN_SANCTUARY, - ABIL_TSO_REPEL_UNDEAD = 120, // 120 - ABIL_TSO_DIVINE_SHIELD, + ABIL_TSO_DIVINE_SHIELD = 120, // 120 ABIL_TSO_ANNIHILATE_UNDEAD, ABIL_TSO_CLEANSING_FLAME, ABIL_TSO_SUMMON_DAEVA, // 124 diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 324789813b..3d4f2ab1fc 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -707,12 +707,12 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) // Divine health and mp restoration doesn't happen when killing // born-friendly monsters. The mutation still applies, however. if (you.mutation[MUT_DEATH_STRENGTH] - || (!created_friendly - && gives_xp + || (!created_friendly && gives_xp && (you.religion == GOD_MAKHLEB || you.religion == GOD_SHINING_ONE && is_mons_evil_demonic_or_undead(monster)) - && (!player_under_penance() && random2(you.piety) >= 30))) + && (!player_under_penance() && + random2(you.piety) >= piety_breakpoint(0)))) { if (you.hp < you.hp_max) { @@ -726,7 +726,8 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) && (you.religion == GOD_MAKHLEB || you.religion == GOD_VEHUMET || you.religion == GOD_SHINING_ONE && is_mons_evil_demonic_or_undead(monster)) - && (!player_under_penance() && random2(you.piety) >= 30)) + && (!player_under_penance() + && random2(you.piety) >= piety_breakpoint(0))) { if (you.magic_points < you.max_magic_points) { diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 98e4467861..72e38ac3dc 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -195,7 +195,7 @@ const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] = "", "call upon Zin to create a Sanctuary" }, // TSO - { "repel the undead", + { "gain power from killing evil in The Shining One's name", "call upon The Shining One for a divine shield", "dispel the undead", "hurl blasts of cleansing flame", @@ -215,7 +215,7 @@ const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] = // Xom { "", "", "", "", "" }, // Vehumet - { "gain power from killing in Vehumet's name", + { "gain magical power from killing in Vehumet's name", "You can call upon Vehumet to aid your destructive magics with prayer.", "During prayer you have some protection from summoned creatures.", "", "" }, @@ -280,7 +280,7 @@ const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] = "", "call upon Zin to create a Sanctuary" }, // TSO - { "repel the undead", + { "gain power from killing evil in The Shining One's name", "call upon The Shining One for a divine shield", "dispel the undead", "hurl blasts of cleansing flame", @@ -300,7 +300,7 @@ const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] = // Xom { "", "", "", "", "" }, // Vehumet - { "gain power from killing in Vehumet's name", + { "gain magical power from killing in Vehumet's name", "Vehumet will no longer aid your destructive magics.", "Vehumet will no longer shield you from summoned creatures.", "", |