fiddlerwoaroof/crawl - Change A54S2WRWNIV4Y4XB5JHR7NALLB55ZCX3Z5DSGBMAVGVY6I7KY2GAC

* Tweak Xom's (non)tension spell selection.

Skip the harmless effects when Xom is BORED.
&^ for Xom randomizes piety and has a 10% chance of making Xom bored.

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

Created by j-p-e-g on March 25, 2009

A54S2WRWNIV4Y4XB5JHR7NALLB55ZCX3Z5DSGBMAVGVY6I7KY2GAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 60 [4.3]

B:BD[3.57] → [3.57:252]

    SPELL_BLINK, SPELL_MAGIC_MAPPING, SPELL_DETECT_ITEMS,
    SPELL_DETECT_CREATURES, SPELL_RING_OF_FLAMES, SPELL_OLGREBS_TOXIC_RADIANCE,
    SPELL_EXCRUCIATING_WOUNDS, SPELL_SUMMON_BUTTERFLIES,

[3.57]

[3.252]

    SPELL_MAGIC_MAPPING, SPELL_DETECT_ITEMS, SPELL_DETECT_CREATURES,
    SPELL_OLGREBS_TOXIC_RADIANCE, SPELL_SUMMON_BUTTERFLIES,

Replacement in crawl-ref/source/xom.cc at line 63 [4.3]

B:BD[3.321] → [3.321:384]

    SPELL_DRAGON_FORM, SPELL_ANIMATE_DEAD, SPELL_NECROMUTATION

[3.321]

[3.384]

    SPELL_DRAGON_FORM, SPELL_NECROMUTATION

Replacement in crawl-ref/source/xom.cc at line 68 [4.3]

B:BD[4.907] → [4.907:968]

B:BD[4.968] → [2.4:70]

    SPELL_BLINK, SPELL_CONFUSING_TOUCH, SPELL_MAGIC_MAPPING,
    SPELL_DETECT_ITEMS, SPELL_DETECT_CREATURES, SPELL_CAUSE_FEAR,

[4.907]

[5.4]

    SPELL_BLINK, SPELL_CONFUSING_TOUCH, SPELL_CAUSE_FEAR,

Replacement in crawl-ref/source/xom.cc at line 1155 [4.3]
B:BD[6.4704] → [3.1013:1048]
```
        if (tension || coinflip())
```
[6.4704]
[3.1048]
```
        if (tension || one_chance_in(3))
```

Insertion in crawl-ref/source/xom.cc at line 1408 [4.3]

[7.1402]

[8.6192]

        messages.push_back("Your eyebrows wriggle.");
    }
    if (you.species != SP_NAGA
        && (you.species != SP_MERFOLK || !player_is_swimming()))
    {
        messages.push_back("You do an impromptu tapdance.");

Deletion in crawl-ref/source/xom.cc at line 1452 [4.3]
B:BD[8.7253] → [8.7253:7287]
```
        messages.push_back(str);
```

Insertion in crawl-ref/source/xom.cc at line 1460 [4.3]

[8.7465]

        messages.push_back(str);
        str = "Your ";
        str += item->name(DESC_BASENAME, false, false, false);
        str += " briefly flashes a lurid colour!";

Replacement in crawl-ref/source/xom.cc at line 1498 [4.3]

B:BD[8.8459] → [8.8459:8562]

        else if (item->sub_type >= ARM_RING_MAIL &&
                 item->sub_type <= ARM_PLATE_MAIL)

[8.8459]

[8.8562]

        else if (item->sub_type >= ARM_RING_MAIL
                 && item->sub_type <= ARM_PLATE_MAIL)

Replacement in crawl-ref/source/xom.cc at line 1814 [4.3]
B:BD[4.19719] → [9.6290:6327]
```
    bool nasty = _xom_feels_nasty();
```
[4.19719]
[10.8]
```
    bool nasty = (sever >= 5 && _xom_feels_nasty());
```
Replacement in crawl-ref/source/xom.cc at line 1824 [4.3]
∅:D[11.652] → [12.431:468]
B:BD[4.19790] → [12.431:468]
```
        if (x_chance_in_y(3, sever))
```
[11.652]
[4.19823]
```
        if (!nasty && x_chance_in_y(3, sever))
```

Replacement in crawl-ref/source/xom.cc at line 1829 [4.3]

B:BD[4.20422] → [13.219:261]

        else if (x_chance_in_y(4, sever))

[4.20422]

[4.20460]

        else if (!nasty && x_chance_in_y(4, sever))

Replacement in crawl-ref/source/xom.cc at line 1841 [4.3]

B:BD[4.22226] → [14.126:201]

        else if (x_chance_in_y(7, sever) && you.level_type != LEVEL_ABYSS)

[4.22226]

[4.22282]

        else if ((!nasty || coinflip())
                 && x_chance_in_y(7, sever) && you.level_type != LEVEL_ABYSS)

Replacement in crawl-ref/source/debug.cc at line 2425 [16.4016436]
B:BD[15.15324] → [15.15324:15392]
```
    else if (you.religion == GOD_XOM) // increase amusement instead
```
[15.15324]
[15.15392]
```
    else if (you.religion == GOD_XOM)
```

Replacement in crawl-ref/source/debug.cc at line 2427 [16.4016436]

B:BD[15.15398] → [15.15398:15446]

        xom_is_stimulated(50, XM_NORMAL, true);

[15.15398]

[15.15446]

        const std::string old_xom_favour = describe_xom_favour();
        you.piety = random2(MAX_PIETY+1); // reroll mood
        if (one_chance_in(10))
            you.gift_timeout = 0;
        else
            you.gift_timeout = random2(256);  // reroll interest
        const std::string new_xom_favour = describe_xom_favour();
        if (old_xom_favour != new_xom_favour)
        {
            const std::string msg = "Your title is now: " + new_xom_favour;
            god_speaks(you.religion, msg.c_str());
        }

Replacement in crawl-ref/source/acr.cc at line 549 [16.4397395]

B:BD[17.16444] → [15.21350:21418]

            xom_acts(coinflip(), random_range(0, MAX_PIETY - 100));

[17.16444]

[16.4413571]

            xom_acts(coinflip(), random_range(0, MAX_PIETY/2));

Replacement in crawl-ref/source/acr.cc at line 2681 [16.4397395]
B:BD[18.7338] → [3.5538:5576]
```
#ifdef DEBUG_TENSION | DEBUG_RELIGION
```
[18.7338]
[18.7374]
```
#if defined(DEBUG_TENSION) || defined(DEBUG_RELIGION)
```