fiddlerwoaroof/crawl - Change TLA5UN6LZPXGKERI27EFY4HKIIU3VU5Y7ZU54WXL6ANBUV2VOTMQC

Moved all of the bazaar specific logic/code to dat/bazaar (or turned the

code into Lua utility functions which can be reused by things other than bazaars). Related changes:

Portal vault entrances now work if they have destinations ("dst" property) besides "bazaar" (though it still causes an assert if no matchng maps for the destination can be found).
The floor and rock colour for a level are generated once and then stored in the save file, rather than being constantly regenerated (which means that bazaar floor colours are now truly random, rather than being tied to the depth of the bazaar entrance).
The floor and rock colour for a portal vault (or for any level containing any vault) can be set with ROCKCOL and FLOORCOL (which currently only accepts a single colour, unlike COLOUR); there are also Lua functions for querying and setting the colours.
Each portal vault level_type_name can have an associated Lua callback which is called when level generation is complete; it can be used for things like stair fixup.

I also moved the Halls of Zot rock/floor colour special casing to the dat/zot.des file, since it was easy once ROCKCOL and FLOORCOL had been implemented.

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

Created by zelgadis on October 4, 2007

TLA5UN6LZPXGKERI27EFY4HKIIU3VU5Y7ZU54WXL6ANBUV2VOTMQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/util/levcomp.ypp at line 58 [7.75608]
[6.741]
[7.76319]
```
%token <i>      FLOORCOL ROCKCOL
```

Insertion in crawl-ref/source/util/levcomp.ypp at line 163 [7.75608]

[4.220]

[8.59]

                | floorcol
                | rockcol

Insertion in crawl-ref/source/util/levcomp.ypp at line 352 [7.75608]

[4.289]

floorcol        : FLOORCOL { }
                | FLOORCOL STRING
                {
                    lc_map.main.add(
                        yylineno,
                        make_stringf("floor_colour(\"%s\")",
                            quote_lua_string($2).c_str()));
                }
rockcol         : ROCKCOL { }
                | ROCKCOL STRING
                {
                    lc_map.main.add(
                        yylineno,
                        make_stringf("rock_colour(\"%s\")",
                            quote_lua_string($2).c_str()));
                }

Insertion in crawl-ref/source/util/levcomp.lpp at line 202 [7.81193]

[4.875]

[7.82446]

FLOORCOL:           { BEGIN(ARGUMENT); return FLOORCOL; }
ROCKCOL:            { BEGIN(ARGUMENT); return ROCKCOL; }

Insertion in crawl-ref/source/tags.cc at line 1480 [9.164589]

[9.203704]

[6.2098]

    marshallByte(th, env.floor_colour);
    marshallByte(th, env.rock_colour);

Insertion in crawl-ref/source/tags.cc at line 1704 [9.164589]

[9.207653]

[6.2139]

    env.floor_colour = unmarshallByte(th);
    env.rock_colour  = unmarshallByte(th);

Deletion in crawl-ref/source/misc.cc at line 1219 [9.1933596]
B:BD[10.1354] → [11.9316:9350]
```
    dgn_set_floor_colours();
    
```
Insertion in crawl-ref/source/mapdef.h at line 583 [7.591249]
[12.1475]
[12.1475]
```
    unsigned char   rock_colour, floor_colour;
```

Replacement in crawl-ref/source/mapdef.cc at line 1161 [7.594797]

B:BD[13.4913] → [13.4913:4971]

      veto("dlveto"), index_only(false), cache_offset(0L)

[13.4913]

[14.12763]

      veto("dlveto"), rock_colour(BLACK), floor_colour(BLACK),
      index_only(false), cache_offset(0L)

Insertion in crawl-ref/source/luadgn.cc at line 26 [16.1232]
[15.73788]
[16.1493]
```
#include "view.h"
```

Insertion in crawl-ref/source/luadgn.cc at line 925 [16.1232]

[17.674]

    return (0);
}
static int dgn_floor_colour(lua_State *ls)
{
    MAP(ls, 1, map);
    const char *s = luaL_checkstring(ls, 2);
    int colour = str_to_colour(s);
    if (colour < 0 || colour == BLACK)
    {
        std::string error;
        if (colour == BLACK)
        {
            error = "Can't set floor to black.";
        }
        else {
            error = "No such colour as '";
            error += s;
            error += "'";
        }
        luaL_argerror(ls, 2, error.c_str());
        return (0);
    }
    map->floor_colour = (unsigned char) colour;
    return (0);
}
static int dgn_rock_colour(lua_State *ls)
{
    MAP(ls, 1, map);
    const char *s = luaL_checkstring(ls, 2);
    int colour = str_to_colour(s);
    if (colour < 0 || colour == BLACK)
    {
        std::string error;
        if (colour == BLACK)
        {
            error = "Can't set rock to black.";
        }
        else {
            error = "No such colour as '";
            error += s;
            error += "'";
        }
        luaL_argerror(ls, 2, error.c_str());
        return (0);
    }
    map->rock_colour = (unsigned char) colour;
    return (0);
}
static int dgn_get_floor_colour(lua_State *ls)
{
    PLUARET(string, colour_to_str(env.floor_colour));
}
static int dgn_get_rock_colour(lua_State *ls)
{
    PLUARET(string, colour_to_str(env.rock_colour));
}
static int dgn_change_floor_colour(lua_State *ls)
{
    const char *s = luaL_checkstring(ls, 1);
    int colour = str_to_colour(s);
    if (colour < 0 || colour == BLACK)
    {
        std::string error;
        if (colour == BLACK)
        {
            error = "Can't set floor to black.";
        }
        else {
            error = "No such colour as '";
            error += s;
            error += "'";
        }
        luaL_argerror(ls, 1, error.c_str());
        return (0);
    }
    env.floor_colour = (unsigned char) colour;
    viewwindow(true, false);
    return (0);
}
static int dgn_change_rock_colour(lua_State *ls)
{
    const char *s = luaL_checkstring(ls, 1);
    int colour = str_to_colour(s);
    if (colour < 0 || colour == BLACK)
    {
        std::string error;
        if (colour == BLACK)
        {
            error = "Can't set rock to black.";
        }
        else {
            error = "No such colour as '";
            error += s;
            error += "'";
        }
        luaL_argerror(ls, 1, error.c_str());
        return (0);
    }
    env.rock_colour = (unsigned char) colour;
    viewwindow(true, false);

Insertion in crawl-ref/source/luadgn.cc at line 1334 [16.1232]

[6.106135]

}
static int lua_dgn_set_lt_callback(lua_State *ls)
{
    const char *level_type = luaL_checkstring(ls, 1);
    if (level_type == NULL || strlen(level_type) == 0)
        return (0);
    const char *callback_name = luaL_checkstring(ls, 2);
    if (callback_name == NULL || strlen(callback_name) == 0)
        return (0);
    dgn_set_lt_callback(level_type, callback_name);
    return (0);
}
static int dgn_fixup_stairs(lua_State *ls)
{
    const dungeon_feature_type up_feat =
        dungeon_feature_by_name(luaL_checkstring(ls, 1));
    const dungeon_feature_type down_feat =
        dungeon_feature_by_name(luaL_checkstring(ls, 2));
    if (up_feat == DNGN_UNSEEN && down_feat == DNGN_UNSEEN)
        return(0);
    for (int y = 0; y < GYM; ++y)
    {
        for (int x = 0; x < GXM; ++x)
        {
            const dungeon_feature_type feat = grd[x][y];
            if (grid_is_stone_stair(feat) || grid_is_rock_stair(feat))
            {
                dungeon_feature_type new_feat = DNGN_UNSEEN;
                if (grid_stair_direction(feat) == CMD_GO_DOWNSTAIRS)
                    new_feat = down_feat;
                else
                    new_feat = up_feat;
                if (new_feat != DNGN_UNSEEN)
                {
                    grd[x][y] = new_feat;
                    env.markers.add(
                        new map_feature_marker(
                            coord_def(x, y),
                            new_feat));
                }
            }
        }
    }
    return (0);
}
static int dgn_floor_halo(lua_State *ls)
{
    std::string error = "";
    const char* s1 = luaL_checkstring(ls, 1);
    const dungeon_feature_type target = dungeon_feature_by_name(s1);
    if (target == DNGN_UNSEEN)
    {
        error += "No such dungeon feature as '";
        error += s1;
        error += "'.  ";
    }
    const char* s2 = luaL_checkstring(ls, 2);
    unsigned char colour = str_to_colour(s2);
    if (colour == -1)
    {
        error += "No such colour as '";
        error += s2;
        error += "'.";
    }
    else if (colour == BLACK)
    {
        error += "Can't set floor colour to black.";
    }
    if (error != "")
    {
        luaL_argerror(ls, 2, error.c_str());
        return(0);
    }
    for (int y = 0; y < GYM; ++y)
    {
        for (int x = 0; x < GXM; ++x)
        {
            const dungeon_feature_type feat = grd[x][y];
            if (feat == target)
            {
                for (int i=-1; i<=1; i++)
                     for (int j=-1; j<=1; j++)
                     {
                         if (!map_bounds(x+i, y+j))
                             continue;
                         const dungeon_feature_type feat2 = grd[x+i][y+j];
                         if (feat2 == DNGN_FLOOR
                             || feat2 == DNGN_UNDISCOVERED_TRAP)
                         {
                             env.grid_colours[x+i][y+j] = colour;
                         }
                     }
            }
        }
    }
    return (0);

Insertion in crawl-ref/source/luadgn.cc at line 1455 [16.1232]
[6.106137]
[6.106137]

Insertion in crawl-ref/source/luadgn.cc at line 1476 [16.1232]

[4.6077]

[16.12649]

    { "floor_colour", dgn_floor_colour},
    { "rock_colour", dgn_rock_colour},

Insertion in crawl-ref/source/luadgn.cc at line 1509 [16.1232]

[6.106491]

    { "get_floor_colour", dgn_get_floor_colour},
    { "get_rock_colour",  dgn_get_rock_colour},
    { "change_floor_colour", dgn_change_floor_colour},
    { "change_rock_colour",  dgn_change_rock_colour},
    { "set_lt_callback", lua_dgn_set_lt_callback},
    { "fixup_stairs", dgn_fixup_stairs},
    { "floor_halo", dgn_floor_halo},

Deletion in crawl-ref/source/dungeon.h at line 297 [9.3428186]
B:BD[11.11640] → [18.738:779]
```
int bazaar_floor_colour(int curr_level);
```
Deletion in crawl-ref/source/dungeon.h at line 300 [9.3428186]
B:BD[11.11761] → [11.11761:11791]
```
void dgn_set_floor_colours();
```

Insertion in crawl-ref/source/dungeon.h at line 321 [9.3428186]

[6.107810]

[9.3429755]

void dgn_set_lt_callback(std::string level_type_name,
                         std::string callback_name);

Replacement in crawl-ref/source/dungeon.cc at line 176 [9.3429798]
B:BD[19.8796] → [20.30726:30770]
```
static void bazaar_level(int level_number);
```
[19.8796]
[9.3433973]
```
static void portal_vault_level(int level_number);
```
Insertion in crawl-ref/source/dungeon.cc at line 233 [9.3429798]
[21.325]
[22.821]
```
// MISC FUNCTIONS
static void dgn_set_floor_colours();
```

Insertion in crawl-ref/source/dungeon.cc at line 250 [9.3429798]

[23.604]

[7.949300]


typedef std::map<std::string, std::string> callback_map;
static callback_map level_type_post_callbacks;

Insertion in crawl-ref/source/dungeon.cc at line 549 [9.3429798]

[6.110527]

[24.3169]


    if (place.map.floor_colour != BLACK)
        env.floor_colour = place.map.floor_colour;
    if (place.map.rock_colour != BLACK)
        env.rock_colour = place.map.rock_colour;

Insertion in crawl-ref/source/dungeon.cc at line 659 [9.3429798]
[6.111056]
[25.4034]
```
    env.floor_colour = BLACK;
    env.rock_colour  = BLACK;
```
Insertion in crawl-ref/source/dungeon.cc at line 854 [9.3429798]
[20.31330]
[26.1764]
```
    {
        dgn_set_floor_colours();
```
Insertion in crawl-ref/source/dungeon.cc at line 857 [9.3429798]
[26.1780]
[26.1780]
```
    }
```

Deletion in crawl-ref/source/dungeon.cc at line 941 [9.3429798]

B:BD[11.12074] → [18.781:1076]

}
int bazaar_floor_colour(int curr_level)
{
    const char floorcolours_bzr[] =
    { BLUE, RED, LIGHTBLUE, MAGENTA, GREEN };
    // set colour according to current level
    // randomization would reset between save/reload and after showing map
    return (floorcolours_bzr[curr_level % 5]);

Replacement in crawl-ref/source/dungeon.cc at line 949 [9.3429798]
B:BD[11.12256] → [11.12256:12285]
```
void dgn_set_floor_colours()
```
[11.12256]
[11.12285]
```
static void dgn_set_floor_colours()
```

Insertion in crawl-ref/source/dungeon.cc at line 951 [9.3429798]

[11.12287]

    unsigned char old_floor_colour = env.floor_colour;
    unsigned char old_rock_colour  = env.rock_colour;

Replacement in crawl-ref/source/dungeon.cc at line 958 [9.3429798]
B:BD[11.12418] → [11.12418:12466]
```
    else if (you.level_type == LEVEL_LABYRINTH)
```
[11.12418]
[11.12466]
```
    else if (you.level_type == LEVEL_DUNGEON)
```

Deletion in crawl-ref/source/dungeon.cc at line 960 [9.3429798]

B:BD[11.12472] → [11.12472:12544]

B:BD[11.12544] → [27.286:511]

B:BD[27.511] → [18.1077:1145]

∅:D[27.827] → [11.12544:12565]

∅:D[18.1145] → [11.12544:12565]

B:BD[11.12544] → [11.12544:12565]

        env.floor_colour = LIGHTGREY;
        env.rock_colour  = BROWN;
    }
    else if (you.level_type == LEVEL_PORTAL_VAULT
             && you.level_type_name == "bazaar")
    {
        // bazaars get gold walls
        env.rock_colour = YELLOW;
        
        // bazaar floor is colourful
        env.floor_colour = bazaar_floor_colour(you.your_level + 1);
    }
    else
    {

Insertion in crawl-ref/source/dungeon.cc at line 961 [9.3429798]
[11.12604]
[11.12604]
```
        // Hall of Zot colours handled in dat/zot.des
```
Insertion in crawl-ref/source/dungeon.cc at line 965 [9.3429798]
[11.12773]
[11.12773]
```
    }
```

Replacement in crawl-ref/source/dungeon.cc at line 967 [9.3429798]

B:BD[11.12774] → [11.12774:13156]

        // Zot is multicoloured
        if ( you.where_are_you == BRANCH_HALL_OF_ZOT )
        {
            const char floorcolours_zot[] = { LIGHTGREY, LIGHTGREY, BLUE,
                                              LIGHTBLUE, MAGENTA };
            const char rockcolours_zot[] = { LIGHTGREY, BLUE, LIGHTBLUE,
                                             MAGENTA, LIGHTMAGENTA };

[11.12774]

[11.13156]

    if (old_floor_colour != BLACK)
        env.floor_colour = old_floor_colour;
    if (old_rock_colour != BLACK)
        env.rock_colour = old_rock_colour;

Replacement in crawl-ref/source/dungeon.cc at line 972 [9.3429798]

B:BD[11.13157] → [11.13157:13559]

            const int curr_subdungeon_level = player_branch_depth();
            if ( curr_subdungeon_level > 5 || curr_subdungeon_level < 1 )
                mpr("Odd colouring!");
            else
            {
                env.floor_colour = floorcolours_zot[curr_subdungeon_level-1];
                env.rock_colour = rockcolours_zot[curr_subdungeon_level-1];
            }
        }
    }

[11.13157]

[11.13559]

    if (env.floor_colour == BLACK)
        env.floor_colour = LIGHTGREY;
    if (env.rock_colour == BLACK)
        env.rock_colour  = BROWN;

Replacement in crawl-ref/source/dungeon.cc at line 1447 [9.3429798]

B:BD[20.31402] → [13.7173:7412]

        if (you.level_type_name == "bazaar")
            bazaar_level(level_number);
        else
        {
            // Need to find encompass vault with tag matching
            // level_type_name.
            ASSERT(false);
        }

[20.31402]

[20.31438]

        portal_vault_level(level_number);

Replacement in crawl-ref/source/dungeon.cc at line 1520 [9.3429798]
B:BD[20.31542] → [20.31542:31576]
```
static void fixup_bazaar_stairs()
```
[20.31542]
[20.31576]
```
static void portal_vault_level(int level_number)
```

Replacement in crawl-ref/source/dungeon.cc at line 1522 [9.3429798]

B:BD[20.31578] → [20.31578:31877]

B:BD[20.31877] → [13.7413:7469]

∅:D[13.7469] → [20.31927:31948]

B:BD[20.31927] → [20.31927:31948]

B:BD[20.31948] → [28.285:303]

∅:D[28.303] → [20.31948:31997]

B:BD[20.31948] → [20.31948:31997]

B:BD[20.31997] → [29.6233:6270]

∅:D[29.6270] → [28.340:498]

B:BD[28.340] → [28.340:498]

B:BD[28.498] → [18.1146:1537]

∅:D[28.498] → [20.31997:32029]

∅:D[18.1537] → [20.31997:32029]

B:BD[20.31997] → [20.31997:32029]

    for (int y = 0; y < GYM; ++y)
    {
        for (int x = 0; x < GXM; ++x)
        {
            const dungeon_feature_type feat = grd[x][y];
            if (grid_is_stone_stair(feat) || grid_is_rock_stair(feat))
            {
                if (grid_stair_direction(feat) == CMD_GO_DOWNSTAIRS)
                    grd[x][y] = DNGN_EXIT_PORTAL_VAULT;
                else
                {
                    grd[x][y] = DNGN_STONE_ARCH;
                    env.markers.add(
                        new map_feature_marker(
                            coord_def(x, y),
                            DNGN_STONE_ARCH));
                }
            }
            
            // colour floor squares around shops
            if (feat == DNGN_ENTER_SHOP)
            {
                for (int i=-1; i<=1; i++)
                     for (int j=-1; j<=1; j++)
                     {
                          if (grd[x+i][y+j] == DNGN_FLOOR)
                              grd[x+i][y+j] = DNGN_FLOOR_SPECIAL;
                     }
            }
        }
    }
}

[20.31578]

[20.32029]

    std::string trimmed_name = trimmed_string(you.level_type_name);
    ASSERT(trimmed_name.c_str() != "");
    const char* level_name = trimmed_name.c_str();

Deletion in crawl-ref/source/dungeon.cc at line 1527 [9.3429798]
B:BD[20.32030] → [20.32030:32075]
```
static void bazaar_level(int level_number)
{
```

Replacement in crawl-ref/source/dungeon.cc at line 1530 [9.3429798]

B:BD[2.3434] → [2.3434:3469]

    if (vault == -1 && you.wizard)

[2.3434]

[2.3469]

    if (vault == -1 && you.wizard
        && random_map_for_tag(level_name, false) != -1)

Replacement in crawl-ref/source/dungeon.cc at line 1537 [9.3429798]

B:BD[2.3519] → [2.3519:3595]

            mprf(MSGCH_PROMPT, "Which bazaar (ESC or ENTER for random): ");

[2.3519]

[2.3595]

            mprf(MSGCH_PROMPT, "Which %s (ESC or ENTER for random): ",
                 level_name);

Replacement in crawl-ref/source/dungeon.cc at line 1551 [9.3429798]

B:BD[2.3873] → [2.3873:3929]

            vault = find_map_by_name("bazaar_" + name);

[2.3873]

[2.3929]

            vault = find_map_by_name(you.level_type_name + "_" + name);

Replacement in crawl-ref/source/dungeon.cc at line 1554 [9.3429798]

B:BD[2.3959] → [2.3959:4030]

                mprf(MSGCH_DIAGNOSTICS, "No such bazaar, try again.");

[2.3959]

[2.4030]

                mprf(MSGCH_DIAGNOSTICS, "No such %s, try again.",
                     level_name);

Replacement in crawl-ref/source/dungeon.cc at line 1561 [9.3429798]

B:BD[20.32162] → [20.32162:32215]

        vault = random_map_for_tag("bazaar", false);

[20.32162]

[20.32215]

        vault = random_map_for_tag(level_name, false);

Insertion in crawl-ref/source/dungeon.cc at line 1564 [9.3429798]

[20.32237]

        ensure_vault_placed( build_vaults(level_number, vault) );
    else

Replacement in crawl-ref/source/dungeon.cc at line 1567 [9.3429798]

B:BD[20.32243] → [20.32243:32378]

        ensure_vault_placed( build_vaults(level_number, vault) );
        link_items();
        fixup_bazaar_stairs();
        return;

[20.32243]

[20.32378]

        plan_main(level_number, 0);
        place_minivaults(level_name, 1, 1, true);
        if (level_vaults.empty())
        {
            mprf(MSGCH_WARN, "No maps or tags named '%s'.",
                 level_name);
            ASSERT(false);
            end(-1);
        }

Replacement in crawl-ref/source/dungeon.cc at line 1579 [9.3429798]

B:BD[20.32385] → [20.32385:32500]

    // No primary Bazaar vaults (ugh).
    plan_main(level_number, 0);
    place_minivaults("bazaar", 1, 1, true);

[20.32385]

[20.32500]

    link_items();

Replacement in crawl-ref/source/dungeon.cc at line 1581 [9.3429798]

B:BD[20.32501] → [20.32501:32652]

    // No vaults placed yet? Place some shops of our own.
    if (level_vaults.empty())
        place_shops(level_number, random_range(5, MAX_SHOPS));

[20.32501]

[20.32652]

    // TODO: Let portal vault map have arbitrary properties which can
    // be passed onto the callback.
    callback_map::const_iterator
        i = level_type_post_callbacks.find(you.level_type_name);

Replacement in crawl-ref/source/dungeon.cc at line 1586 [9.3429798]

B:BD[20.32653] → [20.32653:32702]

    link_items();
    fixup_bazaar_stairs();

[20.32653]

[9.3555306]

    if (i != level_type_post_callbacks.end())
        dlua.callfn(i->second.c_str(), 0, 0);

Insertion in crawl-ref/source/dungeon.cc at line 7253 [9.3429798]

[30.9696]

[31.157799]

void dgn_set_lt_callback(std::string level_type_name,
                         std::string callback_name)
{
    ASSERT(level_type_name != "");
    ASSERT(callback_name   != "");
    level_type_post_callbacks[level_type_name] = callback_name;
}

Replacement in crawl-ref/source/dat/zot.des at line 9 [32.1533]
B:BD[32.1940] → [32.1940:1961]
```
NAME:    hall_of_Zot
```
[32.1940]
[32.1961]
```
NAME:    hall_of_Zot_5
```
Insertion in crawl-ref/source/dat/zot.des at line 13 [32.1533]
[6.111998]
[32.1991]
```
FLOORCOL: magenta
ROCKCOL:  lightmagenta
```

Insertion in crawl-ref/source/dat/zot.des at line 83 [32.1533]

[32.5539]

ENDMAP
################################################################
# For colouring the walls and floors of the first four levels
NAME:     hall_of_Zot_1
PLACE:    Zot:1
TAGS:     transparent
ORIENT:   float
FLOORCOL: lightgrey
ROCKCOL:  lightgrey
MAP
.

Insertion in crawl-ref/source/dat/zot.des at line 101 [32.1533]
[32.5547]
[32.5547]
```
###
```
Insertion in crawl-ref/source/dat/zot.des at line 103 [32.1533]
[32.5548]
[32.5548]
```
NAME:     hall_of_Zot_2
PLACE:    Zot:2
TAGS:     transparent
ORIENT:   float
```
Insertion in crawl-ref/source/dat/zot.des at line 108 [32.1533]
[32.5549]
[32.5549]
```
FLOORCOL: lightgrey
ROCKCOL:  blue
```

Insertion in crawl-ref/source/dat/zot.des at line 111 [32.1533]

[32.5550]

MAP
.
ENDMAP
###
NAME:     hall_of_Zot_3
PLACE:    Zot:3
TAGS:     transparent
ORIENT:   float
FLOORCOL: blue
ROCKCOL:  lightblue
MAP
.
ENDMAP
###
NAME:     hall_of_Zot_4
PLACE:    Zot:4
TAGS:     transparent
ORIENT:   float
FLOORCOL: lightblue
ROCKCOL:  magenta
MAP
.
ENDMAP

Insertion in crawl-ref/source/dat/bazaar.des at line 31 [20.48488]

[13.12399]

[20.48970]

function random_bazaar_colour()
  local colours = {"blue", "red", "lightblue", "magenta", "green"}
  crawl.mpr("#colours = " .. #colours)
  local ret = colours[crawl.random2(#colours) + 1]
  crawl.mpr("ret = " .. ret)
  return ret
end
function fixup_bazaar()
  dgn.fixup_stairs("stone_arch", "exit_portal_vault")
  dgn.floor_halo("enter_shop", "yellow")
  if (dgn.get_floor_colour() == "black") then
    dgn.change_floor_colour(random_bazaar_colour())
  end
  if (dgn.get_rock_colour() == "black") then
    dgn.change_rock_colour("yellow")
  end
end
dgn.set_lt_callback("bazaar", "fixup_bazaar")

Replacement in crawl-ref/source/dat/bazaar.des at line 198 [20.48488]
∅:D[13.12644] → [20.49776:49777]
∅:D[33.17471] → [20.49776:49777]
B:BD[20.49776] → [20.49776:49777]
[13.12644]
[33.17472]
```
#
# You can force a particular colour for the rock walls or floor using
# ROCKCOL and FLOORCOL directives.
#
```

Replacement in crawl-ref/source/dat/bazaar.des at line 280 [20.48488]

B:BD[18.1793] → [18.1793:1831]

: if you.bazaar_floor() == "red" then

[18.1793]

[18.1831]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then

Replacement in crawl-ref/source/dat/bazaar.des at line 285 [20.48488]
B:BD[18.1851] → [18.1851:1890]
```
: if you.bazaar_floor() == "blue" then
```
[18.1851]
[18.1890]
```
: if colour == "blue" then
```

Replacement in crawl-ref/source/dat/bazaar.des at line 313 [20.48488]

B:BD[18.1953] → [18.1953:1991]

: if you.bazaar_floor() == "red" then

[18.1953]

[18.1991]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then

Replacement in crawl-ref/source/dat/bazaar.des at line 318 [20.48488]
B:BD[18.2011] → [18.2011:2050]
```
: if you.bazaar_floor() == "blue" then
```
[18.2011]
[18.2050]
```
: if colour == "blue" then
```

Replacement in crawl-ref/source/dat/bazaar.des at line 368 [20.48488]

B:BD[18.2113] → [18.2113:2168]

: if you.bazaar_floor() == "red" then
SUBST:   l : wWx

[18.2113]

[18.2168]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then
SUBST: l = w

Replacement in crawl-ref/source/dat/bazaar.des at line 373 [20.48488]
B:BD[18.2175] → [18.2175:2230]
```
: if you.bazaar_floor() == "blue" then
SUBST:   w : Wx
```
[18.2175]
[18.2230]
```
: if colour == "blue" then
SUBST: w = l
```

Replacement in crawl-ref/source/dat/bazaar.des at line 692 [20.48488]

B:BD[34.2864] → [18.2245:2309]

# special case for floor
: if you.bazaar_floor() == "blue" then

[34.2864]

[18.2309]

# special cases for blue floor
: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "blue" then

Replacement in crawl-ref/source/dat/bazaar.des at line 818 [20.48488]

B:BD[18.3644] → [18.3644:3682]

: if you.bazaar_floor() == "red" then

[18.3644]

[18.3682]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then

Replacement in crawl-ref/source/dat/bazaar.des at line 823 [20.48488]
B:BD[18.3702] → [18.3702:3741]
```
: if you.bazaar_floor() == "blue" then
```
[18.3702]
[18.3741]
```
: if colour == "blue" then
```

Deletion in crawl-ref/source/clua.cc at line 745 [35.483969]

B:BD[18.3850] → [18.3850:3948]

LUARET1(bzr_floor_colour, string,
        colour_to_str(bazaar_floor_colour(you.your_level + 2)))

Deletion in crawl-ref/source/clua.cc at line 825 [35.483969]
B:BD[3.17067] → [3.17067:17114]
```
    { "bazaar_floor",      bzr_floor_colour },
```

Replacement in crawl-ref/source/acr.cc at line 737 [9.4397395]

B:BD[2.4250] → [2.4250:4357]

        mpr( "Destination for portal? ", MSGCH_PROMPT );
        get_input_line( specs, sizeof( specs ) );

[2.4250]

[2.4357]

        mpr( "Destination for portal (defaults to 'bazaar')? ", MSGCH_PROMPT );
        if (cancelable_get_line( specs, sizeof( specs ) ))
        {
            canned_msg( MSG_OK );
            return;
        }

Insertion in crawl-ref/source/acr.cc at line 746 [9.4397395]
[2.4423]
[2.4423]
```
        dst = replace_all(dst, " ", "_");
```

Replacement in crawl-ref/source/acr.cc at line 749 [9.4397395]

B:BD[2.4447] → [2.4447:4494]

            canned_msg( MSG_OK );
        else

[2.4447]

[2.4494]

            dst = "bazaar";
        if (find_map_by_name(dst) == -1 &&
            random_map_for_tag(dst, false) == -1)

Replacement in crawl-ref/source/acr.cc at line 754 [9.4397395]

B:BD[2.4504] → [2.4504:4822]

            grd[you.x_pos][you.y_pos] = DNGN_ENTER_PORTAL_VAULT;
            map_wiz_props_marker
                *marker = new map_wiz_props_marker(you.pos());
            marker->set_property("dst", dst);
            marker->set_property("desc", "wizard portal, dest = " + dst);
            env.markers.add(marker);

[2.4504]

[2.4822]

            mprf("No map named '%s' or tagged '%s'.",
                 dst.c_str(), dst.c_str());
            return;

Insertion in crawl-ref/source/acr.cc at line 758 [9.4397395]

[2.4832]

[9.4413661]


        grd[you.x_pos][you.y_pos] = DNGN_ENTER_PORTAL_VAULT;
        map_wiz_props_marker
            *marker = new map_wiz_props_marker(you.pos());
        marker->set_property("dst", dst);
        marker->set_property("desc", "wizard portal, dest = " + dst);
        env.markers.add(marker);

Insertion in crawl-ref/docs/level-design.txt at line 422 [36.350]

[6.132826]


FLOORCOL: blue
          FLOORCOL: allows you to set the floor colour for the level
          the vault appears in.  Should only be used for bazaars and
          other portal vaults.

Insertion in crawl-ref/docs/level-design.txt at line 428 [36.350]

[6.132827]

[36.13170]

ROCKCOL:  yellow
          ROCKCOL: allows you to set the colour of rock walls for the
          level the vault appears in.  Should only be used for bazaars and
          other portal vaults.

Replacement in crawl-ref/docs/level-design.txt at line 502 [36.350]
B:BD[5.1108] → [5.1108:1118]
```
         
```
[5.1108]
[36.15845]

Moved all of the bazaar specific logic/code to dat/bazaar (or turned the

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/util/levcomp.ypp at line 58 [7.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 163 [7.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 352 [7.75608]

Insertion in crawl-ref/source/util/levcomp.lpp at line 202 [7.81193]

Insertion in crawl-ref/source/tags.cc at line 1480 [9.164589]

Insertion in crawl-ref/source/tags.cc at line 1704 [9.164589]

Deletion in crawl-ref/source/misc.cc at line 1219 [9.1933596]

Insertion in crawl-ref/source/mapdef.h at line 583 [7.591249]

Replacement in crawl-ref/source/mapdef.cc at line 1161 [7.594797]

Insertion in crawl-ref/source/luadgn.cc at line 26 [16.1232]

Insertion in crawl-ref/source/luadgn.cc at line 925 [16.1232]

Insertion in crawl-ref/source/luadgn.cc at line 1334 [16.1232]

Insertion in crawl-ref/source/luadgn.cc at line 1455 [16.1232]

Insertion in crawl-ref/source/luadgn.cc at line 1476 [16.1232]

Insertion in crawl-ref/source/luadgn.cc at line 1509 [16.1232]

Deletion in crawl-ref/source/dungeon.h at line 297 [9.3428186]

Deletion in crawl-ref/source/dungeon.h at line 300 [9.3428186]

Insertion in crawl-ref/source/dungeon.h at line 321 [9.3428186]

Replacement in crawl-ref/source/dungeon.cc at line 176 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 233 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 250 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 549 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 659 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 854 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 857 [9.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 941 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 949 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 951 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 958 [9.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 960 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 961 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 965 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 967 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 972 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1447 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1520 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1522 [9.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 1527 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1530 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1537 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1551 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1554 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1561 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 1564 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1567 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1579 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1581 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1586 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 7253 [9.3429798]

Replacement in crawl-ref/source/dat/zot.des at line 9 [32.1533]

Insertion in crawl-ref/source/dat/zot.des at line 13 [32.1533]

Insertion in crawl-ref/source/dat/zot.des at line 83 [32.1533]

Insertion in crawl-ref/source/dat/zot.des at line 101 [32.1533]

Insertion in crawl-ref/source/dat/zot.des at line 103 [32.1533]

Insertion in crawl-ref/source/dat/zot.des at line 108 [32.1533]

Insertion in crawl-ref/source/dat/zot.des at line 111 [32.1533]

Insertion in crawl-ref/source/dat/bazaar.des at line 31 [20.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 198 [20.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 280 [20.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 285 [20.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 313 [20.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 318 [20.48488]