diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-10 09:31:59 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-10 09:36:48 -0400 |
| commit | ffd391d7850bbbc282688706f5714a885f07b182 (patch) | |
| tree | 9ef1f9d7ee4e051216b42ee4dd5a782ea38e6209 /crawl-ref/source/player-equip.cc | |
| parent | 897c189157c822dcb87e64f4a38373bdd258e554 (diff) | |
| download | crawl-ref-ffd391d7850bbbc282688706f5714a885f07b182.tar.gz crawl-ref-ffd391d7850bbbc282688706f5714a885f07b182.zip | |
Combine the frost/flame and freezing/flaming brands.
Elec and venom launchers already use the same brands, and with ranged
code more similar to melee code this change actually simplifies most
code. There should be no gameplay change though some weird brand picking
code for launchers was refactored, which might have some effect.
Diffstat (limited to 'crawl-ref/source/player-equip.cc')
| -rw-r--r-- | crawl-ref/source/player-equip.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc index 981383d3e7..dccfc45665 100644 --- a/crawl-ref/source/player-equip.cc +++ b/crawl-ref/source/player-equip.cc @@ -504,7 +504,8 @@ static void _equip_weapon_effect(item_def& item, bool showMsgs, bool unmeld) break; case SPWPN_FREEZING: - mpr("It glows with a cold blue light!"); + mpr(is_range_weapon(item) ? "It is covered in frost." + : "It glows with a cold blue light!"); break; case SPWPN_HOLY_WRATH: @@ -546,14 +547,6 @@ static void _equip_weapon_effect(item_def& item, bool showMsgs, bool unmeld) you.hand_name(true).c_str()); break; - case SPWPN_FLAME: - mpr("It bursts into flame!"); - break; - - case SPWPN_FROST: - mpr("It is covered in frost."); - break; - case SPWPN_VAMPIRICISM: if (you.species == SP_VAMPIRE) { |