summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-16 10:55:26 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-16 10:55:26 +0000
commit1ece2e1bb923cba7ce186e93de54fc8dc78b1cd2 (patch)
tree1c5d64769a944258ea10cc004742d2db0b6b45df
parentbf366a62ce2da465778e9a6fa8b7661a213c13b7 (diff)
downloadcrawl-ref-1ece2e1bb923cba7ce186e93de54fc8dc78b1cd2.tar.gz
crawl-ref-1ece2e1bb923cba7ce186e93de54fc8dc78b1cd2.zip
Fixed maps broken by KFEAT changes in trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3076 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/dat/elf.des11
-rw-r--r--crawl-ref/source/dat/float.des1
-rw-r--r--crawl-ref/source/dat/hive.des1
-rw-r--r--crawl-ref/source/dat/lab.des1
-rw-r--r--crawl-ref/source/dat/large.des5
-rw-r--r--crawl-ref/source/dat/mini.des3
-rw-r--r--crawl-ref/source/dat/orc.des2
-rw-r--r--crawl-ref/source/dat/vaults.des1
8 files changed, 25 insertions, 0 deletions
diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index f99913cb8b..36c7eb89f4 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -105,6 +105,9 @@ SHUFFLE: 23, 45
KMONS: $ = weight:450 nothing / deep elf sorcerer / deep elf annihilator
KMONS: * = weight:300 nothing / deep elf annihilator / deep elf death mage
KMONS: | = weight:600 nothing / deep elf demonologist / deep elf death mage
+KFEAT: $ = $
+KFEAT: * = *
+KFEAT: | = |
SUBST: v = v .:2
SUBST: v : xvb
SUBST: | = | *:2
@@ -167,6 +170,9 @@ SUBST: 4=4., 2=2., 5=5., 3=3.
KMONS: $ = weight:115 nothing / deep elf annihilator
KMONS: * = weight:105 nothing / deep elf death mage
KMONS: | = weight:290 nothing / deep elf sorcerer
+KFEAT: $ = $
+KFEAT: * = *
+KFEAT: | = |
SUBST: | = | *:2
SUBST: * = * |:3
KMONS: A = deep elf master archer
@@ -222,10 +228,15 @@ SUBST: N=@, n=., Z=c, z=c
KMONS: $ = weight:115 nothing / deep elf annihilator
KMONS: * = weight:105 nothing / deep elf death mage
KMONS: | = weight:290 nothing / deep elf sorcerer
+KFEAT: $ = $
+KFEAT: * = *
+KFEAT: | = |
SUBST: | = | *:2
SUBST: * = * |:3
KITEM: 6 = |
KITEM: 7 = |
+KFEAT: 6 = 6
+KFEAT: 7 = 7
MAP
ccccccccccccccccccccccccc
c2ccccccc.......ccccccccc
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 8fc02bda98..3ad73576c2 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -262,6 +262,7 @@ MONS: rat/grey rat/w:6 green rat/w:3 orange rat/w:20 giant bat
MONS: flying skull, human zombie
MONS: vampire, vampire mage, vampire knight
KITEM: > = any good_item
+KFEAT: > = >
KFEAT: ; = altar_yredelemnul/altar_kikubaaqudgha
SHUFFLE: defg
SHUFFLE: *s/!?
diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des
index 6182b58bdc..dbfc2cf3fb 100644
--- a/crawl-ref/source/dat/hive.des
+++ b/crawl-ref/source/dat/hive.des
@@ -151,6 +151,7 @@ MONS: firedrake / w:5 nothing
SHUFFLE: UVTXYZ, lL4/lL4/lL4/wW5
SUBST: l=.l, L=l, w=.w, W=w, U==, V=a, T=a, X=a, Y=a, Z=a, '=.a
KMONS: l = firedrake / w:200 nothing
+KFEAT: l = l
ORIENT: float
MAP
..................
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index 350cf59a50..4e3405db7b 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -130,6 +130,7 @@ SUBST: d = c, e = ., f = c.
SUBST: g = c, h = .
SUBST: k = <, l = ., m = ., i = ., j = .
KMONS: < = minotaur
+KFEAT: < = <
SUBST: c : vvc
validate {{ return has_exit_from_glyph('<') }}
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index a85a8d791a..4a5eccd4e3 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -364,6 +364,9 @@ SHUFFLE: 890
KITEM: 8 = | / nothing w:50
KITEM: 9 = * / nothing w:50
KITEM: 0 = % / nothing w:50
+KFEAT: 8 = 8
+KFEAT: 9 = 9
+KFEAT: 0 = 0
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -918,7 +921,9 @@ ITEM: royal jelly / honeycomb w:20 / nothing w:30
ITEM: scroll of teleportation
KFEAT: T = teleport trap
KMONS: w = electrical eel / jellyfish / nothing w:120
+KFEAT: w = w
KMONS: l = fire vortex / lava snake / lava fish / fire elemental w:1 / nothing w:50
+KFEAT: l = l
KMONS: z = killer bee
KMONS: Z = bumblebee
KITEM: z = royal jelly / honeycomb w:20 / nothing w:120
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index f6f34c3406..952641c300 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -311,6 +311,7 @@ TAGS: no_pool_fixup uniq_water_maze_lemuel
DEPTH: 5-27
SHUFFLE: abcd, efgh, ijkl, mnop
KMONS: * = fungus
+KFEAT: * = *
SUBST: a = =, b = x, c = x, d = x
SUBST: e = =, f = x, g = x, h = x
SUBST: i = =, j = x, k = x, l = x
@@ -1049,6 +1050,8 @@ DEPTH: 13-26, !Orc, !Lair, !Swamp, !Shoal
SUBST: Y = 89
KITEM: 8 = % / * / w:1 |
KITEM: 9 = % / * / w:1 |
+KFEAT: 8 = 8
+KFEAT: 9 = 9
KFEAT: X = teleport trap
KFEAT: Z : teleport trap / w:30 x
SHUFFLE: xcvb
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index a6326054a8..7d3b2a3897 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -186,6 +186,7 @@ TAGS: orc_entry
MONS: orc, orc priest/orc wizard, weight:50 orc warrior/ogre, swamp drake
# The drake's name is Bobby. Since you did ask.
KITEM: 1 = sausage / nothing / animal skin / potion of confusion / potion of paralysis / potion of slowing / potion of degeneration / w:2 potion of speed / w:2 potion of might
+KFEAT: 1 = 1
ITEM: club, potion of confusion, slice of pizza, sausage / weight:40 nothing
ITEM: potion of confusion / potion of water
SHUFFLE: defO
@@ -282,6 +283,7 @@ SUBST: X : c:60 .
SUBST: v : c:60 .
SUBST: b : c:60 .
KITEM: 2 = knife
+KFEAT: 2 = 2
#
MAP
..............................
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index 5290c3e117..6c4ba200c8 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -188,6 +188,7 @@ ORIENT: encompass
#
# the rune's spot, occassionally put nasty on the rune
KMONS: O = 8 / 9 / w:80 nothing
+KFEAT: O = O
NSUBST: O = O / o
KITEM: o = any good_item
KFEAT: o = w:120 . / any shop