fiddlerwoaroof/crawl - Change JWJGOMVBPZRSP2VSHLFFFDIF2CS6UPBA6AHL7DAJWGBCHAV3PJDQC

Got rid of setup_dragon(), moving it's functionality into setup_mons_cast() and

mons_spells(), and added the new spells Fire Breath, Cold Breath and Draconian Breath to trigger that functionality. Also added the new spell Acid Splash to replace monstuff's _plant_spit(), and Sticky Flame Splash, which is exactly the same as Sticky Flame except for the messages it gives and when it makes noise (monsters now spit sticky flame instead of breathing it). All things that were handled as monster special abilities are still handled as such, and were just changed to manually invoke mons_cast().

The spell messages in dat/database/monspell.txt can now take advantage of a new substitution, "@target@", which is expanded into the spell's target.

Added the spell flags SPFLAG_INNATE, for monster spells which are innate even when the monster is a priest or wizard, and which can be used by them when silenced, and SPFLAG_NOISY, for spells which produce noise even when used by monsters other than priests or wizards.

Added the monster class flags M_SPELL_NO_SILENT, for monsters which aren't wizards or priests, yet still can't use spells if silenced (currently only used for Geryon blowing his horn to summon beasts), and M_NOISY_SPELLS, for monsters which can cast spells when silenced, yet whose spells make noise when not silenced (currently only used by curse skulls and Murray).

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

Created by zelgadis on December 13, 2008

JWJGOMVBPZRSP2VSHLFFFDIF2CS6UPBA6AHL7DAJWGBCHAV3PJDQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-data.h at line 2727 [8.268152]

B:BD[6.5120] → [7.622:666]

     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,

[6.5120]

[6.5147]

     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER | SPFLAG_INNATE | SPFLAG_NOISY,

Replacement in crawl-ref/source/spl-data.h at line 2731 [8.268152]
B:BD[9.4340] → [5.3331:3339]
```
     0,
```
[9.4340]
[6.5163]
```
     2,
```

Insertion in crawl-ref/source/spl-data.h at line 2838 [8.268152]

[6.5920]

     false
},
{
    SPELL_ACID_SPLASH, "Acid Splash",
     SPTYP_CONJURATION,
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER | SPFLAG_INNATE | SPFLAG_NOISY,
     5,
     0,
     LOS_RADIUS, LOS_RADIUS,
     0,
     NULL,
     true,

Insertion in crawl-ref/source/spl-data.h at line 2855 [8.268152]

[10.10897]

[8.291213]

    SPELL_STICKY_FLAME_SPLASH, "Sticky Flame Splash",
     SPTYP_CONJURATION | SPTYP_FIRE,
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER | SPFLAG_INNATE | SPFLAG_NOISY,
     4,
     100,
     5, 5,
     0,
     NULL,
     true,
     false
},
{
    SPELL_FIRE_BREATH, "Fire Breath",
     SPTYP_CONJURATION | SPTYP_FIRE,
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER | SPFLAG_INNATE | SPFLAG_NOISY,
     5,
     0,
     6, 6,
     0,
     NULL,
     true,
     false
},
{
    SPELL_COLD_BREATH, "Cold Breath",
     SPTYP_CONJURATION | SPTYP_ICE,
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER | SPFLAG_INNATE | SPFLAG_NOISY,
     5,
     0,
     6, 6,
     0,
     NULL,
     true,
     false
},
{
    SPELL_DRACONIAN_BREATH, "Draconian Breath",
     SPTYP_CONJURATION,
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER | SPFLAG_INNATE | SPFLAG_NOISY,
     8,
     0,
     LOS_RADIUS, LOS_RADIUS,
     0,
     NULL,
     true,
     false
},
{

Replacement in crawl-ref/source/spl-cast.h at line 35 [8.291319]

B:BD[4.4305] → [4.4305:4459]

    SPFLAG_TESTING              = 0x08000,      // a testing/debugging spell
    SPFLAG_DEVEL                = 0x10000       // a spell under development

[4.4305]

[11.46413]

    SPFLAG_INNATE               = 0x08000,      // an innate spell, even if
                                                // use by a priest/wizard
    SPFLAG_NOISY                = 0x10000,      // makes noise, even if innate
    SPFLAG_TESTING              = 0x20000,      // a testing/debugging spell
    SPFLAG_DEVEL                = 0x40000       // a spell under development

Deletion in crawl-ref/source/mstuff2.h at line 20 [8.1336995]
B:BD[12.3429] → [13.19477:19528]
```
void setup_dragon(monsters *monster, bolt &pbolt);
```
Insertion in crawl-ref/source/mstuff2.cc at line 39 [8.1340842]
[8.1341842]
[14.71677]
```
#include "spl-cast.h"
```

Insertion in crawl-ref/source/mstuff2.cc at line 507 [8.1340842]

[5.6711]

    bool force_silent = false;
    spell_type real_spell = spell_cast;
    if (spell_cast == SPELL_DRACONIAN_BREATH)
    {
        int type = monster->type;
        if (mons_genus(type) == MONS_DRACONIAN)
            type = draco_subspecies(monster);
        switch(type)
        {
        case MONS_MOTTLED_DRACONIAN:
            real_spell = SPELL_STICKY_FLAME_SPLASH;
            break;
        case MONS_YELLOW_DRACONIAN:
            real_spell = SPELL_ACID_SPLASH;
            break;
        case MONS_PLAYER_GHOST:
            // Draining breath is silent.
            force_silent = true;
            break;
        default:
            break;
        }
    }
    else if (monster->type == MONS_SHADOW_DRAGON)
        // Draining breath is silent.
        force_silent = true;

Replacement in crawl-ref/source/mstuff2.cc at line 541 [8.1340842]

B:BD[5.6758] → [5.6758:6808]

    const bool silent = silenced(monster->pos());

[5.6758]

[5.6808]

    const bool silent = silenced(monster->pos()) || force_silent;

Insertion in crawl-ref/source/mstuff2.cc at line 546 [8.1340842]
[5.6852]
[5.6852]
```
    const unsigned int flags = get_spell_flags(real_spell);
```

Replacement in crawl-ref/source/mstuff2.cc at line 550 [8.1340842]

B:BD[5.6991] → [5.6991:7036]

    const bool innate = !(priest || wizard);

[5.6991]

[5.7036]

    const bool innate = !(priest || wizard) || (flags & SPFLAG_INNATE);

Replacement in crawl-ref/source/mstuff2.cc at line 553 [8.1340842]

B:BD[5.7052] → [5.7052:7077]

    if(silent || innate)

[5.7052]

[5.7077]

    if(silent
       || (innate
           && !mons_class_flag(monster->type, M_SPELL_NO_SILENT
                                            | M_NOISY_SPELLS)
           && !(flags & SPFLAG_NOISY)))
    {

Insertion in crawl-ref/source/mstuff2.cc at line 560 [8.1340842]
[5.7096]
[5.7096]
```
    }
```

Replacement in crawl-ref/source/mstuff2.cc at line 562 [8.1340842]

B:BD[5.7105] → [5.7105:7146]

        noise = spell_noise(spell_cast);

[5.7105]

[5.7146]

    {
        if (mons_genus(monster->type) == MONS_DRAGON)
            noise = get_shout_noise_level(S_ROAR);
        else
            noise = spell_noise(real_spell);
    }

Replacement in crawl-ref/source/mstuff2.cc at line 579 [8.1340842]

B:BD[5.7368] → [5.7368:7426]

    key             = spell_title(spell_cast) + cast_str;

[5.7368]

[5.7426]

    key             = spell_title(real_spell) + cast_str;

Insertion in crawl-ref/source/mstuff2.cc at line 651 [8.1340842]

[5.9132]

    }
    std::string target = "something";
    if (pbolt.target == you.pos())
        target = "you";
    else if (see_grid(pbolt.target))
    {
        int midx = mgrd(pbolt.target);
        if (midx != NON_MONSTER)
        {
            monsters* mtarg = &menv[midx];
            if (you.can_see(mtarg))
                target = mtarg->name(mons_friendly(mtarg) ? DESC_NOCAP_YOUR :
                                                            DESC_NOCAP_THE);
        }

Insertion in crawl-ref/source/mstuff2.cc at line 669 [8.1340842]
[5.9138]
[5.9138]
```
    msg = replace_all(msg, "@target@", target);
```

Deletion in crawl-ref/source/mstuff2.cc at line 920 [8.1340842]

B:BD[8.1364102] → [3.2487:2544]

∅:D[3.2544] → [8.1364166:1364168]

B:BD[8.1364166] → [8.1364166:1364168]

B:BD[8.1364168] → [3.2545:2685]

∅:D[3.2685] → [15.400976:400999]

B:BD[15.400976] → [15.400976:400999]

B:BD[15.401051] → [15.401051:401052]

B:BD[15.401052] → [16.1103:1127]

∅:D[16.1127] → [15.401052:401070]

B:BD[15.401052] → [15.401052:401070]

∅:D[15.401070] → [8.1364259:1364384]

B:BD[8.1364259] → [8.1364259:1364384]

B:BD[8.1364384] → [17.13058:13103]

∅:D[17.13103] → [15.401115:401167]

B:BD[8.1364501] → [15.401115:401167]

B:BD[15.401167] → [17.13104:13174]

B:BD[17.13174] → [9.7904:7934]

∅:D[9.7934] → [8.1364546:1364588]

∅:D[17.13174] → [8.1364546:1364588]

∅:D[15.401167] → [8.1364546:1364588]

B:BD[8.1364546] → [8.1364546:1364588]

B:BD[8.1364588] → [17.13175:13219]

∅:D[17.13219] → [15.401211:401261]

B:BD[8.1364706] → [15.401211:401261]

B:BD[15.401261] → [17.13220:13292]

B:BD[17.13292] → [9.7935:7965]

∅:D[9.7965] → [15.401261:401306]

∅:D[17.13292] → [15.401261:401306]

B:BD[15.401261] → [15.401261:401306]

B:BD[15.401306] → [17.13293:13337]

∅:D[17.13337] → [15.401518:401572]

B:BD[15.401518] → [15.401518:401572]

B:BD[15.401572] → [17.13338:13408]

B:BD[17.13408] → [9.7966:7996]

∅:D[9.7996] → [17.13408:13439]

B:BD[17.13408] → [17.13408:13439]

∅:D[17.13439] → [8.1364750:1364766]

∅:D[15.401594] → [8.1364750:1364766]

B:BD[8.1364750] → [8.1364750:1364766]

B:BD[8.1364766] → [15.401595:401626]

B:BD[15.401626] → [17.13440:13485]

∅:D[17.13485] → [15.401841:401896]

B:BD[15.401841] → [15.401841:401896]

B:BD[15.401896] → [17.13486:13558]

B:BD[17.13558] → [9.7997:8027]

∅:D[9.8027] → [18.3016:3101]

∅:D[17.13558] → [18.3016:3101]

B:BD[15.401896] → [18.3016:3101]

B:BD[18.3101] → [17.13559:13614]

∅:D[17.13614] → [18.3218:3273]

B:BD[18.3218] → [18.3218:3273]

B:BD[18.3273] → [17.13615:13689]

B:BD[17.13689] → [9.8028:8067]

∅:D[18.3273] → [15.401896:401933]

∅:D[9.8067] → [15.401896:401933]

∅:D[17.13689] → [15.401896:401933]

B:BD[15.401896] → [15.401896:401933]

B:BD[15.401933] → [19.7394:7395]

∅:D[19.7395] → [8.1364766:1364836]

∅:D[15.401942] → [8.1364766:1364836]

B:BD[8.1364766] → [8.1364766:1364836]

B:BD[8.1364836] → [15.401943:401958]

∅:D[15.401958] → [8.1364836:1364843]

B:BD[8.1364836] → [8.1364836:1364843]

B:BD[8.1364843] → [17.13690:13793]

B:BD[20.9041] → [20.9041:9105]

∅:D[20.9105] → [15.401959:402018]

B:BD[8.1364948] → [15.401959:402018]

B:BD[15.402018] → [20.9106:9188]

∅:D[20.9188] → [8.1364994:1365042]

B:BD[8.1364994] → [8.1364994:1365042]

B:BD[8.1365042] → [20.9189:9253]

∅:D[20.9253] → [19.7396:7397]

B:BD[15.402045] → [19.7396:7397]

B:BD[19.7397] → [21.5728:5864]

∅:D[21.5864] → [20.9391:9623]

B:BD[20.9391] → [20.9391:9623]

B:BD[20.9623] → [3.2686:2727]

∅:D[3.2727] → [22.3961:3967]

∅:D[23.9639] → [22.3961:3967]

∅:D[20.9728] → [22.3961:3967]

B:BD[22.3961] → [22.3961:3967]

B:BD[22.3967] → [23.9640:9836]

B:BD[23.9836] → [24.2538:2628]

B:BD[24.2628] → [20.9729:9747]

∅:D[24.2632] → [23.9872:9896]

∅:D[20.9747] → [23.9872:9896]

B:BD[23.9872] → [23.9872:9896]

∅:D[23.9896] → [22.3991:3997]

B:BD[22.3991] → [22.3991:3997]

B:BD[22.3997] → [23.9897:9899]

∅:D[23.9899] → [8.1365152:1365153]

B:BD[8.1365152] → [8.1365152:1365153]

void setup_dragon(struct monsters *monster, bolt &pbolt)
{
    const int type = (mons_genus(monster->type) == MONS_DRACONIAN)
                            ? draco_subspecies(monster) : monster->type;
    int scaling = 100;
    pbolt.name.clear();
    switch (type)
    {
    case MONS_FIREDRAKE:
    case MONS_HELL_HOUND:
    case MONS_DRAGON:
    case MONS_LINDWURM:
    case MONS_XTAHUA:
        pbolt.name      += "blast of flame";
        pbolt.aux_source = "blast of fiery breath";
        pbolt.flavour    = BEAM_FIRE;
        pbolt.colour     = RED;
        pbolt.range      = 6;
        break;
    case MONS_ICE_DRAGON:
        pbolt.name      += "blast of cold";
        pbolt.aux_source = "blast of icy breath";
        pbolt.flavour    = BEAM_COLD;
        pbolt.colour     = WHITE;
        pbolt.range      = 7;
        break;
    case MONS_RED_DRACONIAN:
        pbolt.name      += "searing blast";
        pbolt.aux_source = "blast of searing breath";
        pbolt.flavour    = BEAM_FIRE;
        pbolt.colour     = RED;
        pbolt.range      = 6;
        scaling          = 65;
        break;
    case MONS_WHITE_DRACONIAN:
        pbolt.name      += "chilling blast";
        pbolt.aux_source = "blast of chilling breath";
        pbolt.flavour    = BEAM_COLD;
        pbolt.colour     = WHITE;
        pbolt.range      = 7;
        scaling = 65;
        break;
    case MONS_PLAYER_GHOST: // draconians only
        pbolt.name      += "blast of negative energy";
        pbolt.aux_source = "blast of draining breath";
        pbolt.flavour    = BEAM_NEG;
        pbolt.colour     = DARKGREY;
        pbolt.range      = LOS_RADIUS;
        scaling = 65;
        break;
    default:
        DEBUGSTR("Bad monster class in setup_dragon()");
        break;
    }
#ifdef DEBUG_DIAGNOSTICS
    mprf( MSGCH_DIAGNOSTICS, "bolt name: '%s'", pbolt.name.c_str() );
#endif
    pbolt.damage      = dice_def( 3, (monster->hit_dice * 2) );
    pbolt.damage.size = scaling * pbolt.damage.size / 100;
    pbolt.type        = dchar_glyph(DCHAR_FIRED_ZAP);
    pbolt.hit         = 30;
    pbolt.beam_source = monster_index(monster);
    pbolt.thrower     = KILL_MON;
    pbolt.is_beam     = true;
    // Accuracy is lowered by one quarter if the dragon is attacking
    // a target that is wielding a weapon of dragon slaying (which
    // makes the dragon/draconian avoid looking at the foe).
    // FIXME: This effect is not yet implemented for player draconians
    // or characters in dragon form breathing at monsters wielding a
    // weapon with this brand.
    if (is_dragonkind(monster, monster))
    {
        if (actor *foe = monster->get_foe())
        {
            if (const item_def *weapon = foe->weapon())
            {
                if (get_weapon_brand(*weapon) == SPWPN_DRAGON_SLAYING)
                {
                    pbolt.hit *= 3;
                    pbolt.hit /= 4;
                }
            }
        }
    }
}

Insertion in crawl-ref/source/mstuff2.cc at line 1388 [8.1340842]

[9.8305]

[8.1375940]


    const int drac_type = (mons_genus(mons->type) == MONS_DRACONIAN)
                            ? draco_subspecies(mons) : mons->type;
    int real_spell = spell_cast;
    if (spell_cast == SPELL_DRACONIAN_BREATH)
    {
        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;

Replacement in crawl-ref/source/mstuff2.cc at line 1414 [8.1340842]

B:BD[8.1375941] → [8.1375941:1375965]

    switch (spell_cast)

[8.1375941]

[8.1375965]

        case MONS_PURPLE_DRACONIAN:
            real_spell = SPELL_ISKENDERUNS_MYSTIC_BLAST;
            break;
        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;
        }
    }
    switch (real_spell)

Insertion in crawl-ref/source/mstuff2.cc at line 1788 [8.1340842]
[8.1383831]
[10.20911]
```
    case SPELL_STICKY_FLAME_SPLASH:
```

Insertion in crawl-ref/source/mstuff2.cc at line 1867 [8.1340842]

[8.1387088]

[10.21182]

    case SPELL_ACID_SPLASH:
        beam.colour   = YELLOW;
        beam.name     = "splash of acid";
        beam.damage   = dice_def( 3, 7 );
        beam.hit      = 20 + (3 * mons->hit_dice);
        beam.type     = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower  = KILL_MON_MISSILE;
        beam.flavour  = BEAM_ACID;
        beam.is_beam  = false;
        break;

Insertion in crawl-ref/source/mstuff2.cc at line 1960 [8.1340842]

[25.20804]

        beam.thrower    = KILL_MON;
        beam.is_beam    = true;
        break;
    case SPELL_FIRE_BREATH:
        beam.name       = "blast of flame";
        beam.aux_source = "blast of fiery breath";
        beam.damage     = dice_def( 3, (mons->hit_dice * 2) );
        beam.colour     = RED;
        beam.type       = dchar_glyph(DCHAR_FIRED_ZAP);

Insertion in crawl-ref/source/mstuff2.cc at line 1971 [8.1340842]
[25.20840]
[25.20840]
```
        beam.hit        = 30;
        beam.flavour    = BEAM_FIRE;
```

Insertion in crawl-ref/source/mstuff2.cc at line 1974 [8.1340842]

[25.20872]

[8.1389294]

        break;
    case SPELL_COLD_BREATH:
        beam.name        = "blast of cold";
        beam.aux_source  = "blast of icy breath";
        beam.damage      = dice_def( 3, (mons->hit_dice * 2) );
        beam.colour      = WHITE;
        beam.type        = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower     = KILL_MON;
        beam.hit         = 30;
        beam.flavour     = BEAM_COLD;
        beam.is_beam     = true;
        break;
    case SPELL_DRACONIAN_BREATH:
        beam.damage      = dice_def( 3, (mons->hit_dice * 2) );
        beam.type        = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower     = KILL_MON;
        beam.hit         = 30;
        beam.is_beam     = true;

Insertion in crawl-ref/source/mstuff2.cc at line 2000 [8.1340842]

[8.1389365]

    if (spell_cast == SPELL_DRACONIAN_BREATH)
    {
        int scaling = 100;
        switch(drac_type)
        {
        case MONS_RED_DRACONIAN:
            beam.name       = "searing blast";
            beam.aux_source = "blast of searing breath";
            scaling         = 65;
            break;
        case MONS_WHITE_DRACONIAN:
            beam.name       = "chilling blast";
            beam.aux_source = "blast of chilling breath";
            scaling         = 65;
            break;
        case MONS_PLAYER_GHOST: // draconians only
            beam.name       = "blast of negative energy";
            beam.aux_source = "blast of draining breath";
            beam.flavour    = BEAM_NEG;
            beam.colour     = DARKGREY;
            scaling         = 65;
            break;
        }
        beam.damage.size = scaling * beam.damage.size / 100;
    }
    // Accuracy is lowered by one quarter if the dragon is attacking
    // a target that is wielding a weapon of dragon slaying (which
    // makes the dragon/draconian avoid looking at the foe).
    // FIXME: This effect is not yet implemented for player draconians
    // or characters in dragon form breathing at monsters wielding a
    // weapon with this brand.
    if (is_dragonkind(mons, mons))
    {
        if (actor *foe = mons->get_foe())
        {
            if (const item_def *weapon = foe->weapon())
            {
                if (get_weapon_brand(*weapon) == SPWPN_DRAGON_SLAYING)
                {
                    beam.hit *= 3;
                    beam.hit /= 4;
                }
            }
        }
    }

Deletion in crawl-ref/source/monstuff.cc at line 77 [8.1396662]
B:BD[26.3003] → [26.3003:3060]
```
static bool _plant_spit(monsters *monster, bolt &pbolt);
```
Insertion in crawl-ref/source/monstuff.cc at line 4717 [8.1396662]
[8.1471423]
[15.422716]
```
    spell_type spell = SPELL_NO_SPELL;
```

Replacement in crawl-ref/source/monstuff.cc at line 4868 [8.1396662]

B:BD[8.1474769] → [26.5818:5865]

            used = _plant_spit(monster, beem);

[8.1474769]

[8.1474815]

        {
            spell = SPELL_ACID_SPLASH;
            setup_mons_cast(monster, beem, spell);
            // Fire tracer.
            fire_tracer(monster, beem);

Insertion in crawl-ref/source/monstuff.cc at line 4875 [8.1396662]

[8.1474816]

            // Good idea?
            if (mons_should_fire(beem))
            {
                _make_mons_stop_fleeing(monster);
                mons_cast(monster, beem, spell);
                mmov.reset();
                used = true;
            }
        }

Insertion in crawl-ref/source/monstuff.cc at line 5038 [8.1396662]
[18.3629]
[27.6288]
```
    // Intentional fallthrough
```

Insertion in crawl-ref/source/monstuff.cc at line 5040 [8.1396662]

[27.6289]

    case MONS_WHITE_DRACONIAN:
    case MONS_RED_DRACONIAN:
        spell = SPELL_DRACONIAN_BREATH;
    // Intentional fallthrough
    case MONS_ICE_DRAGON:
        if (spell == SPELL_NO_SPELL)
            spell = SPELL_COLD_BREATH;
    // Intentional fallthrough

Deletion in crawl-ref/source/monstuff.cc at line 5053 [8.1396662]
B:BD[8.1478046] → [8.1478046:1478072]
```
    case MONS_ICE_DRAGON:
```

Replacement in crawl-ref/source/monstuff.cc at line 5056 [8.1396662]

B:BD[8.1478143] → [15.423374:423434]

    case MONS_WHITE_DRACONIAN:
    case MONS_RED_DRACONIAN:

[8.1478143]

[2.2662]

        if (spell == SPELL_NO_SPELL)
            spell = SPELL_FIRE_BREATH;

Replacement in crawl-ref/source/monstuff.cc at line 5068 [8.1396662]
B:BD[8.1478390] → [8.1478390:1478431]
```
            setup_dragon(monster, beem);
```
[8.1478390]
[8.1478431]
```
            setup_mons_cast(monster, beem, spell);
```
Replacement in crawl-ref/source/monstuff.cc at line 5077 [8.1396662]
∅:D[28.6845] → [29.7401:7469]
B:BD[8.1478580] → [29.7401:7469]
∅:D[29.7469] → [8.1478643:1478676]
∅:D[15.423543] → [8.1478643:1478676]
B:BD[8.1478643] → [8.1478643:1478676]
```
                simple_monster_message(monster, " breathes.", spl);
                fire_beam(beem);
```
[28.6845]
[13.27597]
```
                mons_cast(monster, beem, spell);
```

Deletion in crawl-ref/source/monstuff.cc at line 5573 [8.1396662]

B:BD[15.424773] → [15.424773:424808]

B:BD[15.424808] → [10.22088:22137]

∅:D[10.22137] → [15.424854:424908]

B:BD[15.424854] → [15.424854:424908]

B:BD[15.424908] → [10.22138:22183]

∅:D[10.22183] → [15.424950:425005]

B:BD[15.424950] → [15.424950:425005]

B:BD[15.425005] → [10.22184:22234]

∅:D[10.22234] → [15.425049:425105]

B:BD[15.425049] → [15.425049:425105]

B:BD[15.425105] → [10.22235:22294]

∅:D[10.22294] → [15.425147:425204]

B:BD[15.425147] → [15.425147:425204]

B:BD[15.425204] → [10.22295:22342]

∅:D[10.22342] → [15.425248:425268]

B:BD[15.425248] → [15.425248:425268]

        case MONS_BLACK_DRACONIAN:
            draco_breath = SPELL_LIGHTNING_BOLT;
            break;
        case MONS_PALE_DRACONIAN:
            draco_breath = SPELL_STEAM_BALL;
            break;
        case MONS_GREEN_DRACONIAN:
            draco_breath = SPELL_POISONOUS_CLOUD;
            break;
        case MONS_PURPLE_DRACONIAN:
            draco_breath = SPELL_ISKENDERUNS_MYSTIC_BLAST;
            break;
        case MONS_MOTTLED_DRACONIAN:
            draco_breath = SPELL_STICKY_FLAME;
            break;

Replacement in crawl-ref/source/monstuff.cc at line 5575 [8.1396662]

B:BD[15.425367] → [15.425367:425507]

        case MONS_RED_DRACONIAN:        // already handled as ability
        case MONS_WHITE_DRACONIAN:      // already handled as ability

[15.425367]

[15.425507]

            break;

Insertion in crawl-ref/source/monstuff.cc at line 5577 [8.1396662]
[15.425524]
[15.425524]
```
            draco_breath = SPELL_DRACONIAN_BREATH;
```

Deletion in crawl-ref/source/monstuff.cc at line 5609 [8.1396662]

B:BD[15.426220] → [26.6333:6509]

∅:D[26.6509] → [10.22601:22603]

B:BD[10.22601] → [10.22601:22603]

B:BD[10.22603] → [29.7817:7977]

B:BD[29.7977] → [27.6844:6860]

∅:D[27.6860] → [10.22666:22672]

B:BD[10.22666] → [10.22666:22672]

B:BD[10.22672] → [5.9906:9946]

∅:D[5.9946] → [10.22714:22724]

B:BD[10.22714] → [10.22714:22724]

B:BD[10.22724] → [5.9947:10063]

∅:D[5.10063] → [10.23198:23212]

B:BD[10.23198] → [10.23198:23212]

B:BD[10.23212] → [5.10064:10155]

∅:D[29.9090] → [10.26790:26808]

∅:D[5.10155] → [10.26790:26808]

B:BD[10.26790] → [10.26790:26808]

B:BD[10.26808] → [5.10156:10249]

∅:D[5.10249] → [10.27032:27050]

B:BD[10.27032] → [10.27032:27050]

∅:D[30.689] → [10.28011:28025]

B:BD[10.28011] → [10.28011:28025]

B:BD[10.28272] → [10.28272:28282]

B:BD[10.28282] → [5.10250:10326]

∅:D[5.10326] → [10.28282:28289]

B:BD[10.28282] → [10.28282:28289]

B:BD[10.28289] → [5.10327:10347]

∅:D[5.10347] → [10.28308:28311]

B:BD[10.28308] → [10.28308:28311]

static bool _mons_announce_cast(monsters *monster, bool nearby,
                                spell_type spell_cast,
                                spell_type draco_breath)
{
    const msg_channel_type spl = (mons_friendly(monster) ? MSGCH_FRIEND_SPELL
                                                         : MSGCH_MONSTER_SPELL);
    if (nearby)
    {
        if (spell_cast == draco_breath)
        {
            if (simple_monster_message(monster, " breathes.", spl))
                return (true);
            else
            {
                if (!silenced(monster->pos())
                    && !silenced(you.pos()))
                {
                    mpr("You hear a roar.", MSGCH_SOUND);
                    return (true);
                }
            }
        }
        else if (monster->type == -1)
            monster->hit_points = -1;
    }
    return (false);
}

Deletion in crawl-ref/source/monstuff.cc at line 5635 [8.1396662]

B:BD[8.1490534] → [5.10348:10517]

    // Geryon can't summon beasts if he's silenced since he uses a horn,
    // and we have to check for him explicitly since he's neither a priest
    // nor a wizard.

Replacement in crawl-ref/source/monstuff.cc at line 5636 [8.1396662]

B:BD[5.10550] → [5.10550:10667]

        && (monster->type == MONS_GERYON
            || mons_class_flag(monster->type, M_PRIEST | M_ACTUAL_SPELLS)))

[5.10550]

[5.10667]

        && mons_class_flag(monster->type,
                           M_PRIEST | M_ACTUAL_SPELLS | M_SPELL_NO_SILENT))

Replacement in crawl-ref/source/monstuff.cc at line 5916 [8.1396662]

B:BD[8.1498226] → [5.10705:10853]

        const bool did_noise = 
            _mons_announce_cast(monster, monsterNearby,
                                 spell_cast, draco_breath);

[8.1498226]

[19.9254]

        if (monster->type == MONS_BALL_LIGHTNING)
            monster->hit_points = -1;

Replacement in crawl-ref/source/monstuff.cc at line 5925 [8.1396662]

B:BD[15.428402] → [5.10854:10950]

                if (!did_noise)
                    mons_cast_noise(monster, beem, spell_cast);

[15.428402]

[5.10950]

                mons_cast_noise(monster, beem, spell_cast);

Replacement in crawl-ref/source/monstuff.cc at line 5940 [8.1396662]

B:BD[27.7364] → [5.10952:11014]

            mons_cast(monster, beem, spell_cast, !did_noise);

[27.7364]

[13.28258]

            mons_cast(monster, beem, spell_cast);

Deletion in crawl-ref/source/monstuff.cc at line 7927 [8.1396662]
B:BD[8.1547088] → [26.10873:10935]
∅:D[31.314] → [8.1547158:1547160]
∅:D[32.2905] → [8.1547158:1547160]
∅:D[26.10935] → [8.1547158:1547160]
B:BD[8.1547158] → [8.1547158:1547160]
B:BD[8.1547160] → [33.3318:3404]
B:BD[33.3404] → [9.8402:8484]
∅:D[9.8484] → [33.3458:3525]
B:BD[33.3458] → [33.3458:3525]
∅:D[33.3525] → [8.1547413:1547461]
B:BD[8.1547413] → [8.1547413:1547461]
B:BD[8.1547461] → [33.3526:3664]
∅:D[33.3664] → [15.447043:447073]
B:BD[8.1547582] → [15.447043:447073]
B:BD[15.447073] → [31.315:317]
∅:D[31.317] → [8.1547611:1547612]
∅:D[15.447073] → [8.1547611:1547612]
B:BD[8.1547611] → [8.1547611:1547612]
B:BD[8.1547612] → [26.10936:10992]
∅:D[26.10992] → [31.373:375]
B:BD[31.373] → [31.373:375]
B:BD[31.375] → [26.10993:11020]
∅:D[26.11020] → [31.401:436]
B:BD[31.401] → [31.401:436]
B:BD[31.436] → [26.11021:11060]
∅:D[26.11060] → [31.474:475]
B:BD[31.474] → [31.474:475]
B:BD[31.475] → [27.8376:8396]
∅:D[27.8396] → [8.1547631:1547704]
B:BD[8.1547631] → [8.1547631:1547704]
B:BD[8.1547704] → [28.8471:8513]
∅:D[28.8513] → [8.1547704:1547745]
B:BD[8.1547704] → [8.1547704:1547745]
B:BD[8.1547745] → [34.53354:53393]
∅:D[34.53393] → [8.1547817:1547985]
B:BD[8.1547817] → [8.1547817:1547985]
B:BD[8.1547985] → [26.11061:11086]
∅:D[26.11086] → [8.1548009:1548016]
B:BD[8.1548009] → [8.1548009:1548016]
B:BD[8.1548016] → [26.11087:11110]
B:BD[26.11110] → [27.8397:8399]
∅:D[27.8399] → [8.1548090:1548091]
B:BD[8.1548090] → [8.1548090:1548091]
```
static void _setup_plant_spit(monsters *monster, bolt &pbolt)
{
    pbolt.name        = "acid";
    pbolt.type        = dchar_glyph(DCHAR_FIRED_ZAP);
    // immobile plants get long-range spit...
    pbolt.range       = LOS_RADIUS;
    pbolt.colour      = YELLOW;
    pbolt.flavour     = BEAM_ACID;
    pbolt.beam_source = monster_index(monster);
    pbolt.damage      = dice_def( 3, 7 );
    pbolt.hit         = 20 + (3 * monster->hit_dice);
    pbolt.thrower     = KILL_MON_MISSILE;
    pbolt.aux_source.clear();
}
static bool _plant_spit(monsters *monster, bolt &pbolt)
{
    bool did_spit = false;
    char spit_string[INFO_SIZE];
    _setup_plant_spit(monster, pbolt);
    // Fire tracer.
    fire_tracer(monster, pbolt);
    if (mons_should_fire(pbolt))
    {
        _make_mons_stop_fleeing(monster);
        strcpy( spit_string, " spits" );
        if (pbolt.target == you.pos())
            strcat( spit_string, " at you" );
        strcat( spit_string, "." );
        simple_monster_message( monster, spit_string );
        fire_beam( pbolt );
        did_spit = true;
    }
    return (did_spit);
}
```

Replacement in crawl-ref/source/mon-util.h at line 145 [8.1682293]

B:BD[11.68630] → [11.68630:68692]

    M_NO_SKELETON       = (1<<29),        // boneless corpses

[11.68630]

[11.68692]

    M_SPELL_NO_SILENT   = (1<<28),        // cannot cast spells when silenced,
                                          // even though it's not a priest or
                                          // wizard
    M_NOISY_SPELLS      = (1<<29),        // can cast spells when silenced, but
                                          // casting makes noise when not
                                          // silenced
    M_NO_SKELETON       = (1<<30),        // boneless corpses

Replacement in crawl-ref/source/mon-spll.h at line 357 [8.1750895]
∅:D[35.1994] → [10.38536:38590]
B:BD[8.1756343] → [10.38536:38590]
```
       SPELL_STICKY_FLAME,
       SPELL_STICKY_FLAME,
```
[35.1994]
[10.38590]
```
       SPELL_STICKY_FLAME_SPLASH,
       SPELL_STICKY_FLAME_SPLASH,
```

Replacement in crawl-ref/source/mon-spll.h at line 360 [8.1750895]

B:BD[10.38613] → [10.38613:38667]

       SPELL_STICKY_FLAME,
       SPELL_STICKY_FLAME,

[10.38613]

[28.9525]

       SPELL_STICKY_FLAME_SPLASH,
       SPELL_STICKY_FLAME_SPLASH,

Replacement in crawl-ref/source/mon-spll.h at line 885 [8.1750895]
∅:D[35.4196] → [10.46434:46488]
B:BD[8.1764208] → [10.46434:46488]
```
       SPELL_STICKY_FLAME,
       SPELL_STICKY_FLAME,
```
[35.4196]
[10.46488]
```
       SPELL_STICKY_FLAME_SPLASH,
       SPELL_STICKY_FLAME_SPLASH,
```
Replacement in crawl-ref/source/mon-data.h at line 1650 [8.1826214]
B:BD[36.2778] → [36.2778:2798]
```
        | M_SPEAKS,
```
[36.2778]
[37.47185]
```
        | M_SPEAKS | M_NOISY_SPELLS,
```

Replacement in crawl-ref/source/mon-data.h at line 4002 [8.1826214]

B:BD[37.121755] → [37.121755:121819]

    M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS | M_UNIQUE,

[37.121755]

[37.121819]

    M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS | M_UNIQUE
        | M_NOISY_SPELLS,

Insertion in crawl-ref/source/enum.h at line 2781 [8.3287960]

[10.52493]

[38.3170]

    SPELL_ACID_SPLASH,
    SPELL_STICKY_FLAME_SPLASH,         // 225
    SPELL_FIRE_BREATH,
    SPELL_COLD_BREATH,
    SPELL_DRACONIAN_BREATH,

Insertion in crawl-ref/source/dat/database/monspell.txt at line 4 [5.11984]

[5.12114]

%%%%
Acid Splash cast
@The_monster@ spits acid at @target@.
%%%%
Acid Splash cast unseen
You hear a spitting sound.
%%%%
Draconian Breath cast
@The_monster@ breathes.
%%%%
Draconian Breath cast unseen
You hear a roar.

Replacement in crawl-ref/source/dat/database/monspell.txt at line 23 [5.11984]
B:BD[5.12139] → [5.12139:12167]
```
@The_monster@ spits poison.
```
[5.12139]
[5.12167]
```
@The_monster@ spits poison at @target@.
```

Insertion in crawl-ref/source/dat/database/monspell.txt at line 29 [5.11984]

[5.12231]

Sticky Flame Splash cast
@The_monster@ spits sticky flame at @target@.
%%%%
Sticky Flame Splash cast unseen
You hear a spitting sound.
%%%%

Got rid of setup_dragon(), moving it's functionality into setup_mons_cast() and

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-data.h at line 2727 [8.268152]

Replacement in crawl-ref/source/spl-data.h at line 2731 [8.268152]

Insertion in crawl-ref/source/spl-data.h at line 2838 [8.268152]

Insertion in crawl-ref/source/spl-data.h at line 2855 [8.268152]

Replacement in crawl-ref/source/spl-cast.h at line 35 [8.291319]

Deletion in crawl-ref/source/mstuff2.h at line 20 [8.1336995]

Insertion in crawl-ref/source/mstuff2.cc at line 39 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 507 [8.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 541 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 546 [8.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 550 [8.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 553 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 560 [8.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 562 [8.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 579 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 651 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 669 [8.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 920 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1388 [8.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1414 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1788 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1867 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1960 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1971 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1974 [8.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 2000 [8.1340842]

Deletion in crawl-ref/source/monstuff.cc at line 77 [8.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4717 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4868 [8.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4875 [8.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5038 [8.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5040 [8.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 5053 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5056 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5068 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5077 [8.1396662]