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

9
Scripts/Mobiles/AI/HealerAI.cs
View file

@ -1,3 +1,4 @@
using Server.Spells;
using Server.Spells.First;
using Server.Spells.Fourth;
using Server.Spells.Second;
@ -28,11 +29,13 @@ namespace Server.Mobiles
if (targ != null)
{
if (targ is CureSpell.InternalTarget)
ISpellTarget spellTarg = targ as ISpellTarget;
if (spellTarg?.Spell is CureSpell)
ProcessTarget(targ, m_ACure);
else if (targ is GreaterHealSpell.InternalTarget)
else if (spellTarg?.Spell is GreaterHealSpell)
ProcessTarget(targ, m_AGHeal);
else if (targ is HealSpell.InternalTarget)
else if (spellTarg?.Spell is HealSpell)
ProcessTarget(targ, m_ALHeal);
else
targ.Cancel(m_Mobile, TargetCancelType.Canceled);

12
Scripts/Mobiles/AI/MageAI.cs
View file

@ -960,11 +960,13 @@ namespace Server.Mobiles
if (targ == null)
return false;
bool isReveal = targ is RevealSpell.InternalTarget;
bool isDispel = targ is DispelSpell.InternalTarget;
bool isParalyze = targ is ParalyzeSpell.InternalTarget;
bool isTeleport = targ is TeleportSpell.InternalTarget;
bool isInvisible = targ is InvisibilitySpell.InternalTarget;
ISpellTarget spellTarg = targ as ISpellTarget;
bool isReveal = spellTarg?.Spell is RevealSpell;
bool isDispel = spellTarg?.Spell is DispelSpell;
bool isParalyze = spellTarg?.Spell is ParalyzeSpell;
bool isTeleport = spellTarg?.Spell is TeleportSpell;
bool isInvisible = spellTarg?.Spell is InvisibilitySpell;
bool teleportAway = false;
Mobile toTarget;

18
Scripts/Mobiles/Monsters/AOS/Revenant.cs
View file

@ -51,20 +51,8 @@ namespace Server.Mobiles
VirtualArmor = 32;
Item shroud = new DeathShroud();
shroud.Hue = 0x455;
shroud.Movable = false;
AddItem(shroud);
Halberd weapon = new Halberd();
weapon.Hue = 1;
weapon.Movable = false;
AddItem(weapon);
AddItem(new DeathShroud { Hue = 0x455, Movable = false });
AddItem(new Halberd { Hue = 1, Movable = false });
}
public Revenant(Serial serial) : base(serial)
@ -181,4 +169,4 @@ namespace Server.Mobiles
Delete();
}
}
}
}