fiddlerwoaroof/crawl - Change XNSBXTNKIHKTFUAAVT2H6Y2DCJVVS57CN4E7645OSSC5SKAI2QHAC

Fixed wands with many charges losing charges on recharge attempt.

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

Created by dshaligram on July 13, 2008

XNSBXTNKIHKTFUAAVT2H6Y2DCJVVS57CN4E7645OSSC5SKAI2QHAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/effects.cc at line 1821 [3.3382105]
B:BD[2.1178] → [2.1178:1179]
∅:D[2.1179] → [4.27659:27733]
B:BD[5.946737] → [4.27659:27733]
```
        mprf("%s glows for a moment.", wand.name(DESC_CAP_YOUR).c_str());
```

Replacement in crawl-ref/source/effects.cc at line 1822 [3.3382105]

B:BD[5.946878] → [5.946878:946949]

        wand.plus += 1 + random2avg( ((charge_gain - 1) * 3) + 1, 3 );

[5.946878]

[5.946949]

        const int new_charges =
            std::max<int>(
                wand.plus,
                std::min(charge_gain * 3,
                         wand.plus +
                         1 + random2avg( ((charge_gain - 1) * 3) + 1, 3 )));

Replacement in crawl-ref/source/effects.cc at line 1829 [3.3382105]

B:BD[5.946950] → [5.946950:947032]

        if (wand.plus > charge_gain * 3)
            wand.plus = charge_gain * 3;

[5.946950]

[3.3425840]

        const bool charged = new_charges > wand.plus;
        mprf("%s %s for a moment.",
             wand.name(DESC_CAP_YOUR).c_str(),
             charged? "glows" : "flickers");
        wand.plus = new_charges;