fiddlerwoaroof/crawl - Change KNBQ2Y4XXAJGSHC4FU2AHCRGLLHETYA2MU55TDSHV2TIMTOX3QZQC

Updated portal vaults (David).

Fixed dungeon.cc's handling of 1x1 vaults.

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

Created by dshaligram on February 15, 2007

KNBQ2Y4XXAJGSHC4FU2AHCRGLLHETYA2MU55TDSHV2TIMTOX3QZQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/dungeon.cc at line 5538 [5.3429798]

[3.151963]

[4.5803]

static int away_from_edge(int x, int left_edge, int right_edge)
{
    if (x < left_edge)
        return (1);
    else if (x > right_edge)
        return (-1);
    else
        return (coinflip()? 1 : -1);
}

Replacement in crawl-ref/source/dungeon.cc at line 5552 [5.3429798]
B:BD[3.152118] → [3.152118:152143]
```
    const bool x_edge = 
```
[3.152118]
[3.152143]
```
    bool x_edge = 
```
Replacement in crawl-ref/source/dungeon.cc at line 5554 [5.3429798]
B:BD[3.152207] → [3.152207:152231]
```
    const bool y_edge =
```
[3.152207]
[3.152231]
```
    bool y_edge =
```

Insertion in crawl-ref/source/dungeon.cc at line 5557 [5.3429798]

[3.152297]

    if (x_edge && y_edge)
    {
        if (coinflip())
            x_edge = false;
        else
            y_edge = false;
    }

Replacement in crawl-ref/source/dungeon.cc at line 5567 [5.3429798]

B:BD[3.152336] → [3.152336:152382]

        dig_dir.x = pos.x == place.x? -1 : 1;

[3.152336]

[3.152382]

    {
        if (place.width == 1)
            dig_dir.x =
                away_from_edge(pos.x,
                               MAPGEN_BORDER * 2,
                               GXM - MAPGEN_BORDER * 2);
        else
            dig_dir.x = pos.x == place.x? -1 : 1;
    }

Replacement in crawl-ref/source/dungeon.cc at line 5578 [5.3429798]

B:BD[3.152399] → [3.152399:152445]

        dig_dir.y = pos.y == place.y? -1 : 1;

[3.152399]

[3.152445]

    {
        if (place.height == 1)
            dig_dir.y =
                away_from_edge(pos.y,
                               MAPGEN_BORDER * 2,
                               GYM - MAPGEN_BORDER * 2);
        else
            dig_dir.y = pos.y == place.y? -1 : 1;
    }

Deletion in crawl-ref/source/dat/splev.des at line 2360 [6.1090923]
B:BD[6.1183051] → [4.10407:10408]

Insertion in crawl-ref/source/dat/splev.des at line 2378 [6.1090923]

[4.11253]


##############################################################################
# Orcish Mines entries

Insertion in crawl-ref/source/dat/splev.des at line 2382 [6.1090923]

[4.11332]

# Dummy Orc entry
NAME: david_orc_0_dummy
TAGS: orc_entry
CHANCE: 60
ORIENT: float
MAP
O
ENDMAP
##############################################################################

Insertion in crawl-ref/source/dat/splev.des at line 2431 [6.1090923]
[4.12397]
[4.12415]
```
CHANCE: 20
```
Insertion in crawl-ref/source/dat/splev.des at line 2452 [6.1090923]
[2.13214]
[2.13214]
```
CHANCE: 30
```

Insertion in crawl-ref/source/dat/splev.des at line 2467 [6.1090923]

[2.13362]

##############################################################################
# Dummy Vaults entry
NAME: david_vaults_0_dummy
TAGS: orc_vaults
CHANCE: 60
ORIENT: float
MAP
O
ENDMAP

Insertion in crawl-ref/source/dat/splev.des at line 2495 [6.1090923]

[4.12869]

ENDMAP
##############################################################################
# Vault monsters near stair 
NAME: david_vaults_2
TAGS: vault_entry
MONS: weight:40 nothing / weight:30 yaktaur / yaktaur captain
MONS: weight:70 nothing / weight:40 ogre / weight:20 two-headed ogre / ogre-mage
MONS: weight:100 nothing / shapeshifter
SHUFFLE: 123
ORIENT: float
CHANCE: 30
MAP
1111..@......
111..........
111..........
1............
@.....O.....@
.............
.............
.............
....@........

Insertion in crawl-ref/source/dat/splev.des at line 2522 [6.1090923]

[2.13457]

##############################################################################
# Dummy Lair entry
NAME: david_lair_0_dummy
TAGS: orc_lair
CHANCE: 60
ORIENT: float
MAP
O
ENDMAP

Insertion in crawl-ref/source/dat/splev.des at line 2583 [6.1090923]
[2.14103]
[2.14103]
```
CHANCE: 40
```

Insertion in crawl-ref/source/dat/splev.des at line 2594 [6.1090923]

[2.14233]

[4.13563]

ENDMAP
##############################################################################
# Hive entries
##############################################################################
# Beehive entry
NAME: david_hive_0
TAGS: hive_entry
ORIENT: float
CHANCE: 60
MAP
O
ENDMAP
NAME: david_hive_1
TAGS: hive_entry
MONS: queen bee, killer bee, killer bee larva
ORIENT: float
MAP
............
....aaaa....
..a2a2aaaa..
..aaRa3a2a..
.aa2aRa2aaa.
.a3aOa1aRa2.
.aa3aRaRa2a.
.aaa2a2a3aa.
..a3aRa2aa..
...aa2aa2a..
....aaaa....
............
ENDMAP
##############################################################################
# Hive monsters near stair
NAME: david_hive_2
TAGS: hive_entry
MONS: nothing / killer bee / killer bee larva
MONS: queen bee
ORIENT: float
CHANCE: 20
MAP
1111..@.....1
1211.........
1111.........
.............
@.....O.....@
.............
.............
.............
1...@.......1