fiddlerwoaroof/crawl - Change JXO53C3SJ5KPLXVEBFGFWCBI4EFY6TCA6QQVH5NII5NP5BC4EWUAC

Fix [2578352]: If Xom sends you holy beings as allies, you switch to

another god, and then you switch back to Xom, those holy beings won't abandon you when you do so.

Also, if you make a holy being originally sent by Xom good neutral through being a pious worshipper of a good god, that holy being will then start worshipping TSO (the usual god for holy beings) instead of Xom.

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

Created by dolorous on February 7, 2009

JXO53C3SJ5KPLXVEBFGFWCBI4EFY6TCA6QQVH5NII5NP5BC4EWUAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 832 [10.804403]

B:BD[8.5061] → [9.2617:2689]

            // another chance to make hostile holy beings good neutral.

[8.5061]

[8.5128]

            // another chance to make hostile holy beings that worship a
            // good god good neutral.

Replacement in crawl-ref/source/religion.cc at line 3354 [10.804403]

B:BD[8.5285] → [9.2739:2793]

            // make hostile holy beings good neutral.

[8.5285]

[8.5334]

            // make hostile holy beings that worship a good god good
            // neutral.

Replacement in crawl-ref/source/religion.cc at line 3363 [10.804403]

B:BD[11.260] → [11.260:329]

        // every piety level change also affects AC from orcish gear

[11.260]

[12.172]

        // Every piety level change also affects AC from orcish gear.

Replacement in crawl-ref/source/religion.cc at line 3376 [10.804403]

B:BD[13.4571] → [9.2843:2896]

        // to make hostile holy beings good neutral.

[13.4571]

[13.4619]

        // to make hostile holy beings that worship a good god good
        // neutral.

Replacement in crawl-ref/source/religion.cc at line 4950 [10.804403]

∅:D[2.2617] → [9.3027:3065]

B:BD[9.3027] → [9.3027:3065]

            && mons_is_holy(monster))

[2.2617]

[8.5722]

            && mons_is_holy(monster)
            && is_good_god(monster->god))

Replacement in crawl-ref/source/religion.cc at line 4961 [10.804403]

B:BD[14.2724] → [14.2724:2785]

            // neutral and hostile holy beings good neutral.

[14.2724]

[14.2785]

            // neutral and hostile holy beings that worship a good god
            // good neutral.

Replacement in crawl-ref/source/religion.cc at line 4973 [10.804403]

B:BD[14.2999] → [14.2999:3052]

            // and good neutral holy beings hostile.

[14.2999]

[14.3052]

            // and good neutral holy beings that worship a good god
            // hostile.

Replacement in crawl-ref/source/religion.cc at line 5567 [10.804403]
B:BD[15.3846] → [15.3846:3864]
```
// the good gods.
```
[15.3846]
[16.2615]
```
// the good gods, and be made worshippers of TSO if necessary.
```

Insertion in crawl-ref/source/religion.cc at line 5588 [10.804403]

[17.3884]

[18.2829]

    // If the holy being was previously worshipping a different god,
    // make it worship TSO.
    holy->god = GOD_SHINING_ONE;

Insertion in crawl-ref/source/religion.cc at line 5759 [10.804403]

[19.4243]

// Orcs may turn friendly when encountering followers of Beogh, and be
// made gifts of Beogh.

Replacement in crawl-ref/source/religion.cc at line 5800 [10.804403]

B:BD[6.2592] → [6.2592:2737]

    // Prevent assertion if the orc was previously worshipping a different
    // god rather than already worhsipping Beogh or being an athiest.

[6.2592]

[6.2737]

    // Prevent assertion if the orc was previously worshipping a
    // different god, rather than already worshipping Beogh or being an
    // atheist.

Replacement in crawl-ref/source/religion.cc at line 5991 [10.804403]

B:BD[3.2611] → [3.2611:2655]

    // all non-hostile holy beings hostile.

[3.2611]

[3.2655]

    // all non-hostile holy beings that worship a good god hostile.

Deletion in crawl-ref/source/player.cc at line 6839 [10.962854]
B:BD[7.2657] → [7.2657:2707]
```
    if (player_is_unholy())
        return (-2);
```
Insertion in crawl-ref/source/player.cc at line 6842 [10.962854]
[7.2764]
[7.2764]
```
    if (player_is_unholy())
        return (-2);
```
Replacement in crawl-ref/source/monstuff.cc at line 1243 [10.1396662]
∅:D[4.4132] → [20.2903:2934]
B:BD[20.2903] → [20.2903:2934]
```
                if ( passive )
```
[4.4132]
[20.2934]
```
                if (passive)
```
Insertion in crawl-ref/source/monstuff.cc at line 1295 [10.1396662]
[10.1410642]
[21.4459]
```
                // Zin hates chaotic beings.
```
Replacement in crawl-ref/source/mon-util.cc at line 587 [10.1699344]
B:BD[21.5611] → [22.2955:2990]
∅:D[22.2990] → [23.20999:21022]
B:BD[21.5680] → [23.20999:21022]
∅:D[23.21022] → [21.5701:5749]
B:BD[21.5701] → [21.5701:5749]
```
    if (mons_is_shapeshifter(mon))
        return (true);
    if (mon->has_spell(SPELL_POLYMORPH_OTHER))
```
[21.5611]
[23.21023]
```
    if (mons_is_shapeshifter(mon) || mon->has_spell(SPELL_POLYMORPH_OTHER))
```

Replacement in crawl-ref/source/mon-util.cc at line 3939 [10.1699344]

B:BD[5.2638] → [5.2638:2714]

        if ((mons_is_holy(this) || is_good_god(god)) && is_evil_item(item))

[5.2638]

[24.15398]

        if ((mons_is_holy(this) || is_good_god(god))
            && is_evil_item(item))
        {

Insertion in crawl-ref/source/mon-util.cc at line 3943 [10.1699344]
[24.15426]
[24.15426]
```
        }
```

Replacement in crawl-ref/source/mon-util.cc at line 3945 [10.1699344]

B:BD[24.15427] → [5.2715:2844]

∅:D[5.2844] → [25.2770:2849]

B:BD[25.2770] → [25.2770:2849]

        // Holy monsters that aren't gifts of Xom and monsters that are
        // gifts of good gods won't use chaotic weapons.
        if (((mons_is_holy(this) && this->god != GOD_XOM) || is_good_god(god))

[24.15427]

[26.2919]

        // Holy monsters that aren't gifts of chaotic gods and monsters
        // that are gifts of good gods won't use chaotic weapons.
        if (((mons_is_holy(this) && !is_chaotic_god(this->god))
                || is_good_god(god))

Insertion in crawl-ref/source/mon-util.cc at line 5838 [10.1699344]
[7.3108]
[7.3108]
```
    if (mons_is_evil(this))
        return (-1);
```
Deletion in crawl-ref/source/mon-util.cc at line 5844 [10.1699344]
B:BD[27.3140] → [7.3160:3210]
```
    if (mons_is_evil(this))
        return (-1);
```

Fix [2578352]: If Xom sends you holy beings as allies, you switch to

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 832 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 3354 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 3363 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 3376 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 4950 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 4961 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 4973 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 5567 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 5588 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 5759 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 5800 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 5991 [10.804403]

Deletion in crawl-ref/source/player.cc at line 6839 [10.962854]

Insertion in crawl-ref/source/player.cc at line 6842 [10.962854]

Replacement in crawl-ref/source/monstuff.cc at line 1243 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1295 [10.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 587 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3939 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3943 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3945 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5838 [10.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 5844 [10.1699344]