fix: Adds FindItemOnLayer generic (#1223)
This commit is contained in:
parent
053dbcbad0
commit
fd6f4239e2
20 changed files with 112 additions and 169 deletions
|
|
@ -12,22 +12,18 @@ namespace Server.Spells.Ninjitsu
|
|||
|
||||
public override bool Validate(Mobile from)
|
||||
{
|
||||
if (from.FindItemOnLayer(Layer.TwoHanded) is BaseShield)
|
||||
var twoHanded = from.FindItemOnLayer(Layer.TwoHanded);
|
||||
if (twoHanded is BaseShield)
|
||||
{
|
||||
from.SendLocalizedMessage(1063096); // You cannot use this ability while holding a shield.
|
||||
return false;
|
||||
}
|
||||
|
||||
Item handOne = from.FindItemOnLayer(Layer.OneHanded) as BaseWeapon;
|
||||
var meleeWeapon =
|
||||
twoHanded is BaseWeapon and not BaseRanged ||
|
||||
from.FindItemOnLayer(Layer.OneHanded) is BaseWeapon and not BaseRanged;
|
||||
|
||||
if (handOne != null && handOne is not BaseRanged)
|
||||
{
|
||||
return base.Validate(from);
|
||||
}
|
||||
|
||||
Item handTwo = from.FindItemOnLayer(Layer.TwoHanded) as BaseWeapon;
|
||||
|
||||
if (handTwo != null && handTwo is not BaseRanged)
|
||||
if (meleeWeapon)
|
||||
{
|
||||
return base.Validate(from);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue