fiddlerwoaroof/crawl - Change KYCC2MDIHIIDWZ25NTSCVO3CWSF7PX5XV3VRNVXJBXFM5ASY7NGAC

Beams can be assigned custom hit verbs now

If a beam is not, old behavior is default.

Created by abrahamwl on October 28, 2009

KYCC2MDIHIIDWZ25NTSCVO3CWSF7PX5XV3VRNVXJBXFM5ASY7NGAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/effects.cc at line 411 [4.3382105]
B:BD[3.5594] → [3.5594:5639]
```
    const char *aux = "arcing electricity";
```

Replacement in crawl-ref/source/effects.cc at line 418 [4.3382105]

B:BD[3.5874] → [3.5874:5940]

    beam.colour        = LIGHTCYAN;
    beam.aux_source    = aux;

[3.5874]

[3.5940]

    beam.hit_verb      = "shocks";
    beam.colour        = ETC_ELECTRICITY;
    beam.aux_source    = "arcing electricity";

Insertion in crawl-ref/source/beam.h at line 86 [4.4124541]

[5.5416]

[6.106247]

    std::string hit_verb;              // The verb to use when this beam hits
                                       // something. If not set, will use
                                       // "engulfs" if an explosion or cloud
                                       // and "hits" otherwise.

Replacement in crawl-ref/source/beam.cc at line 3956 [4.4128068]

B:BD[7.43647] → [7.43647:43704]

B:BD[7.43704] → [8.5003:5084]

    const bool engulfs = (is_explosion || is_big_cloud);
    mprf("The %s %s you!",
         name.c_str(), engulfs ? "engulfs" : "hits");

[7.43647]

[4.4230983]

    const bool engulfs = is_explosion || is_big_cloud;
    if (hit_verb.empty())
    {
        hit_verb = engulfs ? "engulfs" : "hits";
    }
    mprf("The %s %s you!", name.c_str(), hit_verb.c_str());

Insertion in crawl-ref/source/beam.cc at line 4742 [4.4128068]

[4.4239959]

[9.1250016]

        if (hit_verb.empty())
        {
            hit_verb = (is_explosion || is_big_cloud)
                    ? "engulfs" : "hits";
        }

Replacement in crawl-ref/source/beam.cc at line 4749 [4.4128068]
B:BD[7.58129] → [8.5208:5251]
```
             engulfs ? "engulfs" : "hits",
```
[7.58129]
[2.3799]
```
             hit_verb.c_str(),
```

Replacement in crawl-ref/source/beam.cc at line 5799 [4.4128068]

B:BD[10.19796] → [5.7239:7314]

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

[10.19796]

[10.19857]

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