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/Fifth/BladeSpirits.cs
View file

@ -5,15 +5,14 @@ namespace Server.Spells.Fifth
{
public class BladeSpiritsSpell : MagerySpell, ISpellTargetingPoint3D
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Blade Spirits", "In Jux Hur Ylem",
266,
9040,
false,
Reagent.BlackPearl,
Reagent.MandrakeRoot,
Reagent.Nightshade
);
Reagent.Nightshade);
public BladeSpiritsSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

5
Projects/Scripts/Spells/Fifth/DispelField.cs
View file

@ -6,15 +6,14 @@ namespace Server.Spells.Fifth
{
public class DispelFieldSpell : MagerySpell, ISpellTargetingItem
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Dispel Field", "An Grav",
206,
9002,
Reagent.BlackPearl,
Reagent.SpidersSilk,
Reagent.SulfurousAsh,
Reagent.Garlic
);
Reagent.Garlic);
public DispelFieldSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

13
Projects/Scripts/Spells/Fifth/Incognito.cs
View file

@ -9,16 +9,15 @@ namespace Server.Spells.Fifth
{
public class IncognitoSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Incognito", "Kal In Ex",
206,
9002,
Reagent.Bloodmoss,
Reagent.Garlic,
Reagent.Nightshade
);
Reagent.Nightshade);
private static Dictionary<Mobile, InternalTimer> m_Timers = new Dictionary<Mobile, InternalTimer>();
private static readonly Dictionary<Mobile, InternalTimer> m_Timers = new Dictionary<Mobile, InternalTimer>();
public IncognitoSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
@ -97,7 +96,6 @@ namespace Server.Spells.Fifth
StopTimer(Caster);
int timeVal = 6 * Caster.Skills.Magery.Fixed / 50 + 1;
if (timeVal > 144)
@ -105,7 +103,6 @@ namespace Server.Spells.Fifth
TimeSpan length = TimeSpan.FromSeconds(timeVal);
InternalTimer t = new InternalTimer(Caster, length);
m_Timers[Caster] = t;
@ -134,7 +131,7 @@ namespace Server.Spells.Fifth
private class InternalTimer : Timer
{
private Mobile m_Owner;
private readonly Mobile m_Owner;
public InternalTimer(Mobile owner, TimeSpan length) : base(length)
{
@ -143,7 +140,7 @@ namespace Server.Spells.Fifth
/*
int val = ((6 * owner.Skills.Magery.Fixed) / 50) + 1;
if ( val > 144 )
if (val > 144)
val = 144;
Delay = TimeSpan.FromSeconds( val );

9
Projects/Scripts/Spells/Fifth/MagicReflect.cs
View file

@ -4,16 +4,15 @@ namespace Server.Spells.Fifth
{
public class MagicReflectSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Magic Reflection", "In Jux Sanct",
242,
9012,
Reagent.Garlic,
Reagent.MandrakeRoot,
Reagent.SpidersSilk
);
Reagent.SpidersSilk);
private static Dictionary<Mobile, ResistanceMod[]> m_Table = new Dictionary<Mobile, ResistanceMod[]>();
private static readonly Dictionary<Mobile, ResistanceMod[]> m_Table = new Dictionary<Mobile, ResistanceMod[]>();
public MagicReflectSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
@ -113,7 +112,7 @@ namespace Server.Spells.Fifth
if (Caster.BeginAction<DefensiveSpell>())
{
int value = (int)(Caster.Skills.Magery.Value + Caster.Skills.Inscribe.Value);
value = (int)(8 + value / 200.0 * 7.0); //absorb from 8 to 15 "circles"
value = (int)(8 + value / 200.0 * 7.0); // absorb from 8 to 15 "circles"
Caster.MagicDamageAbsorb = value;

5
Projects/Scripts/Spells/Fifth/MindBlast.cs
View file

@ -5,15 +5,14 @@ namespace Server.Spells.Fifth
{
public class MindBlastSpell : MagerySpell, ISpellTargetingMobile
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Mind Blast", "Por Corp Wis",
218,
Core.AOS ? 9002 : 9032,
Reagent.BlackPearl,
Reagent.MandrakeRoot,
Reagent.Nightshade,
Reagent.SulfurousAsh
);
Reagent.SulfurousAsh);
public MindBlastSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

7
Projects/Scripts/Spells/Fifth/Paralyze.cs
View file

@ -7,14 +7,13 @@ namespace Server.Spells.Fifth
{
public class ParalyzeSpell : MagerySpell, ISpellTargetingMobile
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Paralyze", "An Ex Por",
218,
9012,
Reagent.Garlic,
Reagent.MandrakeRoot,
Reagent.SpidersSilk
);
Reagent.SpidersSilk);
public ParalyzeSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
@ -35,7 +34,7 @@ namespace Server.Spells.Fifth
if (!Caster.CanSee(m))
Caster.SendLocalizedMessage(500237); // Target can not be seen.
else if (Core.AOS && (m.Frozen || m.Paralyzed ||
m.Spell?.IsCasting == true && !(m.Spell is PaladinSpell)))
(m.Spell?.IsCasting == true && !(m.Spell is PaladinSpell))))
{
Caster.SendLocalizedMessage(1061923); // The target is already frozen.
}

32
Projects/Scripts/Spells/Fifth/PoisonField.cs
View file

@ -9,15 +9,14 @@ namespace Server.Spells.Fifth
{
public class PoisonFieldSpell : MagerySpell, ISpellTargetingPoint3D
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Poison Field", "In Nox Grav",
230,
9052,
false,
Reagent.BlackPearl,
Reagent.Nightshade,
Reagent.SpidersSilk
);
Reagent.SpidersSilk);
public PoisonFieldSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
@ -132,20 +131,20 @@ namespace Server.Spells.Fifth
switch (version)
{
case 1:
{
m_Caster = reader.ReadMobile();
{
m_Caster = reader.ReadMobile();
goto case 0;
}
goto case 0;
}
case 0:
{
m_End = reader.ReadDeltaTime();
{
m_End = reader.ReadDeltaTime();
m_Timer = new InternalTimer(this, TimeSpan.Zero, true, true);
m_Timer.Start();
m_Timer = new InternalTimer(this, TimeSpan.Zero, true, true);
m_Timer.Start();
break;
}
break;
}
}
}
@ -197,9 +196,10 @@ namespace Server.Spells.Fifth
private class InternalTimer : Timer
{
private static Queue<Mobile> m_Queue = new Queue<Mobile>();
private bool m_InLOS, m_CanFit;
private InternalItem m_Item;
private static readonly Queue<Mobile> m_Queue = new Queue<Mobile>();
private readonly bool m_InLOS;
private readonly bool m_CanFit;
private readonly InternalItem m_Item;
public InternalTimer(InternalItem item, TimeSpan delay, bool inLOS, bool canFit) : base(delay,
TimeSpan.FromSeconds(1.5))

9
Projects/Scripts/Spells/Fifth/SummonCreature.cs
View file

@ -6,18 +6,17 @@ namespace Server.Spells.Fifth
{
public class SummonCreatureSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new SpellInfo(
"Summon Creature", "Kal Xen",
16,
false,
Reagent.Bloodmoss,
Reagent.MandrakeRoot,
Reagent.SpidersSilk
);
Reagent.SpidersSilk);
// NOTE: Creature list based on 1hr of summon/release on OSI.
private static Type[] m_Types =
private static readonly Type[] m_Types =
{
typeof(PolarBear),
typeof(GrizzlyBear),
@ -66,7 +65,7 @@ namespace Server.Spells.Fifth
{
BaseCreature creature = (BaseCreature)ActivatorUtil.CreateInstance(m_Types[Utility.Random(m_Types.Length)]);
//creature.ControlSlots = 2;
// creature.ControlSlots = 2;
TimeSpan duration;