fiddlerwoaroof/crawl - Change M7ZFG56FN7JSTREHU75K333KVVR75JZDZMIQGN44BLNXEKQXCX4AC

Make the spell message key suffix "gestures" works as documented.

If a targeted spell doesn't exactly hit anything (because the monster was confused or the target was invisible) then, if appropriate, use the prepositions "past" or "next to" instead of "at".

If a targeted spell with an invisible beam with a message saying "gestures at" or "points to" doesn't exactly hit anything, then assume anything near the path implied by the gesture/pointing is the desired target.

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

Created by zelgadis on January 1, 2009

M7ZFG56FN7JSTREHU75K333KVVR75JZDZMIQGN44BLNXEKQXCX4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 589 [5.1340842]
B:BD[4.3890] → [4.3890:3934]
```
    if (shape <= MON_SHAPE_NAGA && !innate)
```
[4.3890]
[6.7610]
```
    if (shape <= MON_SHAPE_NAGA)
```
Replacement in crawl-ref/source/mstuff2.cc at line 591 [5.1340842]
B:BD[6.7616] → [4.3935:3965]
```
        if (priest || wizard)
```
[6.7616]
[4.3965]
```
        if (!innate && (priest || wizard))
```

Replacement in crawl-ref/source/mstuff2.cc at line 619 [5.1340842]

B:BD[2.2825] → [2.2825:2961]

    const bool targeted = in_bounds(pbolt.target)
        && pbolt.target != monster->pos()
        && (flags & SPFLAG_TARGETING_MASK);

[2.2825]

[2.2961]

    const bool targeted = flags & SPFLAG_TARGETING_MASK;

Replacement in crawl-ref/source/mstuff2.cc at line 633 [5.1340842]

B:BD[2.3131] → [2.3131:3203]

            key_list.push_back(pbolt.short_name + " beam " + cast_str);

[2.3131]

[2.3203]

            key_list.push_back(pbolt.get_short_name() + " beam " + cast_str);

Replacement in crawl-ref/source/mstuff2.cc at line 704 [5.1340842]

∅:D[4.6627] → [7.5627:5665]

B:BD[7.5627] → [7.5627:5665]

B:BD[7.5665] → [4.6628:6698]

    std::string target = "something";
    if (!(flags & SPFLAG_TARGETING_MASK) || !in_bounds(pbolt.target))

[4.6627]

[4.6698]

    bolt tracer = pbolt;
    if (targeted)
    {
        // For a targeted but rangeless spell make the range positive so that
        // fire_tracer() will fill out path_taken.
        if (pbolt.range == 0 && pbolt.target != monster->pos())
            tracer.range = ENV_SHOW_DIAMETER;
        fire_tracer(monster, tracer);
    }
    std::string targ_prep = "at";
    std::string target    = "nothing";
    if (!targeted)

Replacement in crawl-ref/source/mstuff2.cc at line 724 [5.1340842]
∅:D[4.6868] → [7.5725:5762]
B:BD[7.5725] → [7.5725:5762]
```
    else if (see_grid(pbolt.target))
```
[4.6868]
[7.5762]
```
    else if (in_bounds(pbolt.target) && see_grid(pbolt.target))
```

Replacement in crawl-ref/source/mstuff2.cc at line 737 [5.1340842]

B:BD[3.2701] → [3.2701:2806]

    // been applied because the monster can't see the target.
    if (target == "something" && targeted)

[3.2701]

[3.2806]

    // been applied because the target is invisible.
    if (target == "nothing" && targeted)

Replacement in crawl-ref/source/mstuff2.cc at line 740 [5.1340842]

B:BD[3.2812] → [3.2812:2841]

        bolt tracer = pbolt;

[3.2812]

[3.2841]

        if (pbolt.aimed_at_spot)
        {
            int count = 0;
            for (adjacent_iterator ai(pbolt.target); ai; ++ai)
            {
                if (*ai == monster->pos())
                    continue;
                if (*ai == you.pos())
                {
                    targ_prep = "next to";
                    target    = "you";
                    break;
                }

Replacement in crawl-ref/source/mstuff2.cc at line 755 [5.1340842]
B:BD[3.2842] → [3.2842:2880]
```
        fire_tracer(monster, tracer);
```
[3.2842]
[3.2880]
```
                const int midx = mgrd(*ai);
```

Replacement in crawl-ref/source/mstuff2.cc at line 757 [5.1340842]

B:BD[3.2881] → [3.2881:2945]

        const std::vector<coord_def> &path = tracer.path_taken;

[3.2881]

[3.2945]

                if (midx != NON_MONSTER && you.can_see(&menv[midx]))
                {
                    targ_prep = "next to";
                    if (one_chance_in(count++))
                        target = menv[midx].name(DESC_NOCAP_THE);
                }
            }
        }

Replacement in crawl-ref/source/mstuff2.cc at line 766 [5.1340842]

B:BD[3.2946] → [3.2946:2986]

        bool mons_targ_aligned = false;

[3.2946]

[3.2986]

        const bool gestured = msg.find("Gesture") != std::string::npos
                           || msg.find(" gesture") != std::string::npos
                           || msg.find("Point") != std::string::npos
                           || msg.find(" point") != std::string::npos;
        const bool visible_path      = visible_beam || gestured;
              bool mons_targ_aligned = false;

Insertion in crawl-ref/source/mstuff2.cc at line 773 [5.1340842]
[3.2987]
[3.2987]
```
        const std::vector<coord_def> &path = tracer.path_taken;
```

Replacement in crawl-ref/source/mstuff2.cc at line 789 [5.1340842]

B:BD[3.3510] → [3.3510:3546]

                    target = "you";

[3.3510]

[3.3546]

                    targ_prep = "at";
                    target    = "you";

Replacement in crawl-ref/source/mstuff2.cc at line 797 [5.1340842]

B:BD[3.3845] → [3.3845:3893]

                else if (target == "something")

[3.3845]

[3.3893]

                else if (target == "nothing")

Insertion in crawl-ref/source/mstuff2.cc at line 800 [5.1340842]
[3.3958]
[3.3958]
```
                    targ_prep         = "at";
```

Replacement in crawl-ref/source/mstuff2.cc at line 804 [5.1340842]

B:BD[3.4036] → [3.4036:4093]

            else if (visible_beam && midx != NON_MONSTER

[3.4036]

[3.4093]

            else if (visible_path && midx != NON_MONSTER

Replacement in crawl-ref/source/mstuff2.cc at line 810 [5.1340842]

B:BD[3.4312] → [3.4312:4355]

                if (target == "something")

[3.4312]

[3.4355]

                if (target == "nothing")

Insertion in crawl-ref/source/mstuff2.cc at line 823 [5.1340842]
[3.4867]
[3.4867]
```
                targ_prep = "at";
```

Replacement in crawl-ref/source/mstuff2.cc at line 825 [5.1340842]

B:BD[3.4881] → [3.4881:4897]

        }
    }

[3.4881]

[3.4897]

            else if (visible_path && target == "nothing")
            {
                int count = 0;
                for (adjacent_iterator ai(pbolt.target); ai; ++ai)
                {
                    if (*ai == monster->pos())
                        continue;
                    if (*ai == you.pos())
                    {
                        targ_prep = "past";
                        target    = "you";
                        break;
                    }
                    const int midx2 = mgrd(*ai);
                    if (midx2 != NON_MONSTER && you.can_see(&menv[midx2]))
                    {
                        targ_prep = "past";
                        if (one_chance_in(count++))
                            target = menv[midx2].name(DESC_NOCAP_THE);
                    }
                }
            }
        } // for (unsigned int i = 0; i < path.size(); i++)
        // If the monster gestures to create an invisible beam then
        // assume that anything close to the beam is the intended target.
        if ((!visible_beam && gestured) || target == "nothing")
            targ_prep = "at";
    } // if (target == "nothing" && targeted)

Insertion in crawl-ref/source/mstuff2.cc at line 856 [5.1340842]
[3.4898]
[7.6097]
```
    msg = replace_all(msg, "@at@",     targ_prep);
```
Deletion in crawl-ref/source/mstuff2.cc at line 859 [5.1340842]
B:BD[6.9139] → [8.2528:2613]
```
    // Don't check for pbolt.seen, since we get called before the beam is
	// fired.
```

Replacement in crawl-ref/source/mstuff2.cc at line 860 [5.1340842]

B:BD[8.2640] → [8.2640:2675]

B:BD[8.2675] → [4.6869:6911]

∅:D[4.6911] → [8.2713:2744]

B:BD[8.2713] → [8.2713:2744]

    if (pbolt.flavour <= BEAM_NONE
        || pbolt.flavour > BEAM_LAST_REAL
        || pbolt.name.empty())

[8.2640]

[8.2744]

    if (!targeted)
    {
        beam_name = "NON TARGETED BEAM";
    }
    else if (pbolt.name.empty())

Replacement in crawl-ref/source/mstuff2.cc at line 868 [5.1340842]
B:BD[8.2792] → [2.3258:3286]
```
    else if (!visible_beam)
```
[8.2792]
[4.7026]
```
    else if (!tracer.seen)
```
Replacement in crawl-ref/source/mstuff2.cc at line 870 [5.1340842]
∅:D[4.7032] → [8.2846:2884]
B:BD[8.2846] → [8.2846:2884]
```
        beam_name = "INVISIBLE BEAM";
```
[4.7032]
[4.7033]
```
        beam_name = "UNSEEN BEAM";
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 89 [6.11984]
B:BD[7.13117] → [7.13117:13155]
```
@The_monster@ spits acid at @target@.
```
[7.13117]
[7.13155]
```
@The_monster@ spits acid @at@ @target@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 97 [6.11984]
B:BD[7.13240] → [8.5257:5300]
```
@The_monster@ breathes @beam@ at @target@.
```
[7.13240]
[7.13264]
```
@The_monster@ breathes @beam@ @at@ @target@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 105 [6.11984]
B:BD[6.12139] → [7.13317:13357]
```
@The_monster@ spits poison at @target@.
```
[6.12139]
[6.12167]
```
@The_monster@ spits poison @at@ @target@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 113 [6.11984]
B:BD[7.13384] → [7.13384:13430]
```
@The_monster@ spits sticky flame at @target@.
```
[7.13384]
[7.13430]
```
@The_monster@ spits sticky flame @at@ @target@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 158 [6.11984]
B:BD[6.13097] → [4.12267:12310]
```
@The_monster@ breathes @beam@ at @target@.
```
[6.13097]
[6.13121]
```
@The_monster@ breathes @beam@ @at@ @target@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 180 [6.11984]
B:BD[4.12461] → [4.12461:12494]
```
@The_monster@ gazes at @target@.
```
[4.12461]
[4.12494]
```
@The_monster@ gazes @at@ @target@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 250 [6.11984]
B:BD[2.4140] → [2.4140:4181]
```
@The_monster@ throws @beam@ at @target@.
```
[2.4140]
[4.13529]
```
@The_monster@ throws @beam@ @at@ @target@.
```

Make the spell message key suffix "gestures" works as documented.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 589 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 591 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 619 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 633 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 704 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 724 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 737 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 740 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 755 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 757 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 766 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 773 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 789 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 797 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 800 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 804 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 810 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 823 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 825 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 856 [5.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 859 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 860 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 868 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 870 [5.1340842]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 89 [6.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 97 [6.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 105 [6.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 113 [6.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 158 [6.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 180 [6.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 250 [6.11984]