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

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

132
Scripts/Items/Containers/FillableContainers.cs
View file

@ -583,12 +583,12 @@ namespace Server.Items
public int Weight => m_Weight;
public FillableEntry( Type type )
: this( 1, new Type[] { type } )
: this( 1, new[] { type } )
{
}
public FillableEntry( int weight, Type type )
: this( weight, new Type[] { type } )
: this( weight, new[] { type } )
{
}
@ -732,11 +732,11 @@ namespace Server.Items
public static FillableContent Alchemist = new FillableContent(
1,
new Type[]
new[]
{
typeof( Mobiles.Alchemist )
},
new FillableEntry[]
new[]
{
new FillableEntry( typeof( NightSightPotion ) ),
new FillableEntry( typeof( LesserCurePotion ) ),
@ -751,11 +751,11 @@ namespace Server.Items
public static FillableContent Armorer = new FillableContent(
2,
new Type[]
new[]
{
typeof( Armorer )
},
new FillableEntry[]
new[]
{
new FillableEntry( 2, typeof( ChainCoif ) ),
new FillableEntry( 1, typeof( PlateGorget ) ),
@ -772,7 +772,7 @@ namespace Server.Items
new Type[]
{
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( PaintsAndBrush ) ),
new FillableEntry( 1, typeof( SledgeHammer ) ),
@ -798,11 +798,11 @@ namespace Server.Items
public static FillableContent Baker = new FillableContent(
1,
new Type[]
new[]
{
typeof( Baker ),
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( RollingPin ) ),
new FillableEntry( 2, typeof( SackFlour ) ),
@ -812,12 +812,12 @@ namespace Server.Items
public static FillableContent Bard = new FillableContent(
1,
new Type[]
new[]
{
typeof( Bard ),
typeof( BardGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( LapHarp ) ),
new FillableEntry( 2, typeof( Lute ) ),
@ -828,12 +828,12 @@ namespace Server.Items
public static FillableContent Blacksmith = new FillableContent(
2,
new Type[]
new[]
{
typeof( Blacksmith ),
typeof( BlacksmithGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 8, typeof( SmithHammer ) ),
new FillableEntry( 8, typeof( Tongs ) ),
@ -850,11 +850,11 @@ namespace Server.Items
public static FillableContent Bowyer = new FillableContent(
2,
new Type[]
new[]
{
typeof( Bowyer )
},
new FillableEntry[]
new[]
{
new FillableEntry( 2, typeof( Bow ) ),
new FillableEntry( 2, typeof( Crossbow ) ),
@ -863,11 +863,11 @@ namespace Server.Items
public static FillableContent Butcher = new FillableContent(
1,
new Type[]
new[]
{
typeof( Butcher ),
},
new FillableEntry[]
new[]
{
new FillableEntry( 2, typeof( Cleaver ) ),
new FillableEntry( 2, typeof( SlabOfBacon ) ),
@ -888,13 +888,13 @@ namespace Server.Items
public static FillableContent Carpenter = new FillableContent(
1,
new Type[]
new[]
{
typeof( Carpenter ),
typeof( Architect ),
typeof( RealEstateBroker )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( ChiselsNorth ) ),
new FillableEntry( 1, typeof( ChiselsWest ) ),
@ -914,13 +914,13 @@ namespace Server.Items
public static FillableContent Clothier = new FillableContent(
1,
new Type[]
new[]
{
typeof( Tailor ),
typeof( Weaver ),
typeof( TailorGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( Cotton ) ),
new FillableEntry( 1, typeof( Wool ) ),
@ -939,11 +939,11 @@ namespace Server.Items
public static FillableContent Cobbler = new FillableContent(
1,
new Type[]
new[]
{
typeof( Cobbler )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( Boots ) ),
new FillableEntry( 2, typeof( Shoes ) ),
@ -953,12 +953,12 @@ namespace Server.Items
public static FillableContent Docks = new FillableContent(
1,
new Type[]
new[]
{
typeof( Fisherman ),
typeof( FisherGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( FishingPole ) ),
// Two different types
@ -969,12 +969,12 @@ namespace Server.Items
public static FillableContent Farm = new FillableContent(
1,
new Type[]
new[]
{
typeof( Farmer ),
typeof( Rancher )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( Shirt ) ),
new FillableEntry( 1, typeof( ShortPants ) ),
@ -998,11 +998,11 @@ namespace Server.Items
public static FillableContent FighterGuild = new FillableContent(
3,
new Type[]
new[]
{
typeof( WarriorGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 12, Loot.ArmorTypes ),
new FillableEntry( 8, Loot.WeaponTypes ),
@ -1015,7 +1015,7 @@ namespace Server.Items
new Type[]
{
},
new FillableEntry[]
new[]
{
new FillableEntry( 12, Loot.ArmorTypes ),
new FillableEntry( 8, Loot.WeaponTypes ),
@ -1025,12 +1025,12 @@ namespace Server.Items
public static FillableContent Healer = new FillableContent(
1,
new Type[]
new[]
{
typeof( Healer ),
typeof( HealerGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( Bandage ) ),
new FillableEntry( 1, typeof( MortarPestle ) ),
@ -1039,11 +1039,11 @@ namespace Server.Items
public static FillableContent Herbalist = new FillableContent(
1,
new Type[]
new[]
{
typeof( Herbalist )
},
new FillableEntry[]
new[]
{
new FillableEntry( 10, typeof( Garlic ) ),
new FillableEntry( 10, typeof( Ginseng ) ),
@ -1060,7 +1060,7 @@ namespace Server.Items
new Type[]
{
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( Candle ) ),
new FillableEntry( 1, typeof( Torch ) ),
@ -1069,11 +1069,11 @@ namespace Server.Items
public static FillableContent Jeweler = new FillableContent(
2,
new Type[]
new[]
{
typeof( Jeweler )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( GoldRing ) ),
new FillableEntry( 1, typeof( GoldBracelet ) ),
@ -1087,11 +1087,11 @@ namespace Server.Items
public static FillableContent Library = new FillableContent(
1,
new Type[]
new[]
{
typeof( Scribe )
},
new FillableEntry[]
new[]
{
new FillableEntry( 8, Loot.LibraryBookTypes ),
new FillableEntry( 1, typeof( RedBook ) ),
@ -1100,13 +1100,13 @@ namespace Server.Items
public static FillableContent Mage = new FillableContent(
2,
new Type[]
new[]
{
typeof( Mage ),
typeof( HolyMage ),
typeof( MageGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 16, typeof( BlankScroll ) ),
new FillableEntry( 14, typeof( Spellbook ) ),
@ -1122,11 +1122,11 @@ namespace Server.Items
public static FillableContent Merchant = new FillableContent(
1,
new Type[]
new[]
{
typeof( MerchantGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( CheeseWheel ) ),
new FillableEntry( 1, typeof( CheeseWedge ) ),
@ -1183,18 +1183,18 @@ namespace Server.Items
new Type[]
{
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( SackFlour ) )
} );
public static FillableContent Mine = new FillableContent(
1,
new Type[]
new[]
{
typeof( Miner )
},
new FillableEntry[]
new[]
{
new FillableEntry( 2, typeof( Pickaxe ) ),
new FillableEntry( 2, typeof( Shovel ) ),
@ -1208,7 +1208,7 @@ namespace Server.Items
new Type[]
{
},
new FillableEntry[]
new[]
{
new FillableEntry( 2, typeof( Sextant ) ),
new FillableEntry( 2, typeof( Clock ) ),
@ -1220,7 +1220,7 @@ namespace Server.Items
new Type[]
{
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( PaintsAndBrush ) ),
new FillableEntry( 2, typeof( PenAndInk ) )
@ -1228,11 +1228,11 @@ namespace Server.Items
public static FillableContent Provisioner = new FillableContent(
1,
new Type[]
new[]
{
typeof( Provisioner )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( CheeseWheel ) ),
new FillableEntry( 1, typeof( CheeseWedge ) ),
@ -1293,12 +1293,12 @@ namespace Server.Items
public static FillableContent Ranger = new FillableContent(
2,
new Type[]
new[]
{
typeof( Ranger ),
typeof( RangerGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 2, typeof( StuddedChest ) ),
new FillableEntry( 2, typeof( StuddedLegs ) ),
@ -1331,12 +1331,12 @@ namespace Server.Items
public static FillableContent Stables = new FillableContent(
1,
new Type[]
new[]
{
typeof( AnimalTrainer ),
typeof( GypsyAnimalTrainer )
},
new FillableEntry[]
new[]
{
//new FillableEntry( 1, typeof( Wheat ) ),
new FillableEntry( 1, typeof( Carrot ) )
@ -1344,13 +1344,13 @@ namespace Server.Items
public static FillableContent Tanner = new FillableContent(
2,
new Type[]
new[]
{
typeof( Tanner ),
typeof( LeatherWorker ),
typeof( Furtrader )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( FeatheredHat ) ),
new FillableEntry( 1, typeof( LeatherArms ) ),
@ -1363,7 +1363,7 @@ namespace Server.Items
public static FillableContent Tavern = new FillableContent(
1,
new Type[]
new[]
{
typeof( TavernKeeper ),
typeof( Barkeeper ),
@ -1380,12 +1380,12 @@ namespace Server.Items
public static FillableContent ThiefGuild = new FillableContent(
1,
new Type[]
new[]
{
typeof( Thief ),
typeof( ThiefGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( Lockpick ) ),
new FillableEntry( 1, typeof( BearMask ) ),
@ -1397,12 +1397,12 @@ namespace Server.Items
public static FillableContent Tinker = new FillableContent(
1,
new Type[]
new[]
{
typeof( Tinker ),
typeof( TinkerGuildmaster )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( Lockpick ) ),
//new FillableEntry( 1, typeof( KeyRing ) ),
@ -1425,11 +1425,11 @@ namespace Server.Items
public static FillableContent Veterinarian = new FillableContent(
1,
new Type[]
new[]
{
typeof( Veterinarian )
},
new FillableEntry[]
new[]
{
new FillableEntry( 1, typeof( Bandage ) ),
new FillableEntry( 1, typeof( MortarPestle ) ),
@ -1440,11 +1440,11 @@ namespace Server.Items
public static FillableContent Weaponsmith = new FillableContent(
2,
new Type[]
new[]
{
typeof( Weaponsmith )
},
new FillableEntry[]
new[]
{
new FillableEntry( 8, Loot.WeaponTypes ),
new FillableEntry( 1, typeof( Arrow ) )
@ -1470,7 +1470,7 @@ namespace Server.Items
private static Hashtable m_AcquireTable;
private static FillableContent[] m_ContentTypes = new FillableContent[]
private static FillableContent[] m_ContentTypes = new[]
{
Weaponsmith, Provisioner, Mage,
Alchemist, Armorer, ArtisanGuild,

4
Scripts/Items/Containers/ParagonChest.cs
View file

@ -3,12 +3,12 @@ namespace Server.Items
[Flippable]
public class ParagonChest : LockableContainer
{
private static int[] m_ItemIDs = new int[]
private static int[] m_ItemIDs = new[]
{
0x9AB, 0xE40, 0xE41, 0xE7C
};
private static int[] m_Hues = new int[]
private static int[] m_Hues = new[]
{
0x0, 0x455, 0x47E, 0x89F, 0x8A5, 0x8AB,
0x966, 0x96D, 0x972, 0x973, 0x979

2
Scripts/Items/Containers/TreasureMapChest.cs
View file

@ -13,7 +13,7 @@ namespace Server.Items
public static Type[] Artifacts => m_Artifacts;
private static Type[] m_Artifacts = new Type[]
private static Type[] m_Artifacts = new[]
{
typeof( CandelabraOfSouls ), typeof( GoldBricks ), typeof( PhillipsWoodenSteed ),
typeof( ArcticDeathDealer ), typeof( BlazeOfDeath ), typeof( BurglarsBandana ),