fiddlerwoaroof/crawl - Change 3GQ4LKESL3LNEHHTXK334UMJJV75ZKL6O763V6RMYPDUBY5GUPZAC

Simplify.

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

Created by dolorous on June 17, 2008

3GQ4LKESL3LNEHHTXK334UMJJV75ZKL6O763V6RMYPDUBY5GUPZAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/effects.cc at line 70 [6.3382105]
∅:D[2.2823] → [5.6093:6094]
∅:D[7.2843] → [5.6093:6094]
∅:D[8.5653] → [5.6093:6094]
B:BD[5.6093] → [5.6093:6094]
B:BD[5.6094] → [7.2844:2877]
```
    int hploss = you.hp / 2 - 1;
```
Replacement in crawl-ref/source/effects.cc at line 71 [6.3382105]
B:BD[7.2933] → [7.2933:2973]
```
    if (hploss < 0)
        hploss = 0;
```
[5.6163]
[5.6270]
```
    int hploss = std::max(0, you.hp / 2 - 1);
```
Replacement in crawl-ref/source/effects.cc at line 113 [6.3382105]
B:BD[7.3666] → [7.3666:3704]
```
    if (pow > 300)
        pow = 300;
```
[7.3666]
[9.2723]
```
    pow = std::min(300, pow);
```

Replacement in crawl-ref/source/effects.cc at line 134 [6.3382105]

B:BD[10.4344] → [3.2854:2910]

    int hploss = roll_dice(2, 15) + (random2(pow) / 3);

[10.4344]

[11.2856]

    int hploss = std::max(0, roll_dice(2, 15) + (random2(pow) / 3));

Deletion in crawl-ref/source/effects.cc at line 136 [6.3382105]
B:BD[11.2857] → [3.2911:2951]
∅:D[11.2911] → [5.7302:7303]
∅:D[3.2951] → [5.7302:7303]
∅:D[10.4384] → [5.7302:7303]
B:BD[5.7302] → [5.7302:7303]
```
    if (hploss < 0)
        hploss = 0;
```
Replacement in crawl-ref/source/effects.cc at line 185 [6.3382105]
∅:D[4.2737] → [9.3229:3296]
B:BD[9.3229] → [9.3229:3296]
B:BD[9.3296] → [10.5044:5045]
∅:D[10.5045] → [9.3359:3407]
B:BD[9.3359] → [9.3359:3407]
```
        hploss = you.hp * (50 - player_prot_life() * 5) / 100 - 1;
        if (hploss < 0)
            hploss = 0;
```
[4.2737]
[9.3407]
```
        hploss = std::max(0, you.hp * (50 - player_prot_life() * 5) / 100 - 1);
```
Replacement in crawl-ref/source/effects.cc at line 258 [6.3382105]
B:BD[6.3383764] → [10.5378:5424]
```
    int hploss = monster->hit_points / 2 - 1;
```
[6.3383764]
[10.5424]
```
    int hploss = std::max(0, monster->hit_points / 2 - 1);
```
Deletion in crawl-ref/source/effects.cc at line 260 [6.3382105]
B:BD[10.5425] → [10.5425:5466]
```
    if (hploss < 0)
        hploss = 0;
```