Skip to content

Commit

Permalink
Don't list stealth/MR in word form on @ and %
Browse files Browse the repository at this point in the history
Since it's now listed in bar form, as with resistances.
  • Loading branch information
Chris Campbell committed Aug 2, 2016
1 parent fec9346 commit 61d329a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 45 deletions.
32 changes: 0 additions & 32 deletions crawl-ref/source/output.cc
Expand Up @@ -2530,32 +2530,6 @@ void print_overview_screen()
redraw_screen();
}

static const char* stealth_words[11] =
{
"extremely un", "very un", "un", "fairly ", "", "quite ", "very ",
"extremely ", "extraordinarily ", "incredibly ", "uncannily "
};

string stealth_desc(int stealth)
{
return make_stringf("%sstealthy", stealth_words[_stealth_breakpoint(stealth)]);
}

string magic_res_adjective(int mr)
{
if (mr == MAG_IMMUNE)
return "immune";

string prefix =
(mr < 40) ? "not" :
(mr < 80) ? "somewhat" :
(mr < 120) ? "very" :
(mr < 160) ? "extremely" :
(mr < 200) ? "incredibly"
: "almost entirely";
return prefix + " resistant";
}

static string _annotate_form_based(string desc, bool suppressed)
{
if (suppressed)
Expand Down Expand Up @@ -2595,12 +2569,6 @@ static string _status_mut_abilities(int sw)
status.emplace_back(help);
}

status.push_back(magic_res_adjective(player_res_magic(false))
+ " to hostile enchantments");

// character evaluates their ability to sneak around:
status.push_back(stealth_desc(check_stealth()));

text += comma_separated_line(status.begin(), status.end(), ", ", ", ");
text += "\n";

Expand Down
3 changes: 0 additions & 3 deletions crawl-ref/source/output.h
Expand Up @@ -28,7 +28,4 @@ void print_overview_screen();

string dump_overview_screen(bool full_id);

string magic_res_adjective(int mr);
string stealth_desc(int stealth);

#endif
10 changes: 0 additions & 10 deletions crawl-ref/source/player.cc
Expand Up @@ -3623,16 +3623,6 @@ void display_char_status()
innate_stat(STAT_INT),
innate_stat(STAT_DEX));
}

// magic resistance
_display_char_status(you.res_magic(),
"You are %s to hostile enchantments",
magic_res_adjective(player_res_magic(false)).c_str());

// character evaluates their ability to sneak around:
_display_char_status(check_stealth(),
"You are %s",
stealth_desc(check_stealth()).c_str());
}

bool player::clarity(bool calc_unid, bool items) const
Expand Down

0 comments on commit 61d329a

Please sign in to comment.