fiddlerwoaroof/crawl - Change XY77S75KH5KV54MZVAPMUC64TVRE2QM2KVJAAGJGCIBGQEC5GUTQC

Added support for no_item_gen and generate_awake tags.

Note: no_item_gen/no_monster_gen produce very bad behaviour on full-screen maps. Don't use them there until this is fixed.

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

Created by dshaligram on March 26, 2007

XY77S75KH5KV54MZVAPMUC64TVRE2QM2KVJAAGJGCIBGQEC5GUTQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/dungeon.h at line 29 [4.3428186]

B:BD[3.948130] → [3.948130:948131]

∅:D[3.948131] → [4.3428537:3428781]

B:BD[4.3428537] → [4.3428537:3428781]

B:BD[4.3428781] → [5.1506:1554]

∅:D[5.1554] → [4.3428830:3429476]

B:BD[4.3428830] → [4.3428830:3429476]

B:BD[4.3429476] → [6.790:824]

∅:D[6.824] → [4.3429476:3429755]

B:BD[4.3429476] → [4.3429476:3429755]

B:BD[4.3429755] → [3.948132:948280]


void item_colour( item_def &item );
// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: files
 * *********************************************************************** */
void builder(int level_number, int level_type);
// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: abyss - debug - dungeon - effects - religion - spells4
 * *********************************************************************** */
int items( int allow_uniques, int force_class, int force_type, 
           bool dont_place, int item_level, int item_race );
// last updated 13mar2001 {gdl}
/* ***********************************************************************
 * called from: dungeon monplace
 * *********************************************************************** */
void give_item(int mid, int level_number);
void init_rod_mp(item_def &item);
// last updated 13mar2001 {gdl}
/* ***********************************************************************
 * called from: dungeon monplace
 * *********************************************************************** */
void define_zombie(int mid, int ztype, int cs, int power);
bool is_wall(int feature);
bool place_specific_trap(unsigned char spec_x, unsigned char spec_y,
                         unsigned char spec_type);

Deletion in crawl-ref/source/dungeon.h at line 30 [4.3428186]

B:BD[3.948281] → [3.948281:948473]

B:BD[3.948473] → [7.147104:147105]

void place_spec_shop(int level_number, unsigned char shop_x,
                         unsigned char shop_y, unsigned char force_s_type,
                         bool representative = false );

Insertion in crawl-ref/source/dungeon.h at line 80 [4.3428186]

[8.747]

void item_colour( item_def &item );
// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: files
 * *********************************************************************** */
void builder(int level_number, int level_type);
// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: abyss - debug - dungeon - effects - religion - spells4
 * *********************************************************************** */
int items( int allow_uniques, int force_class, int force_type, 
           bool dont_place, int item_level, int item_race,
           const dgn_region_list &forbidden = dgn_region_list() );
// last updated 13mar2001 {gdl}
/* ***********************************************************************
 * called from: dungeon monplace
 * *********************************************************************** */
void give_item(int mid, int level_number);
void init_rod_mp(item_def &item);
// last updated 13mar2001 {gdl}
/* ***********************************************************************
 * called from: dungeon monplace
 * *********************************************************************** */
void define_zombie(int mid, int ztype, int cs, int power);
bool is_wall(int feature);
bool place_specific_trap(unsigned char spec_x, unsigned char spec_y,
                         unsigned char spec_type);
void place_spec_shop(int level_number, unsigned char shop_x,
                         unsigned char shop_y, unsigned char force_s_type,
                         bool representative = false );

Insertion in crawl-ref/source/dungeon.cc at line 177 [4.3429798]
[8.1013]
[9.117193]
```
static dgn_region_list no_item_zones;
```
Insertion in crawl-ref/source/dungeon.cc at line 353 [4.3429798]
[8.1044]
[9.117238]
```
    no_item_zones.clear();
```

Replacement in crawl-ref/source/dungeon.cc at line 626 [4.3429798]

B:BD[4.3443954] → [4.3443954:3444027]

           int item_race )          // weapon / armour racial categories

[4.3443954]

[4.3444027]

           int item_race,           // weapon / armour racial categories
           const dgn_region_list &forbidden)

Insertion in crawl-ref/source/dungeon.cc at line 2650 [4.3429798]
[4.3517670]
[4.3517670]
```
        int tries = 500;
```

Insertion in crawl-ref/source/dungeon.cc at line 2653 [4.3429798]

[4.3517691]

            if (tries-- <= 0)
            {
                destroy_item(p);
                return (NON_ITEM);
            }

Replacement in crawl-ref/source/dungeon.cc at line 2662 [4.3429798]

B:BD[4.3517769] → [4.3517769:3517818]

        while (grd[x_pos][y_pos] != DNGN_FLOOR);

[4.3517769]

[4.3517818]

        while (grd[x_pos][y_pos] != DNGN_FLOOR
               || !unforbidden(coord_def(x_pos, y_pos), forbidden));

Replacement in crawl-ref/source/dungeon.cc at line 4951 [4.3429798]

B:BD[4.3582855] → [4.3582855:3582930]

            items( 1, specif_type, OBJ_RANDOM, false, items_levels, 250 );

[4.3582855]

[4.3582930]

            items( 1, specif_type, OBJ_RANDOM, false, items_levels, 250,
                   no_item_zones );

Replacement in crawl-ref/source/dungeon.cc at line 4961 [4.3429798]

B:BD[4.3583292] → [4.3583292:3583365]

            item_no = items( 0, OBJ_WEAPONS, WPN_KNIFE, false, 0, 250 );

[4.3583292]

[4.3583365]

            item_no = items( 0, OBJ_WEAPONS, WPN_KNIFE, false, 0, 250,
                             no_item_zones );

Deletion in crawl-ref/source/dungeon.cc at line 5835 [4.3429798]

B:BD[4.3597425] → [4.3597425:3597530]

    // for some weird reason can't put a vault on level 1, because monster equip
    // isn't generated.

Insertion in crawl-ref/source/dungeon.cc at line 5887 [4.3429798]

[10.1728]

[9.118667]

            dgn_region( place.x, place.y, place.width, place.height ) );
    if (place.map.has_tag("no_item_gen"))
        no_item_zones.push_back(

Insertion in crawl-ref/source/dungeon.cc at line 6125 [4.3429798]

[11.12587]

[2.32566]

        if (place.map.has_tag("generate_awake"))
            mons.generate_awake = true;

Insertion in crawl-ref/source/dungeon.cc at line 6324 [4.3429798]

[12.1360]

[4.3611392]


        if (place.map.has_tag("generate_awake"))
            monster_type_thing.generate_awake = true;