fiddlerwoaroof/crawl - Change V7IKAPO5OY7CJTT62GMHQOD3EQW42FTTY3KDBOTJUODPS5WMBCHAC

Revert the splitting out of monster_change_type() from

monster_polymorph(), as it still doesn't do everything needed. Replace it with monsters::change_type(), split out from monsters::level_up_change(), which does do everything needed, and in a cleaner way. Unfortunately, it's still a hack, but it should be easier to deal with for now. Sorry for the mess.

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

Created by dolorous on March 20, 2008

V7IKAPO5OY7CJTT62GMHQOD3EQW42FTTY3KDBOTJUODPS5WMBCHAC

Dependencies

In channels

main

Change contents

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

B:BD[4.2753] → [5.2509:2570]

∅:D[5.2570] → [7.2532:2579]

B:BD[4.3397] → [7.2532:2579]

        // Turn an ordinary monster into a priestly monster.
        monster_change_type(mon, priest_type);

[4.2753]

[4.3474]

        // Turn an ordinary monster into a priestly monster, using a
        // function normally used when going up an experience level.
        // This is a hack, but there seems to be no better way for now.
        mon->change_type(priest_type, true);

Deletion in crawl-ref/source/monstuff.h at line 65 [6.1390580]
B:BD[8.40165] → [7.2612:2680]
```
void monster_change_type(monsters *monster, monster_type targetc);
```

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

B:BD[8.40933] → [8.40933:40935]

B:BD[8.40935] → [7.2683:2684]

B:BD[7.2684] → [3.2542:2742]

∅:D[5.2645] → [7.2728:2796]

∅:D[3.2742] → [7.2728:2796]

B:BD[7.2728] → [7.2728:2796]

B:BD[7.2796] → [5.2646:2698]

B:BD[5.2698] → [9.2542:2597]

∅:D[9.2597] → [7.2796:2892]

∅:D[5.2698] → [7.2796:2892]

B:BD[7.2796] → [7.2796:2892]

B:BD[7.2892] → [3.2743:2804]

∅:D[3.2804] → [7.2892:2949]

B:BD[7.2892] → [7.2892:2949]

B:BD[7.3010] → [7.3010:3414]

B:BD[7.3414] → [5.2699:2731]

B:BD[5.2731] → [2.2542:2574]

∅:D[2.2574] → [5.2731:2732]

∅:D[9.2633] → [5.2731:2732]

B:BD[5.2731] → [5.2731:2732]

∅:D[5.2732] → [7.3414:3790]

B:BD[7.3414] → [7.3414:3790]

B:BD[7.3790] → [3.2805:2843]

}
// 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.
void monster_change_type(monsters *monster, monster_type targetc)
{
    const unsigned long old_flags = monster->flags;
    const unsigned long old_exp = monster->experience;
    const int old_hp = monster->hit_points;
    const int old_hp_max = monster->max_hit_points;
    const char old_ench_countdown = monster->ench_countdown;
    const bool old_mon_caught = mons_is_caught(monster);
    /* 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->flags = old_flags;
    monster->gain_exp(old_exp);
    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)
        monster->add_ench(ENCH_HELD);

Deletion in crawl-ref/source/monstuff.cc at line 1388 [6.1396662]
B:BD[10.339] → [3.2844:2901]
```
    const bool old_mon_caught = mons_is_caught(monster);
```

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

B:BD[6.1427436] → [7.5434:5477]

    monster_change_type(monster, targetc);

[6.1427436]

[6.1427520]

    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;

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

B:BD[6.1427521] → [5.2733:2783]

B:BD[5.2783] → [9.2634:2664]

    // randomize things:
    monster->flags = 0L;
    monster->experience = 0L;

[6.1427521]

[5.2783]

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

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

∅:D[5.2784] → [7.5478:5539]

B:BD[6.1427521] → [7.5478:5539]

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

[5.2784]

[6.1427805]

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

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

B:BD[6.1427806] → [7.5540:5650]

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

[6.1427806]

[6.1427922]

    monster->add_ench(abj);
    monster->add_ench(shifter);

Replacement in crawl-ref/source/monstuff.cc at line 1416 [6.1396662]
B:BD[6.1427923] → [7.5651:5699]
```
    monster->speed_increment = 67 + random2(6);
```
[6.1427923]
[6.1428102]
```
    monster->ench_countdown = old_ench_countdown;
```
Replacement in crawl-ref/source/monstuff.cc at line 1418 [6.1396662]
B:BD[6.1428103] → [5.2785:2815]
∅:D[5.2815] → [7.5700:5734]
B:BD[6.1428103] → [7.5700:5734]
```
    // drop entire inventory:
    monster_drop_ething(monster);
```
[6.1428103]
[11.1488]
```
    if (mons_class_flag( monster->type, M_INVIS ))
        monster->add_ench(ENCH_INVIS);
```

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

B:BD[11.1489] → [7.5735:5826]

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

[11.1489]

[12.374]

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

Deletion in crawl-ref/source/monstuff.cc at line 1424 [6.1396662]
B:BD[12.380] → [7.5827:5859]
```
        player_messaged = true;
```
Insertion in crawl-ref/source/monstuff.cc at line 1425 [6.1396662]
[12.460]
[12.492]
```
        player_messaged = true;
```

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

[12.499]

[13.75]

    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 1452 [6.1396662]
B:BD[3.3098] → [3.3098:3112]
```
            {
```

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

B:BD[3.3147] → [3.3147:3213]

                monster->del_ench(ENCH_HELD, true);
            }

Replacement in crawl-ref/source/monstuff.cc at line 1471 [6.1396662]
B:BD[3.3813] → [3.3813:3859]
∅:D[13.315] → [6.1428578:1428579]
∅:D[14.1317] → [6.1428578:1428579]
∅:D[15.2649] → [6.1428578:1428579]
∅:D[3.3859] → [6.1428578:1428579]
∅:D[16.11117] → [6.1428578:1428579]
∅:D[17.420165] → [6.1428578:1428579]
B:BD[6.1428578] → [6.1428578:1428579]
```
            mons_clear_trapping_net(monster);
```
[3.3813]
[3.3860]
```
            const int net = get_trapping_net(monster->x, monster->y);
            if (net != NON_ITEM)
                remove_item_stationary(mitm[net]);
                
```
Insertion in crawl-ref/source/monstuff.cc at line 1486 [6.1396662]
[3.4240]
[3.4240]
```
        else
            monster->add_ench(ENCH_HELD);
```
Replacement in crawl-ref/source/mgrow.cc at line 98 [18.2647]
B:BD[18.5773] → [18.5773:5806]
```
bool monsters::level_up_change()
```
[18.5773]
[18.5806]
```
void monsters::change_type(monster_type after, bool adjust_hp)
```

Replacement in crawl-ref/source/mgrow.cc at line 100 [18.2647]

B:BD[18.5808] → [18.5808:6034]

    if (const monster_level_up *lup =
        monster_level_up_target(static_cast<monster_type>(type), hit_dice))
    {
        const monsterentry *orig = get_monster_data(type);
        // Ta-da!
        type   = lup->after;

[18.5808]

[18.6034]

    const monsterentry *orig = get_monster_data(type);
    // Ta-da!
    type   = after;

Replacement in crawl-ref/source/mgrow.cc at line 104 [18.2647]

B:BD[18.6035] → [18.6035:6169]

        // Initialise a dummy monster to save work.
        monsters dummy;
        dummy.type = type;
        define_monster(dummy);

[18.6035]

[18.6169]

    // Initialise a dummy monster to save work.
    monsters dummy;
    dummy.type = after;
    define_monster(dummy);

Replacement in crawl-ref/source/mgrow.cc at line 109 [18.2647]

B:BD[18.6170] → [18.6170:6283]

        colour = dummy.colour;
        speed  = dummy.speed;
        spells = dummy.spells;
        fix_speed();

[18.6170]

[18.6283]

    colour = dummy.colour;
    speed  = dummy.speed;
    spells = dummy.spells;
    fix_speed();

Replacement in crawl-ref/source/mgrow.cc at line 114 [18.2647]

B:BD[18.6284] → [18.6284:6404]

        const monsterentry *m = get_monster_data(type);
        ac += m->AC - orig->AC;
        ev += m->ev - orig->ev;

[18.6284]

[18.6404]

    const monsterentry *m = get_monster_data(after);
    ac += m->AC - orig->AC;
    ev += m->ev - orig->ev;

Replacement in crawl-ref/source/mgrow.cc at line 118 [18.2647]

B:BD[18.6405] → [18.6405:6433]

        if (lup->adjust_hp)

[18.6405]

[18.6433]

    if (adjust_hp)
    {
        const int minhp = dummy.max_hit_points;
        if (max_hit_points < minhp)

Replacement in crawl-ref/source/mgrow.cc at line 123 [18.2647]

B:BD[18.6443] → [18.6443:6731]

            const int minhp = dummy.max_hit_points;
            if (max_hit_points < minhp)
            {
                hit_points    += minhp - max_hit_points;
                max_hit_points = minhp;
                hit_points     = std::min(hit_points, max_hit_points);
            }

[18.6443]

[18.6731]

            hit_points    += minhp - max_hit_points;
            max_hit_points = minhp;
            hit_points     = std::min(hit_points, max_hit_points);

Insertion in crawl-ref/source/mgrow.cc at line 127 [18.2647]

[18.6741]

    }
}
bool monsters::level_up_change()
{
    if (const monster_level_up *lup =
        monster_level_up_target(static_cast<monster_type>(type), hit_dice))
    {
        change_type(lup->after, lup->adjust_hp);

Replacement in crawl-ref/source/externs.h at line 1213 [6.3270163]
B:BD[19.2121] → [19.2121:2152]
```
    // Hack, with a capital H.
```
[19.2121]
[19.2152]
```
    // Hacks, with a capital H.
```
Insertion in crawl-ref/source/externs.h at line 1216 [6.3270163]
[19.2198]
[20.31991]
```
    void change_type(monster_type after, bool adjust_hp);
```
Replacement in crawl-ref/source/externs.h at line 1220 [6.3270163]
B:BD[21.10989] → [22.2939:2992]
```
    int action_energy(energy_use_type et) const;    
```
[21.10989]
[19.2199]
```
    int action_energy(energy_use_type et) const;
```

Revert the splitting out of monster_change_type() from

Dependencies

In channels

Change contents

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

Deletion in crawl-ref/source/monstuff.h at line 65 [6.1390580]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/mgrow.cc at line 98 [18.2647]