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

cleanup: Fixes bugs and cleans up code (#660)

Browse source
This commit is contained in:
Kamron Batman 2021-07-19 20:49:59 -07:00 • committed by GitHub
parent 1de0b656a9
commit 679e8100f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
99 changed files with 160 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Projects/UOContent/Spells/Fifth/PoisonField.cs
View file

@ -43,24 +43,7 @@ namespace Server.Spells.Fifth
var rx = (dx - dy) * 44;
var ry = (dx + dy) * 44;
bool eastToWest;
if (rx >= 0 && ry >= 0)
{
eastToWest = false;
}
else if (rx >= 0)
{
eastToWest = true;
}
else if (ry >= 0)
{
eastToWest = true;
}
else
{
eastToWest = false;
}
bool eastToWest = rx == 0 && ry >= 0 || rx >= 0 && ry == 0;
Effects.PlaySound(new Point3D(p), Caster.Map, 0x20B);
@ -169,24 +152,13 @@ namespace Server.Spells.Fifth
if (Core.AOS)
{
var total = (m_Caster.Skills.Magery.Fixed + m_Caster.Skills.Poisoning.Fixed) / 2;
if (total >= 1000)
p = ((m_Caster.Skills.Magery.Fixed + m_Caster.Skills.Poisoning.Fixed) / 2) switch
{
p = Poison.Deadly;
}
else if (total > 850)
{
p = Poison.Greater;
}
else if (total > 650)
{
p = Poison.Regular;
}
else
{
p = Poison.Lesser;
}
>= 1000 => Poison.Deadly,
> 850 => Poison.Greater,
> 650 => Poison.Regular,
_ => Poison.Lesser
};
}
else
{
@ -220,7 +192,7 @@ namespace Server.Spells.Fifth
private class InternalTimer : Timer
{
private static readonly Queue<Mobile> m_Queue = new();
private static Queue<Mobile> m_Queue;
private readonly bool m_CanFit;
private readonly bool m_InLOS;
private readonly InternalItem m_Item;
@ -292,13 +264,14 @@ namespace Server.Spells.Fifth
if (m.Z + 16 > m_Item.Z && m_Item.Z + 12 > m.Z && (!Core.AOS || m != caster) &&
SpellHelper.ValidIndirectTarget(caster, m) && caster.CanBeHarmful(m, false))
{
m_Queue ??= new Queue<Mobile>();
m_Queue.Enqueue(m);
}
}
eable.Free();
while (m_Queue.Count > 0)
while (m_Queue?.Count > 0)
{
var m = m_Queue.Dequeue();