fiddlerwoaroof/crawl - Change LQH6T3DTCDOS5LAJ4PIPHMQY6UYRFWMVVUX32YJAELGIVR5RZTGQC

Simplify Xom's polymorphing monsters.

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

Created by dolorous on June 24, 2008

LQH6T3DTCDOS5LAJ4PIPHMQY6UYRFWMVVUX32YJAELGIVR5RZTGQC

Dependencies

In channels

main

Change contents

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

B:BD[6.15797] → [7.811:853]

∅:D[7.853] → [8.1805:1833]

B:BD[8.1805] → [8.1805:1833]

        if (!there_are_monsters_nearby())
            goto try_again;

[6.15797]

[8.1833]

        if (there_are_monsters_nearby())
        {
            monsters *mon =
                choose_random_nearby_monster(0, _choose_mutatable_monster);

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

B:BD[8.1834] → [9.4:28]

B:BD[9.28] → [5.1554:1626]

        monsters *mon =
            choose_random_nearby_monster(0, _choose_mutatable_monster);

[8.1834]

[10.320]

            if (mon)
            {
                god_speaks(GOD_XOM, _get_xom_speech("good monster polymorph"));

Replacement in crawl-ref/source/xom.cc at line 609 [6.3]
B:BD[10.321] → [9.100:117]
∅:D[11.41] → [6.15854:15864]
∅:D[9.117] → [6.15854:15864]
∅:D[12.154] → [6.15854:15864]
∅:D[10.338] → [6.15854:15864]
B:BD[6.15854] → [6.15854:15864]
B:BD[6.15864] → [13.5:81]
```
        if (mon)
        {
            god_speaks(GOD_XOM, _get_xom_speech("good monster polymorph"));
```
[10.321]
[14.461]
```
                monster_polymorph(mon, RANDOM_MONSTER,
                    mons_wont_attack(mon) ? PPT_MORE : PPT_LESS);
```

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

B:BD[14.462] → [2.4:43]

∅:D[15.40] → [6.16357:16506]

∅:D[2.43] → [6.16357:16506]

B:BD[6.16357] → [6.16357:16506]

            if (mons_wont_attack(mon))
                monster_polymorph(mon, RANDOM_MONSTER, PPT_MORE);
            else
                monster_polymorph(mon, RANDOM_MONSTER, PPT_LESS);

[14.462]

[16.4]

                if (one_chance_in(8)
                    && !mon->has_ench(ENCH_GLOWING_SHAPESHIFTER,
                                      ENCH_SHAPESHIFTER))
                {
                    mon->add_ench(one_chance_in(3) ? ENCH_GLOWING_SHAPESHIFTER
                                                   : ENCH_SHAPESHIFTER);
                }

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

B:BD[16.5] → [3.4:37]

∅:D[3.37] → [17.38:153]

B:BD[17.38] → [17.38:153]

∅:D[18.39] → [16.40:54]

∅:D[17.153] → [16.40:54]

B:BD[16.40] → [16.40:54]

B:BD[16.54] → [4.4:148]

            if (one_chance_in(8)
                && !mon->has_ench(ENCH_GLOWING_SHAPESHIFTER,
                                  ENCH_SHAPESHIFTER))
            {
                mon->add_ench(one_chance_in(3) ? ENCH_GLOWING_SHAPESHIFTER
                                               : ENCH_SHAPESHIFTER);

[16.5]

[16.186]

                done = true;

Deletion in crawl-ref/source/xom.cc at line 622 [6.3]
∅:D[16.200] → [19.18:19]
B:BD[6.16506] → [19.18:19]
∅:D[19.19] → [6.16506:16531]
B:BD[6.16506] → [6.16506:16531]
```
            done = true;
```

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

B:BD[6.23217] → [20.103:149]

∅:D[20.149] → [8.4808:4840]

B:BD[8.4808] → [8.4808:4840]

            if (!there_are_monsters_nearby())
                goto try_again;

[6.23217]

[8.4840]

            if (there_are_monsters_nearby())
            {
                monsters *mon =
                    choose_random_nearby_monster(0, _choose_mutatable_monster);

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

B:BD[8.4841] → [9.118:146]

B:BD[9.146] → [5.1788:1864]

            monsters *mon =
                choose_random_nearby_monster(0, _choose_mutatable_monster);

[8.4841]

[10.532]

                if (mon)
                {
                    god_speaks(GOD_XOM, _get_xom_speech("bad monster polymorph"));

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

B:BD[10.533] → [9.222:243]

∅:D[11.128] → [15.148:162]

∅:D[20.204] → [15.148:162]

∅:D[9.243] → [15.148:162]

∅:D[10.554] → [15.148:162]

B:BD[15.148] → [15.148:162]

B:BD[15.162] → [13.82:161]

            if (mon)
            {
                god_speaks(GOD_XOM, _get_xom_speech("bad monster polymorph"));

[10.533]

[11.177]

                    monster_polymorph(mon, RANDOM_MONSTER,
                        mons_wont_attack(mon) ? PPT_LESS : PPT_MORE);

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

B:BD[11.178] → [2.44:87]

∅:D[2.87] → [15.589:750]

B:BD[15.589] → [15.589:750]

                if (mons_wont_attack(mon))
                    monster_polymorph(mon, RANDOM_MONSTER, PPT_LESS);
                else
                    monster_polymorph(mon, RANDOM_MONSTER, PPT_MORE);

[11.178]

[16.201]

                    if (one_chance_in(8)
                        && !mon->has_ench(ENCH_GLOWING_SHAPESHIFTER,
                                          ENCH_SHAPESHIFTER))
                    {
                        mon->add_ench(one_chance_in(3) ? ENCH_GLOWING_SHAPESHIFTER
                                                       : ENCH_SHAPESHIFTER);
                    }

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

B:BD[16.202] → [3.38:75]

∅:D[3.75] → [17.192:315]

B:BD[17.192] → [17.192:315]

∅:D[18.79] → [16.241:259]

∅:D[17.315] → [16.241:259]

B:BD[16.241] → [16.241:259]

B:BD[16.259] → [4.149:301]

                if (one_chance_in(8)
                    && !mon->has_ench(ENCH_GLOWING_SHAPESHIFTER,
                                      ENCH_SHAPESHIFTER))
                {
                    mon->add_ench(one_chance_in(3) ? ENCH_GLOWING_SHAPESHIFTER
                                                   : ENCH_SHAPESHIFTER);

[16.202]

[16.399]

                    done = true;

Deletion in crawl-ref/source/xom.cc at line 815 [6.3]
∅:D[16.417] → [21.130:131]
B:BD[15.750] → [21.130:131]
∅:D[21.131] → [15.750:779]
B:BD[15.750] → [15.750:779]
```
                done = true;
```
Deletion in crawl-ref/source/xom.cc at line 906 [6.3]
B:BD[22.991] → [8.6538:6549]
```
try_again:
```