fiddlerwoaroof/crawl - Change PUY2VWZJ3G7HNCLIHZP5VGT2DAGHI436ETDJQTPEBFPRSEHOM2NQC

Code cleanup for Xom. Also fixes a few bugs.

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

Created by haranp on January 15, 2009

PUY2VWZJ3G7HNCLIHZP5VGT2DAGHI436ETDJQTPEBFPRSEHOM2NQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 776 [6.3]
[5.1229]
[5.1229]
```
            // Only give this message once.
```

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

[5.4075]

[7.1282]

        }
        rc = true;
    }
    return (rc);
}
static bool _xom_send_one_ally(int sever)
{
    bool rc = false;
        
    const monster_type mon = _xom_random_demon(sever);
    const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);
    // If we have a non-demon, Xom got it someplace else, so use
    // different messages below.
    bool different = !is_demonic;
    beh_type beha = BEH_FRIENDLY;
    unsigned short hitting = you.pet_target;
    // There's a chance that a non-demon may be hostile.
    if (different && one_chance_in(4))
    {
        beha = BEH_HOSTILE;
        hitting = MHITYOU;
    }
    const int summons =
        create_monster(
            mgen_data(mon, beha,
                      6, MON_SUMM_AID,
                      you.pos(), hitting,
                      MG_FORCE_BEH, GOD_XOM));
    if (summons != -1)
    {
        if (different)
            god_speaks(GOD_XOM, _get_xom_speech("single holy summon").c_str());
        else
            god_speaks(GOD_XOM, _get_xom_speech("single summon").c_str());
        player_angers_monster(&menv[summons]);
        rc = true;
    }
    return (rc);
}
static bool _xom_good_polymorph_nearby_monster()
{
    bool rc = false;
    if (there_are_monsters_nearby(false, false))
    {
        monsters *mon = choose_random_nearby_monster(0,
                                                     _choose_mutatable_monster);
        if (mon)
        {
            god_speaks(GOD_XOM,
                       _get_xom_speech("good monster polymorph").c_str());
            bool made_shifter = false;
            if (one_chance_in(8) && !mons_is_shapeshifter(mon))
            {
                mon->add_ench(one_chance_in(3) ? ENCH_GLOWING_SHAPESHIFTER
                                               : ENCH_SHAPESHIFTER);
                made_shifter = true;
            }
            monster_polymorph(mon, RANDOM_MONSTER,
                              mons_wont_attack(mon) ? PPT_MORE : PPT_LESS,
                              made_shifter);
            rc = true;
        }
    }
    return (rc);
}
// Blink every monster on this level and the player.
static bool _xom_rearrange_pieces(int sever)
{
    bool rc = false;
    // Every now and then, Xom also confuses them all.
    const bool confusem = one_chance_in(10);
    // Not just every monster in sight - oh no.  Every monster on
    // this level!
    for (unsigned i = 0; i < MAX_MONSTERS; ++i)
    {
        monsters* monster = &menv[i];
        if (!monster->alive())
            continue;
        if (monster_blink(monster))
        {
            // Only give a message once.
            if (!rc)
                god_speaks(GOD_XOM,
                           _get_xom_speech("rearrange the pieces").c_str());
            if (confusem)
            {
                if (mons_class_is_confusable(monster->type)
                    && monster->add_ench(mon_enchant(ENCH_CONFUSION, 0,
                                                     KC_FRIENDLY,
                                                     random2(sever))))
                {
                    simple_monster_message(monster, " looks rather confused.");
                }
            }
            rc = true;

Insertion in crawl-ref/source/xom.cc at line 996 [6.3]
[7.1292]
[5.4076]
```
    }
```

Insertion in crawl-ref/source/xom.cc at line 998 [6.3]

[5.4077]

    // If Xom blinked at least one monster, blink the player,
    // too, and then consider this act done.
    if (rc)
        random_blink(false);
    return (rc);
}
static bool _xom_give_good_mutation()
{
    bool rc = false;
    if (you.can_safely_mutate()
        && player_mutation_level(MUT_MUTATION_RESISTANCE) < 3)
    {
        god_speaks(GOD_XOM, _get_xom_speech("good mutations").c_str());
        mpr("Your body is suffused with distortional energy.");
        set_hp(1 + random2(you.hp), false);
        deflate_hp(you.hp_max / 2, true);
        bool failMsg = true;
        for (int i = random2(4); i >= 0; --i)
        {
            if (mutate(RANDOM_GOOD_MUTATION, failMsg, false, true, false,
                       false, true))
            {
                rc = true;
            }
            else
                failMsg = false;
        }
    }
    return (rc);
}
static bool _xom_send_major_ally(int sever)
{
    bool rc = false;
    const monster_type mon = _xom_random_demon(sever);
    const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);
    beh_type beha = BEH_FRIENDLY;
    unsigned short hitting = you.pet_target;
    // There's a chance that a non-demon may be hostile.
    if (!is_demonic && one_chance_in(4))
    {
        beha = BEH_HOSTILE;
        hitting = MHITYOU;
    }
    const int summons =
        create_monster(
            mgen_data(_xom_random_demon(sever, one_chance_in(8)), beha,
                      0, 0, you.pos(), hitting,
                      MG_FORCE_BEH, GOD_XOM));
    if (summons != -1)
    {
        if (is_demonic)
        {
            god_speaks(GOD_XOM,
                       _get_xom_speech("single major demon summon").c_str());
        }
        else
        {
            god_speaks(GOD_XOM,
                       _get_xom_speech("single major holy summon").c_str());
        }
        player_angers_monster(&menv[summons]);

Insertion in crawl-ref/source/xom.cc at line 1074 [6.3]
[5.4102]
[5.4102]

Insertion in crawl-ref/source/xom.cc at line 1077 [6.3]

[5.4121]


static bool _xom_throw_divine_lightning()
{
    if (!player_in_a_dangerous_place())
        return (false);
    if (you.hp <= random2(201))
        you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION] = 1;
    god_speaks(GOD_XOM, "The area is suffused with divine lightning!");
    bolt beam;
    beam.beam_source  = NON_MONSTER;
    beam.type         = dchar_glyph(DCHAR_FIRED_BURST);
    beam.damage       = dice_def(3, 30);
    beam.flavour      = BEAM_ELECTRICITY;
    beam.target       = you.pos();
    beam.name         = "blast of lightning";
    beam.colour       = LIGHTCYAN;
    beam.thrower      = KILL_MISC;
    beam.aux_source   = "Xom's lightning strike";
    beam.ex_size      = 2;
    beam.is_tracer    = false;
    beam.is_explosion = true;
    beam.explode();
    if (you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION])
    {
        mpr("Your divine protection wanes.");
        you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION] = 0;
    }

Insertion in crawl-ref/source/xom.cc at line 1109 [6.3]

[5.4122]

    // Don't accidentally kill the player when doing a good act.
    if (you.escaped_death_cause == KILLED_BY_WILD_MAGIC
        && you.escaped_death_aux == "Xom's lightning strike")
    {
        you.hp = 1;
        you.reset_escaped_death();
    }
    return true;
}

Deletion in crawl-ref/source/xom.cc at line 1136 [6.3]
B:BD[5.4615] → [5.4615:4621]
```
    {
```
Deletion in crawl-ref/source/xom.cc at line 1137 [6.3]
B:BD[5.4654] → [5.4654:4660]
```
    }
```
Deletion in crawl-ref/source/xom.cc at line 1148 [6.3]
B:BD[5.4988] → [5.4988:4994]
```
    {
```
Deletion in crawl-ref/source/xom.cc at line 1149 [6.3]
∅:D[8.563] → [6.14586:14592]
∅:D[9.606] → [6.14586:14592]
∅:D[10.719] → [6.14586:14592]
∅:D[7.1438] → [6.14586:14592]
∅:D[11.1902] → [6.14586:14592]
∅:D[5.5034] → [6.14586:14592]
B:BD[6.14586] → [6.14586:14592]
```
    }
```
Deletion in crawl-ref/source/xom.cc at line 1152 [6.3]
∅:D[12.76] → [13.16:17]
B:BD[14.1427] → [13.16:17]
Replacement in crawl-ref/source/xom.cc at line 1156 [6.3]
∅:D[15.38] → [14.1488:1494]
∅:D[4.117] → [14.1488:1494]
∅:D[16.193] → [14.1488:1494]
∅:D[17.2766] → [14.1488:1494]
B:BD[14.1488] → [14.1488:1494]
B:BD[14.1494] → [18.1500:1553]
∅:D[18.1553] → [19.440:514]
B:BD[20.2540] → [19.440:514]
∅:D[19.514] → [20.2540:2541]
B:BD[20.2540] → [20.2540:2541]
B:BD[20.2541] → [7.1439:1508]
B:BD[7.1508] → [21.4:41]
∅:D[21.41] → [7.1509:1547]
∅:D[22.71] → [7.1509:1547]
B:BD[19.552] → [7.1509:1547]
B:BD[7.1723] → [7.1723:1724]
∅:D[7.1724] → [23.129:167]
B:BD[24.267] → [23.129:167]
∅:D[23.167] → [25.4:53]
B:BD[26.116] → [25.4:53]
∅:D[27.42] → [26.154:155]
∅:D[28.51] → [26.154:155]
∅:D[25.53] → [26.154:155]
B:BD[26.154] → [26.154:155]
B:BD[26.155] → [7.1725:1829]
∅:D[7.1829] → [26.193:276]
B:BD[26.193] → [26.193:276]
B:BD[26.276] → [21.42:43]
B:BD[21.43] → [29.4:60]
B:BD[29.60] → [30.199:358]
∅:D[29.165] → [24.397:398]
∅:D[21.206] → [24.397:398]
∅:D[26.276] → [24.397:398]
∅:D[30.358] → [24.397:398]
B:BD[24.397] → [24.397:398]
B:BD[24.398] → [21.207:234]
∅:D[31.118] → [6.15329:15339]
∅:D[32.142] → [6.15329:15339]
∅:D[33.144] → [6.15329:15339]
∅:D[21.234] → [6.15329:15339]
∅:D[34.234] → [6.15329:15339]
∅:D[23.235] → [6.15329:15339]
∅:D[35.275] → [6.15329:15339]
∅:D[36.287] → [6.15329:15339]
∅:D[26.385] → [6.15329:15339]
∅:D[37.1413] → [6.15329:15339]
∅:D[7.1925] → [6.15329:15339]
∅:D[20.2850] → [6.15329:15339]
B:BD[6.15329] → [6.15329:15339]
B:BD[6.15339] → [21.235:262]
B:BD[21.262] → [38.1069:1153]
∅:D[38.1153] → [21.338:355]
B:BD[21.338] → [21.338:355]
B:BD[21.355] → [38.1154:1233]
∅:D[38.1233] → [21.426:478]
B:BD[21.426] → [21.426:478]
∅:D[21.478] → [36.288:289]
∅:D[7.1981] → [36.288:289]
B:BD[39.1363] → [36.288:289]
B:BD[36.289] → [21.479:514]
∅:D[21.514] → [6.15718:15724]
∅:D[7.2003] → [6.15718:15724]
B:BD[6.15718] → [6.15718:15724]
```
    {
        monster_type mon = _xom_random_demon(sever);
        const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);
        // If we have a non-demon, Xom got it someplace else, so use
        // different messages below.
        bool different = !is_demonic;
        beh_type beha = BEH_FRIENDLY;
        unsigned short hitting = you.pet_target;
        // There's a chance that a non-demon may be hostile.
        if (different && one_chance_in(4))
        {
            beha = BEH_HOSTILE;
            hitting = MHITYOU;
        }
        const int summons =
            create_monster(
                mgen_data(mon, beha,
                    6, MON_SUMM_AID,
                    you.pos(), hitting,
                    MG_FORCE_BEH, GOD_XOM));
        if (summons != -1)
        {
            if (different)
                god_speaks(GOD_XOM, _get_xom_speech("single holy summon").c_str());
            else
                god_speaks(GOD_XOM, _get_xom_speech("single summon").c_str());
            player_angers_monster(&menv[summons]);
            done = true;
        }
    }
```
[4.117]
[17.2767]
```
        done = _xom_send_one_ally(sever);
```
Replacement in crawl-ref/source/xom.cc at line 1158 [6.3]
∅:D[15.73] → [6.15791:15797]
∅:D[16.232] → [6.15791:15797]
∅:D[14.1761] → [6.15791:15797]
∅:D[17.2805] → [6.15791:15797]
B:BD[6.15791] → [6.15791:15797]
B:BD[6.15797] → [40.4:57]
∅:D[40.57] → [41.45:159]
B:BD[41.45] → [41.45:159]
∅:D[41.159] → [14.1833:1834]
B:BD[14.1833] → [14.1833:1834]
B:BD[14.1834] → [41.160:195]
B:BD[41.195] → [40.58:173]
B:BD[40.173] → [2.4:48]
∅:D[2.48] → [42.320:321]
∅:D[43.99] → [42.320:321]
∅:D[40.173] → [42.320:321]
∅:D[41.275] → [42.320:321]
∅:D[38.1322] → [42.320:321]
∅:D[18.1626] → [42.320:321]
B:BD[42.320] → [42.320:321]
B:BD[24.462] → [44.4:72]
∅:D[44.72] → [41.558:576]
∅:D[45.118] → [41.558:576]
B:BD[41.558] → [41.558:576]
B:BD[41.576] → [45.119:244]
B:BD[45.244] → [2.49:90]
∅:D[46.53] → [41.728:746]
∅:D[2.90] → [41.728:746]
∅:D[45.244] → [41.728:746]
B:BD[41.728] → [41.728:746]
B:BD[41.746] → [47.77:78]
B:BD[47.78] → [48.4:59]
B:BD[48.59] → [2.91:171]
∅:D[49.70] → [50.4:5]
∅:D[51.76] → [50.4:5]
∅:D[47.122] → [50.4:5]
∅:D[48.131] → [50.4:5]
∅:D[2.171] → [50.4:5]
∅:D[41.746] → [50.4:5]
B:BD[6.16506] → [50.4:5]
B:BD[50.5] → [41.747:776]
∅:D[52.148] → [50.186:200]
∅:D[53.150] → [50.186:200]
∅:D[41.776] → [50.186:200]
B:BD[50.186] → [50.186:200]
B:BD[6.16531] → [6.16531:16547]
```
    {
        if (there_are_monsters_nearby(false, false))
        {
            monsters *mon =
                choose_random_nearby_monster(0, _choose_mutatable_monster);
            if (mon)
            {
                god_speaks(GOD_XOM,
                           _get_xom_speech("good monster polymorph").c_str());
                bool made_shifter = false;
                if (one_chance_in(8) && !mons_is_shapeshifter(mon))
                {
                    mon->add_ench(one_chance_in(3) ?
                        ENCH_GLOWING_SHAPESHIFTER : ENCH_SHAPESHIFTER);
                    made_shifter = true;
                }
                monster_polymorph(mon, RANDOM_MONSTER,
                    mons_wont_attack(mon) ? PPT_MORE : PPT_LESS, made_shifter);
                done = true;
            }
        }
    }
```
[17.2805]
[17.3190]
```
        done = _xom_good_polymorph_nearby_monster();
```
Deletion in crawl-ref/source/xom.cc at line 1162 [6.3]
B:BD[12.109] → [54.4:5]

Replacement in crawl-ref/source/xom.cc at line 1165 [6.3]

B:BD[17.3303] → [17.3303:3309]

B:BD[17.3309] → [55.1017:1112]

∅:D[55.1112] → [17.3393:3453]

B:BD[17.3393] → [17.3393:3453]

B:BD[17.3453] → [3.4:53]

∅:D[3.53] → [55.1113:1207]

B:BD[17.3496] → [55.1113:1207]

B:BD[17.3608] → [56.410:462]

∅:D[56.462] → [17.3660:3670]

B:BD[17.3660] → [17.3660:3670]

B:BD[17.3670] → [3.54:96]

∅:D[3.96] → [56.463:464]

B:BD[17.3702] → [56.463:464]

B:BD[56.464] → [3.97:132]

∅:D[3.132] → [17.3756:3954]

B:BD[17.3756] → [17.3756:3954]

B:BD[17.3954] → [55.1208:1209]

∅:D[55.1211] → [17.3983:4013]

B:BD[17.3983] → [17.3983:4013]

B:BD[17.4013] → [55.1212:1230]

B:BD[55.1230] → [57.314:530]

∅:D[57.530] → [55.1231:1253]

B:BD[17.4117] → [55.1231:1253]

B:BD[55.1253] → [57.531:643]

∅:D[57.643] → [55.1315:1355]

B:BD[17.4268] → [55.1315:1355]

B:BD[55.1355] → [57.644:673]

∅:D[57.673] → [17.4268:4282]

∅:D[55.1355] → [17.4268:4282]

B:BD[17.4268] → [17.4268:4282]

B:BD[17.4282] → [55.1356:1479]

∅:D[55.1479] → [17.4389:4464]

B:BD[17.4389] → [17.4389:4464]

    {
        // Rearrange the pieces - blink every monster on this level and
        // the player.
        // Every now and then, Xom also confuses them all.
        const bool confusem = one_chance_in(10);
        // Not just every monster in sight - oh no.  Every monster on
        // this level!
        for (unsigned i = 0; i < MAX_MONSTERS; ++i)
        {
            monsters* monster = &menv[i];
            if (!monster->alive())
                continue;
            if (monster_blink(monster))
            {
                if (!done)
                    god_speaks(GOD_XOM, _get_xom_speech("rearrange the pieces").c_str());
                if (confusem)
                {
                    if (mons_class_is_confusable(monster->type)
                        && monster->add_ench(mon_enchant(ENCH_CONFUSION, 0,
                                             KC_FRIENDLY, random2(sever))))
                    {
                        simple_monster_message(monster,
                            " looks rather confused.");
                    }
                }
                done = true;
            }
            // If he blinked at least one monster, blink the player,
            // too, and then consider this act done.
            if (done)
                random_blink(false);
        }
    }

[17.3303]

[17.4464]

        done = _xom_rearrange_pieces(sever);

Deletion in crawl-ref/source/xom.cc at line 1180 [6.3]
B:BD[56.723] → [55.1480:1481]
Deletion in crawl-ref/source/xom.cc at line 1188 [6.3]
B:BD[15.348] → [15.348:349]

Replacement in crawl-ref/source/xom.cc at line 1193 [6.3]

B:BD[6.16703] → [54.6:109]

∅:D[54.109] → [58.109:119]

B:BD[58.109] → [58.109:119]

B:BD[58.119] → [38.1323:1399]

∅:D[58.130] → [14.2271:2272]

∅:D[59.130] → [14.2271:2272]

∅:D[54.178] → [14.2271:2272]

∅:D[38.1399] → [14.2271:2272]

B:BD[14.2271] → [14.2271:2272]

B:BD[14.2272] → [54.179:247]

∅:D[54.247] → [60.176:177]

B:BD[6.17133] → [60.176:177]

B:BD[60.177] → [54.248:376]

∅:D[54.376] → [60.178:179]

B:BD[6.17236] → [60.178:179]

B:BD[60.179] → [54.377:441]

B:BD[54.441] → [61.4:141]

∅:D[61.141] → [54.513:546]

B:BD[54.513] → [54.513:546]

B:BD[54.546] → [61.142:160]

∅:D[61.160] → [54.546:618]

B:BD[54.546] → [54.546:618]

∅:D[54.618] → [6.17501:17511]

B:BD[6.17501] → [6.17501:17511]

        if (you.can_safely_mutate()
            && player_mutation_level(MUT_MUTATION_RESISTANCE) < 3)
        {
            god_speaks(GOD_XOM, _get_xom_speech("good mutations").c_str());
            mpr("Your body is suffused with distortional energy.");
            set_hp(1 + random2(you.hp), false);
            deflate_hp(you.hp_max / 2, true);
            bool failMsg = true;
            for (int i = random2(4); i >= 0; --i)
            {
                if (mutate(RANDOM_GOOD_MUTATION, failMsg, false, true, false,
                           false, true))
                {
                    done = true;
                }
                else
                    failMsg = false;
            }
        }

[6.16703]

[6.17511]

        done = _xom_give_good_mutation();

Replacement in crawl-ref/source/xom.cc at line 1197 [6.3]
∅:D[62.376] → [6.17551:17557]
∅:D[16.390] → [6.17551:17557]
∅:D[14.2626] → [6.17551:17557]
∅:D[17.5203] → [6.17551:17557]
B:BD[6.17551] → [6.17551:17557]
B:BD[6.17557] → [18.1627:1680]
∅:D[18.1680] → [19.577:651]
B:BD[63.872] → [19.577:651]
∅:D[19.651] → [63.872:873]
B:BD[63.872] → [63.872:873]
B:BD[63.873] → [7.2004:2073]
B:BD[7.2073] → [21.515:552]
∅:D[22.103] → [7.2074:2113]
∅:D[21.552] → [7.2074:2113]
B:BD[63.979] → [7.2074:2113]
B:BD[24.725] → [23.236:274]
∅:D[23.274] → [25.54:103]
B:BD[26.424] → [25.54:103]
∅:D[27.81] → [26.462:463]
∅:D[28.99] → [26.462:463]
∅:D[25.103] → [26.462:463]
B:BD[26.462] → [26.462:463]
B:BD[26.463] → [7.2301:2405]
∅:D[7.2405] → [26.501:584]
B:BD[26.501] → [26.501:584]
∅:D[26.584] → [24.855:856]
B:BD[24.855] → [24.855:856]
B:BD[24.856] → [29.166:222]
B:BD[29.222] → [30.359:526]
∅:D[29.366] → [21.785:813]
∅:D[30.526] → [21.785:813]
B:BD[21.785] → [21.785:813]
∅:D[64.73] → [6.18034:18044]
∅:D[65.129] → [6.18034:18044]
∅:D[31.173] → [6.18034:18044]
∅:D[32.209] → [6.18034:18044]
∅:D[33.212] → [6.18034:18044]
∅:D[34.355] → [6.18034:18044]
∅:D[35.442] → [6.18034:18044]
∅:D[23.446] → [6.18034:18044]
∅:D[36.491] → [6.18034:18044]
∅:D[26.731] → [6.18034:18044]
∅:D[21.813] → [6.18034:18044]
∅:D[24.985] → [6.18034:18044]
∅:D[7.2501] → [6.18034:18044]
B:BD[6.18034] → [6.18034:18044]
B:BD[6.18044] → [21.814:841]
B:BD[21.841] → [38.1400:1490]
∅:D[38.1490] → [21.923:940]
B:BD[21.923] → [21.923:940]
B:BD[21.940] → [38.1491:1582]
∅:D[38.1582] → [21.1023:1075]
B:BD[21.1023] → [21.1023:1075]
∅:D[21.1075] → [63.1249:1250]
∅:D[39.1674] → [63.1249:1250]
∅:D[7.2557] → [63.1249:1250]
B:BD[63.1249] → [63.1249:1250]
B:BD[63.1250] → [21.1076:1111]
∅:D[21.1111] → [6.18348:18354]
∅:D[7.2579] → [6.18348:18354]
B:BD[6.18348] → [6.18348:18354]
```
    {
        monster_type mon = _xom_random_demon(sever);
        const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);
        // If we have a non-demon, Xom got it someplace else, so use
        // different messages below.
        bool different = !is_demonic;
        beh_type beha = BEH_FRIENDLY;
        unsigned short hitting = you.pet_target;
        // There's a chance that a non-demon may be hostile.
        if (different && one_chance_in(4))
        {
            beha = BEH_HOSTILE;
            hitting = MHITYOU;
        }
        const int summons =
            create_monster(
                mgen_data(_xom_random_demon(sever, one_chance_in(8)), beha,
                    0, 0, you.pos(), hitting,
                    MG_FORCE_BEH, GOD_XOM));
        if (summons != -1)
        {
            if (different)
                god_speaks(GOD_XOM, _get_xom_speech("single major holy summon").c_str());
            else
                god_speaks(GOD_XOM, _get_xom_speech("single major demon summon").c_str());
            player_angers_monster(&menv[summons]);
            done = true;
        }
    }
```
[62.376]
[17.5204]
```
        done = _xom_send_major_ally(sever);
```

Replacement in crawl-ref/source/xom.cc at line 1199 [6.3]

∅:D[16.430] → [6.18424:18430]

∅:D[14.2904] → [6.18424:18430]

∅:D[17.5243] → [6.18424:18430]

B:BD[6.18424] → [6.18424:18430]

B:BD[6.18430] → [66.4:166]

∅:D[67.203] → [66.166:247]

B:BD[66.166] → [66.166:247]

∅:D[66.247] → [37.1522:1523]

B:BD[6.18642] → [37.1522:1523]

B:BD[37.1523] → [66.248:479]

B:BD[66.479] → [68.4:47]

∅:D[68.47] → [66.565:875]

B:BD[66.565] → [66.565:875]

B:BD[66.875] → [69.4:32]

∅:D[69.32] → [60.251:252]

∅:D[70.80] → [60.251:252]

∅:D[66.904] → [60.251:252]

B:BD[6.18786] → [60.251:252]

B:BD[60.252] → [66.905:1121]

B:BD[66.1121] → [61.161:162]

B:BD[61.162] → [71.421:727]

    {
        if (player_in_a_dangerous_place())
        {
            if (you.hp <= random2(201))
                you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION] = 1;
            god_speaks(GOD_XOM, "The area is suffused with divine lightning!");
            bolt beam;
            beam.beam_source  = NON_MONSTER;
            beam.type         = dchar_glyph(DCHAR_FIRED_BURST);
            beam.damage       = dice_def(3, 30);
            beam.flavour      = BEAM_ELECTRICITY;
            beam.target       = you.pos();
            beam.name         = "blast of lightning";
            beam.colour       = LIGHTCYAN;
            beam.thrower      = KILL_MISC;
            beam.aux_source   = "Xom's lightning strike";
            beam.ex_size      = 2;
            beam.is_tracer    = false;
            beam.is_explosion = true;
            beam.explode();
            if (you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION])
            {
                mpr("Your divine protection wanes.");
                you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION] = 0;
            }
            // Don't accidentally kill the player when doing a good act.
            if (you.escaped_death_cause == KILLED_BY_WILD_MAGIC
                && you.escaped_death_aux == "Xom's lightning strike")
            {
                you.hp = 1;
                you.reset_escaped_death();
            }

[17.5243]

[60.253]

        done = _xom_throw_divine_lightning();

Deletion in crawl-ref/source/xom.cc at line 1201 [6.3]
B:BD[60.254] → [66.1122:1147]
∅:D[66.1147] → [6.19473:19483]
B:BD[6.19473] → [6.19473:19483]
B:BD[6.19521] → [6.19521:19528]
```
            done = true;
        }
    }
```

Code cleanup for Xom. Also fixes a few bugs.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/xom.cc at line 776 [6.3]

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

Insertion in crawl-ref/source/xom.cc at line 996 [6.3]

Insertion in crawl-ref/source/xom.cc at line 998 [6.3]

Insertion in crawl-ref/source/xom.cc at line 1074 [6.3]

Insertion in crawl-ref/source/xom.cc at line 1077 [6.3]

Insertion in crawl-ref/source/xom.cc at line 1109 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1136 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1137 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1148 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1149 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1152 [6.3]

Replacement in crawl-ref/source/xom.cc at line 1156 [6.3]

Replacement in crawl-ref/source/xom.cc at line 1158 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1162 [6.3]

Replacement in crawl-ref/source/xom.cc at line 1165 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1180 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1188 [6.3]

Replacement in crawl-ref/source/xom.cc at line 1193 [6.3]

Replacement in crawl-ref/source/xom.cc at line 1197 [6.3]

Replacement in crawl-ref/source/xom.cc at line 1199 [6.3]

Deletion in crawl-ref/source/xom.cc at line 1201 [6.3]