fiddlerwoaroof/crawl - Change 2K7SL55NUJQ6PBMVPPRCMGS55M2VBZ4CFQYQEKN5SXEW427RKCPAC

Fix bug [2874791], Merfolk stat change issues

Fix some conditions causing permanent stat loss or gain for Mf with stat modifying boots.

Unmerge boots when the player starts levitating or flying on a water square.

Use move_player_to_grid in blink, semi-controlled blink, and teleportation.

Also fix a bug where Mf could random teleport into solid walls.

Created by Charles Otto on October 16, 2009

2K7SL55NUJQ6PBMVPPRCMGS55M2VBZ4CFQYQEKN5SXEW427RKCPAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells4.cc at line 1982 [5.436250]

[4.5698]


    coord_def origin = you.pos();
    int res = move_player_to_grid(target, false, true, true);

Replacement in crawl-ref/source/spells4.cc at line 1986 [5.436250]

B:BD[4.5699] → [2.273:372]

    // Leave a purple cloud.
    place_cloud(CLOUD_PURP_SMOKE, you.pos(), 1 + random2(3), KC_YOU);

[4.5699]

[2.372]

    if(res)
    {
        // Leave a purple cloud.
        place_cloud(CLOUD_PURP_SMOKE, origin, 1 + random2(3), KC_YOU);
    }

Replacement in crawl-ref/source/spells4.cc at line 1992 [5.436250]
∅:D[2.373] → [6.9620:9644]
B:BD[4.5699] → [6.9620:9644]
∅:D[7.7113] → [8.590:604]
∅:D[6.9644] → [8.590:604]
B:BD[8.590] → [8.590:604]
```
    you.moveto(target);
    return 1;
```
[2.373]
[5.525596]
```
    return res;
```
Deletion in crawl-ref/source/spells3.cc at line 1513 [5.531613]
B:BD[9.380] → [2.376:492]
∅:D[9.380] → [10.573:574]
∅:D[2.492] → [10.573:574]
B:BD[10.573] → [10.573:574]
B:BD[10.574] → [11.23998:24027]
```
            // Leave a purple cloud.
            place_cloud(CLOUD_PURP_SMOKE, you.pos(), 1 + random2(3), KC_YOU);
            you.moveto(pos);
```

Replacement in crawl-ref/source/spells3.cc at line 1515 [5.531613]

∅:D[12.3117] → [11.24028:24133]

B:BD[5.550667] → [11.24028:24133]

            if (grd(you.pos()) != DNGN_FLOOR
                    && grd(you.pos()) != DNGN_SHALLOW_WATER

[12.3117]

[12.3118]

            if (grd(pos) != DNGN_FLOOR
                    && grd(pos) != DNGN_SHALLOW_WATER

Replacement in crawl-ref/source/spells3.cc at line 1518 [5.531613]

B:BD[12.3168] → [12.3168:3230]

∅:D[12.3230] → [13.6046:6087]

B:BD[11.24133] → [13.6046:6087]

∅:D[13.6087] → [11.24183:24239]

B:BD[11.24183] → [11.24183:24239]

                        || grd(you.pos()) != DNGN_DEEP_WATER)
                || monster_at(you.pos())
                || env.cgrid(you.pos()) != EMPTY_CLOUD)

[12.3168]

[5.550924]

                        || grd(pos) != DNGN_DEEP_WATER)
                || monster_at(pos)
                || env.cgrid(pos) != EMPTY_CLOUD)

Insertion in crawl-ref/source/spells3.cc at line 1527 [5.531613]

[5.551022]

[3.277]

                // Leave a purple cloud.
                place_cloud(CLOUD_PURP_SMOKE, you.pos(), 1 + random2(3), KC_YOU);

Insertion in crawl-ref/source/spells3.cc at line 1531 [5.531613]

[3.348]

[14.209]

                move_player_to_grid(pos, false, true, true);

Replacement in crawl-ref/source/spells3.cc at line 1576 [5.531613]

B:BD[12.3280] → [12.3280:3341]

                       || grd(you.pos()) != DNGN_DEEP_WATER)

[12.3280]

[13.6088]

                       || grd(newpos) != DNGN_DEEP_WATER)

Replacement in crawl-ref/source/spells3.cc at line 1594 [5.531613]
∅:D[2.601] → [15.381:409]
B:BD[16.824] → [15.381:409]
```
        you.moveto(newpos);
```
[2.601]
[5.551688]
```
        move_player_to_grid(newpos, false, true, true);
```

Insertion in crawl-ref/source/spells1.cc at line 237 [5.616635]

[5.620485]

        // Going to assume that move_player_to_grid works, (it should
        // because terrain type etc. was already checked). could result
        // in awkward messaging if it cancels for some reason but it's
        // probably better than getting the blink message after any Mf
        // transform messages all the time -cao

Insertion in crawl-ref/source/spells1.cc at line 243 [5.616635]

[5.620512]

[17.171]

        coord_def origin = you.pos();
        success = move_player_to_grid(target, false, true, true);
        if(success)
        {
            // Leave a purple cloud.
            place_cloud(CLOUD_PURP_SMOKE, origin, 1 + random2(3), KC_YOU);

Replacement in crawl-ref/source/spells1.cc at line 250 [5.616635]

B:BD[18.718] → [19.886:910]

B:BD[19.910] → [2.774:882]

∅:D[2.882] → [6.11996:12024]

∅:D[19.910] → [6.11996:12024]

B:BD[5.620534] → [6.11996:12024]

∅:D[7.7321] → [5.620582:620636]

∅:D[6.12024] → [5.620582:620636]

B:BD[5.620582] → [5.620582:620636]

B:BD[5.620636] → [19.911:946]

∅:D[19.946] → [20.413:498]

B:BD[5.620673] → [20.413:498]

        success = true;
        // Leave a purple cloud.
        place_cloud(CLOUD_PURP_SMOKE, you.pos(), 1 + random2(3), KC_YOU);
        you.moveto(target);
        if (you.level_type == LEVEL_ABYSS)
        {
            abyss_teleport(false);
            if (you.pet_target != MHITYOU)
                you.pet_target = MHITNOT;

[17.172]

[5.620711]

            if (you.level_type == LEVEL_ABYSS)
            {
                abyss_teleport(false);
                if (you.pet_target != MHITYOU)
                    you.pet_target = MHITNOT;
            }

Insertion in crawl-ref/source/spells1.cc at line 1447 [5.616635]

[21.388]


        // Merfolk boots unmeld if flight takes us out of water
        if(you.species == SP_MERFOLK && grid_is_water(grd(you.pos())))
        {
            unmeld_one_equip(EQ_BOOTS);
        }

Insertion in crawl-ref/source/it_use2.cc at line 34 [5.2904329]
[5.2905343]
[22.40334]
```
#include "terrain.h"
#include "transfor.h"
```

Insertion in crawl-ref/source/it_use2.cc at line 248 [5.2904329]

[23.4310]

[24.12677]

        // Merfolk boots unmeld if levitation takes us out of water
        if(!player_is_airborne() && you.species == SP_MERFOLK
           && grid_is_water(grd(you.pos())))
        {
            unmeld_one_equip(EQ_BOOTS);
        }