fiddlerwoaroof/crawl - Change FVT2J6IVMSQZYKQGUHQVGT4ADYM7AWUQ4U7766GBRRFMSR2WBMLAC

Overhaul quiver storage to hold up to six item slots of

preferred ammo for bow, crossbow, hand crossbow, blowgun, sling, and non-launchers. Breaks saves. (Was Bug 1872821.)

Also fix 1858916: update EV when paralysis is over

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

Created by j-p-e-g on January 16, 2008

FVT2J6IVMSQZYKQGUHQVGT4ADYM7AWUQ4U7766GBRRFMSR2WBMLAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tags.cc at line 937 [4.164589]

[4.183132]

[5.133]

    // remembered quiver items
    marshallByte(th, NUM_QUIVER);
    for (j = 0; j < NUM_QUIVER; ++j)
        marshallByte(th,you.quiver[j]);

Deletion in crawl-ref/source/tags.cc at line 1016 [4.164589]
∅:D[6.287] → [7.133:168]
B:BD[4.185013] → [7.133:168]
```
    marshallByte(th, you.quiver);
```
Insertion in crawl-ref/source/tags.cc at line 1326 [4.164589]
[4.191340]
[5.296]
```
    // how many quiver types?
```

Insertion in crawl-ref/source/tags.cc at line 1329 [4.164589]

[5.364]

        you.quiver[j] = unmarshallByte(th);
    count_c = unmarshallByte(th);
    for (j = 0; j < count_c; ++j)

Deletion in crawl-ref/source/tags.cc at line 1395 [4.164589]
B:BD[7.170] → [7.170:207]
∅:D[7.207] → [4.201045:201046]
B:BD[4.201045] → [4.201045:201046]
```
    you.quiver = unmarshallByte(th);
```
Insertion in crawl-ref/source/spells3.cc at line 36 [4.531613]
[4.532254]
[4.532254]
```
#include "item_use.h"
```

Replacement in crawl-ref/source/spells3.cc at line 988 [4.531613]

B:BD[3.288] → [3.288:325]

        else if (ammo == you.quiver)

[3.288]

[3.325]

        else if (ammo == you.quiver[get_quiver_type()])

Insertion in crawl-ref/source/player.cc at line 5337 [4.962854]
[8.754]
[5.2466]
```
    quiver.init(0);
```
Deletion in crawl-ref/source/player.cc at line 5356 [4.962854]
B:BD[7.246] → [7.246:263]
∅:D[7.263] → [9.203979:203980]
B:BD[9.203979] → [9.203979:203980]
```
    quiver = -1;
```

Replacement in crawl-ref/source/output.cc at line 402 [4.1088282]

B:BD[3.2906] → [3.2906:2950]

        you.quiver = get_fire_item_index();

[3.2906]

[3.2950]

        int q = you.quiver[get_quiver_type()] = get_fire_item_index();

Replacement in crawl-ref/source/output.cc at line 404 [4.1088282]
B:BD[3.2951] → [3.2951:2988]
```
        if (you.quiver == ENDOFPACK)
```
[3.2951]
[3.2988]
```
        if (q == ENDOFPACK)
```

Replacement in crawl-ref/source/output.cc at line 408 [4.1088282]

B:BD[3.3052] → [3.3052:3110]

            const item_def& quiver = you.inv[you.quiver];

[3.3052]

[3.3110]

            const item_def& quiver = you.inv[q];

Replacement in crawl-ref/source/items.cc at line 243 [4.2584728]
B:BD[3.3704] → [3.3704:3731]
```
    if (you.quiver == obj)
```
[3.3704]
[3.3731]
```
    if (you.quiver[get_quiver_type()] == obj)
```
Replacement in crawl-ref/source/items.cc at line 315 [4.2584728]
B:BD[3.3775] → [3.3775:3802]
```
    if (you.quiver == obj)
```
[3.3775]
[3.3802]
```
    if (you.quiver[get_quiver_type()] == obj)
```
Insertion in crawl-ref/source/item_use.h at line 116 [4.2777340]
[4.2779954]
[4.2779954]
```
quiver_type get_quiver_type(void);
```

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

[2.326]

[7.774]

}
quiver_type get_quiver_type()
{
    const int wielded = you.equip[EQ_WEAPON];
    if (wielded == -1)
        return (QUIVER_THROW);
    item_def &weapon = you.inv[wielded];
    if (weapon.base_type != OBJ_WEAPONS)
        return (QUIVER_THROW);
    switch (weapon.sub_type)
    {
        case WPN_BLOWGUN:
            return (QUIVER_BLOWGUN);
        case WPN_SLING:
            return (QUIVER_SLING);
        case WPN_BOW:
        case WPN_LONGBOW:
            return (QUIVER_BOW);
        case WPN_CROSSBOW:
            return (QUIVER_CROSSBOW);
        case WPN_HAND_CROSSBOW:
            return (QUIVER_HAND_CROSSBOW);
        default:
            return (QUIVER_THROW);
    }

Replacement in crawl-ref/source/item_use.cc at line 1328 [4.2781507]
B:BD[4.2809595] → [7.935:969]
```
        const int q = you.quiver;
```
[4.2809595]
[7.969]
```
        const int q = you.quiver[get_quiver_type()];
```
Replacement in crawl-ref/source/item_use.cc at line 1494 [4.2781507]
∅:D[3.3981] → [7.4317:4352]
B:BD[7.4317] → [7.4317:4352]
```
            you.quiver = beh.item;
```
[3.3981]
[3.3982]
```
            you.quiver[get_quiver_type()] = beh.item;
```
Deletion in crawl-ref/source/externs.h at line 640 [4.3270163]
B:BD[4.3277280] → [7.4992:5050]
```
  int quiver;                 // default item for (f)ire.
```

Insertion in crawl-ref/source/externs.h at line 659 [4.3270163]

[10.14445]

[5.2603]

  FixedVector<unsigned char, NUM_QUIVER> quiver; // default items for quiver

Insertion in crawl-ref/source/enum.h at line 185 [4.3287960]

[4.3295078]

[11.904933]

enum quiver_type
{
    QUIVER_THROW,           // no launcher wielded -> darts, stones, ...
    QUIVER_BOW,             // wielded bow -> arrows
    QUIVER_SLING,           // wielded sling -> stones, sling bullets
    QUIVER_CROSSBOW,        // wielded crossbow -> bolts
    QUIVER_HAND_CROSSBOW,   // wielded hand crossbow -> darts
    QUIVER_BLOWGUN,         // wielded blowgun -> needles
    NUM_QUIVER
};

Insertion in crawl-ref/source/command.cc at line 168 [4.4082507]

[3.4305]

[9.480888]

    if (!you.quiver_change)
    {
        int quiver = you.quiver[get_quiver_type()];
        if (to_slot == quiver || from_slot == quiver)
            you.quiver_change = true;
    }

Replacement in crawl-ref/source/acr.cc at line 2582 [4.4397395]

B:BD[12.5166] → [12.5166:5230]

    decrement_a_duration(DUR_PARALYSIS, "You can move again.");

[12.5166]

[12.5230]

    
    if (decrement_a_duration(DUR_PARALYSIS, "You can move again."))
        you.redraw_evasion = true;

Overhaul quiver storage to hold up to six item slots of

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tags.cc at line 937 [4.164589]

Deletion in crawl-ref/source/tags.cc at line 1016 [4.164589]

Insertion in crawl-ref/source/tags.cc at line 1326 [4.164589]

Insertion in crawl-ref/source/tags.cc at line 1329 [4.164589]

Deletion in crawl-ref/source/tags.cc at line 1395 [4.164589]

Insertion in crawl-ref/source/spells3.cc at line 36 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 988 [4.531613]

Insertion in crawl-ref/source/player.cc at line 5337 [4.962854]

Deletion in crawl-ref/source/player.cc at line 5356 [4.962854]

Replacement in crawl-ref/source/output.cc at line 402 [4.1088282]

Replacement in crawl-ref/source/output.cc at line 404 [4.1088282]

Replacement in crawl-ref/source/output.cc at line 408 [4.1088282]

Replacement in crawl-ref/source/items.cc at line 243 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 315 [4.2584728]

Insertion in crawl-ref/source/item_use.h at line 116 [4.2777340]

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

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

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

Deletion in crawl-ref/source/externs.h at line 640 [4.3270163]

Insertion in crawl-ref/source/externs.h at line 659 [4.3270163]

Insertion in crawl-ref/source/enum.h at line 185 [4.3287960]

Insertion in crawl-ref/source/command.cc at line 168 [4.4082507]

Replacement in crawl-ref/source/acr.cc at line 2582 [4.4397395]