fiddlerwoaroof/crawl - Change LFPHI3TJK5V4HPJJHCG5XATY23P25OVIZ4ITQVG354DJHPEPKU4AC

Fix 2488357: ability beams not getting their ranges set.

I chose ranges more or less arbitrarily; better suggestions welcome.

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

Created by haranp on January 7, 2009

LFPHI3TJK5V4HPJJHCG5XATY23P25OVIZ4ITQVG354DJHPEPKU4AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/beam.cc at line 270 [5.4128068]

[4.6887]


    // Save range before overriding it
    const int old_range = pbolt.range;
    if (range)
        pbolt.range = range;

Insertion in crawl-ref/source/beam.cc at line 277 [5.4128068]
[3.9837]
[6.30133]
```
    if (range)
        pbolt.range = old_range;
```

Insertion in crawl-ref/source/abl-show.cc at line 1056 [5.4494389]

[7.11922]

[8.15908]

}
int _calc_breath_ability_range(ability_type ability)
{
    // Following monster draconian abilities.
    switch (ability)
    {
    case ABIL_BREATHE_FIRE:         return 6;
    case ABIL_BREATHE_FROST:        return 6;
    case ABIL_BREATHE_POISON:       return 7;
    case ABIL_BREATHE_LIGHTNING:    return 8;
    case ABIL_SPIT_ACID:            return 8;
    case ABIL_BREATHE_POWER:        return 8;
    case ABIL_BREATHE_STICKY_FLAME: return 5;
    case ABIL_BREATHE_STEAM:        return 7;
    default:
        ASSERT("Bad breath type!");
        break;
    }
    return (-2);

Replacement in crawl-ref/source/abl-show.cc at line 1110 [5.4494389]

B:BD[5.4509595] → [9.10379:10442]

∅:D[9.10442] → [10.11219:11247]

∅:D[11.14872] → [10.11219:11247]

B:BD[10.11219] → [10.11219:11247]

        if (!spell_direction(spd, beam, DIR_NONE, TARG_ENEMY))
            return (false);

[5.4509595]

[12.7143]

        {
            // Note: power level of ball calculated at release -- bwr
            const int pow = calc_spell_power(SPELL_DELAYED_FIREBALL, true);
            const int fake_range = spell_range(SPELL_FIREBALL, pow, false);

Replacement in crawl-ref/source/abl-show.cc at line 1115 [5.4494389]

∅:D[12.7144] → [5.4509595:4509661]

∅:D[10.11256] → [5.4509595:4509661]

B:BD[5.4509595] → [5.4509595:4509661]

B:BD[5.4509661] → [9.10443:10517]

        // Note: power level of ball calculated at release -- bwr
        fireball(calc_spell_power( SPELL_DELAYED_FIREBALL, true ), beam);

[12.7144]

[5.4509731]

            if (!spell_direction(spd, beam, DIR_NONE, TARG_ENEMY, fake_range))
                return (false);
            beam.range = spell_range(SPELL_FIREBALL, pow, true);
            fireball(pow, beam);
        }

Insertion in crawl-ref/source/abl-show.cc at line 1137 [5.4494389]
[6.37773]
[6.37773]
```
        beam.range = 6;         // following Venom Bolt
```
Deletion in crawl-ref/source/abl-show.cc at line 1147 [5.4494389]
∅:D[6.37925] → [5.4510876:4510877]
B:BD[5.4510876] → [5.4510876:4510877]

Replacement in crawl-ref/source/abl-show.cc at line 1198 [5.4494389]

B:BD[5.4512215] → [13.191:235]

B:BD[13.235] → [6.37933:37980]

        if (you.duration[DUR_BREATH_WEAPON]
            && abil.ability != ABIL_SPIT_ACID)

[5.4512215]

[5.4512320]

        if (you.duration[DUR_BREATH_WEAPON] && abil.ability != ABIL_SPIT_ACID)

Replacement in crawl-ref/source/abl-show.cc at line 1203 [5.4494389]

B:BD[5.4512411] → [6.37981:38029]

∅:D[6.38029] → [5.4512508:4512536]

B:BD[5.4512508] → [5.4512508:4512536]

        else if (!spell_direction(abild, beam))
            return (false);

[5.4512411]

[5.4512546]

        else
        {
            beam.range = _calc_breath_ability_range(abil.ability);
            if (!spell_direction(abild, beam, DIR_NONE, TARG_ENEMY, beam.range))
                return (false);
        }

Insertion in crawl-ref/source/abl-show.cc at line 1383 [5.4494389]
[5.4516959]
[6.39753]
```
        beam.range = LOS_RADIUS;
```

Replacement in crawl-ref/source/abl-show.cc at line 1409 [5.4494389]

B:BD[5.4517583] → [6.39902:39945]

        if (!spell_direction(abild, beam))

[5.4517583]

[6.39945]

        // Taking ranges from the equivalent spells.
        beam.range = (abil.ability == ABIL_THROW_FLAME ? 7 : 8);
        if (!spell_direction(abild, beam, DIR_NONE, TARG_ENEMY, beam.range))

Replacement in crawl-ref/source/abl-show.cc at line 1422 [5.4494389]

B:BD[5.4517991] → [6.40116:40159]

        if (!spell_direction(abild, beam))

[5.4517991]

[5.4518081]

        // Taking range from Bolt of Draining.
        beam.range = 6;
        if (!spell_direction(abild, beam, DIR_NONE, TARG_ENEMY, beam.range))

Replacement in crawl-ref/source/abl-show.cc at line 1506 [5.4494389]

B:BD[14.1283346] → [6.40270:40311]

        if (!spell_direction(spd, beam))

[14.1283346]

[6.40311]

        beam.range = 8;
        if (!spell_direction(spd, beam, DIR_NONE, TARG_ENEMY, beam.range))

Replacement in crawl-ref/source/abl-show.cc at line 1531 [5.4494389]
B:BD[15.3260] → [15.3260:3261]
[15.3260]
[6.40445]
```
        beam.range = 8;
```
Replacement in crawl-ref/source/abl-show.cc at line 1583 [5.4494389]
B:BD[16.15950] → [16.15950:15951]
[16.15950]
[16.15951]
```
        beam.range = 8;
```
Replacement in crawl-ref/source/abl-show.cc at line 1615 [5.4494389]
B:BD[5.4523778] → [6.40623:40664]
```
        if (!spell_direction(spd, beam))
```
[5.4523778]
[5.4523866]
```
        if (!spell_direction(spd, beam, DIR_NONE, TARG_ENEMY, 8))
```

Replacement in crawl-ref/source/abl-show.cc at line 1629 [5.4494389]

B:BD[5.4524116] → [5.4524116:4524461]

        case 0: zapping( ZAP_FLAME,        power,     beam ); break;
        case 1: zapping( ZAP_PAIN,         power,     beam ); break;
        case 2: zapping( ZAP_STONE_ARROW,  power,     beam ); break;
        case 3: zapping( ZAP_ELECTRICITY,  power,     beam ); break;
        case 4: zapping( ZAP_BREATHE_ACID, power / 2, beam ); break;

[5.4524116]

[5.4524461]

        case 0: beam.range =  7; zapping(ZAP_FLAME, power, beam); break;
        case 1: beam.range =  8; zapping(ZAP_PAIN,  power, beam); break;
        case 2: beam.range =  5; zapping(ZAP_STONE_ARROW, power, beam); break;
        case 3: beam.range = 13; zapping(ZAP_ELECTRICITY, power, beam); break;
        case 4: beam.range = 8; zapping(ZAP_BREATHE_ACID, power/2, beam); break;

Deletion in crawl-ref/source/abl-show.cc at line 1658 [5.4494389]
B:BD[6.41275] → [2.2704:2732]
```
        switch (random2(7))
```

Replacement in crawl-ref/source/abl-show.cc at line 1659 [5.4494389]

B:BD[5.4525150] → [5.4525150:4525647]

        case 0: zapping( ZAP_FIRE,               power, beam ); break;
        case 1: zapping( ZAP_FIREBALL,           power, beam ); break;
        case 2: zapping( ZAP_LIGHTNING,          power, beam ); break;
        case 3: zapping( ZAP_NEGATIVE_ENERGY,    power, beam ); break;
        case 4: zapping( ZAP_STICKY_FLAME,       power, beam ); break;
        case 5: zapping( ZAP_IRON_BOLT,          power, beam ); break;
        case 6: zapping( ZAP_ORB_OF_ELECTRICITY, power, beam ); break;

[5.4525150]

[5.4526595]

            zap_type ztype = ZAP_DEBUGGING_RAY;
            switch (random2(7))
            {
            case 0: beam.range = 6;  ztype = ZAP_FIRE;               break;
            case 1: beam.range = 6;  ztype = ZAP_FIREBALL;           break;
            case 2: beam.range = 10; ztype = ZAP_LIGHTNING;          break;
            case 3: beam.range = 5;  ztype = ZAP_STICKY_FLAME;       break;
            case 4: beam.range = 5;  ztype = ZAP_IRON_BOLT;          break;
            case 5: beam.range = 6;  ztype = ZAP_NEGATIVE_ENERGY;    break;
            case 6: beam.range = 20; ztype = ZAP_ORB_OF_ELECTRICITY; break;
            }
            zapping(ztype, power, beam);

Insertion in crawl-ref/source/abl-show.cc at line 1776 [5.4494389]
[17.3077]
[6.41827]
```
        beam.range = 8;
```

Fix 2488357: ability beams not getting their ranges set.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/beam.cc at line 270 [5.4128068]

Insertion in crawl-ref/source/beam.cc at line 277 [5.4128068]

Insertion in crawl-ref/source/abl-show.cc at line 1056 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1110 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1115 [5.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 1137 [5.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1147 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1198 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1203 [5.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 1383 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1409 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1422 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1506 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1531 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1583 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1615 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1629 [5.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1658 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1659 [5.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 1776 [5.4494389]