fiddlerwoaroof/crawl - Change AJHVP42Y67SB4NKFMZB24524PGX2XA5WLFNEFV52MIGTS47ALMVQC

Dragons and draconians now give a breath message of "breathes @beam@ at

@target@." instead of merely "breathes."

If an invisible monster on a square visible to the player fires a visible beam then give a message to the player about it.

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

Created by zelgadis on December 14, 2008

AJHVP42Y67SB4NKFMZB24524PGX2XA5WLFNEFV52MIGTS47ALMVQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/mstuff2.cc at line 654 [5.1340842]
B:BD[4.5665] → [4.5665:5666]

Insertion in crawl-ref/source/mstuff2.cc at line 671 [5.1340842]

[6.9139]

    // Don't check for pbolt.seen, since we get called before the beam is
	// fired.
    std::string beam_name;
    if (pbolt.flavour <= BEAM_NONE
        || pbolt.flavour >= NUM_BEAMS
        || pbolt.name.empty())
    {
        beam_name = "INVALID BEAM";
    }
    else if (pbolt.type == 0 || pbolt.name[0] == '0')
        beam_name = "INVISIBLE BEAM";
    else
        beam_name = pbolt.get_short_name();
    msg = replace_all(msg, "@beam@", beam_name);

Insertion in crawl-ref/source/mstuff2.cc at line 800 [5.1340842]
[7.3023]
[7.3023]
```
    pbolt.short_name     = theBeam.short_name;
```

Replacement in crawl-ref/source/mstuff2.cc at line 1773 [5.1340842]

B:BD[8.20860] → [9.14681:14760]

B:BD[5.1382715] → [9.14788:15054]

        beam.colour   = LIGHTMAGENTA;
        beam.name     = "orb of energy";
        beam.damage   = dice_def( 3, 7 + (power / 14) );
        beam.hit      = 20 + (power / 20);
        beam.type     = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower  = KILL_MON_MISSILE;
        beam.flavour  = BEAM_MMISSILE;
        beam.is_beam  = false;

[8.20860]

[5.1382944]

        beam.colour     = LIGHTMAGENTA;
        beam.name       = "orb of energy";
        beam.short_name = "energy";
        beam.damage     = dice_def( 3, 7 + (power / 14) );
        beam.hit        = 20 + (power / 20);
        beam.type       = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower    = KILL_MON_MISSILE;
        beam.flavour    = BEAM_MMISSILE;
        beam.is_beam    = false;

Replacement in crawl-ref/source/mstuff2.cc at line 1830 [5.1340842]

B:BD[8.21046] → [9.16434:16508]

B:BD[5.1385240] → [9.16536:16827]

        beam.colour   = YELLOW;
        beam.name     = "bolt of energy";
        beam.damage   = dice_def( 3, 20 );
        beam.hit      = 15 + power / 30;
        beam.type     = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower  = KILL_MON_MISSILE;
        beam.flavour  = BEAM_NUKE;     // a magical missile which destroys walls
        beam.is_beam  = true;

[8.21046]

[5.1385480]

        beam.colour     = YELLOW;
        beam.name       = "bolt of energy";
        beam.short_name = "energy";
        beam.damage     = dice_def( 3, 20 );
        beam.hit        = 15 + power / 30;
        beam.type       = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower    = KILL_MON_MISSILE;
        beam.flavour    = BEAM_NUKE; // a magical missile which destroys walls
        beam.is_beam    = true;

Replacement in crawl-ref/source/mstuff2.cc at line 1932 [5.1340842]

B:BD[8.21375] → [9.19351:19434]

B:BD[5.1388046] → [9.19462:19712]

        beam.colour   = random_colour();
        beam.name     = "bolt of energy";
        beam.damage   = dice_def( 3, 25 );
        beam.hit      = 16 + power / 25;
        beam.type     = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower  = KILL_MON_MISSILE;
        beam.flavour  = BEAM_MMISSILE;
        beam.is_beam  = false;

[8.21375]

[5.1388245]

        beam.colour     = random_colour();
        beam.name       = "bolt of energy";
        beam.short_name = "energy";
        beam.damage     = dice_def( 3, 25 );
        beam.hit        = 16 + power / 25;
        beam.type       = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower    = KILL_MON_MISSILE;
        beam.flavour    = BEAM_MMISSILE;
        beam.is_beam    = false;

Replacement in crawl-ref/source/mstuff2.cc at line 1957 [5.1340842]

B:BD[8.21464] → [9.20151:20203]

B:BD[5.1388801] → [9.20231:20511]

        beam.name     = "spray of metal splinters";
        beam.damage   = dice_def( 3, 20 + power / 20 );
        beam.colour   = CYAN;
        beam.type     = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower  = KILL_MON;
        beam.flavour  = BEAM_FRAG;
        beam.hit      = 19 + power / 30;
        beam.is_beam  = true;

[8.21464]

[5.1389051]

        beam.name       = "spray of metal splinters";
        beam.short_name = "metal splinters";
        beam.damage     = dice_def( 3, 20 + power / 20 );
        beam.colour     = CYAN;
        beam.type       = dchar_glyph(DCHAR_FIRED_ZAP);
        beam.thrower    = KILL_MON;
        beam.flavour    = BEAM_FRAG;
        beam.hit        = 19 + power / 30;
        beam.is_beam    = true;

Replacement in crawl-ref/source/mstuff2.cc at line 1997 [5.1340842]

B:BD[4.8336] → [4.8336:8724]

        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;

[4.8336]

[4.8724]

        beam.name       = "blast of cold";
        beam.aux_source = "blast of icy breath";
        beam.short_name = "frost";
        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;

Insertion in crawl-ref/source/mstuff2.cc at line 2035 [5.1340842]
[4.9443]
[4.9443]
```
            beam.short_name = "frost";
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 15 [6.11984]
B:BD[4.13240] → [4.13240:13264]
```
@The_monster@ breathes.
```
[4.13240]
[4.13264]
```
@The_monster@ breathes @beam@ at @target@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 81 [6.11984]
B:BD[6.13139] → [3.2701:2725]
```
@The_monster@ breathes.
```
[6.13139]
[6.13162]
```
@The_monster@ breathes @beam@ at @target@.
```
Insertion in crawl-ref/source/beam.h at line 57 [5.4124541]
[10.106247]
[10.106247]
```
    std::string short_name;
```
Insertion in crawl-ref/source/beam.h at line 80 [5.4124541]
[10.107259]
[10.107259]
```
    bool        seen;                  // Has player seen the beam?
```

Insertion in crawl-ref/source/beam.h at line 123 [5.4124541]

[11.8208]

[10.108444]


    // Returns member short_name if set, otherwise some reasonble string
    // for a short name, most likely the name of the beam's flavour.
    std::string get_short_name();

Insertion in crawl-ref/source/beam.h at line 172 [5.4124541]
[12.6578]
[13.1219941]
```
std::string beam_type_name(beam_type type);
```
Insertion in crawl-ref/source/beam.cc at line 217 [5.4128068]
[12.6777]
[14.17349]
```
    beam.seen           = false;             // not seen yet
```
Insertion in crawl-ref/source/beam.cc at line 292 [5.4128068]
[12.6829]
[12.6829]
```
    pbolt.seen          = false;
```

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

[12.7090]


    // Haven't seen it yet in the actual firing.
    pbolt.seen = false;

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

[5.4169482]

[2.18079]

    ASSERT(!pbolt.name.empty());
    ASSERT(pbolt.flavour > BEAM_NONE && pbolt.flavour < NUM_BEAMS);
    ASSERT(!pbolt.drop_item || pbolt.item);
    ASSERT(!pbolt.dropped_item);

Replacement in crawl-ref/source/beam.cc at line 1544 [5.4128068]

B:BD[12.7633] → [12.7633:7680]

        // We aren't being recursively called.

[12.7633]

[12.7680]

        // We aren't being recursively called, so initialize some stuff.

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

[12.7746]


        // pbolt.seen might be set by caller to supress this.
        if (!pbolt.seen && see_grid(pbolt.source) && pbolt.range > 0
            && pbolt.type != 0 && pbolt.name[0] != '0')
        {
            pbolt.seen = true;
            int midx = mgrd(pbolt.source);
            if (!pbolt.is_tracer && !YOU_KILL(pbolt.thrower)
                && !crawl_state.is_god_acting()
                && (midx == NON_MONSTER || !you.can_see(&menv[midx])))
            {
                mprf("%s appears from out of thin air!",
                     article_a(pbolt.name, false).c_str());
            }
        }

Deletion in crawl-ref/source/beam.cc at line 1567 [5.4128068]
B:BD[12.7852] → [12.7852:7929]
```
    ASSERT(!pbolt.drop_item || pbolt.item);
    ASSERT(!pbolt.dropped_item);
```

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

[5.4175688]

[15.14479]


        const bool was_seen = pbolt.seen;
        if (!was_seen && pbolt.range > 0 && pbolt.type != 0
            && pbolt.name[0] != '0' && see_grid(testpos))
        {
            pbolt.seen = true;
        }
        if (!was_seen && pbolt.seen && !pbolt.is_tracer)
        {
            mprf("%s appears from out of your range of vision.",
                 article_a(pbolt.name, false).c_str());
        }

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

[12.10124]

[5.4200887]


    // Hasn't been seen yet in the real firing.
    pbolt.seen        = false;

Replacement in crawl-ref/source/beam.cc at line 5738 [5.4128068]

B:BD[2.19796] → [2.19796:19857]

               beam_source(MHITNOT), name(), is_beam(false),

[2.19796]

[2.19857]

               beam_source(MHITNOT), name(), short_name(), is_beam(false),

Replacement in crawl-ref/source/beam.cc at line 5745 [5.4128068]

B:BD[12.15447] → [12.15447:15517]

∅:D[16.882] → [17.1322:1445]

∅:D[12.15517] → [17.1322:1445]

B:BD[17.1322] → [17.1322:1445]

B:BD[17.1445] → [18.4533:4603]

B:BD[18.4603] → [19.4865:4925]

               range_used(0), is_tracer(false), aimed_at_feet(false),
               msg_generated(false), in_explosion_phase(false),
               smart_monster(false), can_see_invis(false),
               attitude(ATT_HOSTILE), foe_ratio(0), chose_ray(false),
               beam_cancelled(false), dont_stop_foe(false),

[12.15447]

[12.15518]

               seen(false), range_used(0), is_tracer(false),
               aimed_at_feet(false), msg_generated(false),
               in_explosion_phase(false), smart_monster(false),
               can_see_invis(false), attitude(ATT_HOSTILE), foe_ratio(0),
               chose_ray(false), beam_cancelled(false), dont_stop_foe(false),

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

[11.13630]

[5.4260380]

}
std::string bolt::get_short_name()
{
    if (!short_name.empty())
        return (short_name);
    if (item != NULL && is_valid_item(*item))
        return item->name(DESC_NOCAP_A, false, false, false, false,
                          ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK 
                          | ISFLAG_RACIAL_MASK);
    if (real_flavour == BEAM_RANDOM || real_flavour == BEAM_CHAOS)
        flavour = real_flavour;
    if (flavour == BEAM_FIRE && name == "sticky fire")
        return ("sticky fire");
    if (flavour == BEAM_ELECTRICITY && is_beam)
        return ("lightning");
    if (flavour == BEAM_NONE || flavour == BEAM_MISSILE
        || flavour == BEAM_MMISSILE)
    {
        return (name);
    }
    return beam_type_name(flavour);
}
std::string beam_type_name(beam_type type)
{
    switch(type)
    {
    case BEAM_NONE: return("none");
    case BEAM_MISSILE: return("missile");
    case BEAM_MMISSILE: return("magic missile");
    case BEAM_POTION_FIRE:
    case BEAM_FIRE: return("fire");
    case BEAM_POTION_COLD:
    case BEAM_COLD: return("cold");
    case BEAM_MAGIC: return("magic");
    case BEAM_ELECTRICITY: return("electricity");
    case BEAM_POTION_STINKING_CLOUD:
    case BEAM_POTION_POISON:
    case BEAM_POISON: return("poison");
    case BEAM_NEG: return("negative energy");
    case BEAM_ACID: return("acid");
    case BEAM_MIASMA:
    case BEAM_POTION_MIASMA: return("miasma");
    case BEAM_SPORE: return("spores");
    case BEAM_POISON_ARROW: return("poison arrow");
    case BEAM_HELLFIRE: return("hellfire");
    case BEAM_NAPALM: return("sticky fire");
    case BEAM_POTION_STEAM:
    case BEAM_STEAM: return("steam");
    case BEAM_HELLFROST: return("hellfrost");
    case BEAM_ENERGY: return("energy");
    case BEAM_HOLY: return("holy power");
    case BEAM_FRAG: return("fragments");
    case BEAM_LAVA: return("magma");
    case BEAM_ICE: return("ice");
    case BEAM_NUKE: return("nuke");
    case BEAM_RANDOM: return("random");
    case BEAM_CHAOS: return("chaos");
    case BEAM_SLOW: return("slow");
    case BEAM_HASTE: return("haste");
    case BEAM_HEALING: return("healing");
    case BEAM_PARALYSIS: return("paralysis");
    case BEAM_CONFUSION: return("confusion");
    case BEAM_INVISIBILITY: return("invisibility");
    case BEAM_DIGGING: return("digging");
    case BEAM_TELEPORT: return("teleportation");
    case BEAM_POLYMORPH: return("polymorph");
    case BEAM_CHARM: return("enslave");
    case BEAM_BANISH: return("banishment");
    case BEAM_DEGENERATE: return("degenration");
    case BEAM_ENSLAVE_UNDEAD: return("enslave undead");
    case BEAM_ENSLAVE_SOUL: return("enslave soul");
    case BEAM_PAIN: return("pain");
    case BEAM_DISPEL_UNDEAD: return("dispel undead");
    case BEAM_DISINTEGRATION: return("disintegration");
    case BEAM_ENSLAVE_DEMON: return("enlsave demon");
    case BEAM_BLINK: return("blink");
    case BEAM_PETRIFY: return("petrify");
    case BEAM_BACKLIGHT: return("backlight");
    case BEAM_SLEEP: return("sleep");
    case BEAM_POTION_BLACK_SMOKE: return("black smoke");
    case BEAM_POTION_GREY_SMOKE: return("grey smoke");
    case BEAM_POTION_BLUE_SMOKE: return("blue smoke");
    case BEAM_POTION_PURP_SMOKE: return("purple smoke");
    case BEAM_POTION_RANDOM: return("random potion");
    case BEAM_TORMENT_DAMAGE: return("torment damage");
    case BEAM_STEAL_FOOD: return("steal food");
    case BEAM_LINE_OF_SIGHT: return("line of sight");
    case NUM_BEAMS:
        DEBUGSTR("invalid beam type");
        return("INVALID");
    }
    DEBUGSTR("unknown beam type");
    return("UNKNOWN");

Dragons and draconians now give a breath message of "breathes @beam@ at

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/mstuff2.cc at line 654 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 671 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 800 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1773 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1830 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1932 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1957 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1997 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 2035 [5.1340842]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 15 [6.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 81 [6.11984]

Insertion in crawl-ref/source/beam.h at line 57 [5.4124541]

Insertion in crawl-ref/source/beam.h at line 80 [5.4124541]