fiddlerwoaroof/crawl - Change 6HR3FSU5OL3USCTURASA627HFYRDHTYJHRYFNOBRIXFPBCL73IXQC

Make artificers' rods of striking start with a constant number of

charges, as their wands do.

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

Created by dolorous on March 2, 2009

6HR3FSU5OL3USCTURASA627HFYRDHTYJHRYFNOBRIXFPBCL73IXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 3469 [4.1132300]

B:BD[4.1193290] → [5.20553:20612]

static void _make_rod(item_def &item, stave_type rod_type)

[4.1193290]

[6.287]

static void _make_rod(item_def &item, stave_type rod_type, int ncharges)

Replacement in crawl-ref/source/newgame.cc at line 3477 [4.1132300]
∅:D[7.9518] → [6.427:450]
B:BD[6.427] → [6.427:450]
```
    init_rod_mp(item);
```
[7.9518]
[8.214]
```
    init_rod_mp(item, ncharges);
```
Replacement in crawl-ref/source/newgame.cc at line 4384 [4.1132300]
B:BD[9.3669] → [10.2737:2780]
```
    _make_rod(you.inv[2], STAFF_STRIKING);
```
[9.3669]
[10.2780]
```
    _make_rod(you.inv[2], STAFF_STRIKING, 8);
```
Insertion in crawl-ref/source/newgame.cc at line 4533 [4.1132300]
[3.7042]
[10.3197]
Replacement in crawl-ref/source/newgame.cc at line 4542 [4.1132300]
B:BD[10.3417] → [10.3417:3440]
```
    int nCharges = 15;
```
[10.3417]
[10.3440]
```
    int ncharges = 15;
```

Replacement in crawl-ref/source/newgame.cc at line 4544 [4.1132300]

B:BD[10.3514] → [10.3514:3626]

                       nCharges, 0);
    _newgame_make_item(3, EQ_NONE, OBJ_WANDS, choice, -1, 1, nCharges, 0);

[10.3514]

[9.5584]

                       ncharges, 0);
    _newgame_make_item(3, EQ_NONE, OBJ_WANDS, choice, -1, 1, ncharges, 0);

Replacement in crawl-ref/source/makeitem.h at line 28 [11.516]

B:BD[11.769] → [11.769:839]

void item_colour( item_def &item );
void init_rod_mp(item_def &item);

[11.769]

[2.7211]

void item_colour(item_def &item);
void init_rod_mp(item_def &item, int ncharges = -1);

Replacement in crawl-ref/source/makeitem.cc at line 344 [11.927]
B:BD[11.8581] → [11.8581:8616]
```
void item_colour( item_def &item )
```
[11.8581]
[11.8616]
```
void item_colour(item_def &item)
```
Replacement in crawl-ref/source/makeitem.cc at line 2562 [11.927]
∅:D[12.5505] → [13.48897:48955]
B:BD[13.48897] → [13.48897:48955]
```
    if (item_is_rod( item ))
        init_rod_mp( item );
```
[12.5505]
[13.49019]
```
    if (item_is_rod(item))
        init_rod_mp(item);
```
Replacement in crawl-ref/source/makeitem.cc at line 2909 [11.927]
B:BD[13.57459] → [13.57459:57511]
```
    ASSERT( is_valid_item(mitm[p]) );
    return p;
```
[13.57459]
[13.57511]
```
    ASSERT(is_valid_item(mitm[p]));
    return (p);
```
Replacement in crawl-ref/source/makeitem.cc at line 2913 [11.927]
B:BD[11.98954] → [11.98954:98987]
```
void init_rod_mp(item_def &item)
```
[11.98954]
[11.98987]
```
void init_rod_mp(item_def &item, int ncharges)
```

Replacement in crawl-ref/source/makeitem.cc at line 2918 [11.927]

B:BD[11.99034] → [11.99034:99134]

    if (item.sub_type == STAFF_STRIKING)
        item.plus2 = random_range(6, 9) * ROD_CHARGE_MULT;

[11.99034]

[11.99134]

    if (ncharges != -1)
        item.plus2 = ncharges * ROD_CHARGE_MULT;

Replacement in crawl-ref/source/makeitem.cc at line 2921 [11.927]

B:BD[11.99143] → [11.99143:99203]

        item.plus2 = random_range(9, 14) * ROD_CHARGE_MULT;

[11.99143]

[14.3267]

    {
        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;
    }

Make artificers' rods of striking start with a constant number of

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/newgame.cc at line 3469 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3477 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4384 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4533 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4542 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4544 [4.1132300]

Replacement in crawl-ref/source/makeitem.h at line 28 [11.516]

Replacement in crawl-ref/source/makeitem.cc at line 344 [11.927]

Replacement in crawl-ref/source/makeitem.cc at line 2562 [11.927]

Replacement in crawl-ref/source/makeitem.cc at line 2909 [11.927]

Replacement in crawl-ref/source/makeitem.cc at line 2913 [11.927]

Replacement in crawl-ref/source/makeitem.cc at line 2918 [11.927]

Replacement in crawl-ref/source/makeitem.cc at line 2921 [11.927]