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/artefact.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/artefact.cc')
| -rw-r--r-- | crawl-ref/source/artefact.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 574ccf5151..ef346c1cb4 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -224,7 +224,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item, case GOD_DITHMENOS: // No fiery weapons. if (item.base_type == OBJ_WEAPONS - && (brand == SPWPN_FLAME || brand == SPWPN_FLAMING)) + && brand == SPWPN_FLAMING) { return false; } @@ -735,8 +735,8 @@ static void _get_randart_properties(const item_def &item, 2, SPWPN_SPEED, 4, SPWPN_VENOM, 4, SPWPN_VORPAL, - 4, SPWPN_FLAME, - 4, SPWPN_FROST, + 4, SPWPN_FLAMING, + 4, SPWPN_FREEZING, 0); if (atype == WPN_BLOWGUN) |