fiddlerwoaroof/crawl - Change BBAFAQFU3JBSUQT7XYPKOVKGUKCOVLBLBU2YGAEMEBL52CE4MDNQC

Make mummy death curses only happen if the mummy wasn't summoned.

(BR 2002296)

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

Created by j-p-e-g on June 26, 2008

BBAFAQFU3JBSUQT7XYPKOVKGUKCOVLBLBU2YGAEMEBL52CE4MDNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 3414 [3.1132300]
B:BD[3.1207359] → [4.9535:9536]
[3.1207359]
[5.224827]
```
        cprintf(EOL EOL);
```

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

∅:D[2.21484] → [6.85:109]

B:BD[5.224870] → [6.85:109]

B:BD[6.109] → [2.21485:21558]

            cprintf(EOL
                    "SPACE - Choose class first; * - Random species" EOL

[2.21484]

[2.21558]

            cprintf("Space - Choose class first; * - Random species" EOL

Replacement in crawl-ref/source/newgame.cc at line 3423 [3.1132300]
∅:D[2.21660] → [6.289:313]
B:BD[5.225042] → [6.289:313]
B:BD[6.313] → [2.21661:21713]
```
            cprintf(EOL
                    "* - Random; + - Good random; "
```
[2.21660]
[2.21713]
```
            cprintf("* - Random; + - Good random; "
```
Replacement in crawl-ref/source/newgame.cc at line 3437 [3.1132300]
B:BD[7.11543] → [4.9613:9651]
```
                cprintf("%sTAB - %s",
```
[7.11543]
[5.225386]
```
                cprintf("%sTab - %s",
```

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

B:BD[6.543] → [2.24057:24128]

                    "SPACE - Choose species first; * - Random class; "

[6.543]

[2.24128]

                    "Space - Choose species first; * - Random class; "

Replacement in crawl-ref/source/newgame.cc at line 3684 [3.1132300]
B:BD[7.14528] → [4.9738:9776]
```
                cprintf("%sTAB - %s",
```
[7.14528]
[5.228877]
```
                cprintf("%sTab - %s",
```

Replacement in crawl-ref/source/monstuff.cc at line 1204 [3.1396662]

B:BD[3.1415888] → [3.1415888:1415931]

B:BD[3.1415931] → [8.2107:2164]

B:BD[8.2164] → [9.3458:3491]

∅:D[9.3491] → [3.1416096:1416256]

B:BD[3.1416096] → [3.1416096:1416256]

    if (monster->type == MONS_MUMMY)
    {
        if (YOU_KILL(killer) && killer != KILL_YOU_CONF)
            curse_an_item(true);
    }
    else if (monster->type == MONS_GUARDIAN_MUMMY
             || monster->type == MONS_GREATER_MUMMY
             || monster->type == MONS_MUMMY_PRIEST)

[3.1415888]

[3.1416256]

    if (monster->type == MONS_BORIS && !in_transit)

Deletion in crawl-ref/source/monstuff.cc at line 1206 [3.1396662]

B:BD[3.1416262] → [8.2165:2222]

∅:D[8.2222] → [3.1416292:1416690]

B:BD[3.1416292] → [3.1416292:1416690]

B:BD[3.1416690] → [10.12361:12418]

∅:D[10.12418] → [3.1416732:1416738]

B:BD[3.1416732] → [3.1416732:1416738]

        if (YOU_KILL(killer) && killer != KILL_YOU_CONF)
        {
            mpr("You feel extremely nervous for a moment...",
                MSGCH_MONSTER_SPELL);
            miscast_effect( SPTYP_NECROMANCY,
                            3 + (monster->type == MONS_GREATER_MUMMY) * 8
                              + (monster->type == MONS_MUMMY_PRIEST) * 5,
                            random2avg(88, 3), 100, "a mummy death curse" );
        }
    }
    else if (monster->type == MONS_BORIS && !in_transit)
    {

Insertion in crawl-ref/source/monstuff.cc at line 1220 [3.1396662]

[3.1417806]

    else if (!mons_is_summoned(monster))
    {
        if (monster->type == MONS_MUMMY)
        {
            if (YOU_KILL(killer) && killer != KILL_YOU_CONF)
                curse_an_item(true);
        }
        else if (monster->type == MONS_GUARDIAN_MUMMY
                 || monster->type == MONS_GREATER_MUMMY
                 || monster->type == MONS_MUMMY_PRIEST)
        {
            if (YOU_KILL(killer) && killer != KILL_YOU_CONF)
            {
                mpr("You feel extremely nervous for a moment...",
                    MSGCH_MONSTER_SPELL);

Insertion in crawl-ref/source/monstuff.cc at line 1236 [3.1396662]

[3.1417807]

[11.417163]

                miscast_effect( SPTYP_NECROMANCY,
                                3 + (monster->type == MONS_GREATER_MUMMY) * 8
                                  + (monster->type == MONS_MUMMY_PRIEST) * 5,
                                random2avg(88, 3), 100, "a mummy death curse" );
            }
        }
    }