fiddlerwoaroof/crawl - Change HCVH2CWL32UD66O6Z7ZYDUASWN3RF5TW6FSWURGMD7MELKB772FAC

Zooko's Xom patch (piety handling and whether his acts are good or bad).

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

Created by zelgadis on December 12, 2008

HCVH2CWL32UD66O6Z7ZYDUASWN3RF5TW6FSWURGMD7MELKB772FAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.h at line 21 [8.3]
[8.425]
[8.425]
```
void xom_tick();
```
Insertion in crawl-ref/source/xom.cc at line 30 [9.3]
[9.475]
[10.4]
```
#include "spells1.h"
```
Insertion in crawl-ref/source/xom.cc at line 32 [9.3]
[10.25]
[9.496]
```
#include "spells3.h"
```

Replacement in crawl-ref/source/xom.cc at line 98 [9.3]

B:BD[11.150] → [11.150:385]

    return (you.piety > 160) ? "A beloved toy of Xom." :
           (you.piety > 145) ? "A favourite toy of Xom." :
           (you.piety > 130) ? "A very special toy of Xom." :
           (you.piety > 115) ? "A special toy of Xom." :

[11.150]

[11.385]

    if (you.gift_timeout < 1)
        return "A BORING thing.";
    else
        return (you.piety > 180) ? "A beloved toy of Xom." :
           (you.piety > 160) ? "A favourite toy of Xom." :
           (you.piety > 140) ? "A very special toy of Xom." :
           (you.piety > 120) ? "A special toy of Xom." :

Replacement in crawl-ref/source/xom.cc at line 106 [9.3]

B:BD[11.434] → [11.434:620]

B:BD[11.620] → [4.4:67]

           (you.piety >  85) ? "A plaything of Xom." :
           (you.piety >  70) ? "A special plaything of Xom." :
           (you.piety >  55) ? "A very special plaything of Xom." :
           (you.piety >  40) ? "A favourite plaything of Xom."

[11.434]

[4.67]

           (you.piety >  80) ? "A plaything of Xom." :
           (you.piety >  60) ? "A special plaything of Xom." :
           (you.piety >  40) ? "A very special plaything of Xom." :
           (you.piety >  20) ? "A favourite plaything of Xom."

Replacement in crawl-ref/source/xom.cc at line 129 [9.3]

B:BD[11.844] → [11.844:924]

    return (you.gift_timeout > 0 && you.piety > (MAX_PIETY / 2)) || coinflip();

[11.844]

[12.347]

    return (you.gift_timeout > 0 && you.piety > (MAX_PIETY / 2));

Insertion in crawl-ref/source/xom.cc at line 176 [9.3]

[8.2977]


void xom_tick()
{
    // Xom semi-randomly drifts your piety.
    int delta;
    const char *origfavour = describe_xom_favour();
    const bool good = you.piety > (MAX_PIETY / 2);
    int size = abs(you.piety - 100);
    delta = (x_chance_in_y(511, 1000) ? 1 : -1);
    size += delta;
    you.piety = (MAX_PIETY / 2) + (good ? size : -size);
    const char *newfavour = describe_xom_favour();
    if (strcmp(origfavour, newfavour))
    {
        // Dampen oscillation across announcement boundaries.
        size += delta * 8;
        you.piety = (MAX_PIETY / 2) + (good ? size : -size);
    }

Insertion in crawl-ref/source/xom.cc at line 195 [9.3]

[8.2978]

[13.80]

    // ...but he gets bored...
    if (one_chance_in(2))
        you.gift_timeout--;
    newfavour = describe_xom_favour();
    if (strcmp(origfavour, newfavour)) {
        char buf[8192];
        strcpy(buf, "Your title is now: ");
        strcat(buf, newfavour);
        god_speaks( you.religion, buf );
    }
    if (you.gift_timeout == 1)
        simple_god_message(" is getting BORED.");
    if (one_chance_in(20))
        xom_acts(abs(you.piety - 100));
}

Replacement in crawl-ref/source/xom.cc at line 261 [9.3]

B:BD[14.227] → [6.95:150]

    // Only do it 50% of the time.
    if (coinflip())

[14.227]

[14.300]

    // Only do it some of the time.
    if (one_chance_in(3))

Replacement in crawl-ref/source/xom.cc at line 444 [9.3]

B:BD[15.289] → [15.289:370]

                                get_random_body_armour_type(you.your_level * 2),

[15.289]

[16.995]

                                get_random_body_armour_type(power * 2),

Replacement in crawl-ref/source/xom.cc at line 679 [9.3]

B:BD[17.583] → [18.85:156]

    const int roll = random2(1000 - (27 - you.experience_level) * 10);

[17.583]

[18.156]

    const int roll = random2(1000 - (MAX_PIETY - sever) * 3);

Deletion in crawl-ref/source/xom.cc at line 708 [9.3]
B:BD[17.603] → [19.406:513]
B:BD[19.513] → [16.1307:1367]
∅:D[16.1367] → [18.747:792]
B:BD[18.747] → [18.747:792]
B:BD[18.792] → [20.6:7]
∅:D[20.7] → [17.603:610]
∅:D[18.792] → [17.603:610]
B:BD[17.603] → [17.603:610]
B:BD[17.610] → [16.1368:1410]
∅:D[16.1410] → [18.834:979]
B:BD[18.834] → [18.834:979]
B:BD[18.979] → [20.8:9]
∅:D[20.9] → [18.979:999]
B:BD[18.979] → [18.979:999]
∅:D[18.999] → [17.996:999]
B:BD[17.996] → [17.996:999]
```
// Returns a demon suitable for use in Xom's punishments, filtering out
// the really nasty ones early on.
static monster_type _xom_random_punishment_demon(int sever)
{
    monster_type demon = MONS_PROGRAM_BUG;
    do
        demon = _xom_random_demon(sever);
    while ((demon == MONS_HELLION
            && you.experience_level < 12
            && !one_chance_in(3 + (12 - you.experience_level) / 2)));
    return (demon);
}
```
Deletion in crawl-ref/source/xom.cc at line 726 [9.3]
B:BD[21.269] → [21.269:305]
```
        // Downplay this one a bit.
```

Insertion in crawl-ref/source/xom.cc at line 749 [9.3]

[9.13461]

[15.407]

        monsters *monster;
        for (unsigned i = 0; i < MAX_MONSTERS; i++)
        {
            monster = &menv[i];
            if (monster->type == -1 || !mons_near(monster) || mons_wont_attack(monster) || one_chance_in(20))
                continue;
                
            if (monster->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_FRIENDLY, random2(sever))))
            {
                if (!done)
                    god_speaks(GOD_XOM, _get_xom_speech("confusion").c_str());
                done = true;
                if (player_monster_visible( monster ))
                    simple_monster_message(monster, " looks rather confused.");
            }
        }
    }
    else if (x_chance_in_y(5, sever))
    {

Replacement in crawl-ref/source/xom.cc at line 849 [9.3]
B:BD[9.14592] → [22.116:154]
```
    else if (x_chance_in_y(5, sever))
```
[9.14592]
[9.14626]
```
    else if (x_chance_in_y(6, sever))
```
Replacement in crawl-ref/source/xom.cc at line 855 [9.3]
B:BD[23.1454] → [22.155:193]
```
    else if (x_chance_in_y(6, sever))
```
[23.1454]
[23.1488]
```
    else if (x_chance_in_y(7, sever))
```
Replacement in crawl-ref/source/xom.cc at line 891 [9.3]
B:BD[9.15724] → [22.194:232]
```
    else if (x_chance_in_y(7, sever))
```
[9.15724]
[9.15791]
```
    else if (x_chance_in_y(8, sever))
```

Insertion in crawl-ref/source/xom.cc at line 912 [9.3]

[5.78]

                // player_angers_monster() will turn the monster against you 
                // only if the monster hates your religion.  No monsters hate 
                // Xom-religion, so this will only have an effect if you are not 
                // currently a worshipper of Xom, e.g. if you just abandoned him 
                // or if you drew a Card of Xom or something.

Replacement in crawl-ref/source/xom.cc at line 923 [9.3]
B:BD[9.16547] → [22.233:271]
```
    else if (x_chance_in_y(8, sever))
```
[9.16547]
[9.16581]
```
    else if (x_chance_in_y(9, sever))
```

Replacement in crawl-ref/source/xom.cc at line 929 [9.3]

B:BD[9.16645] → [22.272:310]

    else if (x_chance_in_y(9, sever))

[9.16645]

[24.143]

    else if (x_chance_in_y(10, sever) && (you.level_type != LEVEL_ABYSS))
    {
        // rearrange the pieces -- blink every monster on this level and the player
        // Every now and then, Xom also confuses them all.
        bool confusem = one_chance_in(10);
	
        // Not just every monster in sight -- oh no.  Every monster on this level!
        monsters *monster;
        for (unsigned i = 0; i < MAX_MONSTERS; i++)
        {
            monster = &menv[i];
                
            if (monster->type == -1)
                continue;
            if (monster_blink(monster))
            {
                if (!done)
                    god_speaks(GOD_XOM, _get_xom_speech("rearrange the pieces").c_str());
                done = true;
                if (confusem)
                    if (monster->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_FRIENDLY, random2(sever))))
                        if (player_monster_visible( monster ))
                            simple_monster_message(monster, " looks rather confused.");
            }
            // If he blinked at least one monster, blink the player too and this act is considered "done".
            if (done)
                random_blink(false);
        }
    }
    else if (x_chance_in_y(11, sever) && (you.level_type != LEVEL_ABYSS))
    {
        // The Xom teleportation train takes you on instant teleportation to 
        // a few random areas, stopping randomly but mostly likely in an area 
        // that is not dangerous to you.
        god_speaks(GOD_XOM, _get_xom_speech("teleportation journey").c_str());
        do {
            you_teleport_now(false);
            more();
            if (one_chance_in(10))
                break;
        } while (x_chance_in_y(3, 4) || player_in_a_dangerous_place());
        done = true;
    }
    else if (x_chance_in_y(12, sever))

Replacement in crawl-ref/source/xom.cc at line 984 [9.3]

B:BD[24.390] → [22.311:350]

    else if (x_chance_in_y(10, sever))

[24.390]

[9.16697]

    else if (x_chance_in_y(13, sever) && x_chance_in_y(16, how_mutated()))

Replacement in crawl-ref/source/xom.cc at line 1007 [9.3]
B:BD[9.17517] → [22.351:390]
```
    else if (x_chance_in_y(11, sever))
```
[9.17517]
[9.17551]
```
    else if (x_chance_in_y(14, sever))
```
Replacement in crawl-ref/source/xom.cc at line 1043 [9.3]
B:BD[9.18354] → [22.391:430]
```
    else if (x_chance_in_y(12, sever))
```
[9.18354]
[9.18424]
```
    else if (x_chance_in_y(15, sever))
```

Replacement in crawl-ref/source/xom.cc at line 1124 [9.3]

B:BD[9.22226] → [22.598:640]

        else if (x_chance_in_y(7, sever))

[9.22226]

[9.22282]

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

Insertion in crawl-ref/source/xom.cc at line 1126 [9.3]

[9.22292]

[14.7295]

            // The Xom teleportation train takes you on instant teleportation to 
            // a few random areas, stopping if an area is dangerous to you or 
            // randomly stopping.
            god_speaks(GOD_XOM, _get_xom_speech("teleportation journey").c_str());
            do {
                you_teleport_now(false);
                more();
            } while (x_chance_in_y(3, 4) && !player_in_a_dangerous_place());
            done = true;
        }
        else if (x_chance_in_y(8, sever))
        {

Replacement in crawl-ref/source/xom.cc at line 1167 [9.3]
B:BD[14.8178] → [14.8178:8220]
```
        else if (x_chance_in_y(8, sever))
```
[14.8178]
[14.8220]
```
        else if (x_chance_in_y(9, sever))
```
Replacement in crawl-ref/source/xom.cc at line 1190 [9.3]
B:BD[9.23136] → [14.8231:8273]
```
        else if (x_chance_in_y(9, sever))
```
[9.23136]
[9.23207]
```
        else if (x_chance_in_y(10, sever))
```

Replacement in crawl-ref/source/xom.cc at line 1216 [9.3]

B:BD[9.23955] → [14.8274:8317]

        else if (x_chance_in_y(10, sever))

[9.23955]

[9.24011]

        else if (x_chance_in_y(11, sever))
        {
            std::string speech = _get_xom_speech("confusion");
            if (confuse_player(random2(sever)+1, false)) {
                done = true;
                // Well, sometimes Xom gets carried away and starts confusing other 
                // creatures too.
                if (coinflip()) {
                    monsters* monster;
                    for (unsigned i = 0; i < MAX_MONSTERS; i++) {
                        monster = &menv[i];
                        
                        if (monster->type == -1 || !mons_near(monster) || one_chance_in(20))
                            continue;
                        
                        if (monster->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_FRIENDLY, random2(sever)))) {
                            if (player_monster_visible( monster ))
                                simple_monster_message(monster, " looks rather confused.");
                        }
                    }
                }
            } 
        }
        else if (x_chance_in_y(12, sever))

Replacement in crawl-ref/source/xom.cc at line 1270 [9.3]
B:BD[9.24903] → [14.8318:8361]
```
        else if (x_chance_in_y(11, sever))
```
[9.24903]
[9.24941]
```
        else if (x_chance_in_y(13, sever))
```

Replacement in crawl-ref/source/xom.cc at line 1295 [9.3]

B:BD[25.55] → [16.1865:1934]

                                _xom_random_punishment_demon(sever),

[25.55]

[7.130]

                                _xom_random_demon(sever),

Replacement in crawl-ref/source/xom.cc at line 1311 [9.3]
B:BD[9.26044] → [14.8362:8405]
```
        else if (x_chance_in_y(12, sever))
```
[9.26044]
[9.26083]
```
        else if (x_chance_in_y(14, sever))
```
Replacement in crawl-ref/source/xom.cc at line 1390 [9.3]
∅:D[26.474] → [27.3:50]
B:BD[9.27661] → [27.3:50]
```
    if (you.religion == GOD_XOM && coinflip())
```
[26.474]
[28.5]
```
    if (you.religion == GOD_XOM && one_chance_in(2)) {
```

Insertion in crawl-ref/source/xom.cc at line 1392 [9.3]

[28.48]

[8.4503]


        char buf[8192];
        strcpy(buf, "Your title is now: ");
        const char *newfavour = describe_xom_favour();
        strcat(buf, newfavour);
        god_speaks( you.religion, buf );
    }

Replacement in crawl-ref/source/religion.cc at line 6539 [29.804403]

B:BD[29.886355] → [9.30855:31000]

B:BD[9.31000] → [3.2567:2626]

∅:D[3.2626] → [9.31048:31093]

B:BD[9.31048] → [9.31048:31093]

B:BD[9.31093] → [22.5918:5975]

∅:D[22.5975] → [9.31145:31172]

B:BD[9.31145] → [9.31145:31172]

B:BD[9.31172] → [3.2627:2692]

∅:D[3.2692] → [9.31225:31345]

B:BD[9.31225] → [9.31225:31345]

B:BD[9.31345] → [2.2576:2646]

∅:D[2.2646] → [9.31415:31450]

B:BD[9.31415] → [9.31415:31450]

B:BD[9.31450] → [3.2693:2762]

∅:D[3.2762] → [9.31507:31521]

B:BD[9.31507] → [9.31507:31521]

B:BD[9.31521] → [30.3882:3883]

B:BD[30.3883] → [2.2647:2924]

∅:D[2.2924] → [9.31811:31912]

B:BD[9.31811] → [9.31811:31912]

B:BD[9.31912] → [31.2656:2714]

∅:D[32.393] → [9.31958:32053]

∅:D[31.2714] → [9.31958:32053]

B:BD[9.31958] → [9.31958:32053]

B:BD[9.32067] → [9.32067:32115]

B:BD[9.32129] → [9.32129:32165]

B:BD[9.32165] → [33.2658:2706]

        {
            // Xom semi-randomly drifts your piety.
            int delta;
            const char *origfavour = describe_xom_favour();
            const bool good = you.piety > (MAX_PIETY / 2);
            int size = abs(you.piety - 100);
            delta = (x_chance_in_y(511, 1000) ? 1 : -1);
            size += delta;
            you.piety = (MAX_PIETY / 2) + (good ? size : -size);
            const char *newfavour = describe_xom_favour();
            if (strcmp(origfavour, newfavour))
            {
                // Dampen oscillation across announcement boundaries.
                size += delta * 2;
                you.piety = (MAX_PIETY / 2) + (good ? size : -size);
            }
            // ...but he gets bored... (I re-use gift_timeout for this
            // instead of making a separate field because I don't want
            // to learn how to save and restore a new field).  In this
            // usage, the "gift" is the gift you give to Xom of
            // something interesting happening.
            if (you.gift_timeout == 1)
            {
                simple_god_message(" is getting BORED.");
                you.gift_timeout = 0;
            }
            else if (you.gift_timeout > 1)
                you.gift_timeout -= random2(2);
            if (one_chance_in(20))
                xom_acts(abs(you.piety - 100));

[29.886355]

[29.886464]

            xom_tick();

Deletion in crawl-ref/source/religion.cc at line 6541 [29.804403]
B:BD[29.886483] → [9.32411:32421]
```
        }
```

Replacement in crawl-ref/source/dat/descript/gods.txt at line 35 [34.575]

B:BD[34.2373] → [35.4287:4512]

Xom is a wild and unpredictable God of chaos, who seeks not worshippers but playthings to toy with. Many choose to follow Xom in the hope of receiving fabulous rewards and mighty powers, but Xom is nothing if not capricious.

[34.2373]

[34.2598]

Xom is a wild and unpredictable God of chaos, who seeks not worshippers but playthings with which to toy. Many choose to follow Xom in the hope of receiving fabulous rewards and mighty powers, but Xom is nothing if not capricious.

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 232 [12.5538]

[12.9656]

[12.9657]

%%%%
Xom rearrange the pieces
Xom decides to rearrange the pieces.
%%%%
Xom teleportation journey
Whee!
Let's go for a ride!

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 243 [12.5538]
[12.9662]
[12.9662]
```
Xom confusion
Heh heh heh...
%%%%
```

Replacement in crawl-ref/source/acr.cc at line 927 [29.4397395]

B:BD[29.4414659] → [33.2986:3026]

        xom_acts(abs(you.piety - 100));

[29.4414659]

[29.4414693]

        if (you.religion == GOD_XOM)
            xom_acts(abs(you.piety - 100));
        else
            xom_acts(coinflip(), random_range(0, MAX_PIETY - 100));

Zooko's Xom patch (piety handling and whether his acts are good or bad).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/xom.h at line 21 [8.3]

Insertion in crawl-ref/source/xom.cc at line 30 [9.3]

Insertion in crawl-ref/source/xom.cc at line 32 [9.3]

Replacement in crawl-ref/source/xom.cc at line 98 [9.3]

Replacement in crawl-ref/source/xom.cc at line 106 [9.3]

Replacement in crawl-ref/source/xom.cc at line 129 [9.3]

Insertion in crawl-ref/source/xom.cc at line 176 [9.3]

Insertion in crawl-ref/source/xom.cc at line 195 [9.3]

Replacement in crawl-ref/source/xom.cc at line 261 [9.3]

Replacement in crawl-ref/source/xom.cc at line 444 [9.3]

Replacement in crawl-ref/source/xom.cc at line 679 [9.3]

Deletion in crawl-ref/source/xom.cc at line 708 [9.3]

Deletion in crawl-ref/source/xom.cc at line 726 [9.3]

Insertion in crawl-ref/source/xom.cc at line 749 [9.3]

Replacement in crawl-ref/source/xom.cc at line 849 [9.3]

Replacement in crawl-ref/source/xom.cc at line 855 [9.3]

Replacement in crawl-ref/source/xom.cc at line 891 [9.3]

Insertion in crawl-ref/source/xom.cc at line 912 [9.3]

Replacement in crawl-ref/source/xom.cc at line 923 [9.3]

Replacement in crawl-ref/source/xom.cc at line 929 [9.3]

Replacement in crawl-ref/source/xom.cc at line 984 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1007 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1043 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1124 [9.3]

Insertion in crawl-ref/source/xom.cc at line 1126 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1167 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1190 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1216 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1270 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1295 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1311 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1390 [9.3]

Insertion in crawl-ref/source/xom.cc at line 1392 [9.3]

Replacement in crawl-ref/source/religion.cc at line 6539 [29.804403]

Deletion in crawl-ref/source/religion.cc at line 6541 [29.804403]

Replacement in crawl-ref/source/dat/descript/gods.txt at line 35 [34.575]

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 232 [12.5538]

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 243 [12.5538]

Replacement in crawl-ref/source/acr.cc at line 927 [29.4397395]