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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/Scripts/Spells/Third/Bless.cs
View file

@ -6,13 +6,12 @@ namespace Server.Spells.Third
{
public class BlessSpell : MagerySpell, ISpellTargetingMobile
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Bless", "Rel Sanct",
203,
9061,
Reagent.Garlic,
Reagent.MandrakeRoot
);
Reagent.MandrakeRoot);
public BlessSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

5
Projects/Scripts/Spells/Third/Fireball.cs
View file

@ -4,12 +4,11 @@ namespace Server.Spells.Third
{
public class FireballSpell : MagerySpell, ISpellTargetingMobile
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Fireball", "Vas Flam",
203,
9041,
Reagent.BlackPearl
);
Reagent.BlackPearl);
public FireballSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

5
Projects/Scripts/Spells/Third/MagicLock.cs
View file

@ -7,14 +7,13 @@ namespace Server.Spells.Third
{
public class MagicLockSpell : MagerySpell, ISpellTargetingItem
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Magic Lock", "An Por",
215,
9001,
Reagent.Garlic,
Reagent.Bloodmoss,
Reagent.SulfurousAsh
);
Reagent.SulfurousAsh);
public MagicLockSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

13
Projects/Scripts/Spells/Third/Poison.cs
View file

@ -5,12 +5,11 @@ namespace Server.Spells.Third
{
public class PoisonSpell : MagerySpell, ISpellTargetingMobile
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Poison", "In Nox",
203,
9051,
Reagent.Nightshade
);
Reagent.Nightshade);
public PoisonSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
@ -70,9 +69,7 @@ namespace Server.Spells.Third
}
else
{
//double total = Caster.Skills.Magery.Value + Caster.Skills.Poisoning.Value;
#region Dueling
// double total = Caster.Skills.Magery.Value + Caster.Skills.Poisoning.Value;
double total = Caster.Skills.Magery.Value;
@ -86,14 +83,12 @@ namespace Server.Spells.Third
total += Caster.Skills.Poisoning.Value;
}
#endregion
double dist = Caster.GetDistanceToSqrt(m);
if (dist >= 3.0)
total -= (dist - 3.0) * 10.0;
if (total >= 200.0 && 1 > Utility.Random(10))
if (total >= 200.0 && Utility.Random(10) < 1)
level = 3;
else if (total > (Core.AOS ? 170.1 : 170.0))
level = 2;

5
Projects/Scripts/Spells/Third/Telekinesis.cs
View file

@ -5,13 +5,12 @@ namespace Server.Spells.Third
{
public class TelekinesisSpell : MagerySpell, ISpellTargetingItem
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Telekinesis", "Ort Por Ylem",
203,
9031,
Reagent.Bloodmoss,
Reagent.MandrakeRoot
);
Reagent.MandrakeRoot);
public TelekinesisSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

5
Projects/Scripts/Spells/Third/Teleport.cs
View file

@ -11,13 +11,12 @@ namespace Server.Spells.Third
{
public class TeleportSpell : MagerySpell, ISpellTargetingPoint3D
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Teleport", "Rel Por",
215,
9031,
Reagent.Bloodmoss,
Reagent.MandrakeRoot
);
Reagent.MandrakeRoot);
public TeleportSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

5
Projects/Scripts/Spells/Third/Unlock.cs
View file

@ -7,13 +7,12 @@ namespace Server.Spells.Third
{
public class UnlockSpell : MagerySpell, ISpellTargetingPoint3D
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Unlock Spell", "Ex Por",
215,
9001,
Reagent.Bloodmoss,
Reagent.SulfurousAsh
);
Reagent.SulfurousAsh);
public UnlockSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

39
Projects/Scripts/Spells/Third/WallOfStone.cs
View file

@ -7,14 +7,13 @@ namespace Server.Spells.Third
{
public class WallOfStoneSpell : MagerySpell, ISpellTargetingPoint3D
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Wall of Stone", "In Sanct Ylem",
227,
9011,
false,
Reagent.Bloodmoss,
Reagent.Garlic
);
Reagent.Garlic);
public WallOfStoneSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
@ -62,7 +61,7 @@ namespace Server.Spells.Third
Point3D loc = new Point3D(eastToWest ? p.X + i : p.X, eastToWest ? p.Y : p.Y + i, p.Z);
bool canFit = SpellHelper.AdjustField(ref loc, Caster.Map, 22, true);
//Effects.SendLocationParticles( EffectItem.Create( loc, Caster.Map, EffectItem.DefaultDuration ), 0x376A, 9, 10, 5025 );
// Effects.SendLocationParticles( EffectItem.Create( loc, Caster.Map, EffectItem.DefaultDuration ), 0x376A, 9, 10, 5025 );
if (!canFit)
continue;
@ -71,7 +70,7 @@ namespace Server.Spells.Third
Effects.SendLocationParticles(item, 0x376A, 9, 10, 5025);
//new InternalItem( loc, Caster.Map, Caster );
// new InternalItem( loc, Caster.Map, Caster );
}
}
@ -81,7 +80,7 @@ namespace Server.Spells.Third
[DispellableField]
private class InternalItem : Item
{
private Mobile m_Caster;
private readonly Mobile m_Caster;
private DateTime m_End;
private Timer m_Timer;
@ -132,25 +131,25 @@ namespace Server.Spells.Third
switch (version)
{
case 1:
{
m_End = reader.ReadDeltaTime();
{
m_End = reader.ReadDeltaTime();
m_Timer = new InternalTimer(this, m_End - DateTime.UtcNow);
m_Timer.Start();
m_Timer = new InternalTimer(this, m_End - DateTime.UtcNow);
m_Timer.Start();
break;
}
break;
}
case 0:
{
TimeSpan duration = TimeSpan.FromSeconds(10.0);
{
TimeSpan duration = TimeSpan.FromSeconds(10.0);
m_Timer = new InternalTimer(this, duration);
m_Timer.Start();
m_Timer = new InternalTimer(this, duration);
m_Timer.Start();
m_End = DateTime.UtcNow + duration;
m_End = DateTime.UtcNow + duration;
break;
}
break;
}
}
}
@ -175,7 +174,7 @@ namespace Server.Spells.Third
private class InternalTimer : Timer
{
private InternalItem m_Item;
private readonly InternalItem m_Item;
public InternalTimer(InternalItem item, TimeSpan duration) : base(duration)
{