fiddlerwoaroof/crawl - Change 53BVN4ZHKGUAJE53HM6FC6GKUGXOU5QBUT7CLXV2ONS6S5NPW55AC

Simplify checking for monsters that are actually shapeshifters, and

don't allow those in orc form to become Beoghites' followers.

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

Created by dolorous on September 25, 2008

53BVN4ZHKGUAJE53HM6FC6GKUGXOU5QBUT7CLXV2ONS6S5NPW55AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 605 [9.3]

B:BD[7.462] → [8.398:435]

B:BD[8.435] → [4.4:118]

                if (one_chance_in(8)
                    && !mon->has_ench(
                            ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))

[7.462]

[8.558]

                if (one_chance_in(8) && !mons_is_shapeshifter(mon))

Replacement in crawl-ref/source/xom.cc at line 810 [9.3]

B:BD[10.178] → [8.1206:1247]

B:BD[8.1247] → [4.245:367]

                    if (one_chance_in(8)
                        && !mon->has_ench(
                                ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))

[10.178]

[8.1378]

                    if (one_chance_in(8) && !mons_is_shapeshifter(mon))

Insertion in crawl-ref/source/view.cc at line 829 [12.16817]
[6.45]
[11.68]
```
        && !mons_is_shapeshifter(monster)
```
Replacement in crawl-ref/source/monstuff.cc at line 1605 [12.1396662]
B:BD[12.1426708] → [13.8052:8125]
```
    if (monster->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))
```
[12.1426708]
[14.704]
```
    if (mons_is_shapeshifter(monster))
```
Insertion in crawl-ref/source/monstuff.cc at line 4910 [12.1396662]
[12.1490534]
[15.426456]
```
    // Shapeshifters don't get spells.
```
Replacement in crawl-ref/source/monstuff.cc at line 4913 [12.1396662]
∅:D[16.2700] → [17.7207:7283]
∅:D[3.2849] → [17.7207:7283]
B:BD[15.426570] → [17.7207:7283]
```
        && monster->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))
```
[3.2849]
[12.1490719]
```
        && mons_is_shapeshifter(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 4915 [12.1396662]

B:BD[12.1490725] → [2.2542:2620]

∅:D[2.2620] → [12.1490802:1490860]

B:BD[12.1490802] → [12.1490802:1490860]

        return (false);           //jmf: shapeshifters don't get spells, just
                                  //     physical powers.

[12.1490725]

[12.1490860]

        return (false);

Replacement in crawl-ref/source/monstuff.cc at line 5384 [12.1396662]

∅:D[18.7444] → [13.10075:10178]

B:BD[19.175] → [13.10075:10178]

∅:D[13.10178] → [19.288:351]

B:BD[19.288] → [19.288:351]

    if (!monster->has_ench( ENCH_GLOWING_SHAPESHIFTER,
                            ENCH_SHAPESHIFTER )
        || !mons_class_flag( monster->type, M_ACTUAL_SPELLS ))

[18.7444]

[19.351]

    if (!mons_is_shapeshifter(monster)
        || !mons_class_flag(monster->type, M_ACTUAL_SPELLS))

Insertion in crawl-ref/source/mon-util.h at line 537 [12.1682293]
[20.8359]
[12.1692171]
```
bool mons_is_shapeshifter(const monsters *m);
```
Replacement in crawl-ref/source/mon-util.cc at line 482 [12.1699344]
B:BD[21.5611] → [21.5611:5680]
```
    if (mon->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))
```
[21.5611]
[5.20999]
```
    if (mons_is_shapeshifter(mon))
```

Insertion in crawl-ref/source/mon-util.cc at line 2096 [12.1699344]

[20.11451]

[22.2328]

bool mons_is_shapeshifter(const monsters *m)
{
    return (m->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER));
}

Replacement in crawl-ref/source/Kills.cc at line 616 [23.558235]
B:BD[23.579069] → [24.2953:2997]
∅:D[24.2997] → [13.38434:38488]
B:BD[13.38434] → [13.38434:38488]
```
    if (mon->has_ench(ENCH_SHAPESHIFTER) ||
            mon->has_ench(ENCH_GLOWING_SHAPESHIFTER))
```
[23.579069]
[23.579218]
```
    if (mons_is_shapeshifter(mon))
```

Simplify checking for monsters that are actually shapeshifters, and

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 605 [9.3]

Replacement in crawl-ref/source/xom.cc at line 810 [9.3]

Insertion in crawl-ref/source/view.cc at line 829 [12.16817]

Replacement in crawl-ref/source/monstuff.cc at line 1605 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4910 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4913 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4915 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5384 [12.1396662]

Insertion in crawl-ref/source/mon-util.h at line 537 [12.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 482 [12.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2096 [12.1699344]

Replacement in crawl-ref/source/Kills.cc at line 616 [23.558235]