warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wand fixes:

Browse source 
- Wands can now be pigmented.
- Corrected ML weapon speed.
- Added SC/FC-1/MW properties for new wands.
- Added message for when the wand is used while it is recharging.
- Clumsy/Feeblemind/Mana Drain/Weakness wands no longer drop if Core.ML.
- Max charges are now 109 for all ML available wands, if Core.ML.
- Wands now have a cast delay if Core.ML.
- Moved RevealingAction for wands from spell casting to spell targeting.
This commit is contained in:
eos 2012-04-29 01:49:56 +00:00
parent 96725e7ea8
commit 31185a874f
10 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Spells/Base/MagerySpell.cs
View file

@ -96,7 +96,7 @@ namespace Server.Spells
public override TimeSpan GetCastDelay()
{
if( Scroll is BaseWand )
if( !Core.ML && Scroll is BaseWand )
return TimeSpan.Zero;
if( !Core.AOS )

11
Scripts/Spells/Base/Spell.cs
View file

@ -491,6 +491,10 @@ namespace Server.Spells
{
return false;
}
else if ( m_Scroll is BaseWand && m_Caster.Spell != null && m_Caster.Spell.IsCasting )
{
m_Caster.SendLocalizedMessage( 502643 ); // You can not cast a spell while frozen.
}
else if ( m_Caster.Spell != null && m_Caster.Spell.IsCasting )
{
m_Caster.SendLocalizedMessage( 502642 ); // You are already casting a spell.
@ -523,7 +527,7 @@ namespace Server.Spells
m_State = SpellState.Casting;
m_Caster.Spell = this;
if ( RevealOnCast )
if ( !( m_Scroll is BaseWand ) && RevealOnCast )
m_Caster.RevealingAction();
SayMantra();
@ -671,7 +675,7 @@ namespace Server.Spells
public virtual TimeSpan GetCastDelay()
{
if ( m_Scroll is BaseWand )
return TimeSpan.Zero;
return Core.ML ? CastDelayBase : TimeSpan.Zero; // TODO: Should FC apply to wands?
// Faster casting cap of 2 (if not using the protection spell)
// Faster casting cap of 0 (if using the protection spell)
@ -757,7 +761,10 @@ namespace Server.Spells
if ( m_Scroll is SpellScroll )
m_Scroll.Consume();
else if ( m_Scroll is BaseWand )
{
((BaseWand)m_Scroll).ConsumeCharge( m_Caster );
m_Caster.RevealingAction();
}
if ( m_Scroll is BaseWand )
{