fiddlerwoaroof/crawl - Change Z6Q7JVMFQ32SC7FRGOB7CE7JS2HEOPAO3B2VLU3YR3UCUDZFIPFQC

Added floor_special and floor_reserved to dngn_feature_names[], to make

the array match up with the enums.

Don't describe the weapon with which an unseen monster is attacking.

Added methods can_see() and visible_to() to the actor, player and monster classes, which take care of calling mons_player_visible(), player_monster_visible(), mons_monster_visible() and mons_near().

Re-arranged the first 12 dungeon_feature_type enumerations so that similar features are contiguous (i.e., closed door and secret door are next to each other), and added DNGN_MAXOPAQUE (one less than DNGN_MINSEE), DNGN_MINWALL and DNGN_MAXWALL.

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

Created by zelgadis on October 2, 2007

Z6Q7JVMFQ32SC7FRGOB7CE7JS2HEOPAO3B2VLU3YR3UCUDZFIPFQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/terrain.cc at line 36 [3.26938]

B:BD[3.27683] → [3.27683:27880]

B:BD[3.27880] → [2.3522:3705]

    return (grid == DNGN_ROCK_WALL
            || grid == DNGN_STONE_WALL
            || grid == DNGN_METAL_WALL
            || grid == DNGN_GREEN_CRYSTAL_WALL
            || grid == DNGN_WAX_WALL
            || grid == DNGN_PERMAROCK_WALL
            || grid == DNGN_CLEAR_ROCK_WALL
            || grid == DNGN_CLEAR_STONE_WALL
            || grid == DNGN_CLEAR_PERMAROCK_WALL);

[3.27683]

[3.27925]

    return (grid >= DNGN_MINWALL && grid <= DNGN_MAXWALL);

Replacement in crawl-ref/source/terrain.cc at line 159 [3.26938]
B:BD[3.31007] → [3.31007:31068]
```
    return (grid < DNGN_MINSEE && grid != DNGN_ORCISH_IDOL);
```
[3.31007]
[3.31068]
```
    return (grid < DNGN_MINSEE);
```

Insertion in crawl-ref/source/player.cc at line 5905 [6.962854]

[4.1215]

[5.265]

}
bool player::visible_to(actor *looker)
{
    if (this == looker)
        return (!invisible() || can_see_invisible());
    monsters* mon = dynamic_cast<monsters*>(looker);
    return mons_player_visible(mon);
}
bool player::can_see(actor *target)
{
    if (this == target)
        return visible_to(target);
    monsters* mon = dynamic_cast<monsters*>(target);
    return (mons_near(mon) && target->visible_to(this));

Replacement in crawl-ref/source/mon-util.cc at line 3136 [6.1699344]

B:BD[7.10241] → [8.41501:41624]

            const bool can_see =
                mons_near(this) && player_monster_visible(this);
            if (can_see)

[7.10241]

[9.196]

            if (you.can_see(this))

Insertion in crawl-ref/source/mon-util.cc at line 4582 [6.1699344]

[10.268]

bool monsters::visible_to(actor *looker)
{
    if (this == looker)
        return (!invisible() || can_see_invisible());
    if (looker->atype() == ACT_PLAYER)
        return player_monster_visible(this);
    else
    {
        monsters* mon = dynamic_cast<monsters*>(looker);
        return mons_monster_visible(mon, this);
    }
}
bool monsters::can_see(actor *target)
{
    if (this == target)
        return visible_to(target);
    if (!target->visible_to(this))
        return false;
    if (target->atype() == ACT_PLAYER)
        return mons_near(this);
    monsters* mon = dynamic_cast<monsters*>(target);
    int       tx  = mon->x;
    int       ty  = mon->y;
    if (distance(x, y, tx, ty) > LOS_RADIUS)
        return false;
    // Ignoring clouds for now.
    return (num_feats_between(x, y, tx, ty, DNGN_UNSEEN, DNGN_MAXOPAQUE) == 0);
}

Replacement in crawl-ref/source/luadgn.cc at line 929 [12.1232]

B:BD[11.11792] → [11.11792:11930]

B:BD[11.11930] → [2.11830:11951]

    "unseen", "rock_wall", "stone_wall", "closed_door", "metal_wall",
    "secret_door", "green_crystal_wall", "orcish_idol", "wax_wall",
    "permarock_wall", "clear_rock_wall", "clear_stone_wall",
    "clear_permarock_wall", "", "", "", "", "", "", "", "",

[11.11792]

[11.11996]

    "unseen", "closed_door", "secret_door", "rock_wall", "stone_wall",
    "metal_wall", "green_crystal_wall", "wax_wall", "permarock_wall",
    "clear_rock_wall", "clear_stone_wall", "clear_permarock_wall",
    "orcish_idol", "", "", "", "", "", "", "", "",

Replacement in crawl-ref/source/luadgn.cc at line 938 [12.1232]

B:BD[13.545] → [13.545:656]

    "exit_hell", "enter_hell", "open_door", "", "", "", "",
    "trap_mechanical", "trap_magical", "trap_iii",

[13.545]

[11.12436]

    "floor_special", "floor_reserved", "exit_hell", "enter_hell",
    "open_door", "", "", "trap_mechanical", "trap_magical", "trap_iii",

Insertion in crawl-ref/source/fight.cc at line 2927 [6.3140790]
[14.68096]
[15.386]
```
    if (!you.can_see(attacker))
        return ("");
```
Deletion in crawl-ref/source/externs.h at line 111 [6.3270163]
B:BD[16.3104] → [17.435:472]
```
    virtual bool is_icy() const = 0;
```

Insertion in crawl-ref/source/externs.h at line 112 [6.3270163]

[16.3144]

[7.82288]

    virtual bool visible_to(actor *looker) = 0;
    virtual bool can_see(actor *target) = 0;
    virtual bool is_icy() const = 0;

Insertion in crawl-ref/source/externs.h at line 703 [6.3270163]
[16.3209]
[17.473]
```
    bool visible_to(actor *looker);
    bool can_see(actor *target);
```
Insertion in crawl-ref/source/externs.h at line 1046 [6.3270163]
[16.3274]
[17.499]
```
    bool visible_to(actor *looker);
    bool can_see(actor *target);
```
Insertion in crawl-ref/source/enum.h at line 843 [6.3287960]
[6.3307592]
[6.3307592]
```
    DNGN_CLOSED_DOOR,
    DNGN_SECRET_DOOR,
```

Replacement in crawl-ref/source/enum.h at line 847 [6.3287960]

B:BD[6.3307633] → [6.3307633:3307723]

    DNGN_CLOSED_DOOR,
    DNGN_METAL_WALL,
    DNGN_SECRET_DOOR,                  //    5

[6.3307633]

[6.3307723]

    DNGN_METAL_WALL,                   //    5

Replacement in crawl-ref/source/enum.h at line 849 [6.3287960]

B:BD[6.3307752] → [6.3307752:3307891]

B:BD[6.3307891] → [2.12729:12912]

    DNGN_ORCISH_IDOL,
    DNGN_WAX_WALL,                     //    8
    DNGN_PERMAROCK_WALL,               //    9 - for undiggable walls
    DNGN_CLEAR_ROCK_WALL,              //   10 - Transparent
    DNGN_CLEAR_STONE_WALL,             //   11 - Transparent
    DNGN_CLEAR_PERMAROCK_WALL,         //   12 - Transparent

[6.3307752]

[6.3307968]

    DNGN_WAX_WALL,
    DNGN_PERMAROCK_WALL,               //    8 - for undiggable walls
    DNGN_CLEAR_ROCK_WALL,              //    9 - Transparent
    DNGN_CLEAR_STONE_WALL,             //   10 - Transparent
    DNGN_CLEAR_PERMAROCK_WALL,         //   11 - Transparent
    DNGN_ORCISH_IDOL,                  //   12 - Can see past
    // XXX: lowest/highest grid value which is a wall
    DNGN_MINWALL = DNGN_ROCK_WALL,
    DNGN_MAXWALL = DNGN_CLEAR_PERMAROCK_WALL,
    // XXX: highest grid value which is opaque
    DNGN_MAXOPAQUE = DNGN_PERMAROCK_WALL,

Replacement in crawl-ref/source/enum.h at line 864 [6.3287960]
B:BD[18.2907] → [2.12913:12935]
```
    DNGN_MINSEE = 10,
```
[18.2907]
[18.2929]
```
    DNGN_MINSEE = DNGN_CLEAR_ROCK_WALL,
```

Replacement in crawl-ref/source/enum.h at line 881 [6.3287960]

∅:D[19.734] → [20.911594:911688]

B:BD[6.3308441] → [20.911594:911688]

∅:D[20.911688] → [6.3308488:3308535]

B:BD[6.3308488] → [6.3308488:3308535]

    DNGN_EXIT_HELL,                    //   68
    DNGN_ENTER_HELL,                   //   69
    DNGN_OPEN_DOOR,                    //   70

[19.734]

[6.3308582]

    DNGN_EXIT_HELL,                    //   70
    DNGN_ENTER_HELL,                   //   71
    DNGN_OPEN_DOOR,                    //   72

Replacement in crawl-ref/source/beam.cc at line 4648 [6.4128068]
B:BD[6.4258410] → [6.4258410:4258485]
```
    if (dngn_feat < DNGN_GREEN_CRYSTAL_WALL || dngn_feat == DNGN_WAX_WALL)
```
[6.4258410]
[6.4258485]
```
    if (dngn_feat <= DNGN_MAXWALL)
```

Added floor_special and floor_reserved to dngn_feature_names[], to make

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/terrain.cc at line 36 [3.26938]

Replacement in crawl-ref/source/terrain.cc at line 159 [3.26938]

Insertion in crawl-ref/source/player.cc at line 5905 [6.962854]

Replacement in crawl-ref/source/mon-util.cc at line 3136 [6.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4582 [6.1699344]

Replacement in crawl-ref/source/luadgn.cc at line 929 [12.1232]

Replacement in crawl-ref/source/luadgn.cc at line 938 [12.1232]

Insertion in crawl-ref/source/fight.cc at line 2927 [6.3140790]

Deletion in crawl-ref/source/externs.h at line 111 [6.3270163]

Insertion in crawl-ref/source/externs.h at line 112 [6.3270163]

Insertion in crawl-ref/source/externs.h at line 703 [6.3270163]

Insertion in crawl-ref/source/externs.h at line 1046 [6.3270163]

Insertion in crawl-ref/source/enum.h at line 843 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 847 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 849 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 864 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 881 [6.3287960]

Replacement in crawl-ref/source/beam.cc at line 4648 [6.4128068]