diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-07 19:24:34 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-07 19:24:34 +0000 |
| commit | 7351857a9a93080e85cc0fc6a87a5571cb1dadcc (patch) | |
| tree | 8a07ebcbbccd8b726492c258e6df6d8721311368 /crawl-ref/source/makeitem.cc | |
| parent | a670276b9dd4d243f68ad28cacf71f979ae5984c (diff) | |
| download | crawl-ref-7351857a9a93080e85cc0fc6a87a5571cb1dadcc.tar.gz crawl-ref-7351857a9a93080e85cc0fc6a87a5571cb1dadcc.zip | |
Removed DISRUPTION brand and added DRAGON_SLAYING.
The old disruption code should probably be moved over to holy wrath
but I'm unsure whether I should replace the current one. I'm talking
about the "You are blasted by holy energy!" bit in the commit below.
For now, I've simply removed it.
All dragon slaying currently does is what orc slaying does, only
against dragons. So no additional effects, resistances or otherwise.
Both slaying brands are still randomly created (though dragon only
for polearms), I haven't changed anything about that.
Also removed DISTORTION effect upon wielding such a weapon. Xom is
still pleased about seeing you in this conundrum, but not as much as
when you were blasted right away. Changed distortion description to
explicitly mentioning its effects.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3219 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makeitem.cc')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 71d471dfee..d6031633d5 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1195,12 +1195,6 @@ static brand_type determine_weapon_brand(const item_def& item, int item_level) // **** intentional fall through here **** case WPN_MACE: case WPN_GREAT_MACE: - if ((item.sub_type == WPN_MACE || item.sub_type == WPN_GREAT_MACE) - && one_chance_in(4)) - { - rc = SPWPN_DISRUPTION; - } - // **** intentional fall through here **** case WPN_FLAIL: case WPN_SPIKED_FLAIL: case WPN_DIRE_FLAIL: @@ -1414,6 +1408,9 @@ static brand_type determine_weapon_brand(const item_def& item, int item_level) if (one_chance_in(6)) rc = SPWPN_VENOM; + + if (one_chance_in(5)) + rc = SPWPN_DRAGON_SLAYING; if (one_chance_in(3)) rc = SPWPN_REACHING; @@ -2852,13 +2849,8 @@ static void give_monster_item( const mon_holy_type mholy = mons_holiness(mon); - if (get_weapon_brand(mthing) == SPWPN_DISRUPTION - && mholy == MH_UNDEAD) - { - set_item_ego_type( mthing, OBJ_WEAPONS, SPWPN_NORMAL ); - } - else if (get_weapon_brand(mthing) == SPWPN_HOLY_WRATH - && (mholy == MH_UNDEAD || mholy == MH_DEMONIC)) + if (get_weapon_brand(mthing) == SPWPN_HOLY_WRATH + && (mholy == MH_UNDEAD || mholy == MH_DEMONIC)) { set_item_ego_type( mthing, OBJ_WEAPONS, SPWPN_NORMAL ); } |