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

Removes implicit types

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:48:39 -07:00
parent 33f5e77a24
commit 04b4cfe75b
261 changed files with 1329 additions and 1329 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Scripts/Engines/ConPVP/Arena.cs
View file

@ -400,7 +400,7 @@ namespace Server.Engines.ConPVP
}
#region Offsets & Rotation
private static Point2D[] m_EdgeOffsets = new Point2D[]
private static Point2D[] m_EdgeOffsets = new[]
{
/*
* /\
@ -423,7 +423,7 @@ namespace Server.Engines.ConPVP
};
// nw corner
private static Point2D[] m_CornerOffsets = new Point2D[]
private static Point2D[] m_CornerOffsets = new[]
{
/*
* /\
@ -444,16 +444,16 @@ namespace Server.Engines.ConPVP
new Point2D( 3, 0 )
};
private static int[][,] m_Rotate = new int[][,]
{
new int[,]{ { +1, 0 }, { 0, +1 } }, // west
new int[,]{ { -1, 0 }, { 0, -1 } }, // east
new int[,]{ { 0, +1 }, { +1, 0 } }, // north
new int[,]{ { 0, -1 }, { -1, 0 } }, // south
new int[,]{ { +1, 0 }, { 0, +1 } }, // nw
new int[,]{ { -1, 0 }, { 0, -1 } }, // se
new int[,]{ { 0, +1 }, { +1, 0 } }, // sw
new int[,]{ { 0, -1 }, { -1, 0 } }, // ne
private static int[][,] m_Rotate = new[]
{
new[,]{ { +1, 0 }, { 0, +1 } }, // west
new[,]{ { -1, 0 }, { 0, -1 } }, // east
new[,]{ { 0, +1 }, { +1, 0 } }, // north
new[,]{ { 0, -1 }, { -1, 0 } }, // south
new[,]{ { +1, 0 }, { 0, +1 } }, // nw
new[,]{ { -1, 0 }, { 0, -1 } }, // se
new[,]{ { 0, +1 }, { +1, 0 } }, // sw
new[,]{ { 0, -1 }, { -1, 0 } }, // ne
};
#endregion

16
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -743,7 +743,7 @@ namespace Server.Engines.ConPVP
StopSDTimers();
Type[] types = new Type[]{ typeof( BeginGump ), typeof( DuelContextGump ), typeof( ParticipantGump ), typeof( PickRulesetGump ), typeof( ReadyGump ), typeof( ReadyUpGump ), typeof( RulesetGump ) };
Type[] types = new[]{ typeof( BeginGump ), typeof( DuelContextGump ), typeof( ParticipantGump ), typeof( PickRulesetGump ), typeof( ReadyGump ), typeof( ReadyUpGump ), typeof( RulesetGump ) };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -1528,8 +1528,8 @@ namespace Server.Engines.ConPVP
public void CloseAllGumps()
{
Type[] types = new Type[]{ typeof( DuelContextGump ), typeof( ParticipantGump ), typeof( RulesetGump ) };
int[] defs = new int[]{ -1, -1, -1 };
Type[] types = new[]{ typeof( DuelContextGump ), typeof( ParticipantGump ), typeof( RulesetGump ) };
int[] defs = new[]{ -1, -1, -1 };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -1556,8 +1556,8 @@ namespace Server.Engines.ConPVP
if ( m_StartedReadyCountdown )
return; // sanity
Type[] types = new Type[]{ typeof( DuelContextGump ), typeof( ReadyUpGump ), typeof( ReadyGump ) };
int[] defs = new int[]{ -1, -1, -1 };
Type[] types = new[]{ typeof( DuelContextGump ), typeof( ReadyUpGump ), typeof( ReadyGump ) };
int[] defs = new[]{ -1, -1, -1 };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -1962,7 +1962,7 @@ namespace Server.Engines.ConPVP
BeginAutoTie();
}
Type[] types = new Type[]{ typeof( ReadyGump ), typeof( ReadyUpGump ), typeof( BeginGump ) };
Type[] types = new[]{ typeof( ReadyGump ), typeof( ReadyUpGump ), typeof( BeginGump ) };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -2284,7 +2284,7 @@ namespace Server.Engines.ConPVP
m_ReadyWait = true;
m_ReadyCount = -1;
Type[] types = new Type[]{ typeof( ReadyUpGump ) };
Type[] types = new[]{ typeof( ReadyUpGump ) };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -2520,7 +2520,7 @@ namespace Server.Engines.ConPVP
bool isAllReady = true;
Type[] types = new Type[]{ typeof( ReadyGump ) };
Type[] types = new[]{ typeof( ReadyGump ) };
for ( int i = 0; i < m_Participants.Count; ++i )
{

8
Scripts/Engines/ConPVP/Ladder.cs
View file

@ -72,7 +72,7 @@ namespace Server.Engines.ConPVP
public class Ladder
{
private static int[] m_ShortLevels = new int[]
private static int[] m_ShortLevels = new[]
{
1,
2,
@ -97,7 +97,7 @@ namespace Server.Engines.ConPVP
return m_ShortLevels[xp / 100];
}
private static int[] m_BaseXP = new int[]
private static int[] m_BaseXP = new[]
{
0, 100, 200, 400, 600, 900, 1200, 1600, 2000, 2500
};
@ -116,7 +116,7 @@ namespace Server.Engines.ConPVP
}
}
private static int[] m_LossFactors = new int[]
private static int[] m_LossFactors = new[]
{
10,
11, 11,
@ -133,7 +133,7 @@ namespace Server.Engines.ConPVP
return m_LossFactors[level - 1];
}
private static int[,] m_OffsetScalar = new int[,]
private static int[,] m_OffsetScalar = new[,]
{
/* { win, los } */
/* -6 */ { 175, 25 },

62
Scripts/Engines/ConPVP/RulesetLayout.cs
View file

@ -15,58 +15,58 @@ namespace Server.Engines.ConPVP
{
ArrayList entries = new ArrayList();
entries.Add( new RulesetLayout( "Spells", new RulesetLayout[]
entries.Add( new RulesetLayout( "Spells", new[]
{
new RulesetLayout( "1st Circle", "Spells", new string[]
new RulesetLayout( "1st Circle", "Spells", new[]
{
"Reactive Armor", "Clumsy",
"Create Food", "Feeblemind",
"Heal", "Magic Arrow",
"Night Sight", "Weaken"
} ),
new RulesetLayout( "2nd Circle", "Spells", new string[]
new RulesetLayout( "2nd Circle", "Spells", new[]
{
"Agility", "Cunning",
"Cure", "Harm",
"Magic Trap", "Untrap",
"Protection", "Strength"
} ),
new RulesetLayout( "3rd Circle", "Spells", new string[]
new RulesetLayout( "3rd Circle", "Spells", new[]
{
"Bless", "Fireball",
"Magic Lock", "Poison",
"Telekinesis", "Teleport",
"Unlock Spell", "Wall of Stone"
} ),
new RulesetLayout( "4th Circle", "Spells", new string[]
new RulesetLayout( "4th Circle", "Spells", new[]
{
"Arch Cure", "Arch Protection",
"Curse", "Fire Field",
"Greater Heal", "Lightning",
"Mana Drain", "Recall"
} ),
new RulesetLayout( "5th Circle", "Spells", new string[]
new RulesetLayout( "5th Circle", "Spells", new[]
{
"Blade Spirits", "Dispel Field",
"Incognito", "Magic Reflection",
"Mind Blast", "Paralyze",
"Poison Field", "Summon Creature"
} ),
new RulesetLayout( "6th Circle", "Spells", new string[]
new RulesetLayout( "6th Circle", "Spells", new[]
{
"Dispel", "Energy Bolt",
"Explosion", "Invisibility",
"Mark", "Mass Curse",
"Paralyze Field", "Reveal"
} ),
new RulesetLayout( "7th Circle", "Spells", new string[]
new RulesetLayout( "7th Circle", "Spells", new[]
{
"Chain Lightning", "Energy Field",
"Flame Strike", "Gate Travel",
"Mana Vampire", "Mass Dispel",
"Meteor Swarm", "Polymorph"
} ),
new RulesetLayout( "8th Circle", "Spells", new string[]
new RulesetLayout( "8th Circle", "Spells", new[]
{
"Earthquake", "Energy Vortex",
"Resurrection", "Air Elemental",
@ -77,7 +77,7 @@ namespace Server.Engines.ConPVP
if ( Core.AOS )
{
entries.Add( new RulesetLayout( "Chivalry", new string[]
entries.Add( new RulesetLayout( "Chivalry", new[]
{
"Cleanse by Fire",
"Close Wounds",
@ -91,7 +91,7 @@ namespace Server.Engines.ConPVP
"Sacred Journey"
} ) );
entries.Add( new RulesetLayout( "Necromancy", new string[]
entries.Add( new RulesetLayout( "Necromancy", new[]
{
"Animate Dead",
"Blood Oath",
@ -113,7 +113,7 @@ namespace Server.Engines.ConPVP
if ( Core.SE )
{
entries.Add( new RulesetLayout( "Bushido", new string[]
entries.Add( new RulesetLayout( "Bushido", new[]
{
"Confidence",
"Counter Attack",
@ -123,7 +123,7 @@ namespace Server.Engines.ConPVP
"Momentum Strike"
} ) );
entries.Add( new RulesetLayout( "Ninjitsu", new string[]
entries.Add( new RulesetLayout( "Ninjitsu", new[]
{
"Animal Form",
"Backstab",
@ -137,7 +137,7 @@ namespace Server.Engines.ConPVP
if ( Core.ML )
{
entries.Add( new RulesetLayout( "Spellweaving", new string[]
entries.Add( new RulesetLayout( "Spellweaving", new[]
{
"Arcane Circle",
"Arcane Empowerment",
@ -164,7 +164,7 @@ namespace Server.Engines.ConPVP
{
if ( Core.SE )
{
entries.Add( new RulesetLayout( "Combat Abilities", new string[]
entries.Add( new RulesetLayout( "Combat Abilities", new[]
{
"Stun",
"Disarm",
@ -197,7 +197,7 @@ namespace Server.Engines.ConPVP
}
else
{
entries.Add( new RulesetLayout( "Combat Abilities", new string[]
entries.Add( new RulesetLayout( "Combat Abilities", new[]
{
"Stun",
"Disarm",
@ -219,7 +219,7 @@ namespace Server.Engines.ConPVP
}
else
{
entries.Add( new RulesetLayout( "Combat Abilities", new string[]
entries.Add( new RulesetLayout( "Combat Abilities", new[]
{
"Stun",
"Disarm",
@ -229,7 +229,7 @@ namespace Server.Engines.ConPVP
} ) );
}
entries.Add( new RulesetLayout( "Skills", new string[]
entries.Add( new RulesetLayout( "Skills", new[]
{
"Anatomy",
"Detect Hidden",
@ -244,7 +244,7 @@ namespace Server.Engines.ConPVP
if ( Core.AOS )
{
entries.Add( new RulesetLayout( "Weapons", new string[]
entries.Add( new RulesetLayout( "Weapons", new[]
{
"Magical",
"Melee",
@ -253,7 +253,7 @@ namespace Server.Engines.ConPVP
"Wrestling"
} ) );
entries.Add( new RulesetLayout( "Armor", new string[]
entries.Add( new RulesetLayout( "Armor", new[]
{
"Magical",
"Shields"
@ -261,7 +261,7 @@ namespace Server.Engines.ConPVP
}
else
{
entries.Add( new RulesetLayout( "Weapons", new string[]
entries.Add( new RulesetLayout( "Weapons", new[]
{
"Magical",
"Melee",
@ -271,7 +271,7 @@ namespace Server.Engines.ConPVP
"Runics"
} ) );
entries.Add( new RulesetLayout( "Armor", new string[]
entries.Add( new RulesetLayout( "Armor", new[]
{
"Magical",
"Shields",
@ -281,9 +281,9 @@ namespace Server.Engines.ConPVP
if ( Core.SE )
{
entries.Add( new RulesetLayout( "Items", new RulesetLayout[]
entries.Add( new RulesetLayout( "Items", new[]
{
new RulesetLayout( "Potions", new string[]
new RulesetLayout( "Potions", new[]
{
"Agility",
"Cure",
@ -295,7 +295,7 @@ namespace Server.Engines.ConPVP
"Strength"
} )
},
new string[]
new[]
{
"Bandages",
"Wands",
@ -310,9 +310,9 @@ namespace Server.Engines.ConPVP
}
else
{
entries.Add( new RulesetLayout( "Items", new RulesetLayout[]
entries.Add( new RulesetLayout( "Items", new[]
{
new RulesetLayout( "Potions", new string[]
new RulesetLayout( "Potions", new[]
{
"Agility",
"Cure",
@ -324,7 +324,7 @@ namespace Server.Engines.ConPVP
"Strength"
} )
},
new string[]
new[]
{
"Bandages",
"Wands",
@ -497,7 +497,7 @@ namespace Server.Engines.ConPVP
s7x.SetOption( "Items", "Trapped Containers", true );
#endregion
m_Root.Defaults = new Ruleset[] { m5x, m7x, s7x };
m_Root.Defaults = new[] { m5x, m7x, s7x };
}
else
{
@ -586,7 +586,7 @@ namespace Server.Engines.ConPVP
all.SetOption( "Items", "Bandages", true );
all.SetOption( "Items", "Trapped Containers", true );
m_Root.Defaults = new Ruleset[] { all };
m_Root.Defaults = new[] { all };
#endregion
}
@ -642,7 +642,7 @@ namespace Server.Engines.ConPVP
summons.SetOption( "Spellweaving", "Summon Fiend", true );
summons.SetOption( "Spellweaving", "Nature's Fury", true );
m_Root.Flavors = new Ruleset[]{ pots, para, fields, area, summons };
m_Root.Flavors = new[]{ pots, para, fields, area, summons };
}
return m_Root;