fiddlerwoaroof/crawl - Change H2OHWQKMHL66CPVJGJL35RY7EIZB74SZTGOLDJDSCG5WVEVPIIUAC

OK, third time's the charm, I hope. Sorry for the mixups.

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

Created by haranp on January 15, 2009

H2OHWQKMHL66CPVJGJL35RY7EIZB74SZTGOLDJDSCG5WVEVPIIUAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 731 [8.3]

B:BD[6.999] → [7.4:70]

B:BD[7.70] → [9.4:53]

// The nicer stuff.  Note: these things are not necessarily nice.
static bool _xom_is_good(int sever, int tension)

[6.603]

[8.11753]

static bool _xom_do_potion()

Replacement in crawl-ref/source/xom.cc at line 733 [8.3]

B:BD[8.11865] → [8.11865:11888]

    bool done = false;

[8.11755]

[10.4]

    bool rc = false;
    potion_type pot =
        static_cast<potion_type>(
            random_choose(POT_HEALING, POT_HEAL_WOUNDS, POT_SPEED,
                          POT_MIGHT, POT_INVISIBILITY, POT_BERSERK_RAGE,
                          POT_EXPERIENCE, -1));
    if (pot == POT_EXPERIENCE && !one_chance_in(6))
        pot = POT_BERSERK_RAGE;
    if (pot != POT_BERSERK_RAGE || you.can_go_berserk(false))
    {
        god_speaks(GOD_XOM, _get_xom_speech("potion effect").c_str());

Replacement in crawl-ref/source/xom.cc at line 747 [8.3]

B:BD[10.5] → [10.5:47]

B:BD[10.47] → [11.393:420]

∅:D[11.420] → [10.68:91]

B:BD[10.68] → [10.68:91]

    // Did Xom (already) kill the player?
    if (_player_is_dead())
        return (true);

[10.5]

[12.6]

        if (pot == POT_BERSERK_RAGE)
            you.berserk_penalty = NO_BERSERK_PENALTY;

Replacement in crawl-ref/source/xom.cc at line 750 [8.3]
∅:D[12.7] → [13.71:102]
B:BD[8.11888] → [13.71:102]
```
    god_acting gdact(GOD_XOM);
```
[12.7]
[8.11888]
```
        potion_effect(pot, 150);
```

Replacement in crawl-ref/source/xom.cc at line 752 [8.3]

B:BD[8.11889] → [14.1015:1134]

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

[8.11889]

[13.222]

        rc = true;
    }
    return (rc);
}

Replacement in crawl-ref/source/xom.cc at line 757 [8.3]

B:BD[13.223] → [15.896:955]

∅:D[15.955] → [9.109:157]

B:BD[9.109] → [9.109:157]

    // Don't make the player berserk if there's no danger.
    if (tension > 0 && x_chance_in_y(2, sever))

[13.223]

[8.12029]

static bool _xom_confuse_monsters(int sever)
{
    bool rc = false;
    monsters *monster;
    for (unsigned i = 0; i < MAX_MONSTERS; ++i)

Replacement in crawl-ref/source/xom.cc at line 763 [8.3]

B:BD[8.12035] → [16.4:269]

B:BD[16.305] → [16.305:397]

        potion_type pot =
            static_cast<potion_type>(
                random_choose(POT_HEALING, POT_HEAL_WOUNDS, POT_SPEED,
                              POT_MIGHT, POT_INVISIBILITY, POT_BERSERK_RAGE,
                              POT_EXPERIENCE, -1));
        if (pot == POT_EXPERIENCE && !one_chance_in(6))
            pot = POT_BERSERK_RAGE;

[8.12035]

[17.4]

        monster = &menv[i];

Replacement in crawl-ref/source/xom.cc at line 765 [8.3]

B:BD[17.5] → [16.398:464]

        if (pot != POT_BERSERK_RAGE || you.can_go_berserk(false))

[17.5]

[18.5]

        if (monster->type == -1 || !mons_near(monster)
            || mons_wont_attack(monster)
            || !mons_class_is_confusable(monster->type)
            || one_chance_in(20))

Replacement in crawl-ref/source/xom.cc at line 770 [8.3]

B:BD[18.15] → [19.657:732]

∅:D[20.229] → [17.8:9]

∅:D[16.532] → [17.8:9]

∅:D[19.732] → [17.8:9]

B:BD[18.105] → [17.8:9]

B:BD[17.9] → [16.533:632]

            god_speaks(GOD_XOM, _get_xom_speech("potion effect").c_str());
            if (pot == POT_BERSERK_RAGE)
                you.berserk_penalty = NO_BERSERK_PENALTY;

[18.15]

[18.401]

            continue;
        }

Replacement in crawl-ref/source/xom.cc at line 773 [8.3]

B:BD[18.402] → [16.633:670]

            potion_effect(pot, 150);

[18.402]

[17.10]

        if (monster->add_ench(mon_enchant(ENCH_CONFUSION, 0,
                                          KC_FRIENDLY, random2(sever))))
        {
            if (!rc)
                god_speaks(GOD_XOM, _get_xom_speech("confusion").c_str());

Replacement in crawl-ref/source/xom.cc at line 779 [8.3]

B:BD[17.11] → [16.671:696]

            done = true;

[17.11]

[16.696]

            simple_monster_message(monster, " looks rather confused.");
            rc = true;

Replacement in crawl-ref/source/xom.cc at line 783 [8.3]
B:BD[8.13306] → [21.38:76]
∅:D[21.76] → [8.13340:13346]
B:BD[8.13340] → [8.13340:13346]
B:BD[8.13346] → [22.1248:1297]
```
    else if (x_chance_in_y(3, sever))
    {
        _xom_makes_you_cast_random_spell(sever);
```
[8.13306]
[17.12]
```
    return (rc);
}
```
Deletion in crawl-ref/source/xom.cc at line 786 [8.3]
∅:D[17.13] → [8.13394:13421]
B:BD[8.13394] → [8.13394:13421]
B:BD[8.13421] → [21.77:115]
∅:D[21.115] → [8.13455:13461]
B:BD[8.13455] → [8.13455:13461]
B:BD[8.13461] → [23.1959:1986]
B:BD[23.1986] → [24.37:89]
∅:D[24.89] → [23.2038:2080]
B:BD[23.2038] → [23.2038:2080]
```
        done = true;
    }
    else if (x_chance_in_y(4, sever))
    {
        monsters *monster;
        for (unsigned i = 0; i < MAX_MONSTERS; ++i)
        {
            monster = &menv[i];
```

Replacement in crawl-ref/source/xom.cc at line 787 [8.3]

B:BD[23.2081] → [4.4:220]

∅:D[4.220] → [23.2191:2217]

B:BD[23.2191] → [23.2191:2217]

B:BD[23.2217] → [4.221:235]

            if (monster->type == -1 || !mons_near(monster)
                || mons_wont_attack(monster)
                || !mons_class_is_confusable(monster->type)
                || one_chance_in(20))
            {
                continue;
            }

[23.2081]

[24.90]

static bool _xom_send_allies(int sever)
{
    bool rc = false;
    const int numdemons =
        std::min(random2(random2(random2(sever+1)+1)+1)+2, 16);
    int numdifferent = 0;

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

∅:D[24.91] → [23.2234:2450]

B:BD[23.2234] → [23.2234:2450]

            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());

[24.91]

[4.236]

    // If we have a mix of demons and non-demons, there's a chance
    // that one or both of the factions may be hostile.
    int hostiletype = random_choose_weighted(3, 0,  // both friendly
                                             4, 1,  // one hostile
                                             4, 2,  // other hostile
                                             1, 3,  // both hostile
                                             0);

Replacement in crawl-ref/source/xom.cc at line 802 [8.3]

B:BD[4.237] → [4.237:313]

∅:D[4.313] → [23.2450:2479]

B:BD[23.2450] → [23.2450:2479]

B:BD[23.2614] → [23.2614:2644]

B:BD[23.2644] → [15.956:1016]

∅:D[15.1016] → [9.213:266]

B:BD[9.213] → [9.213:266]

∅:D[9.266] → [23.2682:2688]

B:BD[23.2682] → [23.2682:2688]

B:BD[23.2688] → [25.4:61]

∅:D[25.61] → [26.5:103]

∅:D[27.462] → [26.5:103]

B:BD[8.13461] → [26.5:103]

∅:D[28.5] → [29.1726:1756]

∅:D[26.103] → [29.1726:1756]

B:BD[30.1080] → [29.1726:1756]

                simple_monster_message(monster, " looks rather confused.");
                done = true;
            }
        }
    }
    // It's pointless to send in help if there's no danger.
    else if (tension > 0 && x_chance_in_y(5, sever))
    {
        // FIXME: Can we clean up this ugliness, please?
        const int numdemons =
            std::min(random2(random2(random2(sever+1)+1)+1)+2, 16);
        int numdifferent = 0;

[4.237]

[28.6]

    std::vector<bool> is_demonic(numdemons, false);
    std::vector<int> summons(numdemons);

Replacement in crawl-ref/source/xom.cc at line 805 [8.3]

B:BD[28.7] → [31.4:135]

B:BD[31.135] → [25.62:279]

B:BD[25.279] → [5.4:129]

        // If we have a mix of demons and non-demons, there's a chance
        // that one or both of the factions may be hostile.
        int hostiletype = random_choose_weighted(3, 0,  // both friendly
                                                 4, 1,  // one hostile
                                                 4, 2,  // other hostile
                                                 1, 3,  // both hostile
                                                 0);

[28.7]

[31.423]

    int num_actually_summoned = 0;

Replacement in crawl-ref/source/xom.cc at line 807 [8.3]

B:BD[31.424] → [25.352:446]

        std::vector<bool> is_demonic(numdemons);
        std::vector<int> summons(numdemons);

[31.424]

[28.116]

    for (int i = 0; i < numdemons; ++i)
    {
        monster_type monster = _xom_random_demon(sever);

Replacement in crawl-ref/source/xom.cc at line 811 [8.3]

B:BD[28.117] → [31.469:499]

        bool success = false;

[28.117]

[31.499]

        summons[i] =
            create_monster(
                mgen_data(monster, BEH_FRIENDLY,
                          3, MON_SUMM_AID,
                          you.pos(), you.pet_target,
                          MG_FORCE_BEH, GOD_XOM));

Replacement in crawl-ref/source/xom.cc at line 818 [8.3]
∅:D[31.500] → [28.117:161]
B:BD[28.117] → [28.117:161]
```
        for (int i = 0; i < numdemons; ++i)
```
[31.500]
[28.161]
```
        if (summons[i] != -1)
```
Replacement in crawl-ref/source/xom.cc at line 820 [8.3]
B:BD[28.171] → [31.501:562]
∅:D[31.562] → [28.298:299]
B:BD[28.298] → [28.298:299]
```
            monster_type monster = _xom_random_demon(sever);
```
[28.171]
[31.563]
```
            num_actually_summoned++;
```
Insertion in crawl-ref/source/xom.cc at line 827 [8.3]
[28.527]
[32.5]
```
        }
    }
```

Replacement in crawl-ref/source/xom.cc at line 830 [8.3]

B:BD[32.6] → [31.681:738]

B:BD[31.738] → [3.4:198]

            summons[i] =
                create_monster(
                    mgen_data(monster, BEH_FRIENDLY,
                        3, MON_SUMM_AID,
                        you.pos(), you.pet_target,
                        MG_FORCE_BEH, GOD_XOM));

[32.6]

[28.846]

    if (num_actually_summoned)
    {
        const bool only_holy = (numdifferent == num_actually_summoned);
        const bool only_demonic = (numdifferent == 0);

Replacement in crawl-ref/source/xom.cc at line 835 [8.3]

B:BD[28.847] → [31.871:937]

            if (summons[i] != -1)
                success = true;

[28.847]

[31.937]

        if (only_holy)
        {
            god_speaks(GOD_XOM,
                       _get_xom_speech("multiple holy summons").c_str());
        }
        else if (only_demonic)
        {
            god_speaks(GOD_XOM,
                       _get_xom_speech("multiple summons").c_str());
        }
        else
        {
            god_speaks(GOD_XOM,
                       _get_xom_speech("multiple mixed summons").c_str());

Replacement in crawl-ref/source/xom.cc at line 851 [8.3]

B:BD[33.5] → [31.948:969]

        if (success)

[33.5]

[34.187]

        // If we have only non-demons, there's a chance that they
        // may be hostile.
        if (only_holy && one_chance_in(4))
            hostiletype = 2;
        // If we have only demons, they'll always be friendly.
        else if (only_demonic)
            hostiletype = 0;
        for (int i = 0; i < numdemons; ++i)

Replacement in crawl-ref/source/xom.cc at line 861 [8.3]

B:BD[34.197] → [31.970:1013]

B:BD[31.1013] → [19.733:820]

∅:D[19.820] → [31.1092:1131]

B:BD[31.1092] → [31.1092:1131]

B:BD[31.1131] → [19.821:909]

∅:D[19.909] → [31.1211:1228]

B:BD[31.1211] → [31.1211:1228]

B:BD[31.1228] → [19.910:992]

            if (numdifferent == numdemons)
                god_speaks(GOD_XOM, _get_xom_speech("multiple holy summons").c_str());
            else if (numdifferent > 0)
                god_speaks(GOD_XOM, _get_xom_speech("multiple mixed summons").c_str());
            else
                god_speaks(GOD_XOM, _get_xom_speech("multiple summons").c_str());

[34.197]

[34.347]

            if (summons[i] == -1)
                continue;

Replacement in crawl-ref/source/xom.cc at line 864 [8.3]

B:BD[34.348] → [2.4:341]

            // If we have only non-demons, there's a chance that they
            // may be hostile.
            if (numdifferent == numdemons && one_chance_in(4))
                hostiletype = 2;
            // If we have only demons, they'll always be friendly.
            else if (numdifferent == 0)
                hostiletype = 0;

[34.348]

[29.1756]

            monsters *mon = &menv[summons[i]];

Replacement in crawl-ref/source/xom.cc at line 866 [8.3]
B:BD[29.1757] → [31.1711:1759]
```
            for (int i = 0; i < numdemons; ++i)
```
[29.1757]
[28.1016]
```
            if (hostiletype != 0)
```

Replacement in crawl-ref/source/xom.cc at line 868 [8.3]

B:BD[28.1030] → [25.447:498]

∅:D[25.498] → [35.149:150]

∅:D[31.1802] → [35.149:150]

B:BD[35.149] → [35.149:150]

B:BD[35.150] → [34.349:387]

                monsters *mon = &menv[summons[i]];
                if (hostiletype != 0)

[28.1030]

[35.359]

                // Mark factions hostile as appropriate.
                if (hostiletype == 3
                    || (is_demonic[i] && hostiletype == 1)
                    || (!is_demonic[i] && hostiletype == 2))

Replacement in crawl-ref/source/xom.cc at line 873 [8.3]

B:BD[35.504] → [35.504:606]

B:BD[35.606] → [28.1139:1267]

∅:D[28.1267] → [35.728:890]

B:BD[35.728] → [35.728:890]

                    // Mark factions hostile as appropriate.
                    if (hostiletype == 3
                        || (is_demonic[i] && hostiletype == 1)
                        || (!is_demonic[i] && hostiletype == 2))
                    {
                        mon->attitude = ATT_HOSTILE;
                        behaviour_event(mon, ME_ALERT, MHITYOU);
                    }

[35.377]

[35.890]

                    mon->attitude = ATT_HOSTILE;
                    behaviour_event(mon, ME_ALERT, MHITYOU);

Deletion in crawl-ref/source/xom.cc at line 876 [8.3]
B:BD[35.908] → [31.1803:1848]
```
                player_angers_monster(mon);
```
Replacement in crawl-ref/source/xom.cc at line 878 [8.3]
B:BD[31.1850] → [31.1850:1875]
```
            done = true;
```
[31.1850]
[28.1282]
```
            player_angers_monster(mon);
```

Insertion in crawl-ref/source/xom.cc at line 880 [8.3]

[28.1292]

[8.14586]


        rc = true;
    }
    return (rc);
}
// The nicer stuff.  Note: these things are not necessarily nice.
static bool _xom_is_good(int sever, int tension)
{
    bool done = false;
    // Did Xom (already) kill the player?
    if (_player_is_dead())
        return (true);
    god_acting gdact(GOD_XOM);
    // This series of random calls produces a poisson-looking
    // distribution: initial hump, plus a long-ish tail.
    // Don't make the player berserk if there's no danger.
    if (tension > 0 && x_chance_in_y(2, sever))
    {
        done = _xom_do_potion();
    }
    else if (x_chance_in_y(3, sever))
    {
        _xom_makes_you_cast_random_spell(sever);
        done = true;
    }
    else if (x_chance_in_y(4, sever))
    {
        done = _xom_confuse_monsters(sever);
    }
    // It's pointless to send in help if there's no danger.
    else if (tension > 0 && x_chance_in_y(5, sever))
    {
        done = _xom_send_allies(sever);