fiddlerwoaroof/crawl - Change VQCEREOVOQYOCAHAO4OTEHN5ROGPBJ44WK4WKRFIYIJI2PF56UHQC

Clean up "Sticks to Snakes" a bit more.

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

Created by dolorous on June 9, 2008

VQCEREOVOQYOCAHAO4OTEHN5ROGPBJ44WK4WKRFIYIJI2PF56UHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1099 [4.569242]

B:BD[3.395] → [3.395:436]

B:BD[3.436] → [2.169:302]

    monster_type mon = MONS_PROGRAM_BUG;
    const int dur = std::min(3 + random2(pow) / 20, 5);
    int how_many_max = 1 + random2(1 + you.skills[SK_TRANSMIGRATION]) / 4;

[3.395]

[2.302]

    const int wpn = you.equip[EQ_WEAPON];

Replacement in crawl-ref/source/spells2.cc at line 1101 [4.569242]
∅:D[2.303] → [3.571:639]
B:BD[3.571] → [3.571:639]
```
    const int weapon = you.equip[EQ_WEAPON];
    if (weapon == -1)
```
[2.303]
[3.639]
```
    if (wpn == -1)
```

Replacement in crawl-ref/source/spells2.cc at line 1109 [4.569242]

B:BD[3.827] → [3.827:897]

    if (!check_warning_inscriptions(you.inv[ weapon ], OPER_DESTROY))

[3.827]

[3.897]

    if (!check_warning_inscriptions(you.inv[wpn], OPER_DESTROY))

Replacement in crawl-ref/source/spells2.cc at line 1112 [4.569242]

B:BD[3.952] → [3.952:1065]

             you.inv[weapon].name(DESC_CAP_YOUR).c_str(),
             you.inv[weapon].quantity > 1 ? "s" : "");

[3.952]

[3.1065]

             you.inv[wpn].name(DESC_CAP_YOUR).c_str(),
             you.inv[wpn].quantity > 1 ? "s" : "");

Insertion in crawl-ref/source/spells2.cc at line 1116 [4.569242]
[3.1095]
[3.1095]
```
    monster_type mon = MONS_PROGRAM_BUG;
```

Replacement in crawl-ref/source/spells2.cc at line 1119 [4.569242]

B:BD[3.1096] → [3.1096:1382]

    const beh_type beha = item_cursed(you.inv[ weapon ]) ? BEH_HOSTILE
                                                         : BEH_FRIENDLY;
    const unsigned short hitting = (beha == BEH_HOSTILE) ? MHITYOU
                                                         : you.pet_target;

[3.1096]

[2.304]

    const int dur = std::min(3 + random2(pow) / 20, 5);
    int how_many_max = 1 + random2(1 + you.skills[SK_TRANSMIGRATION]) / 4;
    const bool friendly = (!item_cursed(you.inv[wpn]));
    const beh_type beha = (friendly) ? BEH_FRIENDLY
                                     : BEH_HOSTILE;
    const unsigned short hitting = (friendly) ? you.pet_target
                                              : MHITYOU;

Replacement in crawl-ref/source/spells2.cc at line 1132 [4.569242]

B:BD[3.1383] → [3.1383:1487]

    if ((you.inv[weapon].base_type == OBJ_MISSILES
         && (you.inv[weapon].sub_type == MI_ARROW)))

[3.1383]

[3.1487]

    if ((you.inv[wpn].base_type == OBJ_MISSILES
         && (you.inv[wpn].sub_type == MI_ARROW)))

Replacement in crawl-ref/source/spells2.cc at line 1135 [4.569242]

B:BD[3.1493] → [2.325:431]

        if (you.inv[weapon].quantity < how_many_max)
            how_many_max = you.inv[weapon].quantity;

[3.1493]

[3.1581]

        if (you.inv[wpn].quantity < how_many_max)
            how_many_max = you.inv[wpn].quantity;

Replacement in crawl-ref/source/spells2.cc at line 1141 [4.569242]

B:BD[3.1707] → [3.1707:1777]

                || get_ammo_brand(you.inv[weapon]) == SPMSL_POISONED)

[3.1707]

[3.1777]

                || get_ammo_brand(you.inv[wpn]) == SPMSL_POISONED)

Replacement in crawl-ref/source/spells2.cc at line 1160 [4.569242]

B:BD[3.2233] → [3.2233:2972]

    if (you.inv[ weapon ].base_type == OBJ_WEAPONS
        && (you.inv[ weapon ].sub_type == WPN_CLUB
            || you.inv[ weapon ].sub_type == WPN_SPEAR
            || you.inv[ weapon ].sub_type == WPN_QUARTERSTAFF
            || you.inv[ weapon ].sub_type == WPN_SCYTHE
            || you.inv[ weapon ].sub_type == WPN_GIANT_CLUB
            || you.inv[ weapon ].sub_type == WPN_GIANT_SPIKED_CLUB
            || you.inv[ weapon ].sub_type == WPN_BOW
            || you.inv[ weapon ].sub_type == WPN_LONGBOW
            || you.inv[ weapon ].sub_type == WPN_ANKUS
            || you.inv[ weapon ].sub_type == WPN_HALBERD
            || you.inv[ weapon ].sub_type == WPN_GLAIVE
            || you.inv[ weapon ].sub_type == WPN_BLOWGUN))

[3.2233]

[3.2972]

    if (you.inv[wpn].base_type == OBJ_WEAPONS
        && (you.inv[wpn].sub_type == WPN_CLUB
            || you.inv[wpn].sub_type == WPN_SPEAR
            || you.inv[wpn].sub_type == WPN_QUARTERSTAFF
            || you.inv[wpn].sub_type == WPN_SCYTHE
            || you.inv[wpn].sub_type == WPN_GIANT_CLUB
            || you.inv[wpn].sub_type == WPN_GIANT_SPIKED_CLUB
            || you.inv[wpn].sub_type == WPN_BOW
            || you.inv[wpn].sub_type == WPN_LONGBOW
            || you.inv[wpn].sub_type == WPN_ANKUS
            || you.inv[wpn].sub_type == WPN_HALBERD
            || you.inv[wpn].sub_type == WPN_GLAIVE
            || you.inv[wpn].sub_type == WPN_BLOWGUN))

Replacement in crawl-ref/source/spells2.cc at line 1179 [4.569242]
B:BD[3.3297] → [3.3297:3343]
```
        if (item_mass(you.inv[weapon]) < 300)
```
[3.3297]
[3.3343]
```
        if (item_mass(you.inv[wpn]) < 300)
```

Replacement in crawl-ref/source/spells2.cc at line 1205 [4.569242]

B:BD[3.3965] → [3.3965:4077]

    if (count > you.inv[you.equip[EQ_WEAPON]].quantity)
        count = you.inv[you.equip[EQ_WEAPON]].quantity;

[3.3965]

[3.4077]

    count = MIN(count, you.inv[you.equip[EQ_WEAPON]].quantity);