fiddlerwoaroof/crawl - Change ZI3XDQ75HFW54FG6ZK6ERZYV6FEXUGFY35Z6VZMKMQK3IMDG6XBQC

Clean up "Sticks to Snakes", too.

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

Created by dolorous on June 8, 2008

ZI3XDQ75HFW54FG6ZK6ERZYV6FEXUGFY35Z6VZMKMQK3IMDG6XBQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1472 [6.293070]

[4.255]

[5.200]

        break;
    case SPELL_STICKS_TO_SNAKES:
        cast_sticks_to_snakes(powc);

Deletion in crawl-ref/source/spl-cast.cc at line 1858 [6.293070]

B:BD[6.338269] → [6.338269:338355]

        break;
    case SPELL_STICKS_TO_SNAKES:
        cast_sticks_to_snakes(powc);

Deletion in crawl-ref/source/spells4.h at line 50 [6.434549]
B:BD[6.435767] → [6.435767:435804]
```
void cast_sticks_to_snakes(int pow);
```
Deletion in crawl-ref/source/spells4.cc at line 38 [6.436250]
B:BD[6.436942] → [6.436942:436962]
```
#include "invent.h"
```

Deletion in crawl-ref/source/spells4.cc at line 415 [6.436250]

B:BD[6.453133] → [6.453133:453134]

B:BD[6.453256] → [6.453256:453294]

B:BD[6.453294] → [7.5203:5244]

∅:D[8.947] → [6.453322:453344]

∅:D[7.5244] → [6.453322:453344]

B:BD[6.453322] → [6.453322:453344]

B:BD[6.453345] → [6.453345:453413]

B:BD[6.453413] → [9.456:506]

∅:D[9.506] → [6.453515:453589]

∅:D[10.2604] → [6.453515:453589]

B:BD[6.453515] → [6.453515:453589]

B:BD[6.453589] → [11.3022:3127]

∅:D[11.3127] → [6.453687:453710]

∅:D[12.3906] → [6.453687:453710]

B:BD[6.453687] → [6.453687:453710]

B:BD[6.453710] → [13.214:521]

∅:D[13.521] → [14.398:684]

B:BD[6.453710] → [14.398:684]

∅:D[15.317] → [6.453838:454046]

∅:D[16.547] → [6.453838:454046]

∅:D[14.684] → [6.453838:454046]

∅:D[17.783] → [6.453838:454046]

∅:D[8.1050] → [6.453838:454046]

B:BD[6.453838] → [6.453838:454046]

B:BD[6.454046] → [8.1051:1090]

∅:D[8.1090] → [6.454081:454091]

B:BD[6.454081] → [6.454081:454091]

B:BD[6.454091] → [2.165:311]

∅:D[2.311] → [18.203:217]

B:BD[18.203] → [18.203:217]

B:BD[18.217] → [2.312:389]

∅:D[2.389] → [18.218:232]

B:BD[6.454240] → [18.218:232]

∅:D[18.232] → [6.454240:454257]

B:BD[6.454240] → [6.454240:454257]

B:BD[6.454257] → [18.233:247]

∅:D[18.247] → [6.454257:454297]

B:BD[6.454257] → [6.454257:454297]

B:BD[6.454297] → [18.248:262]


void cast_sticks_to_snakes(int pow)
{
    monster_type mon = MONS_PROGRAM_BUG;
    int how_many = 0;
    int max = 1 + random2( 1 + you.skills[SK_TRANSMIGRATION] ) / 4;
    int dur = std::min(3 + random2(pow) / 20, 5);
    const int weapon = you.equip[EQ_WEAPON];
    if (weapon == -1)
    {
        msg::stream << "Your " << your_hand(true) << " feel slithery!"
                    << std::endl;
        return;
    }
    // Don't enchant sticks marked with {!D}.
    if (!check_warning_inscriptions(you.inv[ weapon ], OPER_DESTROY))
    {
        mprf("%s feel%s slithery for a moment!",
             you.inv[weapon].name(DESC_CAP_YOUR).c_str(),
             you.inv[weapon].quantity > 1 ? "s" : "");
        return;
    }
    const beh_type beha = item_cursed(you.inv[ weapon ]) ? BEH_HOSTILE
                                                         : BEH_FRIENDLY;
    const unsigned short hitting = (beha == BEH_HOSTILE) ? MHITYOU
                                                         : you.pet_target;
    if ((you.inv[ weapon ].base_type == OBJ_MISSILES
         && (you.inv[ weapon ].sub_type == MI_ARROW)))
    {
        if (you.inv[ weapon ].quantity < max)
            max = you.inv[ weapon ].quantity;
        for (int i = 0; i <= max; i++)
        {
            if (one_chance_in(5 - std::min(4, div_rand_round(pow * 2, 25)))
                || get_ammo_brand(you.inv[weapon]) == SPMSL_POISONED)
            {
                mon = random2(100) < pow / 3? MONS_BROWN_SNAKE : MONS_SNAKE;
            }
            else
            {
                mon = MONS_SMALL_SNAKE;
            }

Deletion in crawl-ref/source/spells4.cc at line 416 [6.436250]

B:BD[6.454298] → [7.5245:5384]

∅:D[19.476] → [6.454428:454956]

∅:D[17.1012] → [6.454428:454956]

∅:D[7.5384] → [6.454428:454956]

B:BD[6.454428] → [6.454428:454956]

B:BD[6.454956] → [20.143006:143063]

B:BD[20.143063] → [3.329:384]

∅:D[3.384] → [6.455011:455189]

B:BD[6.455011] → [6.455011:455189]

B:BD[6.455212] → [6.455212:455531]

B:BD[6.455531] → [20.143064:143114]

∅:D[20.143114] → [6.455581:455661]

B:BD[6.455581] → [6.455581:455661]

B:BD[6.455661] → [21.165:243]

∅:D[21.243] → [6.455817:455897]

B:BD[6.455817] → [6.455817:455897]

B:BD[6.455897] → [21.244:323]

∅:D[21.323] → [6.455897:455898]

B:BD[6.455897] → [6.455897:455898]

B:BD[6.455898] → [21.324:401]

∅:D[21.401] → [6.455976:455977]

B:BD[6.455976] → [6.455976:455977]

B:BD[6.455977] → [7.5385:5512]

∅:D[22.447] → [17.1208:1252]

∅:D[7.5512] → [17.1208:1252]

B:BD[17.1208] → [17.1208:1252]

∅:D[19.608] → [6.456058:456065]

∅:D[17.1252] → [6.456058:456065]

∅:D[23.2675] → [6.456058:456065]

B:BD[6.456058] → [6.456058:456065]

B:BD[6.456375] → [6.456375:456584]

B:BD[6.456584] → [12.3907:4014]

∅:D[12.4014] → [6.456716:456737]

B:BD[6.456716] → [6.456716:456737]

B:BD[6.456737] → [11.3128:3233]

∅:D[11.3233] → [6.456816:456823]

∅:D[12.4072] → [6.456816:456823]

B:BD[6.456816] → [6.456816:456823]

B:BD[6.456850] → [6.456850:456913]

B:BD[6.457776] → [6.457776:457777]

            if (create_monster(
                    mgen_data( mon, beha, dur,
                               you.pos(), hitting )) != -1)
            {
                how_many++;
            }
        }
    }
    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))
    {
        // Upsizing Snakes to Brown Snakes as the base class for using
        // the really big sticks (so bonus applies really only to trolls,
        // ogres, and most importantly ogre magi).  Still it's unlikely
        // any character is strong enough to bother lugging a few of
        // these around.  -- bwr
        if (item_mass( you.inv[ weapon ] ) < 300)
            mon = MONS_SNAKE;
        else
            mon = MONS_BROWN_SNAKE;
        if (pow > 20 && one_chance_in(3))
            mon = MONS_BROWN_SNAKE;
        if (pow > 40 && one_chance_in(3))
            mon = MONS_YELLOW_SNAKE;
        if (pow > 70 && one_chance_in(3))
            mon = MONS_BLACK_SNAKE;
        if (pow > 90 && one_chance_in(3))
            mon = MONS_GREY_SNAKE;
        if (create_monster(
                mgen_data( mon, beha, dur,
                           you.pos(), hitting )) != -1)
        {
            how_many++;
        }
    }
    if (how_many > you.inv[you.equip[EQ_WEAPON]].quantity)
        how_many = you.inv[you.equip[EQ_WEAPON]].quantity;
    if (how_many)
    {
        dec_inv_item_quantity( you.equip[EQ_WEAPON], how_many );
        mprf("You create %s snake%s!",
             how_many > 1 ? "some" : "a", how_many > 1 ? "s" : "");
    }
    else
    {
        msg::stream << "Your " << your_hand(true) << " feel slithery!"
                    << std::endl;
    }
}                               // end cast_sticks_to_snakes()

Insertion in crawl-ref/source/spells2.h at line 139 [6.562867]
[4.328]
[5.1661]
```
bool cast_sticks_to_snakes(int pow, bool god_gift = false);
```
Insertion in crawl-ref/source/spells2.cc at line 38 [6.569242]
[6.570207]
[6.570207]
```
#include "invent.h"
```

Insertion in crawl-ref/source/spells2.cc at line 1543 [6.569242]

[4.2028]

}
bool cast_sticks_to_snakes(int pow, bool god_gift)
{
    monster_type mon = MONS_PROGRAM_BUG;
    int count = 0;
    int max = 1 + random2(1 + you.skills[SK_TRANSMIGRATION]) / 4;
    int dur = std::min(3 + random2(pow) / 20, 5);
    const int weapon = you.equip[EQ_WEAPON];
    if (weapon == -1)
    {
        msg::stream << "Your " << your_hand(true) << " feel slithery!"
                    << std::endl;
        return (false);
    }
    // Don't enchant sticks marked with {!D}.
    if (!check_warning_inscriptions(you.inv[ weapon ], OPER_DESTROY))
    {
        mprf("%s feel%s slithery for a moment!",
             you.inv[weapon].name(DESC_CAP_YOUR).c_str(),
             you.inv[weapon].quantity > 1 ? "s" : "");
        return (false);
    }
    const beh_type beha = item_cursed(you.inv[ weapon ]) ? BEH_HOSTILE
                                                         : BEH_FRIENDLY;
    const unsigned short hitting = (beha == BEH_HOSTILE) ? MHITYOU
                                                         : you.pet_target;
    if ((you.inv[weapon].base_type == OBJ_MISSILES
         && (you.inv[weapon].sub_type == MI_ARROW)))
    {
        if (you.inv[weapon].quantity < max)
            max = you.inv[weapon].quantity;
        for (int i = 0; i <= max; i++)
        {
            if (one_chance_in(5 - std::min(4, div_rand_round(pow * 2, 25)))
                || get_ammo_brand(you.inv[weapon]) == SPMSL_POISONED)
            {
                mon = random2(100) < pow / 3 ? MONS_BROWN_SNAKE : MONS_SNAKE;
            }
            else
            {
                mon = MONS_SMALL_SNAKE;
            }
            if (create_monster(
                    mgen_data(mon, beha, dur,
                              you.pos(), hitting,
                              god_gift ? MF_GOD_GIFT : 0)) != -1)
            {
                count++;
            }
        }
    }
    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))
    {
        // Upsizing Snakes to Brown Snakes as the base class for using
        // the really big sticks (so bonus applies really only to trolls,
        // ogres, and most importantly ogre magi).  Still it's unlikely
        // any character is strong enough to bother lugging a few of
        // these around.  -- bwr
        if (item_mass(you.inv[weapon]) < 300)
            mon = MONS_SNAKE;
        else
            mon = MONS_BROWN_SNAKE;
        if (pow > 20 && one_chance_in(3))
            mon = MONS_BROWN_SNAKE;
        if (pow > 40 && one_chance_in(3))
            mon = MONS_YELLOW_SNAKE;
        if (pow > 70 && one_chance_in(3))
            mon = MONS_BLACK_SNAKE;
        if (pow > 90 && one_chance_in(3))
            mon = MONS_GREY_SNAKE;
        if (create_monster(
                mgen_data(mon, beha, dur,
                          you.pos(), hitting,
                          god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            count++;
        }
    }
    if (count > you.inv[you.equip[EQ_WEAPON]].quantity)
        count = you.inv[you.equip[EQ_WEAPON]].quantity;
    if (count > 0)
    {
        dec_inv_item_quantity(you.equip[EQ_WEAPON], count);
        mprf("You create %s snake%s!",
             count > 1 ? "some" : "a", count > 1 ? "s" : "");
        return (true);
    }
    msg::stream << "Your " << your_hand(true) << " feel slithery!"
                << std::endl;
    return (false);

Clean up "Sticks to Snakes", too.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1472 [6.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1858 [6.293070]

Deletion in crawl-ref/source/spells4.h at line 50 [6.434549]

Deletion in crawl-ref/source/spells4.cc at line 38 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 415 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 416 [6.436250]

Insertion in crawl-ref/source/spells2.h at line 139 [6.562867]

Insertion in crawl-ref/source/spells2.cc at line 38 [6.569242]

Insertion in crawl-ref/source/spells2.cc at line 1543 [6.569242]