summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells1.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-11 16:13:36 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-11 16:13:36 +0530
commit89b4e230ad3bdc806ae058722c70441d49f5d9fe (patch)
treefef3ab5111d75ce5869881542267c9f848e1fe33 /crawl-ref/source/spells1.cc
parent5871154a2e85ccd38874e88dea22083ced372141 (diff)
downloadcrawl-ref-89b4e230ad3bdc806ae058722c70441d49f5d9fe.tar.gz
crawl-ref-89b4e230ad3bdc806ae058722c70441d49f5d9fe.zip
Amulet of stasis, first cut.
Amulets of stasis blocks: - Teleport self - Blink in all forms - Slowing - Hasting - Paralysis - Petrify - Berserker rage The amulet auto-ids the first time it triggers. The amulet does not affect existing conditions (such as an existing Haste spell or an existing post-berserk Slow).
Diffstat (limited to 'crawl-ref/source/spells1.cc')
-rw-r--r--crawl-ref/source/spells1.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index 8ece64285d..8fa30ade07 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -31,6 +31,7 @@
#include "it_use2.h"
#include "itemname.h"
#include "itemprop.h"
+#include "item_use.h"
#include "los.h"
#include "message.h"
#include "misc.h"
@@ -83,7 +84,7 @@ int blink(int pow, bool high_level_controlled_blink, bool wizard_blink)
}
// yes, there is a logic to this ordering {dlb}:
- if (scan_artefacts(ARTP_PREVENT_TELEPORTATION) && !wizard_blink)
+ if (item_blocks_teleport(true) && !wizard_blink)
mpr("You feel a weird sense of stasis.");
else if (you.level_type == LEVEL_ABYSS
&& _abyss_blocks_teleport(high_level_controlled_blink)
@@ -199,7 +200,7 @@ void random_blink(bool allow_partial_control, bool override_abyss)
bool success = false;
coord_def target;
- if (scan_artefacts(ARTP_PREVENT_TELEPORTATION))
+ if (item_blocks_teleport(true))
mpr("You feel a weird sense of stasis.");
else if (you.level_type == LEVEL_ABYSS
&& !override_abyss && !one_chance_in(3))