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/Items/Addons/AddonComponent.cs
View file

@ -244,7 +244,7 @@ namespace Server.Items
}
}
private static LightEntry[] m_Entries = new LightEntry[]
private static LightEntry[] m_Entries = new[]
{
new LightEntry( LightType.WestSmall, 1122, 1123, 1124, 1141, 1142, 1143, 1144, 1145, 1146, 2347, 2359, 2360, 2361, 2362, 2363, 2364, 2387, 2388, 2389, 2390, 2391, 2392 ),
new LightEntry( LightType.NorthSmall, 1131, 1133, 1134, 1147, 1148, 1149, 1150, 1151, 1152, 2352, 2373, 2374, 2375, 2376, 2377, 2378, 2401, 2402, 2403, 2404, 2405, 2406 ),

10
Scripts/Items/Addons/FlourMillEastAddon.cs
View file

@ -80,11 +80,11 @@ namespace Server.Items
UpdateStage();
}
private static int[][] m_StageTable = new int[][]
{
new int[]{ 0x1920, 0x1921, 0x1925 },
new int[]{ 0x1922, 0x1923, 0x1926 },
new int[]{ 0x1924, 0x1924, 0x1928 }
private static int[][] m_StageTable = new[]
{
new[]{ 0x1920, 0x1921, 0x1925 },
new[]{ 0x1922, 0x1923, 0x1926 },
new[]{ 0x1924, 0x1924, 0x1928 }
};
private int[] FindItemTable( int itemID )

10
Scripts/Items/Addons/FlourMillSouthAddon.cs
View file

@ -66,11 +66,11 @@ namespace Server.Items
UpdateStage();
}
private static int[][] m_StageTable = new int[][]
{
new int[]{ 0x192C, 0x192D, 0x1931 },
new int[]{ 0x192E, 0x192F, 0x1932 },
new int[]{ 0x1930, 0x1930, 0x1934 }
private static int[][] m_StageTable = new[]
{
new[]{ 0x192C, 0x192D, 0x1931 },
new[]{ 0x192E, 0x192F, 0x1932 },
new[]{ 0x1930, 0x1930, 0x1934 }
};
private int[] FindItemTable( int itemID )

4
Scripts/Items/Aquarium/Aquarium.cs
View file

@ -895,7 +895,7 @@ namespace Server.Items
return null;
}
private static Type[] m_Decorations = new Type[]
private static Type[] m_Decorations = new[]
{
typeof( FishBones ),
typeof( WaterloggedBoots ),
@ -924,7 +924,7 @@ namespace Server.Items
return false;
}
private static int[] m_FishHues = new int[]
private static int[] m_FishHues = new[]
{
0x1C2, 0x1C3, 0x2A3, 0x47E, 0x51D
};

2
Scripts/Items/Champion Artifacts/Decorative/Pier.cs
View file

@ -16,7 +16,7 @@ namespace Server.Items
*
*/
private static int[] m_itemids = new int[]
private static int[] m_itemids = new[]
{
0x3486, 0x348b, 0x3ae
};

2
Scripts/Items/Champion Artifacts/Decorative/Web.cs
View file

@ -2,7 +2,7 @@ namespace Server.Items
{
public class Web : Item
{
private static int[] m_itemids = new int[]
private static int[] m_itemids = new[]
{
0x10d7, 0x10d8, 0x10dd
};

2
Scripts/Items/Construction/Doors/BaseDoor.cs
View file

@ -17,7 +17,7 @@ namespace Server.Items
private Timer m_Timer;
private static Point3D[] m_Offsets = new Point3D[]
private static Point3D[] m_Offsets = new[]
{
new Point3D(-1, 1, 0 ),
new Point3D( 1, 1, 0 ),

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 ),

2
Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs
View file

@ -50,7 +50,7 @@ namespace Server.Items
}
}
private static StealableEntry[] m_Entries = new StealableEntry[]
private static StealableEntry[] m_Entries = new[]
{
// Doom - Artifact rarity 1
new StealableEntry( Map.Malas, new Point3D( 317, 56, -1 ), 72, 108, typeof( RockArtifact ) ),

64
Scripts/Items/Deeds/HairRestylingDeed.cs
View file

@ -103,17 +103,17 @@ namespace Server.Items
int[][] LayoutArray =
{
new int[] { 0 }, /* padding: its more efficient than code to ++ the index/buttonid */
new int[] { 425, 280, 342, 295, 000, 000, 310, 292 },
new int[] { 235, 060, 150, 075, 168, 020, 118, 073 },
new int[] { 235, 115, 150, 130, 168, 070, 118, 128 },
new int[] { 235, 170, 150, 185, 168, 130, 118, 183 },
new int[] { 235, 225, 150, 240, 168, 185, 118, 238 },
new int[] { 425, 060, 342, 075, 358, 018, 310, 073 },
new int[] { 425, 115, 342, 130, 358, 075, 310, 128 },
new int[] { 425, 170, 342, 185, 358, 125, 310, 183 },
new int[] { 425, 225, 342, 240, 358, 185, 310, 238 },
new int[] { 235, 280, 150, 295, 168, 245, 118, 292 } // slot 10, Curly - N/A for elfs.
new[] { 0 }, /* padding: its more efficient than code to ++ the index/buttonid */
new[] { 425, 280, 342, 295, 000, 000, 310, 292 },
new[] { 235, 060, 150, 075, 168, 020, 118, 073 },
new[] { 235, 115, 150, 130, 168, 070, 118, 128 },
new[] { 235, 170, 150, 185, 168, 130, 118, 183 },
new[] { 235, 225, 150, 240, 168, 185, 118, 238 },
new[] { 425, 060, 342, 075, 358, 018, 310, 073 },
new[] { 425, 115, 342, 130, 358, 075, 310, 128 },
new[] { 425, 170, 342, 185, 358, 125, 310, 183 },
new[] { 425, 225, 342, 240, 358, 185, 310, 238 },
new[] { 235, 280, 150, 295, 168, 245, 118, 292 } // slot 10, Curly - N/A for elfs.
};
/*
@ -121,30 +121,30 @@ namespace Server.Items
*/
int[][] HumanArray = /* why on earth cant these utilies be consistent with hex/dec */
{
new int[] { 0 },
new int[] { 1011064, 1011064, 0, 0, 0, 0 }, // bald
new int[] { 1011052, 1011052, 0x203B, 0x203B, 0xed1c, 0xC60C }, // Short
new int[] { 1011053, 1011053, 0x203C, 0x203C, 0xed1d, 0xc60d }, // Long
new int[] { 1011054, 1011054, 0x203D, 0x203D, 0xed1e, 0xc60e }, // Ponytail
new int[] { 1011055, 1011055, 0x2044, 0x2044, 0xed27, 0xC60F }, // Mohawk
new int[] { 1011047, 1011047, 0x2045, 0x2045, 0xED26, 0xED26 }, // Pageboy
new int[] { 1074393, 1011048, 0x2046, 0x2048, 0xed28, 0xEDE5 }, // Buns, Receding
new int[] { 1011049, 1011049, 0x2049, 0x2049, 0xede6, 0xede6 }, // 2-tails
new int[] { 1011050, 1011050, 0x204A, 0x204A, 0xED29, 0xED29 }, // Topknot
new int[] { 1011396, 1011396, 0x2047, 0x2047, 0xed25, 0xc618 } // Curly
new[] { 0 },
new[] { 1011064, 1011064, 0, 0, 0, 0 }, // bald
new[] { 1011052, 1011052, 0x203B, 0x203B, 0xed1c, 0xC60C }, // Short
new[] { 1011053, 1011053, 0x203C, 0x203C, 0xed1d, 0xc60d }, // Long
new[] { 1011054, 1011054, 0x203D, 0x203D, 0xed1e, 0xc60e }, // Ponytail
new[] { 1011055, 1011055, 0x2044, 0x2044, 0xed27, 0xC60F }, // Mohawk
new[] { 1011047, 1011047, 0x2045, 0x2045, 0xED26, 0xED26 }, // Pageboy
new[] { 1074393, 1011048, 0x2046, 0x2048, 0xed28, 0xEDE5 }, // Buns, Receding
new[] { 1011049, 1011049, 0x2049, 0x2049, 0xede6, 0xede6 }, // 2-tails
new[] { 1011050, 1011050, 0x204A, 0x204A, 0xED29, 0xED29 }, // Topknot
new[] { 1011396, 1011396, 0x2047, 0x2047, 0xed25, 0xc618 } // Curly
};
int[][] ElvenArray =
{
new int[] { 0 },
new int[] { 1011064, 1011064, 0, 0, 0, 0, }, // bald
new int[] { 1074386, 1074386, 0x2fc0, 0x2fc0, 0xedf5, 0xc6e5 }, // long feather
new int[] { 1074387, 1074387, 0x2fc1, 0x2fc1, 0xedf6, 0xc6e6 }, // short
new int[] { 1074388, 1074388, 0x2fc2, 0x2fc2, 0xedf7, 0xc6e7 }, // mullet
new int[] { 1074391, 1074391, 0x2fce, 0x2fce, 0xeddc, 0xc6cc }, // knob
new int[] { 1074392, 1074392, 0x2fcf, 0x2fcf, 0xeddd, 0xc6cd }, // braided
new int[] { 1074394, 1074394, 0x2fd1, 0x2fd1, 0xeddf, 0xc6cf }, // spiked
new int[] { 1074389, 1074385, 0x2fcc, 0x2fbf, 0xedda, 0xc6e4 }, // flower, mid-long
new int[] { 1074393, 1074390, 0x2fd0, 0x2fcd, 0xedde, 0xc6cb } // buns, long
new[] { 0 },
new[] { 1011064, 1011064, 0, 0, 0, 0, }, // bald
new[] { 1074386, 1074386, 0x2fc0, 0x2fc0, 0xedf5, 0xc6e5 }, // long feather
new[] { 1074387, 1074387, 0x2fc1, 0x2fc1, 0xedf6, 0xc6e6 }, // short
new[] { 1074388, 1074388, 0x2fc2, 0x2fc2, 0xedf7, 0xc6e7 }, // mullet
new[] { 1074391, 1074391, 0x2fce, 0x2fce, 0xeddc, 0xc6cc }, // knob
new[] { 1074392, 1074392, 0x2fcf, 0x2fcf, 0xeddd, 0xc6cd }, // braided
new[] { 1074394, 1074394, 0x2fd1, 0x2fd1, 0xeddf, 0xc6cf }, // spiked
new[] { 1074389, 1074385, 0x2fcc, 0x2fbf, 0xedda, 0xc6e4 }, // flower, mid-long
new[] { 1074393, 1074390, 0x2fd0, 0x2fcd, 0xedde, 0xc6cb } // buns, long
};
}
}

2
Scripts/Items/Food/Beverage.cs
View file

@ -814,7 +814,7 @@ namespace Server.Items
}
}
private static int[] m_SwampTiles = new int[]
private static int[] m_SwampTiles = new[]
{
0x9C4, 0x9EB,
0x3D65, 0x3D65,

2
Scripts/Items/Maps/PresetMap.cs
View file

@ -79,7 +79,7 @@ namespace Server.Items
m_Bounds = new Rectangle2D( xLeft, yTop, xRight - xLeft, yBottom - yTop );
}
private static PresetMapEntry[] m_Table = new PresetMapEntry[]
private static PresetMapEntry[] m_Table = new[]
{
new PresetMapEntry( 1041189, 200, 200, 1092, 1396, 1736, 1924 ), // map of Britain
new PresetMapEntry( 1041203, 200, 200, 0256, 1792, 1736, 2560 ), // map of Britain to Skara Brae

16
Scripts/Items/Maps/TreasureMap.cs
View file

@ -45,15 +45,15 @@ namespace Server.Items
private static Point2D[] m_Locations;
private static Point2D[] m_HavenLocations;
private static Type[][] m_SpawnTypes = new Type[][]
private static Type[][] m_SpawnTypes = new[]
{
new Type[]{ typeof( HeadlessOne ), typeof( Skeleton ) },
new Type[]{ typeof( Mongbat ), typeof( Ratman ), typeof( HeadlessOne ), typeof( Skeleton ), typeof( Zombie ) },
new Type[]{ typeof( OrcishMage ), typeof( Gargoyle ), typeof( Gazer ), typeof( HellHound ), typeof( EarthElemental ) },
new Type[]{ typeof( Lich ), typeof( OgreLord ), typeof( DreadSpider ), typeof( AirElemental ), typeof( FireElemental ) },
new Type[]{ typeof( DreadSpider ), typeof( LichLord ), typeof( Daemon ), typeof( ElderGazer ), typeof( OgreLord ) },
new Type[]{ typeof( LichLord ), typeof( Daemon ), typeof( ElderGazer ), typeof( PoisonElemental ), typeof( BloodElemental ) },
new Type[]{ typeof( AncientWyrm ), typeof( Balron ), typeof( BloodElemental ), typeof( PoisonElemental ), typeof( Titan ) }
new[]{ typeof( HeadlessOne ), typeof( Skeleton ) },
new[]{ typeof( Mongbat ), typeof( Ratman ), typeof( HeadlessOne ), typeof( Skeleton ), typeof( Zombie ) },
new[]{ typeof( OrcishMage ), typeof( Gargoyle ), typeof( Gazer ), typeof( HellHound ), typeof( EarthElemental ) },
new[]{ typeof( Lich ), typeof( OgreLord ), typeof( DreadSpider ), typeof( AirElemental ), typeof( FireElemental ) },
new[]{ typeof( DreadSpider ), typeof( LichLord ), typeof( Daemon ), typeof( ElderGazer ), typeof( OgreLord ) },
new[]{ typeof( LichLord ), typeof( Daemon ), typeof( ElderGazer ), typeof( PoisonElemental ), typeof( BloodElemental ) },
new[]{ typeof( AncientWyrm ), typeof( Balron ), typeof( BloodElemental ), typeof( PoisonElemental ), typeof( Titan ) }
};
public const double LootChance = 0.01; // 1% chance to appear as loot

4
Scripts/Items/Misc/ClockworkAssembly.cs
View file

@ -58,14 +58,14 @@ namespace Server.Items
return;
int res = pack.ConsumeTotal(
new Type[]
new[]
{
typeof( PowerCrystal ),
typeof( IronIngot ),
typeof( BronzeIngot ),
typeof( Gears )
},
new int[]
new[]
{
1,
50,

2
Scripts/Items/Misc/CommunicationCrystals.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
{
public class CrystalRechargeInfo
{
public static readonly CrystalRechargeInfo[] Table = new CrystalRechargeInfo[]
public static readonly CrystalRechargeInfo[] Table = new[]
{
new CrystalRechargeInfo( typeof( Citrine ), 500 ),
new CrystalRechargeInfo( typeof( Amber ), 500 ),

2
Scripts/Items/Misc/DeceitBrazier.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class DeceitBrazier : Item
{
private static Type[] m_Creatures = new Type[]
private static Type[] m_Creatures = new[]
{
#region Animals
typeof( FireSteed ), //Set the tents up people!

2
Scripts/Items/Misc/FlippableAddonAttribute.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
{
private static string m_MethodName = "Flip";
private static Type[] m_Params = new Type[]
private static Type[] m_Params = new[]
{
typeof( Mobile ), typeof( Direction )
};

2
Scripts/Items/Misc/HairDye.cs
View file

@ -69,7 +69,7 @@ namespace Server.Items
}
}
private static HairDyeEntry[] m_Entries = new HairDyeEntry[]
private static HairDyeEntry[] m_Entries = new[]
{
new HairDyeEntry( "*****", 1602, 26 ),
new HairDyeEntry( "*****", 1628, 27 ),

4
Scripts/Items/Misc/Key.cs
View file

@ -45,7 +45,7 @@ namespace Server.Items
if ( cont == null || keyValue == 0 )
return;
Item[] items = cont.FindItemsByType( new Type[] { typeof( Key ), typeof( KeyRing ) } );
Item[] items = cont.FindItemsByType( new[] { typeof( Key ), typeof( KeyRing ) } );
foreach ( Item item in items )
{
@ -68,7 +68,7 @@ namespace Server.Items
if ( cont == null )
return false;
Item[] items = cont.FindItemsByType( new Type[] { typeof( Key ), typeof( KeyRing ) } );
Item[] items = cont.FindItemsByType( new[] { typeof( Key ), typeof( KeyRing ) } );
foreach ( Item item in items )
{

2
Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
public override int LabelNumber => 1075095; // Shimmering Crystals
public override bool ForceShowProperties => true;
private static readonly int[] m_ItemIDs = new int[]
private static readonly int[] m_ItemIDs = new[]
{
0x2206, 0x2207, 0x2208, 0x2209, 0x220A, 0x220B, 0x220C, 0x220D, 0x220E,
0x2210, 0x2211, 0x2212, 0x2213, 0x2214, 0x2215, 0x2216, 0x2217, 0x2218,

30
Scripts/Items/Misc/PublicMoongate.cs
View file

@ -191,7 +191,7 @@ namespace Server.Items
}
public static readonly PMList Trammel =
new PMList( 1012000, 1012012, Map.Trammel, new PMEntry[]
new PMList( 1012000, 1012012, Map.Trammel, new[]
{
new PMEntry( new Point3D( 4467, 1283, 5 ), 1012003 ), // Moonglow
new PMEntry( new Point3D( 1336, 1997, 5 ), 1012004 ), // Britain
@ -206,7 +206,7 @@ namespace Server.Items
} );
public static readonly PMList Felucca =
new PMList( 1012001, 1012013, Map.Felucca, new PMEntry[]
new PMList( 1012001, 1012013, Map.Felucca, new[]
{
new PMEntry( new Point3D( 4467, 1283, 5 ), 1012003 ), // Moonglow
new PMEntry( new Point3D( 1336, 1997, 5 ), 1012004 ), // Britain
@ -221,7 +221,7 @@ namespace Server.Items
} );
public static readonly PMList Ilshenar =
new PMList( 1012002, 1012014, Map.Ilshenar, new PMEntry[]
new PMList( 1012002, 1012014, Map.Ilshenar, new[]
{
new PMEntry( new Point3D( 1215, 467, -13 ), 1012015 ), // Compassion
new PMEntry( new Point3D( 722, 1366, -60 ), 1012016 ), // Honesty
@ -235,30 +235,30 @@ namespace Server.Items
} );
public static readonly PMList Malas =
new PMList( 1060643, 1062039, Map.Malas, new PMEntry[]
new PMList( 1060643, 1062039, Map.Malas, new[]
{
new PMEntry( new Point3D( 1015, 527, -65 ), 1060641 ), // Luna
new PMEntry( new Point3D( 1997, 1386, -85 ), 1060642 ) // Umbra
} );
public static readonly PMList Tokuno =
new PMList( 1063258, 1063415, Map.Tokuno, new PMEntry[]
new PMList( 1063258, 1063415, Map.Tokuno, new[]
{
new PMEntry( new Point3D( 1169, 998, 41 ), 1063412 ), // Isamu-Jima
new PMEntry( new Point3D( 802, 1204, 25 ), 1063413 ), // Makoto-Jima
new PMEntry( new Point3D( 270, 628, 15 ), 1063414 ) // Homare-Jima
} );
public static readonly PMList[] UORLists = new PMList[] { Trammel, Felucca };
public static readonly PMList[] UORListsYoung = new PMList[] { Trammel };
public static readonly PMList[] LBRLists = new PMList[] { Trammel, Felucca, Ilshenar };
public static readonly PMList[] LBRListsYoung = new PMList[] { Trammel, Ilshenar };
public static readonly PMList[] AOSLists = new PMList[] { Trammel, Felucca, Ilshenar, Malas };
public static readonly PMList[] AOSListsYoung = new PMList[] { Trammel, Ilshenar, Malas };
public static readonly PMList[] SELists = new PMList[] { Trammel, Felucca, Ilshenar, Malas, Tokuno };
public static readonly PMList[] SEListsYoung = new PMList[] { Trammel, Ilshenar, Malas, Tokuno };
public static readonly PMList[] RedLists = new PMList[] { Felucca };
public static readonly PMList[] SigilLists = new PMList[] { Felucca };
public static readonly PMList[] UORLists = new[] { Trammel, Felucca };
public static readonly PMList[] UORListsYoung = new[] { Trammel };
public static readonly PMList[] LBRLists = new[] { Trammel, Felucca, Ilshenar };
public static readonly PMList[] LBRListsYoung = new[] { Trammel, Ilshenar };
public static readonly PMList[] AOSLists = new[] { Trammel, Felucca, Ilshenar, Malas };
public static readonly PMList[] AOSListsYoung = new[] { Trammel, Ilshenar, Malas };
public static readonly PMList[] SELists = new[] { Trammel, Felucca, Ilshenar, Malas, Tokuno };
public static readonly PMList[] SEListsYoung = new[] { Trammel, Ilshenar, Malas, Tokuno };
public static readonly PMList[] RedLists = new[] { Felucca };
public static readonly PMList[] SigilLists = new[] { Felucca };
}
public class MoongateGump : Gump

2
Scripts/Items/Misc/SpecialBeardDye.cs
View file

@ -70,7 +70,7 @@ namespace Server.Items
}
}
private static SpecialBeardDyeEntry[] m_Entries = new SpecialBeardDyeEntry[]
private static SpecialBeardDyeEntry[] m_Entries = new[]
{
new SpecialBeardDyeEntry( "*****", 12, 10 ),
new SpecialBeardDyeEntry( "*****", 32, 5 ),

2
Scripts/Items/Misc/SpecialHairDye.cs
View file

@ -71,7 +71,7 @@ namespace Server.Items
}
}
private static SpecialHairDyeEntry[] m_Entries = new SpecialHairDyeEntry[]
private static SpecialHairDyeEntry[] m_Entries = new[]
{
new SpecialHairDyeEntry( "*****", 12, 10 ),
new SpecialHairDyeEntry( "*****", 32, 5 ),

2
Scripts/Items/Misc/WindChimes.cs
View file

@ -19,7 +19,7 @@ namespace Server.Items
{
}
private static int[] m_Sounds = new int[] { 0x505, 0x506, 0x507 };
private static int[] m_Sounds = new[] { 0x505, 0x506, 0x507 };
public static int[] Sounds => m_Sounds;

2
Scripts/Items/Quivers/BaseQuiver.cs
View file

@ -114,7 +114,7 @@ namespace Server.Items
return total;
}
private static Type[] m_Ammo = new Type[]
private static Type[] m_Ammo = new[]
{
typeof( Arrow ), typeof( Bolt )
};

2
Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -51,7 +51,7 @@ namespace Server.Items
}
}
private static TrophyInfo[] m_Table = new TrophyInfo[]
private static TrophyInfo[] m_Table = new[]
{
new TrophyInfo( typeof( BrownBear ), 0x1E60, 1041093, 1041107 ),
new TrophyInfo( typeof( GreatHart ), 0x1E61, 1041095, 1041109 ),

12
Scripts/Items/Skill Items/Fishing/Misc/SOS.cs
View file

@ -173,15 +173,15 @@ namespace Server.Items
}
}
private static int[] m_WaterTiles = new int[]
private static int[] m_WaterTiles = new[]
{
0x00A8, 0x00AB,
0x0136, 0x0137
};
private static Rectangle2D[] m_BritRegions = new Rectangle2D[]{ new Rectangle2D( 0, 0, 5120, 4096 ) };
private static Rectangle2D[] m_IlshRegions = new Rectangle2D[]{ new Rectangle2D( 1472, 272, 304, 240 ), new Rectangle2D( 1240, 1000, 312, 160 ) };
private static Rectangle2D[] m_MalasRegions = new Rectangle2D[]{ new Rectangle2D( 1376, 1520, 464, 280 ) };
private static Rectangle2D[] m_BritRegions = new[]{ new Rectangle2D( 0, 0, 5120, 4096 ) };
private static Rectangle2D[] m_IlshRegions = new[]{ new Rectangle2D( 1472, 272, 304, 240 ), new Rectangle2D( 1240, 1000, 312, 160 ) };
private static Rectangle2D[] m_MalasRegions = new[]{ new Rectangle2D( 1376, 1520, 464, 280 ) };
public static Point3D FindLocation( Map map )
{
@ -197,7 +197,7 @@ namespace Server.Items
else if ( map == Map.Malas )
regions = m_MalasRegions;
else
regions = new Rectangle2D[]{ new Rectangle2D( 0, 0, map.Width, map.Height ) };
regions = new[]{ new Rectangle2D( 0, 0, map.Width, map.Height ) };
if ( regions.Length == 0 )
return Point3D.Zero;
@ -312,7 +312,7 @@ namespace Server.Items
m_Message = message;
}
private static MessageEntry[] m_Entries = new MessageEntry[]
private static MessageEntry[] m_Entries = new[]
{
new MessageEntry( 280, 180, "...Ar! {0} and a fair wind! No chance... storms, though--ar! Is that a sea serp...<br><br>uh oh." ),
new MessageEntry( 280, 215, "...been inside this whale for three days now. I've run out of food I can pick out of his teeth. I took a sextant reading through the blowhole: {0}. I'll never see my treasure again..." ),

6
Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs
View file

@ -30,7 +30,7 @@ namespace Server.Items
Hue = 0x8A0;
}
private static int[] m_Hues = new int[]
private static int[] m_Hues = new[]
{
0x09B,
0x0CD,
@ -312,7 +312,7 @@ namespace Server.Items
return valid;
}
private static int[] m_WaterTiles = new int[]
private static int[] m_WaterTiles = new[]
{
0x00A8, 0x00AB,
0x0136, 0x0137
@ -329,7 +329,7 @@ namespace Server.Items
return water;
}
private static int[] m_UndeepWaterTiles = new int[]
private static int[] m_UndeepWaterTiles = new[]
{
0x1797, 0x179C
};

4
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs
View file

@ -2,7 +2,7 @@ namespace Server.Items
{
public class CurePotion : BaseCurePotion
{
private static CureLevelInfo[] m_OldLevelInfo = new CureLevelInfo[]
private static CureLevelInfo[] m_OldLevelInfo = new[]
{
new CureLevelInfo( Poison.Lesser, 1.00 ), // 100% chance to cure lesser poison
new CureLevelInfo( Poison.Regular, 0.75 ), // 75% chance to cure regular poison
@ -10,7 +10,7 @@ namespace Server.Items
new CureLevelInfo( Poison.Deadly, 0.15 ) // 15% chance to cure deadly poison
};
private static CureLevelInfo[] m_AosLevelInfo = new CureLevelInfo[]
private static CureLevelInfo[] m_AosLevelInfo = new[]
{
new CureLevelInfo( Poison.Lesser, 1.00 ),
new CureLevelInfo( Poison.Regular, 0.95 ),

4
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs
View file

@ -2,7 +2,7 @@ namespace Server.Items
{
public class GreaterCurePotion : BaseCurePotion
{
private static CureLevelInfo[] m_OldLevelInfo = new CureLevelInfo[]
private static CureLevelInfo[] m_OldLevelInfo = new[]
{
new CureLevelInfo( Poison.Lesser, 1.00 ), // 100% chance to cure lesser poison
new CureLevelInfo( Poison.Regular, 1.00 ), // 100% chance to cure regular poison
@ -11,7 +11,7 @@ namespace Server.Items
new CureLevelInfo( Poison.Lethal, 0.25 ) // 25% chance to cure lethal poison
};
private static CureLevelInfo[] m_AosLevelInfo = new CureLevelInfo[]
private static CureLevelInfo[] m_AosLevelInfo = new[]
{
new CureLevelInfo( Poison.Lesser, 1.00 ),
new CureLevelInfo( Poison.Regular, 1.00 ),

4
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs
View file

@ -2,14 +2,14 @@ namespace Server.Items
{
public class LesserCurePotion : BaseCurePotion
{
private static CureLevelInfo[] m_OldLevelInfo = new CureLevelInfo[]
private static CureLevelInfo[] m_OldLevelInfo = new[]
{
new CureLevelInfo( Poison.Lesser, 0.75 ), // 75% chance to cure lesser poison
new CureLevelInfo( Poison.Regular, 0.50 ), // 50% chance to cure regular poison
new CureLevelInfo( Poison.Greater, 0.15 ) // 15% chance to cure greater poison
};
private static CureLevelInfo[] m_AosLevelInfo = new CureLevelInfo[]
private static CureLevelInfo[] m_AosLevelInfo = new[]
{
new CureLevelInfo( Poison.Lesser, 0.75 ),
new CureLevelInfo( Poison.Regular, 0.50 ),

10
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -804,7 +804,7 @@ namespace Server.Items
}
}
private static int[] m_LegendPropertyCounts = new int[]
private static int[] m_LegendPropertyCounts = new[]
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0 properties : 21/52 : 40%
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 1 property : 15/52 : 29%
@ -813,7 +813,7 @@ namespace Server.Items
};
private static int[] m_ElderPropertyCounts = new int[]
private static int[] m_ElderPropertyCounts = new[]
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,// 0 properties : 15/34 : 44%
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 1 property : 10/34 : 29%
@ -821,7 +821,7 @@ namespace Server.Items
3, 3, 3 // 3 properties : 3/34 : 9%
};
private static int[] m_GrandPropertyCounts = new int[]
private static int[] m_GrandPropertyCounts = new[]
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0 properties : 10/20 : 50%
1, 1, 1, 1, 1, 1, // 1 property : 6/20 : 30%
@ -829,14 +829,14 @@ namespace Server.Items
3 // 3 properties : 1/20 : 5%
};
private static int[] m_MasterPropertyCounts = new int[]
private static int[] m_MasterPropertyCounts = new[]
{
0, 0, 0, 0, 0, 0, // 0 properties : 6/10 : 60%
1, 1, 1, // 1 property : 3/10 : 30%
2 // 2 properties : 1/10 : 10%
};
private static int[] m_AdeptPropertyCounts = new int[]
private static int[] m_AdeptPropertyCounts = new[]
{
0, 0, 0, // 0 properties : 3/4 : 75%
1 // 1 property : 1/4 : 25%

4
Scripts/Items/Skill Items/Misc/RepairDeed.cs
View file

@ -29,12 +29,12 @@ namespace Server.Items
}
public RepairSkillInfo( CraftSystem system, Type nearbyType, TextDefinition notNearbyMessage, TextDefinition name )
: this( system, new Type[] { nearbyType }, notNearbyMessage, name )
: this( system, new[] { nearbyType }, notNearbyMessage, name )
{
}
public static RepairSkillInfo[] Table => m_Table;
private static RepairSkillInfo[] m_Table = new RepairSkillInfo[]
private static RepairSkillInfo[] m_Table = new[]
{
new RepairSkillInfo( DefBlacksmithy.CraftSystem, typeof( Blacksmith ), 1047013, 1023015 ),
new RepairSkillInfo( DefTailoring.CraftSystem, typeof( Tailor ), 1061132, 1022981 ),

44
Scripts/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs
View file

@ -59,52 +59,52 @@ namespace Server.Items
m_TitleString = title;
}
public static readonly CustomHuePicker SpecialDyeTub = new CustomHuePicker( new CustomHueGroup[]
public static readonly CustomHuePicker SpecialDyeTub = new CustomHuePicker( new[]
{
/* Violet */
new CustomHueGroup( 1018345, new int[]{ 1230, 1231, 1232, 1233, 1234, 1235 } ),
new CustomHueGroup( 1018345, new[]{ 1230, 1231, 1232, 1233, 1234, 1235 } ),
/* Tan */
new CustomHueGroup( 1018346, new int[]{ 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508 } ),
new CustomHueGroup( 1018346, new[]{ 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508 } ),
/* Brown */
new CustomHueGroup( 1018347, new int[]{ 2012, 2013, 2014, 2015, 2016, 2017 } ),
new CustomHueGroup( 1018347, new[]{ 2012, 2013, 2014, 2015, 2016, 2017 } ),
/* Dark Blue */
new CustomHueGroup( 1018348, new int[]{ 1303, 1304, 1305, 1306, 1307, 1308 } ),
new CustomHueGroup( 1018348, new[]{ 1303, 1304, 1305, 1306, 1307, 1308 } ),
/* Forest Green */
new CustomHueGroup( 1018349, new int[]{ 1420, 1421, 1422, 1423, 1424, 1425, 1426 } ),
new CustomHueGroup( 1018349, new[]{ 1420, 1421, 1422, 1423, 1424, 1425, 1426 } ),
/* Pink */
new CustomHueGroup( 1018350, new int[]{ 1619, 1620, 1621, 1622, 1623, 1624, 1625, 1626 } ),
new CustomHueGroup( 1018350, new[]{ 1619, 1620, 1621, 1622, 1623, 1624, 1625, 1626 } ),
/* Red */
new CustomHueGroup( 1018351, new int[]{ 1640, 1641, 1642, 1643, 1644 } ),
new CustomHueGroup( 1018351, new[]{ 1640, 1641, 1642, 1643, 1644 } ),
/* Olive */
new CustomHueGroup( 1018352, new int[]{ 2001, 2002, 2003, 2004, 2005 } )
new CustomHueGroup( 1018352, new[]{ 2001, 2002, 2003, 2004, 2005 } )
}, false, 1018344 );
public static readonly CustomHuePicker LeatherDyeTub = new CustomHuePicker( new CustomHueGroup[]
public static readonly CustomHuePicker LeatherDyeTub = new CustomHuePicker( new[]
{
/* Dull Copper */
new CustomHueGroup( 1018332, new int[]{ 2419, 2420, 2421, 2422, 2423, 2424 } ),
new CustomHueGroup( 1018332, new[]{ 2419, 2420, 2421, 2422, 2423, 2424 } ),
/* Shadow Iron */
new CustomHueGroup( 1018333, new int[]{ 2406, 2407, 2408, 2409, 2410, 2411, 2412 } ),
new CustomHueGroup( 1018333, new[]{ 2406, 2407, 2408, 2409, 2410, 2411, 2412 } ),
/* Copper */
new CustomHueGroup( 1018334, new int[]{ 2413, 2414, 2415, 2416, 2417, 2418 } ),
new CustomHueGroup( 1018334, new[]{ 2413, 2414, 2415, 2416, 2417, 2418 } ),
/* Bronze */
new CustomHueGroup( 1018335, new int[]{ 2414, 2415, 2416, 2417, 2418 } ),
new CustomHueGroup( 1018335, new[]{ 2414, 2415, 2416, 2417, 2418 } ),
/* Glden */
new CustomHueGroup( 1018336, new int[]{ 2213, 2214, 2215, 2216, 2217, 2218 } ),
new CustomHueGroup( 1018336, new[]{ 2213, 2214, 2215, 2216, 2217, 2218 } ),
/* Agapite */
new CustomHueGroup( 1018337, new int[]{ 2425, 2426, 2427, 2428, 2429, 2430 } ),
new CustomHueGroup( 1018337, new[]{ 2425, 2426, 2427, 2428, 2429, 2430 } ),
/* Verite */
new CustomHueGroup( 1018338, new int[]{ 2207, 2208, 2209, 2210, 2211, 2212 } ),
new CustomHueGroup( 1018338, new[]{ 2207, 2208, 2209, 2210, 2211, 2212 } ),
/* Valorite */
new CustomHueGroup( 1018339, new int[]{ 2219, 2220, 2221, 2222, 2223, 2224 } ),
new CustomHueGroup( 1018339, new[]{ 2219, 2220, 2221, 2222, 2223, 2224 } ),
/* Reds */
new CustomHueGroup( 1018340, new int[]{ 2113, 2114, 2115, 2116, 2117, 2118 } ),
new CustomHueGroup( 1018340, new[]{ 2113, 2114, 2115, 2116, 2117, 2118 } ),
/* Blues */
new CustomHueGroup( 1018341, new int[]{ 2119, 2120, 2121, 2122, 2123, 2124 } ),
new CustomHueGroup( 1018341, new[]{ 2119, 2120, 2121, 2122, 2123, 2124 } ),
/* Greens */
new CustomHueGroup( 1018342, new int[]{ 2126, 2127, 2128, 2129, 2130 } ),
new CustomHueGroup( 1018342, new[]{ 2126, 2127, 2128, 2129, 2130 } ),
/* Yellows */
new CustomHueGroup( 1018343, new int[]{ 2213, 2214, 2215, 2216, 2217, 2218 } )
new CustomHueGroup( 1018343, new[]{ 2213, 2214, 2215, 2216, 2217, 2218 } )
}, true );
}

4
Scripts/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -227,7 +227,7 @@ namespace Server.Items
}
}
private static DisguiseEntry[] m_HairEntries = new DisguiseEntry[]
private static DisguiseEntry[] m_HairEntries = new[]
{
new DisguiseEntry( 8251, 50700, 0, 5, 1011052 ), // Short
new DisguiseEntry( 8261, 60710, 0, 3, 1011047 ), // Pageboy
@ -241,7 +241,7 @@ namespace Server.Items
new DisguiseEntry( 0, 0, 0, 0, 1011051 ) // None
};
private static DisguiseEntry[] m_BeardEntries = new DisguiseEntry[]
private static DisguiseEntry[] m_BeardEntries = new[]
{
new DisguiseEntry( 8269, 50906, 0, 0, 1011401 ), // Vandyke
new DisguiseEntry( 8257, 50808, 0,- 2, 1011062 ), // Mustache

6
Scripts/Items/Skill Items/Tools/BaseRunicTool.cs
View file

@ -139,7 +139,7 @@ namespace Server.Items
attrs[attr] = Scale( min, max, low / scale, high / scale ) * scale;
}
private static SkillName[] m_PossibleBonusSkills = new SkillName[]
private static SkillName[] m_PossibleBonusSkills = new[]
{
SkillName.Swords,
SkillName.Fencing,
@ -171,7 +171,7 @@ namespace Server.Items
SkillName.Ninjitsu
};
private static SkillName[] m_PossibleSpellbookSkills = new SkillName[]
private static SkillName[] m_PossibleSpellbookSkills = new[]
{
SkillName.Magery,
SkillName.Meditation,
@ -357,7 +357,7 @@ namespace Server.Items
int totalDamage = phys;
AosElementAttribute[] attrs = new AosElementAttribute[]
AosElementAttribute[] attrs = new[]
{
AosElementAttribute.Cold,
AosElementAttribute.Energy,

6
Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs
View file

@ -257,7 +257,7 @@ namespace Server.Items
m_Info.Add( MusicName.ValoriaShips, new DawnsMusicInfo( 1075140, DawnsMusicRarity.Rare ) );
}
public static MusicName[] m_CommonTracks = new MusicName[]
public static MusicName[] m_CommonTracks = new[]
{
MusicName.Samlethe, MusicName.Sailing, MusicName.Britain2, MusicName.Britain1,
MusicName.Bucsden, MusicName.Forest_a, MusicName.Cove, MusicName.Death,
@ -271,7 +271,7 @@ namespace Server.Items
MusicName.Mountn_a, MusicName.Wind, MusicName.Yew, MusicName.Zento
};
public static MusicName[] m_UncommonTracks = new MusicName[]
public static MusicName[] m_UncommonTracks = new[]
{
MusicName.GwennoConversation, MusicName.DreadHornArea, MusicName.ElfCity,
MusicName.GoodEndGame, MusicName.GoodVsEvil, MusicName.GreatEarthSerpents,
@ -279,7 +279,7 @@ namespace Server.Items
MusicName.MinocNegative, MusicName.ParoxysmusLair, MusicName.Paws
};
public static MusicName[] m_RareTracks = new MusicName[]
public static MusicName[] m_RareTracks = new[]
{
MusicName.SelimsBar, MusicName.SerpentIsleCombat_U7, MusicName.ValoriaShips
};

4
Scripts/Items/Special/Holiday/HolidayBell.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class HolidayBell : Item
{
private static string[] m_StaffNames = new string[]
private static string[] m_StaffNames = new[]
{
"Adrick",
"Alai",
@ -29,7 +29,7 @@ namespace Server.Items
"Tyrant",
"Vex"
};
private static int[] m_Hues = new int[]
private static int[] m_Hues = new[]
{
0xA, 0x24, 0x42, 0x56, 0x1A, 0x4C, 0x3C, 0x60, 0x2E, 0x55, 0x23, 0x38, 0x482, 0x6, 0x10
};

2
Scripts/Items/Special/Holiday/PKHolidayStuff.cs
View file

@ -37,7 +37,7 @@ namespace Server.Items
[Constructible]
public BadCard() : base( 0x14ef )
{
int[] m_CardHues=new int[]{ 0x45, 0x27, 0x3d0 };
int[] m_CardHues=new[]{ 0x45, 0x27, 0x3d0 };
Hue = m_CardHues[Utility.Random(m_CardHues.Length)];
Stackable = false;
LootType=LootType.Blessed;

2
Scripts/Items/Special/Holiday/SnowGlobes.cs
View file

@ -137,7 +137,7 @@ namespace Server.Items
public class SnowGlobeTwo : SnowGlobe
{
/* Oddly, these are not localized. */
private static readonly string[] m_PlaceNames = new string[]
private static readonly string[] m_PlaceNames = new[]
{
/* AncientCitadel */ "Ancient Citadel",
/* BlackthornesCastle */ "Blackthorne's Castle",

2
Scripts/Items/Special/Holiday/SnowPiles.cs
View file

@ -5,7 +5,7 @@
public override string DefaultName => "Snow Pile";
public override double DefaultWeight => 2.0;
private static readonly int[] m_Types = new int[] { 0x8E2, 0x8E0, 0x8E6, 0x8E5, 0x8E3 };
private static readonly int[] m_Types = new[] { 0x8E2, 0x8E0, 0x8E6, 0x8E5, 0x8E3 };
[Constructible]
public SnowPileDeco()

2
Scripts/Items/Special/Holiday/Snowman.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
public static string GetRandomTitle()
{
// All hail OSI staff
string[] titles = new string[]
string[] titles = new[]
{
/* 1 */ "Backflash",
/* 2 */ "Carbon",

2
Scripts/Items/Special/MiniHouses.cs
View file

@ -197,7 +197,7 @@ namespace Server.Items
m_Graphics = graphics;
}
private static MiniHouseInfo[] m_Info = new MiniHouseInfo[]
private static MiniHouseInfo[] m_Info = new[]
{
/* Stone and plaster house */ new MiniHouseInfo( 0x22C4, 1, 1011303 ),
/* Field stone house */ new MiniHouseInfo( 0x22DE, 1, 1011304 ),

6
Scripts/Items/Special/MonsterStatuette.cs
View file

@ -63,7 +63,7 @@ namespace Server.Items
{
m_LabelNumber = labelNumber;
m_ItemID = itemID;
m_Sounds = new int[]{ baseSoundID, baseSoundID + 1, baseSoundID + 2, baseSoundID + 3, baseSoundID + 4 };
m_Sounds = new[]{ baseSoundID, baseSoundID + 1, baseSoundID + 2, baseSoundID + 3, baseSoundID + 4 };
}
public MonsterStatuetteInfo( int labelNumber, int itemID, int[] sounds )
@ -73,7 +73,7 @@ namespace Server.Items
m_Sounds = sounds;
}
private static MonsterStatuetteInfo[] m_Table = new MonsterStatuetteInfo[]
private static MonsterStatuetteInfo[] m_Table = new[]
{
/* Crocodile */ new MonsterStatuetteInfo( 1041249, 0x20DA, 660 ),
/* Daemon */ new MonsterStatuetteInfo( 1041250, 0x20D3, 357 ),
@ -100,7 +100,7 @@ namespace Server.Items
/* Wolf */ new MonsterStatuetteInfo( 1049770, 0x2122, 229 ),
/* Phillip's Steed */ new MonsterStatuetteInfo( 1063488, 0x3FFE, 168 ),
/* Seahorse */ new MonsterStatuetteInfo( 1070819, 0x25BA, 138 ),
/* Harrower */ new MonsterStatuetteInfo( 1080520, 0x25BB, new int[] { 0x289, 0x28A, 0x28B } ),
/* Harrower */ new MonsterStatuetteInfo( 1080520, 0x25BB, new[] { 0x289, 0x28A, 0x28B } ),
/* Efreet */ new MonsterStatuetteInfo( 1080521, 0x2590, 0x300 ),
/* Slime */ new MonsterStatuetteInfo( 1015246, 0x20E8, 456 ),
/* PlagueBeast */ new MonsterStatuetteInfo( 1029747, 0x2613, 0x1BF ),

4
Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs
View file

@ -9,14 +9,14 @@ namespace Server.Items
public override int DefaultGumpID => 0x2A63;
public override int DefaultDropSound => 0x23F;
private static int[,,] m_Positions = new int[,,]
private static int[,,] m_Positions = new[,,]
{
{ { 275, 85 }, { 360, 111 }, { 375, 184 }, { 332, 228 }, { 141, 105 }, { 189, 75 } },
{ { 274, 34 }, { 327, 89 }, { 354, 168 }, { 304, 225 }, { 113, 86 }, { 189, 75 } },
{ { 276, 79 }, { 369, 117 }, { 372, 192 }, { 336, 230 }, { 141, 116 }, { 189, 75 } },
};
private static int[] m_BrainHues = new int[]
private static int[] m_BrainHues = new[]
{
0x2B, 0x42, 0x54, 0x60
};

2
Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs
View file

@ -284,7 +284,7 @@ namespace Server.Items
Opened = true;
}
private static int[] m_Hues = new int[]
private static int[] m_Hues = new[]
{
0xD, 0x17, 0x2B, 0x42, 0x54, 0x5D
};

8
Scripts/Items/Special/Special Scrolls/PowerScroll.cs
View file

@ -27,7 +27,7 @@ namespace Server.Items
public override string DefaultTitle => String.Format( "<basefont color=#FFFFFF>Power Scroll ({0} Skill):</basefont>", Value );
private static SkillName[] m_Skills = new SkillName[]
private static SkillName[] m_Skills = new[]
{
SkillName.Blacksmith,
SkillName.Tailoring,
@ -53,7 +53,7 @@ namespace Server.Items
SkillName.Peacemaking
};
private static SkillName[] m_AOSSkills = new SkillName[]
private static SkillName[] m_AOSSkills = new[]
{
SkillName.Chivalry,
SkillName.Focus,
@ -63,13 +63,13 @@ namespace Server.Items
SkillName.SpiritSpeak
};
private static SkillName[] m_SESkills = new SkillName[]
private static SkillName[] m_SESkills = new[]
{
SkillName.Ninjitsu,
SkillName.Bushido
};
private static SkillName[] m_MLSkills = new SkillName[]
private static SkillName[] m_MLSkills = new[]
{
SkillName.Spellweaving
};

2
Scripts/Items/Special/Veteran Rewards/Brazier.cs
View file

@ -27,7 +27,7 @@ namespace Server.Items
base.OnDelete();
}
private static int[] m_Art = new int[]
private static int[] m_Art = new[]
{
0x19AA, 0x19BB
};

2
Scripts/Items/Special/Veteran Rewards/Cannon.cs
View file

@ -194,7 +194,7 @@ namespace Server.Items
from.SendLocalizedMessage( 1076198 ); // You do not have a full keg of explosion potions needed to recharge the cannon.
}
private static int[] m_Effects = new int[]
private static int[] m_Effects = new[]
{
0x36B0, 0x3728, 0x3709, 0x36FE
};

12
Scripts/Items/Talismans/BaseTalisman.cs
View file

@ -749,7 +749,7 @@ namespace Server.Items
#endregion
#region Randomize
private static int[] m_ItemIDs = new int[]
private static int[] m_ItemIDs = new[]
{
0x2F58, 0x2F59, 0x2F5A, 0x2F5B
};
@ -759,7 +759,7 @@ namespace Server.Items
return Utility.RandomList(m_ItemIDs);
}
private static Type[] m_Summons = new Type[]
private static Type[] m_Summons = new[]
{
typeof( SummonedAntLion ),
typeof( SummonedCow ),
@ -784,7 +784,7 @@ namespace Server.Items
typeof( Bandage ),
};
private static int[] m_SummonLabels = new int[]
private static int[] m_SummonLabels = new[]
{
1075211, // Ant Lion
1072494, // Cow
@ -837,7 +837,7 @@ namespace Server.Items
return TalismanRemoval.None;
}
private static Type[] m_Killers = new Type[]
private static Type[] m_Killers = new[]
{
typeof( OrcBomber ), typeof( OrcBrute ), typeof( SewerRat ), typeof( Rat ), typeof( GiantRat ),
typeof( Ratman ), typeof( RatmanArcher ), typeof( GiantSpider ), typeof( FrostSpider ), typeof( GiantBlackWidow ),
@ -855,7 +855,7 @@ namespace Server.Items
// TODO Meraktus, Tormented Minotaur, Minotaur
};
private static int[] m_KillerLabels = new int[]
private static int[] m_KillerLabels = new[]
{
1072413, 1072414, 1072418, 1072419, 1072420,
1072421, 1072423, 1072424, 1072425, 1072426,
@ -902,7 +902,7 @@ namespace Server.Items
return new TalismanAttribute(m_Killers[num], m_KillerLabels[num], Utility.RandomMinMax(5, 60));
}
private static SkillName[] m_Skills = new SkillName[]
private static SkillName[] m_Skills = new[]
{
SkillName.Alchemy,
SkillName.Blacksmith,

18
Scripts/Items/Talismans/TalismanSlayer.cs
View file

@ -24,35 +24,35 @@ namespace Server.Items
public static void Initialize()
{
m_Table[ TalismanSlayerName.Bear ] = new Type[]
m_Table[ TalismanSlayerName.Bear ] = new[]
{
typeof( GrizzlyBear ), typeof( BlackBear ), typeof( BrownBear ), typeof( PolarBear ) //, typeof( Grobu )
};
m_Table[ TalismanSlayerName.Vermin ] = new Type[]
m_Table[ TalismanSlayerName.Vermin ] = new[]
{
typeof( RatmanMage ), typeof( RatmanMage ), typeof( RatmanArcher ), typeof( Barracoon),
typeof( Ratman ), typeof( SewerRat ), typeof( Rat ), typeof( GiantRat ) //, typeof( Chiikkaha )
};
m_Table[ TalismanSlayerName.Bat ] = new Type[]
m_Table[ TalismanSlayerName.Bat ] = new[]
{
typeof( Mongbat ), typeof( StrongMongbat ), typeof( VampireBat )
};
m_Table[ TalismanSlayerName.Mage ] = new Type[]
m_Table[ TalismanSlayerName.Mage ] = new[]
{
typeof( EvilMage ), typeof( EvilMageLord ), typeof( AncientLich ), typeof( Lich ), typeof( LichLord ),
typeof( SkeletalMage ), typeof( BoneMagi ), typeof( OrcishMage ), typeof( KhaldunZealot ), typeof( JukaMage ),
};
m_Table[ TalismanSlayerName.Beetle ] = new Type[]
m_Table[ TalismanSlayerName.Beetle ] = new[]
{
typeof( Beetle ), typeof( RuneBeetle ), typeof( FireBeetle ), typeof( DeathwatchBeetle ),
typeof( DeathwatchBeetleHatchling )
};
m_Table[ TalismanSlayerName.Bird ] = new Type[]
m_Table[ TalismanSlayerName.Bird ] = new[]
{
typeof( Bird ), typeof( TropicalBird ), typeof( Chicken ), typeof( Crane ),
typeof( DesertOstard ), typeof( Eagle ), typeof( ForestOstard ), typeof( FrenziedOstard ),
@ -60,7 +60,7 @@ namespace Server.Items
typeof( StoneHarpy ) // ?????
};
m_Table[ TalismanSlayerName.Ice ] = new Type[]
m_Table[ TalismanSlayerName.Ice ] = new[]
{
typeof( ArcticOgreLord ), typeof( IceElemental ), typeof( SnowElemental ), typeof( FrostOoze ),
typeof( IceFiend ), /*typeof( UnfrozenMummy ),*/ typeof( FrostSpider ), typeof( LadyOfTheSnow ),
@ -70,7 +70,7 @@ namespace Server.Items
typeof( IceSnake ), typeof( SnowLeopard ), typeof( PolarBear ), typeof( IceSerpent ), typeof( GiantIceWorm )
};
m_Table[ TalismanSlayerName.Flame ] = new Type[]
m_Table[ TalismanSlayerName.Flame ] = new[]
{
typeof( FireBeetle ), typeof( HellHound ), typeof( LavaSerpent ), typeof( FireElemental ),
typeof( PredatorHellCat ), typeof( Phoenix ), typeof( FireGargoyle ), typeof( HellCat ),
@ -80,7 +80,7 @@ namespace Server.Items
typeof( LavaSnake ),
};
m_Table[ TalismanSlayerName.Bovine ] = new Type[]
m_Table[ TalismanSlayerName.Bovine ] = new[]
{
typeof( Cow ), typeof( Bull ), typeof( Gaman ) /*, typeof( MinotaurCaptain ),
typeof( MinotaurScout ), typeof( Minotaur )*/

2
Scripts/Items/Weapons/Artifacts/TheDryadBow.cs
View file

@ -20,7 +20,7 @@ namespace Server.Items
WeaponAttributes.ResistPoisonBonus = 15;
}
private static SkillName[] m_PossibleBonusSkills = new SkillName[]
private static SkillName[] m_PossibleBonusSkills = new[]
{
SkillName.Archery,
SkillName.Healing,

4
Scripts/Items/Weapons/SlayerEntry.cs
View file

@ -14,7 +14,7 @@ namespace Server.Items
public SlayerName Name => m_Name;
public Type[] Types => m_Types;
private static int[] m_AosTitles = new int[]
private static int[] m_AosTitles = new[]
{
1060479, // undead slayer
1060470, // orc slayer
@ -45,7 +45,7 @@ namespace Server.Items
1070855 // fey slayer
};
private static int[] m_OldTitles = new int[]
private static int[] m_OldTitles = new[]
{
1017384, // Silver
1017385, // Orc Slaying

38
Scripts/Items/Weapons/SlayerGroup.cs
View file

@ -58,28 +58,28 @@ namespace Server.Items
SlayerGroup reptilian = new SlayerGroup();
SlayerGroup fey = new SlayerGroup();
humanoid.Opposition = new SlayerGroup[]{ undead };
humanoid.FoundOn = new Type[]{ typeof( BoneKnight ), typeof( Lich ), typeof( LichLord ) };
humanoid.Opposition = new[]{ undead };
humanoid.FoundOn = new[]{ typeof( BoneKnight ), typeof( Lich ), typeof( LichLord ) };
humanoid.Super = new SlayerEntry( SlayerName.Repond, typeof( ArcticOgreLord ), typeof( Cyclops ), typeof( Ettin ), typeof( EvilMage ), typeof( EvilMageLord ), typeof( FrostTroll ), typeof( MeerCaptain ), typeof( MeerEternal ), typeof( MeerMage ), typeof( MeerWarrior ), typeof( Ogre ), typeof( OgreLord ), typeof( Orc ), typeof( OrcBomber ), typeof( OrcBrute ), typeof( OrcCaptain ), /*typeof( OrcChopper ), typeof( OrcScout ),*/ typeof( OrcishLord ), typeof( OrcishMage ), typeof( Ratman ), typeof( RatmanArcher ), typeof( RatmanMage ), typeof( SavageRider ), typeof( SavageShaman ), typeof( Savage ), typeof( Titan ), typeof( Troglodyte ), typeof( Troll ) );
humanoid.Entries = new SlayerEntry[]
humanoid.Entries = new[]
{
new SlayerEntry( SlayerName.OgreTrashing, typeof( Ogre ), typeof( OgreLord ), typeof( ArcticOgreLord ) ),
new SlayerEntry( SlayerName.OrcSlaying, typeof( Orc ), typeof( OrcBomber ), typeof( OrcBrute ), typeof( OrcCaptain ),/* typeof( OrcChopper ), typeof( OrcScout ),*/ typeof( OrcishLord ), typeof( OrcishMage ) ),
new SlayerEntry( SlayerName.TrollSlaughter, typeof( Troll ), typeof( FrostTroll ) )
};
undead.Opposition = new SlayerGroup[]{ humanoid };
undead.Opposition = new[]{ humanoid };
undead.Super = new SlayerEntry( SlayerName.Silver, typeof( AncientLich ), typeof( Bogle ), typeof( BoneKnight ), typeof( BoneMagi ),/* typeof( DarkGuardian ), */typeof( DarknightCreeper ), typeof( FleshGolem ), typeof( Ghoul ), typeof( GoreFiend ), typeof( HellSteed ), typeof( LadyOfTheSnow ), typeof( Lich ), typeof( LichLord ), typeof( Mummy ), typeof( PestilentBandage ), typeof( Revenant ), typeof( RevenantLion ), typeof( RottingCorpse ), typeof( Shade ), typeof( ShadowKnight ), typeof( SkeletalKnight ), typeof( SkeletalMage ), typeof( SkeletalMount ), typeof( Skeleton ), typeof( Spectre ), typeof( Wraith ), typeof( Zombie ) );
undead.Entries = new SlayerEntry[0];
fey.Opposition = new SlayerGroup[]{ abyss };
fey.Opposition = new[]{ abyss };
fey.Super = new SlayerEntry( SlayerName.Fey, typeof( Centaur ), typeof( CuSidhe ), typeof( EtherealWarrior ), typeof( Kirin ), typeof( LordOaks ), typeof( Pixie ), typeof( Silvani ), typeof( Treefellow ), typeof( Unicorn ), typeof( Wisp ), typeof( MLDryad ), typeof( Satyr ) );
fey.Entries = new SlayerEntry[0];
elemental.Opposition = new SlayerGroup[]{ abyss };
elemental.FoundOn = new Type[]{ typeof( Balron ), typeof( Daemon ) };
elemental.Opposition = new[]{ abyss };
elemental.FoundOn = new[]{ typeof( Balron ), typeof( Daemon ) };
elemental.Super = new SlayerEntry( SlayerName.ElementalBan, typeof( AcidElemental ), typeof( AgapiteElemental ), typeof( AirElemental ), typeof( SummonedAirElemental ), typeof( BloodElemental ), typeof( BronzeElemental ), typeof( CopperElemental ), typeof( CrystalElemental ), typeof( DullCopperElemental ), typeof( EarthElemental ), typeof( SummonedEarthElemental ), typeof( Efreet ), typeof( FireElemental ), typeof( SummonedFireElemental ), typeof( GoldenElemental ), typeof( IceElemental ), typeof( KazeKemono ), typeof( PoisonElemental ), typeof( RaiJu ), typeof( SandVortex ), typeof( ShadowIronElemental ), typeof( SnowElemental ), typeof( ValoriteElemental ), typeof( VeriteElemental ), typeof( WaterElemental ), typeof( SummonedWaterElemental ) );
elemental.Entries = new SlayerEntry[]
elemental.Entries = new[]
{
new SlayerEntry( SlayerName.BloodDrinking, typeof( BloodElemental ) ),
new SlayerEntry( SlayerName.EarthShatter, typeof( AgapiteElemental ), typeof( BronzeElemental ), typeof( CopperElemental ), typeof( DullCopperElemental ), typeof( EarthElemental ), typeof( SummonedEarthElemental ), typeof( GoldenElemental ), typeof( ShadowIronElemental ), typeof( ValoriteElemental ), typeof( VeriteElemental ) ),
@ -90,14 +90,14 @@ namespace Server.Items
new SlayerEntry( SlayerName.WaterDissipation, typeof( WaterElemental ), typeof( SummonedWaterElemental ) )
};
abyss.Opposition = new SlayerGroup[]{ elemental, fey };
abyss.FoundOn = new Type[]{ typeof( BloodElemental ) };
abyss.Opposition = new[]{ elemental, fey };
abyss.FoundOn = new[]{ typeof( BloodElemental ) };
if ( Core.AOS )
{
abyss.Super = new SlayerEntry( SlayerName.Exorcism, typeof( AbysmalHorror ), typeof( ArcaneDaemon ), typeof( Balron ), typeof( BoneDemon ), typeof( ChaosDaemon ), typeof( Daemon ), typeof( SummonedDaemon ), typeof( DemonKnight ), typeof( Devourer ), typeof( EnslavedGargoyle ), typeof( FanDancer ), typeof( FireGargoyle ), typeof( Gargoyle ), typeof( GargoyleDestroyer ), typeof( GargoyleEnforcer ), typeof( Gibberling ), typeof( HordeMinion ), typeof( IceFiend ), typeof( Imp ), typeof( Impaler ), typeof( Moloch ), typeof( Oni ), typeof( Ravager ), typeof( Semidar ), typeof( StoneGargoyle ), typeof( Succubus ), typeof( TsukiWolf ) );
abyss.Entries = new SlayerEntry[]
abyss.Entries = new[]
{
// Daemon Dismissal & Balron Damnation have been removed and moved up to super slayer on OSI.
new SlayerEntry( SlayerName.GargoylesFoe, typeof( EnslavedGargoyle ), typeof( FireGargoyle ), typeof( Gargoyle ), typeof( GargoyleDestroyer ), typeof( GargoyleEnforcer ), typeof( StoneGargoyle ) ),
@ -107,7 +107,7 @@ namespace Server.Items
{
abyss.Super = new SlayerEntry( SlayerName.Exorcism, typeof( AbysmalHorror ), typeof( Balron ), typeof( BoneDemon ), typeof( ChaosDaemon ), typeof( Daemon ), typeof( SummonedDaemon ), typeof( DemonKnight ), typeof( Devourer ), typeof( Gargoyle ), typeof( FireGargoyle ), typeof( Gibberling ), typeof( HordeMinion ), typeof( IceFiend ), typeof( Imp ), typeof( Impaler ), typeof( Ravager ), typeof( StoneGargoyle ), typeof( ArcaneDaemon ), typeof( EnslavedGargoyle ), typeof( GargoyleDestroyer ), typeof( GargoyleEnforcer ), typeof( Moloch ) );
abyss.Entries = new SlayerEntry[]
abyss.Entries = new[]
{
new SlayerEntry( SlayerName.DaemonDismissal, typeof( AbysmalHorror ), typeof( Balron ), typeof( BoneDemon ), typeof( ChaosDaemon ), typeof( Daemon ), typeof( SummonedDaemon ), typeof( DemonKnight ), typeof( Devourer ), typeof( Gibberling ), typeof( HordeMinion ), typeof( IceFiend ), typeof( Imp ), typeof( Impaler ), typeof( Ravager ), typeof( ArcaneDaemon ), typeof( Moloch ) ),
new SlayerEntry( SlayerName.GargoylesFoe, typeof( FireGargoyle ), typeof( Gargoyle ), typeof( StoneGargoyle ), typeof( EnslavedGargoyle ), typeof( GargoyleDestroyer ), typeof( GargoyleEnforcer ) ),
@ -115,20 +115,20 @@ namespace Server.Items
};
}
arachnid.Opposition = new SlayerGroup[]{ reptilian };
arachnid.FoundOn = new Type[]{ typeof( AncientWyrm ), typeof( GreaterDragon ), typeof( Dragon ), typeof( OphidianMatriarch ), typeof( ShadowWyrm ) };
arachnid.Opposition = new[]{ reptilian };
arachnid.FoundOn = new[]{ typeof( AncientWyrm ), typeof( GreaterDragon ), typeof( Dragon ), typeof( OphidianMatriarch ), typeof( ShadowWyrm ) };
arachnid.Super = new SlayerEntry( SlayerName.ArachnidDoom, typeof( DreadSpider ), typeof( FrostSpider ), typeof( GiantBlackWidow ), typeof( GiantSpider ), typeof( Mephitis ), typeof( Scorpion ), typeof( TerathanAvenger ), typeof( TerathanDrone ), typeof( TerathanMatriarch ), typeof( TerathanWarrior ) );
arachnid.Entries = new SlayerEntry[]
arachnid.Entries = new[]
{
new SlayerEntry( SlayerName.ScorpionsBane, typeof( Scorpion ) ),
new SlayerEntry( SlayerName.SpidersDeath, typeof( DreadSpider ), typeof( FrostSpider ), typeof( GiantBlackWidow ), typeof( GiantSpider ), typeof( Mephitis ) ),
new SlayerEntry( SlayerName.Terathan, typeof( TerathanAvenger ), typeof( TerathanDrone ), typeof( TerathanMatriarch ), typeof( TerathanWarrior ) )
};
reptilian.Opposition = new SlayerGroup[]{ arachnid };
reptilian.FoundOn = new Type[]{ typeof( TerathanAvenger ), typeof( TerathanMatriarch ) };
reptilian.Opposition = new[]{ arachnid };
reptilian.FoundOn = new[]{ typeof( TerathanAvenger ), typeof( TerathanMatriarch ) };
reptilian.Super = new SlayerEntry( SlayerName.ReptilianDeath, typeof( AncientWyrm ), typeof( DeepSeaSerpent ), typeof( GreaterDragon ), typeof( Dragon ), typeof( Drake ), typeof( GiantIceWorm ), typeof( IceSerpent ), typeof( GiantSerpent ), typeof( Hiryu ), typeof( IceSnake ), typeof( JukaLord ), typeof( JukaMage ), typeof( JukaWarrior ), typeof( LavaSerpent ), typeof( LavaSnake ), typeof( LesserHiryu ), typeof( Lizardman ), typeof( OphidianArchmage ), typeof( OphidianKnight ), typeof( OphidianMage ), typeof( OphidianMatriarch ), typeof( OphidianWarrior ), typeof( Reptalon ), typeof( SeaSerpent ), typeof( Serado ), typeof( SerpentineDragon ), typeof( ShadowWyrm ), typeof( SilverSerpent ), typeof( SkeletalDragon ), typeof( Snake ), typeof( SwampDragon ), typeof( WhiteWyrm ), typeof( Wyvern ), typeof( Yamandon ) );
reptilian.Entries = new SlayerEntry[]
reptilian.Entries = new[]
{
new SlayerEntry( SlayerName.DragonSlaying, typeof( AncientWyrm ), typeof( GreaterDragon ), typeof( Dragon ), typeof( Drake ), typeof( Hiryu ), typeof( LesserHiryu ), typeof( Reptalon ), typeof( SerpentineDragon ), typeof( ShadowWyrm ), typeof( SkeletalDragon ), typeof( SwampDragon ), typeof( WhiteWyrm ), typeof( Wyvern ) ),
new SlayerEntry( SlayerName.LizardmanSlaughter, typeof( Lizardman ) ),
@ -136,7 +136,7 @@ namespace Server.Items
new SlayerEntry( SlayerName.SnakesBane, typeof( DeepSeaSerpent ), typeof( GiantIceWorm ), typeof( GiantSerpent ), typeof( IceSerpent ), typeof( IceSnake ), typeof( LavaSerpent ), typeof( LavaSnake ), typeof( SeaSerpent ), typeof( Serado ), typeof( SilverSerpent ), typeof( Snake ), typeof( Yamandon ) )
};
m_Groups = new SlayerGroup[]
m_Groups = new[]
{
humanoid,
undead,

2
Scripts/Items/Weapons/Staves/ShepherdsCrook.cs
View file

@ -92,7 +92,7 @@ namespace Server.Items
}
}
private static Type[] m_ChampTamables = new Type[]
private static Type[] m_ChampTamables = new[]
{
typeof( StrongMongbat ), typeof( Imp ), typeof( Scorpion ), typeof( GiantSpider ),
typeof( Snake ), typeof( LavaLizard ), typeof( Drake ), typeof( Dragon ),