diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-22 18:05:50 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-22 18:05:50 +0000 |
| commit | 03d0dc004fc0e97aea58665ea1b09f61afbf34f4 (patch) | |
| tree | fbb5427aa24920bb0d55bf527f8ca75ac838cead /crawl-ref/source/item_use.cc | |
| parent | 2f0b704c918d91c1fccbb040dd1a472491b56ea8 (diff) | |
| download | crawl-ref-03d0dc004fc0e97aea58665ea1b09f61afbf34f4.tar.gz crawl-ref-03d0dc004fc0e97aea58665ea1b09f61afbf34f4.zip | |
For consistency with branded missile weapons, make branded missiles "of
flame" and "of frost" rather than "of flame" and "of ice".
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8697 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 4e0e941b9d..9b98b02c18 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1679,7 +1679,7 @@ bool elemental_missile_beam(int launcher_brand, int ammo_brand) return (true); int element = (launcher_brand == SPWPN_FROST - + ammo_brand == SPMSL_ICE + + ammo_brand == SPMSL_FROST - launcher_brand == SPWPN_FLAME - ammo_brand == SPMSL_FLAME); @@ -2033,7 +2033,7 @@ void setup_missile_beam(const actor *agent, bolt &beam, item_def &item, ammo.special = SPMSL_CHAOS; } else if ((bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME) - && ammo_brand != SPMSL_ICE && bow_brand != SPWPN_FROST) + && ammo_brand != SPMSL_FROST && bow_brand != SPWPN_FROST) { beam.flavour = BEAM_FIRE; beam.name = "flame"; @@ -2041,14 +2041,14 @@ void setup_missile_beam(const actor *agent, bolt &beam, item_def &item, ammo.special = SPMSL_FLAME; } - else if ((bow_brand == SPWPN_FROST || ammo_brand == SPMSL_ICE) + else if ((bow_brand == SPWPN_FROST || ammo_brand == SPMSL_FROST) && ammo_brand != SPMSL_FLAME && bow_brand != SPWPN_FLAME) { beam.flavour = BEAM_COLD; beam.name = "frost"; beam.colour = WHITE; - ammo.special = SPMSL_ICE; + ammo.special = SPMSL_FROST; } ASSERT(beam.flavour == BEAM_MISSILE || !is_artefact(item)); @@ -2149,7 +2149,7 @@ static bool determines_ammo_brand(int bow_brand, int ammo_brand) { if (bow_brand == SPWPN_FLAME && ammo_brand == SPMSL_FLAME) return (false); - if (bow_brand == SPWPN_FROST && ammo_brand == SPMSL_ICE) + if (bow_brand == SPWPN_FROST && ammo_brand == SPMSL_FROST) return (false); if (bow_brand == SPWPN_VENOM && ammo_brand == SPMSL_POISONED) return (false); |