fiddlerwoaroof/crawl - Change 2UQXBHFFMTZG5M6NPB7KS7WNIH6VPBPVJFO4AN3YPCMZBT637ICAC

Make sirens draw the player in their direction. This will not actually

pull the player into deep water, but it's a scary enough effect.

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

Created by j-p-e-g on December 1, 2008

2UQXBHFFMTZG5M6NPB7KS7WNIH6VPBPVJFO4AN3YPCMZBT637ICAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 175 [4.616635]
B:BD[4.619202] → [5.715:752]
```
            // no longer held in net
```
[4.619202]
[5.752]
```
            // No longer held in net.
```

Replacement in crawl-ref/source/spells1.cc at line 180 [4.616635]

B:BD[4.619269] → [4.619269:619336]

            // controlling teleport contaminates the player -- bwr

[4.619269]

[6.7589]

            // Controlling teleport contaminates the player. -- bwr

Replacement in crawl-ref/source/spells1.cc at line 193 [4.616635]
∅:D[7.153046] → [4.619574:619621]
B:BD[4.619574] → [4.619574:619621]
```
}                               // end blink()
```
[7.153046]
[4.619621]
```
}
```

Replacement in crawl-ref/source/player.cc at line 119 [4.962854]

B:BD[7.338336] → [8.18014:18050]

B:BD[8.18050] → [9.2775:2824]

    const int cloud = env.cgrid(p);
    if (cloud != EMPTY_CLOUD && !you.confused())

[7.338336]

[10.2748]

    // Don't prompt if force is true.
    if (!force)

Replacement in crawl-ref/source/player.cc at line 122 [4.962854]

B:BD[10.2754] → [10.2754:2812]

B:BD[10.2812] → [11.3763:3827]

B:BD[11.3827] → [2.2698:2741]

∅:D[2.2741] → [8.18051:18172]

B:BD[10.2919] → [8.18051:18172]

        const cloud_type ctype = env.cloud[ cloud ].type;
        // Don't prompt if already in a cloud of the same type.
        if (is_damaging_cloud(ctype, true)
            && (env.cgrid(you.pos()) == EMPTY_CLOUD
                || ctype != env.cloud[ env.cgrid(you.pos()) ].type))

[10.2754]

[10.3062]

        const int cloud = env.cgrid(p);
        if (cloud != EMPTY_CLOUD && !you.confused())

Replacement in crawl-ref/source/player.cc at line 125 [4.962854]

B:BD[10.3072] → [10.3072:3257]

            std::string prompt = make_stringf(
                                    "Really step into that cloud of %s?",
                                    cloud_name(ctype).c_str());

[10.3072]

[10.3257]

            const cloud_type ctype = env.cloud[ cloud ].type;
            // Don't prompt if already in a cloud of the same type.
            if (is_damaging_cloud(ctype, true)
                && (env.cgrid(you.pos()) == EMPTY_CLOUD
                    || ctype != env.cloud[ env.cgrid(you.pos()) ].type))
            {
                std::string prompt = make_stringf(
                                        "Really step into that cloud of %s?",
                                        cloud_name(ctype).c_str());

Replacement in crawl-ref/source/player.cc at line 135 [4.962854]

B:BD[10.3258] → [10.3258:3434]

            if (!yesno(prompt.c_str(), false, 'n'))
            {
                canned_msg(MSG_OK);
                you.turn_is_over = false;
                return (false);

[10.3258]

[10.3434]

                if (!yesno(prompt.c_str(), false, 'n'))
                {
                    canned_msg(MSG_OK);
                    you.turn_is_over = false;
                    return (false);
                }

Deletion in crawl-ref/source/player.cc at line 143 [4.962854]
B:BD[10.3458] → [10.3458:3464]
```
    }
```
Replacement in crawl-ref/source/player.cc at line 144 [4.962854]
B:BD[10.3465] → [11.3828:3889]
∅:D[11.3889] → [12.181:227]
B:BD[7.338395] → [12.181:227]
∅:D[12.227] → [7.338477:338483]
∅:D[13.273] → [7.338477:338483]
B:BD[7.338477] → [7.338477:338483]
B:BD[7.338483] → [13.274:322]
```
    // If we're walking along, give a chance to avoid traps.
    if (stepped && !force && !you.confused())
    {
        if (new_grid == DNGN_UNDISCOVERED_TRAP)
```
[10.3465]
[7.338704]
```
        // If we're walking along, give a chance to avoid traps.
        if (stepped && !you.confused())
```

Replacement in crawl-ref/source/player.cc at line 147 [4.962854]

B:BD[7.338714] → [13.323:384]

B:BD[13.384] → [14.5855:6009]

            const int skill = 4 + you.skills[SK_TRAPS_DOORS]
                                + player_mutation_level(MUT_ACUTE_VISION)
                                - 2 * player_mutation_level(MUT_BLURRY_VISION);

[7.338714]

[7.338854]

            if (new_grid == DNGN_UNDISCOVERED_TRAP)
            {
                const int skill = 4 + you.skills[SK_TRAPS_DOORS]
                                    + player_mutation_level(MUT_ACUTE_VISION)
                                    - 2 * player_mutation_level(MUT_BLURRY_VISION);

Replacement in crawl-ref/source/player.cc at line 153 [4.962854]

B:BD[7.338855] → [15.24705:24741]

∅:D[15.24741] → [13.559:573]

B:BD[13.559] → [13.559:573]

B:BD[13.573] → [15.24742:24831]

            if (random2(skill) > 6)
            {
                if (trap_def* ptrap = find_trap(p))
                    ptrap->reveal();

[7.338855]

[16.2689]

                if (random2(skill) > 6)
                {
                    if (trap_def* ptrap = find_trap(p))
                        ptrap->reveal();

Replacement in crawl-ref/source/player.cc at line 158 [4.962854]

B:BD[16.2690] → [16.2690:2731]

                viewwindow(true, false);

[16.2690]

[16.2731]

                    viewwindow(true, false);

Replacement in crawl-ref/source/player.cc at line 160 [4.962854]

∅:D[16.2732] → [13.573:725]

B:BD[13.573] → [13.573:725]

                mprf( MSGCH_WARN,
                      "Wait a moment, %s!  Do you really want to step there?",
                      you.your_name );

[16.2732]

[11.3890]

                    mprf( MSGCH_WARN,
                          "Wait a moment, %s!  Do you really want to step there?",
                          you.your_name );

Replacement in crawl-ref/source/player.cc at line 164 [4.962854]

∅:D[11.3891] → [17.2784:2862]

B:BD[13.725] → [17.2784:2862]

                if (!you.running.is_any_travel())
                    more();

[11.3891]

[7.338919]

                    if (!you.running.is_any_travel())
                        more();

Replacement in crawl-ref/source/player.cc at line 167 [4.962854]

B:BD[7.338920] → [13.751:798]

                exercise( SK_TRAPS_DOORS, 3 );

[7.338920]

[13.798]

                    exercise( SK_TRAPS_DOORS, 3 );

Replacement in crawl-ref/source/player.cc at line 169 [4.962854]

B:BD[13.799] → [13.799:841]

                you.turn_is_over = false;

[13.799]

[7.338958]

                    you.turn_is_over = false;

Replacement in crawl-ref/source/player.cc at line 171 [4.962854]

B:BD[7.339087] → [13.982:1014]

                return (false);

[7.338959]

[13.1014]

                    return (false);
                }

Replacement in crawl-ref/source/player.cc at line 174 [4.962854]
B:BD[13.1028] → [11.3892:3902]
∅:D[11.3902] → [18.693:740]
B:BD[13.1054] → [18.693:740]
```
        }
        else if (new_grid == DNGN_TRAP_MAGICAL
```
[13.1028]
[19.2621]
```
            else if (new_grid == DNGN_TRAP_MAGICAL
```

Replacement in crawl-ref/source/player.cc at line 176 [4.962854]

B:BD[19.2642] → [19.2642:2738]

                 || new_grid == DNGN_TRAP_MECHANICAL
                    && Options.trap_prompt

[19.2642]

[19.2738]

                     || new_grid == DNGN_TRAP_MECHANICAL
                        && Options.trap_prompt

Replacement in crawl-ref/source/player.cc at line 179 [4.962854]
∅:D[19.2745] → [18.740:791]
B:BD[18.740] → [18.740:791]
∅:D[18.791] → [13.1102:1112]
B:BD[13.1102] → [13.1102:1112]
B:BD[13.1112] → [15.24832:24885]
∅:D[8.18343] → [20.2882:2916]
∅:D[15.24885] → [20.2882:2916]
B:BD[20.2882] → [20.2882:2916]
```
                 || new_grid == DNGN_TRAP_NATURAL)
        {
            const trap_type type = get_trap_type(p);
            if (type == TRAP_ZOT)
```
[19.2745]
[19.2796]
```
                     || new_grid == DNGN_TRAP_NATURAL)
```

Replacement in crawl-ref/source/player.cc at line 181 [4.962854]

B:BD[19.2810] → [10.3466:3546]

                if (!yes_or_no("Do you really want to step into the Zot trap"))

[19.2810]

[19.3077]

                const trap_type type = get_trap_type(p);
                if (type == TRAP_ZOT)

Replacement in crawl-ref/source/player.cc at line 184 [4.962854]

B:BD[19.3095] → [19.3095:3135]

B:BD[19.3135] → [21.4706:4742]

∅:D[21.4742] → [19.3135:3217]

B:BD[19.3135] → [19.3135:3217]

                    canned_msg(MSG_OK);
                    stop_running();
                    you.turn_is_over = false;
                    return (false);

[19.3095]

[19.3217]

                    if (!yes_or_no("Do you really want to step into the Zot trap"))
                    {
                        canned_msg(MSG_OK);
                        stop_running();
                        you.turn_is_over = false;
                        return (false);
                    }

Replacement in crawl-ref/source/player.cc at line 192 [4.962854]

B:BD[19.3235] → [20.2917:2931]

B:BD[20.2931] → [10.3547:3617]

∅:D[10.3617] → [20.2990:3004]

B:BD[20.2990] → [20.2990:3004]

B:BD[20.3004] → [10.3618:3699]

∅:D[20.3033] → [19.3235:3266]

∅:D[10.3699] → [19.3235:3266]

B:BD[19.3235] → [19.3235:3266]

            }
            else if (new_grid != DNGN_TRAP_MAGICAL && you.airborne())
            {
                // No prompt (shaft and mechanical traps ineffective, if flying)
            }
            else

[19.3235]

[19.3266]

                else if (new_grid != DNGN_TRAP_MAGICAL && you.airborne())
                {
                    // No prompt (shaft and mechanical traps ineffective, if flying)
                }
                else

Replacement in crawl-ref/source/player.cc at line 198 [4.962854]

B:BD[19.3287] → [22.3225:3300]

∅:D[22.3300] → [19.3362:3546]

B:BD[19.3362] → [19.3362:3546]

B:BD[19.3546] → [8.18344:18415]

                 // Prompt for any trap where you might not have enough hp
                 // as defined in init.txt (see trapwalk.lua)
                 if (new_grid != DNGN_TRAP_MECHANICAL
                     || !clua.callbooleanfn(false, "ch_cross_trap",
                                            "s", trap_name(p.x, p.y)))

[19.3287]

[19.3613]

                     // Prompt for any trap where you might not have enough hp
                     // as defined in init.txt (see trapwalk.lua)
                     if (new_grid != DNGN_TRAP_MECHANICAL
                         || !clua.callbooleanfn(false, "ch_cross_trap",
                                                "s", trap_name(p.x, p.y)))

Replacement in crawl-ref/source/player.cc at line 204 [4.962854]

∅:D[19.3620] → [13.1536:1550]

B:BD[13.1536] → [13.1536:1550]

B:BD[13.1550] → [20.3034:3327]

            {
                std::string prompt = make_stringf(
                    "Really step %s that %s?",
                    (type == TRAP_ALARM) ? "onto" : "into",
                    feature_description(new_grid, type,
                                        false, DESC_BASENAME, false).c_str());

[19.3620]

[19.4039]

                {
                    std::string prompt = make_stringf(
                        "Really step %s that %s?",
                        (type == TRAP_ALARM) ? "onto" : "into",
                        feature_description(new_grid, type,
                                            false, DESC_BASENAME, false).c_str());

Replacement in crawl-ref/source/player.cc at line 211 [4.962854]

B:BD[19.4040] → [19.4040:4153]

B:BD[19.4153] → [21.4743:4779]

∅:D[21.4779] → [19.4153:4235]

B:BD[19.4153] → [19.4153:4235]

                if (!yesno(prompt.c_str(), true, 'n'))
                {
                    canned_msg(MSG_OK);
                    stop_running();
                    you.turn_is_over = false;
                    return (false);

[19.4040]

[19.4235]

                    if (!yesno(prompt.c_str(), true, 'n'))
                    {
                        canned_msg(MSG_OK);
                        stop_running();
                        you.turn_is_over = false;
                        return (false);
                    }

Replacement in crawl-ref/source/monstuff.h at line 162 [4.1390580]

B:BD[23.3004] → [23.3004:3056]

bool swap_check(monsters *monster, coord_def &loc);

[23.3004]

[4.1394225]

bool swap_check(monsters *monster, coord_def &loc, bool quiet = false);

Replacement in crawl-ref/source/monstuff.cc at line 2007 [4.1396662]
∅:D[24.43737] → [23.3718:3769]
B:BD[23.3718] → [23.3718:3769]
```
bool swap_check(monsters *monster, coord_def &loc)
```
[24.43737]
[23.3769]
```
bool swap_check(monsters *monster, coord_def &loc, bool quiet)
```

Replacement in crawl-ref/source/monstuff.cc at line 2020 [4.1396662]

B:BD[25.400] → [25.400:463]

        simple_monster_message(monster, " is held in a net!");

[25.400]

[25.463]

        if (!quiet)
            simple_monster_message(monster, " is held in a net!");

Replacement in crawl-ref/source/monstuff.cc at line 2033 [4.1396662]

B:BD[4.1432725] → [24.43894:44099]

        for ( adjacent_iterator ai; ai; ++ai )
            if (mgrd(*ai) == NON_MONSTER && _habitat_okay( monster, grd(*ai)))
                if (one_chance_in(++num_found))
                    loc = *ai;

[4.1432725]

[4.1432844]

        for (adjacent_iterator ai; ai; ++ai)
            if (mgrd(*ai) == NON_MONSTER && _habitat_okay( monster, grd(*ai))
                && one_chance_in(++num_found))
            {
                loc = *ai;
            }

Replacement in crawl-ref/source/monstuff.cc at line 2044 [4.1396662]
B:BD[4.1433419] → [24.44100:44115]
```
    if (!swap)
```
[4.1433419]
[4.1433661]
```
    if (!swap && !quiet)
```
Replacement in crawl-ref/source/monstuff.cc at line 2054 [4.1396662]
B:BD[4.1433886] → [4.1433886:1433939]
```
}                               // end swap_places()
```
[4.1433886]
[4.1433939]
```
}
```
Replacement in crawl-ref/source/monstuff.cc at line 2874 [4.1396662]
B:BD[3.3024] → [3.3024:3070]
```
    if ((mon->pos() - you.pos()).rdist() > 6)
```
[3.3024]
[3.3070]
```
    if ((mon->pos() - you.pos()).rdist() >= 6)
```

Replacement in crawl-ref/source/monstuff.cc at line 3475 [4.1396662]

B:BD[26.24304] → [26.24304:24349]

                if (mon->type == MONS_SIREN)

[26.24304]

[26.24349]

                if (mon->type == MONS_SIREN
                    && player_mesmerised_by(mon)
                    && _find_siren_water_target(mon))

Replacement in crawl-ref/source/monstuff.cc at line 3479 [4.1396662]

B:BD[26.24367] → [27.7343:7393]

B:BD[26.24477] → [26.24477:24610]

                    if (player_mesmerised_by(mon)
                        && _find_siren_water_target(mon))
                    {
                        break;
                    }

[26.24367]

[26.24610]

                    break;

Replacement in crawl-ref/source/monstuff.cc at line 4347 [4.1396662]

B:BD[4.1470797] → [4.1470797:1470860]

}                               // end handle_nearby_ability()

[4.1470797]

[4.1470860]

}
static bool _siren_movement_effect(const monsters *monster)
{
    bool do_resist = (you.attribute[ATTR_HELD] || you_resist_magic(70));
    if (!do_resist)
    {
        coord_def dir(coord_def(0,0));
        if (monster->pos().x < you.pos().x)
            dir.x = -1;
        else if (monster->pos().x > you.pos().x)
            dir.x = 1;
        if (monster->pos().y < you.pos().y)
            dir.y = -1;
        else if (monster->pos().y > you.pos().y)
            dir.y = 1;
        const coord_def newpos = you.pos() + dir;
        if (!in_bounds(newpos) || is_grid_dangerous(grd(newpos)))
        {
            do_resist = true;
        }
        else
        {
            bool swapping = false;
            monsters *mon;
            if (mgrd(newpos) != NON_MONSTER)
            {
                mon = &menv[mgrd(newpos)];
                if (mons_wont_attack(mon)
                    && !mons_is_stationary(mon)
                    && !mons_cannot_act(mon)
                    && !mons_is_sleeping(mon)
                    && swap_check(mon, you.pos(), true))
                {
                    swapping = true;
                }
                else if (!mons_is_submerged(mon))
                    do_resist = true;
            }
            if (!do_resist)
            {
                const coord_def oldpos = you.pos();
                mprf("The pull of her song draws you forwards.");
                if (swapping)
                {
                    int swap_mon = mgrd(newpos);
                    // Pick the monster up.
                    mgrd(newpos) = NON_MONSTER;
                    mon->moveto(oldpos);
                    // Plunk it down.
                    mgrd(mon->pos()) = swap_mon;
                    mprf("You swap places with %s.",
                         mon->name(DESC_NOCAP_THE).c_str());
                }
                move_player_to_grid(newpos, true, true, true);

Insertion in crawl-ref/source/monstuff.cc at line 4410 [4.1396662]

[4.1470861]

                if (swapping)
                    mon->apply_location_effects(newpos);
            }
        }
    }
    return (do_resist);
}

Insertion in crawl-ref/source/monstuff.cc at line 4835 [4.1396662]
[28.3606]
[29.19333]
```
            bool did_resist = false;
```

Insertion in crawl-ref/source/monstuff.cc at line 4842 [4.1396662]

[30.7816]

[31.5150]


                if (monster->type == MONS_SIREN)
                {
                    if (_siren_movement_effect(monster))
                    {
                        canned_msg(MSG_YOU_RESIST); // flavour only
                        did_resist = true;
                    }
                }

Replacement in crawl-ref/source/monstuff.cc at line 4878 [4.1396662]

B:BD[31.6176] → [31.6176:6220]

                canned_msg(MSG_YOU_RESIST);

[31.6176]

[31.6220]

                if (!did_resist)
                    canned_msg(MSG_YOU_RESIST);