fiddlerwoaroof/crawl - Change GXXYPBFEWKRZQ6OBGYNS2EXZN52NGNV3UU3WM6S5R74CMJBAKGTAC

Expand choose_random_nearby_monster() to optionally allow choosing only

particular types of monsters. Accordingly, make it global, and move it from decks.cc to monstuff.cc.

In xom.cc, remove get_random_nearby_monster(), as it's duplicate code, and replace it with a call to choose_random_nearby_monster(), filtering out those monsters that shouldn't be mutated.

All this should eventually allow choosing a random friendly monster near you, for the proposed TSO/Beogh blessings.

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

Created by dolorous on March 18, 2008

GXXYPBFEWKRZQ6OBGYNS2EXZN52NGNV3UU3WM6S5R74CMJBAKGTAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 484 [5.3]
B:BD[5.11302] → [5.11302:11340]
```
monsters *get_random_nearby_monster()
```
[5.11302]
[5.11340]
```
static bool choose_mutatable_monster(const monsters* mon)
```

Replacement in crawl-ref/source/xom.cc at line 486 [5.3]

B:BD[5.11342] → [5.11342:11372]

B:BD[5.11372] → [3.5:55]

∅:D[3.55] → [5.11420:11715]

B:BD[5.11420] → [5.11420:11715]

    monsters *monster = NULL;
    /* not particularly efficient, but oh well */
    for (int it = 0, num = 0; it < MAX_MONSTERS; it++)
    {
        monsters *mons = &menv[it];
        if (mons->alive() && mons_near(mons)
            && !mons_is_submerged(mons)
            && one_chance_in(++num))
        {
            monster = mons;
        }
    }
    return (monster);

[5.11342]

[5.11715]

    return (mons_holiness(mon) == MH_NATURAL && !mons_is_submerged(mon));

Replacement in crawl-ref/source/xom.cc at line 634 [5.3]

∅:D[6.1834] → [7.51:154]

B:BD[5.15797] → [7.51:154]

        monsters* mon = get_random_nearby_monster();
        if (mon && mon->holiness() == MH_NATURAL)

[6.1834]

[5.15854]

        int monster = choose_random_nearby_monster(0,
                          choose_mutatable_monster);
        monsters* mon = (monster != NON_MONSTER) ? &menv[monster] : NULL;
        if (mon)

Replacement in crawl-ref/source/xom.cc at line 818 [5.3]

∅:D[6.4841] → [8.41:98]

B:BD[5.23217] → [8.41:98]

B:BD[8.98] → [4.150:204]

            monsters* mon = get_random_nearby_monster();
            if (mon && mon->holiness() == MH_NATURAL)

[6.4841]

[8.148]

            int monster = choose_random_nearby_monster(0,
                              choose_mutatable_monster);
            monsters* mon = (monster != NON_MONSTER) ? &menv[monster] : NULL;
            if (mon)

Insertion in crawl-ref/source/monstuff.h at line 124 [9.1390580]

[9.1394008]

bool choose_any_monster(const monsters* mon);
int choose_random_nearby_monster(int weight,
                                 bool (*suitable)(const monsters* mon) =
                                     choose_any_monster);

Insertion in crawl-ref/source/monstuff.cc at line 2322 [9.1396662]

[10.1433]

[11.2313]

}
// The default suitable() function for choose_random_nearby_monster().
bool choose_any_monster(const monsters* mon)
{
    return true;
}
// Find a nearby monster and return its index, including you as a
// possibility with probability weight.  suitable() should return true
// for the type of monster wanted.
int choose_random_nearby_monster(int weight,
                                 bool (*suitable)(const monsters* mon))
{
    int mons_count = weight;
    int result = NON_MONSTER;
    int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
    int yend = you.y_pos + 9, xend = you.x_pos + 9;
    if ( xstart < 0 ) xstart = 0;
    if ( ystart < 0 ) ystart = 0;
    if ( xend >= GXM ) xend = GXM;
    if ( yend >= GYM ) yend = GYM;
    // monster check
    for ( int y = ystart; y < yend; ++y )
        for ( int x = xstart; x < xend; ++x )
            if ( see_grid(x,y) && mgrd[x][y] != NON_MONSTER )
            {
                result = mgrd[x][y];
                if ( suitable(&menv[result]) && one_chance_in(++mons_count) )
                    break;
                result = NON_MONSTER;
            }
    return result;

Deletion in crawl-ref/source/decks.cc at line 1348 [9.3987460]

B:BD[12.17640] → [13.293:737]

B:BD[13.737] → [2.2700:2735]

∅:D[2.2735] → [13.774:1061]

B:BD[13.774] → [13.774:1061]

}
// Find a nearby monster to banish and return its index,
// including you as a possibility with probability weight.
static int choose_random_nearby_monster(int weight)
{
    int mons_count = weight;
    int result = NON_MONSTER;
    int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
    int yend = you.y_pos + 9, xend = you.x_pos + 9;
    if ( xstart < 0 ) xstart = 0;
    if ( ystart < 0 ) ystart = 0;
    if ( xend >= GXM ) xend = GXM;
    if ( yend >= GYM ) yend = GYM;
    /* monster check */
    for ( int y = ystart; y < yend; ++y )
        for ( int x = xstart; x < xend; ++x )
            if ( see_grid(x,y) && mgrd[x][y] != NON_MONSTER )
                if ( one_chance_in(++mons_count) )
                    result = mgrd[x][y];
    return result;