fiddlerwoaroof/crawl - Change 22YVHM74WBJNJE4PA5CBEUTDWM6FAGGGILI26A4LXAURX55TNRKAC

Apply patch 1901117: vitrification effect for Xom (and Xom cleanup)

This needs flavour messages, and looks odd for large power because the undiggable stone of the level also gets turned into glass possibly resulting in huge areas of glass tiles.

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

Created by j-p-e-g on February 25, 2008

22YVHM74WBJNJE4PA5CBEUTDWM6FAGGGILI26A4LXAURX55TNRKAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 488 [9.3]
[8.999]
[9.11718]
```
// The nicer stuff (note: these things are not necessarily nice)
```

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

B:BD[9.11755] → [9.11755:11865]

    // niceness = false - bad, true - nice
    int temp_rand;              // probability determination {dlb}

Insertion in crawl-ref/source/xom.cc at line 492 [9.3]
[9.11888]
[9.11888]
```
    god_acting gdact(GOD_XOM);
```

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

B:BD[9.11889] → [9.11889:12000]

B:BD[9.12000] → [3.136:167]

    bolt beam;
    
    // Okay, now for the nicer stuff (note: these things are not
    // necessarily nice):
    god_acting gdact(GOD_XOM);

[9.11889]

[9.12000]

    // This series of random calls produces a poisson-looking distribution:
    // initial hump, plus a long-ish tail.

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

B:BD[9.12035] → [9.12035:13129]

        temp_rand = random2(4);
                
        god_speaks(GOD_XOM,
                   (temp_rand == 0) ? "\"Go forth and destroy!\"" :
                   (temp_rand == 1) ? "\"Go forth and cause havoc, mortal!\"" :
                   (temp_rand == 2) ? "Xom grants you a minor favour."
                   : "Xom smiles on you.");
                
        switch (random2(7))
        {
        case 0:
            potion_effect(POT_HEALING, 150);
            break;
        case 1:
            potion_effect(POT_HEAL_WOUNDS, 150);
            break;
        case 2:
            potion_effect(POT_SPEED, 150);
            break;
        case 3:
            potion_effect(POT_MIGHT, 150);
            break;
        case 4:
            potion_effect(POT_INVISIBILITY, 150);
            break;
        case 5:
            if (one_chance_in(6))
                potion_effect(POT_EXPERIENCE, 150);
            else
            {
                you.berserk_penalty = NO_BERSERK_PENALTY;
                potion_effect(POT_BERSERK_RAGE, 150);
            }
            break;
        case 6:

[9.12035]

[9.13129]

        god_speaks(GOD_XOM, random_choose_string(
                       "\"Go forth and destroy!\"",
                       "\"Go forth and cause havoc, mortal!\"",
                       "Xom grants you a minor favour.",
                       "Xom smiles on you.", NULL));
        potion_type type = (potion_type)random_choose(
            POT_HEALING, POT_HEAL_WOUNDS, POT_SPEED, POT_MIGHT,
            POT_INVISIBILITY, POT_BERSERK_RAGE, POT_EXPERIENCE, -1);
        // downplay this one a bit
        if (type == POT_EXPERIENCE && !one_chance_in(6))
            type = POT_BERSERK_RAGE;
        if (type == POT_BERSERK_RAGE)

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

B:BD[9.13183] → [9.13183:13279]

            potion_effect(POT_BERSERK_RAGE, 150);
            break;
        }

[9.13183]

[9.13279]

        potion_effect(type, 150);

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

B:BD[9.13461] → [9.13461:13746]

        temp_rand = random2(3);
        god_speaks(GOD_XOM,
                   (temp_rand == 0) ? "\"Serve the mortal, my children!\"" :
                   (temp_rand == 1) ? "Xom grants you some temporary aid."
                   : "Xom momentarily opens a gate.");

[9.13461]

[4.1000]

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

Deletion in crawl-ref/source/xom.cc at line 534 [9.3]
B:BD[9.14548] → [9.14548:14565]
```
                
```

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

B:BD[9.14632] → [9.14632:14663]

        xom_gives_item(sever);

[9.14632]

[9.14663]

        const int radius = random2avg(sever/2, 3);
        god_speaks(GOD_XOM, random_choose_string(
                       // XXX need some more creative flavor text
                       "Xom alters the dungeon around you.", NULL));
        vitrify_area(radius);

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

[9.14730]

[8.1267]

        xom_gives_item(sever);
        done = true;
    }
    else if (random2(sever) <= 6)
    {

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

B:BD[9.15339] → [9.15339:15506]

B:BD[9.15506] → [5.4:124]

            temp_rand = random2(3);
                    
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"Serve the mortal, my child!\"" :
                       (temp_rand == 1) ? "\"Serve the toy, my child!\"" :
                       "Xom opens a gate.");

[9.15339]

[9.15683]

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

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

B:BD[9.15724] → [9.15724:15791]

    else if ((random2(sever) <= 6) && there_are_monsters_nearby())

[9.15724]

[9.15791]

    else if (random2(sever) <= 7)

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

[9.15797]

[10.51]

        if (! there_are_monsters_nearby())
            goto try_again;

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

B:BD[9.15864] → [9.15864:16279]

B:BD[9.16279] → [2.3:4]

            temp_rand = random2(4);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"This might be better!\"" :
                       (temp_rand == 1) ? "\"Hum-dee-hum-dee-hum...\"" :
                       (temp_rand == 2) ?
                                     "Xom's power touches on a nearby monster."
                       : "You hear Xom's avuncular chuckle.");

[9.15864]

[2.4]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"This might be better!\"",
                           "\"Hum-dee-hum-dee-hum...\"",
                           "Xom's power touches on a nearby monster.",
                           "You hear Xom's avuncular chuckle.", NULL));

Replacement in crawl-ref/source/xom.cc at line 583 [9.3]
B:BD[9.16547] → [9.16547:16581]
```
    else if (random2(sever) <= 7)
```
[9.16547]
[9.16581]
```
    else if (random2(sever) <= 8)
```
Replacement in crawl-ref/source/xom.cc at line 588 [9.3]
B:BD[9.16645] → [9.16645:16697]
```
    else if (!you.is_undead && random2(sever) <= 8)
```
[9.16645]
[9.16697]
```
    else if (random2(sever) <= 9)
```

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

B:BD[9.16703] → [9.16703:17009]

B:BD[9.17009] → [11.3332:3391]

        temp_rand = random2(4);
        god_speaks(GOD_XOM,
                   (temp_rand == 0) ? "\"You need some minor adjustments, mortal!\"" :
                   (temp_rand == 1) ? "\"Let me alter your pitiful body.\"" :
                   (temp_rand == 2) ? "Xom's power touches on you for a moment."
                   : "You hear Xom's maniacal cackling.");

[9.16703]

[9.17069]

        if (you.is_undead)
            goto try_again;
        god_speaks(GOD_XOM, random_choose_string(
                       "\"You need some minor adjustments, mortal!\"",
                       "\"Let me alter your pitiful body.\"",
                       "Xom's power touches on you for a moment.",
                       "You hear Xom's maniacal cackling.", NULL));

Replacement in crawl-ref/source/xom.cc at line 612 [9.3]
B:BD[9.17517] → [9.17517:17551]
```
    else if (random2(sever) <= 9)
```
[9.17517]
[9.17551]
```
    else if (random2(sever) <= 10)
```

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

B:BD[9.18044] → [9.18044:18112]

B:BD[9.18112] → [5.125:286]

∅:D[5.286] → [9.18266:18313]

B:BD[9.18266] → [9.18266:18313]

            temp_rand = random2(3);
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "Xom grants you a demonic assistant."
                       : (temp_rand == 1) ? "Xom grants you a demonic servitor."
                       : "Xom opens a gate.");

[9.18044]

[9.18313]

            god_speaks(GOD_XOM, random_choose_string(
                           "Xom grants you a demonic assistant.",
                           "Xom grants you a demonic servitor.",
                           "Xom opens a gate.", NULL));

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

B:BD[9.18354] → [9.18354:18424]

    else if ((random2(sever) <= 10) && player_in_a_dangerous_place())

[9.18354]

[9.18424]

    else if (random2(sever) <= 11)

Insertion in crawl-ref/source/xom.cc at line 628 [9.3]
[9.18430]
[8.1485]
```
        if (player_in_a_dangerous_place())
```
Insertion in crawl-ref/source/xom.cc at line 634 [9.3]
[9.18803]
[9.18803]
```
        bolt beam;
```
Insertion in crawl-ref/source/xom.cc at line 659 [9.3]
[9.19528]
[9.19528]
```
try_again:
```

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

B:BD[9.19586] → [9.19586:19696]

    // niceness = false - bad, true - nice
    int temp_rand;              // probability determination {dlb}

Deletion in crawl-ref/source/xom.cc at line 666 [9.3]
B:BD[9.19719] → [9.19719:19735]
B:BD[9.19735] → [3.168:169]
```
    bolt beam;
```
Deletion in crawl-ref/source/xom.cc at line 668 [9.3]
∅:D[12.989] → [9.19740:19766]
B:BD[9.19740] → [9.19740:19766]
```
    // begin "Bad Things"
```

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

B:BD[9.19833] → [9.19833:20245]

            temp_rand = random2(4);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "Xom almost notices you." :
                       (temp_rand == 1) ? "Xom's attention almost turns to you for a moment.":
                       (temp_rand == 2) ? "Xom's power almost touches on you for a moment."
                       : "You almost hear Xom's maniacal laughter.");

[9.19833]

[9.20245]

            god_speaks(GOD_XOM, random_choose_string(
                           "Xom almost notices you.",
                           "Xom's attention almost turns to you for a moment.",
                           "Xom's power almost touches on you for a moment.",
                           "You almost hear Xom's maniacal laughter.", NULL));

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

B:BD[9.20470] → [9.20470:20854]

            temp_rand = random2(4);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "Xom notices you." :
                       (temp_rand == 1) ? "Xom's attention turns to you for a moment.":
                       (temp_rand == 2) ? "Xom's power touches on you for a moment."
                       : "You hear Xom's maniacal laughter.");

[9.20470]

[9.20854]

            god_speaks(GOD_XOM, random_choose_string(
                           "Xom notices you.",
                           "Xom's attention turns to you for a moment.",
                           "Xom's power touches on you for a moment.",
                           "You hear Xom's maniacal laughter.", NULL));

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

B:BD[9.21091] → [9.21091:21478]

            temp_rand = random2(4);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"Suffer!\"" :
                       (temp_rand == 1) ? "Xom's malign attention turns to you for a moment." :
                       (temp_rand == 2) ? "Xom's power touches on you for a moment."
                       : "You hear Xom's maniacal laughter.");

[9.21091]

[9.21478]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"Suffer!\"",
                           "Xom's malign attention turns to you for a moment.",
                           "Xom's power touches on you for a moment.",
                           "You hear Xom's maniacal laughter.", NULL));

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

B:BD[9.21653] → [9.21653:22037]

            temp_rand = random2(4);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "Xom notices you." :
                       (temp_rand == 1) ? "Xom's attention turns to you for a moment.":
                       (temp_rand == 2) ? "Xom's power touches on you for a moment."
                       : "You hear Xom's maniacal laughter.");

[9.21653]

[9.22037]

            god_speaks(GOD_XOM, random_choose_string(
                           "Xom notices you.",
                           "Xom's attention turns to you for a moment.",
                           "Xom's power touches on you for a moment.",
                           "You hear Xom's maniacal laughter.", NULL));

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

B:BD[9.22226] → [9.22226:22282]

        else if (!you.is_undead && random2(sever) <= 6)

[9.22226]

[9.22282]

        else if (random2(sever) <= 6)

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

B:BD[9.22292] → [9.22292:22679]

            temp_rand = random2(4);
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"You need some minor improvements, mortal!\"" :
                       (temp_rand == 1) ? "\"Let me alter your body.\"" :
                       (temp_rand == 2) ? "Xom's power brushes against you for a moment."
                       : "You hear Xom's avuncular chuckle.");

[9.22292]

[9.22679]

            if (you.is_undead)
                goto try_again;
            god_speaks(GOD_XOM, random_choose_string(
                           "\"You need some minor improvements, mortal!\"",
                           "\"Let me alter your body.\"",
                           "Xom's power brushes against you for a moment.",
                           "You hear Xom's avuncular chuckle.", NULL));

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

B:BD[9.23136] → [9.23136:23207]

        else if ((random2(sever) <= 7) && there_are_monsters_nearby())

[9.23136]

[9.23207]

        else if (random2(sever) <= 7)

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

[9.23217]

[2.41]

            if (! there_are_monsters_nearby())
                goto try_again;

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

B:BD[2.162] → [2.162:202]

∅:D[2.202] → [9.23351:23368]

B:BD[9.23351] → [9.23351:23368]

B:BD[9.23368] → [2.203:548]

                temp_rand = random2(4);
                
                god_speaks(GOD_XOM,
                           (temp_rand == 0) ? "\"This might be better!\"" :
                           (temp_rand == 1) ? "\"Hum-dee-hum-dee-hum...\"" :
                           (temp_rand == 2) ? "Xom's power touches on a nearby monster."
                           : "You hear Xom's avuncular chuckle.");

[2.162]

[2.548]

                god_speaks(GOD_XOM, random_choose_string(
                               "\"This might be better!\"",
                               "\"Hum-dee-hum-dee-hum...\"",
                               "Xom's power touches on a nearby monster.",
                               "You hear Xom's avuncular chuckle.", NULL));

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

B:BD[9.23955] → [9.23955:24011]

        else if (!you.is_undead && random2(sever) <= 8)

[9.23955]

[9.24011]

        else if (random2(sever) <= 8)

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

B:BD[9.24021] → [9.24021:24438]

            temp_rand = random2(4);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"You have displeased me, mortal.\"" :
                       (temp_rand == 1) ? "\"You have grown too confident for your meagre worth.\"" :
                       (temp_rand == 2) ? "Xom's power touches on you for a moment."
                       : "You hear Xom's maniacal laughter.");

[9.24021]

[9.24438]

            if (you.is_undead)
                goto try_again;
            god_speaks(GOD_XOM, random_choose_string(
                           "\"You have displeased me, mortal.\"",
                           "\"You have grown too confident for your meagre worth.\"",
                           "Xom's power touches on you for a moment.",
                           "You hear Xom's maniacal laughter.", NULL));

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

B:BD[9.24951] → [9.24951:25344]

            temp_rand = random2(4);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"Time to have some fun!\"" :
                       (temp_rand == 1) ? "\"Fight to survive, mortal.\"" :
                       (temp_rand == 2) ? "\"Let's see if it's strong enough to survive yet.\""
                       : "You hear Xom's maniacal laughter.");

[9.24951]

[9.25344]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"Time to have some fun!\"",
                           "\"Fight to survive, mortal.\"",
                           "\"Let's see if it's strong enough to survive yet.\"",
                           "You hear Xom's maniacal laughter.", NULL));

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

B:BD[9.26093] → [9.26093:26427]

            temp_rand = random2(4);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"Try this!\"" :
                       (temp_rand == 1) ? "Xom's attention turns to you.":
                       (temp_rand == 2) ? "Xom's power touches on you."
                       : "Xom giggles.");

[9.26093]

[9.26427]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"Try this!\"",
                           "Xom's attention turns to you.",
                           "Xom's power touches on you.",
                           "Xom giggles.", NULL));

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

B:BD[9.26708] → [9.26708:27078]

            temp_rand = random2(3);
                
            god_speaks(GOD_XOM,
                       (temp_rand == 0) ? "\"You have grown too comfortable in your little world, mortal!\"" :
                       (temp_rand == 1) ? "Xom casts you into the Abyss!"
                       : "The world seems to spin as Xom's maniacal laughter rings in your ears.");

[9.26708]

[9.27078]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"You have grown too comfortable in your little world, mortal!\"",
                           "Xom casts you into the Abyss!",
                           "The world seems to spin as Xom's maniacal laughter rings in your ears.", NULL));

Insertion in crawl-ref/source/xom.cc at line 843 [9.3]
[12.991]
[9.27194]
```
try_again:
```
Insertion in crawl-ref/source/stuff.h at line 40 [15.217090]
[13.1439]
[14.134]
```
const char* random_choose_string(const char* first, ...);
```

Insertion in crawl-ref/source/stuff.cc at line 300 [15.224557]

[14.580]

[16.192]

// Chooses one of the strings passed in at random. The list of strings
// must be terminated with NULL.
const char* random_choose_string(const char* first, ...)
{
    va_list args;
    va_start(args, first);
    const char* chosen = first;
    int count = 1, nargs = 100;
    while (nargs-- > 0)
    {
        char* pick = va_arg(args, char*);
        if (pick == NULL)
            break;
        if (one_chance_in(++count))
            chosen = pick;
    }
    ASSERT(nargs > 0);
    
    va_end(args);
    return (chosen);
}

Replacement in crawl-ref/source/effects.h at line 116 [15.3378996]
B:BD[17.3083] → [7.342:343]
[17.3083]
[7.343]
```
void vitrify_area(int radius);
```

Insertion in crawl-ref/source/effects.cc at line 1983 [15.3382105]

[17.4649]

[7.614]

}
void vitrify_area(int radius)
{
    const int radius2 = radius * radius;
    for ( int x = X_BOUND_1; x <= X_BOUND_2; ++x )
    {
        for ( int y = Y_BOUND_1; y <= Y_BOUND_2; ++y )
        {
            if ( distance(x,y,you.x_pos,you.y_pos) < radius2 )
            {
                if ( grd[x][y] == DNGN_ROCK_WALL )
                    grd[x][y] = DNGN_CLEAR_ROCK_WALL;
                else if ( grd[x][y] == DNGN_STONE_WALL )
                    grd[x][y] = DNGN_CLEAR_STONE_WALL;
                else if ( grd[x][y] == DNGN_PERMAROCK_WALL )
                    grd[x][y] = DNGN_CLEAR_PERMAROCK_WALL;
            }
        }
    }

Replacement in crawl-ref/source/decks.cc at line 2074 [15.3987460]

B:BD[6.622] → [6.622:1364]

    int radius2;
    if ( power_level == 2 )
        radius2 = 1000000;
    else
    {
        radius2 = random2(power/40) + 2;
        radius2 *= radius2;
    }
    for ( int x = X_BOUND_1; x <= X_BOUND_2; ++x )
    {
        for ( int y = Y_BOUND_1; y <= Y_BOUND_2; ++y )
        {
            if ( distance(x,y,you.x_pos,you.y_pos) < radius2 )
            {
                if ( grd[x][y] == DNGN_ROCK_WALL )
                    grd[x][y] = DNGN_CLEAR_ROCK_WALL;
                else if ( grd[x][y] == DNGN_STONE_WALL )
                    grd[x][y] = DNGN_CLEAR_STONE_WALL;
                else if ( grd[x][y] == DNGN_PERMAROCK_WALL )
                    grd[x][y] = DNGN_CLEAR_PERMAROCK_WALL;
            }
        }
    }

[6.622]

[18.26136]

    const int radius = ( power_level == 2 ) ? 1000 : random2(power/40) + 2;
    vitrify_area(radius);