fiddlerwoaroof/crawl - Change 7RDIBNLUIBTAYOJXJ5Q3DOW3MKKYXBAA3Q4G4QE74KJL23NW6C7AC

Really fix message sequences again.

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

Created by dolorous on June 22, 2008

7RDIBNLUIBTAYOJXJ5Q3DOW3MKKYXBAA3Q4G4QE74KJL23NW6C7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 473 [6.3]
[2.103]
[5.1726]

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

[5.1756]

[7.5]


        monster_type *monster = new monster_type[numdemons];
        bool *is_demonic = new bool[numdemons];
        for (int i = 0; i < numdemons; ++i)
        {
            monster[i] = xom_random_demon(sever);
            is_demonic[i] = (mons_class_holiness(monster[i]) == MH_DEMONIC);
            // If it's not a demon, Xom got it someplace else, so use
            // different messages and give it a chance of being hostile
            // below.
            if (!is_demonic[i])
                numdifferent++;
        }

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

[7.6]

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

Deletion in crawl-ref/source/xom.cc at line 505 [6.3]
B:BD[7.424] → [8.5:49]
```
        int *summons = new int[numdemons];
```

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

B:BD[6.13903] → [5.1758:1814]

B:BD[5.1814] → [9.77:155]

∅:D[9.155] → [5.1814:1815]

∅:D[7.479] → [5.1814:1815]

B:BD[5.1814] → [5.1814:1815]

B:BD[5.1815] → [10.514:584]

∅:D[10.584] → [5.1888:1929]

B:BD[5.1888] → [5.1888:1929]

B:BD[5.1929] → [9.156:185]

∅:D[9.185] → [5.1966:1998]

∅:D[7.507] → [5.1966:1998]

B:BD[5.1966] → [5.1966:1998]

∅:D[11.153] → [5.1998:1999]

B:BD[5.1998] → [5.1998:1999]

∅:D[11.393] → [12.4:61]

B:BD[5.1999] → [12.4:61]

B:BD[12.61] → [13.4:138]

∅:D[14.63] → [15.36:71]

∅:D[16.75] → [15.36:71]

∅:D[17.76] → [15.36:71]

∅:D[18.77] → [15.36:71]

∅:D[19.86] → [15.36:71]

∅:D[20.128] → [15.36:71]

∅:D[13.138] → [15.36:71]

∅:D[12.172] → [15.36:71]

∅:D[11.513] → [15.36:71]

B:BD[8.249] → [15.36:71]

            monster_type mon = xom_random_demon(sever);
            const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC);
            // If it's not a demon, Xom got it someplace else, so use
            // different messages below.
            if (!is_demonic)
                numdifferent++;
            summons[i] =
                create_monster(
                    mgen_data(mon, BEH_FRIENDLY, 3,
                              you.pos(), you.pet_target, MG_FORCE_BEH, GOD_XOM));
            if (summons[i] != -1)

[6.13903]

[15.71]

            if (create_monster(
                    mgen_data(monster[i], BEH_FRIENDLY, 3,
                              you.pos(), you.pet_target, 0, GOD_XOM)) != -1)
            {

Deletion in crawl-ref/source/xom.cc at line 515 [6.3]
B:BD[15.103] → [13.139:149]
```
        }
```

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

B:BD[13.150] → [4.4:25]

∅:D[4.25] → [13.194:204]

B:BD[13.194] → [13.194:204]

B:BD[13.204] → [4.26:407]

∅:D[4.407] → [13.238:252]

B:BD[13.238] → [13.238:252]

B:BD[13.252] → [4.408:535]

        if (success)
        {
            if (numdifferent == numdemons)
                god_speaks(GOD_XOM, _get_xom_speech("multiple holy summons"));
            else if (numdifferent > 0)
                god_speaks(GOD_XOM, _get_xom_speech("multiple mixed summons"));
            else
                god_speaks(GOD_XOM, _get_xom_speech("multiple summons"));
            for (int i = 0; i < numdemons; ++i)
            {
                if (summons[i] != -1 && hostiletype != 0
                    && numdifferent != numdemons && numdifferent > 0)

[13.150]

[13.359]

                if (hostiletype != 0 && numdifferent != numdemons
                    && numdifferent > 0)

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

B:BD[13.423] → [13.423:503]

                    const bool is_demonic = (mons_holiness(mon) == MH_DEMONIC);

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

B:BD[13.606] → [13.606:728]

                        || (is_demonic && hostiletype == 1)
                        || (!is_demonic && hostiletype == 2))

[13.606]

[13.728]

                        || (is_demonic[i] && hostiletype == 1)
                        || (!is_demonic[i] && hostiletype == 2))

Insertion in crawl-ref/source/xom.cc at line 530 [6.3]
[13.908]
[13.908]
```
            }
        }
```

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

B:BD[13.909] → [13.909:981]

                player_angers_monster(&menv[summons[i]]);
            }

[13.909]

[5.2453]

        delete[] is_demonic;
        delete[] monster;

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

B:BD[5.2454] → [15.571:606]

            done = true;
        }

[5.2454]

[4.536]

        if (!success)
            canned_msg(MSG_NOTHING_HAPPENS);

Replacement in crawl-ref/source/xom.cc at line 539 [6.3]
B:BD[4.537] → [4.537:563]
```
        delete[] summons;
```
[4.537]
[6.14586]
```
        done = true;
```

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

B:BD[21.1494] → [5.2455:2488]

B:BD[5.2488] → [22.5:215]

        bool different = false;
        // If we get a non-demon, there's a chance that it may be
        // hostile.
        bool hostiletype = one_chance_in(4); // 3/4: friendly
                                             // 1/4: hostile

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

B:BD[5.2541] → [10.585:651]

        // If it's not a demon, Xom got it someplace else, so use

[5.2541]

[9.515]

        // If we have a non-demon, Xom got it someplace else, so use

Replacement in crawl-ref/source/xom.cc at line 566 [6.3]
B:BD[9.552] → [3.4:29]
∅:D[3.29] → [5.2680:2710]
∅:D[9.576] → [5.2680:2710]
B:BD[5.2680] → [5.2680:2710]
```
        if (!is_demonic)
            different = true;
```
[9.552]
[5.2710]
```
        bool different = !is_demonic;
```

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

B:BD[5.2711] → [22.216:267]

        // Mark non-demons hostile as appropriate.

[5.2711]

[20.129]

        if (different)
            god_speaks(GOD_XOM, _get_xom_speech("single holy summon"));
        else
            god_speaks(GOD_XOM, _get_xom_speech("single summon"));

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

B:BD[18.155] → [18.155:193]

        if (different && hostiletype)

[18.155]

[18.193]

        // There's a chance that a non-demon may be hostile.
        if (different && one_chance_in(4))

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

B:BD[22.398] → [19.137:187]

        int summons =
            create_monster(

[22.398]

[18.277]

        if (create_monster(

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

B:BD[18.317] → [19.188:287]

                          you.pos(), hitting, MG_FORCE_BEH, GOD_XOM));
        if (summons != -1)

[18.317]

[6.15329]

                          you.pos(), hitting, 0, GOD_XOM)) == -1)

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

B:BD[6.15339] → [5.2851:2878]

B:BD[5.2878] → [23.1215:1291]

∅:D[24.705] → [5.2956:2973]

∅:D[23.1291] → [5.2956:2973]

B:BD[5.2956] → [5.2956:2973]

B:BD[5.2973] → [23.1292:1363]

            if (different)
                god_speaks(GOD_XOM, _get_xom_speech("single holy summon"));
            else
                god_speaks(GOD_XOM, _get_xom_speech("single summon"));

[6.15339]

[19.288]

            canned_msg(MSG_NOTHING_HAPPENS);
        }

Replacement in crawl-ref/source/xom.cc at line 590 [6.3]
B:BD[19.289] → [19.289:340]
∅:D[19.340] → [5.3046:3047]
∅:D[24.786] → [5.3046:3047]
∅:D[23.1363] → [5.3046:3047]
B:BD[5.3046] → [5.3046:3047]
∅:D[25.124] → [6.15683:15718]
∅:D[21.1726] → [6.15683:15718]
∅:D[5.3047] → [6.15683:15718]
B:BD[6.15683] → [6.15683:15718]
```
            player_angers_monster(&menv[summons]);
            done = true;
        }
```
[19.289]
[6.15718]
```
        done = true;
```

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

B:BD[6.17557] → [24.787:820]

B:BD[24.820] → [22.463:673]

        bool different = false;
        // If we get a non-demon, there's a chance that it may be
        // hostile.
        bool hostiletype = one_chance_in(4); // 3/4: friendly
                                             // 1/4: hostile

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

B:BD[24.873] → [10.690:756]

        // If it's not a demon, Xom got it someplace else, so use

[24.873]

[24.942]

        // If we have a non-demon, Xom got it someplace else, so use

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

B:BD[24.979] → [3.30:55]

∅:D[3.55] → [24.1012:1042]

∅:D[9.676] → [24.1012:1042]

B:BD[24.1012] → [24.1012:1042]

        if (!is_demonic)
            different = true;

[24.979]

[24.1042]

        bool different = !is_demonic;
        if (different)
            god_speaks(GOD_XOM, _get_xom_speech("single major holy summon"));
        else
            god_speaks(GOD_XOM, _get_xom_speech("single demon summon"));

Deletion in crawl-ref/source/xom.cc at line 662 [6.3]
B:BD[24.1043] → [22.674:725]
```
        // Mark non-demons hostile as appropriate.
```

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

B:BD[18.463] → [18.463:501]

        if (different && hostiletype)

[18.463]

[18.501]

        // There's a chance that a non-demon may be hostile.
        if (different && one_chance_in(4))

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

B:BD[22.856] → [19.341:391]

        int summons =
            create_monster(

[22.856]

[20.275]

        if (create_monster(

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

B:BD[20.379] → [19.392:491]

                          you.pos(), hitting, MG_FORCE_BEH, GOD_XOM));
        if (summons != -1)

[20.379]

[6.18034]

                          you.pos(), hitting, 0, GOD_XOM)) == -1)

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

B:BD[6.18044] → [24.1044:1071]

B:BD[24.1071] → [23.1521:1603]

∅:D[23.1603] → [24.1154:1171]

B:BD[24.1154] → [24.1154:1171]

B:BD[24.1171] → [23.1604:1674]

            if (different)
                god_speaks(GOD_XOM, _get_xom_speech("single major holy summon"));
            else
	        god_speaks(GOD_XOM, _get_xom_speech("single demon summon"));

[6.18044]

[24.1249]

            canned_msg(MSG_NOTHING_HAPPENS);
        }

Replacement in crawl-ref/source/xom.cc at line 680 [6.3]
B:BD[24.1250] → [19.492:544]
∅:D[19.544] → [6.18313:18348]
∅:D[24.1250] → [6.18313:18348]
∅:D[21.2868] → [6.18313:18348]
B:BD[6.18313] → [6.18313:18348]
```
            player_angers_monster(&menv[summons]);
            done = true;
        }
```
[24.1250]
[6.18348]
```
        done = true;
```