fiddlerwoaroof/crawl - Change BLN5LDH5NRRJPBY77A36Q4THEY75N42MVCJMZRUZ2D5YSXTDL4HQC

Expand handling of monster intelligence and zombifiability to work on

the level of individual monsters.

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

Created by dolorous on October 5, 2008

BLN5LDH5NRRJPBY77A36Q4THEY75N42MVCJMZRUZ2D5YSXTDL4HQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1310 [5.16817]
∅:D[4.80] → [5.47722:47795]
∅:D[6.141] → [5.47722:47795]
B:BD[5.47722] → [5.47722:47795]
```
    mons_perc = 10 + (mons_intel(monster->type) * 4) + monster->hit_dice
```
[6.141]
[4.81]
```
    mons_perc = 10 + (mons_intel(monster) * 4) + monster->hit_dice
```

Replacement in crawl-ref/source/traps.cc at line 153 [7.5308]

B:BD[2.3074] → [2.3074:3127]

        const int intel = mons_intel(monster->type);

[2.3074]

[7.6142]

        const int intel = mons_intel(monster);

Replacement in crawl-ref/source/spells4.cc at line 1172 [5.436250]
B:BD[8.5913] → [8.5913:5962]
```
        || mons_intel(menv[mon].type) < I_NORMAL
```
[8.5913]
[8.5962]
```
        || mons_intel(&menv[mon]) < I_NORMAL
```

Replacement in crawl-ref/source/spells3.cc at line 636 [5.531613]

B:BD[9.1552] → [9.1552:1607]

        && mons_zombie_size(item.plus) != Z_NOZOMBIE);

[9.1552]

[10.1482]

        && mons_class_can_be_zombified(item.plus));

Replacement in crawl-ref/source/spells2.cc at line 214 [5.569242]

B:BD[11.32249] → [11.32249:32363]

            if (mons_intel( mon->type ) == I_HIGH
                && mons_class_flag( mon->type, M_SPELLCASTER ))

[11.32249]

[5.572695]

            if (mons_intel(mon) == I_HIGH
                && mons_class_flag(mon->type, M_SPELLCASTER))

Replacement in crawl-ref/source/spells2.cc at line 217 [5.569242]

B:BD[5.572709] → [11.32364:32436]

                behaviour_event( mon, ME_DISTURB, MHITYOU, you.pos() );

[5.572709]

[5.573223]

                behaviour_event(mon, ME_DISTURB, MHITYOU, you.pos());

Replacement in crawl-ref/source/spells1.cc at line 655 [5.616635]
∅:D[12.10828] → [13.787:850]
B:BD[13.787] → [13.787:850]
```
    if (mons_intel(mon->type) <= I_PLANT) // no self-awareness
```
[12.10828]
[12.10829]
```
    if (mons_intel(mon) <= I_PLANT) // no self-awareness
```

Replacement in crawl-ref/source/spells1.cc at line 674 [5.616635]

∅:D[14.227] → [13.961:1037]

B:BD[13.961] → [13.961:1037]

    const int factor = (mons_intel(mon->type) <= I_ANIMAL) ? 3 : // animals

[13.961]

[14.228]

    const int factor = (mons_intel(mon) <= I_ANIMAL)       ? 3 : // animals

Replacement in crawl-ref/source/mstuff2.cc at line 1065 [5.1340842]
B:BD[5.1372527] → [5.1372527:1372572]
```
    if (mons_intel(monster->type) == I_HIGH)
```
[5.1372527]
[5.1372572]
```
    if (mons_intel(monster) == I_HIGH)
```
Replacement in crawl-ref/source/monstuff.cc at line 2013 [5.1396662]
∅:D[15.2746] → [16.2564:2628]
B:BD[5.1436487] → [16.2564:2628]
```
    bool isSmart          = (mons_intel(mon->type) > I_ANIMAL);
```
[15.2746]
[16.2676]
```
    bool isSmart          = (mons_intel(mon) > I_ANIMAL);
```
Replacement in crawl-ref/source/monstuff.cc at line 2192 [5.1396662]
B:BD[17.4168] → [18.4280:4325]
```
    const int intel = mons_intel(mon->type);
```
[17.4168]
[18.4325]
```
    const int intel = mons_intel(mon);
```
Replacement in crawl-ref/source/monstuff.cc at line 2348 [5.1396662]
B:BD[19.3300] → [20.6231:6287]
```
    const mon_intel_type intel = mons_intel(mon->type);
```
[19.3300]
[19.3345]
```
    const mon_intel_type intel = mons_intel(mon);
```
Replacement in crawl-ref/source/monstuff.cc at line 2373 [5.1396662]
B:BD[20.6944] → [20.6944:6985]
```
        if (mons_intel(m->type) > intel)
```
[20.6944]
[20.6985]
```
        if (mons_intel(m) > intel)
```
Replacement in crawl-ref/source/monstuff.cc at line 2520 [5.1396662]
B:BD[17.5023] → [17.5023:5081]
```
    bool isSmart    = (mons_intel(mon->type) > I_ANIMAL);
```
[17.5023]
[17.5081]
```
    bool isSmart    = (mons_intel(mon) > I_ANIMAL);
```
Replacement in crawl-ref/source/monstuff.cc at line 2554 [5.1396662]
B:BD[5.1441259] → [21.420814:420863]
```
        const int intel = mons_intel(mon->type);
```
[5.1441259]
[17.5262]
```
        const int intel = mons_intel(mon);
```

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

∅:D[22.7042] → [23.969:1045]

B:BD[23.969] → [23.969:1045]

        if (!isFriendly && proxPlayer && mons_intel(mon->type) >= I_NORMAL)

[22.7042]

[23.1055]

        if (!isFriendly && proxPlayer && mons_intel(mon) >= I_NORMAL)

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

B:BD[24.222] → [24.222:278]

                switch (mons_intel(monster_index(mon)))

[24.222]

[5.1446495]

                switch (mons_intel(mon))

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

∅:D[25.5652] → [19.4511:4589]

B:BD[19.4511] → [19.4511:4589]

                if (potentially_blocking && mons_intel(mon->type) >= I_NORMAL

[25.5652]

[25.5653]

                if (potentially_blocking && mons_intel(mon) >= I_NORMAL

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

B:BD[19.5096] → [19.5096:5157]

                        && (mons_intel(mon->type) < I_NORMAL

[19.5096]

[19.5157]

                        && (mons_intel(mon) < I_NORMAL

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

B:BD[26.7430] → [26.7430:7481]

                    switch (mons_intel(mon->type))

[26.7430]

[26.7481]

                    switch (mons_intel(mon))

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

B:BD[18.7142] → [18.7142:7204]

                        if (mons_intel(mon->type) == I_PLANT)

[18.7142]

[18.7204]

                        if (mons_intel(mon) == I_PLANT)

Replacement in crawl-ref/source/monstuff.cc at line 6470 [5.1396662]
B:BD[27.1878] → [28.2434:2483]
```
    const int intel = mons_intel(monster->type);
```
[27.1878]
[29.2723]
```
    const int intel = mons_intel(monster);
```

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

∅:D[30.6557] → [31.1319:1387]

B:BD[31.1319] → [31.1319:1387]

            if (mons_intel(monster->type) > I_ANIMAL || coinflip())

[30.6557]

[19.7057]

            if (mons_intel(monster) > I_ANIMAL || coinflip())

Replacement in crawl-ref/source/monstuff.cc at line 6836 [5.1396662]
∅:D[30.6679] → [32.9010:9060]
B:BD[32.9010] → [32.9010:9060]
```
        if (mons_intel(monster->type) != I_PLANT)
```
[30.6679]
[19.7202]
```
        if (mons_intel(monster) != I_PLANT)
```

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

B:BD[25.6389] → [25.6389:6451]

           && mons_intel(monster_index(monster)) >= I_NORMAL)

[25.6389]

[5.1537737]

           && mons_intel(monster) >= I_NORMAL)

Replacement in crawl-ref/source/monspeak.cc at line 270 [5.1558496]

B:BD[33.3177] → [33.3177:3248]

                               mons_intel(monster->type) <= I_ANIMAL))

[33.3177]

[33.3248]

                               mons_intel(monster) <= I_ANIMAL))

Replacement in crawl-ref/source/monspeak.cc at line 376 [5.1558496]
B:BD[34.12581] → [34.12581:12635]
```
    mon_intel_type intel = mons_intel(monster->type);
```
[34.12581]
[34.12635]
```
    mon_intel_type intel = mons_intel(monster);
```
Replacement in crawl-ref/source/monplace.cc at line 2668 [5.1641732]
B:BD[35.3450] → [35.3450:3496]
```
        && (mons_intel(mons->type) < I_NORMAL
```
[35.3450]
[36.5121]
```
        && (mons_intel(mons) < I_NORMAL
```

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

B:BD[5.1692638] → [37.1011:1046]

mon_intel_type mons_intel(int mc);

[5.1692638]

[37.1046]

mon_intel_type mons_class_intel(int mc);
mon_intel_type mons_intel(const monsters *mon);

Insertion in crawl-ref/source/mon-util.h at line 604 [5.1682293]

[38.11571]

[5.1694947]

bool mons_class_can_be_zombified(int mc);
bool mons_can_be_zombified(const monsters *mon);

Insertion in crawl-ref/source/mon-util.h at line 607 [5.1682293]
[5.1694948]
[5.1694948]

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

[39.3819]

[40.8478]

}
bool mons_is_zombified(const monsters *mon)
{
    return mons_class_is_zombified(mon->type);

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

B:BD[40.8481] → [40.8481:8529]

bool mons_is_zombified(const monsters *monster)

[40.8481]

[5.1707702]

bool mons_class_can_be_zombified(int mc)
{
    return (mons_zombie_size(mc) == Z_NOZOMBIE);
}
bool mons_can_be_zombified(const monsters *mon)

Replacement in crawl-ref/source/mon-util.cc at line 804 [5.1699344]
B:BD[5.1707704] → [39.3820:3871]
```
    return mons_class_is_zombified(monster->type);
```
[5.1707704]
[40.8827]
```
    return (mons_class_can_be_zombified(mon->type));
```
Replacement in crawl-ref/source/mon-util.cc at line 1256 [5.1699344]
B:BD[5.1715961] → [37.1192:1235]
```
    if (mons_zombie_size(mc) == Z_NOZOMBIE
```
[5.1715961]
[37.1235]
```
    if (!mons_class_can_be_zombified(mc)
```
Deletion in crawl-ref/source/mon-util.cc at line 2014 [5.1699344]
∅:D[41.3838] → [5.1732249:1732250]
B:BD[5.1732249] → [5.1732249:1732250]
Deletion in crawl-ref/source/mon-util.cc at line 2020 [5.1699344]
∅:D[41.3841] → [5.1732826:1732827]
B:BD[5.1732826] → [5.1732826:1732827]
Replacement in crawl-ref/source/mon-util.cc at line 2021 [5.1699344]
B:BD[5.1732828] → [42.11276:11310]
```
mon_intel_type mons_intel(int mc)
```
[5.1732828]
[5.1732890]
```
mon_intel_type mons_class_intel(int mc)
```

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

[5.1732917]

[43.3352]

}
mon_intel_type mons_intel(const monsters *mon)
{
    return (mons_class_intel(mon->type));

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

B:BD[3.6903] → [3.6903:6984]

    return (mon->attitude == ATT_FRIENDLY && mons_intel(mon->type) >= I_NORMAL);

[3.6903]

[42.11311]

    return (mon->attitude == ATT_FRIENDLY && mons_intel(mon) >= I_NORMAL);

Replacement in crawl-ref/source/mon-util.cc at line 2627 [5.1699344]
B:BD[5.1746162] → [5.1746162:1746203]
```
        intel = mons_intel( mon->type );
```
[5.1746162]
[5.1746203]
```
        intel = mons_intel(mon);
```
Replacement in crawl-ref/source/mgrow.cc at line 221 [44.2647]
B:BD[44.8166] → [44.8166:8208]
```
        if (mons_intel(type) >= I_NORMAL)
```
[44.8166]
[44.8208]
```
        if (mons_intel(this) >= I_NORMAL)
```

Replacement in crawl-ref/source/itemname.cc at line 2597 [5.2667494]

B:BD[45.3216] → [45.3216:3274]

                   && mons_intel(item.plus) >= I_NORMAL))

[45.3216]

[45.3274]

                   && mons_class_intel(item.plus) >= I_NORMAL))

Replacement in crawl-ref/source/food.cc at line 56 [5.3043806]

B:BD[46.3150] → [46.3150:3227]

static void _eat_chunk( int chunk_effect, bool cannibal, int mon_intel = 0);

[46.3150]

[46.3227]

static void _eat_chunk(int chunk_effect, bool cannibal, int mon_intel = 0);

Replacement in crawl-ref/source/food.cc at line 1103 [5.3043806]

B:BD[47.8340] → [47.8340:8405]

∅:D[48.5662] → [21.853913:853977]

∅:D[47.8405] → [21.853913:853977]

∅:D[49.15778] → [21.853913:853977]

B:BD[5.3062215] → [21.853913:853977]

        const int intel      = mons_intel(mons_type) - I_ANIMAL;
        const int chunk_type = mons_corpse_effect( mons_type );

[47.8340]

[47.8406]

        const int intel      = mons_class_intel(mons_type) - I_ANIMAL;
        const int chunk_type = mons_corpse_effect(mons_type);

Replacement in crawl-ref/source/food.cc at line 1134 [5.3043806]

B:BD[50.430560] → [51.7037:7101]

B:BD[51.7101] → [47.8688:8823]

        const int chunk_type = mons_corpse_effect( food.plus );
        const int intel      = mons_intel( food.plus ) - I_ANIMAL;
        const bool cannibal  = is_player_same_species( food.plus );

[50.430560]

[47.8823]

        const int chunk_type = mons_corpse_effect(food.plus);
        const int intel      = mons_class_intel(food.plus) - I_ANIMAL;
        const bool cannibal  = is_player_same_species(food.plus);

Replacement in crawl-ref/source/food.cc at line 1143 [5.3043806]
B:BD[52.6148] → [52.6148:6164]
```
        intel);
```
[52.6148]
[50.430764]
```
                   intel);
```
Replacement in crawl-ref/source/food.cc at line 1355 [5.3043806]
∅:D[53.5414] → [52.6743:6816]
B:BD[52.6743] → [52.6743:6816]
```
static void _eat_chunk( int chunk_effect, bool cannibal, int mon_intel )
```
[53.5414]
[5.3064241]
```
static void _eat_chunk(int chunk_effect, bool cannibal, int mon_intel)
```

Replacement in crawl-ref/source/describe.cc at line 1834 [5.3736416]

B:BD[54.6771] → [54.6771:6828]

                   && mons_intel(item.plus) >= I_NORMAL)

[54.6771]

[54.6828]

                   && mons_class_intel(item.plus) >= I_NORMAL)

Replacement in crawl-ref/source/delay.cc at line 65 [5.3963459]
∅:D[55.2955] → [56.2745:2790]
B:BD[57.3181] → [56.2745:2790]
```
    return (mons_intel(mon->type) < I_NORMAL
```
[55.2955]
[55.2956]
```
    return (mons_intel(mon) < I_NORMAL
```

Replacement in crawl-ref/source/delay.cc at line 1113 [5.3963459]

B:BD[58.9756] → [58.9756:9819]

                         && mons_intel(item.plus) >= I_NORMAL)

[58.9756]

[46.15547]

                         && mons_class_intel(item.plus) >= I_NORMAL)

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

B:BD[59.2963] → [59.2963:3030]

    pbolt.smart_monster = (mons_intel(monster->type) >= I_NORMAL);

[59.2963]

[60.34892]

    pbolt.smart_monster = (mons_intel(monster) >= I_NORMAL);

Expand handling of monster intelligence and zombifiability to work on

Dependencies

In channels

Change contents

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

Replacement in crawl-ref/source/traps.cc at line 153 [7.5308]

Replacement in crawl-ref/source/spells4.cc at line 1172 [5.436250]

Replacement in crawl-ref/source/spells3.cc at line 636 [5.531613]

Replacement in crawl-ref/source/spells2.cc at line 214 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 217 [5.569242]

Replacement in crawl-ref/source/spells1.cc at line 655 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 674 [5.616635]

Replacement in crawl-ref/source/mstuff2.cc at line 1065 [5.1340842]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/monspeak.cc at line 270 [5.1558496]

Replacement in crawl-ref/source/monspeak.cc at line 376 [5.1558496]

Replacement in crawl-ref/source/monplace.cc at line 2668 [5.1641732]

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

Insertion in crawl-ref/source/mon-util.h at line 604 [5.1682293]

Insertion in crawl-ref/source/mon-util.h at line 607 [5.1682293]

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/mgrow.cc at line 221 [44.2647]