fiddlerwoaroof/crawl - Change RYK4OAO72K3TDOSKJ2GTQHD3LSMDSB6TQXFZWHPB6FYETNVFNVIAC

Only trigger the "attack neutral" conduct upon attacking neutral god

gifts (i.e., neutral monsters that don't attack).

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

Created by dolorous on April 7, 2008

RYK4OAO72K3TDOSKJ2GTQHD3LSMDSB6TQXFZWHPB6FYETNVFNVIAC

Dependencies

In channels

main

Change contents

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

B:BD[3.270] → [4.167:207]

        else if (mons_neutral(monster))

[3.270]

[4.207]

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

Insertion in crawl-ref/source/spells3.cc at line 223 [5.531613]
[4.274]
[2.167]
```
        }
```

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

B:BD[3.383] → [4.275:319]

            else if (mons_neutral(monster))

[3.383]

[4.319]

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

Insertion in crawl-ref/source/spells3.cc at line 285 [5.531613]
[4.390]
[3.383]
```
            }
```

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

B:BD[6.280] → [4.440:482]

        else if (mons_neutral( monster ))

[6.280]

[4.482]

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

Insertion in crawl-ref/source/spells2.cc at line 1186 [5.569242]
[4.551]
[4.551]
```
        }
```

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

B:BD[6.4305] → [4.3757:3794]

        else if (mons_neutral(mons))

[6.4305]

[4.3794]

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

Insertion in crawl-ref/source/player.cc at line 5854 [5.962854]
[4.3858]
[7.6886]
```
        }
```

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

B:BD[8.18261] → [9.5528:5600]

∅:D[9.5600] → [6.6506:6578]

B:BD[10.1172] → [6.6506:6578]

B:BD[6.6578] → [4.4100:4249]

                if (mons_friendly( mon ) && beam.flavour != BEAM_CHARM)
                    did_god_conduct( DID_ATTACK_FRIEND, 5, true, mon );
                else if (mons_neutral( mon ) && beam.flavour != BEAM_CHARM)
                    did_god_conduct( DID_ATTACK_NEUTRAL, 5, true, mon );

[8.18261]

[11.3343]

                if (beam.flavour != BEAM_CHARM)
                {
                    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 );
                    }
                }

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

B:BD[12.4950] → [4.4250:4290]

            else if (mons_neutral(mon))

[12.4950]

[4.4290]

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

Insertion in crawl-ref/source/beam.cc at line 4003 [5.4128068]
[4.4356]
[13.1249580]
```
            }
```

Only trigger the "attack neutral" conduct upon attacking neutral god

Dependencies

In channels

Change contents

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

Insertion in crawl-ref/source/spells3.cc at line 223 [5.531613]

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

Insertion in crawl-ref/source/spells3.cc at line 285 [5.531613]

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

Insertion in crawl-ref/source/spells2.cc at line 1186 [5.569242]

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

Insertion in crawl-ref/source/player.cc at line 5854 [5.962854]

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

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

Insertion in crawl-ref/source/beam.cc at line 4003 [5.4128068]