fiddlerwoaroof/crawl - Change DVQMYOEH2UDXRU6254CIXZLCNPZD2ENZTBXXSHBDOHRIG6DZNRTQC

Fix 2021696: allow_self_target = no even forbidding self-targetting for

area effect spells (now prompts) Fix 2028704: spell view toggle 'I' preventing forgetting spell slot 'I'

Allow intelligent summoned monsters to equip themselves.

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

Created by j-p-e-g on July 28, 2008

DVQMYOEH2UDXRU6254CIXZLCNPZD2ENZTBXXSHBDOHRIG6DZNRTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-util.h at line 119 [11.242902]

B:BD[10.266] → [4.164:244]

                      const char *prompt = NULL, bool cancel_at_self = false );

[10.266]

[11.245381]

                      bool may_target_self = false, const char *prompt = NULL,
                      bool cancel_at_self = false );

Replacement in crawl-ref/source/spl-util.cc at line 742 [11.245665]

B:BD[10.402] → [4.246:310]

                      const char *prompt, bool cancel_at_self )

[10.402]

[11.264740]

                      bool may_target_self, const char *prompt,
                      bool cancel_at_self )

Replacement in crawl-ref/source/spl-util.cc at line 749 [11.245665]

B:BD[10.508] → [4.311:378]

               may_target_monster, prompt, NULL, cancel_at_self );

[10.508]

[11.264983]

               may_target_monster, may_target_self, prompt, NULL,
               cancel_at_self );

Replacement in crawl-ref/source/spl-data.h at line 2063 [11.268152]
B:BD[11.289535] → [12.156:183]
```
     SPFLAG_DIR_OR_TARGET,
```
[11.289535]
[13.4102]
```
     SPFLAG_DIR_OR_TARGET | SPFLAG_AREA,
```
Replacement in crawl-ref/source/spl-cast.h at line 44 [11.291319]
B:BD[11.291578] → [14.143:162]
```
int list_spells();
```
[11.291578]
[15.10934]
```
int list_spells(bool toggle_with_I = true);
```
Replacement in crawl-ref/source/spl-cast.cc at line 194 [11.293070]
B:BD[11.296045] → [14.164:182]
```
int list_spells()
```
[11.296045]
[16.1034]
```
int list_spells(bool toggle_with_I)
```
Deletion in crawl-ref/source/spl-cast.cc at line 206 [11.293070]
B:BD[16.1272] → [5.168:253]
```
    spell_menu.set_more(formatted_string("Press '!' or 'I' to toggle spell view."));
```

Replacement in crawl-ref/source/spl-cast.cc at line 207 [11.293070]

B:BD[17.1698] → [5.254:290]

    spell_menu.add_toggle_key('I');

[17.1698]

[18.248]

    if (toggle_with_I)
    {
        spell_menu.set_more(
            formatted_string("Press '!' or 'I' to toggle spell view."));
        spell_menu.add_toggle_key('I');
    }
    else
    {
        spell_menu.set_more(
            formatted_string("Press '!' to toggle spell view."));
    }

Replacement in crawl-ref/source/spl-cast.cc at line 221 [11.293070]
B:BD[11.296152] → [16.1273:1308]
```
    for ( int i = 0; i < 52; ++i )
```
[11.296152]
[16.1308]
```
    for (int i = 0; i < 52; ++i)
```

Replacement in crawl-ref/source/spl-cast.cc at line 1050 [11.293070]

B:BD[19.2907] → [4.382:459]

        if (!spell_direction(spd, beam, dir, targ, needs_path, true, prompt,

[19.2907]

[4.459]

        const bool dont_cancel_me = testbits(flags, SPFLAG_AREA);
        if (!spell_direction(spd, beam, dir, targ, needs_path, true,
                             dont_cancel_me, prompt,

Replacement in crawl-ref/source/spells3.cc at line 81 [11.531613]

B:BD[11.533212] → [11.533212:533267]

                keyin = (unsigned char) list_spells();

[11.533212]

[11.533267]

                keyin = (unsigned char) list_spells(false);

Replacement in crawl-ref/source/spells3.cc at line 1078 [11.531613]
B:BD[8.542] → [8.542:552]
```
    }    
```
[8.542]
[20.1053]
```
    }
```
Replacement in crawl-ref/source/spells1.cc at line 107 [11.616635]
∅:D[21.312] → [22.228:270]
∅:D[10.721] → [22.228:270]
B:BD[22.228] → [22.228:270]
```
                      "Blink to where?");
```
[10.721]
[11.618452]
```
                     false, "Blink to where?");
```

Replacement in crawl-ref/source/spells1.cc at line 690 [11.616635]

B:BD[3.374] → [3.374:439]

                                      true, true, "Heal whom?");

[3.374]

[23.310]

                                      true, true, true, "Heal whom?");

Replacement in crawl-ref/source/religion.cc at line 914 [11.804403]

B:BD[24.493] → [2.2529:2635]

∅:D[2.2635] → [25.3821:3928]

B:BD[25.3821] → [25.3821:3928]

B:BD[25.3928] → [2.2636:2690]

∅:D[2.2690] → [25.3981:4083]

B:BD[25.3981] → [25.3981:4083]

B:BD[25.4083] → [2.2691:2878]

∅:D[2.2878] → [25.4183:4332]

B:BD[25.4183] → [25.4183:4332]

    weights[0] =  you.sacrifice_value[OBJ_ARMOUR] + 1;
    weights[1] =  you.sacrifice_value[OBJ_WEAPONS]
                + you.sacrifice_value[OBJ_STAVES]
                + you.sacrifice_value[OBJ_MISSILES] + 1;
    weights[2] =  you.sacrifice_value[OBJ_MISCELLANY]
                + you.sacrifice_value[OBJ_JEWELLERY]
                + you.sacrifice_value[OBJ_BOOKS]
                + you.sacrifice_value[OBJ_GOLD];        // only via acquirement
    weights[3] =  you.sacrifice_value[OBJ_CORPSES] / 2;
    weights[4] =  you.sacrifice_value[OBJ_POTIONS]
                + you.sacrifice_value[OBJ_SCROLLS]
                + you.sacrifice_value[OBJ_WANDS]
                + you.sacrifice_value[OBJ_FOOD];

[24.493]

[26.1405]

    weights[0] = you.sacrifice_value[OBJ_ARMOUR] + 1;
    weights[1] = you.sacrifice_value[OBJ_WEAPONS]
                 + you.sacrifice_value[OBJ_STAVES]
                 + you.sacrifice_value[OBJ_MISSILES] + 1;
    weights[2] = you.sacrifice_value[OBJ_MISCELLANY]
                 + you.sacrifice_value[OBJ_JEWELLERY]
                 + you.sacrifice_value[OBJ_BOOKS]
                 + you.sacrifice_value[OBJ_GOLD];     // only via acquirement
    weights[3] = you.sacrifice_value[OBJ_CORPSES] / 2;
    weights[4] = you.sacrifice_value[OBJ_POTIONS]
                 + you.sacrifice_value[OBJ_SCROLLS]
                 + you.sacrifice_value[OBJ_WANDS]
                 + you.sacrifice_value[OBJ_FOOD];

Deletion in crawl-ref/source/mon-util.cc at line 4167 [11.1699344]
B:BD[27.25319] → [28.3745:3862]
B:BD[28.3862] → [29.8989:9021]
∅:D[29.9021] → [28.3892:3893]
B:BD[28.3892] → [28.3892:3893]
```
            // No pickup for abjurable (summoned) allies - not worth the hassle.
            if (has_ench(ENCH_ABJ))
                return (false);
```

Replacement in crawl-ref/source/item_use.cc at line 1459 [11.2781507]

B:BD[30.33312] → [10.3335:3408]

    direction( target, DIR_NONE, TARG_ENEMY, -1, false, !teleport, true,

[30.33312]

[10.3408]

    direction( target, DIR_NONE, TARG_ENEMY, -1, false, !teleport, true, false,

Replacement in crawl-ref/source/directn.h at line 153 [11.3696722]

B:BD[21.3194] → [10.3469:3544]

B:BD[10.3544] → [4.3058:3138]

                bool may_target_monster = true, const char *prompt = NULL,
                targeting_behaviour *mod = NULL, bool cancel_at_self = false );

[21.3194]

[11.3697568]

                bool may_target_monster = true, bool may_target_self = false,
                const char *prompt = NULL, targeting_behaviour *mod = NULL,
                bool cancel_at_self = false );

Replacement in crawl-ref/source/directn.cc at line 522 [11.3697945]

B:BD[21.4933] → [10.3597:3674]

               bool needs_path, bool may_target_monster, const char *prompt,

[21.4933]

[4.3140]

               bool needs_path, bool may_target_monster,
               bool may_target_self, const char *prompt,

Replacement in crawl-ref/source/directn.cc at line 1116 [11.3697945]

B:BD[4.3305] → [4.3305:3446]

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

[4.3305]

[31.1411]

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

Replacement in crawl-ref/source/directn.cc at line 1124 [11.3697945]

B:BD[4.3545] → [4.3545:3615]

                else if (Options.allow_self_target == CONFIRM_CANCEL)

[4.3545]

[32.4002]

                else if (Options.allow_self_target == CONFIRM_CANCEL
                         && !may_target_self)
                {

Insertion in crawl-ref/source/directn.cc at line 1128 [11.3697945]
[32.4083]
[4.3616]
```
                }
```
Replacement in crawl-ref/source/directn.cc at line 1253 [11.3697945]
B:BD[9.5418] → [9.5418:5452]
```
        if (is_terrain_seen(gc)) 
```
[9.5418]
[9.5452]
```
        if (is_terrain_seen(gc))
```

Replacement in crawl-ref/source/decks.cc at line 1674 [11.3987460]

B:BD[33.5432] → [10.3854:3932]

    if (spell_direction(target, beam, DIR_NONE, TARG_ENEMY, true, true, info)

[33.5432]

[7.5620]

    if (spell_direction(target, beam, DIR_NONE, TARG_ENEMY, true, true, false,
                        info)

Replacement in crawl-ref/source/debug.cc at line 10 [11.4016436]

B:BD[11.4016610] → [11.4016610:4016695]

 *               <4>     14/12/99       LRH             Added cast_spec_spell_name()

[11.4016610]

[11.4016695]

 *               <4>     14/12/99       LRH     Added cast_spec_spell_name()

Replacement in crawl-ref/source/debug.cc at line 13 [11.4016436]

B:BD[11.4016839] → [11.4016839:4016920]

 *                                                   Old code is now #if WIZARD.

[11.4016839]

[11.4016920]

 *                                              Old code is now #if WIZARD.

Replacement in crawl-ref/source/debug.cc at line 4143 [11.4016436]

B:BD[34.3411] → [10.4044:4108]

    direction(moves, DIR_NONE, TARG_ANY, -1, true, false, true,

[34.3411]

[34.3469]

    direction(moves, DIR_NONE, TARG_ANY, -1, true, false, true, true,

Replacement in crawl-ref/source/command.cc at line 380 [11.4082507]
∅:D[35.2889] → [14.3644:3675]
B:BD[14.3644] → [14.3644:3675]
```
        keyin = list_spells();
```
[35.2889]
[14.3675]
```
        keyin = list_spells(false);
```
Replacement in crawl-ref/source/command.cc at line 385 [11.4082507]
B:BD[14.3753] → [14.3753:3788]
```
            keyin = list_spells();
```
[14.3753]
[11.4086316]
```
            keyin = list_spells(false);
```
Replacement in crawl-ref/source/command.cc at line 396 [11.4082507]
B:BD[14.3905] → [14.3905:3960]
```
    spell_type spell = get_spell_by_letter( input_1 );
```
[14.3905]
[11.4086721]
```
    spell_type spell  = get_spell_by_letter( input_1 );
```

Replacement in crawl-ref/source/acr.cc at line 1939 [11.4397395]

B:BD[6.4179] → [6.4179:4389]

            mpr("Only intelligent, permanent allies may equip themselves, "
                "which excludes all types of zombies as well as enslaved and "
                "summoned monsters.", MSGCH_TUTORIAL);

[6.4179]

[6.4389]

            mpr("Only intelligent allies may equip themselves, which excludes "
                "all types of zombies as well as hostile monsters you "
                "enslaved.", MSGCH_TUTORIAL);

Replacement in crawl-ref/docs/options_guide.txt at line 511 [38.63392]

B:BD[36.10700] → [37.3158:3521]

        Note that this only works for intelligent permanent allies (such
        as you can get when worshipping Beogh or the Shining One), and
        that monsters have their own reasonings for which items they may
        need, and when they feel safe enough to pick them up. Except for
        "none", these options won't let you override these requirements.

[36.10700]

[39.7838]

        Note that this only works for intelligent allies (such as you 
        can get when worshipping Beogh or when summoning intelligent 
        monsters), and that monsters have their own reasonings for which 
        items they may need, and when they feel safe enough to pick them 
        up. Except for "none", these options won't let you override these 
        requirements.

Fix 2021696: allow_self_target = no even forbidding self-targetting for

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-util.h at line 119 [11.242902]

Replacement in crawl-ref/source/spl-util.cc at line 742 [11.245665]

Replacement in crawl-ref/source/spl-util.cc at line 749 [11.245665]

Replacement in crawl-ref/source/spl-data.h at line 2063 [11.268152]

Replacement in crawl-ref/source/spl-cast.h at line 44 [11.291319]

Replacement in crawl-ref/source/spl-cast.cc at line 194 [11.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 206 [11.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 207 [11.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 221 [11.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1050 [11.293070]

Replacement in crawl-ref/source/spells3.cc at line 81 [11.531613]

Replacement in crawl-ref/source/spells3.cc at line 1078 [11.531613]

Replacement in crawl-ref/source/spells1.cc at line 107 [11.616635]

Replacement in crawl-ref/source/spells1.cc at line 690 [11.616635]

Replacement in crawl-ref/source/religion.cc at line 914 [11.804403]

Deletion in crawl-ref/source/mon-util.cc at line 4167 [11.1699344]

Replacement in crawl-ref/source/item_use.cc at line 1459 [11.2781507]

Replacement in crawl-ref/source/directn.h at line 153 [11.3696722]

Replacement in crawl-ref/source/directn.cc at line 522 [11.3697945]

Replacement in crawl-ref/source/directn.cc at line 1116 [11.3697945]

Replacement in crawl-ref/source/directn.cc at line 1124 [11.3697945]

Insertion in crawl-ref/source/directn.cc at line 1128 [11.3697945]

Replacement in crawl-ref/source/directn.cc at line 1253 [11.3697945]

Replacement in crawl-ref/source/decks.cc at line 1674 [11.3987460]

Replacement in crawl-ref/source/debug.cc at line 10 [11.4016436]

Replacement in crawl-ref/source/debug.cc at line 13 [11.4016436]

Replacement in crawl-ref/source/debug.cc at line 4143 [11.4016436]

Replacement in crawl-ref/source/command.cc at line 380 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 385 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 396 [11.4082507]

Replacement in crawl-ref/source/acr.cc at line 1939 [11.4397395]

Replacement in crawl-ref/docs/options_guide.txt at line 511 [38.63392]