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

2
Scripts/Gumps/AddDoorGump.cs
View file

@ -100,7 +100,7 @@ namespace Server.Gumps
e.Mobile.SendGump( new AddDoorGump() );
}
public static DoorInfo[] m_Types = new DoorInfo[]
public static DoorInfo[] m_Types = new[]
{
new DoorInfo( typeof( MetalDoor ), 0x675 ),
new DoorInfo( typeof( RattanDoor ), 0x695 ),

2
Scripts/Gumps/AddGump.cs
View file

@ -185,7 +185,7 @@ namespace Server.Gumps
else if ( p is Mobile m )
p = m.Location;
Server.Commands.Add.Invoke( from, new Point3D( p ), new Point3D( p ), new string[]{ m_Type.Name } );
Server.Commands.Add.Invoke( from, new Point3D( p ), new Point3D( p ), new[]{ m_Type.Name } );
from.Target = new InternalTarget( m_Type, m_SearchResults, m_SearchString, m_Page );
}

4
Scripts/Gumps/AdminGump.cs
View file

@ -160,7 +160,7 @@ namespace Server.Gumps
}
}
private static string[] m_AccessLevelStrings = new string[]
private static string[] m_AccessLevelStrings = new[]
{
"Player",
"Counselor",
@ -2724,7 +2724,7 @@ namespace Server.Gumps
if ( m_PageType == AdminGumpPage.AccountDetails_Access_ClientIPs )
{
from.SendGump( new WarningGump( 1060635, 30720, String.Format( "You are about to firewall {0}. All connection attempts from a matching IP will be refused. Are you sure?", m_List[index] ), 0xFFC000, 420, 280, new WarningGumpCallback( Firewall_Callback ), new object[]{ a, m_List[index] } ) );
from.SendGump( new WarningGump( 1060635, 30720, String.Format( "You are about to firewall {0}. All connection attempts from a matching IP will be refused. Are you sure?", m_List[index] ), 0xFFC000, 420, 280, new WarningGumpCallback( Firewall_Callback ), new[]{ a, m_List[index] } ) );
}
else if ( m_PageType == AdminGumpPage.AccountDetails_Access_Restrictions )
{

2
Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs
View file

@ -126,7 +126,7 @@ namespace Server.Guilds
public GuildDiplomacyGump( PlayerMobile pm, Guild g, IComparer<Guild> currentComparer, bool ascending, string filter, int startNumber, GuildDisplayType display, List<Guild> list, TextDefinition lowerText )
: base( pm, g, list, currentComparer, ascending, filter, startNumber,
new InfoField<Guild>[]
new[]
{
new InfoField<Guild>( 1062954, 280, GuildDiplomacyGump.NameComparer.Instance ), //Guild Name
new InfoField<Guild>( 1062957, 50, GuildDiplomacyGump.AbbrevComparer.Instance ), //Abbrev

2
Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs
View file

@ -106,7 +106,7 @@ namespace Server.Guilds
#endregion
private static InfoField<PlayerMobile>[] m_Fields =
new InfoField<PlayerMobile>[]
new[]
{
new InfoField<PlayerMobile>( 1062955, 130, GuildRosterGump.NameComparer.Instance ), //Name
new InfoField<PlayerMobile>( 1062956, 80, GuildRosterGump.RankComparer.Instance ), //Rank

8
Scripts/Gumps/HouseGumpAOS.cs
View file

@ -163,22 +163,22 @@ namespace Server.Gumps
return 1 + (index * 15) + type;
}
private static int[] m_HangerNumbers = new int[]
private static int[] m_HangerNumbers = new[]
{
2968, 2970, 2972,
2974, 2976, 2978
};
private static int[] m_FoundationNumbers = (Core.ML ? new int[]
private static int[] m_FoundationNumbers = (Core.ML ? new[]
{
20, 189, 765, 65, 101, 0x2DF7, 0x2DFB, 0x3672, 0x3676
}:
new int[]
new[]
{
20, 189, 765, 65, 101
});
private static int[] m_PostNumbers = new int[]
private static int[] m_PostNumbers = new[]
{
9, 29, 54, 90, 147, 169,
177, 204, 251, 257, 263,

28
Scripts/Gumps/PlayerVendorGumps.cs
View file

@ -380,8 +380,8 @@ namespace Server.Gumps
public int LocNumber => m_LocNum;
}
private static CustomCategory[] Categories = new CustomCategory[]{
new CustomCategory( Layer.InnerTorso, 1011357, true, new CustomItem[]{// Upper Torso
private static CustomCategory[] Categories = new[]{
new CustomCategory( Layer.InnerTorso, 1011357, true, new[]{// Upper Torso
new CustomItem( typeof( Shirt ), 1011359, 5399 ),
new CustomItem( typeof( FancyShirt ), 1011360, 7933 ),
new CustomItem( typeof( PlainDress ), 1011363, 7937 ),
@ -389,7 +389,7 @@ namespace Server.Gumps
new CustomItem( typeof( Robe ), 1011365, 7939 )
} ),
new CustomCategory( Layer.MiddleTorso, 1011371, true, new CustomItem[]{//Over chest
new CustomCategory( Layer.MiddleTorso, 1011371, true, new[]{//Over chest
new CustomItem( typeof( Doublet ), 1011358, 8059 ),
new CustomItem( typeof( Tunic ), 1011361, 8097 ),
new CustomItem( typeof( JesterSuit ), 1011366, 8095 ),
@ -399,14 +399,14 @@ namespace Server.Gumps
new CustomItem( typeof( FullApron ), 1011374, 5437 ),
} ),
new CustomCategory( Layer.Shoes, 1011388, true, new CustomItem[]{//Footwear
new CustomCategory( Layer.Shoes, 1011388, true, new[]{//Footwear
new CustomItem( typeof( Sandals ), 1011389, 5901 ),
new CustomItem( typeof( Shoes ), 1011390, 5904 ),
new CustomItem( typeof( Boots ), 1011391, 5899 ),
new CustomItem( typeof( ThighBoots ), 1011392, 5906 ),
} ),
new CustomCategory( Layer.Helm, 1011375, true, new CustomItem[]{//Hats
new CustomCategory( Layer.Helm, 1011375, true, new[]{//Hats
new CustomItem( typeof( SkullCap ), 1011376, 5444 ),
new CustomItem( typeof( Bandana ), 1011377, 5440 ),
new CustomItem( typeof( FloppyHat ), 1011378, 5907 ),
@ -415,7 +415,7 @@ namespace Server.Gumps
new CustomItem( typeof( TallStrawHat ), 1011382, 5910 )
} ),
new CustomCategory( Layer.Helm, 1015319, true, new CustomItem[]{//More Hats
new CustomCategory( Layer.Helm, 1015319, true, new[]{//More Hats
new CustomItem( typeof( StrawHat ), 1011382, 5911 ),
new CustomItem( typeof( WizardsHat ), 1011383, 5912 ),
new CustomItem( typeof( Bonnet ), 1011384, 5913 ),
@ -424,17 +424,17 @@ namespace Server.Gumps
new CustomItem( typeof( JesterHat ), 1011387, 5916 )
} ),
new CustomCategory( Layer.Pants, 1011367, true, new CustomItem[]{ //Lower Torso
new CustomCategory( Layer.Pants, 1011367, true, new[]{ //Lower Torso
new CustomItem( typeof( LongPants ), 1011368, 5433 ),
new CustomItem( typeof( Kilt ), 1011369, 5431 ),
new CustomItem( typeof( Skirt ), 1011370, 5398 ),
} ),
new CustomCategory( Layer.Cloak, 1011393, true, new CustomItem[]{ // Back
new CustomCategory( Layer.Cloak, 1011393, true, new[]{ // Back
new CustomItem( typeof( Cloak ), 1011394, 5397 )
} ),
new CustomCategory( Layer.Hair, 1011395, true, new CustomItem[]{ // Hair
new CustomCategory( Layer.Hair, 1011395, true, new[]{ // Hair
new CustomItem( 0x203B, 1011052 ),
new CustomItem( 0x203C, 1011053 ),
new CustomItem( 0x203D, 1011054 ),
@ -446,7 +446,7 @@ namespace Server.Gumps
new CustomItem( 0x2049, 1011049 ),
} ),
new CustomCategory( Layer.FacialHair, 1015320, true, new CustomItem[]{//Facial Hair
new CustomCategory( Layer.FacialHair, 1015320, true, new[]{//Facial Hair
new CustomItem( 0x2041, 1011062 ),
new CustomItem( 0x203F, 1011060 ),
new CustomItem( 0x204B, 1015321, true ),
@ -456,7 +456,7 @@ namespace Server.Gumps
new CustomItem( 0x204D, 1011401 ),
} ),
new CustomCategory( Layer.FirstValid, 1011397, false, new CustomItem[]{//Held items
new CustomCategory( Layer.FirstValid, 1011397, false, new[]{//Held items
new CustomItem( typeof( FishingPole ), 1011406, 3520 ),
new CustomItem( typeof( Pickaxe ), 1011407, 3717 ),
new CustomItem( typeof( Pitchfork ), 1011408, 3720 ),
@ -468,7 +468,7 @@ namespace Server.Gumps
new CustomItem( typeof( GnarledStaff ), 1011413, 5113 )
} ),
new CustomCategory( Layer.FirstValid, 1015325, false, new CustomItem[]{//More held items
new CustomCategory( Layer.FirstValid, 1015325, false, new[]{//More held items
new CustomItem( typeof( Crossbow ), 1011414, 3920 ),
new CustomItem( typeof( WarMace ), 1011415, 5126 ),
new CustomItem( typeof( TwoHandedAxe ), 1011416, 5186 ),
@ -798,7 +798,7 @@ namespace Server.Gumps
}
}
private static HairOrBeard[] m_HairStyles = new HairOrBeard[]
private static HairOrBeard[] m_HairStyles = new[]
{
new HairOrBeard( 0x203B, 1011052 ), // Short
new HairOrBeard( 0x203C, 1011053 ), // Long
@ -811,7 +811,7 @@ namespace Server.Gumps
new HairOrBeard( 0x2049, 1011049 ) // 2-tails
};
private static HairOrBeard[] m_BeardStyles = new HairOrBeard[]
private static HairOrBeard[] m_BeardStyles = new[]
{
new HairOrBeard( 0x2041, 1011062 ), // Mustache
new HairOrBeard( 0x203F, 1011060 ), // Short beard

4
Scripts/Gumps/PolymorphGump.cs
View file

@ -62,7 +62,7 @@ namespace Server.Gumps
public int LocNumber => m_Num;
}
private static PolymorphCategory[] Categories = new PolymorphCategory[]
private static PolymorphCategory[] Categories = new[]
{
new PolymorphCategory( 1015235, // Animals
PolymorphEntry.Chicken,
@ -155,7 +155,7 @@ namespace Server.Gumps
public class NewPolymorphGump : Gump
{
private static readonly PolymorphEntry[] m_Entries = new PolymorphEntry[]
private static readonly PolymorphEntry[] m_Entries = new[]
{
PolymorphEntry.Chicken,
PolymorphEntry.Dog,

10
Scripts/Gumps/Props/PropsGump.cs
View file

@ -230,10 +230,10 @@ namespace Server.Gumps
}
}
public static string[] m_BoolNames = new string[]{ "True", "False" };
public static string[] m_BoolNames = new[]{ "True", "False" };
public static object[] m_BoolValues = new object[]{ true, false };
public static string[] m_PoisonNames = new string[]{ "None", "Lesser", "Regular", "Greater", "Deadly", "Lethal" };
public static string[] m_PoisonNames = new[]{ "None", "Lesser", "Regular", "Greater", "Deadly", "Lethal" };
public static object[] m_PoisonValues = new object[]{ null, Poison.Lesser, Poison.Regular, Poison.Greater, Poison.Deadly, Poison.Lethal };
public override void OnResponse( NetState state, RelayInfo info )
@ -414,13 +414,13 @@ namespace Server.Gumps
private static Type typeofPropertyObject = typeof( PropertyObjectAttribute );
private static Type typeofNoSort = typeof( NoSortAttribute );
private static Type[] typeofReal = new Type[]
private static Type[] typeofReal = new[]
{
typeof( Single ),
typeof( Double )
};
private static Type[] typeofNumeric = new Type[]
private static Type[] typeofNumeric = new[]
{
typeof( Byte ),
typeof( Int16 ),
@ -625,7 +625,7 @@ namespace Server.Gumps
}
else if ( t.IsDefined( typeof( ParsableAttribute ), false ) )
{
MethodInfo parseMethod = t.GetMethod( "Parse", new Type[]{ typeof( string ) } );
MethodInfo parseMethod = t.GetMethod( "Parse", new[]{ typeof( string ) } );
return parseMethod.Invoke( null, new object[]{ s } );
}

2
Scripts/Gumps/Props/SetBodyGump.cs
View file

@ -238,7 +238,7 @@ namespace Server.Gumps
public string Name => m_Name;
public string DisplayName => m_DisplayName;
private static string[] m_GroupNames = new string[]
private static string[] m_GroupNames = new[]
{
"ogres_", "ettins_", "walking_dead_", "gargoyles_",
"orcs_", "flails_", "daemons_", "arachnids_",

2
Scripts/Gumps/Props/SetCustomEnumGump.cs
View file

@ -24,7 +24,7 @@ namespace Server.Gumps
{
try
{
MethodInfo info = m_Property.PropertyType.GetMethod( "Parse", new Type[]{ typeof( string ) } );
MethodInfo info = m_Property.PropertyType.GetMethod( "Parse", new[]{ typeof( string ) } );
string result = "";

16
Scripts/Gumps/SkillsGump.cs
View file

@ -457,9 +457,9 @@ namespace Server.Gumps
}
}
private static SkillsGumpGroup[] m_Groups = new SkillsGumpGroup[]
private static SkillsGumpGroup[] m_Groups = new[]
{
new SkillsGumpGroup( "Crafting", new SkillName[]
new SkillsGumpGroup( "Crafting", new[]
{
SkillName.Alchemy,
SkillName.Blacksmith,
@ -472,14 +472,14 @@ namespace Server.Gumps
SkillName.Tinkering,
SkillName.Imbuing
} ),
new SkillsGumpGroup( "Bardic", new SkillName[]
new SkillsGumpGroup( "Bardic", new[]
{
SkillName.Discordance,
SkillName.Musicianship,
SkillName.Peacemaking,
SkillName.Provocation
} ),
new SkillsGumpGroup( "Magical", new SkillName[]
new SkillsGumpGroup( "Magical", new[]
{
SkillName.Chivalry,
SkillName.EvalInt,
@ -493,7 +493,7 @@ namespace Server.Gumps
SkillName.Spellweaving,
SkillName.Mysticism
} ),
new SkillsGumpGroup( "Miscellaneous", new SkillName[]
new SkillsGumpGroup( "Miscellaneous", new[]
{
SkillName.Camping,
SkillName.Fishing,
@ -506,7 +506,7 @@ namespace Server.Gumps
SkillName.Snooping,
SkillName.Veterinary
} ),
new SkillsGumpGroup( "Combat Ratings", new SkillName[]
new SkillsGumpGroup( "Combat Ratings", new[]
{
SkillName.Archery,
SkillName.Fencing,
@ -517,7 +517,7 @@ namespace Server.Gumps
SkillName.Wrestling,
SkillName.Throwing
} ),
new SkillsGumpGroup( "Actions", new SkillName[]
new SkillsGumpGroup( "Actions", new[]
{
SkillName.AnimalTaming,
SkillName.Begging,
@ -529,7 +529,7 @@ namespace Server.Gumps
SkillName.Stealth,
SkillName.Tracking
} ),
new SkillsGumpGroup( "Lore & Knowledge", new SkillName[]
new SkillsGumpGroup( "Lore & Knowledge", new[]
{
SkillName.Anatomy,
SkillName.AnimalLore,