fiddlerwoaroof/crawl - Change HH3HFWVXABJ4IRMN22PPJCREMULZSN6DA7VYKOGECGMNUQTZ5QNQC

Implemented Erik's invisibility proposal:

M_SENSE_INVIS for perceptive monsters; split existing monsters with see invisible into M_SEE_INVIS and M_SENSE_INVIS.
Monsters that can't see invisible get to-hit penalties vs invisible players and monsters in both melee and at range.
Monsters that sense where you are know where to shoot and attack, but still get to-hit penalties because they don't know exactly where you are.

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

Created by dshaligram on April 7, 2007

HH3HFWVXABJ4IRMN22PPJCREMULZSN6DA7VYKOGECGMNUQTZ5QNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 724 [5.16817]

B:BD[5.47649] → [5.47649:47722]

    // I assume that creatures who can see invisible are very perceptive

[5.47649]

[5.47722]

    // I assume that creatures who can sense invisible are very perceptive

Replacement in crawl-ref/source/view.cc at line 726 [5.16817]

B:BD[5.47795] → [5.47795:47845]

                   + mons_see_invis(monster) * 5;

[5.47795]

[5.47845]

                   + mons_sense_invis(monster) * 5;

Insertion in crawl-ref/source/player.cc at line 5252 [5.962854]

[6.317]

}
bool player::can_see_invisible() const
{
    return (player_see_invis() > 0);

Insertion in crawl-ref/source/player.cc at line 5258 [5.962854]
[6.319]
```
bool player::invisible() const
{
    return (invis);
}
```

Replacement in crawl-ref/source/monstuff.cc at line 1530 [5.1396662]

B:BD[7.421023] → [7.421023:421081]

        else if ((intel == I_NORMAL && one_chance_in(10))

[7.421023]

[7.421081]

        else if ((intel == I_NORMAL && one_chance_in(13))

Replacement in crawl-ref/source/mon-util.h at line 159 [5.1682293]

B:BD[5.1689311] → [5.1689311:1689357]

char mons_see_invis( struct monsters *mon );

[5.1689311]

[5.1689357]

bool mons_see_invis(const monsters *mon);
bool mons_sense_invis(const monsters *mon);

Replacement in crawl-ref/source/mon-util.cc at line 522 [5.1699344]

B:BD[5.1706116] → [5.1706116:1706160]

char mons_see_invis( struct monsters *mon )

[5.1706116]

[5.1706160]

bool mons_sense_invis(const monsters *mon)
{
    return (mons_class_flag(mon->type, M_SENSE_INVIS));
}
bool mons_see_invis(const monsters *mon)

Replacement in crawl-ref/source/mon-util.cc at line 532 [5.1699344]
∅:D[7.471449] → [5.1706362:1706382]
B:BD[5.1706362] → [5.1706362:1706382]
```
        return (1);
```
[7.471449]
[5.1706382]
```
        return (true);
```
Replacement in crawl-ref/source/mon-util.cc at line 534 [5.1699344]
B:BD[5.1706443] → [5.1706443:1706463]
```
        return (1);
```
[5.1706443]
[5.1706463]
```
        return (true);
```
Replacement in crawl-ref/source/mon-util.cc at line 536 [5.1699344]
B:BD[5.1706464] → [5.1706464:1706480]
```
    return (0);
```
[5.1706464]
[5.1706480]
```
    return (false);
```
Replacement in crawl-ref/source/mon-util.cc at line 562 [5.1699344]
B:BD[5.1707197] → [5.1707197:1707232]
```
        if (mons_see_invis( mon ))
```
[5.1707197]
[5.1707232]
```
        if (mons_see_invis( mon ) || mons_sense_invis(mon))
```
Deletion in crawl-ref/source/mon-util.cc at line 575 [5.1699344]
B:BD[5.1707440] → [5.1707440:1707441]

Insertion in crawl-ref/source/mon-util.cc at line 3866 [5.1699344]

[8.1947]

[9.27505]

bool monsters::can_see_invisible() const
{
    return (mons_see_invis(this));
}
bool monsters::invisible() const
{
    return (has_ench(ENCH_INVIS));
}

Replacement in crawl-ref/source/mon-data.h at line 138 [5.1826214]
B:BD[5.1830139] → [5.1830139:1830181]
```
    M_FLIES | M_SEE_INVIS | M_WARM_BLOOD,
```
[5.1830139]
[7.493160]
```
    M_FLIES | M_SENSE_INVIS | M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 210 [5.1826214]
B:BD[5.1831708] → [5.1831708:1831740]
```
    M_SEE_INVIS | M_WARM_BLOOD,
```
[5.1831708]
[7.493745]
```
    M_SENSE_INVIS | M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 912 [5.1826214]
B:BD[5.1847957] → [7.499828:499864]
```
    M_SEE_INVIS | M_FLIES | M_EVIL,
```
[5.1847957]
[7.499864]
```
    M_SENSE_INVIS | M_FLIES | M_EVIL,
```
Replacement in crawl-ref/source/mon-data.h at line 1020 [5.1826214]
B:BD[5.1850591] → [7.500844:500890]
```
    M_SEE_INVIS | M_EVIL | M_SPECIAL_ABILITY,
```
[5.1850591]
[7.500890]
```
    M_SENSE_INVIS | M_EVIL | M_SPECIAL_ABILITY,
```
Replacement in crawl-ref/source/mon-data.h at line 1177 [5.1826214]
B:BD[5.1854432] → [7.502607:502633]
```
    M_SEE_INVIS | M_EVIL,
```
[5.1854432]
[7.502633]
```
    M_EVIL,
```
Replacement in crawl-ref/source/mon-data.h at line 1632 [5.1826214]
B:BD[5.1865736] → [7.507289:507306]
```
    M_SEE_INVIS,
```
[5.1865736]
[7.507306]
```
    M_SENSE_INVIS,
```

Replacement in crawl-ref/source/mon-data.h at line 1802 [5.1826214]

B:BD[5.1869802] → [10.429:498]

    M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,

[5.1869802]

[7.509014]

    M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SENSE_INVIS | M_EVIL,

Replacement in crawl-ref/source/mon-data.h at line 1814 [5.1826214]
B:BD[5.1870094] → [11.31790:31833]
```
    M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
```
[5.1870094]
[7.509134]
```
    M_SPELLCASTER | M_FLIES | M_SENSE_INVIS,
```
Replacement in crawl-ref/source/mon-data.h at line 1868 [5.1826214]
B:BD[5.1871519] → [5.1871519:1871551]
```
    M_SEE_INVIS | M_WARM_BLOOD,
```
[5.1871519]
[7.509611]
```
    M_SENSE_INVIS | M_WARM_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 2014 [5.1826214]

B:BD[5.1874664] → [10.499:568]

    M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,

[5.1874664]

[7.510765]

    M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SENSE_INVIS | M_EVIL,

Replacement in crawl-ref/source/mon-data.h at line 2026 [5.1826214]

B:BD[5.1874973] → [10.569:638]

    M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,

[5.1874973]

[7.510904]

    M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SENSE_INVIS | M_EVIL,

Replacement in crawl-ref/source/mon-data.h at line 2085 [5.1826214]
B:BD[5.1876400] → [7.511456:511497]
```
    M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,
```
[5.1876400]
[7.511497]
```
    M_WARM_BLOOD | M_SENSE_INVIS | M_EVIL,
```
Replacement in crawl-ref/source/mon-data.h at line 2384 [5.1826214]
B:BD[5.1882966] → [7.514382:514434]
```
    M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL,
```
[5.1882966]
[7.514434]
```
    M_SPELLCASTER | M_FLIES | M_SENSE_INVIS | M_EVIL,
```
Replacement in crawl-ref/source/mon-data.h at line 2469 [5.1826214]
B:BD[5.1885231] → [7.515470:515509]
```
    M_SEE_INVIS | M_LEVITATE | M_EVIL,
```
[5.1885231]
[7.515509]
```
    M_SENSE_INVIS | M_LEVITATE | M_EVIL,
```
Replacement in crawl-ref/source/mon-data.h at line 2505 [5.1826214]
B:BD[5.1886178] → [7.515906:515942]
```
    M_SEE_INVIS | M_INVIS | M_EVIL,
```
[5.1886178]
[7.515942]
```
    M_SENSE_INVIS | M_INVIS | M_EVIL,
```
Replacement in crawl-ref/source/mon-data.h at line 2529 [5.1826214]
B:BD[5.1886804] → [7.516195:516243]
```
    M_NO_SKELETON | M_SEE_INVIS | M_AMPHIBIOUS,
```
[5.1886804]
[7.516243]
```
    M_NO_SKELETON | M_SENSE_INVIS | M_AMPHIBIOUS,
```
Replacement in crawl-ref/source/mon-data.h at line 2878 [5.1826214]
B:BD[5.1895976] → [12.18809:18858]
```
    M_NO_SKELETON | M_SEE_INVIS | M_ACID_SPLASH,
```
[5.1895976]
[3.523]
```
    M_NO_SKELETON | M_SENSE_INVIS | M_ACID_SPLASH,
```
Replacement in crawl-ref/source/mon-data.h at line 2890 [5.1826214]
B:BD[5.1896270] → [7.519830:519863]
```
    M_NO_SKELETON | M_SEE_INVIS,
```
[5.1896270]
[3.573]
```
    M_NO_SKELETON | M_SENSE_INVIS,
```
Replacement in crawl-ref/source/mon-data.h at line 2903 [5.1826214]
B:BD[5.1896604] → [7.519998:520040]
```
    M_NO_SKELETON | M_SEE_INVIS | M_EVIL,
```
[5.1896604]
[3.674]
```
    M_NO_SKELETON | M_SENSE_INVIS | M_EVIL,
```

Replacement in crawl-ref/source/mon-data.h at line 2915 [5.1826214]

B:BD[5.1896908] → [12.18967:19036]

    M_NO_SKELETON | M_SEE_INVIS | M_SPECIAL_ABILITY | M_ACID_SPLASH,

[5.1896908]

[3.738]

    M_NO_SKELETON | M_SENSE_INVIS | M_SPECIAL_ABILITY | M_ACID_SPLASH,

Replacement in crawl-ref/source/mon-data.h at line 2927 [5.1826214]
B:BD[5.1897198] → [12.19073:19122]
```
    M_NO_SKELETON | M_SEE_INVIS | M_ACID_SPLASH,
```
[5.1897198]
[3.788]
```
    M_NO_SKELETON | M_SENSE_INVIS | M_ACID_SPLASH,
```
Replacement in crawl-ref/source/mon-data.h at line 3396 [5.1826214]
B:BD[5.1908647] → [7.525902:525935]
```
    M_NO_SKELETON | M_SEE_INVIS,
```
[5.1908647]
[3.838]
```
    M_NO_SKELETON | M_SENSE_INVIS,
```
Replacement in crawl-ref/source/mon-data.h at line 3408 [5.1826214]
B:BD[5.1908923] → [10.5519:5563]
```
    M_FIGHTER | M_WARM_BLOOD | M_SEE_INVIS,
```
[5.1908923]
[7.526020]
```
    M_FIGHTER | M_WARM_BLOOD | M_SENSE_INVIS,
```
Replacement in crawl-ref/source/mon-data.h at line 3519 [5.1826214]
B:BD[5.1911814] → [11.46667:46693]
```
    M_SEE_INVIS | M_EVIL,
```
[5.1911814]
[7.527162]
```
    M_SENSE_INVIS | M_EVIL,
```

Replacement in crawl-ref/source/mon-data.h at line 3543 [5.1826214]

B:BD[5.1912484] → [5.1912484:1912560]

    M_FLIES | M_SEE_INVIS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,

[5.1912484]

[7.527472]

    M_FLIES | M_SENSE_INVIS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,

Replacement in crawl-ref/source/mon-data.h at line 4003 [5.1826214]
B:BD[5.1919233] → [7.536376:536428]
```
    M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL,
```
[5.1919233]
[7.536428]
```
    M_SPELLCASTER | M_FLIES | M_SENSE_INVIS | M_EVIL,
```
Replacement in crawl-ref/source/mon-data.h at line 4027 [5.1826214]
B:BD[5.1919862] → [11.50828:50871]
```
    M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
```
[5.1919862]
[7.536611]
```
    M_SPELLCASTER | M_FLIES | M_SENSE_INVIS,
```
Replacement in crawl-ref/source/mon-data.h at line 4039 [5.1826214]
B:BD[5.1920162] → [11.50979:51012]
```
    M_SPELLCASTER | M_SEE_INVIS,
```
[5.1920162]
[7.536727]
```
    M_SPELLCASTER | M_SENSE_INVIS,
```
Replacement in crawl-ref/source/mon-data.h at line 4214 [5.1826214]
B:BD[5.1925317] → [5.1925317:1925375]
```
    M_WARM_BLOOD | M_SEE_INVIS, //jmf: until smell exists
```
[5.1925317]
[7.538460]
```
    M_WARM_BLOOD | M_SENSE_INVIS,
```
Replacement in crawl-ref/source/mon-data.h at line 4226 [5.1826214]
B:BD[5.1925590] → [7.538530:538562]
```
    M_SEE_INVIS | M_WARM_BLOOD,
```
[5.1925590]
[7.538562]
```
    M_SENSE_INVIS | M_WARM_BLOOD,
```
Insertion in crawl-ref/source/fight.cc at line 2017 [5.3140790]
[13.5357]
[12.70058]
```
    const bool see_invis = player_see_invis();
```
Replacement in crawl-ref/source/fight.cc at line 2019 [5.3140790]
B:BD[12.70122] → [12.70122:70164]
```
    if (you.invis && !player_see_invis())
```
[12.70122]
[12.70164]
```
    if (you.invis && !see_invis)
```

Replacement in crawl-ref/source/fight.cc at line 2132 [5.3140790]

B:BD[12.73234] → [12.73234:73295]

B:BD[12.73295] → [9.30115:30157]

    if (defender
        && defender->atype() == ACT_MONSTER
        && def->has_ench(ENCH_BACKLIGHT))

[12.73234]

[12.73363]

    if (defender && defender->atype() == ACT_MONSTER)

Replacement in crawl-ref/source/fight.cc at line 2134 [5.3140790]

B:BD[12.73369] → [12.73369:73408]

        your_to_hit += 2 + random2(8);

[12.73369]

[12.73408]

        if (def->has_ench(ENCH_BACKLIGHT))
            your_to_hit += 2 + random2(8);
        // Invisible monsters are hard to hit.
        else if (def->invisible() && !see_invis)
            your_to_hit -= 6;

Insertion in crawl-ref/source/fight.cc at line 3073 [5.3140790]

[2.3868]


    // Invisible defender is hard to hit if you can't see invis. Note
    // that this applies only to monsters vs monster and monster vs
    // player. Does not apply to a player fighting an invisible
    // monster.
    if (defender->invisible() && !attacker->can_see_invisible())
        mhit = mhit * 65 / 100;

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

[4.11306]

[12.82288]

    virtual bool can_see_invisible() const = 0;
    virtual bool invisible() const = 0;

Insertion in crawl-ref/source/externs.h at line 719 [5.3270163]
[14.823]
[9.30270]
```
    bool invisible() const;
    bool can_see_invisible() const;
```
Replacement in crawl-ref/source/externs.h at line 997 [5.3270163]
B:BD[11.88963] → [11.88963:88964]
[11.88963]
[11.88964]
```
    bool invisible() const;
    bool can_see_invisible() const;
```

Replacement in crawl-ref/source/enum.h at line 1797 [5.3287960]

B:BD[7.919251] → [7.919251:920062]

    M_SPEAKS            = (1<< 8),        // uses talking code
    M_CONFUSED          = (1<< 9),        // monster is perma-confused,
    M_BATTY             = (1<<10),        // monster is batty
    M_SPLITS            = (1<<11),        // monster can split
    M_AMPHIBIOUS        = (1<<12),        // monster can swim in water,
    M_THICK_SKIN        = (1<<13),        // monster has more effective AC,
    M_HUMANOID          = (1<<14),        // for Glamour 
    M_COLD_BLOOD        = (1<<15),        // susceptible to cold
    M_WARM_BLOOD        = (1<<16),        // no effect currently
    M_REGEN             = (1<<17),        // regenerates quickly
    M_BURROWS           = (1<<18),        // monster digs through rock
    M_EVIL              = (1<<19),        // monster vulnerable to holy spells

[7.919251]

[7.920062]

    M_SENSE_INVIS       = (1<< 8),        // can sense invisible things
    M_SPEAKS            = (1<< 9),        // uses talking code
    M_CONFUSED          = (1<<10),        // monster is perma-confused,
    M_BATTY             = (1<<11),        // monster is batty
    M_SPLITS            = (1<<12),        // monster can split
    M_AMPHIBIOUS        = (1<<13),        // monster can swim in water,
    M_THICK_SKIN        = (1<<14),        // monster has more effective AC,
    M_HUMANOID          = (1<<15),        // for Glamour 
    M_COLD_BLOOD        = (1<<16),        // susceptible to cold
    M_WARM_BLOOD        = (1<<17),        // no effect currently
    M_REGEN             = (1<<18),        // regenerates quickly
    M_BURROWS           = (1<<19),        // monster digs through rock
    M_EVIL              = (1<<20),        // monster vulnerable to holy spells

Replacement in crawl-ref/source/enum.h at line 1811 [5.3287960]

B:BD[7.920063] → [7.920063:920128]

    M_UNIQUE            = (1<<20),        // monster is a unique

[7.920063]

[15.9938]

    M_UNIQUE            = (1<<21),        // monster is a unique

Insertion in crawl-ref/source/beam.cc at line 2888 [5.4128068]

[7.1241900]


    const int beam_src = beam_source(beem);
    if (beam_src != MHITNOT && beam_src != MHITYOU)
    {
        // Monsters that can sense invisible 
        const monsters *mon = &menv[beam_src];
        if (mons_sense_invis(mon))
            return (!dist);
    }

Insertion in crawl-ref/source/beam.cc at line 2972 [5.4128068]

[5.4223744]

[7.1242590]

    // Monsters shooting at an invisible player are very inaccurate.
    if (you.invis && !beam.can_see_invis)
        beamHit /= 2;

Insertion in crawl-ref/source/beam.cc at line 3539 [5.4128068]

[7.1249828]

[16.564]

    int beam_hit = beam.hit;
    if (menv[tid].invisible() && !beam.can_see_invis)
        beam_hit /= 2;

Replacement in crawl-ref/source/beam.cc at line 3546 [5.4128068]

B:BD[16.761] → [10.14285:14349]

    if (!engulfs && !test_beam_hit(beam.hit, random2(mon->ev)))

[16.761]

[5.4239486]

    if (!engulfs && !test_beam_hit(beam_hit, random2(mon->ev)))

Implemented Erik's invisibility proposal:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 724 [5.16817]

Replacement in crawl-ref/source/view.cc at line 726 [5.16817]

Insertion in crawl-ref/source/player.cc at line 5252 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5258 [5.962854]

Replacement in crawl-ref/source/monstuff.cc at line 1530 [5.1396662]

Replacement in crawl-ref/source/mon-util.h at line 159 [5.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 522 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 532 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 534 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 536 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 562 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 575 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3866 [5.1699344]

Replacement in crawl-ref/source/mon-data.h at line 138 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 210 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 912 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1020 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1177 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1632 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1802 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1814 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1868 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2014 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2026 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2085 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2384 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2469 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2505 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2529 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2878 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2890 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2903 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2915 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2927 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3396 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3408 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3519 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3543 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4003 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4027 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4039 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4214 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4226 [5.1826214]

Insertion in crawl-ref/source/fight.cc at line 2017 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 2019 [5.3140790]