fiddlerwoaroof/crawl - Change QEPTJOPJFKTXH27KOHY7DMQSMTXWAM57OPL3Y7WYE4X2OFMZE5IAC

Various Xom neutrality adjustments:

Allow him to randomly summon angels or daevas (on the grounds that they're misguided, curious, exiled from their usual god, etc.), with the same rarity as greater demons. Add appropriate introductory messages for this (from both me and dploog).
Remove "Xom the Psychopath" from his list of titles, and replace it with the older "Xom the Begetter of Discontinuities" for now.
Remove "Call Imp" from his list of spells that he can randomly make you cast, as he seems to summon enough minor demons through other means, which makes it an overlap (as the Summon Guardian and Summon Daeva "spells" would also be).

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

Created by dolorous on March 17, 2008

QEPTJOPJFKTXH27KOHY7DMQSMTXWAM57OPL3Y7WYE4X2OFMZE5IAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 48 [5.3]

B:BD[5.694] → [5.694:866]

// roughly ascending order of power. ([ds] Removed SUMMON_GUARDIAN and
// SUMMON_DAEVA which are inappropriate for a god of chaos; need to
// investigate substitutes).
//

[5.694]

[5.866]

// roughly ascending order of power.

Replacement in crawl-ref/source/xom.cc at line 58 [5.3]

B:BD[5.1384] → [5.1384:1603]

    SPELL_CALL_IMP, SPELL_SUMMON_SCORPIONS, SPELL_FLY, SPELL_SPIDER_FORM,
    SPELL_STATUE_FORM, SPELL_ICE_FORM, SPELL_DRAGON_FORM, SPELL_SWARM,
    SPELL_SUMMON_WRAITHS, SPELL_SHADOW_CREATURES, SPELL_SUMMON_ELEMENTAL,

[5.1384]

[5.1603]

    SPELL_SUMMON_SCORPIONS, SPELL_FLY, SPELL_SPIDER_FORM, SPELL_STATUE_FORM,
    SPELL_ICE_FORM, SPELL_DRAGON_FORM, SPELL_SWARM, SPELL_SUMMON_WRAITHS,
    SPELL_SHADOW_CREATURES, SPELL_SUMMON_ELEMENTAL,

Insertion in crawl-ref/source/xom.cc at line 64 [5.3]

[5.1764]

};
static const char *xom_single_summons[] =
{
    "\"Serve the mortal, my child!\"",
    "\"Serve the toy, my child!\"",
    "Xom opens a gate."
};
static const char *xom_single_diff_summons[] =
{
    "\"Serve the mortal, my confused child!\"",
    "\"Serve the toy, my child of exile!\"",
    "Xom calls in a curious servant of another god.",
    "Xom lures something onto this plane.",
    "\"A toy for the toy!\"",
    "\"I wonder which toy lasts longer.\"",
    "Xom opens a gate."
};
static const char *xom_multiple_summons[] =
{
    "\"Serve the mortal, my children!\"",
    "Xom grants you some temporary aid.",
    "Xom momentarily opens a gate."
};
static const char *xom_multiple_some_diff_summons[] =
{
    "Xom calls in some mixed company.",
    "\"Serve the toy, my motley children!\"",
    "Xom sends help from the ranks of the outcast.",
    "\"Oh, what a happy playground.\"",
    "Xom manages to trick several beings into existence.",
    "Xom snickers at the variety.",
    "Xom momentarily opens several gates."
};
static const char *xom_multiple_all_diff_summons[] =
{
    "Xom stirs up dislodged servants of other gods.",
    "Xom summons wayward servants of other gods.",
    "Xom tricks other gods for their servants.",
    "\"Different god, different toy.\"",
    "Xom momentarily opens a gate."

Insertion in crawl-ref/source/xom.cc at line 512 [5.3]

[6.416]


    // Sometimes, send an angel or daeva instead.
    if (dct == DEMON_GREATER && coinflip())
        return (coinflip() ? MONS_ANGEL : MONS_DAEVA);

Deletion in crawl-ref/source/xom.cc at line 576 [5.3]

B:BD[5.13461] → [7.892:1128]

B:BD[7.1128] → [4.403:427]

        god_speaks(GOD_XOM, random_choose_string(
                       "\"Serve the mortal, my children!\"",
                       "Xom grants you some temporary aid.",
                       "Xom momentarily opens a gate.", NULL));

Insertion in crawl-ref/source/xom.cc at line 577 [5.3]
[6.1080]
[8.1080]
```
        int numdifferent = 0;
```

Replacement in crawl-ref/source/xom.cc at line 581 [5.3]

B:BD[5.13903] → [8.1125:1194]

B:BD[8.1194] → [3.5:116]

            create_monster(xom_random_demon(sever), 3, BEH_GOD_GIFT,
                           you.x_pos, you.y_pos, you.pet_target,
                           MONS_PROGRAM_BUG);

[5.13903]

[5.14538]

            monster_type mon = xom_random_demon(sever);
            // If it's not a demon, Xom got it someplace else, so we use
            // different messages below.
            if (!mons_is_demon(mon))
                numdifferent++;
            create_monster(mon, 3, BEH_GOD_GIFT, you.x_pos, you.y_pos,
                           you.pet_target, MONS_PROGRAM_BUG);

Insertion in crawl-ref/source/xom.cc at line 591 [5.3]

[5.14548]

[5.14565]


        if (numdifferent == numdemons)
            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_multiple_all_diff_summons));
        else if (numdifferent > 0)
            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_multiple_some_diff_summons));
        else
            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_multiple_summons));

Replacement in crawl-ref/source/xom.cc at line 621 [5.3]

∅:D[7.1494] → [8.1267:1336]

B:BD[5.14730] → [8.1267:1336]

B:BD[8.1336] → [3.117:234]

        if (create_monster(xom_random_demon(sever), 6, BEH_GOD_GIFT,
                           you.x_pos, you.y_pos, you.pet_target,
                           MONS_PROGRAM_BUG) != -1)

[7.1494]

[5.15329]

        bool different = false;
        monster_type mon = xom_random_demon(sever);
        // If it's not a demon, Xom got it someplace else, so we use
        // different messages below.
        if (!mons_is_demon(mon))
            different = true;
        if (create_monster(mon, 6, BEH_GOD_GIFT, you.x_pos, you.y_pos,
                           you.pet_target, MONS_PROGRAM_BUG) != -1)

Replacement in crawl-ref/source/xom.cc at line 633 [5.3]

B:BD[5.15339] → [7.1495:1726]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"Serve the mortal, my child!\"",
                           "\"Serve the toy, my child!\"",
                           "Xom opens a gate.", NULL));

[5.15339]

[5.15683]

            if (different)
                god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_single_diff_summons));
            else
                god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_single_summons));

Replacement in crawl-ref/source/religion.cc at line 1148 [9.804403]

B:BD[2.2083] → [2.2083:2312]

                "Xom the Psychotic", "Xom the Psychopath",
                "Xom of Gnomic Intent", "Xom the Fickle",
                "Xom of Unknown Intention", "The Xom-Meister",
                "Xom the Begetter of Turbulence"

[2.2083]

[2.2312]

                "Xom the Psychotic", "Xom of Gnomic Intent",
                "Xom the Fickle", "Xom of Unknown Intention",
                "The Xom-Meister", "Xom the Begetter of Turbulence",
                "Xom the Begetter of Discontinuities"