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/item_use.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/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 509aacc3aa..c3a546b013 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -164,7 +164,6 @@ bool can_wield(const item_def *weapon, bool say_reason, if ((you.is_undead || you.species == SP_DEMONSPAWN) && (!is_fixed_artefact( *weapon ) && (weap_brand == SPWPN_HOLY_WRATH - || weap_brand == SPWPN_DISRUPTION || (weapon->base_type == OBJ_WEAPONS && weapon->sub_type == WPN_BLESSED_BLADE)))) { @@ -513,6 +512,12 @@ void wield_effects(int item_wield_2, bool showMsgs) : "You feel a sudden desire to kill orcs!"); break; + case SPWPN_DRAGON_SLAYING: + mpr(player_genus(GENPC_DRACONIAN) + ? "You feel a sudden desire to commit suicide." + : "You feel a sudden desire to slay dragons!"); + break; + case SPWPN_VENOM: mpr("It begins to drip with poison!"); break; @@ -544,10 +549,6 @@ void wield_effects(int item_wield_2, bool showMsgs) mpr("You feel strangely empty."); break; - case SPWPN_DISRUPTION: - mpr("You sense a holy aura."); - break; - case SPWPN_RETURNING: mpr("It wiggles slightly."); break; @@ -616,10 +617,7 @@ void wield_effects(int item_wield_2, bool showMsgs) case SPWPN_DISTORTION: if (!was_known) - xom_is_stimulated(128); - miscast_effect( SPTYP_TRANSLOCATION, 9, 90, 100, - was_known ? "distortion wield" : - "unknowing distortion wield"); + xom_is_stimulated(32); break; case SPWPN_SINGING_SWORD: |