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/mon-gear.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/mon-gear.cc')
| -rw-r--r-- | crawl-ref/source/mon-gear.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc index 52169da254..6529a4b3fe 100644 --- a/crawl-ref/source/mon-gear.cc +++ b/crawl-ref/source/mon-gear.cc @@ -913,7 +913,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false, item.plus += 1 + random2(3); item.plus2 += 1 + random2(3); item.flags |= ISFLAG_KNOW_TYPE; - set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAME); + set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAMING); break; case MONS_YAKTAUR: @@ -1264,7 +1264,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false, if (is_range_weapon(item)) { - set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAME); + set_item_ego_type(item, OBJ_WEAPONS, SPWPN_FLAMING); item.flags |= ISFLAG_KNOW_TYPE; } @@ -1649,7 +1649,7 @@ static void _give_ammo(monster* mon, int level, bool mons_summoned) const int bow_brand = get_weapon_brand(*launcher); const int ammo_brand = get_ammo_brand(mitm[thing_created]); if (ammo_brand != SPMSL_NORMAL - && (bow_brand == SPWPN_FLAME || bow_brand == SPWPN_FROST)) + && (bow_brand == SPWPN_FLAMING || bow_brand == SPWPN_FREEZING)) { mitm[thing_created].special = SPMSL_NORMAL; } |