fiddlerwoaroof/crawl - Change S6FRUNPFE3PD2DAMVJGWX7TX262KVATIMQ4ON67BPRNVTOOO2XVQC

Add miscellaneous minor fixes.

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

Created by dolorous on June 7, 2008

S6FRUNPFE3PD2DAMVJGWX7TX262KVATIMQ4ON67BPRNVTOOO2XVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1673 [3.569242]

B:BD[3.605084] → [2.643:785]

    beh_type beha =
        (spell == SPELL_SUMMON_GREATER_DEMON) ? BEH_CHARMED
                                              : BEH_FRIENDLY;

[3.605084]

[2.785]

    beh_type beha = (spell == SPELL_SUMMON_GREATER_DEMON) ? BEH_CHARMED
                                                          : BEH_FRIENDLY;

Replacement in crawl-ref/source/spells2.cc at line 1695 [3.569242]

B:BD[2.1772] → [2.1772:1867]

                       stepdown_value(1 + random2(pow) / 10 + random2(pow) / 10, 2, 2, 6, 8) :

[2.1772]

[2.1867]

                       stepdown_value(1 + random2(pow) / 10 + random2(pow) / 10,
                                      2, 2, 6, 8) :

Replacement in crawl-ref/source/spells2.cc at line 1700 [3.569242]

B:BD[2.2021] → [2.2021:2114]

                       stepdown_value(1 + random2(pow) / 30 + random2(pow) / 30, 2, 2, 6, 8)

[2.2021]

[2.2114]

                       stepdown_value(1 + random2(pow) / 30 + random2(pow) / 30,
                                      2, 2, 6, 8)

Replacement in crawl-ref/source/spells2.cc at line 1778 [3.569242]

B:BD[2.4637] → [2.4637:4844]

                mon = ((chance > 8) ? MONS_WRAITH :           // 64%
                       (chance > 3) ? MONS_FREEZING_WRAITH    // 20%
                                    : MONS_SPECTRAL_WARRIOR); // 16%

[2.4637]

[2.4844]

                mon = ((chance > 8) ? MONS_WRAITH :
                       (chance > 3) ? MONS_FREEZING_WRAITH
                                    : MONS_SPECTRAL_WARRIOR);

Replacement in crawl-ref/source/spells2.cc at line 1814 [3.569242]
B:BD[2.5622] → [2.5622:5642]
```
    return success;
```
[2.5622]
[2.5642]
```
    return (success);
```
Insertion in crawl-ref/source/spells2.cc at line 1950 [3.569242]
[4.4515]
[5.4604]
```
    bool success = false;
```
Replacement in crawl-ref/source/spells2.cc at line 1954 [3.569242]
∅:D[6.409] → [4.4620:4673]
∅:D[5.4646] → [4.4620:4673]
B:BD[4.4620] → [4.4620:4673]
```
    int numsc = std::min(2 + (random2(pow) / 4), 6);
```
[5.4646]
[5.4647]
```
    int dur = std::min(2 + (random2(pow) / 4), 6);
```
Deletion in crawl-ref/source/spells2.cc at line 1957 [3.569242]
∅:D[5.4727] → [6.410:436]
B:BD[4.4673] → [6.410:436]
```
    bool success = false;
```
Replacement in crawl-ref/source/spells2.cc at line 2006 [3.569242]
B:BD[7.8404] → [5.4747:4787]
```
            mgen_data(mon, beha, numsc,
```
[7.8404]
[5.4787]
```
            mgen_data(mon, beha, dur,
```
Insertion in crawl-ref/source/spells2.cc at line 2034 [3.569242]
[3.606298]
[5.5032]
```
    bool success = false;
```
Replacement in crawl-ref/source/spells2.cc at line 2038 [3.569242]
∅:D[5.5074] → [3.606370:606429]
∅:D[7.8593] → [3.606370:606429]
B:BD[3.606370] → [3.606370:606429]
```
    int numsc = 2 + random2(pow) / 10 + random2(pow) / 25;
```
[5.5074]
[5.5075]
```
    int dur = std::min(2 + (random2(pow) / 4), 6);
```
Deletion in crawl-ref/source/spells2.cc at line 2041 [3.569242]
B:BD[5.5155] → [5.5155:5181]
```
    bool success = false;
```

Replacement in crawl-ref/source/spells2.cc at line 2042 [3.569242]

B:BD[3.606457] → [3.606457:606495]

B:BD[3.606495] → [5.5182:5229]

    // see stuff.cc - 12jan2000 {dlb}
    numsc = stepdown_value(numsc, 2, 2, 6, 8);

[3.606457]

[3.606544]

    int how_many = stepdown_value(2 + random2(pow) / 10 + random2(pow) / 25,
                                  2, 2, 6, 8);

Replacement in crawl-ref/source/spells2.cc at line 2045 [3.569242]
B:BD[3.606545] → [5.5230:5281]
```
    for (int scount = 0; scount < numsc; ++scount)
```
[3.606545]
[3.606596]
```
    for (int scount = 0; scount < how_many; ++scount)
```

Replacement in crawl-ref/source/spells2.cc at line 2103 [3.569242]

B:BD[7.8622] → [5.5921:5965]

                mgen_data(mon, beha, numsc,

[7.8622]

[5.5965]

                mgen_data(mon, beha, dur,

Add miscellaneous minor fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1673 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 1695 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 1700 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 1778 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 1814 [3.569242]

Insertion in crawl-ref/source/spells2.cc at line 1950 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 1954 [3.569242]

Deletion in crawl-ref/source/spells2.cc at line 1957 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 2006 [3.569242]

Insertion in crawl-ref/source/spells2.cc at line 2034 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 2038 [3.569242]

Deletion in crawl-ref/source/spells2.cc at line 2041 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 2042 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 2045 [3.569242]

Replacement in crawl-ref/source/spells2.cc at line 2103 [3.569242]