Menu
▾
▴
[crawl-ref-commits] master branch updated: 0.14-a0-66-g560282b
|
From: <gi...@cr...> - 2013-09-30 17:15:11
|
via 560282b6d41e0319427228cb1b2c16fe234102e0 (commit)
via 011cccd8b062ad9854dd629e73d88d488ca87466 (commit)
via 11c248451e2392f93de405dfe692c31ff6ff4338 (commit)
via b88737e909f4e54c920e240f93eca2ce475f8a4d (commit)
from 96a4fb3f24cbe59ac6ac971ccdd3387b5efd3146 (commit)
-----------------------------------------------------------------------
commit 560282b6d41e0319427228cb1b2c16fe234102e0
Author: Adam Borowski <kil...@an...>
Date: Mon Sep 30 04:25:12 2013 +0200
Colour large rocks differently than stones and sling bullets.
Hardly ever the same character will want both.
commit 011cccd8b062ad9854dd629e73d88d488ca87466
Author: Adam Borowski <kil...@an...>
Date: Sat Sep 28 05:45:04 2013 +0200
Delete three empty description files.
They had only quotes.
commit 11c248451e2392f93de405dfe692c31ff6ff4338
Author: Adam Borowski <kil...@an...>
Date: Sat Sep 28 05:08:22 2013 +0200
Get rid of traps in a number of vaults.
This is a step towards complete removal of mechanical traps. The few traps
that are supposed to remain don't work well in the niche once filled by
mechanical ones. And, most vaults placed them in fixed or almost fixed
places.
This is only a start of the work, there are some cases that need discussing.
commit b88737e909f4e54c920e240f93eca2ce475f8a4d
Author: Adam Borowski <kil...@an...>
Date: Fri Sep 27 18:01:15 2013 +0200
Move the handling of 'B' vault altars to the proper function.
That's what the comment requested. I think 'C' should be moved, too --
it is random, unlike anything else in that function.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/des/altar/overflow.des | 4 ++-
crawl-ref/source/dat/des/branches/geh.des | 2 +-
crawl-ref/source/dat/des/branches/hell.des | 5 +--
crawl-ref/source/dat/des/branches/orc.des | 4 +-
crawl-ref/source/dat/des/branches/pan.des | 10 +++---
crawl-ref/source/dat/des/branches/swamp.des | 17 ++++-----
crawl-ref/source/dat/des/branches/tomb.des | 1 -
crawl-ref/source/dat/des/serial/column_ruins.des | 8 ++---
crawl-ref/source/dat/des/variable/float.des | 39 +++++++++-----------
.../source/dat/des/variable/large_abstract.des | 18 +++++-----
.../source/dat/des/variable/lemuel_castle.des | 16 ++++----
.../source/dat/des/variable/mini_features.des | 5 ++-
.../source/dat/des/variable/mini_monsters.des | 8 ++--
crawl-ref/source/dat/des/variable/tomb_raider.des | 3 +-
crawl-ref/source/dat/descript/pl/branches.txt | 1 -
crawl-ref/source/dat/descript/pl/features.txt | 1 -
crawl-ref/source/dat/descript/pl/monsters.txt | 1 -
crawl-ref/source/dungeon.cc | 10 ++---
crawl-ref/source/makeitem.cc | 4 ++-
19 files changed, 73 insertions(+), 84 deletions(-)
delete mode 100644 crawl-ref/source/dat/descript/pl/branches.txt
delete mode 100644 crawl-ref/source/dat/descript/pl/features.txt
delete mode 100644 crawl-ref/source/dat/descript/pl/monsters.txt
diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index 42c8936..b5bfc3b 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -1484,7 +1484,8 @@ MONS: orc; club ego:chaos / orc; dagger ego:chaos / orc; spear ego:chaos
MONS: gnoll; club ego:chaos / gnoll; dagger ego:chaos / gnoll; spear ego:chaos
MONS: place:D:1-8
NSUBST: ' = 1:_ / *:.
-SUBST: . = .:200 ~:70 W:60 w:50 x:80 n:80 v b l Z T U M:20
+SUBST: . = .:200 ~:10 W:60 w:50 x:80 n:80 v b l Z T U M:20
+KFEAT: ~ = shaft trap / teleport trap / alarm trap w:3
NSUBST: Z = 1:* / *:%
SUBST: M : 123333M, 1 = 1.., 2 = 2.., M = 123.
COLOUR: . = random
@@ -1599,6 +1600,7 @@ SUBST: . = lWwtm_~......
KFEAT: _ = altar_xom
NSUBST: T = 3:T / .
KFEAT: T = known teleport trap
+KFEAT: ~ = shaft trap / alarm trap / teleport trap
: interest_check(_G)
MAP
@
diff --git a/crawl-ref/source/dat/des/branches/geh.des b/crawl-ref/source/dat/des/branches/geh.des
index e0e5ddd..ca48c29 100644
--- a/crawl-ref/source/dat/des/branches/geh.des
+++ b/crawl-ref/source/dat/des/branches/geh.des
@@ -149,7 +149,7 @@ KMONS: L = patrolling efreet w:12 / patrolling fire elemental w:8
KFEAT: L = l
KPROP: l = no_cloud_gen
SHUFFLE: 13, 24, 12 / 12 / 12 / 11 / 11 / 22, ()~- / ()~- / -~(), () / {( / }) / '' / ''
-SUBST: 4 = 3, ' = .:99 >:1, ( = ( <:2, ) = ) >:2
+SUBST: 4 = 3, ' = .:99 >:1, ( = ( <:2, ) = ) >:2, ~- = .
: if you.branch() == "Geh" then
SUBST: d$ = .
: end
diff --git a/crawl-ref/source/dat/des/branches/hell.des b/crawl-ref/source/dat/des/branches/hell.des
index 6a9b031..e2cf2f3 100644
--- a/crawl-ref/source/dat/des/branches/hell.des
+++ b/crawl-ref/source/dat/des/branches/hell.des
@@ -310,11 +310,10 @@ ENDMAP
NAME: vestibule_tar_mu
TAGS: vestibule_tar
MARKER: T=feat:enter_tartarus
-FTILE: =~T3Dz+'; = floor_infernal_blank
+FTILE: =T3Dz+'; = floor_infernal_blank
TILE: c = dngn_stone_dark
SUBST: T=A
-SUBST: . = ~.........
-SUBST: ; = ~...
+SUBST: ; = .
KMONS: 3 = shadow wraith
KMONS: z = skeletal warrior / zombie / nothing
KMONS: D = shadow dragon
diff --git a/crawl-ref/source/dat/des/branches/orc.des b/crawl-ref/source/dat/des/branches/orc.des
index 61d7201..ce1e684 100644
--- a/crawl-ref/source/dat/des/branches/orc.des
+++ b/crawl-ref/source/dat/des/branches/orc.des
@@ -39,10 +39,10 @@ MAP
xx.....xxx.I.I.xxx..I..x
xx......x.......x......xx
x..x.x..x..x+x..x..x+x..x
-x.xx.xx.x.xx.xx.x.xx~xx.x
+x.xx.xx.x.xx.xx.x.xx.xx.x
x.x%1.x.x.x2e2x.x.x3d3x.x
x.x.%1x.x.x2e2x.x.xd3dx.x
-x.xx.xx.x.xx.xx.x.xx~xx.x
+x.xx.xx.x.xx.xx.x.xx.xx.x
x..x.x..x..x+x..x..x+x..x
x.......+.......+.......x
xx.....xxx.I.I.xxx..I..xx
diff --git a/crawl-ref/source/dat/des/branches/pan.des b/crawl-ref/source/dat/des/branches/pan.des
index 0864f42..a75019b 100644
--- a/crawl-ref/source/dat/des/branches/pan.des
+++ b/crawl-ref/source/dat/des/branches/pan.des
@@ -310,7 +310,7 @@ DEPTH: D:21-
MONS: common demon
KMONS: O = any demon
KFEAT: O = enter_pandemonium
-NSUBST: ^ = 4:^ / 4:1 / *:.
+NSUBST: ^ = 4:1 / *:.
MAP
............
.xxxxxxxxxx.
@@ -1387,10 +1387,10 @@ MAP
.xxxxxxxxxx.
.x2+3+3+3xx.
.x+xxxxxx2x.
-.x3x^^^^x+x.
-.x+x^P^^x2x.
-.x3x^^1^x+x.
-.x+x^^^^x3x.
+.x3x....x+x.
+.x+x.P..x2x.
+.x3x..1.x+x.
+.x+x....x3x.
.x2xxxx+x+x.
.xx2+2+3x3x.
.xxxxxxxx=x.
diff --git a/crawl-ref/source/dat/des/branches/swamp.des b/crawl-ref/source/dat/des/branches/swamp.des
index bcdd9f7..22fd6f8 100644
--- a/crawl-ref/source/dat/des/branches/swamp.des
+++ b/crawl-ref/source/dat/des/branches/swamp.des
@@ -281,17 +281,16 @@ KMONS: 3 = vapour
KFEAT: t = mangrove
KFEAT: 123 = deep_water
SHUFFLE: })
-SUBST: T = w:3 t, M = ~:4 t, W = W:3 w, . = .:3 W, } = }:20 >, ) = ):25 <>
-KPROP: ~ = no_rtele_into
+SUBST: T = w:3 t, W = W:3 w, . = .:3 W, } = }:20 >, ) = ):25 <>
MAP
- Mtttttt @tt{@
- Mttttttttt..ttM
-Mttt3twwwtWT.wtt
-Mtt211w}wwt.wwwtt
+ ttttttt @tt{@
+ tttttttttt..ttt
+tttt3twwwtWT.wtt
+ttt211w}wwt.wwwtt
ttt11w.w.w.w11ttt
-ttwww.tWw)w112ttM
-Mttw.TWt.wwt3tttM
- Mtt..tttttttttM
+ttwww.tWw)w112ttt
+tttw.TWt.wwt3tttt
+ ttt..tttttttttt
tt@ ttttttt
ENDMAP
diff --git a/crawl-ref/source/dat/des/branches/tomb.des b/crawl-ref/source/dat/des/branches/tomb.des
index 13c859a..6504c56 100644
--- a/crawl-ref/source/dat/des/branches/tomb.des
+++ b/crawl-ref/source/dat/des/branches/tomb.des
@@ -274,7 +274,6 @@ SUBST: - = T
SUBST: _ = F 6 ~:30 .:30
SUBST: T = ~ .
SUBST: t = ~ .:50
-SUBST: ' = ~ ':200
SUBST: ' = 5 .:100
SUBST: 2 = 2 1:2 .
SUBST: 1 = 1 2:3 .
diff --git a/crawl-ref/source/dat/des/serial/column_ruins.des b/crawl-ref/source/dat/des/serial/column_ruins.des
index 0a4db88..6c099bc 100644
--- a/crawl-ref/source/dat/des/serial/column_ruins.des
+++ b/crawl-ref/source/dat/des/serial/column_ruins.des
@@ -36,9 +36,8 @@ function init_column_ruins(e)
e.subst('q = GGG__')
e.subst('r = GG__.')
e.subst('s = G_...')
- e.subst('_ = _:24 ~:1')
- e.ftile('_~$%*90GTUVB = floor_rough_brown')
- e.colour('_~$%*90TUVB = brown')
+ e.ftile('_$%*90GTUVB = floor_rough_brown')
+ e.colour('_$%*90TUVB = brown')
e.tile('G = dngn_crumbled_column')
e.colour('G = lightgrey')
e.subst('_ = .')
@@ -670,7 +669,6 @@ TAGS: allow_dup mini_float transparent
WEIGHT: 10
SUBST: 0 = 0:40 9:10 $:15 %:5 *:1 T:9 _:20
SUBST: T = TTUVVV
-SUBST: ~ = ~__
: init_column_ruins_hut(_G)
: init_column_ruins(_G)
MAP
@@ -681,7 +679,7 @@ MKJx___xJKM
LJ_x_0_x_JL
MJ_x___x_JM
MKJxx+xxJKM
-rLp_G~G_pLr
+rLp_G_G_pLr
MLKJ___JKLM
sMrKqJqKrMs
NMMMLLLMMMN
diff --git a/crawl-ref/source/dat/des/variable/float.des b/crawl-ref/source/dat/des/variable/float.des
index c1dab97..8e67996 100644
--- a/crawl-ref/source/dat/des/variable/float.des
+++ b/crawl-ref/source/dat/des/variable/float.des
@@ -631,7 +631,6 @@ TAGS: extra luniq_staircase decor
DEPTH: D:2-26
WEIGHT: 3
NSUBST: } = 1:} / *:.
-NSUBST: ~ = 1:~ / *:.
SHUFFLE: })]{([
MAP
xxxxxxx
@@ -641,7 +640,7 @@ x.x.x.x
x.x.x.x
x.x.x.x
x+x+x+x
-x~~~~~x
+x.....x
x.....x
x.....x
xx...xx
@@ -1201,8 +1200,6 @@ DEPTH: D:12-
ORIENT: float
SUBST: 9 = 9 0 8:2
SUBST: 0 = 0 .
-KFEAT: $ = ^
-KITEM: $ = gold
MAP
........................
wwwwwwwwwwwwwwwwwwwwwwww
@@ -1486,8 +1483,8 @@ SHUFFLE: AB@
SUBST: x = .:30 W x:4
SUBST: A : x, B : x
SUBST: D = .:30 W
-KFEAT: E = w:20 . / x / w:50 W / w:30 w / ~
-KFEAT: F = w:150 w / w:70 W / ~ / . / x
+KFEAT: E = w:20 . / x / w:50 W / w:30 w
+KFEAT: F = w:150 w / w:70 W / . / x
KFEAT: G = x / . / w / W
KFEAT: H = . / W
KMONS: D = Plant / w:200 nothing
@@ -2307,7 +2304,6 @@ DEPTH: D:14-
ORIENT: float
NSUBST: . = 7:0 / 2:9 / 1:8 / *:.
NSUBST: ' = 7:0 / 2:9 / 1:8 / *:.
-SUBST: . = .:90 ~
NSUBST: % = 6:* / 3:| / *=%$
SUBST: - = .
MAP
@@ -2466,7 +2462,6 @@ ORIENT: float
TAGS: no_pool_fixup
SUBST: w: wlll
NSUBST: . = 10:0 / 4:9 / *:.
-SUBST: . = .:90 ~
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
wwwwwwwwwwxxxxxxwwwxxxxxxxxxxxx
@@ -2886,7 +2881,7 @@ WEIGHT: 4
SUBST: X : cccvvb
MAP
X@XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-X....XXXXXXXX0X.X.............~...........X....X
+X....XXXXXXXX0X.X.........................X....X
XXXX.XX.......X.X.XXX.XXXXXXXX.XXXXXXXX.X.X.XX.X
X....XX.XXXXXXX.X...X.XG.....X.XXXXXXXX.X...XX.X
X.XXXXX.X.......XXX.X.XXXXXX.X.X.....XX.XXXXXX.X
@@ -2897,7 +2892,7 @@ X.....X.XXXXXXX.XXXXX.X....X.X.X.XXX......XXXX.X
X.XX.XX..X....X.....X.X.XX.X.X.X.XXXXXXXXXXXXX.X
X.XXXXXX.X.XX.XXXXXXX.XGXX.....X.X|X...XX....X.X
X......X.X.XXXXXXXXXXXXXXXXXXXXX.n|X.X.XX.XX.X.X
-XXXXXX.X.X..........~............X|+.X....XX.X.X
+XXXXXX.X.X.......................X|+.X....XX.X.X
X.XXXX.X.X.XXXXXXXX.X.XXXXXXXXXX.XXXXXXXXXXX.X.X
X.XXXX.X.X.X.XX...X.X.XXXXX....X.XX..........X.X
X......X...X....XXX.X.X...X.XX.X.XX.XXX.XXXXXX.X
@@ -2907,7 +2902,7 @@ X.XX.X.XXXXXXX.X.X.XX.XX..X.XX...X......XXX....X
X.XX...XXX.XXX.X.X.XX.XX.XX.XXXX.X.XXXX.....XX.X
X.XXXXXXXX.X...X...XX.XX.....9*X.X....XXX.XXXX.X
X.XXXXXXXX.XXXXXXXXXX.XXXXXXXXXX.X.XXXX0X.X.GX.X
-X.XXXXXXXX............~..........X.XXX..X.X.XX.X
+X.XXXXXXXX.......................X.XXX..X.X.XX.X
X.X...XXXX.XXXXXXXXXX.XXXXXXXXXX.X.....XX.X.XX.X
X.X.X.XXXX.X........X.XX.......X.XXXXXXXX.X.XX.X
X...X........XXXXXX0X....XXXXX............X....X
@@ -2925,19 +2920,19 @@ xx@xxxxxxxxxxxxxxxxxxxxxxxxxx
xx..0....0....0....+........x
xxG%xxxG%xxxG%xxxG%x........x
xxxxxxxxxxxxxxxxxxxx+xxxxxxxx
-xx0........0.......~.......xx
+xx0........0...............xx
xwwwwwwwwwwwwwwwwwwwwwwwwwwwx
xwwwwwwwwwwwwwwwwwwwwwwwwwwwx
xx.........................xx
xxxx.xxxxxxxxxxxxxxxxxxxxxxxx
-xxx.xxx~.xxxxxxxxx..xxxxxG.xx
+xxx.xxx..xxxxxxxxx..xxxxxG.xx
xx.xx0.xx.xxxxxxx.xx.xxxxxx.x
-x.xxxxxxxx.xxx...xxxx..xxxx~x
+x.xxxxxxxx.xxx...xxxx..xxxx.x
x.x...xxx.x.x.xxx.xxxxx.xx.xx
xx.xxx...xxx.xxxxx.xx%0x..xxx
xxxxxxxxxxxxxxxxxxx.xxxxxxxxx
.x.0..x.x..0.x....x.x....x...
-..x..x...x..x.....~.......x..
+..x..x...x..x.............x..
..................x.x........
...................@.........
ENDMAP
@@ -2984,11 +2979,11 @@ X..%X.............X%..X
X0G.X.GXGXG.GXGXG.X.G0X
X.0.X.X.........X.X.0.X
X+XXX.X.XXXXXXX.X.XXX+X
-X.......~.............X
+X.....................X
XXXXX+XXXXXXXXXXX+XXXXX
XXXX...X.X.X.X.X...XXXX
XXX.....'..X..'.9...XXX
-@.....%'''.+~'''......@
+@.....%'''.+.'''......@
XXX..0..'..X..'.....XXX
XXXX...X.X.X.X9X...XXXX
XXXXX+XXXXnXnXXXX+XXXXX
@@ -2998,7 +2993,7 @@ XXXXXXX.XXX9XXX.XXXXXXX
XXXXXXXX.XX+XX.XXXXXXXX
XXXXXXXXX.X.X.XXXXXXXXX
XXXXXXXGXX.X.XXGXXXXXXX
-X0......XXX.XXX.~...0%X
+X0......XXX.XXX.....0%X
XXXXXXX.+..X..+.XXXXXXX
XXXXXXXXXXXXXXXXXXXXXXX
ENDMAP
@@ -3015,15 +3010,15 @@ MAP
xxxxxxxxxxxxxxxxx@xxxxxxxxxx
xxxxxx...xxxxxxx..xxxxxxxxxx
xxxxxx..%xxxxxxx...xxxxxxxxx
-x%..xx.x~xxxxxxx....xxxxxxxx
+x%..xx.x.xxxxxxx....xxxxxxxx
x...+.x.xxxxxxx..'..xxxxxxxx
x...xxxx.xxx....'.'..xxxxxxx
-xxxxxxxxx......'.'.'~..xxxxx
+xxxxxxxxx......'.'.'...xxxxx
xxxx1.WWW..xxx..'.'.xx+xxxxx
-xx...WW....+0x~..'..x....xxx
+xx...WW....+0x...'..x....xxx
x1.........xxx......x...0xxx
xxx.xxxx...'........xxxxxxxx
-xxxxx0.+..'.'...~.xxxxxxxxxx
+xxxxx0.+..'.'.....xxxxxxxxxx
xxxxxxxx.'.'.'.xx+x%..x9..xx
xxxxxxxxx.'.'xxxx.x...+...xx
xxxxxxxxxx.'xxxxx....0x...xx
diff --git a/crawl-ref/source/dat/des/variable/large_abstract.des b/crawl-ref/source/dat/des/variable/large_abstract.des
index d47c528..6cd1485 100644
--- a/crawl-ref/source/dat/des/variable/large_abstract.des
+++ b/crawl-ref/source/dat/des/variable/large_abstract.des
@@ -417,7 +417,7 @@ ENDMAP
NAME: thingy_vault_2
DEPTH: D:14-26
ORIENT: southeast
-SUBST: ' = ^ .:50
+KFEAT: ' = alarm trap / floor w:190
MONS: orange crystal statue
MAP
xxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxx
@@ -498,19 +498,19 @@ xx.@.xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxx...xxxxxxxxxxxxxxxxxxxxxxxxxx
xxxx..........................xx
xxxxxxxxxxxxxxxxxxxxxxxxxxxx..xx
-x.^^..........................xx
-xx.^^xx+xxxxxxxxxxxxxxxxxxxxxxxx
-xxx.^...11....xxxxxxxx..xxxxxxxx
+x.............................xx
+xx...xx+xxxxxxxxxxxxxxxxxxxxxxxx
+xxx.....11....xxxxxxxx..xxxxxxxx
xxxx..x.1..6..xxx........xx..xxx
xxxxx.xxxxxxxxx...vvvvv...x...xx
x6..1...x.........+1..v.......xx
x..1....x.........vvvvv........x
x..5...xx......................x
-xxxxxx^++...........vvvvvvv....x
-xxxxxx^xx...xx=xx...vv$%$vvvvv.x
-xxxxxx^x...xxv1vxx...vvv*2...v.x
-xxxxxx^x..vvvv7.vvvv...vv.vv+v^x
-x..xxx^..vvvb....bvvv...vvv^...x
+xxxxxx.++...........vvvvvvv....x
+xxxxxx.xx...xx=xx...vv$%$vvvvv.x
+xxxxxx.x...xxv1vxx...vvv*2...v.x
+xxxxxx.x..vvvv7.vvvv...vv.vv+v.x
+x..xxx...vvvb....bvvv...vvv....x
x%%.xx..vvvvb....bvvvv.......xxx
xx.....vvbbb......bbbvv.....xxxx
xxx....vvb....66....bvvxxxxxxxxx
diff --git a/crawl-ref/source/dat/des/variable/lemuel_castle.des b/crawl-ref/source/dat/des/variable/lemuel_castle.des
index c25de52..13e97ce 100644
--- a/crawl-ref/source/dat/des/variable/lemuel_castle.des
+++ b/crawl-ref/source/dat/des/variable/lemuel_castle.des
@@ -19,8 +19,8 @@ function castle_lemuel_subvault_setup(e)
e.colour("? = brown")
e.ftile("? = floor_mud")
e.kfeat("? = floor")
+ e.kfeat("~ = alarm trap w:1 / floor")
e.subst("X = c +:1")
- e.subst("~ = ~:2 .")
e.subst("8 = 89")
e.tile("c = wall_stone_brick")
e.ftile(".~*X|+$ = floor_cobble_blood")
@@ -94,7 +94,7 @@ NAME: lemuel_castle_interior_original
TAGS: lemuel_castle_interior
: castle_lemuel_subvault_setup(_G)
MAP
-+c....+~~~.~~~+..+~~.~~~~+.***c+
++c....+~......+..+......~+.***c+
.c||..ccccccccc++ccccccccc.***c.
1c||2.c1...1..1321..1...1c.***c1
.cccccc..1...211112...1..cccccc.
@@ -117,7 +117,7 @@ MAP
.c.11.ccc+cccccccccccc+ccc..2.c.
.c|.2.X*m.1..........1.m|c....c.
.ccm+mc|m.....1111.....m|cm+mcc.
-....~.c|m..1...22......m*c.~1...
+......c|m..1...22......m*c..1...
......c.+....1132.2....+.X..1...
.cccccccccccccccccccccccccccccc.
.c........1..m....m..1........c.
@@ -134,14 +134,14 @@ TAGS: lemuel_castle_interior
SUBST: $=$:5 .
ITEM: w:5 meat ration / sausage / beef jerky / potion of confusion
MAP
-+c....+~~.....1............~$*c+
++c....+.......1.............$*c+
...1..cccccccccccccccccccccccXc.
cc....c......cG..Gc.1.......c|c1
*cc++cc..cG..+....+...12....m|c.
-|....~12.cG..+....+...23....+~c.
+|....~12.cG..+....+...23....+.c.
$....~.2.....c....c...12....m*c.
*cc++ccccccccc....ccccccc++ccXc+
-cc.~~.c.m444dc....c2..$c.~~.....
+cc~~~~c.m444dc....c2..$c.~~.....
...12.c.cm4mmc....c$cc.c12......
+c....+...2..c....c...........c+
cccccccccccc++++cccccccccccc
@@ -154,14 +154,14 @@ TAGS: lemuel_castle_interior
: castle_lemuel_subvault_setup(_G)
SUBST: $=$:5 .
MAP
-+c....+~~.*c$*|cc|*$cccccc$...c+
++c....+...*c$*|cc|*$cccccc$...c+
.c.1..ccccccmc1321cmcccccc....c.
.c..2........c.12.c...........c.
.cc++c.........ww.....2..1c++cc.
.....c.2.......ww.........c.....
.2...c...1...c..$.c...1...c..1..
.ccccc+cccccccccXcccccccc+ccccc.
-.c.1.c.~..1..+....+2.....~c2..c.
+.c.1.c.~..1..+....+2....~.c2..c.
.~.c$c.~2....c....c.....~.c$c1~.
+c..2c.~..1..c....c..1..~.c...c+
cccccccccccc++++cccccccccccc
diff --git a/crawl-ref/source/dat/des/variable/mini_features.des b/crawl-ref/source/dat/des/variable/mini_features.des
index 9e97911..9399a97 100644
--- a/crawl-ref/source/dat/des/variable/mini_features.des
+++ b/crawl-ref/source/dat/des/variable/mini_features.des
@@ -3385,7 +3385,7 @@ TAGS: transparent mini_float allow_dup extra
DEPTH: D:8-26
MAP
............
-.~xxxxxxxx~.
+..xxxxxxxx..
.x........x.
.x.ccnccc.x.
.x.c|..<c.x.
@@ -3394,7 +3394,7 @@ MAP
.x.c>..|c.x.
.x.cccncc.x.
.x........x.
-.~xxxxxxxx~.
+..xxxxxxxx..
............
ENDMAP
@@ -3402,6 +3402,7 @@ NAME: minivault_22
TAGS: transparent mini_float allow_dup extra abyss ruin_abyss
DEPTH: D:6-26
SUBST: $ : $ *:5
+SUBST: ~ : . +:2
MAP
............
.....xx.....
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index efd1fd2..a758b9f 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -2956,7 +2956,7 @@ NAME: onia_ninara_cookie
SHUFFLE: ABCDEF
SUBST: A : !, B : !, C : !, D : !, E : !, F : +, G : ~ l:50 w:50 I
SUBST: ! : xvcb
-SUBST: H = 0 . ~ , J = 1 0:100 $:20
+SUBST: H = 0 ., J = 1 0:100 $:20
ITEM: any jewellery
MONS: giant eyeball
MAP
@@ -3679,14 +3679,14 @@ NAME: wad_rectangle_vault
DEPTH: D:3-26
WEIGHT: 4
FTILE: ; = floor_pebble
-FTILE: "0~U = floor_pebble_brown
+FTILE: "0U = floor_pebble_brown
COLOUR: "0 = brown
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
x..xxx;;;;;.;;;;;.;;;;;xxx..x
x..xxxx;";...;";...;";xxxx..x
xx.x.x;""";.;"0";.;""";x.x.xx
-@.x.x;""~0";""U0";""~"0;x.x.@
+@.x.x;"""0";""U0";""""0;x.x.@
xx.x.x;""";.;""";.;0"";x.x.xx
x..xxxx;";...;";...;0;xxxx..x
x..xxx;;;;;.;;;;;.;;;;;xxx..x
@@ -3704,7 +3704,7 @@ MAP
.""".vvvvv1....
.."..vvvvv.."0.
.....vvvvv.""".
-.~G..vvvvv.~...
+.~G..vvvvv.....
vvvvv.....vvvvv
vvvvv."...xx*xv
vvvvv."".G.x%8v
diff --git a/crawl-ref/source/dat/des/variable/tomb_raider.des b/crawl-ref/source/dat/des/variable/tomb_raider.des
index 181ac1d..eaf9cff 100644
--- a/crawl-ref/source/dat/des/variable/tomb_raider.des
+++ b/crawl-ref/source/dat/des/variable/tomb_raider.des
@@ -41,7 +41,6 @@ TAGS: no_item_gen no_monster_gen
KITEM: $ = ring of regeneration unrand:ring_of_vitality / acquire any
KITEM: 1234 = gold / any / nothing
KITEM: M4 = superb_item / any
-SUBST: . = .:10 ~:1
COLOUR: G = yellow
TILE: G = dngn_sarcophagus_sealed
COLOUR: c = yellow
@@ -50,7 +49,7 @@ COLOUR: C = white
TILE: C = wall_lab_stone
COLOUR: X = brown
TILE: X = dngn_stone_wall_brown
-FTILE: .!~>cCXG1234M$ = floor_sandstone
+FTILE: .!>cCXG1234M$ = floor_sandstone
: if you.absdepth() <= 17 then
KMONS: 1 = mummy / guardian mummy / nothing
KMONS: 2 = mummy / guardian mummy / nothing
diff --git a/crawl-ref/source/dat/descript/pl/branches.txt b/crawl-ref/source/dat/descript/pl/branches.txt
deleted file mode 100644
index 0206eda..0000000
--- a/crawl-ref/source/dat/descript/pl/branches.txt
+++ /dev/null
@@ -1 +0,0 @@
-%%%%
diff --git a/crawl-ref/source/dat/descript/pl/features.txt b/crawl-ref/source/dat/descript/pl/features.txt
deleted file mode 100644
index 0206eda..0000000
--- a/crawl-ref/source/dat/descript/pl/features.txt
+++ /dev/null
@@ -1 +0,0 @@
-%%%%
diff --git a/crawl-ref/source/dat/descript/pl/monsters.txt b/crawl-ref/source/dat/descript/pl/monsters.txt
deleted file mode 100644
index 0206eda..0000000
--- a/crawl-ref/source/dat/descript/pl/monsters.txt
+++ /dev/null
@@ -1 +0,0 @@
-%%%%
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index c34a30a..3f1b062 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4982,9 +4982,7 @@ static bool _dgn_place_one_monster(const vault_placement &place,
return false;
}
-/* "Oddball grids" are handled in _vault_grid. 'B' is arguably oddball, too, as
- * it depends on the place where the vault is. Maybe handling it here is not
- * such a good idea. */
+/* "Oddball grids" are handled in _vault_grid. */
static dungeon_feature_type _glyph_to_feat(int glyph,
vault_placement *place = NULL)
{
@@ -5011,8 +5009,6 @@ static dungeon_feature_type _glyph_to_feat(int glyph,
(glyph == ']') ? DNGN_STONE_STAIRS_DOWN_III :
(glyph == '[') ? DNGN_STONE_STAIRS_UP_III :
(glyph == 'A') ? DNGN_STONE_ARCH :
- (glyph == 'B') ? (place ? _pick_temple_altar(*place)
- : DNGN_ALTAR_ZIN) :
(glyph == 'C') ? _pick_an_altar() : // f(x) elsewhere {dlb}
(glyph == 'I') ? DNGN_ORCISH_IDOL :
(glyph == 'G') ? DNGN_GRANITE_STATUE :
@@ -5114,7 +5110,6 @@ static void _vault_grid_glyph(vault_placement &place, const coord_def& where,
case '+':
if (_map_feat_is_on_edge(place, where))
place.exits.push_back(where);
-
break;
case '^':
place_specific_trap(where, TRAP_RANDOM);
@@ -5122,6 +5117,9 @@ static void _vault_grid_glyph(vault_placement &place, const coord_def& where,
case '~':
place_specific_trap(where, random_trap_for_place());
break;
+ case 'B':
+ grd(where) = _pick_temple_altar(place);
+ break;
}
// Then, handle grids that place "stuff" {dlb}:
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index bc3c17a..38406dc 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -158,9 +158,11 @@ static int _missile_colour(const item_def &item)
{
case MI_STONE:
case MI_SLING_BULLET:
- case MI_LARGE_ROCK:
item_colour = BROWN;
break;
+ case MI_LARGE_ROCK:
+ item_colour = YELLOW;
+ break;
case MI_ARROW:
item_colour = BLUE;
break;
--
Dungeon Crawl Stone Soup
|
