fiddlerwoaroof/crawl - Change JQKRFPNPLYBHUWMVQLPX5UB5RRP5PKY6NQ5LRHJRIOY6IKN2AH6AC

Allow choosing different arena layouts (patch by sorear).

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

Created by dshaligram on December 31, 2008

JQKRFPNPLYBHUWMVQLPX5UB5RRP5PKY6NQ5LRHJRIOY6IKN2AH6AC

Dependencies

[2] PKXXBHS3LWLPZI2QVRX22MSQ4R2626IXRSNHFFYHXYTLJJQU54LQC

In channels

main

Change contents

Replacement in crawl-ref/source/dat/arena.des at line 1 [2.10126]
B:BD[2.10126] → [2.10127:10175]
```
NAME: arena_level
TAGS: arena_level no_mons_gen
```
[2.10126]
[2.10175]
```
NAME: arena_default
TAGS: arena_default no_mons_gen
```

Insertion in crawl-ref/source/dat/arena.des at line 25 [2.10126]

[2.10620]

XXXXXXXXXXXXXXXXX
ENDMAP
# Metal-lined vault, when electricity reflection is important
NAME: arena_metal
TAGS: arena_metal no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = .
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXXXX
XvvvvvvvvvvvvvvvvvX
Xv...............vX
Xv.......B.......vX
Xv...............vX
Xv...............vX
Xv...............vX
Xv...............vX
Xv...............vX
Xv.......O.......vX
Xv...............vX
Xv...............vX
Xv...............vX
Xv...............vX
Xv...............vX
Xv.......A.......vX
Xv...............vX
XvvvvvvvvvvvvvvvvvX
XXXXXXXXXXXXXXXXXXX
ENDMAP
# Especially for immobile monsters... all locations are in LOS of each other
NAME: arena_small
TAGS: arena_small no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = .
ORIENT: encompass
MAP

Insertion in crawl-ref/source/dat/arena.des at line 67 [2.10126]

[2.10638]

XvvvvvvvvvvvvvvvX
XvvvvvvvvvvvvvvvX
XvvvvvvvvvvvvvvvX
Xvvvvvv.B.vvvvvvX
Xvvvv.......vvvvX
Xvvvv.......vvvvX
Xvvv.........vvvX
Xvvv....O....vvvX
Xvvv.........vvvX
Xvvvv.......vvvvX
Xvvvv.......vvvvX
Xvvvvvv.A.vvvvvvX
XvvvvvvvvvvvvvvvX
XvvvvvvvvvvvvvvvX
XvvvvvvvvvvvvvvvX
XXXXXXXXXXXXXXXXX

Insertion in crawl-ref/source/dat/arena.des at line 84 [2.10126]

[2.10645]


# for fine-tuning interactions
NAME: arena_narrow
TAGS: arena_narrow no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = .
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
XXXXXX.....XXXXXX
XXXXXX..B..XXXXXX
XXXXXX.....XXXXXX
XXXXXX.....XXXXXX
XXXXXX.....XXXXXX
XXXXXX.....XXXXXX
XXXXXX.....XXXXXX
XXXXXX..O..XXXXXX
XXXXXX.....XXXXXX
XXXXXX.....XXXXXX
XXXXXX.....XXXXXX
XXXXXX.....XXXXXX
XXXXXX.....XXXXXX
XXXXXX..A..XXXXXX
XXXXXX.....XXXXXX
XXXXXXXXXXXXXXXXX
ENDMAP
NAME: arena_corridor
TAGS: arena_corridor no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = .
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
XXXXXXXXBXXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXXOXXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXX.XXXXXXXX
XXXXXXXXAXXXXXXXX
XXXXXXXXXXXXXXXXX
ENDMAP
NAME: arena_pillarred
TAGS: arena_pillarred no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = G
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
X...............X
X.G...G.B.G...G.X
X...............X
X...G...G...G...X
X...............X
X.G...G...G...G.X
X...............X
X...G...O...G...X
X...............X
X.G...G...G...G.X
X...............X
X...G...G...G...X
X...............X
X.G...G.A.G...G.X
X...............X
XXXXXXXXXXXXXXXXX
ENDMAP
NAME: arena_lattice
TAGS: arena_lattice no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = X
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
X...............X
X.X...X.B.X...X.X
X...............X
X...X...X...X...X
X...............X
X.X...X...X...X.X
X...............X
X...X...O...X...X
X...............X
X.X...X...X...X.X
X...............X
X...X...X...X...X
X...............X
X.X...X.A.X...X.X
X...............X
XXXXXXXXXXXXXXXXX
ENDMAP
NAME: arena_river
TAGS: arena_river no_mons_gen no_pool_fixup
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = w
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
X...............X
X.......B.......X
X...............X
X...............X
Xw..............X
Xww.............X
Xwww....wwwww...X
X.wwwwwwOwwwwww.X
X...wwwww....wwwX
X.............wwX
X..............wX
X...............X
X...............X
X.......A.......X
X...............X
XXXXXXXXXXXXXXXXX
ENDMAP
NAME: arena_swamp
TAGS: arena_swamp no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = x
SUBST: . = w:30 W .:5
SUBST: x = W .:5
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
X........xx.....X
X.......B..x....X
X..........x....X
X..........x....X
X..........x....X
X.........x.....X
X........x......X
X.......O.......X
X......x........X
X.....x.........X
X....x..........X
X....x..........X
X....x..........X
X....x..A.......X
X.....xx........X
XXXXXXXXXXXXXXXXX
ENDMAP
NAME: arena_lava
TAGS: arena_lava no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = x
SUBST: . = l:30 .
SUBST: x = .
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
X........xx.....X
X.......B..x....X
X..........x....X
X..........x....X
X..........x....X
X.........x.....X
X........x......X
X.......O.......X
X......x........X
X.....x.........X
X....x..........X
X....x..........X
X....x..........X
X....x..A.......X
X.....xx........X
XXXXXXXXXXXXXXXXX
ENDMAP
NAME: arena_baffles
TAGS: arena_baffles no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = X
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
X...X...B...X...X
X.X.X.X.X.X.X.X.X
X.......X.......X
X.XXXXX.X.XXXXX.X
X.......X.......X
X.X.X.X.X.X.X.X.X
X...X.......X...X
XXX.X.XXOXX.X.XXX
X...X.......X...X
X.X.X.X.X.X.X.X.X
X.......X.......X
X.XXXXX.X.XXXXX.X
X.......X.......X
X.X.X.X.X.X.X.X.X
X...X...A...X...X
XXXXXXXXXXXXXXXXX
ENDMAP
NAME: arena_glassbaffles
TAGS: arena_glassbaffles no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = o
ORIENT: encompass
MAP
ooooooooooooooooo
o...o...B...o...o
o.o.o.o.o.o.o.o.o
o.......o.......o
o.ooooo.o.ooooo.o
o.......o.......o
o.o.o.o.o.o.o.o.o
o...o.......o...o
ooo.o.ooOoo.o.ooo
o...o.......o...o
o.o.o.o.o.o.o.o.o
o.......o.......o
o.ooooo.o.ooooo.o
o.......o.......o
o.o.o.o.o.o.o.o.o
o...o...A...o...o
ooooooooooooooooo
ENDMAP

Insertion in crawl-ref/source/arena.cc at line 49 [2.10815]
[2.11756]
[2.11756]
```
    std::string arena_type = "";
```

Replacement in crawl-ref/source/arena.cc at line 127 [2.10815]

B:BD[2.14053] → [2.14053:14124]

        const map_def *map = random_map_for_tag("arena_level", false);

[2.14053]

[2.14124]

        std::string map_name = "arena_" + arena_type;
        const map_def *map = random_map_for_tag(map_name.c_str(), false);
        if (!map)
            throw make_stringf("No arena maps named \"%s\"", arena_type.c_str());

Insertion in crawl-ref/source/arena.cc at line 176 [2.10815]

[2.15327]

        arena_type = strip_tag_prefix(spec, "arena:");
        if (arena_type.empty())
            arena_type = "default";

Deletion in crawl-ref/source/arena.cc at line 209 [2.10815]
B:BD[2.16168] → [2.16168:16198]
```
        parse_monster_spec();
```
Insertion in crawl-ref/source/arena.cc at line 288 [2.10815]
[2.18509]
[2.18509]
```
        parse_monster_spec();
```

Allow choosing different arena layouts (patch by sorear).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/dat/arena.des at line 1 [2.10126]

Insertion in crawl-ref/source/dat/arena.des at line 25 [2.10126]

Insertion in crawl-ref/source/dat/arena.des at line 67 [2.10126]

Insertion in crawl-ref/source/dat/arena.des at line 84 [2.10126]

Insertion in crawl-ref/source/arena.cc at line 49 [2.10815]

Replacement in crawl-ref/source/arena.cc at line 127 [2.10815]

Insertion in crawl-ref/source/arena.cc at line 176 [2.10815]

Deletion in crawl-ref/source/arena.cc at line 209 [2.10815]

Insertion in crawl-ref/source/arena.cc at line 288 [2.10815]