fiddlerwoaroof/crawl - Change MUN4FZPPYRQDGFJDIGNS6AGTBOJ42GGMXCZHPT5Y7CQFFFSF5SRAC

Apply patch by (?) to make Apportation autotarget the nearest object.

Thanks!

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

Created by j-p-e-g on August 28, 2009

MUN4FZPPYRQDGFJDIGNS6AGTBOJ42GGMXCZHPT5Y7CQFFFSF5SRAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1174 [5.293070]

B:BD[3.6126] → [4.327:564]

            (testbits( flags, SPFLAG_TARGET ) ? DIR_TARGET :
             testbits( flags, SPFLAG_GRID )   ? DIR_TARGET :
             testbits( flags, SPFLAG_DIR )    ? DIR_DIR
                                              : DIR_NONE);

[3.6126]

[3.6322]

            ( (spell == SPELL_APPORTATION)   ? DIR_TARGET_OBJECT :
              testbits(flags, SPFLAG_TARGET) ? DIR_TARGET        :
              testbits(flags, SPFLAG_GRID)   ? DIR_TARGET        :
              testbits(flags, SPFLAG_DIR)    ? DIR_DIR           :
                                               DIR_NONE          );

Replacement in crawl-ref/source/enum.h at line 2899 [5.3287960]

B:BD[6.408] → [6.408:420]

    DIR_DIR

[6.408]

[5.3372908]

    DIR_DIR,
    DIR_TARGET_OBJECT // New as of 27-August-2009, for item-targeting spells

Replacement in crawl-ref/source/directn.cc at line 1057 [5.3697945]

B:BD[7.3456] → [2.2904:2984]

    if (Options.default_target && (mode == TARG_ENEMY || mode == TARG_HOSTILE))

[7.3456]

[8.314]

    if (Options.default_target)

Replacement in crawl-ref/source/directn.cc at line 1059 [5.3697945]

B:BD[8.320] → [7.3457:3525]

∅:D[7.3525] → [9.11114:11180]

B:BD[10.572] → [9.11114:11180]

        skip_iter = true;   // Skip first iteration...XXX mega-hack
        if (you.prev_targ != MHITNOT && you.prev_targ != MHITYOU)

[8.320]

[8.449]

        if (restricts == DIR_TARGET_OBJECT)

Replacement in crawl-ref/source/directn.cc at line 1061 [5.3697945]

B:BD[8.459] → [10.641:703]

B:BD[10.703] → [11.7821:7860]

B:BD[11.7860] → [12.4068:4120]

B:BD[12.4120] → [2.2985:3117]

∅:D[2.3117] → [13.45970:46035]

∅:D[12.4192] → [13.45970:46035]

B:BD[9.11332] → [13.45970:46035]

            const monsters *montarget = &menv[you.prev_targ];
            if (you.can_see(montarget)
                    // not made friendly since then
                && (mons_attitude(montarget) == ATT_HOSTILE
                    || mode == TARG_ENEMY && !mons_friendly(montarget))
                && _is_target_in_range(montarget->pos(), range))

[8.459]

[10.778]

             skip_iter = true;
             found_autotarget = true;
        }
        else if (Options.default_target && (mode == TARG_ENEMY || mode == TARG_HOSTILE))
        {
            skip_iter = true;   // Skip first iteration...XXX mega-hack
            if (you.prev_targ != MHITNOT && you.prev_targ != MHITYOU)

Replacement in crawl-ref/source/directn.cc at line 1069 [5.3697945]

B:BD[10.792] → [10.792:833]

B:BD[10.833] → [14.92739:92788]

                found_autotarget = true;
                moves.target = montarget->pos();

[10.792]

[10.915]

                const monsters *montarget = &menv[you.prev_targ];
                if (you.can_see(montarget)
                        // not made friendly since then
                    && (mons_attitude(montarget) == ATT_HOSTILE
                        || mode == TARG_ENEMY && !mons_friendly(montarget))
                    && _is_target_in_range(montarget->pos(), range))
                {
                    found_autotarget = true;
                    moves.target = montarget->pos();
                }

Replacement in crawl-ref/source/directn.cc at line 1082 [5.3697945]
∅:D[15.256] → [16.5744:5745]
∅:D[17.580] → [16.5744:5745]
∅:D[18.987] → [16.5744:5745]
∅:D[10.1051] → [16.5744:5745]
∅:D[3.9757] → [16.5744:5745]
∅:D[19.10208] → [16.5744:5745]
B:BD[5.3701029] → [16.5744:5745]
[8.621]
[20.406]
```
     
```

Replacement in crawl-ref/source/directn.cc at line 1135 [5.3697945]

B:BD[10.1062] → [7.3550:3584]

            if (found_autotarget)

[10.1062]

[10.1098]

            if (restricts == DIR_TARGET_OBJECT)
            {
                key_command = CMD_TARGET_OBJ_CYCLE_FORWARD;
            }
            else if (found_autotarget)
            {

Insertion in crawl-ref/source/directn.cc at line 1142 [5.3697945]
[10.1140]
[10.1140]
```
            }
```
Insertion in crawl-ref/source/directn.cc at line 1144 [5.3697945]
[10.1157]
[7.3585]
```
            {
```
Insertion in crawl-ref/source/directn.cc at line 1146 [5.3697945]
[7.3665]
[10.1235]
```
            }
```
Replacement in crawl-ref/source/directn.cc at line 1150 [5.3697945]
∅:D[21.5933730] → [22.6086:6132]
B:BD[8.733] → [22.6086:6132]
```
            key_command = beh->get_command();
```
[21.5933658]
[21.5933731]
```
                key_command = beh->get_command();
```

Apply patch by (?) to make Apportation autotarget the nearest object.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1174 [5.293070]

Replacement in crawl-ref/source/enum.h at line 2899 [5.3287960]

Replacement in crawl-ref/source/directn.cc at line 1057 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 1059 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 1061 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 1069 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 1082 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 1135 [5.3697945]

Insertion in crawl-ref/source/directn.cc at line 1142 [5.3697945]

Insertion in crawl-ref/source/directn.cc at line 1144 [5.3697945]

Insertion in crawl-ref/source/directn.cc at line 1146 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 1150 [5.3697945]