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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Scripts/Spells/Seventh/MeteorSwarm.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Server.Targeting;
namespace Server.Spells.Seventh
@ -16,7 +17,7 @@ namespace Server.Spells.Seventh
Reagent.SpidersSilk
);
public MeteorSwarmSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public MeteorSwarmSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}
@ -42,7 +43,7 @@ namespace Server.Spells.Seventh
if (p is Item item)
p = item.GetWorldLocation();
List<Mobile> targets = new List<Mobile>();
List<Mobile> targets;
Map map = Caster.Map;
@ -52,27 +53,29 @@ namespace Server.Spells.Seventh
{
IPooledEnumerable<Mobile> eable = map.GetMobilesInRange(new Point3D(p), 2);
foreach (Mobile m in eable)
if (Caster != m && SpellHelper.ValidIndirectTarget(Caster, m) && Caster.CanBeHarmful(m, false))
{
if (Core.AOS && !Caster.InLOS(m))
continue;
targets = eable.Where(m =>
{
if (Caster == m || !SpellHelper.ValidIndirectTarget(Caster, m) || !Caster.CanBeHarmful(m, false) ||
Core.AOS && !Caster.InLOS(m))
return false;
targets.Add(m);
if (m.Player)
playerVsPlayer = true;
if (m.Player)
playerVsPlayer = true;
}
return true;
}).ToList();
eable.Free();
}
else
{
targets = new List<Mobile>();
}
double damage;
if (Core.AOS)
damage = GetNewAosDamage(51, 1, 5, playerVsPlayer);
else
damage = Utility.Random(27, 22);
damage = Core.AOS ? GetNewAosDamage(51, 1, 5, playerVsPlayer)
: Utility.Random(27, 22);
if (targets.Count > 0)
{
@ -83,12 +86,11 @@ namespace Server.Spells.Seventh
else if (!Core.AOS)
damage /= targets.Count;
double toDeal;
for (int i = 0; i < targets.Count; ++i)
{
Mobile m = targets[i];
toDeal = damage;
double toDeal = damage;
if (!Core.AOS && CheckResisted(m))
{
@ -130,4 +132,4 @@ namespace Server.Spells.Seventh
}
}
}
}
}