diff options
| author | reaverb <reaverb.Crawl@gmail.com> | 2014-06-11 16:41:10 -0400 |
|---|---|---|
| committer | reaverb <reaverb.Crawl@gmail.com> | 2014-06-11 17:34:05 -0400 |
| commit | 16b496fb2919fe1aa9923fed4653cfcc7b6c2f4b (patch) | |
| tree | 8b6544b2bb2165243da23e58c8ee1fef8cab9782 /crawl-ref/source/beam.cc | |
| parent | 8cb171325177e01f64fa4477e967cad611ddfb83 (diff) | |
| download | crawl-ref-16b496fb2919fe1aa9923fed4653cfcc7b6c2f4b.tar.gz crawl-ref-16b496fb2919fe1aa9923fed4653cfcc7b6c2f4b.zip | |
Rename BEAM_NAPALM to BEAM_STICKY_FLAME
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index fc8d7d5763..08afcda4c1 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -529,7 +529,7 @@ static beam_type _chaos_beam_flavour(bolt* beam) 10, BEAM_NEG, 10, BEAM_ACID, 10, BEAM_HELLFIRE, - 10, BEAM_NAPALM, + 10, BEAM_STICKY_FLAME, 10, BEAM_SLOW, 10, BEAM_HASTE, 10, BEAM_MIGHT, @@ -680,7 +680,7 @@ void bolt::apply_beam_conducts() break; case BEAM_FIRE: case BEAM_HOLY_FLAME: - case BEAM_NAPALM: + case BEAM_STICKY_FLAME: did_god_conduct(DID_FIRE, is_beam || is_explosion ? 6 + random2(3) : 2 + random2(3), @@ -3228,7 +3228,7 @@ bool bolt::harmless_to_player() const case BEAM_FIRE: case BEAM_HELLFIRE: case BEAM_HOLY_FLAME: - case BEAM_NAPALM: + case BEAM_STICKY_FLAME: return you.species == SP_DJINNI; #endif @@ -6592,7 +6592,7 @@ static string _beam_type_name(beam_type type) 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_STICKY_FLAME: return "sticky fire"; case BEAM_STEAM: return "steam"; case BEAM_ENERGY: return "energy"; case BEAM_HOLY: return "holy energy"; |