fiddlerwoaroof/crawl - Change 2TFYJ7D72JY4DYQW3GSPEONA2WYIVHAJXTIQ2QRDIWF65XN2QFGAC

Some cleanup in the blessing routines.

Possibly fix a crash when calling bless_follower without an argument (it only happened with Beogh and TSO, so this is the most likely candidate). Outsource Boris' "I'll be back" speech.

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

Created by j-p-e-g on April 24, 2008

2TFYJ7D72JY4DYQW3GSPEONA2WYIVHAJXTIQ2QRDIWF65XN2QFGAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.h at line 81 [12.800304]
B:BD[10.2550] → [11.2511:2558]
```
bool bless_follower(monsters* follower = NULL,
```
[10.2550]
[10.2597]
```
bool bless_follower(int follower = -1,
```
Insertion in crawl-ref/source/religion.cc at line 1018 [12.804403]
[13.2515]
[14.5015]
```
// IF you don't currently have any followers, send a small band to help you out.
```
Insertion in crawl-ref/source/religion.cc at line 1028 [12.804403]
[13.2720]
[13.2720]
```
    // up to four orcish followers
```

Replacement in crawl-ref/source/religion.cc at line 1034 [12.804403]

B:BD[13.2838] → [6.3422:3474]

            followers[random2(ARRAYSZ(followers))];

[13.2838]

[13.2892]

            followers[RANDOM_ELEMENT(followers)];

Replacement in crawl-ref/source/religion.cc at line 1037 [12.804403]

B:BD[13.2962] → [13.2962:3085]

                                 you.x_pos, you.y_pos, you.pet_target,
                                 MONS_PROGRAM_BUG);

[13.2962]

[13.3085]

                                     you.x_pos, you.y_pos, you.pet_target,
                                     MONS_PROGRAM_BUG);

Replacement in crawl-ref/source/religion.cc at line 1076 [12.804403]
∅:D[4.2580] → [11.2560:2600]
B:BD[15.3268] → [11.2560:2600]
```
bool bless_follower(monsters* follower,
```
[4.2580]
[10.3548]
```
bool bless_follower(int follower,
```
Replacement in crawl-ref/source/religion.cc at line 1081 [12.804403]
B:BD[16.2700] → [17.2512:2538]
```
    monsters *mon = NULL;
```
[16.2700]
[18.2902]
```
    monsters *mon;
```

Replacement in crawl-ref/source/religion.cc at line 1094 [12.804403]

B:BD[19.2925] → [20.2856:2907]

∅:D[20.2907] → [19.2965:2989]

B:BD[19.2965] → [19.2965:2989]

    if (follower && (force || suitable(follower)))
        mon = follower;

[19.2925]

[3.2509]

    if (follower != -1 && (force || suitable(&menv[follower])))
        mon = &menv[follower];

Insertion in crawl-ref/source/religion.cc at line 1115 [12.804403]

[21.2786]

[14.5191]

                            // try again, or possibly get some more

Insertion in crawl-ref/source/monstuff.cc at line 37 [12.1396662]
[12.1397612]
[12.1397612]
```
#include "database.h"
```
Replacement in crawl-ref/source/monstuff.cc at line 158 [12.1396662]
B:BD[12.1400371] → [12.1400371:1400423]
```
            set_equip_desc( item, ISFLAG_GLOWING );
```
[12.1400371]
[12.1400423]
```
            set_equip_desc(item, ISFLAG_GLOWING);
```
Replacement in crawl-ref/source/monstuff.cc at line 160 [12.1396662]
B:BD[12.1400451] → [12.1400451:1400501]
```
            set_equip_desc( item, ISFLAG_RUNED );
```
[12.1400451]
[12.1400501]
```
            set_equip_desc(item, ISFLAG_RUNED);
```

Replacement in crawl-ref/source/monstuff.cc at line 162 [12.1396662]

B:BD[12.1400529] → [12.1400529:1400591]

            set_equip_desc( item, ISFLAG_EMBROIDERED_SHINY );

[12.1400529]

[12.1400591]

            set_equip_desc(item, ISFLAG_EMBROIDERED_SHINY);

Replacement in crawl-ref/source/monstuff.cc at line 164 [12.1396662]
B:BD[12.1400619] → [12.1400619:1400670]
```
            set_equip_race( item, ISFLAG_ORCISH );
```
[12.1400619]
[12.1400670]
```
            set_equip_race(item, ISFLAG_ORCISH);
```
Replacement in crawl-ref/source/monstuff.cc at line 166 [12.1396662]
B:BD[12.1400698] → [12.1400698:1400750]
```
            set_equip_race( item, ISFLAG_DWARVEN );
```
[12.1400698]
[12.1400750]
```
            set_equip_race(item, ISFLAG_DWARVEN);
```
Replacement in crawl-ref/source/monstuff.cc at line 168 [12.1396662]
B:BD[12.1400778] → [12.1400778:1400828]
```
            set_equip_race( item, ISFLAG_ELVEN );
```
[12.1400778]
[12.1400828]
```
            set_equip_race(item, ISFLAG_ELVEN);
```
Deletion in crawl-ref/source/monstuff.cc at line 248 [12.1396662]
B:BD[12.1403008] → [12.1403008:1403062]
```
    /* don't change you.inv_special (just for fun) */
```

Insertion in crawl-ref/source/monstuff.cc at line 406 [12.1396662]

[19.3454]

[22.2719]

            if (you.religion != GOD_SHINING_ONE && you.religion != GOD_BEOGH
                || player_under_penance()
                || one_chance_in(3))
            {
                return;
            }

Replacement in crawl-ref/source/monstuff.cc at line 414 [12.1396662]

B:BD[22.2785] → [23.2695:2746]

∅:D[23.2746] → [10.3890:4073]

B:BD[10.3890] → [10.3890:4073]

B:BD[10.4073] → [23.2747:2791]

∅:D[23.2791] → [24.2697:2735]

B:BD[24.2697] → [24.2697:2735]

            if ((((you.religion == GOD_SHINING_ONE
                && random2(you.piety) >= piety_breakpoint(0))
                    || (you.religion == GOD_BEOGH
                        && random2(you.piety) >= piety_breakpoint(2)))
                && !player_under_penance())
                && !one_chance_in(3))

[22.2785]

[24.2735]

            if (you.religion == GOD_SHINING_ONE
                    && random2(you.piety) >= piety_breakpoint(0)
                || you.religion == GOD_BEOGH
                    && random2(you.piety) >= piety_breakpoint(2))

Replacement in crawl-ref/source/monstuff.cc at line 419 [12.1396662]
B:BD[24.2749] → [10.4074:4111]
```
                bless_follower(mon);
```
[24.2749]
[24.2821]
```
                bless_follower(killer_index);
```

Replacement in crawl-ref/source/monstuff.cc at line 923 [12.1396662]

∅:D[25.3330] → [26.2842:2962]

B:BD[27.4669] → [26.2842:2962]

                    && (!player_under_penance() &&
                        random2(you.piety) >= piety_breakpoint(0))))

[25.3330]

[12.1411430]

                    && !player_under_penance()
                    && random2(you.piety) >= piety_breakpoint(0)))

Replacement in crawl-ref/source/monstuff.cc at line 938 [12.1396662]

∅:D[25.3390] → [26.2963:3074]

B:BD[27.4871] → [26.2963:3074]

                && (!player_under_penance()
                    && random2(you.piety) >= piety_breakpoint(0)))

[25.3390]

[12.1411895]

                && !player_under_penance()
                && random2(you.piety) >= piety_breakpoint(0))

Replacement in crawl-ref/source/monstuff.cc at line 949 [12.1396662]

B:BD[22.2906] → [22.2906:2952]

B:BD[22.2952] → [23.2792:3213]

            if (!created_friendly && gives_xp
                && (((you.religion == GOD_SHINING_ONE
                    && mons_is_evil_or_unholy(monster)
                    && random2(you.piety) >= piety_breakpoint(0))
                        || (you.religion == GOD_BEOGH
                            && mons_holiness(monster) == MH_NATURAL
                            && random2(you.piety) >= piety_breakpoint(2)))
                    && !player_under_penance()))

[22.2906]

[22.3170]

            if (!created_friendly
                && gives_xp
                && (you.religion == GOD_SHINING_ONE
                        && mons_is_evil_or_unholy(monster)
                        && random2(you.piety) >= piety_breakpoint(0)
                    || you.religion == GOD_BEOGH
                        && mons_holiness(monster) == MH_NATURAL
                        && random2(you.piety) >= piety_breakpoint(2))
                && !player_under_penance())

Insertion in crawl-ref/source/monstuff.cc at line 981 [12.1396662]
[28.1211]
[2.191]
```
            {
```
Insertion in crawl-ref/source/monstuff.cc at line 987 [12.1396662]
[28.1342]
[12.1412996]
```
            }
```
Insertion in crawl-ref/source/monstuff.cc at line 991 [12.1396662]
[12.1413145]
[29.844]
```
            {
```
Insertion in crawl-ref/source/monstuff.cc at line 994 [12.1396662]
[30.4477]
[12.1413220]
```
            }
```

Replacement in crawl-ref/source/monstuff.cc at line 1078 [12.1396662]

∅:D[22.3307] → [25.4042:4160]

B:BD[25.4042] → [25.4042:4160]

                    && (!player_under_penance()
                        && random2(you.piety) >= piety_breakpoint(0))

[22.3307]

[31.2780]

                    && !player_under_penance()
                    && random2(you.piety) >= piety_breakpoint(0)

Replacement in crawl-ref/source/monstuff.cc at line 1085 [12.1396662]

B:BD[8.2657] → [8.2657:2723]

                    if (!one_chance_in(3) && bless_follower(mon))

[8.2657]

[8.2723]

                    if (!one_chance_in(3) && bless_follower(i))

Replacement in crawl-ref/source/monstuff.cc at line 1097 [12.1396662]

B:BD[22.3386] → [8.2755:2803]

                if (((you.religion == GOD_BEOGH

[22.3386]

[8.2803]

                if (you.religion == GOD_BEOGH

Replacement in crawl-ref/source/monstuff.cc at line 1099 [12.1396662]

B:BD[8.2863] → [8.2863:2929]

∅:D[8.2929] → [23.3600:3648]

B:BD[23.3600] → [23.3600:3648]

                    && random2(you.piety) >= piety_breakpoint(2))
                    && !player_under_penance())

[8.2863]

[23.3648]

                    && random2(you.piety) >= piety_breakpoint(2)
                    && !player_under_penance()

Replacement in crawl-ref/source/monstuff.cc at line 1104 [12.1396662]
B:BD[22.3682] → [22.3682:3728]
B:BD[22.3728] → [11.3251:3252]
∅:D[11.3252] → [10.4193:4234]
B:BD[22.3728] → [10.4193:4234]
```
                    monsters *mon = &menv[i];
                    bless_follower(mon);
```
[22.3682]
[27.5525]
```
                    bless_follower(i);
```
Insertion in crawl-ref/source/monstuff.cc at line 1113 [12.1396662]
[28.1368]
[2.515]
```
            {
```
Insertion in crawl-ref/source/monstuff.cc at line 1119 [12.1396662]
[28.1499]
[12.1415034]
```
            }
```

Replacement in crawl-ref/source/monstuff.cc at line 1123 [12.1396662]

B:BD[12.1415079] → [12.1415079:1415300]

        /* Monster doesn't die, just goes back to wherever it came from
           This must only be called by monsters running out of time (or
           abjuration), because it uses the beam variables! Or does it??? */

[12.1415079]

[28.1500]

        // Monster doesn't die, just goes back to wherever it came from
        // This must only be called by monsters running out of time (or
        // abjuration), because it uses the beam variables! Or does it???

Insertion in crawl-ref/source/monstuff.cc at line 1127 [12.1396662]
[28.1525]
[28.1525]
```
            {
```
Insertion in crawl-ref/source/monstuff.cc at line 1130 [12.1396662]
[28.1651]
[12.1415418]
```
            }
```

Replacement in crawl-ref/source/monstuff.cc at line 1191 [12.1396662]

B:BD[12.1416968] → [12.1416968:1417008]

B:BD[12.1417008] → [32.2995:3040]

∅:D[32.3040] → [12.1417054:1417338]

B:BD[12.1417054] → [12.1417054:1417338]

B:BD[12.1417338] → [33.417068:417162]

B:BD[33.417162] → [5.2558:2627]

∅:D[5.2627] → [12.1417501:1417630]

B:BD[12.1417501] → [12.1417501:1417630]

            const int tmp = random2(6);
            simple_monster_message( monster,
                    (tmp == 0) ? " says, \"You haven't seen the last of me!\"" :
                    (tmp == 1) ? " says, \"I'll get you next time!\"" :
                    (tmp == 2) ? " says, \"This isn't over yet!\"" :
                    (tmp == 3) ? " says, \"I'll be back!\"" :
                    (tmp == 4) ? " says, \"This isn't the end, it's only just beginning!\"" :
                    (tmp == 5) ? " says, \"Kill me?  I think not!\""
                               : " says, \"You cannot defeat me so easily!\"",
                                    MSGCH_TALK );

[12.1416968]

[12.1417630]

            std::string msg = getSpeakString("Boris return_speech");
            if (!msg.empty())
            {
                msg = do_mon_str_replacements(msg, monster);
                mpr(msg.c_str(), MSGCH_TALK);
            }

Replacement in crawl-ref/source/misc.cc at line 1019 [12.1933596]

B:BD[34.19710] → [34.19710:19738]

        item.plus      = 0;

[34.19710]

[34.19738]

        // keep description as it was
        item.plus      = potion.plus;

Replacement in crawl-ref/source/misc.cc at line 1052 [12.1933596]

B:BD[35.9484] → [35.9484:9635]

        potion2.plus      = potion.plus; // are these even needed?
        potion2.plus2     = potion.plus2;
        potion2.flags     = potion.flags;

[35.9484]

[35.9635]

        // keep description as it was
        potion2.plus      = potion.plus;

Deletion in crawl-ref/source/misc.cc at line 1055 [12.1933596]
B:BD[35.9671] → [35.9671:9702]
```
        potion2.special   = 0;
```

Insertion in crawl-ref/source/misc.cc at line 1056 [12.1933596]

[7.6317]

[12.1936956]

        potion2.plus2     = 0;
        potion2.flags     = 0;
        potion2.special   = 0;

Replacement in crawl-ref/source/debug.cc at line 3560 [12.4016436]

B:BD[20.12278] → [20.12278:12336]

    if (!bless_follower(mon, god, _force_suitable, true))

[20.12278]

[20.12336]

    if (!bless_follower(monster_index(mon), god, _force_suitable, true))

Deletion in crawl-ref/source/dat/database/randname.txt at line 736 [36.14728]
B:BD[20.13010] → [20.13010:13016]
```
Orik
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 738 [36.14728]
[9.4341]
[20.13016]
```
Orik
```

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 957 [37.307]

[37.18071]

%%%%
Boris return_speech
@The_monster@ says, "You haven't seen the last of me!"
@The_monster@ says, "I'll get you next time!"
@The_monster@ says, "This isn't over yet!"
@The_monster@ says, "I'll be back!"
@The_monster@ says, "This isn't the end, it's only just beginning!"
@The_monster@ says, "Kill me?  I think not!"
@The_monster@ says, "You cannot defeat me so easily!"

Some cleanup in the blessing routines.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.h at line 81 [12.800304]

Insertion in crawl-ref/source/religion.cc at line 1018 [12.804403]

Insertion in crawl-ref/source/religion.cc at line 1028 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 1034 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 1037 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 1076 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 1081 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 1094 [12.804403]

Insertion in crawl-ref/source/religion.cc at line 1115 [12.804403]

Insertion in crawl-ref/source/monstuff.cc at line 37 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 158 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 160 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 162 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 164 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 166 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 168 [12.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 248 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 406 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 414 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 419 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 923 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 938 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 949 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 981 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 987 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 991 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 994 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1078 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1085 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1097 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1099 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1104 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1113 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1119 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1123 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1127 [12.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1130 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1191 [12.1396662]

Replacement in crawl-ref/source/misc.cc at line 1019 [12.1933596]

Replacement in crawl-ref/source/misc.cc at line 1052 [12.1933596]

Deletion in crawl-ref/source/misc.cc at line 1055 [12.1933596]

Insertion in crawl-ref/source/misc.cc at line 1056 [12.1933596]

Replacement in crawl-ref/source/debug.cc at line 3560 [12.4016436]

Deletion in crawl-ref/source/dat/database/randname.txt at line 736 [36.14728]

Insertion in crawl-ref/source/dat/database/randname.txt at line 738 [36.14728]

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 957 [37.307]