fiddlerwoaroof/crawl - Change SBTVKHKZRMVDBYLGQNMZMJXPAYJG43UWBBD7HQJWIPN3BMMHUBJAC

Add mesilliac's patch in [1944555] for improved handling of

followers/summoned creatures, with one minor tweak to take good neutral monsters into account.

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

Created by dolorous on April 21, 2008

SBTVKHKZRMVDBYLGQNMZMJXPAYJG43UWBBD7HQJWIPN3BMMHUBJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 2798 [4.436250]

B:BD[4.523923] → [4.523923:523957]

        you.pet_target = MHITNOT;

[4.523923]

[4.523957]

        if (you.pet_target != MHITYOU)
            you.pet_target = MHITNOT;

Replacement in crawl-ref/source/spells3.cc at line 615 [4.531613]

B:BD[4.549478] → [4.549478:549512]

        you.pet_target = MHITNOT;

[4.549478]

[5.28285]

        if (you.pet_target != MHITYOU)
            you.pet_target = MHITNOT;

Replacement in crawl-ref/source/spells1.cc at line 154 [4.616635]

B:BD[4.619131] → [4.619131:619169]

            you.pet_target = MHITNOT;

[4.619131]

[4.619169]

            if (you.pet_target != MHITYOU)
                you.pet_target = MHITNOT;

Replacement in crawl-ref/source/spells1.cc at line 226 [4.616635]

B:BD[4.620673] → [4.620673:620711]

            you.pet_target = MHITNOT;

[4.620673]

[4.620711]

            if (you.pet_target != MHITYOU)
                you.pet_target = MHITNOT;

Replacement in crawl-ref/source/misc.cc at line 1651 [4.1933596]
∅:D[3.10104] → [4.1946046:1946076]
B:BD[4.1946046] → [4.1946046:1946076]
```
    you.pet_target = MHITNOT;
```
[3.10104]
[3.10105]
```
    if (you.pet_target != MHITYOU)
        you.pet_target = MHITNOT;
```
Replacement in crawl-ref/source/misc.cc at line 1986 [4.1933596]
∅:D[3.10178] → [4.1951059:1951089]
B:BD[4.1951059] → [4.1951059:1951089]
```
    you.pet_target = MHITNOT;
```
[3.10178]
[3.10179]
```
    if (you.pet_target != MHITYOU)
        you.pet_target = MHITNOT;
```
Insertion in crawl-ref/source/fight.cc at line 3041 [4.3140790]
[6.63824]
[6.63824]

Insertion in crawl-ref/source/fight.cc at line 3046 [4.3140790]

[2.942]

[7.79636]

    }
    // if an enemy attacked a friend, set the pet target if it isn't
    // set already
    if (perceived_attack && atk->alive() && mons_friendly(def)
        && !mons_wont_attack(atk) && you.pet_target == MHITNOT)
    {
        you.pet_target = monster_index(atk);

Insertion in crawl-ref/source/fight.cc at line 3055 [4.3140790]
[7.79642]
[6.63960]
Insertion in crawl-ref/source/effects.cc at line 1916 [4.3382105]
[4.3427023]
[8.8232]
```
        mpr(" h - Order allies to stop attacking");
```

Replacement in crawl-ref/source/effects.cc at line 1972 [4.3382105]

B:BD[4.3427914] → [4.3427914:3427944]

        /* fall through... */

[4.3427914]

[4.3427944]


    case 'h':
        mons_targd = MHITYOU;
        break;
    /* fall through... */

Replacement in crawl-ref/source/effects.cc at line 1990 [4.3382105]
B:BD[4.3428083] → [4.3428083:3428103]
```
    mpr("Attack!");
```
[4.3428083]
[4.3428103]
```
    mpr(mons_targd == MHITYOU ? "Heel!" : "Attack!");
```

Replacement in crawl-ref/source/acr.cc at line 4228 [4.4397395]

B:BD[4.4480569] → [4.4480569:4480603]

        you.pet_target = MHITNOT;

[4.4480569]

[4.4480603]

        if (you.pet_target != MHITYOU)
            you.pet_target = MHITNOT;

Add mesilliac's patch in [1944555] for improved handling of

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells4.cc at line 2798 [4.436250]

Replacement in crawl-ref/source/spells3.cc at line 615 [4.531613]

Replacement in crawl-ref/source/spells1.cc at line 154 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 226 [4.616635]

Replacement in crawl-ref/source/misc.cc at line 1651 [4.1933596]

Replacement in crawl-ref/source/misc.cc at line 1986 [4.1933596]

Insertion in crawl-ref/source/fight.cc at line 3041 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 3046 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 3055 [4.3140790]

Insertion in crawl-ref/source/effects.cc at line 1916 [4.3382105]

Replacement in crawl-ref/source/effects.cc at line 1972 [4.3382105]

Replacement in crawl-ref/source/effects.cc at line 1990 [4.3382105]

Replacement in crawl-ref/source/acr.cc at line 4228 [4.4397395]