fiddlerwoaroof/crawl - Change 7YSKYUNV34XIWRTJUHJV4QMQRTXXYDIXM5AZSPSDPAYDW4B4PU6QC

Allow vaults to ask for a monster to be generated awake (generate_awake tag).

Add Enter as a synonym for . in targeting.

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

Created by dshaligram on January 29, 2007

7YSKYUNV34XIWRTJUHJV4QMQRTXXYDIXM5AZSPSDPAYDW4B4PU6QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mapdef.h at line 86 [5.591249]

[5.592839]


struct mons_spec
{
    int mid;
    int genweight;
    bool fix_mons;
    bool generate_awake;

Insertion in crawl-ref/source/mapdef.h at line 94 [5.591249]

[5.592840]

[6.713]

    mons_spec(int id = RANDOM_MONSTER, int gw = 10, bool _fixmons = false,
              bool awaken = false)
        : mid(id), genweight(gw), fix_mons(_fixmons), generate_awake(awaken)
    {
    }
};

Replacement in crawl-ref/source/mapdef.h at line 108 [5.591249]
B:BD[6.733] → [6.733:765]
```
    int get_monster(int index);
```
[6.733]
[6.765]
```
    mons_spec get_monster(int index);
```

Deletion in crawl-ref/source/mapdef.h at line 116 [5.591249]

B:BD[6.936] → [6.936:1026]

∅:D[6.1026] → [5.592977:592978]

B:BD[5.592977] → [5.592977:592978]

B:BD[5.592978] → [6.1027:1190]

    struct mons_spec
    {
        int mid;
        int genweight;
        bool fix_mons;
        mons_spec(int id = RANDOM_MONSTER, int gw = 10, bool _fixmons = false)
            : mid(id), genweight(gw), fix_mons(_fixmons)
        {
        }
    };

Replacement in crawl-ref/source/mapdef.h at line 137 [5.591249]
B:BD[6.1605] → [6.1605:1649]
```
    int pick_monster(mons_spec_slot &slot);
```
[6.1605]
[6.1649]
```
    mons_spec pick_monster(mons_spec_slot &slot);
```
Replacement in crawl-ref/source/mapdef.cc at line 576 [5.594797]
B:BD[5.602380] → [6.2518:2568]
```
int mons_list::pick_monster(mons_spec_slot &slot)
```
[5.602380]
[6.2568]
```
mons_spec mons_list::pick_monster(mons_spec_slot &slot)
```
Replacement in crawl-ref/source/mapdef.cc at line 579 [5.594797]
B:BD[6.2593] → [6.2593:2624]
```
    int pick = RANDOM_MONSTER;
```
[6.2593]
[6.2624]
```
    mons_spec pick;
```
Replacement in crawl-ref/source/mapdef.cc at line 587 [5.594797]
B:BD[6.2832] → [6.2832:2859]
```
            pick = i->mid;
```
[6.2832]
[6.2859]
```
            pick = *i;
```

Replacement in crawl-ref/source/mapdef.cc at line 589 [5.594797]

B:BD[6.2860] → [6.2860:2950]

            if (pick < 0 && i->fix_mons)
                pick = i->mid = fix_demon(pick);

[6.2860]

[6.2950]

            if (pick.mid < 0 && pick.fix_mons)
                pick.mid = i->mid = fix_demon(pick.mid);

Replacement in crawl-ref/source/mapdef.cc at line 594 [5.594797]

B:BD[6.2967] → [6.2967:3017]

    if (pick < 0)
        pick = fix_demon(pick);

[6.2967]

[6.3017]

    if (pick.mid < 0)
        pick = fix_demon(pick.mid);

Replacement in crawl-ref/source/mapdef.cc at line 600 [5.594797]
B:BD[6.3075] → [6.3075:3124]
```
        slot.mlist.push_back( mons_spec(pick) );
```
[6.3075]
[6.3124]
```
        slot.mlist.push_back( pick );
```
Replacement in crawl-ref/source/mapdef.cc at line 607 [5.594797]
B:BD[6.3188] → [6.3188:3226]
```
int mons_list::get_monster(int index)
```
[6.3188]
[5.602431]
```
mons_spec mons_list::get_monster(int index)
```
Replacement in crawl-ref/source/mapdef.cc at line 610 [5.594797]
B:BD[6.3276] → [6.3276:3309]
```
        return (RANDOM_MONSTER);
```
[6.3276]
[6.3309]
```
        return mons_spec(RANDOM_MONSTER);
```

Insertion in crawl-ref/source/mapdef.cc at line 636 [5.594797]

[6.3873]

        const bool generate_awake = strip_tag(s, "generate_awake");

Replacement in crawl-ref/source/mapdef.cc at line 647 [5.594797]

B:BD[6.4101] → [6.4101:4166]

        slot.mlist.push_back( mons_spec(mid, weight, fixmons) );

[6.4101]

[6.4166]

        slot.mlist.push_back( mons_spec(mid, weight, fixmons, generate_awake) );

Replacement in crawl-ref/source/dungeon.cc at line 5851 [7.3429798]
B:BD[7.3610867] → [7.3610867:3610899]
```
        int monster_type_thing;
```
[7.3610867]
[7.3610899]
```
        mons_spec monster_type_thing(RANDOM_MONSTER);
```

Replacement in crawl-ref/source/dungeon.cc at line 5854 [7.3429798]

B:BD[7.3610969] → [7.3610969:3611047]

                         (vgrid == '9') ? (5 + level_number) : level_number);

[7.3610969]

[7.3611047]

                          (vgrid == '9') ? (5 + level_number) : level_number);

Replacement in crawl-ref/source/dungeon.cc at line 5859 [7.3429798]

B:BD[7.3611158] → [7.3611158:3611314]

B:BD[7.3611314] → [6.6839:6919]

        monster_type_thing = ((vgrid == '8'
                               || vgrid == '9'
                               || vgrid == '0') ? RANDOM_MONSTER
                                    : place.map.mons.get_monster(vgrid - '1'));

[7.3611158]

[7.3611392]

        if (vgrid != '8' && vgrid != '9' && vgrid != '0')
            monster_type_thing = place.map.mons.get_monster(vgrid - '1');

Replacement in crawl-ref/source/dungeon.cc at line 5862 [7.3429798]

B:BD[7.3611393] → [3.263:443]

        if (monster_type_thing != -1)
            place_monster( not_used, monster_type_thing, monster_level,
                           BEH_SLEEP, MHITNOT, true, vx, vy, false );

[7.3611393]

[7.3611526]

        if (monster_type_thing.mid != -1)
            place_monster( not_used, monster_type_thing.mid, monster_level,
                           monster_type_thing.generate_awake?
                               BEH_WANDER : BEH_SLEEP,
                           MHITNOT, true, vx, vy, false );

Insertion in crawl-ref/source/direct.cc at line 113 [7.3697945]
[4.2610]
[4.2610]
```
    case '\r': return CMD_TARGET_SELECT;
```
Replacement in crawl-ref/source/dat/vaults.des at line 1806 [5.1041446]
B:BD[2.6219] → [2.6219:6243]
```
MONS: jelly
ITEM: stone
```
[2.6219]
[2.6243]
```
MONS: generate_awake jelly
ITEM: scroll of paper
```
Replacement in crawl-ref/source/dat/vaults.des at line 1833 [5.1041446]
B:BD[2.6911] → [2.6911:6931]
```
MONS: boring beetle
```
[2.6911]
[2.6931]
```
MONS: generate_awake boring beetle
```

Allow vaults to ask for a monster to be generated awake (generate_awake tag).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mapdef.h at line 86 [5.591249]

Insertion in crawl-ref/source/mapdef.h at line 94 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 108 [5.591249]

Deletion in crawl-ref/source/mapdef.h at line 116 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 137 [5.591249]

Replacement in crawl-ref/source/mapdef.cc at line 576 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 579 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 587 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 589 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 594 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 600 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 607 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 610 [5.594797]

Insertion in crawl-ref/source/mapdef.cc at line 636 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 647 [5.594797]

Replacement in crawl-ref/source/dungeon.cc at line 5851 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5854 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5859 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5862 [7.3429798]

Insertion in crawl-ref/source/direct.cc at line 113 [7.3697945]

Replacement in crawl-ref/source/dat/vaults.des at line 1806 [5.1041446]

Replacement in crawl-ref/source/dat/vaults.des at line 1833 [5.1041446]