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

4
Scripts/Spells/Sixth/Dispel.cs
View file

@ -15,7 +15,7 @@ namespace Server.Spells.Sixth
Reagent.SulfurousAsh
);
public DispelSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public DispelSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}
@ -79,4 +79,4 @@ namespace Server.Spells.Sixth
}
}
}
}
}

4
Scripts/Spells/Sixth/EnergyBolt.cs
View file

@ -12,7 +12,7 @@ namespace Server.Spells.Sixth
Reagent.Nightshade
);
public EnergyBoltSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public EnergyBoltSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}
@ -92,4 +92,4 @@ namespace Server.Spells.Sixth
}
}
}
}
}

4
Scripts/Spells/Sixth/Explosion.cs
View file

@ -13,7 +13,7 @@ namespace Server.Spells.Sixth
Reagent.MandrakeRoot
);
public ExplosionSpell(Mobile caster, Item scroll)
public ExplosionSpell(Mobile caster, Item scroll = null)
: base(caster, scroll, m_Info)
{
}
@ -125,4 +125,4 @@ namespace Server.Spells.Sixth
}
}
}
}
}

2
Scripts/Spells/Sixth/Invisibility.cs
View file

@ -19,7 +19,7 @@ namespace Server.Spells.Sixth
private static Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
public InvisibilitySpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public InvisibilitySpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}

4
Scripts/Spells/Sixth/Mark.cs
View file

@ -15,7 +15,7 @@ namespace Server.Spells.Sixth
Reagent.MandrakeRoot
);
public MarkSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public MarkSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}
@ -87,4 +87,4 @@ namespace Server.Spells.Sixth
}
}
}
}
}

42
Scripts/Spells/Sixth/MassCurse.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Server.Targeting;
namespace Server.Spells.Sixth
@ -16,7 +17,7 @@ namespace Server.Spells.Sixth
Reagent.SulfurousAsh
);
public MassCurseSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public MassCurseSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}
@ -39,8 +40,6 @@ namespace Server.Spells.Sixth
SpellHelper.GetSurfaceTop(ref p);
List<Mobile> targets = new List<Mobile>();
Map map = Caster.Map;
if (map != null)
@ -49,33 +48,26 @@ namespace Server.Spells.Sixth
foreach (Mobile m in eable)
{
if (Core.AOS && m == Caster)
if (Core.AOS && (m == Caster || !SpellHelper.ValidIndirectTarget(Caster, m) || !Caster.CanSee(m) ||
!Caster.CanBeHarmful(m, false)))
continue;
if (SpellHelper.ValidIndirectTarget(Caster, m) && Caster.CanSee(m) && Caster.CanBeHarmful(m, false))
targets.Add(m);
Caster.DoHarmful(m);
SpellHelper.AddStatCurse(Caster, m, StatType.Str);
SpellHelper.DisableSkillCheck = true;
SpellHelper.AddStatCurse(Caster, m, StatType.Dex);
SpellHelper.AddStatCurse(Caster, m, StatType.Int);
SpellHelper.DisableSkillCheck = false;
m.FixedParticles(0x374A, 10, 15, 5028, EffectLayer.Waist);
m.PlaySound(0x1FB);
HarmfulSpell(m);
}
eable.Free();
}
for (int i = 0; i < targets.Count; ++i)
{
Mobile m = targets[i];
Caster.DoHarmful(m);
SpellHelper.AddStatCurse(Caster, m, StatType.Str);
SpellHelper.DisableSkillCheck = true;
SpellHelper.AddStatCurse(Caster, m, StatType.Dex);
SpellHelper.AddStatCurse(Caster, m, StatType.Int);
SpellHelper.DisableSkillCheck = false;
m.FixedParticles(0x374A, 10, 15, 5028, EffectLayer.Waist);
m.PlaySound(0x1FB);
HarmfulSpell(m);
}
}
FinishSequence();
@ -102,4 +94,4 @@ namespace Server.Spells.Sixth
}
}
}
}
}

4
Scripts/Spells/Sixth/ParalyzeField.cs
View file

@ -18,7 +18,7 @@ namespace Server.Spells.Sixth
Reagent.SpidersSilk
);
public ParalyzeFieldSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public ParalyzeFieldSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}
@ -234,4 +234,4 @@ namespace Server.Spells.Sixth
}
}
}
}
}

31
Scripts/Spells/Sixth/Reveal.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Server.Mobiles;
using Server.Targeting;
@ -14,7 +15,7 @@ namespace Server.Spells.Sixth
Reagent.SulfurousAsh
);
public RevealSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public RevealSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}
@ -34,11 +35,7 @@ namespace Server.Spells.Sixth
else if (CheckSequence())
{
SpellHelper.Turn(Caster, p);
SpellHelper.GetSurfaceTop(ref p);
List<Mobile> targets = new List<Mobile>();
Map map = Caster.Map;
if (map != null)
@ -48,26 +45,20 @@ namespace Server.Spells.Sixth
foreach (Mobile m in eable)
{
if (m is ShadowKnight && (m.X != p.X || m.Y != p.Y))
if (m is ShadowKnight &&
(m.X != p.X || m.Y != p.Y || !m.Hidden || m.AccessLevel != AccessLevel.Player &&
Caster.AccessLevel <= m.AccessLevel ||
!CheckDifficulty(Caster, m)))
continue;
if (m.Hidden && (m.AccessLevel == AccessLevel.Player || Caster.AccessLevel > m.AccessLevel) &&
CheckDifficulty(Caster, m))
targets.Add(m);
m.RevealingAction();
m.FixedParticles(0x375A, 9, 20, 5049, EffectLayer.Head);
m.PlaySound(0x1FD);
}
eable.Free();
}
for (int i = 0; i < targets.Count; ++i)
{
Mobile m = targets[i];
m.RevealingAction();
m.FixedParticles(0x375A, 9, 20, 5049, EffectLayer.Head);
m.PlaySound(0x1FD);
}
}
FinishSequence();
@ -117,4 +108,4 @@ namespace Server.Spells.Sixth
}
}
}
}
}