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/tags.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/tags.cc')
| -rw-r--r-- | crawl-ref/source/tags.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index f1b9748832..abc42fafa7 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -3692,6 +3692,13 @@ void unmarshallItem(reader &th, item_def &item) item.special = SPWPN_NORMAL; } + // Not putting these in a minor tag since it's possible for an old + // random monster spawn list to place flame/frost weapons. + if (item.base_type == OBJ_WEAPONS && item.special == SPWPN_FROST) + item.special = SPWPN_FREEZING; + if (item.base_type == OBJ_WEAPONS && item.special == SPWPN_FLAME) + item.special = SPWPN_FLAMING; + if (item.base_type == OBJ_MISCELLANY && item.sub_type == MISC_HORN_OF_GERYON && th.getMinorVersion() < TAG_MINOR_HORN_GERYON_CHANGE) { |