fiddlerwoaroof/crawl - Change BNP25NWD5OXPQEPLM3YJRJCRE24DH55RZKFCZPUX5NLWGOSBIYGAC

Bazaar updates (David).

Mark bazaar entry points using feature markers so the player enters at the right place even if the bazaar uses stone arches as decorative elements.

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

Created by dshaligram on August 12, 2007

BNP25NWD5OXPQEPLM3YJRJCRE24DH55RZKFCZPUX5NLWGOSBIYGAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/dungeon.cc at line 1425 [4.3429798]
[3.31948]
[3.31948]
```
                {
```

Insertion in crawl-ref/source/dungeon.cc at line 1427 [4.3429798]

[3.31997]

                    env_add_marker(
                        new map_feature_marker(
                            coord_def(x, y),
                            DNGN_STONE_ARCH));
                }

Insertion in crawl-ref/source/dungeon.cc at line 6923 [4.3429798]

[2.3377]

    if (stair_to_find == DNGN_STONE_ARCH)
    {
        const coord_def pos(dgn_find_feature_marker(stair_to_find));
        if (in_bounds(pos) && grd(pos) == stair_to_find)
            return (pos);
    }

Replacement in crawl-ref/source/dat/bazaar.des at line 82 [3.48488]
B:BD[5.16999] → [5.16999:17020]
```
SUBST:   . = .:210 1
```
[5.16999]
[5.17020]
```
SUBST:   . = .:150 1
```

Insertion in crawl-ref/source/dat/bazaar.des at line 91 [3.48488]

[5.17102]

ENDMAP
###############################################################################
# Safe
NAME:    bzr_entry_004
TAGS:    bzr_entry 
ORIENT:  float
MARKER: O = lua:bazaar_portal()
MAP
 xxxxx
xx...xx
+..O..x
xx...xx
 xxxxx

Insertion in crawl-ref/source/dat/bazaar.des at line 108 [3.48488]

[5.17190]

[3.49524]

# Safe 2
NAME:    bzr_entry_005
TAGS:    bzr_entry 
ORIENT:  float
SHUFFLE: wlW
MARKER: O = lua:bazaar_portal()
MAP
 wwwww
wwwwwww
ww<O>ww
wwwwwww
 wwwww
ENDMAP
###############################################################################
# Portal along the road
NAME:    bzr_entry_006
TAGS:    bzr_entry 
ORIENT:  float
SHUFFLE: XU, TUV
SUBST:   X=.
MARKER: O = lua:bazaar_portal()
MAP
   xxx
  xxOxx
xxx.X.xxx
.U.....U.
xxxxxxxxx
ENDMAP
###############################################################################

Insertion in crawl-ref/source/dat/bazaar.des at line 154 [3.48488]
[5.17522]
[3.49807]
```
FLAGS:  no_rotate
```

Replacement in crawl-ref/source/dat/bazaar.des at line 160 [3.48488]

B:BD[3.49849] → [3.49849:49919]

B:BD[3.49919] → [5.17556:17576]

xxxxxxxxx
xxxx>xxxx
xxx...xxx
xx..A..xx
x<.A.A.>x
xx..A..xx
xxx...xxx
xxxx>xxxx
xxxxxxxxx

[3.49849]

[5.17576]

xxxxxxxxxxxxxxx
xxxxxxx>xxxxxxx
xxxxxx...xxxxxx
xxxxx.....xxxxx
xxxx...A...xxxx
xxx.........xxx
xx...........xx
x<..A.....A..>x
xx...........xx
xxx.........xxx
xxxx...A...xxxx
xxxxx.....xxxxx
xxxxxx...xxxxxx
xxxxxxx>xxxxxxx
xxxxxxxxxxxxxxx

Replacement in crawl-ref/source/dat/bazaar.des at line 203 [3.48488]
B:BD[5.18058] → [5.18058:18082]
```
SHUFFLE: AB, def, xw/vl
```
[5.18058]
[5.18082]
```
SHUFFLE: AB, def, wlb
```
Replacement in crawl-ref/source/dat/bazaar.des at line 208 [3.48488]
B:BD[5.18255] → [5.18255:18304]
```
SUBST:   w:w.l, x:b, c:., v=bl, d=.d, e=.e, f=.f
```
[5.18255]
[6.12689]
```
SUBST:   d=.d, e=.e, f=.f
```

Replacement in crawl-ref/source/dat/bazaar.des at line 211 [3.48488]

B:BD[5.18308] → [5.18308:18406]

xxxxxxxxxxxxx
xxxxxxxwwwxxx
xxxwwx....Axx
x<...+.def.>x
xxxwwx....Bxx
xxxxxxxwwwxxx
xxxxxxxxxxxxx

[5.18308]

[5.18406]

xxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxwwwwwxxxxxx
xxxxxxxxxxwwww...wwwxxxx
xwwwwwwwwww....A...wwxxx
xw<......d+....e....+f>x
xwwwwwwwwww....B...wwxxx
xxxxxxxxxxwwww...wwwxxxx
xxxxxxxxxxxxxwwwwwxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxx

Insertion in crawl-ref/source/dat/bazaar.des at line 224 [3.48488]
[5.18453]
[5.18453]
```
FLAGS:   no_rotate
```

Replacement in crawl-ref/source/dat/bazaar.des at line 227 [3.48488]

B:BD[5.18495] → [5.18495:18513]

ITEM:    any wand

[5.18495]

[6.12711]

KFEAT:   B = distillery shop
#ITEM:    any wand, cursed ring of levitation
ITEM:    any wand, ring of levitation
SHUFFLE: leAB/wdBA
: bazaar_message(_G)
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxx......>......xxxxxxxxxx
xxxx.........................xxxx
xx.....l.................l.....xx
xx......l...............l.......x
xl....A.ll.............ll.A....lx
xl......l...............l......lx
xll...........................llx
xllll.......................llllx
xlllllll.................lllllllx
xllllllllllll.......llllllllllllx
xlllllllllllllllllllllllllllllllx
x...lllllllllllllllllllllllll...x
x........lllllllllllllll........x
x............lllllll............x
x..............lll..............x
xxxxx.......................xxxxx
x...x.......................x...x
x.B.+.......................+.B.x
x...x..........<e>..........x...x
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP
NAME:    bazaar_row
TAGS:    bazaar 
FLAGS:   no_rotate
ORIENT:  encompass
SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff
SHUFFLE: Aa/Zz, Bb/Yy, Cc/Rr, Dd/Ss
KFEAT:   A = any shop / antique weapon shop
KFEAT:   B = any shop / antique armour shop
KFEAT:   C = any shop / wand shop
KFEAT:   D = any shop / jewellery shop
KFEAT:   E = any shop / weapon shop / armour shop
KFEAT:   F = any shop / book shop / scroll shop
SUBST:   a=T, b=T, c=T, d=T, e=T, f=T
SUBST:   z=V, y=V, r=V, s=V
KFEAT:   Z = stone_arch
KFEAT:   Y = stone_arch
KFEAT:   R = stone_arch
KFEAT:   S = stone_arch
SHUFFLE: lw
SUBST:   w:wWx, l:lx

Replacement in crawl-ref/source/dat/bazaar.des at line 278 [3.48488]

B:BD[5.18517] → [5.18517:18625]

xxxxxxxxxxx
xx...>...xx
x..A...A..x
x.........x
xllll.llllx
x....>....x
x..d...d..x
xx...<...xx
xxxxxxxxxxx

[5.18517]

[5.18625]

xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxAxxxxxxxxxxxCxxxxxxxxxxxExxxxxxxxxxxxxxxx
xxx.....xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx
xx..www..xxxxxx.a.xxxxxxxxx.c.xxxxxxxxx.e.xxxxxx..lll..xx
x<.wwwww..+...........+...........+...........+..lllll.>x
xx..www..xxxxxx.b.xxxxxxxxx.d.xxxxxxxxx.f.xxxxxx..lll..xx
xx......xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx
xxxxxxxxxxxxxxxxBxxxxxxxxxxxDxxxxxxxxxxxFxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP
NAME:    bazaar_circle_1
CHANCE:  2
TAGS:    bazaar 
FLAGS:   no_rotate
ORIENT:  encompass
SHUFFLE: ABCD, EFGH
SUBST:   H=>, A=T, B=T
KFEAT:   C = any shop
KFEAT:   D = any shop
KFEAT:   E = any shop
KFEAT:   F = any shop
KFEAT:   G = any shop
: bazaar_message(_G)
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
x.....xxxxxxxxxx...xxxxxxxxxx.....x
x..E..+.......+.....+.......+..H..x
x.....xxxxxxxxx..D..xxxxxxxxx.....x
xx...xxxxx....+.....+....xxxxx...xx
xxx+xxx....xxxxx...xxxxx....xxx+xxx
xxx.xx..xxxxxxxxx+xxxxxxxxx..xx.xxx
xxx.x..xxxxxxxxxx+xxxxxxxxxx..x.xxx
xxx+x+xxxxxxxxxx...xxxxxxxxxx+x+xxx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xx.....xxxxxx.........xxxxxx.....xx
xx..A..xxxxxT....<....Txxxxx..B..xx
xx.....xxxxxx.........xxxxxx.....xx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xxx+x+xxxxxxxxxx...xxxxxxxxxx+x+xxx
xxx.x..xxxxxxxxxx+xxxxxxxxxx..x.xxx
xxx.xx..xxxxxxxxx+xxxxxxxxx..xx.xxx
xxx+xxx....xxxxx...xxxxx....xxx+xxx
xx...xxxxx....+.....+....xxxxx...xx
x.....xxxxxxxxx..C..xxxxxxxxx.....x
x..G..+.......+.....+.......+..F..x
x.....xxxxxxxxxx...xxxxxxxxxx.....x
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

Insertion in crawl-ref/source/dat/bazaar.des at line 329 [3.48488]

[5.18632]


NAME:    bazaar_circle_2
CHANCE:  2
TAGS:    bazaar 
FLAGS:   no_rotate
ORIENT:  encompass
SHUFFLE: EFGH
SUBST:   H=>, D=T, C=T
KFEAT:   A = any shop
KFEAT:   B = any shop
KFEAT:   E = any shop
KFEAT:   F = any shop
KFEAT:   G = any shop
: bazaar_message(_G)
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
x.....xxxxxxxxxx...xxxxxxxxxx.....x
x..H..xxxxxxxxx.....xxxxxxxxx..E..x
x.....xxxxxxxxx..D..xxxxxxxxx.....x
xx...xxxxx....+.....+....xxxxx...xx
xxx+xxx....xxxxx...xxxxx....xxx+xxx
xxx.xx..xxxxxxxxx+xxxxxxxxx..xx.xxx
xxx.x..xxxxxxxxxx+xxxxxxxxxx..x.xxx
xxx+x+xxxxxxxxxx...xxxxxxxxxx+x+xxx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xx.....xxxxxx.........xxxxxx.....xx
xx..A..xxxxxT....<....Txxxxx..B..xx
xx.....xxxxxx.........xxxxxx.....xx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xxx+x+xxxxxxxxxx...xxxxxxxxxx+x+xxx
xxx.x..xxxxxxxxxx+xxxxxxxxxx..x.xxx
xxx.xx..xxxxxxxxx+xxxxxxxxx..xx.xxx
xxx+xxx....xxxxx...xxxxx....xxx+xxx
xx...xxxxx....+.....+....xxxxx...xx
x.....xxxxxxxxx..C..xxxxxxxxx.....x
x..G..xxxxxxxxx.....xxxxxxxxx..F..x
x.....xxxxxxxxxx...xxxxxxxxxx.....x
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP
NAME:    bazaar_circle_3
CHANCE:  2
TAGS:    bazaar 
FLAGS:   no_rotate
ORIENT:  encompass
SHUFFLE: EFGH
SUBST:   A=>, D=T, C=T
KFEAT:   B = any shop
KFEAT:   H = any shop
KFEAT:   E = any shop
KFEAT:   F = any shop
KFEAT:   G = any shop
: bazaar_message(_G)
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
x.....xxxxxxxxxx...xxxxxxxxxx.....x
x..H..+.......+.....+.......+..E..x
x.....xxxxxxxxx..D..xxxxxxxxx.....x
xx...xxxxxxxxxx.....xxxxxxxxxx...xx
xxx+xxxxxxxxxxxx...xxxxxxxxxxxx+xxx
xxx.xxxxxxxxxxxxx+xxxxxxxxxxxxx.xxx
xxx.xxxxxxxxxxxxx+xxxxxxxxxxxxx.xxx
xxx+xxxxxxxxxxxx...xxxxxxxxxxxx+xxx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xx.....xxxxxx.........xxxxxx.....xx
xx..A..xxxxxT....<....Txxxxx..B..xx
xx.....xxxxxx.........xxxxxx.....xx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xxx+xxxxxxxxxxxx...xxxxxxxxxxxx+xxx
xxx.xxxxxxxxxxxxx+xxxxxxxxxxxxx.xxx
xxx.xxxxxxxxxxxxx+xxxxxxxxxxxxx.xxx
xxx+xxxxxxxxxxxx...xxxxxxxxxxxx+xxx
xx...xxxxxxxxxx.....xxxxxxxxxx...xx
x.....xxxxxxxxx..C..xxxxxxxxx.....x
x..G..+.......+.....+.......+..F..x
x.....xxxxxxxxxx...xxxxxxxxxx.....x
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP
NAME:    bazaar_circle_4
CHANCE:  1
TAGS:    bazaar 
FLAGS:   no_rotate
ORIENT:  encompass
SHUFFLE: ABCDEF
KFEAT:   A = any shop
KFEAT:   B = any shop
KFEAT:   E = any shop
KFEAT:   C = any shop
KFEAT:   D = any shop
: bazaar_message(_G)
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
x.....xxxxxxxxxx...xxxxxxxxxx.....x
x..C..+.......+.....xxxxxxxxx..T..x
x.....xxxxxxxxx..D..xxxxxxxxx.....x
xx...xxxxxxxxxx.....xxxxxxxxxx...xx
xxx+xxxxxx.xxxxx...xxxxxxxxxxxx+xxx
xxx.xxxxxxxxxxxxx+xxxxxxxxxxxxx.xxx
xxx.xxxxxxxxxxxxx+xxxxxxxxxxxxx.xxx
xxx+xxxxxxxxxxxx...xxxxxxxxxxxx+xxx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xx.....xxxxxx.........xxxxxx.....xx
xx..A..xxxxxT....<....Txxxxx..>..xx
xx.....xxxxxx.........xxxxxx.....xx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xxx+xxxxxxxxxxxx...xxxxxxxxxxxx+xxx
xxx.xxxxxxxxxxxxxTxxxxxxxxxxxxx.xxx
xxx.xxxxxxxxxxxxxxxxxxxxxxxxxxx.xxx
xxx+xxxxxx.xxxxx...xxxxxxxxxxxx+xxx
xx...xxxxxxxxxx.....xxxxxxxxxx...xx
x.....xxxxxxxxx..E..xxxxxxxxx.....x
x..T..+.......+.....+.......+..B..x
x.....xxxxxxxxxx...xxxxxxxxxx.....x
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP
NAME:    bazaar_circle_5
CHANCE:  2
TAGS:    bazaar 
FLAGS:   no_rotate
ORIENT:  encompass
KFEAT:   C = any shop
KFEAT:   D = any shop
KFEAT:   E = any shop
KFEAT:   F = any shop
KFEAT:   G = any shop
: bazaar_message(_G)
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
x.....xxxxxxxxxx...xxxxxxxxxx.....x
x..>..+.......+.....+.......+..E..x
x.....xxxxxxxxx..D..xxxxxxxxx.....x
xx...xxxxx....+.....+....xxxxx...xx
xxxxxxx....xxxxx...xxxxx....xxxxxxx
xxxxxx..xxxxxxxxxxxxxxxxxxx..xxxxxx
xxxxx..xxxxxxxxxxTxxxxxxxxxx..xxxxx
xxxxx+xxxxxxxxxx...xxxxxxxxxx+xxxxx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xx.....xxxxxx.........xxxxxx.....xx
xx..T..+....+....<....+....+..T..xx
xx.....xxxxxx.........xxxxxx.....xx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xxx+x+xxxxxxxxxx...xxxxxxxxxx+x+xxx
xxx.x..xxxxxxxxxxTxxxxxxxxxx..x.xxx
xxx.xx..xxxxxxxxxxxxxxxxxxx..xx.xxx
xxx+xxx....xxxxx...xxxxx....xxx+xxx
xx...xxxxx....+.....+....xxxxx...xx
x.....xxxxxxxxx..C..xxxxxxxxx.....x
x..G..xxxxxxxxx.....xxxxxxxxx..F..x
x.....xxxxxxxxxx...xxxxxxxxxx.....x
xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP
NAME:    bazaar_circle_6
CHANCE:  3
TAGS:    bazaar 
FLAGS:   no_rotate
ORIENT:  encompass
KFEAT:   A = any shop / antique armour shop
KFEAT:   B = any shop / antique weapon shop
KFEAT:   C = any shop / jewellery shop
KFEAT:   D = any shop / book shop
: bazaar_message(_G)
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxx...xxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxx.....xxxxxxxxxxxxxxx
xxxxxxxxxxxxxxx..D..xxxxxxxxxxxxxxx
xxxxxxxxxx....+.....+....xxxxxxxxxx
xxxxxxx....xxxxx...xxxxx....xxxxxxx
xxxxxx..xxxxxxxxxxxxxxxxxxx..xxxxxx
xxxxx..xxxxxxxxxx>xxxxxxxxxx..xxxxx
xxxxx+xxxxxxxxxx...xxxxxxxxxx+xxxxx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xx.....xxxxxx.........xxxxxx.....xx
xx..A..xxxxxT....<....Txxxxx..B..xx
xx.....xxxxxx.........xxxxxx.....xx
xxx...xxxxxxxx.......xxxxxxxx...xxx
xxxxx+xxxxxxxxxx...xxxxxxxxxx+xxxxx
xxxxx..xxxxxxxxxx+xxxxxxxxxx..xxxxx
xxxxxx..xxxxxxxxx+xxxxxxxxx..xxxxxx
xxxxxxx....xxxxx...xxxxx....xxxxxxx
xxxxxxxxxx....+.....+....xxxxxxxxxx
xxxxxxxxxxxxxxx..C..xxxxxxxxxxxxxxx
xxxxxxxxxxxxxxx.....xxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxx...xxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP

Bazaar updates (David).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/dungeon.cc at line 1425 [4.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 1427 [4.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 6923 [4.3429798]

Replacement in crawl-ref/source/dat/bazaar.des at line 82 [3.48488]

Insertion in crawl-ref/source/dat/bazaar.des at line 91 [3.48488]

Insertion in crawl-ref/source/dat/bazaar.des at line 108 [3.48488]

Insertion in crawl-ref/source/dat/bazaar.des at line 154 [3.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 160 [3.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 203 [3.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 208 [3.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 211 [3.48488]

Insertion in crawl-ref/source/dat/bazaar.des at line 224 [3.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 227 [3.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 278 [3.48488]

Insertion in crawl-ref/source/dat/bazaar.des at line 329 [3.48488]