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

Code cleanup (#188)

Browse source
This commit is contained in:
Kamron Batman 2020-08-01 08:40:06 -07:00 • committed by GitHub
parent df53c16620
commit 010fd9402a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
185 changed files with 1052 additions and 1271 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Spells/Fourth/ArchProtection.cs
View file

@ -99,9 +99,7 @@ namespace Server.Spells.Fourth
{
_Table.Remove(m);
m.EndAction<ArchProtectionSpell>();
m.VirtualArmorMod -= v;
if (m.VirtualArmorMod < 0)
m.VirtualArmorMod = 0;
m.VirtualArmorMod -= Math.Min(v, m.VirtualArmorMod);
}
}

9
Projects/UOContent/Spells/Fourth/ManaDrain.cs
View file

@ -59,12 +59,7 @@ namespace Server.Spells.Fourth
if (Core.AOS)
{
int toDrain = 40 + (int)(GetDamageSkill(Caster) - GetResistSkill(m));
if (toDrain < 0)
toDrain = 0;
else if (toDrain > m.Mana)
toDrain = m.Mana;
int toDrain = Math.Clamp(40 + (int)(GetDamageSkill(Caster) - GetResistSkill(m)), 0, m.Mana);
if (m_Table.Contains(m))
toDrain = 0;
@ -77,7 +72,7 @@ namespace Server.Spells.Fourth
m.Mana -= toDrain;
m_Table.Add(m);
Timer.DelayCall(TimeSpan.FromSeconds(5.0), () => AosDelay_Callback(m, toDrain));
Timer.DelayCall(TimeSpan.FromSeconds(5.0), AosDelay_Callback, m, toDrain);
}
}
else