From 436078067b93a484213ed2a2bc212e7127f75e49 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 19 Jan 2009 18:36:11 +0000 Subject: Rename cleansing flame resistance to holy energy resistance, and clean up holy wrath weapon checks. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8595 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 4c7fd7f5fd..346ba40798 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2259,12 +2259,12 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted, case BEAM_HOLY: { // Cleansing flame. - const int rcf = monster->res_cleansing_flame(pbolt.agent()); - if (rcf > 0) + const int rhe = monster->res_holy_energy(pbolt.agent()); + if (rhe > 0) hurted = 0; - else if (rcf == 0) + else if (rhe == 0) hurted /= 2; - else if (rcf < -1) + else if (rhe < -1) hurted = (hurted * 3) / 2; if (doFlavouredEffects) @@ -3207,7 +3207,7 @@ bool bolt::is_harmless(const monsters *mon) const return (true); case BEAM_HOLY: - return (mon->res_cleansing_flame(agent()) > 0); + return (mon->res_holy_energy(agent()) > 0); case BEAM_STEAM: return (mons_res_steam(mon) >= 3); @@ -5365,7 +5365,7 @@ bool bolt::nasty_to(const monsters *mon) const { // Cleansing flame. if (flavour == BEAM_HOLY) - return (mon->res_cleansing_flame(agent()) <= 0); + return (mon->res_holy_energy(agent()) <= 0); // Take care of other non-enchantments. if (!is_enchantment()) @@ -5596,7 +5596,7 @@ std::string beam_type_name(beam_type type) case BEAM_STEAM: return("steam"); case BEAM_ENERGY: return("energy"); - case BEAM_HOLY: return("holy power"); + case BEAM_HOLY: return("holy energy"); case BEAM_FRAG: return("fragments"); case BEAM_LAVA: return("magma"); case BEAM_ICE: return("ice"); -- cgit v1.2.3-54-g00ecf