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

31
Scripts/Spells/Spellweaving/ArcaneCircle.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Items;
using Server.Mobiles;
@ -12,7 +13,7 @@ namespace Server.Spells.Spellweaving
-1
);
public ArcaneCircleSpell(Mobile caster, Item scroll)
public ArcaneCircleSpell(Mobile caster, Item scroll = null)
: base(caster, scroll, m_Info)
{
}
@ -91,23 +92,14 @@ namespace Server.Spells.Spellweaving
return true;
}
IPooledEnumerable<Item> eable = map.GetItemsInRange(location, 0); // Added Tiles
IPooledEnumerable<Item> eable = map.GetItemsInRange(location, 0);
foreach (Item item in eable)
{
ItemData id = item.ItemData;
if (item.Z + id.CalcHeight != location.Z)
continue;
if (IsValidTile(item.ItemID))
{
eable.Free();
return true;
}
}
bool found = eable.Any(item =>
item.Z + item.ItemData.CalcHeight == location.Z && IsValidTile(item.ItemID));
eable.Free();
return false;
return found;
}
public static bool IsValidTile(int itemID)
@ -123,11 +115,10 @@ namespace Server.Spells.Spellweaving
List<Mobile> weavers = new List<Mobile> { Caster };
//OSI Verified: Even enemies/combatants count
foreach (Mobile m in Caster.GetMobilesInRange(1)) //Range verified as 1
if (m != Caster && m is PlayerMobile && Caster.CanBeBeneficial(m, false) &&
Math.Abs(Caster.Skills.Spellweaving.Value - m.Skills.Spellweaving.Value) <= 20)
weavers.Add(m);
// Everyone gets the Arcane Focus, power capped elsewhere
weavers.AddRange(Caster.GetMobilesInRange(1)
.Where(m => m != Caster && m is PlayerMobile && Caster.CanBeBeneficial(m, false) &&
Math.Abs(Caster.Skills.Spellweaving.Value - m.Skills.Spellweaving.Value) <= 20));
return weavers;
}
@ -163,4 +154,4 @@ namespace Server.Spells.Spellweaving
}
}
}
}
}