fiddlerwoaroof/crawl - Change MVQRUYIXCXGGH7J7TN2GKUQL23EOBLYGPJL4TBQKCZR2D6DCL7XQC

Changed '!' in targeting from target-select to target-select-ignoring-range.

Added '@', which is to '!' as '.' is to the old '5'. Fixed 2146628: cancelling targeting was incorrectly checking range. The behaviour of allow_self_target is now slightly different (see forthcoming mail on crawl-ref-discuss.)

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

Created by haranp on October 4, 2008

MVQRUYIXCXGGH7J7TN2GKUQL23EOBLYGPJL4TBQKCZR2D6DCL7XQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/initfile.cc at line 2039 [6.2957258]
B:BD[4.3787] → [5.5306:5352]
```
    else BOOL_OPTION(easy_quit_item_prompts);
```
Insertion in crawl-ref/source/initfile.cc at line 2048 [6.2957258]
[7.3166]
[5.5352]
```
    else BOOL_OPTION(easy_quit_item_prompts);
```
Insertion in crawl-ref/source/enum.h at line 581 [6.3287960]
[8.351]
[9.907615]
```
    CMD_TARGET_SELECT_FORCE,
    CMD_TARGET_SELECT_FORCE_ENDPOINT,
```

Insertion in crawl-ref/source/directn.cc at line 344 [6.3697945]

[10.19275]

            || key_command == CMD_TARGET_SELECT_FORCE_ENDPOINT
            || key_command == CMD_TARGET_SELECT_FORCE

Replacement in crawl-ref/source/directn.cc at line 361 [6.3697945]

B:BD[10.19518] → [10.19518:19569]

    if (key_command == CMD_TARGET_SELECT_ENDPOINT)

[10.19518]

[10.19569]

    if (key_command == CMD_TARGET_SELECT_ENDPOINT
        || key_command == CMD_TARGET_SELECT_FORCE_ENDPOINT)
    {

Insertion in crawl-ref/source/directn.cc at line 365 [6.3697945]
[10.19602]
[11.9580]
```
    }
```

Insertion in crawl-ref/source/directn.cc at line 747 [6.3697945]

[2.3768]

[12.7805]

bool _dist_ok(const dist& moves, int range, targ_mode_type mode,
              bool may_target_self, bool cancel_at_self)
{
    if (!moves.isCancel && moves.isTarget)
    {
        if (!see_grid(moves.target))
        {
            mpr("Sorry, you can't target what you can't see.",
                MSGCH_EXAMINE_FILTER);
            return (false);
        }
        if (moves.target == you.pos())
        {                    
            // may_target_self == makes (some) sense to target yourself
            // (SPFLAG_AREA)
            // cancel_at_self == not allowed to target yourself
            // (SPFLAG_NOT_SELF)
            if (cancel_at_self)
            {
                mpr("Sorry, you can't target yourself.", MSGCH_EXAMINE_FILTER);
                return (false);
            }
            if (!may_target_self && mode == TARG_ENEMY)
            {
                if (Options.allow_self_target == CONFIRM_CANCEL)
                {
                    mpr("That would be overly suicidal.", MSGCH_EXAMINE_FILTER);
                    return (false);
                }
                else if (Options.allow_self_target == CONFIRM_PROMPT)
                {
                    return yesno("Really target yourself?", false, 'n');
                }
            }
        }
        // Check range
        if (range >= 0 && grid_distance(moves.target, you.pos()) > range)
        {
            mpr("That is beyond the maximum range.", MSGCH_EXAMINE_FILTER);
            return (false);
        }
    }
    
    // Some odd cases
    if (!moves.isValid && !moves.isCancel)
        return yesno("Are you sure you want to fizzle?", false, 'n');
    return (true);
}

Insertion in crawl-ref/source/directn.cc at line 893 [6.3697945]
[13.5787]
[14.436]
```
        bool allow_out_of_range = false;
```

Insertion in crawl-ref/source/directn.cc at line 1184 [6.3697945]

[13.9051]

[8.2687]

            // some modifiers to the basic selection command
        case CMD_TARGET_SELECT_FORCE:

Replacement in crawl-ref/source/directn.cc at line 1187 [6.3697945]

B:BD[8.2728] → [8.2728:2765]

            moves.isEndpoint = true;

[8.2728]

[8.2765]

        case CMD_TARGET_SELECT_FORCE_ENDPOINT:
            if (key_command == CMD_TARGET_SELECT_ENDPOINT
                || key_command == CMD_TARGET_SELECT_FORCE_ENDPOINT)
            {
                moves.isEndpoint = true;
            }
            if (key_command == CMD_TARGET_SELECT_FORCE
                || key_command == CMD_TARGET_SELECT_FORCE_ENDPOINT)
            {
                allow_out_of_range = true;
            }

Replacement in crawl-ref/source/directn.cc at line 1396 [6.3697945]

B:BD[6.3703828] → [15.875:1014]

            // This is where we either finalize everything, or else
            // decide that we're not really done and continue looping.

[6.3703828]

[15.1014]

            // Confirm that the loop is really done. If it is,
            // break out. If not, just continue looping.

Deletion in crawl-ref/source/directn.cc at line 1401 [6.3697945]

B:BD[8.2933] → [8.2933:2934]

B:BD[8.2934] → [15.1016:1118]

B:BD[15.1118] → [7.3653:3726]

∅:D[7.3726] → [15.1118:1187]

∅:D[16.14501] → [15.1118:1187]

B:BD[15.1118] → [15.1118:1187]

B:BD[15.1187] → [17.10963:10994]

B:BD[17.10994] → [18.95301:95346]

∅:D[19.9422] → [17.11060:11098]

∅:D[18.95346] → [17.11060:11098]

B:BD[17.11060] → [17.11060:11098]

B:BD[17.11098] → [20.3203:3305]

B:BD[20.3305] → [21.5049:5359]

∅:D[22.458] → [15.1411:1425]

∅:D[20.3446] → [15.1411:1425]

∅:D[7.3935] → [15.1411:1425]

∅:D[21.5359] → [15.1411:1425]

∅:D[23.7432] → [15.1411:1425]

∅:D[17.11164] → [15.1411:1425]

B:BD[15.1411] → [15.1411:1425]

B:BD[15.1425] → [20.3447:3545]

B:BD[20.3545] → [21.5360:5493]

∅:D[20.3615] → [7.4002:4083]

∅:D[21.5493] → [7.4002:4083]

B:BD[7.4002] → [7.4002:4083]

B:BD[7.4083] → [21.5494:5512]


            // A bunch of confirmation tests; if we survive them all,
            // then break out.
            // Confirm self-targeting on TARG_ENEMY (option-controlled.)
            // Conceivably we might want to confirm on TARG_ANY too.
            if (moves.isTarget
                && moves.target == you.pos()
                && mode == TARG_ENEMY
                && (cancel_at_self
                    || Options.allow_self_target == CONFIRM_CANCEL
                       && !may_target_self
                    || (Options.allow_self_target == CONFIRM_PROMPT
                           || Options.allow_self_target == CONFIRM_CANCEL
                              && may_target_self)
                        && !yesno("Really target yourself?", false, 'n')))
            {
                if (cancel_at_self)
                    mpr("Sorry, you can't target yourself.");
                else if (Options.allow_self_target == CONFIRM_CANCEL
                         && !may_target_self)
                {
                    mpr("That would be overly suicidal.", MSGCH_EXAMINE_FILTER);
                }

Replacement in crawl-ref/source/directn.cc at line 1402 [6.3697945]

∅:D[20.3617] → [24.284:320]

∅:D[7.4083] → [24.284:320]

B:BD[25.193] → [24.284:320]

∅:D[25.319] → [15.1461:1475]

∅:D[24.320] → [15.1461:1475]

B:BD[15.1461] → [15.1461:1475]

B:BD[15.1475] → [18.95347:95411]

∅:D[15.1547] → [13.11573:11587]

∅:D[26.2946] → [13.11573:11587]

∅:D[18.95411] → [13.11573:11587]

B:BD[13.11573] → [13.11573:11587]

B:BD[13.11587] → [27.396:506]

∅:D[27.506] → [13.11692:11706]

∅:D[28.1412] → [13.11692:11706]

B:BD[13.11692] → [13.11692:11706]

B:BD[13.11706] → [3.9261:9473]

∅:D[3.9473] → [29.5003:5078]

B:BD[13.11706] → [29.5003:5078]

B:BD[29.5078] → [26.2947:3079]

                show_prompt = true;
            }
            else if (moves.isTarget && !see_grid(moves.target))
            {
                mpr("Sorry, you can't target what you can't see.",
                    MSGCH_EXAMINE_FILTER);
            }
            else if (range >= 0
                     && grid_distance(moves.target, you.pos()) > range)
            {
                mpr("That is beyond the maximum range.", MSGCH_EXAMINE_FILTER);
            }
            // Ask for confirmation if we're quitting for some odd reason.
            else if (moves.isValid || moves.isCancel
                     || yesno("Are you sure you want to fizzle?", false, 'n'))

[20.3617]

[13.11898]

            if (_dist_ok(moves, allow_out_of_range ? -1 : range,
                         mode, may_target_self, cancel_at_self))

Insertion in crawl-ref/source/directn.cc at line 1410 [6.3697945]

[13.11935]

            }
            else
            {
                show_prompt = true;

Deletion in crawl-ref/source/directn.cc at line 1418 [6.3697945]
B:BD[30.1385] → [30.1385:1386]

Insertion in crawl-ref/source/cmd-name.h at line 164 [31.12200]

[31.18961]

{CMD_TARGET_SELECT_FORCE, "CMD_TARGET_SELECT_FORCE"},
{CMD_TARGET_SELECT_FORCE_ENDPOINT, "CMD_TARGET_SELECT_FORCE_ENDPOINT"},

Replacement in crawl-ref/source/cmd-keys.h at line 150 [31.20639]
B:BD[31.23956] → [31.23956:23982]
```
{'!', CMD_TARGET_SELECT},
```
[31.23956]
[31.23982]
```
{'!', CMD_TARGET_SELECT_FORCE},
{'@', CMD_TARGET_SELECT_FORCE_ENDPOINT},
```

Changed '!' in targeting from target-select to target-select-ignoring-range.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/initfile.cc at line 2039 [6.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2048 [6.2957258]

Insertion in crawl-ref/source/enum.h at line 581 [6.3287960]