fiddlerwoaroof/crawl - Change MVLBKQVOJ7DCX3XDVC3S5WBSYEUSCMFIWULUM7G2C777UZFT7SKAC

Simplify and display resistances for (very) ugly things.

Created by David Lawrence Ramsey on October 6, 2009

MVLBKQVOJ7DCX3XDVC3S5WBSYEUSCMFIWULUM7G2C777UZFT7SKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/ghost.h at line 63 [4.18366]

B:BD[4.19367] → [5.6158:6196]

    void ugly_thing_add_resistance();

[4.19367]

    void ugly_thing_add_resistance(bool very_ugly,
                                   mon_attack_flavour u_att_flav);

Deletion in crawl-ref/source/ghost.cc at line 513 [6.9890]

∅:D[2.3849] → [5.8090:8237]

B:BD[5.8090] → [5.8090:8237]

B:BD[5.8237] → [3.3045:3074]

∅:D[3.3074] → [5.8237:8320]

B:BD[5.8237] → [5.8237:8320]


    resists.elec = 0;
    resists.poison = 0;
    resists.fire = 0;
    resists.cold = 0;
    resists.acid = 0;
    resists.sticky_flame = false;
    resists.rotting = false;
    // An ugly thing gets one random resistance.
    ugly_thing_add_resistance();

Insertion in crawl-ref/source/ghost.cc at line 535 [6.9890]

[5.8884]


    // Pick a compatible resistance for this attack flavour.
    ugly_thing_add_resistance(very_ugly, att_flav);

Replacement in crawl-ref/source/ghost.cc at line 560 [6.9890]

∅:D[7.3106] → [5.9505:9660]

B:BD[5.9505] → [5.9505:9660]

B:BD[5.9660] → [7.3107:3172]

∅:D[7.3172] → [5.9725:9758]

B:BD[5.9725] → [5.9725:9758]

    if (one_chance_in(3))
        att_flav = _ugly_thing_flavour_upgrade(att_flav);
    // A very ugly thing gets one more random resistance, and another
    // possible resistance based on its upgraded attack flavour.
    ugly_thing_add_resistance();

[7.3106]

[6.19401]

    att_flav = _ugly_thing_flavour_upgrade(att_flav);

Replacement in crawl-ref/source/ghost.cc at line 563 [6.9890]

B:BD[6.19404] → [5.9759:9805]

void ghost_demon::ugly_thing_add_resistance()

[6.19404]

[5.9805]

void ghost_demon::ugly_thing_add_resistance(bool very_ugly,
                                            mon_attack_flavour u_att_flav)

Replacement in crawl-ref/source/ghost.cc at line 566 [6.9890]

B:BD[5.9807] → [3.3075:3092]

    int res = 0;

[5.9807]

[5.9881]

    resists.elec = 0;
    resists.poison = 0;
    resists.fire = 0;
    resists.sticky_flame = false;
    resists.cold = 0;
    resists.acid = 0;
    resists.rotting = false;

Replacement in crawl-ref/source/ghost.cc at line 574 [6.9890]
B:BD[5.9882] → [3.3093:3100]
```
    do
```
[5.9882]
[5.9914]
```
    switch (u_att_flav)
```

Replacement in crawl-ref/source/ghost.cc at line 576 [6.9890]

B:BD[5.9920] → [3.3101:3237]

        switch (random2(7))
        {
            case 0:
                resists.elec++;
                res++;
                break;

[5.9920]

[5.9983]

    case AF_ELEC:
        resists.elec = (very_ugly ? 2 : 1);
        break;

Replacement in crawl-ref/source/ghost.cc at line 580 [6.9890]

B:BD[5.9984] → [3.3238:3338]

            case 1:
                resists.poison++;
                res++;
                break;

[5.9984]

[5.10049]

    case AF_POISON_NASTY:
        resists.poison = 1;
        break;
    case AF_POISON_MEDIUM:
        resists.poison = 2;
        break;
    case AF_FIRE:
        resists.fire = 1;
        resists.sticky_flame = true;
        break;

Replacement in crawl-ref/source/ghost.cc at line 593 [6.9890]

B:BD[5.10050] → [3.3339:3437]

            case 2:
                resists.fire++;
                res++;
                break;

[5.10050]

[5.10113]

    case AF_NAPALM:
        resists.fire = 2;
        resists.sticky_flame = true;
        break;

Replacement in crawl-ref/source/ghost.cc at line 598 [6.9890]

B:BD[5.10114] → [3.3438:3536]

            case 3:
                resists.cold++;
                res++;
                break;

[5.10114]

[3.3536]

    case AF_COLD:
        resists.cold = (very_ugly ? 2 : 1);
        break;

Replacement in crawl-ref/source/ghost.cc at line 602 [6.9890]

B:BD[3.3537] → [3.3537:3635]

            case 4:
                resists.acid++;
                res++;
                break;

[3.3537]

[5.10177]

    case AF_DISEASE:
    case AF_ROT:
        resists.rotting = true;
        break;

Replacement in crawl-ref/source/ghost.cc at line 607 [6.9890]

B:BD[5.10178] → [3.3636:3834]

            case 5:
                if (!resists.sticky_flame)
                {
                    resists.sticky_flame = true;
                    res++;
                }
                break;

[5.10178]

[5.10241]

    case AF_ACID:
        resists.acid = (very_ugly ? 2 : 1);
        break;

Replacement in crawl-ref/source/ghost.cc at line 611 [6.9890]

B:BD[5.10242] → [3.3835:4033]

            case 6:
                if (!resists.rotting)
                {
                    resists.rotting = true;
                    res++;
                }
                break;
        }

[5.10242]

[5.10318]

    default:
        break;

Deletion in crawl-ref/source/ghost.cc at line 614 [6.9890]

B:BD[5.10324] → [3.4034:4056]

∅:D[3.4056] → [5.10324:10325]

B:BD[5.10324] → [5.10324:10325]

B:BD[5.10325] → [3.4057:4124]

∅:D[7.3275] → [5.10392:10475]

∅:D[3.4124] → [5.10392:10475]

B:BD[5.10392] → [5.10392:10475]

B:BD[5.10550] → [5.10550:10648]

B:BD[5.10648] → [3.4125:4210]

    while (res == 0);
    // Guarantee certain resistances for upgraded attack flavours.
    if (att_flav == AF_POISON_MEDIUM && !resists.poison)
        resists.poison++;
    else if (att_flav == AF_NAPALM && !resists.sticky_flame)
        resists.sticky_flame = true;
    else if (att_flav == AF_ROT && !resists.rotting)
        resists.rotting = true;

Replacement in crawl-ref/source/describe.cc at line 2601 [9.3736416]
B:BD[8.3596] → [8.3596:3613]
```
    // monsters.
```
[8.3596]
[10.9202]
```
    // monsters, except for (very) ugly things.
```

Replacement in crawl-ref/source/describe.cc at line 2603 [9.3736416]

B:BD[10.9236] → [8.3614:3751]

        mons_is_ghost_demon(mon.type) ? get_mons_class_resists(mon.type)
                                      : get_mons_resists(&mon);

[10.9236]

[10.9426]

        (mons_is_ghost_demon(mon.type)
                && mon.type != MONS_UGLY_THING
                && mon.type != MONS_VERY_UGLY_THING)
            ? get_mons_class_resists(mon.type) : get_mons_resists(&mon);