fiddlerwoaroof/crawl - Change AMBBZGB4EP4MA2ILKQSAY4O2XQAIH673JHCDQ6N4MBGL2MAZGXNAC

Add a neutral monster brand (defaulting to darkgrey).

Of course we still need something like this for Tiles!

Make Ctrl+Dir call close_door() if the square in question is a closed door. I've tested it, and found this change (suggested by dpeg) extremely convenient. Also fixed the information leak about an invisible monster blocking a doorway without time passing.

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

Created by j-p-e-g on March 20, 2008

AMBBZGB4EP4MA2ILKQSAY4O2XQAIH673JHCDQ6N4MBGL2MAZGXNAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 304 [5.16817]

[4.5415]

    case COLFLAG_NEUTRAL_MONSTER:
        return (Options.neutral_brand);

Insertion in crawl-ref/source/view.cc at line 705 [5.16817]

[6.392]

    }
    else if (mons_neutral(mons))
    {
        col |= COLFLAG_NEUTRAL_MONSTER;

Replacement in crawl-ref/source/libunix.cc at line 747 [5.2550041]

B:BD[7.1222] → [7.1222:1424]

B:BD[7.1424] → [8.4448:4522]

∅:D[8.4522] → [9.556:627]

B:BD[7.1496] → [9.556:627]

∅:D[9.627] → [7.1496:1558]

B:BD[7.1496] → [7.1496:1558]

        (col & COLFLAG_ITEM_HEAP)?           Options.heap_brand :
        (col & COLFLAG_WILLSTAB)?            Options.stab_brand :
        (col & COLFLAG_MAYSTAB)?             Options.may_stab_brand :
        (col & COLFLAG_STAIR_ITEM)?          Options.feature_item_brand :
        (col & COLFLAG_TRAP_ITEM)?           Options.trap_item_brand :
        (col & COLFLAG_REVERSE)?             CHATTR_REVERSE :

[7.1222]

[7.1558]

           (col & COLFLAG_NEUTRAL_MONSTER)?  Options.neutral_brand :
           (col & COLFLAG_ITEM_HEAP)?        Options.heap_brand :
           (col & COLFLAG_WILLSTAB)?         Options.stab_brand :
           (col & COLFLAG_MAYSTAB)?          Options.may_stab_brand :
           (col & COLFLAG_STAIR_ITEM)?       Options.feature_item_brand :
           (col & COLFLAG_TRAP_ITEM)?        Options.trap_item_brand :
           (col & COLFLAG_REVERSE)?          CHATTR_REVERSE :

Insertion in crawl-ref/source/initfile.cc at line 789 [5.2957258]
[8.5249]
[8.5249]
```
    neutral_brand      = CHATTR_NORMAL;
```

Insertion in crawl-ref/source/initfile.cc at line 1907 [5.2957258]

[10.1109]

[11.411283]

    else if (key == "neutral_brand")
    {
        neutral_brand = curses_attribute(field);
    }

Insertion in crawl-ref/source/externs.h at line 1608 [5.3270163]

[12.4891]

    unsigned    neutral_brand;   // Attribute for branding neutral monsters

Replacement in crawl-ref/source/defines.h at line 261 [5.3982910]
B:BD[5.3986158] → [11.478240:478292]
```
    #define COLFLAG_ITEM_HEAP                0x0200
```
[5.3986158]
[11.478292]
```
    #define COLFLAG_NEUTRAL_MONSTER          0x0200
```

Replacement in crawl-ref/source/defines.h at line 264 [5.3982910]

B:BD[11.478396] → [7.2279:2331]

B:BD[7.2331] → [9.891:995]

    #define COLFLAG_STAIR_ITEM               0x1000
    #define COLFLAG_TRAP_ITEM                0x2000
    #define COLFLAG_REVERSE                  0x4000

[11.478396]

[13.1263]

    #define COLFLAG_ITEM_HEAP                0x1000
    #define COLFLAG_STAIR_ITEM               0x2000
    #define COLFLAG_TRAP_ITEM                0x4000
    #define COLFLAG_REVERSE                  0x8000

Replacement in crawl-ref/source/acr.cc at line 3454 [5.4397395]

B:BD[2.4491] → [2.4491:4568]

                mpr("There isn't anything that you can open there!"); break;

[2.4491]

[2.4568]

                mpr("There isn't anything that you can open there!");
                break;

Insertion in crawl-ref/source/acr.cc at line 3509 [5.4397395]

[5.4466354]

    else if (grd[dx][dy] == DNGN_OPEN_DOOR)
        close_door(move_x, move_y); // for convenience

Replacement in crawl-ref/source/acr.cc at line 3517 [5.4397395]
B:BD[5.4466473] → [5.4466473:4466524]
```
}                               // end open_door()
```
[5.4466473]
[5.4466524]
```
}
```
Insertion in crawl-ref/source/acr.cc at line 3551 [5.4397395]
[2.5187]
[2.5187]
```
        
```

Replacement in crawl-ref/source/acr.cc at line 3568 [5.4397395]

B:BD[14.4560] → [14.4560:4624]

                mprf("There's a creature in the %sway!", noun);

[14.4560]

[14.4624]

                if (!player_monster_visible(&menv[mgrd[dc.x][dc.y]]))
                {
                    mprf("Something is blocking the %sway!", noun);
                    you.turn_is_over = true;
                }
                else
                    mprf("There's a creature in the %sway!", noun);

Replacement in crawl-ref/source/acr.cc at line 3645 [5.4397395]
B:BD[5.4468314] → [5.4468314:4468365]
```
}                               // end open_door()
```
[5.4468314]
[5.4468365]
```
}
```
Insertion in crawl-ref/init.txt at line 120 [5.4830895]
[3.3007]
[3.3007]
```
neutral_brand      = hi:darkgrey
```

Replacement in crawl-ref/docs/crawl_options.txt at line 35 [17.63392]

B:BD[15.4106] → [16.4828:4886]

                friend_brand, stab_brand, may_stab_brand,

[15.4106]

[8.7268]

                friend_brand, neutral_brand, stab_brand, may_stab_brand,

Insertion in crawl-ref/docs/crawl_options.txt at line 514 [17.63392]

[16.16458]

[18.18502]


neutral_brand = none
        Brand neutral monsters in some way. Useful both to get out of
	a neutral monster's path, and to avoid accidentally killing it.
	E.g.
	     neutral_brand = hi:darkgrey
	shows neutrals with a dark grey background. Since there are
	no darkgrey monster glyphs anymore, this works fine.