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

Cleans up Spell Targeting (#36)

Browse source
This commit is contained in:
Kamron Batman 2019-03-15 15:23:03 -07:00 • committed by GitHub
parent de50bc9e43
commit 472b84f5ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
99 changed files with 653 additions and 2192 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,13 +20,7 @@ namespace Server.Spells
public override bool ConsumeReagents()
{
if (base.ConsumeReagents())
return true;
if (ArcaneGem.ConsumeCharges(Caster, Core.SE ? 1 : 1 + (int)Circle))
return true;
return false;
return base.ConsumeReagents() || ArcaneGem.ConsumeCharges(Caster, Core.SE ? 1 : 1 + (int)Circle);
}
public override void GetCastSkills(out double min, out double max)
@ -44,10 +38,7 @@ namespace Server.Spells
public override int GetMana()
{
if (Scroll is BaseWand)
return 0;
return m_ManaTable[(int)Circle];
return Scroll is BaseWand ? 0 : m_ManaTable[(int)Circle];
}
public override double GetResistSkill(Mobile m)
@ -108,4 +99,4 @@ namespace Server.Spells
return base.GetCastDelay();
}
}
}
}