fiddlerwoaroof/crawl - Change USSKCWQTF6BTE3SFLQVCT6RZHU2R7URWFC7EPO2EN3Z6U4IEQ7GQC

Remove duplicate code from the priest promotion function, consolidate

the code to change one monster type into another into its own function, and use it. The code handling net trapping should probably be somewhere else, though.

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

Created by dolorous on March 20, 2008

USSKCWQTF6BTE3SFLQVCT6RZHU2R7URWFC7EPO2EN3Z6U4IEQ7GQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 768 [6.804403]

B:BD[5.2825] → [5.2825:2944]

        // important characteristics.  Keep this as generic as possible,
        // in case more promotions are added.

[5.2825]

[5.2944]

        // the flags.

Deletion in crawl-ref/source/religion.cc at line 770 [6.804403]

B:BD[5.2996] → [5.2996:3396]

        const int old_hp = mon->hit_points;
        const int old_hp_max = mon->max_hit_points;
        const char old_ench_countdown = mon->ench_countdown;
        mon_enchant abj = mon->get_ench(ENCH_ABJ);
        mon_enchant shifter = mon->get_ench(ENCH_GLOWING_SHAPESHIFTER,
                                            ENCH_SHAPESHIFTER);
        const bool old_mon_caught = mons_is_caught(mon);

Replacement in crawl-ref/source/religion.cc at line 771 [6.804403]

B:BD[5.3397] → [5.3397:3474]

        mon->type = priest_type;
        define_monster(monster_index(mon));

[5.3397]

[5.3474]

        monster_change_type(mon, priest_type);

Deletion in crawl-ref/source/religion.cc at line 774 [6.804403]

B:BD[5.3507] → [5.3507:3894]

        mon->hit_points = mon->max_hit_points *
            ((old_hp * 100) / old_hp_max) / 100;
        mon->ench_countdown = old_ench_countdown;
        mon->add_ench(abj);
        mon->add_ench(shifter);
        if (old_mon_caught)
            mon->add_ench(ENCH_HELD);
        if (mons_class_flag(mon->type, M_INVIS))
            mon->add_ench(ENCH_INVIS);
        mon->fix_speed();

Insertion in crawl-ref/source/monstuff.h at line 65 [6.1390580]
[7.40165]
[7.40165]
```
void monster_change_type(monsters *monster, monster_type targetc);
```

Insertion in crawl-ref/source/monstuff.cc at line 1307 [6.1396662]

[7.40935]


/* Change one monster type into another. */
void monster_change_type(monsters *monster, monster_type targetc)
{
    const int old_hp = monster->hit_points;
    const int old_hp_max = monster->max_hit_points;
    const bool old_mon_caught = mons_is_caught(monster);
    const char old_ench_countdown = monster->ench_countdown;
    /* deal with mons_sec */
    monster->type = targetc;
    monster->number = MONS_PROGRAM_BUG;
    mon_enchant abj = monster->get_ench(ENCH_ABJ);
    mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
                                            ENCH_SHAPESHIFTER);
    // Note: define_monster() will clear out all enchantments! -- bwr
    define_monster( monster_index(monster) );
    monster->add_ench(abj);
    monster->add_ench(shifter);
    monster->ench_countdown = old_ench_countdown;
    if (mons_class_flag( monster->type, M_INVIS ))
        monster->add_ench(ENCH_INVIS);
    monster->hit_points = monster->max_hit_points
                                * ((old_hp * 100) / old_hp_max) / 100;
    monster->fix_speed();
    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);

Insertion in crawl-ref/source/monstuff.cc at line 1348 [6.1396662]

[7.40936]

            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);
    }
}

Replacement in crawl-ref/source/monstuff.cc at line 1398 [6.1396662]

B:BD[6.1425671] → [6.1425671:1425856]

    // Used to be mons_power, but that just returns hit_dice 
    // for the monster class.  By using the current hit dice 
    // the player gets the opportunity to use draining more

[6.1425649]

[6.1425856]

    // Used to be mons_power, but that just returns hit_dice
    // for the monster class.  By using the current hit dice
    // the player gets the opportunity to use draining more

Replacement in crawl-ref/source/monstuff.cc at line 1442 [6.1396662]
B:BD[6.1426598] → [8.419671:419726]
```
    bool invis = (mons_class_flag( targetc, M_INVIS ) 
```
[6.1426598]
[9.1236]
```
    bool invis = (mons_class_flag( targetc, M_INVIS )
```

Replacement in crawl-ref/source/monstuff.cc at line 1474 [6.1396662]

B:BD[6.1427436] → [10.1185:1281]

B:BD[10.1281] → [11.2329:2386]

B:BD[11.2386] → [12.1296:1357]

    const int old_hp = monster->hit_points;
    const int old_hp_max = monster->max_hit_points;
    const bool old_mon_caught = mons_is_caught(monster);
    const char old_ench_countdown = monster->ench_countdown;

[6.1427436]

[6.1427520]

    monster_change_type(monster, targetc);

Replacement in crawl-ref/source/monstuff.cc at line 1476 [6.1396662]

B:BD[6.1427521] → [6.1427521:1427579]

B:BD[6.1427579] → [3.9966:10006]

∅:D[3.10006] → [6.1427606:1427607]

B:BD[6.1427606] → [6.1427606:1427607]

B:BD[6.1427607] → [13.8126:8312]

    /* deal with mons_sec */
    monster->type = targetc;
    monster->number = MONS_PROGRAM_BUG;
    mon_enchant abj = monster->get_ench(ENCH_ABJ);
    mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
                                            ENCH_SHAPESHIFTER);

[6.1427521]

[6.1427805]

    monster->hit_points += random2(monster->max_hit_points);

Replacement in crawl-ref/source/monstuff.cc at line 1478 [6.1396662]

B:BD[6.1427806] → [6.1427806:1427922]

    // Note: define_monster() will clear out all enchantments! -- bwr
    define_monster( monster_index(monster) );

[6.1427806]

[6.1427922]

    if (monster->hit_points > monster->max_hit_points)
        monster->hit_points = monster->max_hit_points;

Replacement in crawl-ref/source/monstuff.cc at line 1481 [6.1396662]
B:BD[6.1427923] → [13.8313:8373]
```
    monster->add_ench(abj);
    monster->add_ench(shifter);
```
[6.1427923]
[6.1428102]
```
    monster->speed_increment = 67 + random2(6);
```
Replacement in crawl-ref/source/monstuff.cc at line 1483 [6.1396662]
B:BD[6.1428103] → [14.204:254]
```
    monster->ench_countdown = old_ench_countdown;
```
[6.1428103]
[12.1488]
```
    monster_drop_ething(monster);
```

Replacement in crawl-ref/source/monstuff.cc at line 1485 [6.1396662]

∅:D[12.1489] → [8.419890:419941]

B:BD[6.1428103] → [8.419890:419941]

B:BD[8.419941] → [13.8374:8413]

∅:D[13.8413] → [6.1428194:1428195]

B:BD[6.1428194] → [6.1428194:1428195]

B:BD[6.1428195] → [15.283:374]

    if (mons_class_flag( monster->type, M_INVIS ))
        monster->add_ench(ENCH_INVIS);
    if (!player_messaged && mons_near(monster)
        && player_monster_visible(monster))

[12.1489]

[15.374]

    if (!player_messaged && player_monster_visible(monster)
        && mons_near(monster))

Insertion in crawl-ref/source/monstuff.cc at line 1488 [6.1396662]
[15.380]
[15.380]
```
        player_messaged = true;
```
Deletion in crawl-ref/source/monstuff.cc at line 1490 [6.1396662]
B:BD[15.460] → [15.460:492]
```
        player_messaged = true;
```

Deletion in crawl-ref/source/monstuff.cc at line 1492 [6.1396662]

∅:D[15.499] → [6.1428195:1428578]

B:BD[6.1428195] → [6.1428195:1428578]

B:BD[6.1428578] → [8.419942:419943]

    monster->hit_points = monster->max_hit_points
                                * ((old_hp * 100) / old_hp_max) / 100
                                + random2(monster->max_hit_points);
    if (monster->hit_points > monster->max_hit_points)
        monster->hit_points = monster->max_hit_points;
    monster->speed_increment = 67 + random2(6);
    monster_drop_ething(monster);

Deletion in crawl-ref/source/monstuff.cc at line 1498 [6.1396662]

B:BD[16.315] → [11.2387:2486]

B:BD[11.2486] → [17.1185:1317]


    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);

Deletion in crawl-ref/source/monstuff.cc at line 1499 [6.1396662]

B:BD[11.2897] → [11.2897:3327]

B:BD[11.3327] → [18.1609:1663]

B:BD[18.1663] → [2.450:555]

∅:D[2.555] → [18.1751:1761]

B:BD[18.1751] → [18.1751:1761]

B:BD[18.1761] → [2.556:626]

∅:D[2.626] → [18.1825:1980]

B:BD[18.1825] → [18.1825:1980]

B:BD[18.1980] → [2.627:777]

∅:D[2.777] → [18.2063:2080]

B:BD[18.2063] → [18.2063:2080]

B:BD[18.2080] → [2.778:927]

∅:D[2.927] → [18.2162:2172]

B:BD[18.2162] → [18.2162:2172]

∅:D[18.2172] → [11.3327:3340]

B:BD[11.3327] → [11.3327:3340]

B:BD[11.3340] → [19.804:846]

∅:D[19.846] → [11.3384:3395]

B:BD[11.3384] → [11.3384:3395]

            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);
    }

Replacement in crawl-ref/source/monstuff.cc at line 1509 [6.1396662]
B:BD[4.2675] → [4.2675:2680]
```
    
```
[4.2675]
[4.2680]