fiddlerwoaroof/crawl - Change 7MMBAVNSUSNLVE2G6Z25C3TGHYAYLCOOXQ63KHXPYUMOOSKNGDKAC

Added allow_self_target option, with possible values yes, no, prompt.

Added brief documentation (could be improved.)

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

Created by haranp on July 2, 2008

7MMBAVNSUSNLVE2G6Z25C3TGHYAYLCOOXQ63KHXPYUMOOSKNGDKAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monplace.cc at line 2205 [7.1641732]
B:BD[7.1678678] → [8.5345:5398]
```
                // Add point to list of good points.
```
Replacement in crawl-ref/source/misc.cc at line 1734 [7.1933596]
∅:D[9.1784] → [10.466:528]
B:BD[10.466] → [10.466:528]
```
        force_stair? force_stair : grd[you.x_pos][you.y_pos];
```
[9.1784]
[7.1948399]
```
        force_stair? force_stair : grd(you.pos());
```

Replacement in crawl-ref/source/misc.cc at line 1777 [7.1933596]

B:BD[11.17751] → [11.17751:17875]

        bool known_trap = (grd[you.x_pos][you.y_pos] != DNGN_UNDISCOVERED_TRAP
                           && !force_stair);

[11.17751]

[11.17875]

        const bool known_trap = (grd(you.pos()) != DNGN_UNDISCOVERED_TRAP
                                 && !force_stair);

Insertion in crawl-ref/source/initfile.cc at line 679 [7.2957258]
[12.792470]
[12.792470]
```
    allow_self_target      = CONFIRM_PROMPT;
```

Insertion in crawl-ref/source/initfile.cc at line 1946 [7.2957258]

[13.5352]

    else if (key == "allow_self_target")
    {
        if (field == "yes")
            allow_self_target = CONFIRM_NONE;
        else if (field == "no")
            allow_self_target = CONFIRM_CANCEL;
        else if (field == "prompt")
            allow_self_target = CONFIRM_PROMPT;
    }

Replacement in crawl-ref/source/externs.h at line 1668 [7.3270163]

∅:D[4.3549] → [14.3919:3986]

B:BD[12.899325] → [14.3919:3986]

∅:D[14.3986] → [7.3283909:3283988]

B:BD[7.3283909] → [7.3283909:3283988]

    int         easy_confirm;    // make yesno() confirming easier
    int         easy_quit_item_prompts; // make item prompts quitable on space

[4.3549]

[14.3987]

    confirm_level_type easy_confirm;    // make yesno() confirming easier
    bool        easy_quit_item_prompts; // make item prompts quitable on space
    confirm_prompt_type allow_self_target;      // yes, no, prompt

Insertion in crawl-ref/source/enum.h at line 683 [7.3287960]

[12.909304]

[15.94624]

enum confirm_prompt_type
{
    CONFIRM_CANCEL,             // automatically answer 'no', i.e. disallow
    CONFIRM_PROMPT,             // prompt
    CONFIRM_NONE                // automatically answer 'yes'
};

Replacement in crawl-ref/source/effects.cc at line 304 [7.3382105]
B:BD[16.398] → [16.398:430]
```
    std::string cast_into = "";
```
[16.398]
[17.9156]
```
    std::string cast_into;
```

Replacement in crawl-ref/source/directn.cc at line 1047 [7.3697945]

B:BD[18.1118] → [19.14448:14501]

            // Confirm self-targeting on TARG_ENEMY.

[18.1118]

            // Confirm self-targeting on TARG_ENEMY (option-controlled.)

Replacement in crawl-ref/source/directn.cc at line 1052 [7.3697945]

B:BD[20.11098] → [20.11098:11164]

                && !yesno("Really target yourself?", false, 'n'))

[20.11098]

[18.1411]

                && (Options.allow_self_target == CONFIRM_CANCEL
                    || (Options.allow_self_target == CONFIRM_PROMPT
                        && !yesno("Really target yourself?", false, 'n'))))

Replacement in crawl-ref/source/directn.cc at line 1056 [7.3697945]

∅:D[5.3364] → [21.167:193]

B:BD[18.1425] → [21.167:193]

                mesclr();

[18.1425]

[2.284]

                if (Options.allow_self_target == CONFIRM_CANCEL )
                    mpr("That would be overly suicidal.", MSGCH_EXAMINE_FILTER);

Insertion in crawl-ref/settings/init.txt at line 207 [7.4830895]
[3.425]
[22.3279]
```
# allow_self_target = (yes | no | prompt)
```

Replacement in crawl-ref/docs/options_guide.txt at line 61 [23.63392]

B:BD[22.5317] → [6.2965:3020]

                easy_butcher, always_confirm_butcher,

[22.5317]

[24.3200]

                allow_self_target, easy_butcher, always_confirm_butcher,

Insertion in crawl-ref/docs/options_guide.txt at line 978 [23.63392]

[3.492]

[22.24319]


allow_self_target = (yes | no | prompt)
        Allow targeting yourself with risky magic (e.g., the spell
        Bolt of Fire or a wand of slowing.)
        When set to 'yes', you are a valid target. When set to 'no',
        you cannot target yourself with such spells. When set to
        'prompt' (the default), you will be required to confirm
        self-targeting.