fiddlerwoaroof/crawl - Change RRTDASQXZVA6WHTD22SITD7RUF7VNGLZUP2MCZ2VRL36OOEWOK5AC

Add penance-related cleanups.

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

Created by dolorous on November 19, 2008

RRTDASQXZVA6WHTD22SITD7RUF7VNGLZUP2MCZ2VRL36OOEWOK5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.h at line 17 [4.800304]
B:BD[3.169] → [3.169:191]
```
#define MAX_PIETY 200
```
[3.169]
[5.270]
```
#define MAX_PIETY   200
#define MAX_PENANCE 200
```
Replacement in crawl-ref/source/religion.cc at line 865 [4.804403]
∅:D[6.878] → [7.2354:2392]
∅:D[8.2512] → [7.2354:2392]
B:BD[4.807001] → [7.2354:2392]
∅:D[7.2392] → [4.807045:807119]
B:BD[4.807045] → [4.807045:807119]
```
    if (you.penance[god] + val > 200)
        you.penance[god] = 200;
    else
        you.penance[god] += val;
```
[8.2512]
[8.2513]
```
    you.penance[god] += val;
    you.penance[god] = MIN(MAX_PENANCE, you.penance[god]);
```
Replacement in crawl-ref/source/religion.cc at line 4352 [4.804403]
∅:D[9.3704] → [4.876772:876819]
∅:D[10.193307] → [4.876772:876819]
B:BD[4.876772] → [4.876772:876819]
```
            confuse_player( 3 + random2(10) );
```
[9.3704]
[9.3705]
```
            confuse_player(3 + random2(10));
```
Replacement in crawl-ref/source/religion.cc at line 4361 [4.804403]
B:BD[4.876999] → [4.876999:877043]
```
                slow_player( random2(20) );
```
[4.876999]
[4.877043]
```
                slow_player(random2(20));
```
Replacement in crawl-ref/source/religion.cc at line 4368 [4.804403]
B:BD[11.389] → [11.389:429]
```
    dec_penance( god, 1 + random2(3) );
```
[11.389]
[12.5462]
```
    dec_penance(god, 1 + random2(3));
```

Replacement in crawl-ref/source/religion.cc at line 5748 [4.804403]

B:BD[13.2585] → [2.2432:2511]

            std::min(MAX_PIETY * 2, you.piety + you.duration[DUR_PIETY_POOL]);

[13.2585]

[14.2833]

            std::min(MAX_PIETY + MAX_PENANCE,
                     you.piety + you.duration[DUR_PIETY_POOL]);

Replacement in crawl-ref/source/religion.cc at line 6092 [4.804403]
∅:D[15.5782] → [16.5494:5531]
B:BD[17.670] → [16.5494:5531]
```
    bool penance = you.penance[god];
```
[15.5782]
[17.670]
```
    bool penance = (you.penance[god] > 0);
```