fiddlerwoaroof/crawl - Change IOMAHHDYJ6P65ZZK4Q44YX2PEBZWBPB7ZOA3OKXPUBI5BRLRQ5JAC

Applied patch 1742546: Xom shouldn't polymorph demons.

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

Created by haranp on June 27, 2007

IOMAHHDYJ6P65ZZK4Q44YX2PEBZWBPB7ZOA3OKXPUBI5BRLRQ5JAC

Dependencies

[2] KFULGQQOHWUTXOM3BXCCYPGGVGGY4Z6265XUFRCBPNLTZAEHJZSQC

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 523 [2.3]

B:BD[2.16279] → [2.16279:16357]

            bool isFriendly = mons_friendly(mon);
            if (isFriendly)

[2.16279]

[2.16357]


            if (mons_friendly(mon))

Replacement in crawl-ref/source/xom.cc at line 718 [2.3]

B:BD[2.23217] → [2.23217:23281]

            struct monsters* mon = get_random_nearby_monster();

[2.23217]

[2.23281]

            monsters* mon = get_random_nearby_monster();

Replacement in crawl-ref/source/xom.cc at line 720 [2.3]

B:BD[2.23315] → [2.23315:23351]

            temp_rand = random2(4);

[2.23315]

[2.23351]

            if ( mon->holiness() == MH_NATURAL )
            {
                temp_rand = random2(4);

Replacement in crawl-ref/source/xom.cc at line 724 [2.3]

B:BD[2.23368] → [2.23368:23945]

            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"This might be better!\"" :
                       (temp_rand == 1) ? "\"Hum-dee-hum-dee-hum...\"" :
                       (temp_rand == 2) ? "Xom's power touches on a nearby monster."
                       : "You hear Xom's avuncular chuckle.");
            bool isFriendly = mons_friendly(mon);
            if (isFriendly)
                monster_polymorph(mon, RANDOM_MONSTER, PPT_LESS);
            else
                monster_polymorph(mon, RANDOM_MONSTER, PPT_MORE);
            done = true;

[2.23368]

[2.23945]

                god_speaks(GOD_XOM,
                           (temp_rand == 0) ? "\"This might be better!\"" :
                           (temp_rand == 1) ? "\"Hum-dee-hum-dee-hum...\"" :
                           (temp_rand == 2) ? "Xom's power touches on a nearby monster."
                           : "You hear Xom's avuncular chuckle.");
                if (mons_friendly(mon))
                    monster_polymorph(mon, RANDOM_MONSTER, PPT_LESS);
                else
                    monster_polymorph(mon, RANDOM_MONSTER, PPT_MORE);
                done = true;
            }