fiddlerwoaroof/crawl - Change Z75MWMOPGK3RC3ERIV5AW52CRJDTYWLXYGE6CHRF4MCB5EJ7WH6QC

Move net handling (mostly) back to monster_polymorph(), and add comments

to monster_change_type indicating that special handling may be needed if the types are different enough.

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

Created by dolorous on March 20, 2008

Z75MWMOPGK3RC3ERIV5AW52CRJDTYWLXYGE6CHRF4MCB5EJ7WH6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1308 [4.1396662]

B:BD[3.2684] → [2.2604:2645]

// Change one monster type into another.

[3.2684]

[3.2728]

// Change one monster type into another.  This preserves as much as
// possible between types, so, if the two types are radically different,
// some special handling may be needed after calling this.

Insertion in crawl-ref/source/monstuff.cc at line 1317 [4.1396662]
[3.2892]
[3.2892]
```
    const char old_ench_countdown = monster->ench_countdown;
```
Deletion in crawl-ref/source/monstuff.cc at line 1319 [4.1396662]
B:BD[3.2949] → [3.2949:3010]
```
    const char old_ench_countdown = monster->ench_countdown;
```

Replacement in crawl-ref/source/monstuff.cc at line 1348 [4.1396662]

B:BD[3.3790] → [3.3790:3996]

∅:D[3.3996] → [5.40935:40936]

B:BD[5.40935] → [5.40935:40936]

B:BD[5.40936] → [3.3997:5192]

    {
        if (monster->body_size(PSIZE_BODY) >= SIZE_GIANT)
        {
            int net = get_trapping_net(monster->x, monster->y);
            if (net != NON_ITEM)
                destroy_item(net);
            if (see_grid(monster->x, monster->y))
            {
                if (player_monster_visible(monster))
                {
                    mprf("The net rips apart, and %s comes free!",
                         monster->name(DESC_NOCAP_THE).c_str());
                }
                else
                {
                    mpr("All of a sudden the net rips apart!");
                }
            }
        }
        else if (mons_is_insubstantial(monster->type)
                 || monster->type == MONS_OOZE
                 || monster->type == MONS_PULSATING_LUMP)
        {
            const int net = get_trapping_net(monster->x, monster->y);
            if (net != NON_ITEM)
                remove_item_stationary(mitm[net]);
            if (mons_is_insubstantial(monster->type))
            {
                simple_monster_message(monster,
                                       " drifts right through the net!");
            }
            else
            {
                simple_monster_message(monster,
                                       " oozes right through the net!");
            }
        }
        else
            monster->add_ench(ENCH_HELD);
    }

[3.3790]

[3.5192]

        monster->add_ench(ENCH_HELD);

Insertion in crawl-ref/source/monstuff.cc at line 1431 [4.1396662]
[6.339]
[4.1427403]
```
    const bool old_mon_caught = mons_is_caught(monster);
```

Insertion in crawl-ref/source/monstuff.cc at line 1470 [4.1396662]

[7.315]

[4.1428578]


    if (old_mon_caught)
    {
        if (monster->body_size(PSIZE_BODY) >= SIZE_GIANT)
        {
            int net = get_trapping_net(monster->x, monster->y);
            if (net != NON_ITEM)
            {
                destroy_item(net);
                monster->del_ench(ENCH_HELD, true);
            }
            if (see_grid(monster->x, monster->y))
            {
                if (player_monster_visible(monster))
                {
                    mprf("The net rips apart, and %s comes free!",
                         monster->name(DESC_NOCAP_THE).c_str());
                }
                else
                {
                    mpr("All of a sudden the net rips apart!");
                }
            }
        }
        else if (mons_is_insubstantial(monster->type)
                 || monster->type == MONS_OOZE
                 || monster->type == MONS_PULSATING_LUMP)
        {
            mons_clear_trapping_net(monster);

Insertion in crawl-ref/source/monstuff.cc at line 1501 [4.1396662]

[4.1428579]

            if (mons_is_insubstantial(monster->type))
            {
                simple_monster_message(monster,
                                       " drifts right through the net!");
            }
            else
            {
                simple_monster_message(monster,
                                       " oozes right through the net!");
            }
        }
    }