fiddlerwoaroof/crawl - Change 5TKGFHC6X2JYR3MVN5T2XU2VWG45V7HGEI45H3BZ4B55WPULZEFAC

.des file reoraganisation (Eino).

Fixed luadgn misreporting error line numbers.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1876 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on July 15, 2007

5TKGFHC6X2JYR3MVN5T2XU2VWG45V7HGEI45H3BZ4B55WPULZEFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/luadgn.cc at line 245 [4.1232]

B:BD[3.2745] → [3.2745:2841]

        s = s.substr(0, lns) + make_stringf("%d", lnum + first - 1)
            + s.substr(pe);

[3.2745]

[3.2841]

        const std::string newlnum = make_stringf("%d", lnum + first - 1);
        s = s.substr(0, lns) + newlnum + s.substr(pe);
        pe = lns + newlnum.length();

Replacement in crawl-ref/source/dat/mini.des at line 1250 [6.75280]

B:BD[5.981] → [5.981:1082]

# Doghouse (Eino)
# put the rest of the doghouses in float.des, combined CHANCE of all of them is 10

[5.981]

[5.1082]

# Small statue alley (Eino)

Replacement in crawl-ref/source/dat/mini.des at line 1252 [6.75280]

B:BD[5.1083] → [5.1083:1104]

B:BD[5.1104] → [2.1642:1662]

∅:D[2.1662] → [5.1104:1210]

B:BD[5.1104] → [5.1104:1210]

NAME:    doghouse_v1
TAGS:    mini_float
DEPTH:   4-8
SHUFFLE: 1?T
SUBST:   T : T V:2
SUBST:   ? : 1:2 .
MONS:    hound / w:1 nothing / w:2 jackal

[5.1083]

[5.1210]

NAME:    small_statue_alley_a
DEPTH:   D:10-20
CHANCE:  7
MAP
xxxcccccx
...G...G@
.G.F.G.G.
.G.G.F.G.
@G...G...
xcccccxxx
ENDMAP
NAME:    small_statue_alley_b
DEPTH:   D:3-10

Replacement in crawl-ref/source/dat/mini.des at line 1268 [6.75280]

B:BD[5.1225] → [2.1663:1719]

xxx+xxx
xxx+xxx
xx...xx
xx?..xx
xx1.Txx
xxxxxxx
xxxxxxx

[5.1225]

[5.1315]

xxxcccccx
...G...G@
.G.G.G.G.
.G.G.G.G.
@G...G...
xcccccxxx
ENDMAP
NAME:    small_statue_alley_c
DEPTH:   D:6-12
CHANCE:  1
MAP
xxxcccccx
...I...I@
.I.I.I.I.
.I.I.I.I.
@I...I...
xcccccxxx

Deletion in crawl-ref/source/dat/mini.des at line 1290 [6.75280]
B:BD[5.1430] → [5.1430:1495]
```
# put the third version in float.des, hence combined CHANCE < 10
```

Insertion in crawl-ref/source/dat/mini.des at line 1350 [6.75280]

[6.96123]

ENDMAP
NAME: circle_pieces_altar_v3
DEPTH: 3-26
CHANCE: 3
MAP
xxxxxxxxxxxxxxxxxx
.bbbbbbbbbbbbbbbbx
...bbbbbbbbbbbbbbx
@....bbbbbbbbbb...
.......bbbbb.....@
xbb...............
xbbb...........bbx
xbbbbb.......bbbbx
xbbbbbb.....bbbbbx
xbbbbbb.....bbbbbx
xbbbbbb..C..bbbbbx
xbbbbbb.....bbbbbx
xbbbbbb.....bbbbbx
xbbbbb.......bbbbx
xbbb...........bbx
@.....bbbb......bx
..bbbbbbbbbbb.....
xbbbbbbbbbbbbbb..@
xxxxxxxxxxxxxxxx..
ENDMAP
#############################################################################
# Doghouse (Eino)
NAME:    doghouse_v1
DEPTH:   4-8
SHUFFLE: 1?T
SUBST:   T : T V:2
SUBST:   ? : 1:2 .
MONS:    hound / w:1 nothing / w:2 jackal
CHANCE:  2
MAP
.........
.xxx+xxx.
.xxx+xxx.
.xx...xx.
.xx?..xx.
.xx1.Txx.
.xxxxxxx.
.xxxxxxx.
.........
ENDMAP
NAME:    doghouse_v2
TAGS:    mini_float
DEPTH:   4-8
SHUFFLE: ?1T
SUBST:   T : T V:2
SUBST:   ? : 1:2 .
MONS:    hound / w:1 nothing / w:2 jackal
CHANCE:  3
MAP
xx+xx
xx+xx
x...x
x?1Tx
x...x
xx+xx
xx+xx
ENDMAP
NAME:    doghouse_v3
TAGS:    mini_float
DEPTH:   4-8
SHUFFLE: ?1T
SUBST:   T : T V:2
SUBST:   ? : 1:2 .
MONS:    hound / w:1 nothing / w:2 jackal
CHANCE:  3
MAP
xxx+xx
xxx+xx
xx...x
++..?x
xx.T1x
xxxxxx
ENDMAP
NAME:    doghouse_v4
TAGS:    mini_float
DEPTH:   4-8
SHUFFLE: ?1T
SUBST:   T : T V:2
SUBST:   ? : 1:2 .
MONS:    hound / w:1 nothing / w:2 jackal
CHANCE:  2
MAP
xxx+xxx
xxx+xxx
xx...xx
++.T.++
xx?1?xx
xxxxxxx

Insertion in crawl-ref/source/dat/mini.des at line 1458 [6.75280]
[5.3017]
[5.3017]
```
TAGS:    mini_float
```

Insertion in crawl-ref/source/dat/mini.des at line 1466 [6.75280]

[2.1744]


#############################################################################
# Small chambers for nice items (Eino)
# not necessarily versions of the same vault
NAME:   small_chamber_a
TAGS:   mini_float
DEPTH:  4-27
MAP
 xxxxxxx
xx.....xx
x...*...x
x.......x
xx.....xx
 x.....x
ENDMAP
NAME:   small_chamber_b
TAGS:   mini_float
DEPTH:  8-27, Elf, Snake, Vault, Crypt
MAP
xxxxxxxxx
xxG...Gxx
x...|...x
x...9...x
xx.....xx
xxT...Txx
xx.....xx
xxT...Txx
ENDMAP
NAME:   tiny_chamber_a
TAGS:   mini_float
DEPTH:  2-27, Elf, Snake, Vault, Crypt
MAP
xxxxx
x...x
x.*.=
x...x
xxxxx
ENDMAP
NAME:   dig_this
TAGS:   mini_float
DEPTH:  8-27, Elf, Snake, Vault, Crypt
NSUBST: Z = 1:| / 1:* / *:Z
KFEAT:  Z = teleport trap
MAP
xxxxxxxxxxxxxxx
xvvvvvvvvvvvvvx
x.vxvZxZxZvvvvx
=.xvxxZxZxvvvvx
xvvvvvvvvvvvvvx
xxxxxxxxxxxxxxx
ENDMAP

Insertion in crawl-ref/source/dat/hive.des at line 171 [6.173047]

[6.176840]

ENDMAP
#############################################################################
# Another hive entry (Eino)
# This one appeared to me in a dream.
#
NAME:      eino_hive_1
TAGS:      hive_entry no_monster_gen
ORIENT:    float
# i'm not sure water creatures would fit this one.. change if you strongly think otherwise
MONS:      killer bee / killer bee larva w:2, queen bee / killer bee w:2, oklob plant / plant w:1, plant / nothing
KMONS:     R = killer bee / killer bee larva w:2
KFEAT:     R = R
KMONS:     M = plant
KMONS:     N = plant
CHANCE:    50000
KFEAT:     M = *
KFEAT:     N = | / * w:20
KMONS:     Z = plant / nothing
: if crawl.coinflip() then
SUBST:     W : .
SUBST:     w : .
KFEAT:     Z = W
: else
KFEAT:     Z = .
: end
SUBST:     q=w
MAP
   x   x
 xxx...xxx
xx4.a1a.4xx
x4.aRaRa.4x
x441aOa244x
x4.aRaRa.4x
xx4.a1a.4xx
 x4.....4x
 xxZ4.44xx
  xZWW.4x
  xxZWZxx
   xxWxx
    xWx
xxxxxWxxxxx
@....W....@
xxxxxWxxxxx
    xWx
   xxWxx
  xx4W4xx
  x4.WW4x
 xx4.WWZxx
 xM4WWww4x
xxN3wwwwwxx
xM4wwwwwqqx
x4.wwwwqqqx
x4..wwqqqqx
xx...44qqxx
 xxx..4xxx
   x   x

Insertion in crawl-ref/source/dat/hive.des at line 230 [6.173047]
[6.176848]
[6.176848]
```
##########################################
# Bees in trees by the pond
```

Insertion in crawl-ref/source/dat/hive.des at line 233 [6.173047]

[6.176849]

NAME:      eino_hive_2
TAGS:      hive_entry
ORIENT:    float
KFEAT:     N = w / w:5 .
KFEAT:     Z = w
KMONS:     Z = plant / w:3 nothing
KFEAT:     V = w
KMONS:     V = killer bee w:20 / nothing w:6 / giant blowfly w:1
MONS:      plant / nothing w:3
MONS:      killer bee w:20 / nothing w:6 / giant blowfly w:1
MAP
     ....  ...NNNZNN.
  ....11.....NZZwwZZNN.
 . 11.2111.1NZwwVwwwwwN
.1.1.11.22ZZw.wwwwVwwwZN
..1212211ZZOZwwwwwwwVZZ.
.1..111.21wV1.ZwVwwwZNN
 ..1.2211.1Zw1.ZwwZNN.
  ...11.1...  11.NN..
     ....
ENDMAP

Deletion in crawl-ref/source/dat/float.des at line 401 [6.216297]

B:BD[5.15335] → [5.15335:15875]

ENDMAP
#############################################################################
# Small statue alley (Eino)
NAME:    small_statue_alley_a
DEPTH:   D:10-20
CHANCE:  7
ORIENT:  float
MAP
xxxcccccx
...G...G@
.G.F.G.G.
.G.G.F.G.
@G...G...
xcccccxxx
ENDMAP
NAME:    small_statue_alley_b
DEPTH:   D:3-10
CHANCE:  2
ORIENT:  float
MAP
xxxcccccx
...G...G@
.G.G.G.G.
.G.G.G.G.
@G...G...
xcccccxxx
ENDMAP
NAME:    small_statue_alley_c
DEPTH:   D:6-12
CHANCE:  1
ORIENT:  float
MAP
xxxcccccx
...I...I@
.I.I.I.I.
.I.I.I.I.
@I...I...
xcccccxxx

Deletion in crawl-ref/source/dat/float.des at line 402 [6.216297]

B:BD[5.15882] → [5.15882:16045]


#############################################################################
# Circle pieces altar (Eino)
# two versions are in float.des, combined CHANCE is 10

Deletion in crawl-ref/source/dat/float.des at line 403 [6.216297]

B:BD[5.16046] → [5.16046:16476]

∅:D[7.5675] → [6.231010:231017]

∅:D[5.16476] → [6.231010:231017]

B:BD[6.231010] → [6.231010:231017]

B:BD[6.231017] → [5.16477:16650]

∅:D[5.16650] → [6.231017:231018]

B:BD[6.231017] → [6.231017:231018]

B:BD[6.231018] → [5.16651:17277]

NAME: circle_pieces_altar_v3
DEPTH: 3-26
CHANCE: 3
ORIENT: float
MAP
xxxxxxxxxxxxxxxxxx
.bbbbbbbbbbbbbbbbx
...bbbbbbbbbbbbbbx
@....bbbbbbbbbb...
.......bbbbb.....@
xbb...............
xbbb...........bbx
xbbbbb.......bbbbx
xbbbbbb.....bbbbbx
xbbbbbb.....bbbbbx
xbbbbbb..C..bbbbbx
xbbbbbb.....bbbbbx
xbbbbbb.....bbbbbx
xbbbbb.......bbbbx
xbbb...........bbx
@.....bbbb......bx
..bbbbbbbbbbb.....
xbbbbbbbbbbbbbb..@
xxxxxxxxxxxxxxxx..
ENDMAP
#############################################################################
# Doghouse (Eino)
# one of the doghouses is in mini.des, combined CHANCE of all of them is 10
NAME:    doghouse_v2
DEPTH:   5-8
SHUFFLE: ?1T
SUBST:   T : T V:2
SUBST:   ? : 1:2 .
MONS:    hound / w:1 nothing / w:2 jackal
CHANCE:  3
ORIENT:  float
MAP
xx+xx
xx+xx
x...x
x?1Tx
x...x
xx+xx
xx+xx
ENDMAP
NAME:    doghouse_v3
DEPTH:   5-8
SHUFFLE: ?1T
SUBST:   T : T V:2
SUBST:   ? : 1:2 .
MONS:    hound / w:1 nothing / w:2 jackal
CHANCE:  3
ORIENT:  float
MAP
xxx+xx
xxx+xx
xx...x
++..?x
xx.T1x
xxxxxx
ENDMAP
NAME:    doghouse_v4
DEPTH:   6-8
SHUFFLE: ?1T
SUBST:   T : T V:2
SUBST:   ? : 1:2 .
MONS:    hound / w:1 nothing / w:2 jackal
CHANCE:  2
ORIENT:  float
MAP
xxx+xxx
xxx+xxx
xx...xx
++.T.++
xx?1?xx
xxxxxxx
ENDMAP