summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-data.h
diff options
context:
space:
mode:
authorStefan O'Rear <stefanor@cox.net>2009-11-15 00:04:52 -0800
committerStefan O'Rear <stefanor@cox.net>2009-11-15 00:04:52 -0800
commit05010f1d267b268e68821223680f34545c443f5c (patch)
tree967466e274aa990271509d232af4a6c1fd0ad1a5 /crawl-ref/source/spl-data.h
parentdd56050f2d05db6ed7ff5bc99acd1032707c27fd (diff)
parent5bba7e89fd395a2cde9cbf596208785508e22331 (diff)
downloadcrawl-ref-05010f1d267b268e68821223680f34545c443f5c.tar.gz
crawl-ref-05010f1d267b268e68821223680f34545c443f5c.zip
Merge Johnny Shelley's arcane marksman patch
Diffstat (limited to 'crawl-ref/source/spl-data.h')
-rw-r--r--crawl-ref/source/spl-data.h62
1 files changed, 57 insertions, 5 deletions
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 4e678f2ce1..24f171e2e6 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -559,7 +559,7 @@
{
SPELL_DETECT_TRAPS, "Detect Traps",
- SPTYP_DIVINATION,
+ 0,
SPFLAG_MAPPING,
2,
50,
@@ -571,7 +571,7 @@
},
{
- SPELL_BLINK, "Blink",
+ SPELL_BLINK, "Blink",
SPTYP_TRANSLOCATION,
SPFLAG_ESCAPE,
2,
@@ -583,6 +583,45 @@
true
},
+{
+ SPELL_BLINK_RANGE, "Blink Range", // XXX needs better name
+ SPTYP_TRANSLOCATION,
+ SPFLAG_ESCAPE | SPFLAG_MONSTER,
+ 2,
+ 0,
+ -1, -1,
+ 0,
+ NULL,
+ false,
+ false
+},
+
+{
+ SPELL_BLINK_AWAY, "Blink Away",
+ SPTYP_TRANSLOCATION,
+ SPFLAG_ESCAPE | SPFLAG_MONSTER,
+ 2,
+ 0,
+ -1, -1,
+ 0,
+ NULL,
+ false,
+ false
+},
+
+{
+ SPELL_BLINK_CLOSE, "Blink Close",
+ SPTYP_TRANSLOCATION,
+ SPFLAG_MONSTER,
+ 2,
+ 0,
+ -1, -1,
+ 0,
+ NULL,
+ false,
+ false
+},
+
// The following name was found in the hack.exe file of an early version
// of PCHACK - credit goes to its creator (whoever that may be):
{
@@ -729,7 +768,7 @@
{
SPELL_DETECT_ITEMS, "Detect Items",
- SPTYP_DIVINATION,
+ 0,
SPFLAG_MAPPING,
2,
50,
@@ -1210,7 +1249,7 @@
{
SPELL_DETECT_CREATURES, "Detect Creatures",
- SPTYP_DIVINATION,
+ 0,
SPFLAG_MAPPING,
2,
60, // not 50, note the fuzz
@@ -1691,7 +1730,7 @@
{
SPELL_DETECT_SECRET_DOORS, "Detect Secret Doors",
- SPTYP_DIVINATION,
+ 0,
SPFLAG_NONE,
1,
200,
@@ -2239,6 +2278,19 @@
},
{
+ SPELL_BLINK_OTHER_CLOSE, "Blink Other Close",
+ SPTYP_TRANSLOCATION,
+ SPFLAG_TARGET | SPFLAG_MONSTER,
+ 2,
+ 0,
+ LOS_RADIUS, LOS_RADIUS,
+ 0,
+ NULL,
+ true,
+ false
+},
+
+{
SPELL_SUMMON_MUSHROOMS, "Summon Mushrooms",
SPTYP_SUMMONING,
SPFLAG_MONSTER,