fiddlerwoaroof/crawl - Change DYYOSUUTPWZ723XAZWXFKV2BTYIHVRFJM65VYR6EHL5VBEJQOOHQC

Make weapons of reaching work through granite statues again.

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

Created by j-p-e-g on June 7, 2009

DYYOSUUTPWZ723XAZWXFKV2BTYIHVRFJM65VYR6EHL5VBEJQOOHQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 5980 [3.1396662]

[3.1481747]

[4.8605]

            const coord_def delta = monster->pos() - you.pos();
            const int x_middle = std::max(monster->pos().x, you.pos().x)
                                    - (abs(delta.x) / 2);
            const int y_middle = std::max(monster->pos().y, you.pos().y)
                                    - (abs(delta.y) / 2);
            const coord_def middle(x_middle, y_middle);

Replacement in crawl-ref/source/monstuff.cc at line 5989 [3.1396662]

B:BD[5.49091] → [5.49091:49144]

B:BD[5.49144] → [6.2649:2715]

                && see_grid_no_trans(monster->pos())
                && grid_distance(monster->pos(), you.pos()) == 2)

[5.49091]

[3.1481899]

                && grid_distance(monster->pos(), you.pos()) == 2
                && (see_grid_no_trans(monster->pos())
                    || grd(middle) > DNGN_MAX_NONREACH))

Replacement in crawl-ref/source/it_use3.cc at line 259 [3.2870456]

B:BD[5.65161] → [5.65161:65243]

    const int x_distance = abs(delta.x);
    const int y_distance = abs(delta.y);

[5.65161]

[7.9566]

    const int x_distance  = abs(delta.x);
    const int y_distance  = abs(delta.y);

Insertion in crawl-ref/source/it_use3.cc at line 263 [3.2870456]

[3.2878329]

    const int x_middle = std::max(beam.target.x, you.pos().x)
                            - (x_distance / 2);
    const int y_middle = std::max(beam.target.y, you.pos().y)
                            - (y_distance / 2);
    const coord_def middle(x_middle, y_middle);

Replacement in crawl-ref/source/it_use3.cc at line 274 [3.2870456]

B:BD[8.539] → [5.65244:65290]

    else if (!see_grid_no_trans(beam.target))

[8.539]

[9.433]

    else if (!see_grid_no_trans(beam.target)
             && grd(middle) <= DNGN_MAX_NONREACH)

Insertion in crawl-ref/source/it_use3.cc at line 277 [3.2870456]

[9.439]

        // Might also be a granite statue/orcish idol which you
        // can reach _past_.

Deletion in crawl-ref/source/it_use3.cc at line 297 [3.2870456]

B:BD[3.2878541] → [2.10547:10795]

∅:D[8.1234] → [3.2878750:2878751]

∅:D[2.10795] → [3.2878750:2878751]

∅:D[5.65501] → [3.2878750:2878751]

B:BD[3.2878750] → [3.2878750:2878751]

        const int x_middle = std::max(beam.target.x, you.pos().x)
            - (x_distance / 2);
        const int y_middle = std::max(beam.target.y, you.pos().y)
            - (y_distance / 2);
        const coord_def middle(x_middle, y_middle);

Replacement in crawl-ref/source/fight.cc at line 4315 [3.3140790]

B:BD[10.841] → [11.4982:5054]

            if ( grid_distance(attacker->pos(), defender->pos()) == 2 )

[10.841]

[10.1033]

            if (grid_distance(attacker->pos(), defender->pos()) == 2)