diff options
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/describe.cc | 11 | ||||
-rw-r--r-- | crawl-ref/source/mon-util.cc | 15 | ||||
-rw-r--r-- | crawl-ref/source/mutation.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/output.cc | 3 |
4 files changed, 21 insertions, 12 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index c2495e71f9..05ca6958d1 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2622,6 +2622,8 @@ static const char* _get_resist_name(mon_resist_flags res_type) return "cold"; case MR_RES_ACID: return "acid"; + case MR_RES_ROTTING: + return "rotting"; default: return "buggy resistance"; } @@ -2642,8 +2644,9 @@ static std::string _monster_stat_description(const monsters& mon) ? get_mons_class_resists(mon.type) : get_mons_resists(&mon); const mon_resist_flags resists[] = { - MR_RES_ELEC, MR_RES_POISON, MR_RES_FIRE, - MR_RES_STEAM, MR_RES_COLD, MR_RES_ACID + MR_RES_ELEC, MR_RES_POISON, MR_RES_FIRE, + MR_RES_STEAM, MR_RES_COLD, MR_RES_ACID, + MR_RES_ROTTING }; std::vector<std::string> extreme_resists; @@ -3635,7 +3638,7 @@ void describe_god( god_type which_god, bool give_title ) _print_final_god_abil_desc(which_god, buf, ABIL_ZIN_SUSTENANCE); } - const char *how = (you.piety >= 150) ? "carefully" : // res mut. 3 + const char *how = (you.piety >= 150) ? "carefully" : (you.piety >= 100) ? "often" : (you.piety >= 50) ? "sometimes" : "occasionally"; @@ -3646,7 +3649,7 @@ void describe_god( god_type which_god, bool give_title ) else if (which_god == GOD_SHINING_ONE) { have_any = true; - const char *how = (you.piety >= 150) ? "carefully" : // l.p. 3 + const char *how = (you.piety >= 150) ? "carefully" : (you.piety >= 100) ? "often" : (you.piety >= 50) ? "sometimes" : "occasionally"; diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index dc953f4305..a42409cf9c 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -276,13 +276,14 @@ short mon_resist_def::get_resist_level(mon_resist_flags res_type) const { switch (res_type) { - case MR_RES_ELEC: return elec; - case MR_RES_POISON: return poison; - case MR_RES_FIRE: return fire; - case MR_RES_STEAM: return steam; - case MR_RES_COLD: return cold; - case MR_RES_ACID: return acid; - default: return (0); + case MR_RES_ELEC: return elec; + case MR_RES_POISON: return poison; + case MR_RES_FIRE: return fire; + case MR_RES_STEAM: return steam; + case MR_RES_COLD: return cold; + case MR_RES_ACID: return acid; + case MR_RES_ROTTING: return rotting; + default: return (0); } } diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 55769f6eda..5eaa5f64e5 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1593,7 +1593,7 @@ static void _display_vampire_attributes() std::string result; - const int lines = 14; + const int lines = 15; std::string column[lines][7] = { {" ", "<lightgreen>Alive</lightgreen> ", "<green>Full</green> ", @@ -1615,6 +1615,8 @@ static void _display_vampire_attributes() {"Negative resistance ", " ", " ", " + ", " ++ ", " +++ ", " +++ "}, + {"Rotting resistance ", " ", " ", " ", " + ", " + ", " + "}, + {"Torment resistance ", " ", " ", " ", " ", " ", " + "}, {EOL "<w>Other effects</w>" EOL diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index d498d043ef..1744cf8527 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1825,6 +1825,7 @@ static std::vector<formatted_string> _get_overview_resistances( const int rmuta = (wearing_amulet(AMU_RESIST_MUTATION, calc_unid) || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3 || you.religion == GOD_ZIN && you.piety >= 150); + const int rrott = you.res_rotting(); const int rslow = wearing_amulet(AMU_RESIST_SLOW, calc_unid); snprintf(buf, sizeof buf, @@ -1836,6 +1837,7 @@ static std::vector<formatted_string> _get_overview_resistances( "%sSpirit.Shd: %s\n" "%sSust.Abil.: %s\n" "%sRes.Mut. : %s\n" + "%sRes.Rott. : %s\n" "%sRes.Slow : %s\n", _determine_colour_string(rfire, 3), itosym3(rfire), _determine_colour_string(rcold, 3), itosym3(rcold), @@ -1845,6 +1847,7 @@ static std::vector<formatted_string> _get_overview_resistances( _determine_colour_string(rspir, 1), itosym1(rspir), _determine_colour_string(rsust, 1), itosym1(rsust), _determine_colour_string(rmuta, 1), itosym1(rmuta), + _determine_colour_string(rrott, 1), itosym1(rrott), _determine_colour_string(rslow, 1), itosym1(rslow)); cols.add_formatted(0, buf, false); |