fiddlerwoaroof/crawl - Change RDZUMV3A5TREQHLPPJWDWVXBNIOWC3CQJJ35TYFBQQVQNTU7SPXQC

Modify Portal Projectile to use the quiver interface, so you can now

choose your projectiles and are no longer prompted when "firing through" friendlies. (FR 1816789)

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

Created by j-p-e-g on June 8, 2008

RDZUMV3A5TREQHLPPJWDWVXBNIOWC3CQJJ35TYFBQQVQNTU7SPXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 935 [4.293070]

B:BD[3.5969] → [3.5969:6008]

    if (flags & SPFLAG_TARGETING_MASK)

[3.5969]

[3.6008]

    if ((flags & SPFLAG_TARGETING_MASK) && spell != SPELL_PORTAL_PROJECTILE)

Replacement in crawl-ref/source/spl-cast.cc at line 946 [4.293070]

B:BD[5.1950] → [6.295:341]

∅:D[6.341] → [7.393:403]

B:BD[7.393] → [7.393:403]

B:BD[7.403] → [8.182:326]

∅:D[8.326] → [7.490:588]

B:BD[7.490] → [7.490:588]

B:BD[7.588] → [8.327:467]

∅:D[8.467] → [7.588:751]

B:BD[7.588] → [7.588:751]

B:BD[7.751] → [9.270:313]

        if (spell == SPELL_PORTAL_PROJECTILE)
        {
            const item_def* item;
            int idx;
            you.m_quiver->get_desired_item(&item, &idx);
            if ( item == NULL )
            {
                mpr("No suitable missiles.");
                return (SPRET_ABORT);
            }
            else if ( idx == -1 )
            {
                mpr("No missiles left.");
                return SPRET_ABORT;
            }
            mprf(MSGCH_PROMPT, "Where do you want to aim %s?",
                               you.inv[idx].name(DESC_NOCAP_YOUR).c_str());
        }
        else if (spell == SPELL_EVAPORATE)

[5.1950]

[9.313]

        if (spell == SPELL_EVAPORATE)

Replacement in crawl-ref/source/spl-cast.cc at line 1984 [4.293070]

B:BD[6.376] → [6.376:427]

        if ( !cast_portal_projectile(powc, beam) )

[6.376]

[10.412]

        if (!cast_portal_projectile(powc))

Replacement in crawl-ref/source/spells4.h at line 57 [4.434549]
B:BD[11.142666] → [6.462:512]
```
bool cast_portal_projectile(int pow, bolt& beam);
```
[11.142666]
[4.436206]
```
bool cast_portal_projectile(int pow);
```
Insertion in crawl-ref/source/spells4.cc at line 33 [4.436250]
[4.436880]
[4.436880]
```
#include "invent.h"
```
Replacement in crawl-ref/source/spells4.cc at line 2103 [4.436250]
B:BD[4.512708] → [4.512708:512734]
```
    // Inflict the damage
```
[4.512708]
[4.512734]
```
    // Inflict the damage.
```
Replacement in crawl-ref/source/spells4.cc at line 2105 [4.436250]
B:BD[4.512775] → [4.512775:512839]
```
    return;
}                               // end cast_twist()
```
[4.512775]
[10.606]
```
}
```
Replacement in crawl-ref/source/spells4.cc at line 2107 [4.436250]
B:BD[10.607] → [6.514:563]
```
bool cast_portal_projectile(int pow, bolt& beam)
```
[10.607]
[10.658]
```
bool cast_portal_projectile(int pow)
```

Replacement in crawl-ref/source/spells4.cc at line 2112 [4.436250]

B:BD[10.699] → [12.2803:2856]

    if (grid_is_solid(beam.target_x, beam.target_y))

[10.699]

[10.754]

    dist target;
    int item = get_ammo_to_shoot(-1, target, true);
    if (item == -1)
        return (false);
    if (grid_is_solid(target.tx, target.ty))

Replacement in crawl-ref/source/spells4.cc at line 2120 [4.436250]
B:BD[10.804] → [10.804:826]
```
        return false;
```
[10.804]
[13.4628]
```
        return (false);
```

Replacement in crawl-ref/source/spells4.cc at line 2123 [4.436250]

B:BD[13.4635] → [13.4635:4696]

    if (trans_wall_blocking( beam.target_x, beam.target_y ))

[13.4635]

[13.4696]

    // Can't use portal through walls. (That'd be just too cheap!)
    if (trans_wall_blocking( target.tx, target.ty ))

Replacement in crawl-ref/source/spells4.cc at line 2127 [4.436250]
B:BD[13.4752] → [13.4752:4770]
```
        return 0;
```
[13.4752]
[10.826]
```
        return (false);
```

Replacement in crawl-ref/source/spells4.cc at line 2130 [4.436250]

B:BD[4.512840] → [8.493:581]

B:BD[8.581] → [12.2857:2879]

∅:D[8.605] → [10.904:948]

∅:D[12.2879] → [10.904:948]

B:BD[10.904] → [10.904:948]

B:BD[10.948] → [8.606:634]

B:BD[8.634] → [12.2880:2904]

∅:D[12.2904] → [8.660:700]

B:BD[8.660] → [8.660:700]

∅:D[8.700] → [10.948:976]

B:BD[10.948] → [10.948:976]

    int idx;
    const item_def* item;
    you.m_quiver->get_desired_item(&item, &idx);
    if (item == NULL)
    {
        mpr("No suitable missiles.");
        return false;
    }
    else if (idx == -1)
    {
        mpr("No missiles left.");
        return false;
    }

[4.512840]

[12.2905]

    if (!check_warning_inscriptions(you.inv[item], OPER_FIRE))
        return (false);

Replacement in crawl-ref/source/spells4.cc at line 2133 [4.436250]

B:BD[12.2906] → [12.2906:2953]

    throw_it(beam, idx, true, random2(pow/4));

[12.2906]

[10.976]

    bolt beam;
    throw_it( beam, item, true, random2(pow/4), &target );

Replacement in crawl-ref/source/spells4.cc at line 2136 [4.436250]
B:BD[10.1026] → [10.1026:1043]
```
    return true;
```
[10.977]
[10.1043]
```
    return (true);
```
Replacement in crawl-ref/source/item_use.h at line 108 [4.2777340]
∅:D[14.2869] → [15.2603:2633]
B:BD[16.464] → [15.2603:2633]
```
void fire_thing(int item=-1);
```
[14.2869]
[4.2779954]
```
int get_ammo_to_shoot(int item, dist &target, bool teleport = false);
void fire_thing(int item = -1);
```
Replacement in crawl-ref/source/item_use.cc at line 344 [4.2781507]
B:BD[4.2788631] → [4.2788631:2788686]
```
    // warn player about low str/dex or throwing skill
```
[4.2788631]
[17.259]
```
    // Warn player about low str/dex or throwing skill.
```
Replacement in crawl-ref/source/item_use.cc at line 348 [4.2781507]
B:BD[4.2788708] → [4.2788708:2788733]
```
    // time calculations
```
[4.2788708]
[18.376]
```
    // Time calculations.
```

Replacement in crawl-ref/source/item_use.cc at line 1411 [4.2781507]

B:BD[16.3085] → [8.10636:10702]

static bool _fire_choose_item_and_target(int& slot, dist& target)

[16.3085]

[16.3144]

static bool _fire_choose_item_and_target(int& slot, dist& target,
                                         bool teleport = false)

Replacement in crawl-ref/source/item_use.cc at line 1425 [4.2781507]

B:BD[19.12080] → [8.10831:10896]

        beh.m_slot = slot; // force item to be the prechosen one

[19.12080]

[19.12081]

        beh.m_slot = slot; // Force item to be the prechosen one.

Replacement in crawl-ref/source/item_use.cc at line 1429 [4.2781507]

B:BD[15.5715] → [20.2679:2759]

∅:D[20.2759] → [21.2836:2912]

B:BD[15.5797] → [21.2836:2912]

    message_current_target();  // XXX: this stuff should be done by direction()
    direction( target, DIR_NONE, TARG_ENEMY, -1, false, true, NULL, &beh );

[15.5715]

[22.9036]

    message_current_target();  // XXX: This stuff should be done by direction()!
    direction( target, DIR_NONE, TARG_ENEMY, -1, false, !teleport, NULL, &beh );

Replacement in crawl-ref/source/item_use.cc at line 1536 [4.2781507]
B:BD[15.9031] → [15.9031:9066]
B:BD[15.9066] → [23.2892:2943]
∅:D[23.2943] → [15.9066:9092]
B:BD[15.9066] → [15.9066:9092]
```
// if item == -1, prompt the user.
// if item passed, it will be put into the quiver.
void fire_thing(int item)
```
[15.9031]
[15.9092]
```
int get_ammo_to_shoot(int item, dist &target, bool teleport)
```
Insertion in crawl-ref/source/item_use.cc at line 1538 [4.2781507]
[15.9094]
[15.9094]
```
    mpr("in get_ammo_to_shoot()");
```
Replacement in crawl-ref/source/item_use.cc at line 1542 [4.2781507]
∅:D[24.4433] → [4.2811971:2811987]
∅:D[25.4672] → [4.2811971:2811987]
∅:D[15.9192] → [4.2811971:2811987]
B:BD[4.2811971] → [4.2811971:2811987]
```
        return;
```
[25.4672]
[4.2811987]
```
        return (-1);
```

Replacement in crawl-ref/source/item_use.cc at line 1545 [4.2781507]

∅:D[25.4674] → [15.9202:9270]

B:BD[15.9202] → [15.9202:9270]

    if (Options.tutorial_left)
        Options.tut_throw_counter++;

[25.4674]

[4.2812121]

    if (!_fire_choose_item_and_target(item, target, teleport))
        return (-1);

Deletion in crawl-ref/source/item_use.cc at line 1548 [4.2781507]
B:BD[4.2812122] → [16.4418:4435]
B:BD[16.4435] → [26.3852:3905]
B:BD[26.3905] → [27.2927:2944]
```
    dist target;
    if (!_fire_choose_item_and_target(item, target))
        return;
```
Replacement in crawl-ref/source/item_use.cc at line 1552 [4.2781507]
∅:D[27.3041] → [26.3905:3921]
B:BD[26.3905] → [26.3905:3921]
```
        return;
```
[27.3041]
[27.3042]
```
        return (-1);
```

Insertion in crawl-ref/source/item_use.cc at line 1554 [4.2781507]

[27.3048]

[15.9389]

    return (item);
}
// If item == -1, prompt the user.
// If item passed, it will be put into the quiver.
void fire_thing(int item)
{
    mpr("in fire_thing()");
    dist target;
    item = get_ammo_to_shoot(item, target);
    mpr("back in fire_thing()");
    if (item == -1)
        return;
    if (Options.tutorial_left)
        Options.tut_throw_counter++;

Replacement in crawl-ref/source/item_use.cc at line 1767 [4.2781507]
B:BD[4.2813244] → [10.1428:1447]
```
    if (!teleport)
```
[4.2813244]
[11.741346]
```
    if (target)
        thr = *target;
    else
```

Replacement in crawl-ref/source/item_use.cc at line 1771 [4.2781507]

B:BD[11.741352] → [16.4643:4703]

        if (target)
            thr = *target;
        else

[11.741352]

[16.4703]

        message_current_target();
        direction( thr, DIR_NONE, TARG_ENEMY );
        if (!thr.isValid)

Replacement in crawl-ref/source/item_use.cc at line 1776 [4.2781507]

B:BD[16.4713] → [16.4713:4803]

∅:D[16.4803] → [4.2813288:2813289]

∅:D[11.741638] → [4.2813288:2813289]

B:BD[4.2813288] → [4.2813288:2813289]

B:BD[4.2813289] → [16.4804:4922]

            message_current_target();
            direction( thr, DIR_NONE, TARG_ENEMY );
            if (!thr.isValid)
            {
                if (thr.isCancel)
                    canned_msg(MSG_OK);

[16.4713]

[25.4800]

            if (thr.isCancel)
                canned_msg(MSG_OK);

Replacement in crawl-ref/source/item_use.cc at line 1779 [4.2781507]
∅:D[25.4801] → [16.4923:4969]
B:BD[10.1563] → [16.4923:4969]
```
                return (false);
            }
```
[25.4801]
[10.1591]
```
            return (false);
```

Replacement in crawl-ref/source/item_use.cc at line 1784 [4.2781507]

B:BD[11.741670] → [2.2893:2960]

    // Making a copy of the item: changed only for venom launchers

[11.741670]

[2.2960]

    // Making a copy of the item: changed only for venom launchers.

Replacement in crawl-ref/source/item_use.cc at line 1793 [4.2781507]
B:BD[2.3227] → [2.3227:3273]
```
    // figure out if we're thrown or launched
```
[2.3227]
[2.3273]
```
    // Figure out if we're thrown or launched.
```

Replacement in crawl-ref/source/item_use.cc at line 1852 [4.2781507]

B:BD[2.4914] → [2.4914:5158]

    // init tracer variables
    pbolt.foe_count     = pbolt.fr_count = 0;
    pbolt.foe_power     = pbolt.fr_power = 0;
    pbolt.fr_helped     = pbolt.fr_hurt  = 0;
    pbolt.foe_helped    = pbolt.foe_hurt = 0;
    pbolt.foe_ratio     = 100;

[2.4914]

[2.5158]

    // Don't do the tracing when using Portaled Projectile, or when confused.
    if (!teleport && !you.duration[DUR_CONF])
    {
        // Init tracer variables.
        pbolt.foe_count     = pbolt.fr_count = 0;
        pbolt.foe_power     = pbolt.fr_power = 0;
        pbolt.fr_helped     = pbolt.fr_hurt  = 0;
        pbolt.foe_helped    = pbolt.foe_hurt = 0;
        pbolt.foe_ratio     = 100;

Deletion in crawl-ref/source/item_use.cc at line 1862 [4.2781507]
B:BD[2.5159] → [2.5159:5235]
```
    // Don't do the tracing when confused.
    if (!you.duration[DUR_CONF])
```

Replacement in crawl-ref/source/item_use.cc at line 1864 [4.2781507]

B:BD[2.5262] → [2.5262:5492]

    // Should only happen if the player answered 'n' to one of those
    // "Fire through friendly?" prompts.
    if (pbolt.fr_count > 0)
    {
        canned_msg(MSG_OK);
        you.turn_is_over = false;
        return (false);

[2.5262]

[2.5492]

        // Should only happen if the player answered 'n' to one of those
        // "Fire through friendly?" prompts.
        if (pbolt.fr_count > 0)
        {
            canned_msg(MSG_OK);
            you.turn_is_over = false;
            return (false);
        }

Replacement in crawl-ref/source/item_use.cc at line 1901 [4.2781507]

B:BD[4.2813551] → [11.742224:742286]

    // even though direction is allowed, we're throwing so we

[4.2813551]

[4.2813614]

    // Even though direction is allowed, we're throwing so we

Replacement in crawl-ref/source/item_use.cc at line 2040 [4.2781507]
B:BD[28.5069] → [28.5069:5101]
```
        effSkill = shoot_skill;
```
[11.744549]
[4.2817679]
```
        effSkill    = shoot_skill;
```
Replacement in crawl-ref/source/item_use.cc at line 2224 [4.2781507]
B:BD[4.2823614] → [11.748202:748239]
```
            pbolt.name = "bolt of ";
```
[4.2823614]
[4.2823663]
```
            pbolt.name    = "bolt of ";
```
Replacement in crawl-ref/source/item_use.cc at line 2229 [4.2781507]
B:BD[4.2823743] → [11.748282:748317]
```
            pbolt.name += "frost";
```
[4.2823743]
[2.6344]
```
            pbolt.name   += "frost";
```

Replacement in crawl-ref/source/item_use.cc at line 2364 [4.2781507]

B:BD[29.12768] → [29.12768:12823]

                exHitBonus = you.skills[SK_DARTS] * 2;

[29.12625]

[28.5745]

                exHitBonus  = you.skills[SK_DARTS] * 2;

Replacement in crawl-ref/source/item_use.cc at line 2366 [4.2781507]
∅:D[28.5810] → [29.12893:12948]
B:BD[29.12893] → [29.12893:12948]
```
                exDamBonus = you.skills[SK_DARTS] / 3;
```
[28.5810]
[28.5811]
```
                exDamBonus  = you.skills[SK_DARTS] / 3;
```

Replacement in crawl-ref/source/item_use.cc at line 2506 [4.2781507]

∅:D[30.15148] → [31.319:385]

B:BD[4.2829966] → [31.319:385]

    mprf( "You %s%s %s.",
          projected? "" : "awkwardly ",

[30.15148]

[31.385]

    mprf( "%s %s%s %s.",
          teleport  ? "Magically, you" : "You",
          projected ? "" : "awkwardly ",

Replacement in crawl-ref/source/item_use.cc at line 2582 [4.2781507]
∅:D[11.751720] → [4.2830692:2830742]
B:BD[4.2830692] → [4.2830692:2830742]
```
}                               // end throw_it()
```
[11.751720]
[32.2477]
```
}
```

Replacement in crawl-ref/source/item_use.cc at line 2602 [4.2781507]

B:BD[32.3028] → [32.3028:3200]

        case MI_STONE:  chance = 4; break;
        case MI_DART:   chance = 3; break;
        case MI_ARROW:  chance = 4; break;
        case MI_BOLT:   chance = 4; break;

[32.3028]

[32.3200]

        case MI_STONE:   chance =  4; break;
        case MI_DART:    chance =  3; break;
        case MI_ARROW:   chance =  4; break;
        case MI_BOLT:    chance =  4; break;

Replacement in crawl-ref/source/item_use.cc at line 2607 [4.2781507]

B:BD[32.3245] → [32.3245:3319]

        case MI_THROWING_NET: break; // doesn't get destroyed by throwing

[32.3245]

[4.2830742]

        case MI_THROWING_NET: break; // Doesn't get destroyed by throwing.

Insertion in crawl-ref/source/effects.cc at line 1992 [4.3382105]
[4.3427210]
[4.3427210]
```
    mesclr();
```
Replacement in crawl-ref/source/beam.cc at line 5366 [4.4128068]
B:BD[4.4256742] → [4.4256742:4256791]
```
        // random beams: randomize before affect
```
[4.4256742]
[4.4256791]
```
        // Random beams: randomize before affect.
```

Modify Portal Projectile to use the quiver interface, so you can now

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 935 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 946 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1984 [4.293070]

Replacement in crawl-ref/source/spells4.h at line 57 [4.434549]

Insertion in crawl-ref/source/spells4.cc at line 33 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2103 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2105 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2107 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2112 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2120 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2123 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2127 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2130 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2133 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 2136 [4.436250]

Replacement in crawl-ref/source/item_use.h at line 108 [4.2777340]

Replacement in crawl-ref/source/item_use.cc at line 344 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 348 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1411 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1425 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1429 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1536 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 1538 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1542 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1545 [4.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1548 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1552 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 1554 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1767 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1771 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1776 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1779 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1784 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1793 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1852 [4.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1862 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1864 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1901 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2040 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2224 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2229 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2364 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2366 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2506 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2582 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2602 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2607 [4.2781507]

Insertion in crawl-ref/source/effects.cc at line 1992 [4.3382105]

Replacement in crawl-ref/source/beam.cc at line 5366 [4.4128068]