fiddlerwoaroof/crawl - Change EJZK7RJA2HE4S3SNFM2RDLT2UFVXJ64N5D2X7K2EUPSUS2UITB5AC

When drawing a damaging card, set the beam range to LOS_RADIUS.

Remove unused function hurt_monster().

In monsters::hurt() if, after hurting the monster, hit_points > max_hit_points, then hurt the monster some more until hit_points == max_hit_points.

Use monsers::hurt() instead of directly descreasing the hit_points member.

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

Created by zelgadis on January 2, 2009

EJZK7RJA2HE4S3SNFM2RDLT2UFVXJ64N5D2X7K2EUPSUS2UITB5AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.h at line 197 [6.1390580]
∅:D[5.2629] → [6.1395959:1395960]
∅:D[4.4737] → [6.1395959:1395960]
B:BD[6.1395959] → [6.1395959:1395960]
B:BD[6.1396258] → [7.201:255]
```
int hurt_monster(monsters *victim, int damage_dealt);
```
Deletion in crawl-ref/source/monstuff.cc at line 8468 [6.1396662]
B:BD[6.1556114] → [7.257:311]
∅:D[7.311] → [6.1556176:1556178]
∅:D[8.3023] → [6.1556176:1556178]
B:BD[6.1556176] → [6.1556176:1556178]
B:BD[9.3611] → [10.2617:2664]
∅:D[10.2664] → [7.455:457]
B:BD[7.455] → [7.455:457]
∅:D[7.457] → [6.1556410:1556411]
B:BD[6.1556410] → [6.1556410:1556411]
```
int hurt_monster(monsters * victim, int damage_dealt)
{
    return (victim->hurt(NULL, damage_dealt));
}
```

Insertion in crawl-ref/source/mon-util.cc at line 5676 [6.1699344]

[11.15495]

[4.4991]

    // Already dead?
    if (hit_points < 1 || type == -1)
        return (0);

Replacement in crawl-ref/source/mon-util.cc at line 5682 [6.1699344]

B:BD[4.5053] → [4.5053:5079]

    else if (amount <= 0)

[4.5053]

[10.2723]

    else if (hit_dice < 1)
        amount = hit_points;
    else if (amount <= 0 && hit_points <= max_hit_points)

Insertion in crawl-ref/source/mon-util.cc at line 5690 [6.1699344]

[12.11738]

[10.2793]

    if (hit_points > max_hit_points)
    {
        amount    += hit_points - max_hit_points;
        hit_points = max_hit_points;
    }

Replacement in crawl-ref/source/fight.cc at line 2071 [6.3140790]
B:BD[11.59357] → [11.59357:59396]
B:BD[11.59396] → [2.339:340]
∅:D[2.340] → [11.59405:59500]
B:BD[11.59405] → [11.59405:59500]
B:BD[11.59500] → [13.4936:4937]
∅:D[13.4937] → [11.59509:59565]
B:BD[11.59509] → [11.59509:59565]
```
    def->hit_points -= 2 + random2(3);
    if (def->hit_points >= def->max_hit_points)
        def->hit_points = def->max_hit_points;
    if (def->hit_dice < 1)
        def->hit_points = 0;
```
[11.59357]
[13.4938]
```
    def->hurt(attacker, 2 + random2(3), BEAM_NEG, false);
```

Replacement in crawl-ref/source/decks.cc at line 1734 [6.3987460]

B:BD[14.1655] → [14.1655:1882]

B:BD[14.1882] → [15.17230:17267]

B:BD[15.17267] → [16.4040:4098]

            mon.hit_points -= 2 + random2(50);
            if (mon.hit_points >= mon.max_hit_points)
                mon.hit_points = mon.max_hit_points;
            if (mon.hit_dice < 1)
                mon.hit_points = 0;
            if (mon.hit_points <= 0)
                monster_die(&mon, KILL_YOU, NON_MONSTER);

[14.1655]

[17.5716]

            mon.hurt(&you, 2 + random2(50), BEAM_NEG);

Deletion in crawl-ref/source/decks.cc at line 1753 [6.3987460]
B:BD[18.20116] → [18.20116:20131]
```
    bolt beam;
```
Insertion in crawl-ref/source/decks.cc at line 1808 [6.3987460]
[19.5432]
[3.9887]
```
    bolt beam;
    beam.range = LOS_RADIUS;
```

When drawing a damaging card, set the beam range to LOS_RADIUS.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/monstuff.h at line 197 [6.1390580]

Deletion in crawl-ref/source/monstuff.cc at line 8468 [6.1396662]

Insertion in crawl-ref/source/mon-util.cc at line 5676 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5682 [6.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5690 [6.1699344]

Replacement in crawl-ref/source/fight.cc at line 2071 [6.3140790]

Replacement in crawl-ref/source/decks.cc at line 1734 [6.3987460]

Deletion in crawl-ref/source/decks.cc at line 1753 [6.3987460]

Insertion in crawl-ref/source/decks.cc at line 1808 [6.3987460]