fiddlerwoaroof/crawl - Change 3HGELZU7NELOQ635HZO6IJIYLBSNCJ5VPH46IE22KA3OSLEFK7AQC

Added trapdoor spider (not yet randomly generated). If a trapdoor

spider can't see any enemies and is on a floor square it will "submurge" into the floor and only come out if an enemy moves right next to it or if something attacks it from a distance. Most of this is done with the new monster behavour BEH_LURK.

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

Created by zelgadis on June 4, 2008

3HGELZU7NELOQ635HZO6IJIYLBSNCJ5VPH46IE22KA3OSLEFK7AQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 1467 [3.1396662]

[3.1424294]

[4.192]


        // Monsters still under development
        || new_mclass == MONS_ROCK_WORM
        || new_mclass == MONS_TRAPDOOR_SPIDER

Insertion in crawl-ref/source/monstuff.cc at line 2023 [3.1396662]
[3.1436487]
[5.2564]
```
    beh_type old_behaviour = mon->behaviour;
```

Insertion in crawl-ref/source/monstuff.cc at line 2169 [3.1396662]

[6.5031]

[7.4102]


    if (old_behaviour == BEH_LURK && mon->behaviour != BEH_LURK)
    {
        switch(event)
        {
        case ME_EVAL:
        case ME_DISTURB:
        case ME_ALERT:
            // Lurking monsters won't stop lurking just because they
            // noticed something.
            mon->behaviour = BEH_LURK;
            break;
            
        default:
            if (mon->has_ench(ENCH_SUBMERGED))
                mon->del_ench(ENCH_SUBMERGED);
            break;
        }
    }

Insertion in crawl-ref/source/monstuff.cc at line 2504 [3.1396662]
[3.1443856]
[3.1443856]
```
        case BEH_LURK:
```
Insertion in crawl-ref/source/monstuff.cc at line 3150 [3.1396662]
[8.5274]
[9.2652]
```
        && monster->behaviour != BEH_LURK // Handled elsewhere
```

Insertion in crawl-ref/source/monstuff.cc at line 5202 [3.1396662]

[10.1542]

[11.4924]

                }
            }
        }
        if (monster->behaviour == BEH_LURK)
        {
            // Lurking monsters only stop lurking if their target is right
            // next tp them, otherwise they just sit there.
            if (monster->foe != MHITNOT
                && abs(monster->target_x - monster->x) <= 1
                && abs(monster->target_y - monster->y) <= 1)
            {
                if (monster->has_ench(ENCH_SUBMERGED))
                {
                    // Don't unsubmerge if the player is right on top,
                    // if the monster is too damaged or if the monster
                    // is afraid.
                    if (monster->pos() == you.pos()
                        || monster->hit_points <= monster->max_hit_points / 2
                        || monster->has_ench(ENCH_FEAR))
                    {
                        monster->speed_increment -= non_move_energy;
                        continue;
                    }
                    monster->del_ench(ENCH_SUBMERGED);

Insertion in crawl-ref/source/monstuff.cc at line 5229 [3.1396662]

[11.4942]

[12.9498]

                monster->behaviour = BEH_SEEK;
            }
            else
            {
                monster->speed_increment -= non_move_energy;
                continue;

Insertion in crawl-ref/source/monstuff.cc at line 6373 [3.1396662]

[3.1529902]

[13.444]


    if (monster->type == MONS_TRAPDOOR_SPIDER)
    {
        if(monster->has_ench(ENCH_SUBMERGED))
           return false;

Insertion in crawl-ref/source/monstuff.cc at line 6379 [3.1396662]

[13.445]

[14.6735]

        // Trapdoor spiders hide if they can't see their target.
        bool can_see;
        
        if (monster->foe == MHITNOT)
            can_see = false;
        else if (monster->foe == MHITYOU)
            can_see = monster->can_see(&you);
        else
            can_see = monster->can_see(&menv[monster->foe]);
        if (monster_can_submerge(monster, grd[monster->x][monster->y])
            && !can_see && !mons_is_confused(monster)
            && !monster->has_ench(ENCH_BERSERK))
        {
            monster->add_ench(ENCH_SUBMERGED);
            monster->behaviour = BEH_LURK;
            return false;
        }
    }

Insertion in crawl-ref/source/monplace.cc at line 161 [3.1641732]

[15.454007]

[2.5664]

    if (mons->type == MONS_TRAPDOOR_SPIDER && grid == DNGN_FLOOR)
        return true;

Insertion in crawl-ref/source/mon-util.cc at line 4765 [3.1699344]

[16.7084]


        if (has_ench(ENCH_SUBMERGED))
            del_ench(ENCH_SUBMERGED);
        if (behaviour == BEH_LURK)
        {
            behaviour = BEH_WANDER;
            behaviour_event(this, ME_EVAL);
        }

Replacement in crawl-ref/source/mon-util.cc at line 4793 [3.1699344]

B:BD[17.327] → [17.327:396]

        if (type == MONS_AIR_ELEMENTAL && mons_near(this) && !quiet)

[17.327]

[18.6476]

        // XXX: What if the monster was invisible before submerging?
        if (mons_near(this) && !quiet)
        {
            if (type == MONS_AIR_ELEMENTAL)
            {
                mprf("%s merges itself into the air.",
                     name(DESC_CAP_A, true).c_str() );
            }
            else if (type == MONS_TRAPDOOR_SPIDER)
            {
                mprf("%s hides itself under the floor.",
                     name(DESC_CAP_A, true).c_str() );
            }
        }
        break;
    case ENCH_CONFUSION:
        if (type == MONS_TRAPDOOR_SPIDER && has_ench(ENCH_SUBMERGED))
            del_ench(ENCH_SUBMERGED);
        if (behaviour == BEH_LURK)

Replacement in crawl-ref/source/mon-util.cc at line 4815 [3.1699344]

∅:D[18.6486] → [17.396:498]

B:BD[17.396] → [17.396:498]

            mprf("%s merges itself into the air.",
                 name(DESC_CAP_A, true).c_str() );

[18.6486]

[18.6487]

            behaviour = BEH_WANDER;
            behaviour_event(this, ME_EVAL);

Insertion in crawl-ref/source/mon-util.cc at line 5005 [3.1699344]

[19.2223]

[20.643]

                else if (type == MONS_TRAPDOOR_SPIDER)
                    seen_context = "leaps out";

Insertion in crawl-ref/source/mon-util.cc at line 5019 [3.1699344]

[21.32732]

                else if (type == MONS_TRAPDOOR_SPIDER)
                {
                    mprf("%s leaps out from its hiding place under the floor!",
                         name(DESC_CAP_A, true).c_str() );
                }

Insertion in crawl-ref/source/mon-util.cc at line 5030 [3.1699344]

[20.1530]

[17.1186]

        }
        if (behaviour == BEH_WANDER)
        {
            behaviour = BEH_SEEK;
            behaviour_event(this, ME_EVAL);

Insertion in crawl-ref/source/mon-util.cc at line 5421 [3.1699344]

[22.21312]

        else if (type == MONS_TRAPDOOR_SPIDER)
        {
            // This should probably never happen.
            if (behaviour != BEH_LURK)
                del_ench(ENCH_SUBMERGED);
            break;
        }

Replacement in crawl-ref/source/mon-util.cc at line 5853 [3.1699344]

B:BD[20.1578] → [23.14861:14912]

        && !monster_can_submerge(this, grd[x][y]))

[20.1578]

[20.1629]

        && (!monster_can_submerge(this, grd[x][y])
            || type == MONS_TRAPDOOR_SPIDER))

Insertion in crawl-ref/source/mon-util.cc at line 5857 [3.1699344]

[20.1669]


        if (type == MONS_TRAPDOOR_SPIDER)
            behaviour_event(this, ME_EVAL);

Insertion in crawl-ref/source/mon-data.h at line 1256 [3.1826214]

[24.37884]

    MONS_TRAPDOOR_SPIDER, 's', BROWN, "trapdoor spider",
    M_NO_FLAGS,
    MR_VUL_POISON,
    800, 10, MONS_WOLF_SPIDER, MONS_WOLF_SPIDER, MH_NATURAL, -3,
    { {AT_BITE, AF_POISON_MEDIUM, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 8, 3, 5, 0 },
    3, 10, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_HISS, I_INSECT,
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
},
{

Replacement in crawl-ref/source/enum.h at line 1797 [3.3287960]
B:BD[3.3338857] → [25.4171:4182]
```
    // 383
```
[3.3338857]
[25.4182]
```
    MONS_TRAPDOOR_SPIDER,
```

Insertion in crawl-ref/source/enum.h at line 1870 [3.3287960]

[15.922519]

[3.3340484]

    BEH_LURK,                          //  stay still until discovered or
                                       //  enemy closeby