summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-cast.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-08-13 10:25:22 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-08-13 10:25:22 +0000
commit2de657642dded89bf7f04024b5e7f6eb4a00a18a (patch)
treecfd04b8277b524ab8ed1c4fc8ba5635a7ba05983 /crawl-ref/source/spl-cast.cc
parent3f3afe7a266723d33b84c19b09b45854dee24ebd (diff)
downloadcrawl-ref-2de657642dded89bf7f04024b5e7f6eb4a00a18a.tar.gz
crawl-ref-2de657642dded89bf7f04024b5e7f6eb4a00a18a.zip
FR 2819565: Abort when trying to read a known ?blinking or ?teleportation
or when zapping a known /teleportation at yourself if you know you have a -TELE artefact equipped. In the same situation, prompt when trying to evoke Blink or cast one of the teleportation spells, in case the player insists on training Evoc/Spellcasting/Translocations that way. Also, automatically update the autoinscriptions when tweaking artefact properties in wizard mode. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10532 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
-rw-r--r--crawl-ref/source/spl-cast.cc19
1 files changed, 18 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 0d6b7ed2b1..f549179ac8 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -279,7 +279,16 @@ int list_spells(bool toggle_with_I, bool viewing, int minRange)
{
const char letter = index_to_letter(i);
const spell_type spell = get_spell_by_letter(letter);
- if (!viewing)
+
+ // If an equipped artefact prevents teleportation, the following spells
+ // cannot be cast.
+ if ((spell == SPELL_BLINK || spell == SPELL_CONTROLLED_BLINK
+ || spell == SPELL_TELEPORT_SELF)
+ && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false))
+ {
+ grey = true;
+ }
+ else if (!viewing)
{
if (spell_mana(spell) > you.magic_points
|| _spell_no_hostile_in_range(spell, minRange))
@@ -1128,6 +1137,14 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
if (!wiz_cast && _spell_is_uncastable(spell))
return (SPRET_ABORT);
+ if ((spell == SPELL_BLINK || spell == SPELL_CONTROLLED_BLINK
+ || spell == SPELL_TELEPORT_SELF)
+ && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false)
+ && !yesno("You cannot teleport right now. Cast anyway?", true, 'n'))
+ {
+ return (SPRET_ABORT);
+ }
+
const unsigned int flags = get_spell_flags(spell);
ASSERT(wiz_cast || !(flags & SPFLAG_TESTING));