fiddlerwoaroof/crawl - Change QKV56RZTWOX64VLWW52R2DEUM3HGGZNLRAJ2ZV2BHW5K422OPNJQC

* Rename beheld -> mesmerised.

Fix forget_map routine for Tiles. There are two problems remaining: a) Calling forget_map every ~20 turns is fine for ASCII since it mostly happens outside vision range anyway but looks really odd and spurious when watched in the minimap. Potential solution: Call the function more often. b) The minimap currently does not recenter but of course it should from time to time. The problem with this is that this is likely to look wobbly. Potential solution: Disable the minimap entirely while in labyrinths.

I don't like the solutions I came up with, so if anyone has a better idea please speak up.

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

Created by j-p-e-g on November 30, 2008

QKV56RZTWOX64VLWW52R2DEUM3HGGZNLRAJ2ZV2BHW5K422OPNJQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 416 [9.16817]
∅:D[4.427] → [8.136:181]
B:BD[8.136] → [8.136:181]
```
                && you.duration[DUR_BEHELD])
```
[4.427]
[8.181]
```
                && you.duration[DUR_MESMERISED])
```

Replacement in crawl-ref/source/view.cc at line 420 [9.16817]

B:BD[8.297] → [8.297:369]

                for (unsigned int i = 0; i < you.beheld_by.size(); i++)

[8.297]

[8.369]

                for (unsigned int i = 0; i < you.mesmerised_by.size(); i++)

Replacement in crawl-ref/source/view.cc at line 422 [9.16817]

B:BD[8.387] → [8.387:447]

                    monsters& mon = menv[you.beheld_by[i]];

[8.387]

[8.447]

                    monsters& mon = menv[you.mesmerised_by[i]];

Replacement in crawl-ref/source/view.cc at line 690 [9.16817]
B:BD[10.9011] → [8.1137:1176]
```
    else if (you.duration[DUR_BEHELD])
```
[10.9011]
[8.1176]
```
    else if (you.duration[DUR_MESMERISED])
```

Replacement in crawl-ref/source/view.cc at line 692 [9.16817]

B:BD[8.1182] → [8.1182:1252]

        // If beheld, colour the few grids that can be reached anyway

[8.1182]

[8.1252]

        // If mesmerised, colour the few grids that can be reached anyway

Replacement in crawl-ref/source/view.cc at line 697 [9.16817]

B:BD[8.1433] → [8.1433:1501]

            for (unsigned int i = 0; i < you.beheld_by.size(); i++)

[8.1433]

[8.1501]

            for (unsigned int i = 0; i < you.mesmerised_by.size(); i++)

Replacement in crawl-ref/source/view.cc at line 699 [9.16817]

B:BD[8.1515] → [8.1515:1571]

                monsters& mon = menv[you.beheld_by[i]];

[8.1515]

[8.1571]

                monsters& mon = menv[you.mesmerised_by[i]];

Replacement in crawl-ref/source/view.cc at line 1593 [9.16817]

B:BD[10.13930] → [11.196:264]

        if (!mermaid && loudness >= 20 && you.duration[DUR_BEHELD])

[10.13930]

[12.63]

        if (!mermaid && loudness >= 20 && you.duration[DUR_MESMERISED])

Replacement in crawl-ref/source/view.cc at line 1596 [9.16817]

B:BD[12.138] → [12.138:193]

                 you.beheld_by.size() == 1? "" : "s");

[12.138]

[12.193]

                 you.mesmerised_by.size() == 1? "" : "s");

Replacement in crawl-ref/source/view.cc at line 1598 [9.16817]

B:BD[12.257] → [12.257:334]

            you.duration[DUR_BEHELD] = 0;
            you.beheld_by.clear();

[12.257]

[12.334]

            you.duration[DUR_MESMERISED] = 0;
            you.mesmerised_by.clear();

Replacement in crawl-ref/source/tags.cc at line 1030 [9.164589]

∅:D[13.1906] → [12.543:692]

B:BD[12.543] → [12.543:692]

    marshallByte(th, you.beheld_by.size());
    for (unsigned int k = 0; k < you.beheld_by.size(); k++)
         marshallByte(th, you.beheld_by[k]);

[13.1906]

[14.146]

    marshallByte(th, you.mesmerised_by.size());
    for (unsigned int k = 0; k < you.mesmerised_by.size(); k++)
         marshallByte(th, you.mesmerised_by[k]);

Replacement in crawl-ref/source/tags.cc at line 1440 [9.164589]

B:BD[12.826] → [12.826:880]

         you.beheld_by.push_back(unmarshallByte(th));

[12.826]

[14.226]

         you.mesmerised_by.push_back(unmarshallByte(th));

Replacement in crawl-ref/source/spells4.cc at line 769 [9.436250]
∅:D[15.671] → [12.909:943]
B:BD[12.909] → [12.909:943]
```
    if (you.duration[DUR_BEHELD])
```
[15.671]
[12.943]
```
    if (you.duration[DUR_MESMERISED])
```

Replacement in crawl-ref/source/spells4.cc at line 772 [9.436250]

B:BD[12.1009] → [12.1009:1078]

        you.duration[DUR_BEHELD] = 0;
        you.beheld_by.clear();

[12.1009]

[12.1078]

        you.duration[DUR_MESMERISED] = 0;
        you.mesmerised_by.clear();

Replacement in crawl-ref/source/spells3.cc at line 1278 [9.531613]
B:BD[8.2563] → [8.2563:2605]
```
            if (you.duration[DUR_BEHELD])
```
[8.2563]
[8.2605]
```
            if (you.duration[DUR_MESMERISED])
```

Replacement in crawl-ref/source/spells3.cc at line 1281 [9.531613]

B:BD[8.2666] → [8.2666:2738]

                for (unsigned int i = 0; i < you.beheld_by.size(); i++)

[8.2666]

[8.2738]

                for (unsigned int i = 0; i < you.mesmerised_by.size(); i++)

Replacement in crawl-ref/source/spells3.cc at line 1283 [9.531613]

B:BD[8.2756] → [8.2756:2816]

                    monsters& mon = menv[you.beheld_by[i]];

[8.2756]

[8.2816]

                    monsters& mon = menv[you.mesmerised_by[i]];

Replacement in crawl-ref/source/spells3.cc at line 1495 [9.531613]

B:BD[16.168] → [16.168:228]

        for (int i = you.beheld_by.size() - 1; i >= 0; i--)

[16.168]

[16.228]

        for (int i = you.mesmerised_by.size() - 1; i >= 0; i--)

Replacement in crawl-ref/source/spells3.cc at line 1497 [9.531613]

B:BD[16.238] → [16.238:297]

            const monsters* mon = &menv[you.beheld_by[i]];

[16.238]

[17.9785]

            const monsters* mon = &menv[you.mesmerised_by[i]];

Replacement in crawl-ref/source/spells3.cc at line 1505 [9.531613]

B:BD[16.620] → [16.620:663]

                if (you.beheld_by.empty())

[16.620]

[16.663]

                if (you.mesmerised_by.empty())

Replacement in crawl-ref/source/spells3.cc at line 1507 [9.531613]

B:BD[16.681] → [16.681:731]

                    you.duration[DUR_BEHELD] = 0;

[16.681]

[16.731]

                    you.duration[DUR_MESMERISED] = 0;

Replacement in crawl-ref/source/spells1.cc at line 114 [9.616635]

B:BD[8.3530] → [8.3530:3589]

            if (!wizard_blink && you.duration[DUR_BEHELD])

[8.3530]

[8.3589]

            if (!wizard_blink && you.duration[DUR_MESMERISED])

Replacement in crawl-ref/source/spells1.cc at line 117 [9.616635]

B:BD[8.3650] → [8.3650:3722]

                for (unsigned int i = 0; i < you.beheld_by.size(); i++)

[8.3650]

[8.3722]

                for (unsigned int i = 0; i < you.mesmerised_by.size(); i++)

Replacement in crawl-ref/source/spells1.cc at line 119 [9.616635]

B:BD[8.3740] → [8.3740:3800]

                    monsters& mon = menv[you.beheld_by[i]];

[8.3740]

[8.3800]

                    monsters& mon = menv[you.mesmerised_by[i]];

Replacement in crawl-ref/source/player.h at line 281 [9.945993]
B:BD[9.956579] → [12.1107:1153]
```
bool player_beheld_by( const monsters *mon );
```
[9.956579]
[12.1153]
```
bool player_mesmerised_by( const monsters *mon );
```

Replacement in crawl-ref/source/player.cc at line 2620 [9.962854]

B:BD[12.1288] → [18.4973:5029]

∅:D[18.5029] → [12.1343:1388]

B:BD[12.1343] → [12.1343:1388]

// Returns true if player is beheld by a given monster.
bool player_beheld_by( const monsters *mon )

[12.1288]

[12.1388]

// Returns true if player is mesmerised by a given monster.
bool player_mesmerised_by( const monsters *mon )

Replacement in crawl-ref/source/player.cc at line 2623 [9.962854]
B:BD[12.1390] → [12.1390:1425]
```
    if (!you.duration[DUR_BEHELD])
```
[12.1390]
[19.16162]
```
    if (!you.duration[DUR_MESMERISED])
```

Replacement in crawl-ref/source/player.cc at line 2631 [9.962854]

B:BD[12.1580] → [12.1580:1788]

    mprf(MSGCH_DIAGNOSTICS, "beheld_by.size: %d, DUR_BEHELD: %d, current mon: %d",
                            you.beheld_by.size(), you.duration[DUR_BEHELD],
                            monster_index(mon));

[12.1580]

[12.1788]

    mprf(MSGCH_DIAGNOSTICS, "mesmerised_by.size: %d, DUR_MESMERISED: %d, "
                            "current mon: %d", you.mesmerised_by.size(),
                            you.duration[DUR_MESMERISED], monster_index(mon));

Replacement in crawl-ref/source/player.cc at line 2636 [9.962854]
B:BD[12.1796] → [12.1796:1847]
```
    if (you.beheld_by.empty()) // shouldn't happen
```
[12.1796]
[12.1847]
```
    if (you.mesmerised_by.empty()) // shouldn't happen
```
Replacement in crawl-ref/source/player.cc at line 2638 [9.962854]
B:BD[12.1853] → [12.1853:1891]
```
        you.duration[DUR_BEHELD] = 0;
```
[12.1853]
[19.16212]
```
        you.duration[DUR_MESMERISED] = 0;
```
Replacement in crawl-ref/source/player.cc at line 2642 [9.962854]
∅:D[20.4719] → [12.1924:1984]
B:BD[12.1924] → [12.1924:1984]
```
    for (unsigned int i = 0; i < you.beheld_by.size(); i++)
```
[20.4719]
[12.1984]
```
    for (unsigned int i = 0; i < you.mesmerised_by.size(); i++)
```

Replacement in crawl-ref/source/player.cc at line 2644 [9.962854]

B:BD[12.1990] → [12.1990:2042]

         unsigned int which_mon = you.beheld_by[i];

[12.1990]

[12.2042]

         unsigned int which_mon = you.mesmerised_by[i];

Replacement in crawl-ref/source/player.cc at line 2656 [9.962854]
B:BD[12.2325] → [21.3431:3479]
```
    if (!player_beheld_by(mon)) // Not in list?
```
[12.2325]
[12.2373]
```
    if (!player_mesmerised_by(mon)) // Not in list?
```

Replacement in crawl-ref/source/player.cc at line 2664 [9.962854]

B:BD[12.2670] → [12.2670:2754]

        const std::vector<int> help = you.beheld_by;
        you.beheld_by.clear();

[12.2670]

[12.2754]

        const std::vector<int> help = you.mesmerised_by;
        you.mesmerised_by.clear();

Replacement in crawl-ref/source/player.cc at line 2671 [9.962854]

B:BD[12.2917] → [12.2917:2962]

                 you.beheld_by.push_back(i);

[12.2917]

[12.2962]

                 you.mesmerised_by.push_back(i);

Replacement in crawl-ref/source/player.cc at line 2674 [9.962854]
B:BD[12.2973] → [12.2973:3008]
```
        if (you.beheld_by.empty())
```
[12.2973]
[12.3008]
```
        if (you.mesmerised_by.empty())
```
Replacement in crawl-ref/source/player.cc at line 2677 [9.962854]
B:BD[12.3083] → [12.3083:3125]
```
            you.duration[DUR_BEHELD] = 0;
```
[12.3083]
[12.3125]
```
            you.duration[DUR_MESMERISED] = 0;
```

Replacement in crawl-ref/source/player.cc at line 2684 [9.962854]

B:BD[16.904] → [16.904:960]

    for (int i = you.beheld_by.size() - 1; i >= 0; i--)

[16.904]

[16.960]

    for (int i = you.mesmerised_by.size() - 1; i >= 0; i--)

Replacement in crawl-ref/source/player.cc at line 2686 [9.962854]

B:BD[16.966] → [16.966:1021]

        const monsters* mon = &menv[you.beheld_by[i]];

[16.966]

[7.21751]

        const monsters* mon = &menv[you.mesmerised_by[i]];

Replacement in crawl-ref/source/player.cc at line 2691 [9.962854]

B:BD[16.1128] → [16.1128:1201]

                mpr("Dead mermaid still beholding?", MSGCH_DIAGNOSTICS);

[16.1128]

[7.21820]

                mpr("Dead mermaid/siren still mesmerising?", MSGCH_DIAGNOSTICS);

Replacement in crawl-ref/source/player.cc at line 2694 [9.962854]

∅:D[7.21851] → [16.1249:1320]

B:BD[16.1249] → [16.1249:1320]

                mprf(MSGCH_DIAGNOSTICS, "Non-mermaid '%s' beholding?",

[7.21851]

[16.1320]

                mprf(MSGCH_DIAGNOSTICS, "Non-mermaid/siren '%s' mesmerising?",

Replacement in crawl-ref/source/player.cc at line 2699 [9.962854]

B:BD[16.1387] → [16.1387:1486]

            you.beheld_by.erase(you.beheld_by.begin() + i);
            if (you.beheld_by.empty())

[16.1387]

[16.1486]

            you.mesmerised_by.erase(you.mesmerised_by.begin() + i);
            if (you.mesmerised_by.empty())

Replacement in crawl-ref/source/player.cc at line 2703 [9.962854]

B:BD[16.1569] → [16.1569:1615]

                you.duration[DUR_BEHELD] = 0;

[16.1569]

[16.1615]

                you.duration[DUR_MESMERISED] = 0;

Replacement in crawl-ref/source/player.cc at line 2715 [9.962854]

B:BD[16.1948] → [16.1948:2019]

            mprf(MSGCH_DIAGNOSTICS, "%d walls between beholding '%s' "

[16.1948]

[16.2019]

            mprf(MSGCH_DIAGNOSTICS, "%d walls between mesmerising '%s' "

Replacement in crawl-ref/source/player.cc at line 2718 [9.962854]

B:BD[16.2102] → [16.2102:2201]

            you.beheld_by.erase(you.beheld_by.begin() + i);
            if (you.beheld_by.empty())

[16.2102]

[16.2201]

            you.mesmerised_by.erase(you.mesmerised_by.begin() + i);
            if (you.mesmerised_by.empty())

Replacement in crawl-ref/source/player.cc at line 2722 [9.962854]

B:BD[16.2284] → [16.2284:2330]

                you.duration[DUR_BEHELD] = 0;

[16.2284]

[16.2330]

                you.duration[DUR_MESMERISED] = 0;

Replacement in crawl-ref/source/player.cc at line 2729 [9.962854]

B:BD[16.2406] → [16.2406:2469]

    if (you.duration[DUR_BEHELD] > 0 && you.beheld_by.empty())

[16.2406]

[16.2469]

    if (you.duration[DUR_MESMERISED] > 0 && you.mesmerised_by.empty())

Replacement in crawl-ref/source/player.cc at line 2732 [9.962854]

B:BD[16.2485] → [16.2485:2550]

        mpr("Beheld with no mermaids left?", MSGCH_DIAGNOSTICS);

[16.2485]

[16.2550]

        mpr("Mesmerised with no mermaids/sirens left?", MSGCH_DIAGNOSTICS);

Replacement in crawl-ref/source/player.cc at line 2736 [9.962854]
B:BD[16.2619] → [16.2619:2657]
```
        you.duration[DUR_BEHELD] = 0;
```
[16.2619]
[16.2657]
```
        you.duration[DUR_MESMERISED] = 0;
```

Replacement in crawl-ref/source/player.cc at line 2856 [9.962854]

B:BD[9.1006657] → [5.2447:2578]

    int radius = 25*25;
    if (chance_forgotten < 100 && you.level_type == LEVEL_LABYRINTH
        && you.species == SP_MINOTAUR)

[9.1006657]

[5.2578]

    // The radius is only used in labyrinths.
    const bool use_lab_check = (!force && you.level_type == LEVEL_LABYRINTH
                                && chance_forgotten < 100);
    const int radius = (use_lab_check && you.species == SP_MINOTAUR) ? 40*40
                                                                     : 25*25;
    for (rectangle_iterator ri(1); ri; ++ri)

Replacement in crawl-ref/source/player.cc at line 2863 [9.962854]

B:BD[5.2584] → [5.2584:2614]

∅:D[5.2614] → [22.523:582]

B:BD[9.1006657] → [22.523:582]

B:BD[9.1006708] → [22.583:646]

        radius = 40*40;
    }
    for (unsigned char xcount = 0; xcount < GXM; xcount++)
        for (unsigned char ycount = 0; ycount < GYM; ycount++)

[5.2584]

[9.1006757]

        if (!see_grid(*ri)
            && (force || x_chance_in_y(chance_forgotten, 100)
                || use_lab_check && (you.pos()-*ri).abs() > radius))

Replacement in crawl-ref/source/player.cc at line 2867 [9.962854]

B:BD[9.1006767] → [5.2615:2837]

∅:D[5.2837] → [19.16609:16686]

∅:D[23.6299] → [19.16609:16686]

B:BD[19.16609] → [19.16609:16686]

∅:D[22.834] → [9.1006889:1006899]

∅:D[24.12956] → [9.1006889:1006899]

∅:D[19.16686] → [9.1006889:1006899]

B:BD[9.1006889] → [9.1006889:1006899]

B:BD[9.1006899] → [20.4857:4858]

            const coord_def c(xcount, ycount);
            if (!see_grid(c)
                && (force || x_chance_in_y(chance_forgotten, 100)
                    || chance_forgotten < 100 && (you.pos()-c).abs() > radius))
            {
                env.map[xcount][ycount].clear();
            }
        }

[9.1006767]

[25.5747363]

            env.map(*ri).clear();

Replacement in crawl-ref/source/player.cc at line 2869 [9.962854]

B:BD[25.5747379] → [26.164332:164359]

    tiles.clear_minimap();

[25.5747379]

[25.5747422]

            set_envmap_obj(*ri, 0);
            tiles.update_minimap(ri->x, ri->y);
            env.tile_bk_fg[ri->x][ri->y] = 0;
            env.tile_bk_bg[ri->x][ri->y]
                = tileidx_feature(DNGN_UNSEEN, ri->x, ri->y);

Insertion in crawl-ref/source/player.cc at line 2875 [9.962854]
[25.5747429]
[19.16687]
```
        }
    }
```

Replacement in crawl-ref/source/player.cc at line 3923 [9.962854]

B:BD[12.3143] → [12.3143:3177]

B:BD[12.3177] → [27.3409:3441]

    if (you.duration[DUR_BEHELD])
        mpr("You are beheld.");

[12.3143]

[9.1033533]

    // TODO: Distinguish between mermaids and sirens!
    if (you.duration[DUR_MESMERISED])
        mpr("You are mesmerised.");

Replacement in crawl-ref/source/output.cc at line 546 [9.1088282]

B:BD[28.7346] → [29.2611:2679]

// confused, beheld, fire, poison, disease, rot, held, glow, swift,

[28.7346]

[2.2550]

// confused, mesmerised, fire, poison, disease, rot, held, glow, swift,

Replacement in crawl-ref/source/output.cc at line 691 [9.1088282]

∅:D[30.2806] → [31.12955:12989]

∅:D[32.3265] → [31.12955:12989]

B:BD[31.12955] → [31.12955:12989]

B:BD[31.12995] → [28.10616:10666]

    if (you.duration[DUR_BEHELD])
        out.push_back(status_light(RED, "Bhld"));

[30.2806]

[9.1095985]

    // TODO: Differentiate between mermaids and sirens!
    if (you.duration[DUR_MESMERISED])
        out.push_back(status_light(RED, "Mesm"));

Replacement in crawl-ref/source/monstuff.cc at line 2864 [9.1396662]

B:BD[7.22468] → [7.22468:22555]

    if (mon->travel_target == MTRAV_SIREN && !one_chance_in(8))
        return (true);

[7.22468]

[7.22555]

    if (mon->travel_target == MTRAV_SIREN)
    {
        coord_def targ_pos(mon->travel_path[mon->travel_path.size()-1]);
        if ((mon->pos() - targ_pos).rdist() > 2)
            return (true);
    }

Replacement in crawl-ref/source/monstuff.cc at line 3416 [9.1396662]

B:BD[7.24367] → [7.24367:24413]

                    if (player_beheld_by(mon)

[7.24367]

[7.24413]

                    if (player_mesmerised_by(mon)

Replacement in crawl-ref/source/monstuff.cc at line 4227 [9.1396662]

∅:D[33.48744] → [34.5198:5274]

B:BD[35.6966] → [34.5198:5274]

        && !player_beheld_by(monster) // No submerging if player entranced.

[33.48744]

[36.2681]

        && !player_mesmerised_by(monster) // No submerging if player entranced.

Replacement in crawl-ref/source/monstuff.cc at line 4700 [9.1396662]

B:BD[10.423560] → [12.4688:4745]

        bool already_beheld = player_beheld_by(monster);

[10.423560]

[37.8087]

        bool already_mesmerised = player_mesmerised_by(monster);

Replacement in crawl-ref/source/monstuff.cc at line 4703 [9.1396662]

B:BD[12.4787] → [12.4787:4860]

            || monster->foe == MHITYOU && !already_beheld && coinflip())

[12.4787]

[12.4860]

            || monster->foe == MHITYOU && !already_mesmerised && coinflip())

Replacement in crawl-ref/source/monstuff.cc at line 4711 [9.1396662]

B:BD[12.5034] → [3.2756:2831]

                    already_beheld ? "her luring" : "a haunting").c_str(),

[12.5034]

[38.7790]

                    already_mesmerised ? "her luring" : "a haunting").c_str(),

Replacement in crawl-ref/source/monstuff.cc at line 4716 [9.1396662]

B:BD[12.5195] → [39.3985:4135]

∅:D[39.4135] → [12.5344:5380]

B:BD[12.5344] → [12.5344:5380]

                // If you're already beheld by an invisible mermaid she can
                // still prolong the enchantment; otherwise you "resist".
                if (already_beheld)

[12.5195]

[12.5380]

                // If you're already mesmerised by an invisible mermaid she
                // can still prolong the enchantment; otherwise you "resist".
                if (already_mesmerised)

Replacement in crawl-ref/source/monstuff.cc at line 4735 [9.1396662]

B:BD[37.8092] → [39.4136:4215]

∅:D[39.4215] → [12.6057:6089]

B:BD[12.6057] → [12.6057:6089]

            // Once beheld by a particular monster, you cannot resist anymore.
            if (!already_beheld

[37.8092]

[12.6089]

            // Once mesmerised by a particular monster, you cannot resist
            // anymore.
            if (!already_mesmerised

Replacement in crawl-ref/source/monstuff.cc at line 4744 [9.1396662]
B:BD[12.6258] → [12.6258:6301]
```
            if (!you.duration[DUR_BEHELD])
```
[12.6258]
[12.6301]
```
            if (!you.duration[DUR_MESMERISED])
```

Replacement in crawl-ref/source/monstuff.cc at line 4746 [9.1396662]

B:BD[12.6315] → [12.6315:6478]

                you.duration[DUR_BEHELD] = 7;
                you.beheld_by.push_back(monster_index(monster));
                mpr("You are beheld!", MSGCH_WARN);

[12.6315]

[12.6478]

                you.duration[DUR_MESMERISED] = 7;
                you.mesmerised_by.push_back(monster_index(monster));
                mprf(MSGCH_WARN, "You are mesmerised by %s!",
                                 monster->name(DESC_NOCAP_THE));

Replacement in crawl-ref/source/monstuff.cc at line 4753 [9.1396662]

B:BD[12.6523] → [12.6523:6676]

                you.duration[DUR_BEHELD] += 5;
                if (!already_beheld)
                    you.beheld_by.push_back(monster_index(monster));

[12.6523]

[12.6676]

                you.duration[DUR_MESMERISED] += 5;
                if (!already_mesmerised)
                    you.mesmerised_by.push_back(monster_index(monster));

Replacement in crawl-ref/source/monstuff.cc at line 4759 [9.1396662]

B:BD[12.6716] → [12.6716:6810]

            if (you.duration[DUR_BEHELD] > 12)
                you.duration[DUR_BEHELD] = 12;

[12.6716]

[12.6810]

            if (you.duration[DUR_MESMERISED] > 12)
                you.duration[DUR_MESMERISED] = 12;

Replacement in crawl-ref/source/monstuff.cc at line 6518 [9.1396662]

B:BD[12.6897] → [40.5933:5982]

∅:D[40.5982] → [12.6945:6987]

B:BD[12.6945] → [12.6945:6987]

            // Clear list of beholding monsters.
            if (you.duration[DUR_BEHELD])

[12.6897]

[12.6987]

            // Clear list of mesmerisinging monsters.
            if (you.duration[DUR_MESMERISED])

Replacement in crawl-ref/source/monstuff.cc at line 6521 [9.1396662]

B:BD[12.7001] → [12.7001:7086]

                you.beheld_by.clear();
                you.duration[DUR_BEHELD] = 0;

[12.7001]

[12.7086]

                you.mesmerised_by.clear();
                you.duration[DUR_MESMERISED] = 0;

Replacement in crawl-ref/source/misc.cc at line 2411 [9.1933596]
∅:D[41.7541] → [12.8752:8786]
B:BD[12.8752] → [12.8752:8786]
```
    if (you.duration[DUR_BEHELD])
```
[41.7541]
[12.8786]
```
    if (you.duration[DUR_MESMERISED])
```

Replacement in crawl-ref/source/misc.cc at line 2413 [9.1933596]

B:BD[12.8792] → [12.8792:8861]

        you.beheld_by.clear();
        you.duration[DUR_BEHELD] = 0;

[12.8792]

[12.8861]

        you.mesmerised_by.clear();
        you.duration[DUR_MESMERISED] = 0;

Replacement in crawl-ref/source/externs.h at line 698 [9.3270163]

B:BD[12.9804] → [12.9804:9863]

  std::vector<int> beheld_by; // monsters beholding player

[12.9804]

[42.1756]

  std::vector<int> mesmerised_by; // monsters mesmerising player

Replacement in crawl-ref/source/enum.h at line 1093 [9.3287960]
B:BD[43.14707] → [12.9865:9881]
```
    DUR_BEHELD,
```
[43.14707]
[43.14707]
```
    DUR_MESMERISED,
```

Insertion in crawl-ref/source/effects.cc at line 2610 [9.3382105]

[44.2991]

[45.5935]


        // Shift blood some most of the time.
        if (is_bloodcovered(c))
        {
            if (one_chance_in(4))
            {
                int wall_count = 0;
                coord_def old_adj(c);
                for (adjacent_iterator ai(c); ai; ++ai)
                    if (grid_is_wall(grd(*ai)) && one_chance_in(++wall_count))
                        old_adj = *ai;
                if (old_adj != c)
                {
                    if (!is_bloodcovered(old_adj))
                        env.map(old_adj).property |= FPROP_BLOODY;
                    env.map(c).property &= (~FPROP_BLOODY);
                }
            }
        }
        else if (one_chance_in(750))
        {
            // Sometimes (rarely) add blood randomly, accumulating with time...
            env.map(p).property |= FPROP_BLOODY;
        }

Deletion in crawl-ref/source/effects.cc at line 2638 [9.3382105]

B:BD[44.3119] → [46.15044:15236]

        // TODO: Blood is currently left on the grid even though it turned
        //       into a wall or floor. Rather, it should be nudged aside to
        //       a grid of similar type.

Insertion in crawl-ref/source/effects.cc at line 2663 [9.3382105]

[45.6473]

[47.11985]


        // Shift blood some of the time.
        if (is_bloodcovered(p))
        {
            if (one_chance_in(4))
            {
                int floor_count = 0;
                coord_def new_adj(p);
                for (adjacent_iterator ai(c); ai; ++ai)
                    if (_is_floor(grd(*ai)) && one_chance_in(++floor_count))
                        new_adj = *ai;
                if (new_adj != p)
                {
                    if (!is_bloodcovered(new_adj))
                        env.map(new_adj).property |= FPROP_BLOODY;
                    env.map(p).property &= (~FPROP_BLOODY);
                }
            }
        }
        else if (one_chance_in(150))
        {
            // Occasionally add blood randomly, accumulating with time...
            env.map(p).property |= FPROP_BLOODY;
        }

Replacement in crawl-ref/source/effects.cc at line 3514 [9.3382105]
B:BD[48.26427] → [33.71157:71208]
```
        for ( rectangle_iterator ri(1); ri; ++ri )
```
[48.26427]
[33.71208]
```
        for (rectangle_iterator ri(1); ri; ++ri)
```

Replacement in crawl-ref/source/directn.cc at line 536 [9.3697945]

B:BD[49.3369] → [8.6649:6739]

            if (player_beheld_by(list_mons[i]))
                str += ", beholding you";

[49.3369]

[8.6739]

            if (player_mesmerised_by(list_mons[i]))
                str += ", keeping you mesmerised";

Replacement in crawl-ref/source/directn.cc at line 2775 [9.3697945]

B:BD[50.2460] → [12.10212:10302]

    if (player_beheld_by(mon))
        mpr("You are beheld by her song.", MSGCH_EXAMINE);

[50.2460]

[51.33769]

    if (player_mesmerised_by(mon))
        mpr("You are mesmerised by her song.", MSGCH_EXAMINE);

Insertion in crawl-ref/source/delay.cc at line 395 [9.3963459]

[52.5750]

[53.3788]


            // Maybe we should do precisely that, but that would entirely
            // defeat the purpose of the weapon swap.
//            you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;

Replacement in crawl-ref/source/acr.cc at line 665 [9.4397395]
∅:D[54.7009] → [12.10374:10412]
B:BD[43.16234] → [12.10374:10412]
```
        if (you.duration[DUR_BEHELD])
```
[54.7009]
[12.10412]
```
        if (you.duration[DUR_MESMERISED])
```

Replacement in crawl-ref/source/acr.cc at line 667 [9.4397395]

B:BD[12.10422] → [12.10422:10499]

            you.duration[DUR_BEHELD] = 0;
            you.beheld_by.clear();

[12.10422]

[12.10499]

            you.duration[DUR_MESMERISED] = 0;
            you.mesmerised_by.clear();

Replacement in crawl-ref/source/acr.cc at line 1669 [9.4397395]
B:BD[55.24576] → [56.18753:18788]
```
static bool _stairs_check_beheld()
```
[55.24576]
[16.3271]
```
static bool _stairs_check_mesmerised()
```

Replacement in crawl-ref/source/acr.cc at line 1671 [9.4397395]

B:BD[16.3273] → [57.3918:3971]

    if (you.duration[DUR_BEHELD] && !you.confused())

[16.3273]

[16.3334]

    if (you.duration[DUR_MESMERISED] && !you.confused())

Replacement in crawl-ref/source/acr.cc at line 1674 [9.4397395]

B:BD[16.3386] → [16.3386:3459]

             menv[you.beheld_by[0]].name(DESC_NOCAP_THE, true).c_str());

[16.3386]

[19.44224]

             menv[you.mesmerised_by[0]].name(DESC_NOCAP_THE, true).c_str());

Replacement in crawl-ref/source/acr.cc at line 1691 [9.4397395]
B:BD[16.3510] → [56.18847:18879]
```
    if (_stairs_check_beheld())
```
[16.3510]
[58.382]
```
    if (_stairs_check_mesmerised())
```
Replacement in crawl-ref/source/acr.cc at line 1734 [9.4397395]
B:BD[16.3560] → [56.18910:18942]
```
    if (_stairs_check_beheld())
```
[16.3559]
[16.3591]
```
    if (_stairs_check_mesmerised())
```

Replacement in crawl-ref/source/acr.cc at line 2777 [9.4397395]

B:BD[12.10547] → [6.3914:3988]

    if ( _decrement_a_duration(DUR_BEHELD, "You break out of your daze.",

[12.10547]

[6.3988]

    if ( _decrement_a_duration(DUR_MESMERISED, "You break out of your daze.",

Replacement in crawl-ref/source/acr.cc at line 2780 [9.4397395]
B:BD[12.10689] → [12.10689:10720]
```
        you.beheld_by.clear();
```
[12.10689]
[12.10720]
```
        you.mesmerised_by.clear();
```

Replacement in crawl-ref/source/acr.cc at line 4059 [9.4397395]

B:BD[17.66459] → [57.4273:4326]

    if (you.duration[DUR_BEHELD] && !you.confused())

[17.66459]

[59.3357]

    if (you.duration[DUR_MESMERISED] && !you.confused())

Replacement in crawl-ref/source/acr.cc at line 4061 [9.4397395]
∅:D[59.3363] → [12.11237:11301]
B:BD[12.11237] → [12.11237:11301]
```
        for (unsigned int i = 0; i < you.beheld_by.size(); i++)
```
[59.3363]
[12.11301]
```
        for (unsigned int i = 0; i < you.mesmerised_by.size(); i++)
```

Replacement in crawl-ref/source/acr.cc at line 4063 [9.4397395]

B:BD[12.11311] → [17.66460:66513]

             monsters& mon = menv[you.beheld_by[i]];

[12.11311]

[17.66513]

             monsters& mon = menv[you.mesmerised_by[i]];