Attached Files |
0001-Fix-unique-annotations-for-polymorphed-royal-jelly-B.patch [^] (1,354 bytes) 2011-12-09 18:38 [Show Content] [Hide Content]From c9a0ba5fe6b605738c4d89366afded65501c04af Mon Sep 17 00:00:00 2001
From: Aaron Becker <akbecker@gmail.com>
Date: Fri, 9 Dec 2011 11:37:01 -0600
Subject: [PATCH] Fix unique annotations for polymorphed royal jelly, Blork the orc, etc
---
crawl-ref/source/dgn-overview.cc | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/dgn-overview.cc b/crawl-ref/source/dgn-overview.cc
index 731617b..f4bcee2 100644
--- a/crawl-ref/source/dgn-overview.cc
+++ b/crawl-ref/source/dgn-overview.cc
@@ -882,10 +882,19 @@ static void _update_unique_annotation(level_id level)
static std::string unique_name(monster* mons)
{
std::string name = mons->name(DESC_PLAIN, true);
- if (mons->type == MONS_LERNAEAN_HYDRA)
- name = "Lernaean hydra";
if (mons->type == MONS_PLAYER_GHOST)
name += ", " + short_ghost_description(mons, true);
+ else {
+ if (strstr(name.c_str(), "royal jelly")
+ || strstr(name.c_str(), "Royal Jelly"))
+ name = "Royal Jelly";
+ if (strstr(name.c_str(), "Lernaean hydra"))
+ name = "Lernaean hydra";
+ if (strstr(name.c_str(), "Serpent of Hell"))
+ name = "Lernaean hydra";
+ if (strstr(name.c_str(), "Blork"))
+ name = "Blork the orc";
+ }
return name;
}
--
1.7.4.1
0001-For-unique-annotations-check-whether-monster-has-eve.patch [^] (1,263 bytes) 2011-12-09 19:20 [Show Content] [Hide Content]From 81e232c661913af49d68c962aa3c28300d442c1e Mon Sep 17 00:00:00 2001
From: Aaron Becker <akbecker@gmail.com>
Date: Fri, 9 Dec 2011 12:18:44 -0600
Subject: [PATCH] For unique annotations, check whether monster has ever been unique.
When uniques are polymorphed, mons_is_unique becomes false, and you have
to separately check the original_was_unique property, otherwise their
annotations won't work correctly.
---
crawl-ref/source/dgn-overview.cc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/crawl-ref/source/dgn-overview.cc b/crawl-ref/source/dgn-overview.cc
index f4bcee2..f1885b3 100644
--- a/crawl-ref/source/dgn-overview.cc
+++ b/crawl-ref/source/dgn-overview.cc
@@ -903,7 +903,10 @@ void set_unique_annotation(monster* mons, const level_id level)
// Abyss persists its denizens.
if (level.level_type != LEVEL_DUNGEON && level.level_type != LEVEL_ABYSS)
return;
- if (!mons_is_unique(mons->type) && mons->type != MONS_PLAYER_GHOST)
+ if (!mons_is_unique(mons->type)
+ && !(mons->props.exists("original_was_unique")
+ && mons->props["original_was_unique"].get_bool())
+ && mons->type != MONS_PLAYER_GHOST)
return;
remove_unique_annotation(mons);
--
1.7.4.1
0001-Fix-annotation-name-for-Serpent-of-Hell.patch [^] (884 bytes) 2011-12-09 19:36 [Show Content] [Hide Content]From 62567bc23a7bf2bb2a0e76dcc33b52aeb8b378f8 Mon Sep 17 00:00:00 2001
From: Aaron Becker <akbecker@gmail.com>
Date: Fri, 9 Dec 2011 12:35:51 -0600
Subject: [PATCH] Fix annotation name for Serpent of Hell.
---
crawl-ref/source/dgn-overview.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/crawl-ref/source/dgn-overview.cc b/crawl-ref/source/dgn-overview.cc
index f1885b3..86cdf83 100644
--- a/crawl-ref/source/dgn-overview.cc
+++ b/crawl-ref/source/dgn-overview.cc
@@ -891,7 +891,7 @@ static std::string unique_name(monster* mons)
if (strstr(name.c_str(), "Lernaean hydra"))
name = "Lernaean hydra";
if (strstr(name.c_str(), "Serpent of Hell"))
- name = "Lernaean hydra";
+ name = "Serpent of Hell";
if (strstr(name.c_str(), "Blork"))
name = "Blork the orc";
}
--
1.7.4.1
|