summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-09 21:48:55 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-09 21:48:55 +0000
commit5e2d8f305c41e9f2eec9b5a66804d1a03370a0b5 (patch)
treeee600a1ceea04920fc86a59e13495b94db2a9e7b /crawl-ref/source/effects.cc
parentdbe4130e239966c0e524704123c0fb094a07e7ec (diff)
downloadcrawl-ref-5e2d8f305c41e9f2eec9b5a66804d1a03370a0b5.tar.gz
crawl-ref-5e2d8f305c41e9f2eec9b5a66804d1a03370a0b5.zip
Implement FR 1808966:
Your summoned Daevas leave you if TSO puts you under penance, and they'll actually attack you if you abandon TSO. While the former only applies to Daevas on your current level, the latter happens for all visited dungeon levels. The functions used are generic enough to work for other cases as well, e.g. Trog's "Brothers in Arms" now also turn hostile if you leave Trog. Also: * Make Beogh "protect you from harm" like Zin/TSO do, but only if you're not under penance. * Correct Amulet of inaccuracy description (Bug 1895810). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3558 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 70c8b27159..d6af67574d 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1869,7 +1869,7 @@ void yell(bool force)
}
mpr("What do you say?", MSGCH_PROMPT);
- mprf(" ! - %s", cap_shout.c_str());
+ mprf(" t - %s", cap_shout.c_str());
if (!you.duration[DUR_BERSERKER])
{
@@ -1894,7 +1894,7 @@ void yell(bool force)
switch (keyn)
{
- case '!':
+ case 't':
mprf(MSGCH_SOUND, "You %s for attention!", shout_verb.c_str());
you.turn_is_over = true;
noisy( noise_level, you.x_pos, you.y_pos );