fiddlerwoaroof/crawl - Change VNSLOK372XJJSBJRVPCEFXCXSGYBOUAEBWGNG2KEK6XRZI6GTK6AC

Fix monster emergency spells not checking for ENCH_TP, thus allowing

monsters to cancel their teleportation without meaning to. (BR 2000428) Fix the quiver not being cleared when wielding the only quiverable (and thus previously quivered) item. (Un)wielding such an item now switches nicely between "Nothing wielded" and "Nothing quivered", as it should be.

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

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

VNSLOK372XJJSBJRVPCEFXCXSGYBOUAEBWGNG2KEK6XRZI6GTK6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/quiver.cc at line 25 [4.3828]

B:BD[3.3585] → [3.3585:3677]

static bool _item_matches(const item_def &item, fire_type types, const item_def* launcher);

[3.3585]

[3.3677]

static bool _item_matches(const item_def &item, fire_type types,
                          const item_def* launcher);

Insertion in crawl-ref/source/quiver.cc at line 28 [4.3828]
[3.3743]
[4.4506]

Replacement in crawl-ref/source/quiver.cc at line 62 [4.3828]

B:BD[4.5222] → [5.2773:2845]

        // Return the item in inv, since it will have an accurate count

[4.5222]

[2.3352]

        // Return the item in inv, since it will have an accurate count.

Replacement in crawl-ref/source/quiver.cc at line 173 [4.3828]

B:BD[3.5541] → [3.5541:5595]

        if (! _items_similar(*weapon, m_last_weapon))

[3.5541]

[3.5595]

        if (!_items_similar(*weapon, m_last_weapon))

Deletion in crawl-ref/source/quiver.cc at line 199 [4.3828]
B:BD[3.6270] → [6.10301:10312]
```
        //
```

Replacement in crawl-ref/source/quiver.cc at line 200 [4.3828]

B:BD[7.5060] → [7.5060:5119]

        int qv_slot; get_desired_item(&desired, &qv_slot);

[7.5060]

[3.6325]

        int qv_slot;
        get_desired_item(&desired, &qv_slot);

Deletion in crawl-ref/source/quiver.cc at line 203 [4.3828]
B:BD[3.6354] → [7.5120:5130]
```
        {
```
Deletion in crawl-ref/source/quiver.cc at line 204 [4.3828]
B:BD[7.5168] → [7.5168:5178]
```
        }
```

Replacement in crawl-ref/source/quiver.cc at line 212 [4.3828]

B:BD[3.6613] → [3.6613:6665]

    if (! is_valid_item(m_last_used_of_type[slot]))

[3.6613]

[3.6665]

#ifdef DEBUG_QUIVER
    mprf(MSGCH_DIAGNOSTICS, "last quiver item: %s; link %d, wpn: %d",
         m_last_used_of_type[slot].name(DESC_PLAIN).c_str(),
         m_last_used_of_type[slot].link, you.equip[EQ_WEAPON]);
#endif
    bool unquiver_weapon = false;
    if (is_valid_item(m_last_used_of_type[slot]))

Replacement in crawl-ref/source/quiver.cc at line 221 [4.3828]

B:BD[3.6671] → [3.6671:6977]

        // const launch_retval desired_ret =
        //     (weapon && is_range_weapon(*weapon)) ? LRET_LAUNCHED : LRET_THROWN;
        const launch_retval desired_ret =
            (slot == AMMO_THROW ? LRET_THROWN : LRET_LAUNCHED);
        std::vector<int> order;  _get_fire_order(order, false, weapon);

[3.6671]

[6.10313]

        // If we're wielding an item previously quivered, the quiver may need
        // to be cleared. Else, any already quivered item is valid and we
        // don't need to do anything else.
        if (m_last_used_of_type[slot].link == you.equip[EQ_WEAPON])
            unquiver_weapon = true;
        else
            return;
    }
#ifdef DEBUG_QUIVER
    mpr("recalculating fire order...", MSGCH_DIAGNOSTICS);
#endif
    // const launch_retval desired_ret =
    //     (weapon && is_range_weapon(*weapon)) ? LRET_LAUNCHED : LRET_THROWN;
    const launch_retval desired_ret =
        (slot == AMMO_THROW ? LRET_THROWN : LRET_LAUNCHED);
    std::vector<int> order;  _get_fire_order(order, false, weapon);
    if (unquiver_weapon && order.empty())
    {
//        m_last_used_of_type[slot] = you.inv[order[i]];
        m_last_used_of_type[slot].quantity = 0;
    }
    else
    {

Replacement in crawl-ref/source/quiver.cc at line 269 [4.3828]

B:BD[3.7721] → [3.7721:7856]

void player_quiver::_get_fire_order(
    std::vector<int>& order,
    bool ignore_inscription_etc,
    const item_def* launcher) const

[3.7721]

[4.8064]

void player_quiver::_get_fire_order( std::vector<int>& order,
                                     bool ignore_inscription_etc,
                                     const item_def* launcher) const

Replacement in crawl-ref/source/quiver.cc at line 273 [4.3828]

B:BD[4.8066] → [4.8066:8149]

    const int inv_start = (ignore_inscription_etc ? 0 : Options.fire_items_start);

[4.8066]

[4.8149]

    const int inv_start = (ignore_inscription_etc ? 0
                                                  : Options.fire_items_start);

Replacement in crawl-ref/source/quiver.cc at line 280 [4.3828]

∅:D[3.7916] → [4.8368:8432]

B:BD[4.8368] → [4.8368:8432]

B:BD[4.8432] → [3.7917:8009]

            for (int i_inv=inv_start; i_inv<ENDOFPACK; i_inv++)
                if (is_valid_item(you.inv[i_inv]) && you.inv[i_inv].launched_by(*launcher))

[3.7916]

[4.8522]

        {
            for (int i_inv = inv_start; i_inv < ENDOFPACK; i_inv++)
                if (is_valid_item(you.inv[i_inv])
                    && you.inv[i_inv].launched_by(*launcher))
                {

Insertion in crawl-ref/source/quiver.cc at line 286 [4.3828]
[4.8566]
[4.8566]
```
                }
        }
```

Replacement in crawl-ref/source/quiver.cc at line 291 [4.3828]

B:BD[4.8589] → [4.8589:8645]

    for (int i_inv=inv_start; i_inv<ENDOFPACK; i_inv++)

[4.8589]

[4.8645]

    for (int i_inv = inv_start; i_inv < ENDOFPACK; i_inv++)

Insertion in crawl-ref/source/quiver.cc at line 296 [4.3828]
[4.8754]
[4.8754]
```
        // Don't quiver wielded weapon.
```

Replacement in crawl-ref/source/quiver.cc at line 302 [4.3828]

∅:D[2.3830] → [4.8873:8964]

B:BD[4.8873] → [4.8873:8964]

        if (!ignore_inscription_etc &&
            strstr(item.inscription.c_str(), "=f"))

[2.3830]

[4.8964]

        if (!ignore_inscription_etc
            && strstr(item.inscription.c_str(), "=f"))

Replacement in crawl-ref/source/quiver.cc at line 308 [4.3828]

B:BD[4.9007] → [6.10374:10463]

        for (unsigned int i_flags = 0;
             i_flags < Options.fire_order.size();

[4.9007]

[4.9092]

        for (unsigned int i_flags = 0; i_flags < Options.fire_order.size();

Replacement in crawl-ref/source/quiver.cc at line 311 [4.3828]

B:BD[4.9126] → [6.10464:10540]

            if (_item_matches(item, (fire_type)Options.fire_order[i_flags],

[4.9126]

[6.10540]

            if (_item_matches(item, (fire_type) Options.fire_order[i_flags],

Replacement in crawl-ref/source/monstuff.cc at line 242 [10.1396662]
∅:D[8.3933] → [9.2897:2950]
B:BD[10.1402957] → [9.2897:2950]
```
    if (decay_potions && !quiet) // just for mummies
```
[8.3933]
[9.2950]
```
    if (decay_potions && !quiet) // Just for mummies.
```
Replacement in crawl-ref/source/monstuff.cc at line 248 [10.1396662]
B:BD[9.3041] → [9.3041:3084]
```
        // decay at least two of the stack
```
[9.3041]
[9.3084]
```
        // Decay at least two of the stack.
```

Replacement in crawl-ref/source/mon-util.cc at line 1549 [10.1699344]

B:BD[11.476688] → [12.11042:11121]

        spells = static_cast<mon_spellbook_type>(MST_ORC_WIZARD_I+random2(3));

[11.476688]

[11.476736]

        spells = static_cast<mon_spellbook_type>(MST_ORC_WIZARD_I + random2(3));

Insertion in crawl-ref/source/mon-util.cc at line 2343 [10.1699344]

[13.32136]

        // Don't cast again if already about to teleport.
        if (mon->has_ench(ENCH_TP))
            return (false);
        // intentional fall-through

Replacement in crawl-ref/source/mon-util.cc at line 2378 [10.1699344]

B:BD[14.12737] → [14.12737:12851]

      case SPELL_TELEPORT_SELF:
      case SPELL_BLINK:
        return true;
      default:
        return false;

[14.12737]

[14.12851]

    case SPELL_TELEPORT_SELF:
        // Don't cast again if already about to teleport.
        if (mon->has_ench(ENCH_TP))
            return (false);
        // intentional fall-through
    case SPELL_BLINK:
        return (true);
    default:
        return (false);

Replacement in crawl-ref/source/mon-util.cc at line 2462 [10.1699344]
B:BD[10.1745338] → [15.12298:12336]
```
        if (mon->has_ench( ENCH_TP ))
```
[10.1745338]
[10.1745395]
```
        if (mon->has_ench(ENCH_TP))
```

Replacement in crawl-ref/source/item_use.cc at line 1287 [10.2781507]

B:BD[16.4544] → [16.4544:4629]

            unsigned next = (i + fire_order.size() + direction) % fire_order.size();

[16.4544]

[16.4629]

            unsigned next =
                (i + fire_order.size() + direction) % fire_order.size();