summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-28 09:28:25 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-28 09:28:25 +0000
commit64bceda514975079abe443208b60678d1582c42e (patch)
treed2e82c6c0fd53f747f2c1756623bc3e48df92a0e
parentbb8e9480efb1259fbb2da1e07bdfc0b613c68eea (diff)
downloadcrawl-ref-64bceda514975079abe443208b60678d1582c42e.tar.gz
crawl-ref-64bceda514975079abe443208b60678d1582c42e.zip
Fix fake rakshasas being described as summoned.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9840 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/dat/database/FAQ.txt14
-rw-r--r--crawl-ref/source/describe.cc2
-rw-r--r--crawl-ref/source/directn.cc2
3 files changed, 10 insertions, 8 deletions
diff --git a/crawl-ref/source/dat/database/FAQ.txt b/crawl-ref/source/dat/database/FAQ.txt
index eff0143976..4df69f4124 100644
--- a/crawl-ref/source/dat/database/FAQ.txt
+++ b/crawl-ref/source/dat/database/FAQ.txt
@@ -58,9 +58,9 @@ A:downstairs
A: While this might be a bug, chances are the downstairs are somewhere in
a room closed off by a secret door. If you search (with '5') in suspicious
looking corridors and along walls near empty terrain, you will eventually
-find one. Note that most level feature three downstairs as well as three
+find one. Note that most levels feature three downstairs as well as three
upstairs, not counting any escape hatches. If you get stuck, you might
-try another stairs from the level above.
+try another set of stairs from the level above.
Alternatively, if you are in one of the branches, you might also have
reached its lowest level and have to turn around to explore another one.
Check the database ('?/b') for the number of levels per branch.
@@ -141,8 +141,8 @@ Which gods would you recommend to a beginning player?
%%%%
A:religion
-A: The easiest gods to play are probably Trog (for pure fighters), Sif Muna
-(for spellcasters), Beogh (for orcs) and Xom (for general fun).
+A: The easiest gods to play are probably Trog (for pure fighters), Vehumet or
+Sif Muna (for spellcasters), Beogh (for orcs) and Xom (for general fun).
When you reach the Temple for the first time be sure to read all gods'
descriptions and take your time in deciding which way to go.
%%%%
@@ -162,6 +162,7 @@ the end of prayer before chopping a corpse if need be.
Also, casting (difficult) spells will make you hungry, but high
Intelligence and Spellcasting will lessen this effect. If you press 'II',
you can read about the hunger effects of your spells.
+Invocations likewise often have a Food cost.
%%%%
Q:ghosts
@@ -170,7 +171,8 @@ I keep getting murdered by my own ghosts. Can I deactivate them?
A:ghosts
A: No, you can't. On the plus side, once a ghost has been loaded onto a
-level, it won't be loaded again - unless you happen to die on that level.
+level, it won't be loaded again - unless you happen to die on that level,
+thus creating a bones file featuring more than one ghost.
Keep in mind that you don't absolutely have to fight every monster you meet,
and with ghosts it's even easier: they cannot leave the level they were
created on.
@@ -303,7 +305,7 @@ into the game.
Note that your idea has better chances to be accepted if you present the
ramifications on gameplay. Since we put a lot of emphasis on the interface,
-a good proposal on how to make the game play smoother may go without much
+a good proposal on how to make the game play smoother may go in without much
ado.
%%%%
Q:feature
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index ec681119df..9437a4c4c8 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2904,7 +2904,7 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
<< " is incapable of using stairs.$";
}
- if (mons_is_summoned(&mons))
+ if (mons_is_summoned(&mons) && mons.type != MONS_RAKSHASA_FAKE)
{
inf.body << "$" << "This monster has been summoned, and is thus only "
"temporary. Killing it yields no experience, nutrition "
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 9cccc435a1..cc6b8ea9d7 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -3065,7 +3065,7 @@ static std::string _get_monster_desc(const monsters *mon)
else if (mons_neutral(mon)) // don't differentiate between permanent or not
text += pronoun + " is indifferent to you.\n";
- if (mons_is_summoned(mon))
+ if (mons_is_summoned(mon) && mon->type != MONS_RAKSHASA_FAKE)
text += pronoun + " has been summoned.\n";
if (mon->haloed())