fiddlerwoaroof/crawl - Change 3A3OAIFRFU3IHF6SDNDPCN3XYOFYIBYCEYJAXAFASCFDY76SMFXQC

[1608520] No more special treatment for rods of striking.

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

Created by dshaligram on December 4, 2006

3A3OAIFRFU3IHF6SDNDPCN3XYOFYIBYCEYJAXAFASCFDY76SMFXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 1528 [3.397614]

B:BD[3.433919] → [2.141034:141105]

∅:D[2.141105] → [3.434240:434241]

B:BD[3.434240] → [3.434240:434241]

B:BD[3.434241] → [2.141106:141274]

    if (staff_type == STAFF_STRIKING)
        mana /= ROD_CHARGE_MULT;
    if ((staff_type == STAFF_STRIKING? 
                you.magic_points < mana
              : you.inv[staff].plus < mana)
            || you.experience_level < diff)

[3.433919]

[2.141274]

    if (you.inv[staff].plus < mana
        || you.experience_level < diff)

Replacement in crawl-ref/source/spl-book.cc at line 1539 [3.397614]

B:BD[2.141618] → [2.141618:141748]

            mprf("%s have enough magic points.", 
                staff_type == STAFF_STRIKING? "You don't" : "The rod doesn't");

[2.141618]

[2.141748]

            mpr("The rod doesn't have enough magic points.");

Replacement in crawl-ref/source/spl-book.cc at line 1549 [3.397614]

B:BD[2.141975] → [2.141975:142179]

    // dec_mp(spell_mana(specspell));
    if (staff_type != STAFF_STRIKING)
        you.inv[staff].plus -= mana;
    else {
        you.magic_points -= mana;
        you.redraw_magic_points = true;
    }

[2.141975]

[2.142179]

    you.inv[staff].plus -= mana;

Insertion in crawl-ref/source/newgame.cc at line 2365 [3.1132300]

[3.1193290]

static void make_rod(item_def &item, int rod_type)
{
    item.base_type = OBJ_STAVES;
    item.sub_type = rod_type;
    item.quantity = 1;
    item.special = 0;
    item.colour = BROWN;
    
    init_rod_mp(item);
}

Replacement in crawl-ref/source/newgame.cc at line 4157 [3.1132300]

B:BD[3.1240700] → [3.1240700:1240876]

            {
                you.inv[0].base_type = OBJ_STAVES;
                you.inv[0].sub_type = STAFF_STRIKING;
                you.inv[0].colour = BROWN;
            }

[3.1240700]

[3.1240876]

                make_rod(you.inv[0], STAFF_STRIKING);

Replacement in crawl-ref/source/newgame.cc at line 4346 [3.1132300]

B:BD[3.1246956] → [3.1246956:1247232]

            you.inv[0].base_type = OBJ_STAVES;
            you.inv[0].sub_type = STAFF_STRIKING;
            you.inv[0].quantity = 1;
            you.inv[0].plus = 0;
            you.inv[0].plus2 = 0;
            you.inv[0].special = 0;
            you.inv[0].colour = BROWN;

[3.1246956]

[3.1247232]

            make_rod(you.inv[0], STAFF_STRIKING);

Replacement in crawl-ref/source/newgame.cc at line 4364 [3.1132300]

B:BD[3.1247617] → [3.1247617:1247753]

            you.inv[0].base_type = OBJ_STAVES;
            you.inv[0].sub_type = STAFF_STRIKING;
            you.inv[0].colour = BROWN;

[3.1247617]

[3.1247753]

            make_rod(you.inv[0], STAFF_STRIKING);

Replacement in crawl-ref/source/itemname.cc at line 1741 [3.2667494]

B:BD[2.714955] → [2.714955:715080]

        if (item_is_rod( item ) && item.sub_type != STAFF_STRIKING 
                && item_ident( item, ISFLAG_KNOW_TYPE ))

[2.714955]

[2.715080]

        if (item_is_rod( item )
            && item_ident( item, ISFLAG_KNOW_TYPE ))

Insertion in crawl-ref/source/dungeon.h at line 52 [3.3428186]
[3.3429476]
[3.3429476]
```
void init_rod_mp(item_def &item);
```

Insertion in crawl-ref/source/dungeon.cc at line 480 [3.3429798]

[3.3443475]


void init_rod_mp(item_def &item)
{
    if (!item_is_rod(item))
        return;
    if (item.sub_type == STAFF_STRIKING)
        item.plus2 = random_range(6, 9) * ROD_CHARGE_MULT;
    else
        item.plus2 = random_range(9, 14) * ROD_CHARGE_MULT;
    
    item.plus  = item.plus2;
}

Replacement in crawl-ref/source/dungeon.cc at line 2450 [3.3429798]

B:BD[2.956358] → [2.956358:956488]

        {
            mitm[p].plus2 = random_range(9, 14) * ROD_CHARGE_MULT;
            mitm[p].plus  = mitm[p].plus2;
        }

[2.956358]

[3.3514761]

            init_rod_mp( mitm[p] );

Replacement in crawl-ref/source/describe.cc at line 2966 [3.3736416]

B:BD[3.3831185] → [2.987058:987326]

            if (item.sub_type != STAFF_STRIKING)
                description += 
                    "$$It uses its own mana reservoir for casting spells, and "
                    "recharges automatically by channeling mana from its "
                    "wielder.";

[3.3831185]

[3.3831293]

            description += 
                "$$It uses its own mana reservoir for casting spells, and "
                "recharges automatically by channeling mana from its "
                "wielder.";