fiddlerwoaroof/crawl - Change HRBCN6CYP36HGNB3IDETM2UXWSANJM3QZA2HAM4P4B62QB4KBKXAC

Fix [2220297]: nonenchantment tracers were improperly doublecounting each

creature, once with and once without resistances. Also reduced fireball foe_ratio to 60 to make fire giants more aggressive.

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

Created by haranp on February 3, 2009

HRBCN6CYP36HGNB3IDETM2UXWSANJM3QZA2HAM4P4B62QB4KBKXAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 1588 [7.1340842]

[5.1606]

[6.3525]


static spell_type _draco_type_to_breath(int drac_type)
{
    switch (drac_type)
    {
    case MONS_BLACK_DRACONIAN:   return SPELL_LIGHTNING_BOLT;
    case MONS_MOTTLED_DRACONIAN: return SPELL_STICKY_FLAME_SPLASH;
    case MONS_YELLOW_DRACONIAN:  return SPELL_ACID_SPLASH;
    case MONS_GREEN_DRACONIAN:   return SPELL_POISONOUS_CLOUD;
    case MONS_PURPLE_DRACONIAN:  return SPELL_ISKENDERUNS_MYSTIC_BLAST;
    case MONS_RED_DRACONIAN:     return SPELL_FIRE_BREATH;
    case MONS_WHITE_DRACONIAN:   return SPELL_COLD_BREATH;
    case MONS_PALE_DRACONIAN:    return SPELL_STEAM_BALL;

Insertion in crawl-ref/source/mstuff2.cc at line 1602 [7.1340842]

[6.3526]

[7.1374803]

    // Handled later.
    case MONS_PLAYER_GHOST:      return SPELL_DRACONIAN_BREATH;

Insertion in crawl-ref/source/mstuff2.cc at line 1605 [7.1340842]

[7.1374804]

[8.5417]

    default:
        DEBUGSTR("Invalid monster using draconian breath spell");
        break;
    }
    return (SPELL_DRACONIAN_BREATH);
}

Replacement in crawl-ref/source/mstuff2.cc at line 1642 [7.1340842]

B:BD[9.6364] → [9.6364:6370]

B:BD[9.6370] → [4.2633:2660]

∅:D[4.2660] → [9.6396:6819]

B:BD[9.6396] → [9.6396:6819]

∅:D[9.6819] → [7.1375940:1375941]

∅:D[10.8305] → [7.1375940:1375941]

∅:D[11.404949] → [7.1375940:1375941]

B:BD[7.1375940] → [7.1375940:1375941]

B:BD[7.1375941] → [9.6820:6932]

    {
        switch (drac_type)
        {
        case MONS_BLACK_DRACONIAN:
            real_spell = SPELL_LIGHTNING_BOLT;
            break;
        case MONS_MOTTLED_DRACONIAN:
            real_spell = SPELL_STICKY_FLAME_SPLASH;
            break;
        case MONS_YELLOW_DRACONIAN:
            real_spell = SPELL_ACID_SPLASH;
            break;
        case MONS_GREEN_DRACONIAN:
            real_spell = SPELL_POISONOUS_CLOUD;
            break;
        case MONS_PURPLE_DRACONIAN:
            real_spell = SPELL_ISKENDERUNS_MYSTIC_BLAST;
            break;

[9.6364]

[9.6932]

        real_spell = _draco_type_to_breath(drac_type);

Deletion in crawl-ref/source/mstuff2.cc at line 1644 [7.1340842]

B:BD[9.6933] → [9.6933:7258]

B:BD[9.7258] → [4.2661:2691]

∅:D[4.2691] → [9.7287:7430]

B:BD[9.7287] → [9.7287:7430]

        case MONS_RED_DRACONIAN:
            real_spell = SPELL_FIRE_BREATH;
            break;
        case MONS_WHITE_DRACONIAN:
            real_spell = SPELL_COLD_BREATH;
            break;
        case MONS_PALE_DRACONIAN:
            real_spell = SPELL_STEAM_BALL;
            break;
        case MONS_PLAYER_GHOST:
            // Handled later.
            break;
        default:
            DEBUGSTR("Invalid monster using draconian breath spell");
            break;
        }
    }

Insertion in crawl-ref/source/mstuff2.cc at line 1818 [7.1340842]
[12.6764]
[8.5487]
```
        beam.foe_ratio = 60;
```

Replacement in crawl-ref/source/mon-util.cc at line 306 [7.1699344]

B:BD[2.2807] → [2.2807:3104]

    case MR_RES_ELEC:
        return elec;
    case MR_RES_POISON:
        return poison;
    case MR_RES_FIRE:
        return fire;
    case MR_RES_STEAM:
        return steam;
    case MR_RES_COLD:
        return cold;
    case MR_RES_ACID:
        return acid;
    default:
        return (0);

[2.2807]

[2.3104]

    case MR_RES_ELEC:   return elec;
    case MR_RES_POISON: return poison;
    case MR_RES_FIRE:   return fire;
    case MR_RES_STEAM:  return steam;
    case MR_RES_COLD:   return cold;
    case MR_RES_ACID:   return acid;
    default:            return (0);

Insertion in crawl-ref/source/beam.cc at line 3991 [7.4128068]

[7.4233593]

[13.45648]

    // Update friend or foe encountered.
    if (!mons_atts_aligned(attitude, mons_attitude(mon)))
    {
        foe_info.count++;
        foe_info.power += mons_power(mon->type);
    }
    else
    {
        friend_info.count++;
        friend_info.power += mons_power(mon->type);
    }

Insertion in crawl-ref/source/beam.cc at line 4114 [7.4128068]
[13.48660]
[14.6101]
```
        {
```
Insertion in crawl-ref/source/beam.cc at line 4116 [7.4128068]
[14.6174]
[13.48728]
```
            foe_info.count++;
        }
```
Insertion in crawl-ref/source/beam.cc at line 4119 [7.4128068]
[13.48741]
[14.6175]
```
        {
```
Insertion in crawl-ref/source/beam.cc at line 4121 [7.4128068]
[14.6251]
[3.25058]
```
            friend_info.count++;
        }
```
Deletion in crawl-ref/source/beam.cc at line 4156 [7.4128068]
B:BD[15.2737] → [13.49230:49335]
B:BD[13.49335] → [14.6252:6327]
∅:D[14.6327] → [13.49400:49421]
B:BD[13.49400] → [13.49400:49421]
B:BD[13.49421] → [14.6328:6409]
∅:D[14.6409] → [13.49484:49490]
B:BD[13.49484] → [13.49484:49490]
∅:D[13.49490] → [16.18260:18261]
B:BD[16.18260] → [16.18260:18261]
```
    // Update friend or foe encountered.
    if (!mons_atts_aligned(attitude, mons_attitude(mon)))
    {
        foe_info.count++;
        foe_info.power += mons_power(mon->type);
    }
    else
    {
        friend_info.count++;
        friend_info.power += mons_power(mon->type);
    }
```

Fix [2220297]: nonenchantment tracers were improperly doublecounting each

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 1588 [7.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1602 [7.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1605 [7.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1642 [7.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 1644 [7.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1818 [7.1340842]

Replacement in crawl-ref/source/mon-util.cc at line 306 [7.1699344]

Insertion in crawl-ref/source/beam.cc at line 3991 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 4114 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 4116 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 4119 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 4121 [7.4128068]

Deletion in crawl-ref/source/beam.cc at line 4156 [7.4128068]