fiddlerwoaroof/crawl - Change X2FMJXEWN2NI4PJZLE2POIBGVLK5DSXU4IVFI7KCONRQO2UH4MJAC

Clean up handling of neutral god gifts.

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

Created by dolorous on April 7, 2008

X2FMJXEWN2NI4PJZLE2POIBGVLK5DSXU4IVFI7KCONRQO2UH4MJAC

Dependencies

In channels

main

Change contents

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

B:BD[4.270] → [3.167:270]

        else if (mons_neutral(monster)
            && testbits(monster->flags, MF_GOD_GIFT))
        {

[4.270]

[6.207]

        else if (mons_good_neutral(monster))

Deletion in crawl-ref/source/spells3.cc at line 221 [5.531613]
B:BD[6.274] → [3.271:281]
```
        }
```

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

B:BD[4.383] → [3.282:397]

            else if (mons_neutral(monster)
                && testbits(monster->flags, MF_GOD_GIFT))
            {

[4.383]

[6.319]

            else if (mons_good_neutral(monster))

Deletion in crawl-ref/source/spells3.cc at line 280 [5.531613]
B:BD[6.390] → [3.398:412]
```
            }
```

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

B:BD[5.597658] → [7.159:197]

B:BD[8.334] → [9.212:280]

B:BD[9.280] → [3.415:522]

∅:D[3.522] → [6.482:551]

B:BD[6.482] → [6.482:551]

B:BD[6.551] → [3.523:533]

        if (mons_friendly( monster ))
            did_god_conduct( DID_ATTACK_FRIEND, 5, true, monster );
        else if (mons_neutral( monster )
            && testbits( monster->flags, MF_GOD_GIFT ))
        {
            did_god_conduct( DID_ATTACK_NEUTRAL, 5, true, monster );
        }

[5.597658]

[6.551]

        if (mons_friendly(monster))
            did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);
        else if (mons_good_neutral(monster))
            did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);

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

∅:D[6.552] → [10.135:251]

B:BD[10.135] → [10.135:251]

        if (mons_holiness( monster ) == MH_HOLY)
            did_god_conduct( DID_ATTACK_HOLY, monster->hit_dice );

[6.552]

[10.251]

        if (mons_holiness(monster) == MH_HOLY)
            did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice);

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

B:BD[10.301] → [10.301:356]

        behaviour_event( monster, ME_ANNOY, MHITYOU );

[10.301]

[10.356]

        behaviour_event(monster, ME_ANNOY, MHITYOU);

Replacement in crawl-ref/source/player.cc at line 5889 [5.962854]

B:BD[9.4305] → [3.2897:2994]

        else if (mons_neutral(mons)
            && testbits(mons->flags, MF_GOD_GIFT))
        {

[9.4305]

[6.3794]

        else if (mons_good_neutral(mons))

Deletion in crawl-ref/source/player.cc at line 5891 [5.962854]
B:BD[6.3858] → [3.2995:3005]
```
        }
```
Insertion in crawl-ref/source/mon-util.h at line 624 [5.1682293]
[11.7760]
[11.7760]
```
bool mons_good_neutral(const monsters *m);
```

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

[5.1733727]

[11.8061]

bool mons_good_neutral(const monsters *m)
{
    return (mons_neutral(m) && testbits(m->flags, MF_GOD_GIFT));
}

Replacement in crawl-ref/source/fight.cc at line 3913 [5.3140790]

∅:D[2.2951] → [12.3162:3230]

B:BD[12.3162] → [12.3162:3230]

B:BD[12.3230] → [2.2952:3008]

    if ((mons_friendly(attacker)
        || (mons_neutral(attacker)
            && testbits(attacker->flags, MF_GOD_GIFT)))

[2.2951]

[12.3289]

    if ((mons_friendly(attacker) || mons_good_neutral(attacker))

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

B:BD[3.3288] → [3.3288:3644]

                    if (mons_friendly( mon ))
                        did_god_conduct( DID_ATTACK_FRIEND, 5, true, mon );
                    else if (mons_neutral( mon )
                        && testbits( mon->flags, MF_GOD_GIFT ))
                    {
                        did_god_conduct( DID_ATTACK_NEUTRAL, 5, true, mon );
                    }

[3.3288]

[3.3644]

                    if (mons_friendly(mon))
                        did_god_conduct(DID_ATTACK_FRIEND, 5, true, mon);
                    else if (mons_good_neutral(mon))
                        did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, mon);

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

B:BD[13.3344] → [13.3344:3385]

∅:D[13.3385] → [9.6579:6661]

B:BD[14.1248065] → [9.6579:6661]

                if (mons_is_holy( mon ))
                    did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, true, mon );

[13.3344]

[15.1489]

                if (mons_is_holy(mon))
                    did_god_conduct(DID_ATTACK_HOLY, mon->hit_dice, true, mon);

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

B:BD[14.1249523] → [16.4885:4950]

B:BD[16.4950] → [3.3663:3770]

∅:D[3.3770] → [6.4290:4356]

B:BD[6.4290] → [6.4290:4356]

B:BD[6.4356] → [3.3771:3785]

                conduct.set( DID_ATTACK_FRIEND, 5, !okay, mon );
            else if (mons_neutral(mon)
                && testbits(mon->flags, MF_GOD_GIFT))
            {
                conduct.set( DID_ATTACK_NEUTRAL, 5, !okay, mon );
            }

[14.1249523]

[14.1249580]

                conduct.set(DID_ATTACK_FRIEND, 5, !okay, mon);
            else if (mons_good_neutral(mon))
                conduct.set(DID_ATTACK_NEUTRAL, 5, !okay, mon);