fiddlerwoaroof/crawl - Change KZIBMMGUSWOMS5NQ2KTWGY3SRYUYGZGD2YRZPQ2ISN5Z3JRSMEWQC

Fixing bugs:

butterflies stay confused, even when reentering levels (Bug 1793061)
Hunters with Bow/Crossbow don't get Shields skill (FR 1762819), it sends the wrong message
abominations count as undead regardless of colour, at least the ones created via Twisted Resurrection (Bug 1784326)

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

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

KZIBMMGUSWOMS5NQ2KTWGY3SRYUYGZGD2YRZPQ2ISN5Z3JRSMEWQC

Dependencies

In channels

main

Change contents

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

[3.557232]


// 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);
}

Replacement in crawl-ref/source/spells3.cc at line 967 [3.531613]
B:BD[3.558242] → [3.558242:558274]
```
        if (type_recalled == 1)
```
[3.558242]
[3.558274]
```
        if (type_recalled == 1) // undead
```

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

B:BD[3.558284] → [3.558284:558493]

B:BD[3.558493] → [4.148090:148260]

            /* abomin created by twisted res, although it gets others too */
            if ( !((monster->type == MONS_ABOMINATION_SMALL
                            || monster->type == MONS_ABOMINATION_LARGE)
                        && (monster->colour == BROWN
                            || monster->colour == RED
                            || monster->colour == LIGHTRED)) )

[3.558284]

[3.558663]

            if (monster->type != MONS_REAPER
                && mons_holiness(monster) != MH_UNDEAD
                && !mons_your_abomination(monster))

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

B:BD[3.558677] → [3.558677:558726]

B:BD[3.558726] → [4.148261:148325]

∅:D[4.148325] → [3.558796:558862]

B:BD[3.558796] → [3.558796:558862]

                if (monster->type != MONS_REAPER
                        && mons_holiness(monster) != MH_UNDEAD)
                {
                    continue;
                }

[3.558677]

[3.558862]

                continue;

Replacement in crawl-ref/source/spells2.cc at line 480 [3.569242]

B:BD[3.580692] → [3.580692:580748]

        mpr("The corpses collapse into a pulpy mess.");

[3.580692]

[3.580748]

        mprf("The corpse%s collapse%s into a pulpy mess.",
             num_corpses > 1 ? "s": "", num_corpses > 1 ? "": "s");

Insertion in crawl-ref/source/spells2.cc at line 502 [3.569242]

[3.581249]

        // This was probably intended, but it's really boring. (jpeg)
        // Use menv[mon].number instead (set in create_monster)
//        menv[mon].colour = colour;

Replacement in crawl-ref/source/newgame.cc at line 4178 [3.1132300]

B:BD[3.1237999] → [3.1237999:1238039]

            you.skills[SK_SHIELDS] = 1;

[3.1237999]

[2.4439]

            // don't hand out shields skill to (Cross)Bow users
//            you.skills[SK_SHIELDS] = 1;

Replacement in crawl-ref/source/newgame.cc at line 4193 [3.1132300]

B:BD[3.1238414] → [3.1238414:1238481]

            you.skills[(coinflip() ? SK_STABBING : SK_SHIELDS)]++;

[3.1238414]

[2.4525]

            // don't hand out shields skill to Bow users
            you.skills[(coinflip() ? SK_STABBING : SK_STEALTH)]++;

Replacement in crawl-ref/source/mon-util.cc at line 3922 [3.1699344]

B:BD[5.19114] → [6.2966:2998]

∅:D[6.2998] → [5.19114:19135]

∅:D[7.7566] → [5.19114:19135]

B:BD[5.19114] → [5.19114:19135]

            del_ench(i->first);
            blink();

[5.19114]

[5.19135]

            if (!mons_class_flag(type, M_CONFUSED))
            {
                del_ench(i->first);
                blink();
            }