fiddlerwoaroof/crawl - Change INWKDE6QMV7PUWMZ65IZTUF4WB2G2OR2Q2NPTNID4Y3NVD7JWN3AC

Fix blessing routine -- oops!

Fix choose_random_nearby_monster() to really pick a random monster rather than the first one that fits, and allow named monsters to get higher chances. Use this when deciding which monster to bless (only happens if the one doing the kill, usually the player, is not eligible for blessing).

At high xp levels allow reinforcement (if there are no orcs nearby) to send in high xp orcs: orc warrior, orc knight, or orc warlord, rather than the normal ones (orc, orc wizard, orc priest). At xl 27 the probability for this happening is about 31%.

Problem: From the code, it appears that scumming for large armies is possible by deliberately losing your followers somewhere and then killing monsters until you get the reinforcement effect. This will have to be controlled somehow, while still allowing for genuinely lost allies somewhere on the level. Maybe use recall instead or something like that.

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

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

INWKDE6QMV7PUWMZ65IZTUF4WB2G2OR2Q2NPTNID4Y3NVD7JWN3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 1027 [5.804403]

[4.2712]

    };
    const monster_type high_xl_followers[] = {
        MONS_ORC_PRIEST, MONS_ORC_WARRIOR, MONS_ORC_KNIGHT, MONS_ORC_WARLORD

Insertion in crawl-ref/source/religion.cc at line 1036 [5.804403]
[4.2756]
[4.2756]
```
    monster_type follower_type;
```

Replacement in crawl-ref/source/religion.cc at line 1039 [5.804403]

B:BD[4.2801] → [4.2801:2838]

B:BD[4.2838] → [6.2686:2736]

        monster_type follower_type =
            followers[RANDOM_ELEMENT(followers)];

[4.2801]

[4.2892]

        if (random2(you.experience_level) >= 9 && coinflip())
            follower_type = RANDOM_ELEMENT(high_xl_followers);
        else
            follower_type = RANDOM_ELEMENT(followers);

Deletion in crawl-ref/source/religion.cc at line 1050 [5.804403]
B:BD[4.3166] → [4.3166:3167]
Deletion in crawl-ref/source/religion.cc at line 1088 [5.804403]
B:BD[7.2700] → [6.2904:2923]
∅:D[8.2538] → [9.2902:2903]
∅:D[6.2923] → [9.2902:2903]
B:BD[10.2860] → [9.2902:2903]
```
    monsters *mon;
```
Insertion in crawl-ref/source/religion.cc at line 1091 [5.804403]
[9.2952]
[7.2754]
```
    monsters *mon;
```

Replacement in crawl-ref/source/religion.cc at line 1093 [5.804403]

B:BD[7.2755] → [9.2953:2983]

B:BD[9.2983] → [11.2811:2855]

    int chance = random2(20);
    if (force)
        chance = coinflip();

[7.2755]

[9.2983]

    int chance = (force ? coinflip() : random2(20));
    if (chance > 2)
        return false;

Deletion in crawl-ref/source/religion.cc at line 1101 [5.804403]

B:BD[10.2925] → [6.2924:3019]

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

Replacement in crawl-ref/source/religion.cc at line 1102 [5.804403]
∅:D[12.2578] → [10.3031:3040]
B:BD[10.3031] → [10.3031:3040]
```
    else
```
[12.2578]
[10.3040]
```
    if (follower == -1 || (!force && !suitable(&menv[follower])))
```

Replacement in crawl-ref/source/religion.cc at line 1104 [5.804403]

B:BD[10.3046] → [10.3046:3111]

        int monster = choose_random_nearby_monster(0, suitable);

[10.3046]

[10.3111]

        // Choose a random follower in LOS, preferably a named one.
        follower = choose_random_nearby_monster(0, suitable, true);

Replacement in crawl-ref/source/religion.cc at line 1107 [5.804403]
∅:D[9.3078] → [10.3112:3148]
B:BD[10.3112] → [10.3112:3148]
```
        if (monster == NON_MONSTER)
```
[10.3112]
[9.3079]
```
        if (follower == NON_MONSTER)
```
Replacement in crawl-ref/source/religion.cc at line 1109 [5.804403]
B:BD[9.3089] → [2.2513:2542]
```
            if (chance <= 1)
```
[9.3089]
[9.3118]
```
            switch (god)
```
Replacement in crawl-ref/source/religion.cc at line 1111 [5.804403]
B:BD[9.3132] → [13.2542:2571]
```
                switch (god)
```
[9.3132]
[14.2639]
```
                case GOD_BEOGH:
```

Replacement in crawl-ref/source/religion.cc at line 1113 [5.804403]

B:BD[14.2657] → [13.2572:2630]

B:BD[13.2630] → [15.2581:2647]

∅:D[15.2647] → [16.3340:3393]

B:BD[16.3340] → [16.3340:3393]

B:BD[16.3393] → [17.5115:5190]

∅:D[13.2704] → [14.2769:2770]

∅:D[17.5190] → [14.2769:2770]

B:BD[14.2769] → [14.2769:2770]

B:BD[14.2770] → [13.2705:2786]

B:BD[13.2786] → [3.2648:2758]

∅:D[3.2758] → [17.5191:5256]

∅:D[6.3088] → [17.5191:5256]

B:BD[13.2786] → [17.5191:5256]

∅:D[17.5256] → [13.2850:2927]

B:BD[13.2850] → [13.2850:2927]

                    case GOD_BEOGH:
                    {
                        // If no follower was chosen, either send
                        // reinforcement or get out.
                        bool reinforced = _beogh_blessing_reinforcement();
                        if (!reinforced || coinflip())
                        {
                            // Try again, or possibly send more
                            // reinforcement.
                            if (_beogh_blessing_reinforcement())
                                reinforced = true;
                        }

[14.2657]

[13.2927]

                    // If no follower was chosen, either send
                    // reinforcement or get out.
                    bool reinforced = _beogh_blessing_reinforcement();

Replacement in crawl-ref/source/religion.cc at line 1117 [5.804403]

B:BD[13.2928] → [13.2928:2994]

B:BD[13.2994] → [8.2593:2635]

∅:D[8.2635] → [13.2994:3039]

B:BD[13.2994] → [13.2994:3039]

B:BD[13.3039] → [11.2908:2963]

∅:D[11.2963] → [13.3093:3219]

B:BD[13.3093] → [13.3093:3219]

                        if (reinforced)
                        {
                            pronoun = "";
                            blessed = "you";
                            result  = "reinforcement";
                            goto blessing_done;
                        }
                        break;
                   }

[13.2928]

[13.3219]

                    if (!reinforced || coinflip())
                    {
                        // Try again, or possibly send more reinforcement.
                        if (_beogh_blessing_reinforcement())
                            reinforced = true;
                    }

Replacement in crawl-ref/source/religion.cc at line 1124 [5.804403]

B:BD[13.3220] → [13.3220:3278]

                   default:
                       break;

[13.3220]

[9.3321]

                    if (reinforced)
                    {
                        pronoun = "";
                        blessed = "you";
                        result  = "reinforcement";
                        goto blessing_done;
                    }
                    break;

Insertion in crawl-ref/source/religion.cc at line 1133 [5.804403]

[9.3339]


                default:
                    break;

Deletion in crawl-ref/source/religion.cc at line 1141 [5.804403]
B:BD[18.3946] → [10.3169:3199]
```
        mon = &menv[monster];
```
Insertion in crawl-ref/source/religion.cc at line 1143 [5.804403]
[8.2637]
[8.2637]
```
    mon = &menv[follower];
```

Replacement in crawl-ref/source/religion.cc at line 1306 [5.804403]

B:BD[19.3926] → [11.3782:3835]

    std::string whom = get_unique_monster_name(mon);

[19.3926]

[11.3835]

    std::string whom = "";
    if (follower != NON_MONSTER)
        whom = get_unique_monster_name(mon);

Replacement in crawl-ref/source/monstuff.h at line 128 [5.1390580]

B:BD[20.3255] → [20.3255:3313]

                                     choose_any_monster);

[20.3255]

[20.3313]

                                     choose_any_monster,
                                 bool prefer_named = false);

Insertion in crawl-ref/source/monstuff.cc at line 875 [5.1396662]
[21.5761]
[21.5761]
```
                {
```
Insertion in crawl-ref/source/monstuff.cc at line 878 [5.1396662]
[22.4005]
[5.1410215]
```
                }
```
Insertion in crawl-ref/source/monstuff.cc at line 881 [5.1396662]
[21.5928]
[21.5928]
```
                {
```
Insertion in crawl-ref/source/monstuff.cc at line 884 [5.1396662]
[22.4077]
[5.1410499]
```
                }
```
Insertion in crawl-ref/source/monstuff.cc at line 887 [5.1396662]
[21.6096]
[21.6096]
```
                {
```
Insertion in crawl-ref/source/monstuff.cc at line 890 [5.1396662]
[22.4149]
[23.260]
```
                }
```
Insertion in crawl-ref/source/monstuff.cc at line 900 [5.1396662]
[24.4084]
[25.4350]
```
                {
```
Insertion in crawl-ref/source/monstuff.cc at line 903 [5.1396662]
[25.4485]
[25.4485]
```
                }
```
Insertion in crawl-ref/source/monstuff.cc at line 907 [5.1396662]
[21.6296]
[21.6296]
```
                {
```
Insertion in crawl-ref/source/monstuff.cc at line 910 [5.1396662]
[22.4293]
[5.1410829]
```
                }
```
Insertion in crawl-ref/source/monstuff.cc at line 914 [5.1396662]
[21.6506]
[21.6506]
```
                {
```
Insertion in crawl-ref/source/monstuff.cc at line 917 [5.1396662]
[22.4365]
[26.413568]
```
                }
```

Insertion in crawl-ref/source/monstuff.cc at line 2590 [5.1396662]

[20.3629]

// If prefer_named is true, named monsters (including uniques) are twice as
// likely to get chosen compared with non-named ones.

Replacement in crawl-ref/source/monstuff.cc at line 2593 [5.1396662]

B:BD[20.3674] → [20.3674:3746]

                                 bool (*suitable)(const monsters* mon))

[20.3674]

[20.3746]

                                 bool (*suitable)(const monsters* mon),
                                 bool prefer_named)

Insertion in crawl-ref/source/monstuff.cc at line 2598 [5.1396662]
[20.3807]
[20.3807]
```
    int mon;
```

Replacement in crawl-ref/source/monstuff.cc at line 2612 [5.1396662]

B:BD[20.4240] → [20.4240:4422]

                result = mgrd[x][y];
                if ( suitable(&menv[result]) && one_chance_in(++mons_count) )
                    break;
                result = NON_MONSTER;

[20.4240]

[20.4422]

                mon = mgrd[x][y];
                if (suitable(&menv[mon]))
                {
                    if (prefer_named
                        && !get_unique_monster_name(&menv[mon]).empty())
                    {
                        mons_count += 2;
                        // named monsters have doubled chances
                        if (random2(mons_count) < 2)
                            result = mon;
                    }
                    else if (one_chance_in(++mons_count))
                        result = mon;
                }

Insertion in crawl-ref/source/monstuff.cc at line 4733 [5.1396662]
[27.1483]
[27.1483]
```
            {
```
Insertion in crawl-ref/source/monstuff.cc at line 4736 [5.1396662]
[27.1623]
[27.1623]
```
            }
```
Insertion in crawl-ref/source/monstuff.cc at line 4738 [5.1396662]
[27.1640]
[27.1640]
```
            {
```
Insertion in crawl-ref/source/monstuff.cc at line 4741 [5.1396662]
[27.1782]
[27.1782]
```
            }
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 701 [29.14728]
∅:D[28.4304] → [11.12779:12787]
B:BD[11.12779] → [11.12779:12787]
```
Albeogh
```
[28.4304]
[11.12787]
```
Arbeogh
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 703 [29.14728]
B:BD[11.12788] → [11.12788:12796]
```
Bogbart
```
[11.12788]
[11.12796]
```
Bogbarth
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 714 [29.14728]
[28.4314]
[28.4314]
```
Bogrim
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 754 [29.14728]
[11.13062]
[11.13062]
```
Argrim
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 759 [29.14728]
[11.13077]
[28.4342]
```
Bladwarg
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 765 [29.14728]
[28.4360]
[28.4360]
```
Bolgrim
Borgoth
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 775 [29.14728]
[11.13084]
[11.13084]
```
Garbold
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 792 [29.14728]
[11.13117]
[11.13117]
```
Morguth
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 804 [29.14728]
[11.13154]
[11.13154]
```
Ugbert
Ugrim
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 809 [29.14728]
[11.13161]
[11.13161]
```
Wargrak
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 816 [29.14728]
B:BD[11.13177] → [11.13177:13183]
```
Zoruk
```
[11.13177]
[11.13183]
```
Zorug
```

Fix blessing routine -- oops!

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 1027 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 1036 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1039 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 1050 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 1088 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 1091 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1093 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 1101 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1102 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1104 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1107 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1109 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1111 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1113 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1117 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1124 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 1133 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 1141 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 1143 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1306 [5.804403]

Replacement in crawl-ref/source/monstuff.h at line 128 [5.1390580]

Insertion in crawl-ref/source/monstuff.cc at line 875 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 878 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 881 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 884 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 887 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 890 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 900 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 903 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 907 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 910 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 914 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 917 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2590 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2593 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2598 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2612 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4733 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4736 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4738 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4741 [5.1396662]

Replacement in crawl-ref/source/dat/database/randname.txt at line 701 [29.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 703 [29.14728]

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/dat/database/randname.txt at line 816 [29.14728]