fiddlerwoaroof/crawl - Change AY3TQCPUUX7KA64V23KUW3PZD4M6DW5DZNJGWS7X2V7ANSU6LREQC

Whoops, overlooked something with abominations.

Moving the check directly into mons_holiness, so now it should work for all cases.

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

Created by j-p-e-g on September 14, 2007

AY3TQCPUUX7KA64V23KUW3PZD4M6DW5DZNJGWS7X2V7ANSU6LREQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells3.cc at line 911 [3.531613]

B:BD[3.557232] → [2.151:428]


// Returns true if a given monster is an abomination
// created by Twisted Resurrection
static bool mons_your_abomination(const monsters *mon)
{
    if ( mon->type != MONS_ABOMINATION_SMALL
         && mon->type != MONS_ABOMINATION_LARGE )
    {
        return (false);
    }

Deletion in crawl-ref/source/spells3.cc at line 912 [3.531613]

B:BD[2.429] → [2.429:576]

∅:D[2.576] → [3.557232:557233]

B:BD[3.557232] → [3.557232:557233]

    // Reusing the colour scheme - hacky! (jpeg)
    return (mon->number == BROWN || mon->number == RED
            || mon->number == LIGHTRED);
}

Replacement in crawl-ref/source/spells3.cc at line 955 [3.531613]

B:BD[2.665] → [2.665:772]

                && mons_holiness(monster) != MH_UNDEAD
                && !mons_your_abomination(monster))

[2.665]

[3.558663]

                && mons_holiness(monster) != MH_UNDEAD)

Insertion in crawl-ref/source/mon-util.cc at line 324 [3.1699344]

[3.1703982]

}
// Returns true if a given monster is an abomination
// created by Twisted Resurrection
static bool mons_your_abomination(const monsters *mon)
{
    if ( mon->type != MONS_ABOMINATION_SMALL
         && mon->type != MONS_ABOMINATION_LARGE )
    {
        return (false);
    }
    // Reusing the colour scheme - hacky! (jpeg)
    return (mon->number == BROWN || mon->number == RED
            || mon->number == LIGHTRED);

Insertion in crawl-ref/source/mon-util.cc at line 343 [3.1699344]

[4.469699]

    if (mons_your_abomination(mon))
        return (MH_UNDEAD);