fiddlerwoaroof/crawl - Change 6X36L3WFJHVRAZ2KD6VQMG7O2BBTYKHVU7EMIRHUFUNE7VDMXA7AC

Moved hellmouths back to hells.des after discussions with David.

Restored a couple of other maps.

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

Created by dshaligram on July 1, 2007

6X36L3WFJHVRAZ2KD6VQMG7O2BBTYKHVU7EMIRHUFUNE7VDMXA7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mapdef.h at line 191 [4.591249]
[3.5447]
[3.5447]
```
    coord_def find_first_glyph(const std::string &glyphs) const;
```
Insertion in crawl-ref/source/mapdef.h at line 503 [4.591249]
[5.1583]
[6.5846]
```
    coord_def find_first_glyph(const std::string &glyphs) const;
```

Replacement in crawl-ref/source/mapdef.cc at line 1049 [4.594797]

B:BD[3.9402] → [3.9402:9571]

        for (int x = 0, w = width(); x < w; ++x)
        {
            const coord_def c(x, y);
            if ((*this)(c) == gly)
                return (c);
        }

[3.9402]

[3.9571]

        std::string::size_type pos = lines[y].find(gly);
        if (pos != std::string::npos)
            return coord_def(pos, y);

Insertion in crawl-ref/source/mapdef.cc at line 1057 [4.594797]

[3.9611]

[4.598506]

coord_def map_lines::find_first_glyph(const std::string &glyphs) const
{
    for (int y = 0, h = height(); y < h; ++y)
    {
        std::string::size_type pos = lines[y].find_first_of(glyphs);
        if (pos != std::string::npos)
            return coord_def(pos, y);
    }
    return coord_def(-1, -1);
}

Insertion in crawl-ref/source/mapdef.cc at line 1181 [4.594797]

[3.9687]

[5.3271]

}
coord_def map_def::find_first_glyph(const std::string &s) const
{
    return map.find_first_glyph(s);

Replacement in crawl-ref/source/dat/lab.des at line 145 [2.165145]
B:BD[2.168791] → [2.168791:168804]
```
KFEAT: d = .
```
[2.168791]
[2.168804]
```
KFEAT: d = floor
```
Replacement in crawl-ref/source/dat/lab.des at line 147 [2.165145]
B:BD[2.168949] → [2.168949:168989]
```
KMONS: d = minotaur
SUBST: e = ., f = <
```
[2.168949]
[2.168989]
```
KFEAT: e = floor
KFEAT: f = <
```
Insertion in crawl-ref/source/dat/hive.des at line 101 [2.173047]
[2.175403]
[2.175403]
```
SUBST: ; = 1:1 .
```

Replacement in crawl-ref/source/dat/hive.des at line 106 [2.173047]

B:BD[2.175454] → [2.175454:175594]

.,,,,,...?aaa???...
.,,,,,..aaa2aaaaa..
.,,,,,.?a2e4d342a?.
.,,,,,.?a4?2?4O4a?.
.,,,,,..?a42?a2a...
.,,,,,..?aaaaaa?...
.,,,,,....????.....

[2.175454]

[2.175594]

.;;;;;...?aaa???...
.;;;;;..aaa2aaaaa..
.;;;;;.?a2e4d342a?.
.;;;;;.?a4?2?4O4a?.
.;;;;;..?a42?a2a...
.;;;;;..?aaaaaa?...
.;;;;;....????.....

Insertion in crawl-ref/source/dat/hells.des at line 3 [2.182976]

[2.183119]

##############################################################################
##############################################################################
# Hell-themed random maps

Insertion in crawl-ref/source/dat/hells.des at line 8 [2.182976]

[2.183198]


default-depth: D:12-26
###################################
# Hellmouth (Lemuel)
# note that other than the imps, the demons here cannot fly
NAME:   hellmouth_1
FLAGS:  no_rotate
MONS:   imp / quasit / shadow imp, hellion / rotting devil / iron devil / hairy devil / hell hound
ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / wand of draining 
ITEM:   wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
ORIENT: float
SUBST:  d=de, ?:?.l, ?=l.
MAP
xxxxxxxxxxxxxxxxxxx
xxxxxxxxlllxxxxxxxx
xxxxxxlllAlllxxxxxx
xxxlllll.d.llll?xxx
xlllllll121lllll?.x
x?lllllll1llll?...x
x.??llllllll?.....x
x...?llllll?......x
x....?lllll.......x
xxx...?lll?.....xxx
xxxx...lll?....xxxx
xxxxx.?ll?....xxxxx
xxxxx?lll.....xxxxx
xxxxxxlll?...xxxxxx
xxxxxxxlll...xxxxxx
xxxxxxxxll?.xxxxxxx
xxxxxxxxll?.xxxxxxx
xxxxxxxxl?@xxxxxxxx
ENDMAP
###################################
# Hellmouth 2 (Lemuel)
# note that other than the imps, the demons here cannot fly
NAME:   hellmouth_2
TAGS:   no_monster_gen
FLAGS:  no_rotate
MONS:   imp / quasit / shadow imp / manes / lemure
MONS:   hellion / rotting devil / iron devil / hairy devil / hell hound
ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / wand of draining 
ITEM:   wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / w:30 nothing
ORIENT: float
SUBST:  d=de, ?:?.l, ?=l.
SUBST:  b : b:30 c v .
MAP
..........................
.......bbbbbbbbbbbb.......
....bbbb..........bbbb....
..bbb....llllllll....bbb..
.bb....llllllllllll....bb.
.b....llllllllllllll....b.
.b....llllll??llllll....b.
.b...?lll??.....?lll?...b.
.b...?ll?...111...ll?...b.
@+...?l?...11211d..l?...b.
@+...?l?...12A21|f.l?...b.
.b...?ll...11211d.ll?...b.
.b...?lll?..111..lll?...b.
.b....llll?.....llll....b.
.b....llllll??llllll....b.
.bb....llllllllllll....bb.
..bbb....llllllll....bbb..
....bbbb..........bbbb....
.......bbbbbbbbbbbb.......
..........................
ENDMAP

Insertion in crawl-ref/source/dat/hells.des at line 80 [2.182976]

[2.183199]

###################################
# Hellmouth 3 (Lemuel)
NAME:   hellmouth_3
MONS:   weight:50 imp / quasit / shadow imp / manes / lemure, hell hound
ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / nothing
ORIENT: float
SUBST:  ? : . l ?:40, ?=l.
MAP
................??............
...........................??.
....??..........l?............
...?ll?........?l?............
..?lll?.........l.............
...?l........??l?.............
...........??lll?.............
.........?lllllll?............
.......?llllllllll??..........
......?lll111111llll?.........
......?llll12Ad1lll...........
.......?lll11111ll?...........
........?lllll1ll?............
.........??llllll......?......
...........?llll?.....ll?.....
..?.........?ll?.......ll?....
.?............................
..................??..........
ENDMAP

Deletion in crawl-ref/source/dat/float.des at line 420 [2.216297]

B:BD[2.228949] → [2.228949:231010]

ENDMAP
###################################
# Hellmouth (Lemuel)
# note that other than the imps, the demons here cannot fly
NAME:   hellmouth_1
FLAGS:  no_rotate
MONS:   imp / quasit / shadow imp, hellion / rotting devil / iron devil / hairy devil / hell hound
ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / wand of draining 
ITEM:   wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
ORIENT: float
SUBST:  d=de, ?:?.l, ?=l.
MAP
xxxxxxxxxxxxxxxxxxx
xxxxxxxxlllxxxxxxxx
xxxxxxlllAlllxxxxxx
xxxlllll.d.llll?xxx
xlllllll121lllll?.x
x?lllllll1llll?...x
x.??llllllll?.....x
x...?llllll?......x
x....?lllll.......x
xxx...?lll?.....xxx
xxxx...lll?....xxxx
xxxxx.?ll?....xxxxx
xxxxx?lll.....xxxxx
xxxxxxlll?...xxxxxx
xxxxxxxlll...xxxxxx
xxxxxxxxll?.xxxxxxx
xxxxxxxxll?.xxxxxxx
xxxxxxxxl?@xxxxxxxx
ENDMAP
###################################
# Hellmouth 2 (Lemuel)
# note that other than the imps, the demons here cannot fly
NAME:   hellmouth_2
TAGS:   no_monster_gen
FLAGS:  no_rotate
MONS:   imp / quasit / shadow imp / manes / lemure
MONS:   hellion / rotting devil / iron devil / hairy devil / hell hound
ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / wand of draining 
ITEM:   wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / w:30 nothing
ORIENT: float
SUBST:  d=de, ?:?.l, ?=l.
SUBST:  b : b:30 c v .
MAP
..........................
.......bbbbbbbbbbbb.......
....bbbb..........bbbb....
..bbb....llllllll....bbb..
.bb....llllllllllll....bb.
.b....llllllllllllll....b.
.b....llllll??llllll....b.
.b...?lll??.....?lll?...b.
.b...?ll?...111...ll?...b.
@+...?l?...11211d..l?...b.
@+...?l?...12A21|f.l?...b.
.b...?ll...11211d.ll?...b.
.b...?lll?..111..lll?...b.
.b....llll?.....llll....b.
.b....llllll??llllll....b.
.bb....llllllllllll....bb.
..bbb....llllllll....bbb..
....bbbb..........bbbb....
.......bbbbbbbbbbbb.......
..........................

Deletion in crawl-ref/source/dat/float.des at line 422 [2.216297]

B:BD[2.231018] → [2.231018:231869]

###################################
# Hellmouth 3 (Lemuel)
NAME:   hellmouth_3
MONS:   weight:50 imp / quasit / shadow imp / manes / lemure, hell hound
ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / nothing
ORIENT: float
SUBST:  ? : . l ?:40, ?=l.
MAP
................??............
...........................??.
....??..........l?............
...?ll?........?l?............
..?lll?.........l.............
...?l........??l?.............
...........??lll?.............
.........?lllllll?............
.......?llllllllll??..........
......?lll111111llll?.........
......?llll12Ad1lll...........
.......?lll11111ll?...........
........?lllll1ll?............
.........??llllll......?......
...........?llll?.....ll?.....
..?.........?ll?.......ll?....
.?............................
..................??..........
ENDMAP