diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-02-20 05:07:00 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-02-20 05:07:00 +0100 |
| commit | 30d37ef7a7daa2b88f93d43bccb9c141448edf65 (patch) | |
| tree | d24da09d0c51b53cbd1e8507a252af5a8f61a841 /crawl-ref/source/notes.cc | |
| parent | b89be0430b6359a069e13c86565dbf6985eefe5e (diff) | |
| parent | 9d196e98bf78ac3589ad650da44d0b9a2d6613a2 (diff) | |
| download | crawl-ref-30d37ef7a7daa2b88f93d43bccb9c141448edf65.tar.gz crawl-ref-30d37ef7a7daa2b88f93d43bccb9c141448edf65.zip | |
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/notes.cc')
| -rw-r--r-- | crawl-ref/source/notes.cc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc index 37842c0d41..946b5078b6 100644 --- a/crawl-ref/source/notes.cc +++ b/crawl-ref/source/notes.cc @@ -90,6 +90,7 @@ static bool _is_noteworthy_dlevel(unsigned short place) if (lev == _dungeon_branch_depth(branch) || branch == BRANCH_MAIN_DUNGEON && (lev % 5) == 0 + || branch == BRANCH_MAIN_DUNGEON && lev == 14 || branch != BRANCH_MAIN_DUNGEON && lev == 1) { return (true); @@ -114,7 +115,7 @@ static bool _is_noteworthy(const Note& note) || note.type == NOTE_BUY_ITEM || note.type == NOTE_DONATE_MONEY || note.type == NOTE_SEEN_MONSTER - || note.type == NOTE_KILL_MONSTER + || note.type == NOTE_DEFEAT_MONSTER || note.type == NOTE_POLY_MONSTER || note.type == NOTE_USER_NOTE || note.type == NOTE_MESSAGE @@ -127,7 +128,6 @@ static bool _is_noteworthy(const Note& note) || note.type == NOTE_PARALYSIS || note.type == NOTE_NAMED_ALLY || note.type == NOTE_ALLY_DEATH - || note.type == NOTE_BANISH_MONSTER || note.type == NOTE_FEAT_MIMIC) { return (true); @@ -348,11 +348,11 @@ std::string Note::describe(bool when, bool where, bool what) const case NOTE_SEEN_MONSTER: result << "Noticed " << name; break; - case NOTE_KILL_MONSTER: + case NOTE_DEFEAT_MONSTER: if (second) - result << name << " (ally) was defeated"; + result << name << " (ally) was " << desc; else - result << "Defeated " << name; + result << uppercase_first(desc) << " " << name; break; case NOTE_POLY_MONSTER: result << name << " changed into " << desc; @@ -407,19 +407,13 @@ std::string Note::describe(bool when, bool where, bool what) const case NOTE_ALLY_DEATH: result << "Your ally " << name << " died"; break; - case NOTE_BANISH_MONSTER: - if (second) - result << name << " (ally) was banished"; - else - result << "Banished " << name; - break; default: result << "Buggy note description: unknown note type"; break; } } - if (type == NOTE_SEEN_MONSTER || type == NOTE_KILL_MONSTER) + if (type == NOTE_SEEN_MONSTER || type == NOTE_DEFEAT_MONSTER) { if (what && first == MONS_PANDEMONIUM_LORD) result << " the pandemonium lord"; @@ -466,7 +460,7 @@ void Note::check_milestone() const if (dep == 1) mark_milestone("br.enter", "entered " + branch + ".", true); - else if (dep == _dungeon_branch_depth(br)) + else if (dep == _dungeon_branch_depth(br) || dep == 14) { std::string level = place_name(packed_place, true, true); if (level.find("Level ") == 0) @@ -474,7 +468,7 @@ void Note::check_milestone() const std::ostringstream branch_finale; branch_finale << "reached " << level << "."; - mark_milestone("br.end", branch_finale.str()); + mark_milestone(dep == 14 ? "br.mid" : "br.end", branch_finale.str()); } } } |