fiddlerwoaroof/crawl - Change USNTAFJF3IA4JD6E26RY4MHVMFBEKRBHFJC6KV3MAF2MFW4G4MDAC

Rewrite _set_nearest_monster_foe.

With the previous one_chance_ins, it was failing quite often with enemies in view.

Created by Robert Vollmert on October 29, 2009

USNTAFJF3IA4JD6E26RY4MHVMFBEKRBHFJC6KV3MAF2MFW4G4MDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 4819 [6.1396662]

B:BD[4.245] → [5.25615:25682]

∅:D[5.25682] → [7.2558:2619]

B:BD[8.5223] → [7.2558:2619]

static bool _mons_check_set_foe(monsters *mon, const coord_def& p,
                                bool friendly, bool neutral)

[4.245]

[4.351]

static bool _mons_check_foe(monsters *mon, const coord_def& p,
                            bool friendly, bool neutral)

Deletion in crawl-ref/source/monstuff.cc at line 4828 [6.1396662]
B:BD[4.505] → [4.505:533]
```
        mon->foe = MHITYOU;
```
Deletion in crawl-ref/source/monstuff.cc at line 4839 [6.1396662]
B:BD[4.774] → [2.5483:5521]
```
            mon->foe = foe->mindex();
```

Replacement in crawl-ref/source/monstuff.cc at line 4853 [6.1396662]

B:BD[3.3017] → [3.3017:3070]

        int count = 0;
        bool success = false;

[3.3017]

[3.3070]

        std::vector<coord_def> monster_pos;

Replacement in crawl-ref/source/monstuff.cc at line 4858 [6.1396662]

B:BD[3.3257] → [3.3257:3443]

                if (one_chance_in(++count)
                    && _mons_check_set_foe(mon, p, friendly, neutral))
                {
                    success = true;
                }

[3.3257]

[3.3443]

                if (_mons_check_foe(mon, p, friendly, neutral))
                    monster_pos.push_back(p);

Insertion in crawl-ref/source/monstuff.cc at line 4861 [6.1396662]
[3.3457]
[3.3457]
```
        if (monster_pos.empty())
            continue;
```

Replacement in crawl-ref/source/monstuff.cc at line 4864 [6.1396662]

B:BD[3.3458] → [3.3458:3498]

        if (success)
            break;

[3.3458]

[3.3498]

        const coord_def mpos = monster_pos[random2(monster_pos.size())];
        if (mpos == you.pos())
            mon->foe = MHITYOU;
        else
            mon->foe = env.mgrid(mpos);
        return;