fiddlerwoaroof/crawl - Change 3C2VE43SHCSBY4LTRTFYFLIPRWFUN6DXU6D34QVWDQTSNRBUFG7AC

[1770625] Allow generated monster names in &M.

Removed sealed entry vaults.

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

Created by dshaligram on August 9, 2007

3C2VE43SHCSBY4LTRTFYFLIPRWFUN6DXU6D34QVWDQTSNRBUFG7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monplace.h at line 99 [5.1638277]
[4.450900]
[5.1641672]
```
coord_def find_newmons_square(int mons_class, int x, int y);
```

Insertion in crawl-ref/source/dungeon.h at line 287 [5.3428186]

[6.148284]

[5.3429755]

class mons_spec;
bool dgn_place_monster(const mons_spec &mspec,
                       int monster_level, int vx, int vy,
                       bool generate_awake);

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

B:BD[7.10235] → [7.10235:10295]

static void dngn_place_item_explicit(const item_spec &spec,

[7.10235]

[7.10295]

static void dgn_place_item_explicit(const item_spec &spec,

Replacement in crawl-ref/source/dungeon.cc at line 3741 [5.3429798]
B:BD[8.1350] → [8.1350:1405]
```
static void dngn_place_multiple_items(item_list &list,
```
[8.1350]
[8.1405]
```
static void dgn_place_multiple_items(item_list &list,
```

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

B:BD[8.1539] → [8.1539:1604]

        dngn_place_item_explicit(list.get_item(i), x, y, level);

[8.1539]

[7.10756]

        dgn_place_item_explicit(list.get_item(i), x, y, level);

Replacement in crawl-ref/source/dungeon.cc at line 3749 [5.3429798]
B:BD[5.3604958] → [9.149493:149555]
```
static void dngn_place_item_explicit(int index, int x, int y,
```
[9.149118]
[10.6087]
```
static void dgn_place_item_explicit(int index, int x, int y,
```
Replacement in crawl-ref/source/dungeon.cc at line 3765 [5.3429798]
B:BD[10.6344] → [7.10759:10808]
```
    dngn_place_item_explicit(spec, x, y, level);
```
[10.6344]
[7.10808]
```
    dgn_place_item_explicit(spec, x, y, level);
```

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

B:BD[11.266] → [12.450:516]

B:BD[12.516] → [13.4126:4154]

∅:D[13.4154] → [7.10883:10926]

B:BD[7.10883] → [7.10883:10926]

static bool dngn_place_monster(
    const vault_placement &place,
    const mons_spec &mspec,
    int monster_level,
    int vx, int vy)

[11.266]

[7.10926]

bool dgn_place_monster(const mons_spec &mspec,
                       int monster_level, int vx, int vy,
                       bool generate_awake)

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

∅:D[13.4216] → [12.517:553]

B:BD[7.11015] → [12.517:553]

B:BD[12.553] → [13.4217:4290]

        const bool generate_awake =
            mspec.generate_awake || place.map.has_tag("generate_awake");

[13.4216]

[12.651]

        const bool m_generate_awake = generate_awake || mspec.generate_awake;

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

B:BD[12.748] → [12.748:819]

                               generate_awake? BEH_WANDER : BEH_SLEEP,

[12.748]

[13.4354]

                               m_generate_awake? BEH_WANDER : BEH_SLEEP,

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

B:BD[12.889] → [12.889:909]

    return (false);

[12.889]

[12.909]

    return (false);    
}
static bool dgn_place_monster(
    const vault_placement &place,
    const mons_spec &mspec,
    int monster_level,
    int vx, int vy)
{
    const bool generate_awake =
        mspec.generate_awake || place.map.has_tag("generate_awake");
    return dgn_place_monster(mspec, monster_level, vx, vy,
                             generate_awake);

Replacement in crawl-ref/source/dungeon.cc at line 3819 [5.3429798]
B:BD[12.912] → [12.912:948]
```
static bool dngn_place_one_monster(
```
[12.912]
[12.948]
```
static bool dgn_place_one_monster(
```

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

B:BD[12.1109] → [12.1109:1168]

        if (dngn_place_monster(place, mons.get_monster(i),

[12.1109]

[12.1168]

        if (dgn_place_monster(place, mons.get_monster(i),

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

B:BD[12.1341] → [12.1341:1408]

        dngn_place_one_monster(place, mons, level_number, vx, vy);

[12.1341]

[7.12642]

        dgn_place_one_monster(place, mons, level_number, vx, vy);

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

B:BD[8.1652] → [8.1652:1716]

        dngn_place_multiple_items(items, vx, vy, level_number);

[8.1652]

[7.12749]

        dgn_place_multiple_items(items, vx, vy, level_number);

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

B:BD[9.151435] → [9.151435:151511]

        dngn_place_item_explicit(vgrid - 'd', vx, vy, place, level_number);

[9.151435]

[9.151511]

        dgn_place_item_explicit(vgrid - 'd', vx, vy, place, level_number);

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

B:BD[5.3611393] → [12.1409:1487]

        dngn_place_monster(place, monster_type_thing, monster_level, vx, vy);

[5.3611393]

[5.3611526]

        dgn_place_monster(place, monster_type_thing, monster_level, vx, vy);

Deletion in crawl-ref/source/debug.cc at line 153 [5.4016436]
B:BD[5.4025799] → [5.4025799:4025882]
```
    mpr( "(Hint: 'generated' names, eg 'orc zombie', won't work)", MSGCH_PROMPT );
```

Replacement in crawl-ref/source/debug.cc at line 154 [5.4016436]

B:BD[5.4025934] → [5.4025934:4026032]

    get_input_line( specs, sizeof( specs ) );
    
    if (specs[0] == '\0')
        return (-1);

[5.4025934]

[5.4026498]

    if (!cancelable_get_line(specs, sizeof specs))
    {
        if (specs[0] == '\0')
            return (-1);

Replacement in crawl-ref/source/debug.cc at line 159 [5.4016436]

B:BD[5.4026499] → [4.1024600:1024641]

    return (get_monster_by_name(specs));

[5.4026499]

[5.4026517]

        return (get_monster_by_name(specs));
    }
    return (-1);

Replacement in crawl-ref/source/debug.cc at line 378 [5.4016436]

B:BD[5.4031613] → [5.4031613:4031656]

B:BD[5.4031656] → [2.174:220]

    int mon = debug_prompt_for_monster();
    if (mon == -1 || mon == MONS_PROGRAM_BUG)

[5.4031613]

[5.4031675]

    char specs[100];
    mpr( "Which monster by name? ", MSGCH_PROMPT );
    if (cancelable_get_line(specs, sizeof specs) || !*specs)

Replacement in crawl-ref/source/debug.cc at line 382 [5.4016436]
B:BD[5.4031681] → [5.4031681:4031727]
```
        mpr("I couldn't find that monster.");
```
[5.4031681]
[5.4031727]
```
        canned_msg(MSG_OK);
        return;
    }
```

Replacement in crawl-ref/source/debug.cc at line 386 [5.4016436]

B:BD[5.4031728] → [5.4031728:4031798]

        if (one_chance_in(20))
            mpr("Maybe it's hiding.");

[5.4031728]

[5.4031798]

    mons_list mlist;
    std::string err = mlist.add_mons(specs);
    
    if (!err.empty())
    {
        mpr(err.c_str());
        return;

Replacement in crawl-ref/source/debug.cc at line 394 [5.4016436]

B:BD[5.4031804] → [5.4031804:4031813]

    else

[5.4031804]

[5.4031813]

    
    const bool force_place = x != -1 && y != -1;
    if (x == -1)
        x = you.x_pos;
    if (y == -1)
        y = you.y_pos;
    const mons_spec mspec = mlist.get_monster(0);
    if (!force_place && mspec.mid != -1)

Replacement in crawl-ref/source/debug.cc at line 404 [5.4016436]

B:BD[5.4031819] → [14.2765:3029]

        const bool force_place = x != -1 && y != -1;
        if (x == -1)
            x = you.x_pos;
        if (y == -1)
            y = you.y_pos;
        
        create_monster(mon, 0, BEH_SLEEP, x, y,
                       MHITNOT, 250, false, force_place);

[5.4031819]

[5.4031898]

        coord_def place = find_newmons_square(mspec.mid, x, y);
        if (in_bounds(place))
        {
            x = place.x;
            y = place.y;
        }

Replacement in crawl-ref/source/debug.cc at line 411 [5.4016436]

B:BD[5.4031904] → [5.4031904:4031970]

}                               // end create_spec_monster_name()

[5.4031904]

[5.4031970]

    
    dgn_place_monster(mspec, you.your_level, x, y, false);
}

Deletion in crawl-ref/source/dat/entry.des at line 3394 [15.591]
B:BD[15.85738] → [15.85738:85817]
B:BD[15.85817] → [3.15203:15224]
```
##############################################################################
# Being Mean Is Cool
```
Deletion in crawl-ref/source/dat/entry.des at line 3395 [15.591]
B:BD[15.85826] → [3.15225:15248]
∅:D[3.15248] → [15.85847:85873]
B:BD[15.85847] → [15.85847:85873]
B:BD[15.85873] → [3.15249:15318]
∅:D[3.15318] → [15.85910:85914]
B:BD[15.85910] → [15.85910:85914]
B:BD[15.85914] → [3.15319:15349]
∅:D[3.15349] → [15.86334:86342]
B:BD[15.86334] → [15.86334:86342]
B:BD[15.86342] → [3.15350:15373]
∅:D[3.15373] → [15.86451:86463]
B:BD[15.86451] → [15.86451:86463]
B:BD[15.87238] → [15.87238:87252]
B:BD[15.87252] → [3.15374:15551]
∅:D[3.15551] → [15.87277:87281]
B:BD[15.87277] → [15.87277:87281]
B:BD[15.87281] → [3.15552:15608]
∅:D[3.15608] → [15.87542:87550]
B:BD[15.87542] → [15.87542:87550]
B:BD[15.87550] → [3.15609:15632]
∅:D[3.15632] → [16.29212:29224]
B:BD[15.87663] → [16.29212:29224]
B:BD[15.88394] → [15.88394:88408]
B:BD[15.88408] → [3.15633:15886]
∅:D[3.15886] → [15.88433:88437]
B:BD[15.88433] → [15.88433:88437]
B:BD[15.88437] → [3.15887:15943]
∅:D[3.15943] → [15.88682:88690]
B:BD[15.88682] → [15.88682:88690]
B:BD[15.89573] → [15.89573:89574]
```
NAME: erik_entry_006_a
TAGS: entry
ORIENT: float
CHANCE: 5
ITEM: scroll of curse armour
ITEM: scroll of teleportation
MAP
xxxxx
xxexx
xd{ex
xxdxx
xxxxx
ENDMAP
NAME: erik_entry_006_b
TAGS: entry
ORIENT: float
CHANCE: 4
ITEM: scroll of curse armour, scroll of random uselessness, scroll of identify
ITEM: scroll of curse armour, scroll of fear, scroll of teleportation
SHUFFLE: def, ghi
MAP
@.....@
.xx=xx.
.xxgxx.
.=d{g=.
.xxdxx.
.xx=xx.
@.....@
ENDMAP
NAME: erik_entry_006_c
TAGS: entry
ORIENT: float
CHANCE: 1
SHUFFLE: uU / vV / wW / zZ
SUBST: u==, v==, V=~, w=x, W=x, z==, Z=~.
ITEM: scroll of curse armour, scroll of random uselessness, scroll of identify
ITEM: scroll of curse armour, scroll of fear, scroll of teleportation
KFEAT: U = teleport trap
MAP
xxxxxxx
xZxxxWx
xxzgwxx
xxd{gxx
xxudvxx
xUxxxVx
xxxxxxx
ENDMAP
```