From 04b4cfe75b74765613a2df28b6c07eaf02dfda59 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Fri, 14 Sep 2018 08:48:39 -0700 Subject: [PATCH] Removes implicit types --- Scripts/Accounting/AccountHandler.cs | 4 +- Scripts/Commands/Add.cs | 6 +- Scripts/Commands/Batch.cs | 2 +- Scripts/Commands/Docs.cs | 2 +- Scripts/Commands/GenCategorization.cs | 2 +- Scripts/Commands/Generic/Commands/Commands.cs | 48 +-- .../Commands/Generic/Commands/DesignInsert.cs | 2 +- .../Commands/Generic/Commands/Interface.cs | 2 +- .../Compilers/ConditionalCompiler.cs | 12 +- .../Extensions/Compilers/DistinctCompiler.cs | 12 +- .../Extensions/Compilers/SortCompiler.cs | 4 +- .../Implementors/AreaCommandImplementor.cs | 2 +- .../ContainedCommandImplementor.cs | 2 +- .../Implementors/FacetCommandImplementor.cs | 2 +- .../Implementors/GlobalCommandImplementor.cs | 2 +- .../IPAddressCommandImplementor.cs | 2 +- .../Implementors/MultiCommandImplementor.cs | 2 +- .../Implementors/OnlineCommandImplementor.cs | 2 +- .../Implementors/RangeCommandImplementor.cs | 2 +- .../Implementors/RegionCommandImplementor.cs | 2 +- .../Implementors/ScreenCommandImplementor.cs | 2 +- .../Implementors/SelfCommandImplementor.cs | 2 +- .../Implementors/SerialCommandImplementor.cs | 2 +- .../Implementors/SingleCommandImplementor.cs | 2 +- Scripts/Commands/Handlers.cs | 2 +- Scripts/Commands/Logging.cs | 2 +- Scripts/Commands/Profiling.cs | 4 +- Scripts/Commands/Properties.cs | 4 +- Scripts/Commands/SignParser.cs | 12 +- .../Engines/BulkOrders/Books/BOBFilterGump.cs | 24 +- Scripts/Engines/BulkOrders/LargeSmithBOD.cs | 2 +- Scripts/Engines/BulkOrders/LargeTailorBOD.cs | 2 +- Scripts/Engines/BulkOrders/Rewards.cs | 274 +++++++++--------- Scripts/Engines/BulkOrders/SmallSmithBOD.cs | 2 +- Scripts/Engines/BulkOrders/SmallTailorBOD.cs | 2 +- .../Engines/CannedEvil/ChampionSpawnType.cs | 94 +++--- Scripts/Engines/ConPVP/Arena.cs | 24 +- Scripts/Engines/ConPVP/DuelContext.cs | 16 +- Scripts/Engines/ConPVP/Ladder.cs | 8 +- Scripts/Engines/ConPVP/RulesetLayout.cs | 62 ++-- Scripts/Engines/Craft/Core/CraftItem.cs | 52 ++-- Scripts/Engines/Craft/DefInscription.cs | 2 +- Scripts/Engines/Craft/DefTailoring.cs | 2 +- Scripts/Engines/Craft/DefTinkering.cs | 2 +- .../Doom/LeverPuzzle/LeverPuzzleController.cs | 48 +-- Scripts/Engines/Ethics/Core/Ethic.cs | 2 +- Scripts/Engines/Factions/Core/Faction.cs | 8 +- .../Engines/Factions/Core/MerchantTitles.cs | 2 +- Scripts/Engines/Factions/Core/Town.cs | 2 +- .../Factions/Definitions/VendorDefinition.cs | 2 +- Scripts/Engines/Factions/Gumps/FinanceGump.cs | 2 +- .../Instances/Factions/CouncilOfMages.cs | 8 +- .../Factions/Instances/Factions/Minax.cs | 8 +- .../Instances/Factions/Shadowlords.cs | 8 +- .../Instances/Factions/TrueBritannians.cs | 8 +- .../Mobiles/Guards/BaseFactionGuard.cs | 4 +- Scripts/Engines/Harvest/Fishing.cs | 20 +- Scripts/Engines/Harvest/Lumberjacking.cs | 18 +- Scripts/Engines/Harvest/Mining.cs | 28 +- Scripts/Engines/Help/HelpGump.cs | 2 +- Scripts/Engines/Help/PageQueue.cs | 2 +- Scripts/Engines/Help/PageQueueGump.cs | 2 +- Scripts/Engines/Help/StuckMenu.cs | 20 +- .../Engines/MLQuests/Definitions/Bedlam.cs | 2 +- .../Engines/MLQuests/Definitions/Heartwood.cs | 168 +++++------ .../Engines/MLQuests/Definitions/Heritage.cs | 6 +- .../Engines/MLQuests/Definitions/Ilshenar.cs | 12 +- .../MLQuests/Definitions/MistakenIdentity.cs | 6 +- .../MLQuests/Definitions/NewHavenTraining.cs | 2 +- .../Engines/MLQuests/Definitions/Sanctuary.cs | 30 +- .../MLQuests/Definitions/Spellweaving.cs | 12 +- .../MLQuests/Items/CraftmansSatchel.cs | 2 +- Scripts/Engines/MLQuests/MLQuestSystem.cs | 6 +- Scripts/Engines/MyRunUO/LayerComparer.cs | 2 +- Scripts/Engines/MyRunUO/MyRunUO.cs | 2 +- Scripts/Engines/Plants/MainPlantGump.cs | 2 +- .../Engines/Plants/MiscItems/GreenThorns.cs | 12 +- Scripts/Engines/Plants/PlantBowl.cs | 2 +- Scripts/Engines/Plants/PlantResources.cs | 2 +- Scripts/Engines/Plants/PlantType.cs | 2 +- .../AmbitiousQueenQuest.cs | 2 +- .../Quests/Collector/CollectorQuest.cs | 2 +- .../Quests/Collector/Items/ImageType.cs | 2 +- .../Quests/Collector/Items/Obsidian.cs | 2 +- .../Quests/Core/Items/EnchantedSextant.cs | 8 +- Scripts/Engines/Quests/Core/QuestSystem.cs | 2 +- .../Quests/Dark Tides/Conversations.cs | 6 +- .../Quests/Dark Tides/DarkTidesQuest.cs | 2 +- .../Engines/Quests/Dark Tides/Objectives.cs | 6 +- .../EminosUndertakingQuest.cs | 2 +- .../Mobiles/HiddenFigure.cs | 2 +- .../Haochi's Trials/HaochisTrialsQuest.cs | 2 +- .../Solen Matriarch/SolenMatriarchQuest.cs | 2 +- .../Study of the Solen Hive/NestArea.cs | 2 +- .../StudyOfSolenQuest.cs | 2 +- .../TerribleHatchlingsQuest.cs | 2 +- .../Quests/The Summoning/Mobiles/Chyloth.cs | 2 +- .../Quests/The Summoning/TheSummoningQuest.cs | 2 +- .../Quests/Uzeraan Turmoil/Conversations.cs | 14 +- .../Uzeraan Turmoil/UzeraanTurmoilQuest.cs | 2 +- .../Quests/Witch Apprentice/Ingredient.cs | 2 +- .../Quests/Witch Apprentice/Objectives.cs | 2 +- .../Witch Apprentice/WitchApprenticeQuest.cs | 4 +- .../Reports/Objects/Staffing/StaffHistory.cs | 2 +- .../Reports/Rendering/BarGraphRenderer.cs | 8 +- .../BasePigmentsOfTokuno.cs | 6 +- .../Treasures of Tokuno/GreaterArtifacts.cs | 42 +-- .../Treasures of Tokuno/LesserArtifacts.cs | 26 +- .../Treasures of Tokuno/TreasuresOfTokuno.cs | 26 +- .../Engines/VeteranRewards/RewardSystem.cs | 28 +- Scripts/Gumps/AddDoorGump.cs | 2 +- Scripts/Gumps/AddGump.cs | 2 +- Scripts/Gumps/AdminGump.cs | 4 +- .../Guilds/New Guild System/DiplomacyGump.cs | 2 +- .../New Guild System/GuildRosterGump.cs | 2 +- Scripts/Gumps/HouseGumpAOS.cs | 8 +- Scripts/Gumps/PlayerVendorGumps.cs | 28 +- Scripts/Gumps/PolymorphGump.cs | 4 +- Scripts/Gumps/Props/PropsGump.cs | 10 +- Scripts/Gumps/Props/SetBodyGump.cs | 2 +- Scripts/Gumps/Props/SetCustomEnumGump.cs | 2 +- Scripts/Gumps/SkillsGump.cs | 16 +- .../Halloween/2012/Engines/PlayerZombies.cs | 2 +- Scripts/Items/Addons/AddonComponent.cs | 2 +- Scripts/Items/Addons/FlourMillEastAddon.cs | 10 +- Scripts/Items/Addons/FlourMillSouthAddon.cs | 10 +- Scripts/Items/Aquarium/Aquarium.cs | 4 +- .../Champion Artifacts/Decorative/Pier.cs | 2 +- .../Champion Artifacts/Decorative/Web.cs | 2 +- Scripts/Items/Construction/Doors/BaseDoor.cs | 2 +- .../Items/Containers/FillableContainers.cs | 132 ++++----- Scripts/Items/Containers/ParagonChest.cs | 4 +- Scripts/Items/Containers/TreasureMapChest.cs | 2 +- .../StealableArtifactsSpawner.cs | 2 +- Scripts/Items/Deeds/HairRestylingDeed.cs | 64 ++-- Scripts/Items/Food/Beverage.cs | 2 +- Scripts/Items/Maps/PresetMap.cs | 2 +- Scripts/Items/Maps/TreasureMap.cs | 16 +- Scripts/Items/Misc/ClockworkAssembly.cs | 4 +- Scripts/Items/Misc/CommunicationCrystals.cs | 2 +- Scripts/Items/Misc/DeceitBrazier.cs | 2 +- Scripts/Items/Misc/FlippableAddonAttribute.cs | 2 +- Scripts/Items/Misc/HairDye.cs | 2 +- Scripts/Items/Misc/Key.cs | 4 +- .../Misc/Prism of Light/ShimmeringCrystal.cs | 2 +- Scripts/Items/Misc/PublicMoongate.cs | 30 +- Scripts/Items/Misc/SpecialBeardDye.cs | 2 +- Scripts/Items/Misc/SpecialHairDye.cs | 2 +- Scripts/Items/Misc/WindChimes.cs | 2 +- Scripts/Items/Quivers/BaseQuiver.cs | 2 +- .../Carpenter Items/TaxidermyKit.cs | 2 +- Scripts/Items/Skill Items/Fishing/Misc/SOS.cs | 12 +- .../Fishing/Misc/SpecialFishingNet.cs | 6 +- .../Potions/Cure Potions/CurePotion.cs | 4 +- .../Potions/Cure Potions/GreaterCurePotion.cs | 4 +- .../Potions/Cure Potions/LesserCurePotion.cs | 4 +- .../Items/Skill Items/Magical/Spellbook.cs | 10 +- Scripts/Items/Skill Items/Misc/RepairDeed.cs | 4 +- .../Tailor Items/Dyetubs/CustomHuePicker.cs | 44 +-- .../Items/Skill Items/Thief/DisguiseKit.cs | 4 +- .../Items/Skill Items/Tools/BaseRunicTool.cs | 6 +- .../Dawn's Music Box/DawnsMusicBox.cs | 6 +- Scripts/Items/Special/Holiday/HolidayBell.cs | 4 +- .../Items/Special/Holiday/PKHolidayStuff.cs | 2 +- Scripts/Items/Special/Holiday/SnowGlobes.cs | 2 +- Scripts/Items/Special/Holiday/SnowPiles.cs | 2 +- Scripts/Items/Special/Holiday/Snowman.cs | 2 +- Scripts/Items/Special/MiniHouses.cs | 2 +- Scripts/Items/Special/MonsterStatuette.cs | 6 +- .../Mutation Core/PlagueBeastBackpack.cs | 4 +- .../Mutation Core/PlagueBeastOrgans.cs | 2 +- .../Special/Special Scrolls/PowerScroll.cs | 8 +- .../Items/Special/Veteran Rewards/Brazier.cs | 2 +- .../Items/Special/Veteran Rewards/Cannon.cs | 2 +- Scripts/Items/Talismans/BaseTalisman.cs | 12 +- Scripts/Items/Talismans/TalismanSlayer.cs | 18 +- .../Items/Weapons/Artifacts/TheDryadBow.cs | 2 +- Scripts/Items/Weapons/SlayerEntry.cs | 4 +- Scripts/Items/Weapons/SlayerGroup.cs | 38 +-- .../Items/Weapons/Staves/ShepherdsCrook.cs | 2 +- Scripts/Misc/AutoSave.cs | 2 +- Scripts/Misc/CharacterCreation.cs | 16 +- Scripts/Misc/DoorGenerator.cs | 14 +- Scripts/Misc/Emitter.cs | 6 +- .../Winter2004/LightOfTheWinterSolstice.cs | 2 +- .../Gifts/Winter2004/PileOfGlacialSnow.cs | 2 +- Scripts/Misc/Gifts/Winter2004/SnowPile.cs | 2 +- Scripts/Misc/Guild.cs | 2 +- Scripts/Misc/InhumanSpeech.cs | 20 +- Scripts/Misc/Loot.cs | 78 ++--- Scripts/Misc/LootPack.cs | 104 +++---- Scripts/Misc/MondainsLegacy.cs | 2 +- Scripts/Misc/NameVerification.cs | 6 +- Scripts/Misc/ProfanityProtection.cs | 4 +- Scripts/Misc/RaceDefinitions.cs | 8 +- Scripts/Misc/ResourceInfo.cs | 10 +- Scripts/Misc/SkillCheck.cs | 2 +- Scripts/Misc/SocketOptions.cs | 2 +- Scripts/Misc/Titles.cs | 16 +- Scripts/Misc/ToggleItem.cs | 2 +- Scripts/Misc/VendorGenerator.cs | 4 +- Scripts/Misc/Weather.cs | 4 +- Scripts/Misc/WelcomeTimer.cs | 4 +- Scripts/Misc/uoamVendors.cs | 2 +- Scripts/Mobiles/AI/BaseAI.cs | 2 +- Scripts/Mobiles/AI/HealerAI.cs | 8 +- Scripts/Mobiles/AI/MageAI.cs | 2 +- Scripts/Mobiles/AI/OppositionGroup.cs | 24 +- Scripts/Mobiles/AI/SpeedInfo.cs | 10 +- Scripts/Mobiles/Animals/Mounts/Horse.cs | 2 +- Scripts/Mobiles/BaseCreature.cs | 18 +- .../Mobiles/Monsters/LBR/Jukas/JukaLord.cs | 2 +- .../Mobiles/Monsters/LBR/Meers/MeerMage.cs | 2 +- Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs | 2 +- .../Mobiles/Monsters/ML/Special/Meraktus.cs | 2 +- Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs | 8 +- .../Monsters/Reptile/Magic/Leviathan.cs | 2 +- .../Reptile/Magic/OphidianArchmage.cs | 2 +- .../Monsters/Reptile/Magic/OphidianMage.cs | 2 +- .../Monsters/Reptile/Melee/OphidianKnight.cs | 2 +- .../Monsters/Reptile/Melee/OphidianWarrior.cs | 2 +- Scripts/Mobiles/PlayerMobile.cs | 10 +- Scripts/Mobiles/Special/Barracoon.cs | 8 +- Scripts/Mobiles/Special/Harrower.cs | 12 +- Scripts/Mobiles/Special/LordOaks.cs | 6 +- Scripts/Mobiles/Special/Mephitis.cs | 8 +- Scripts/Mobiles/Special/Neira.cs | 6 +- Scripts/Mobiles/Special/Paragon.cs | 4 +- Scripts/Mobiles/Special/Rikktor.cs | 8 +- Scripts/Mobiles/Special/Semidar.cs | 6 +- Scripts/Mobiles/Special/Serado.cs | 6 +- Scripts/Mobiles/Townfolk/BaseEscortable.cs | 4 +- Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs | 4 +- .../Mobiles/Vendors/NPC/CustomHairstylist.cs | 26 +- Scripts/Mobiles/Vendors/PlayerBarkeeper.cs | 2 +- Scripts/Mobiles/Vendors/PlayerVendor.cs | 2 +- Scripts/Mobiles/Vendors/RentedVendor.cs | 2 +- Scripts/Multis/Boats/BaseBoat.cs | 6 +- Scripts/Multis/Boats/Strandedness.cs | 6 +- Scripts/Multis/HouseFoundation.cs | 8 +- Scripts/Multis/HousePlacement.cs | 2 +- Scripts/Multis/HousePlacementTool.cs | 6 +- Scripts/Multis/Houses.cs | 28 +- Scripts/Skills/Stealth.cs | 2 +- Scripts/Skills/Tracking.cs | 2 +- .../SpecialSystems/Engines/PreventInaccess.cs | 2 +- Scripts/Spells/Base/MagerySpell.cs | 2 +- Scripts/Spells/Base/SpellHelper.cs | 6 +- Scripts/Spells/Base/SpellRegistry.cs | 2 +- Scripts/Spells/Fifth/Incognito.cs | 4 +- Scripts/Spells/Fifth/SummonCreature.cs | 2 +- Scripts/Spells/First/CreateFood.cs | 2 +- Scripts/Spells/Necromancy/AnimateDeadSpell.cs | 20 +- Scripts/Spells/Necromancy/Exorcism.cs | 8 +- Scripts/Spells/Necromancy/SummonFamiliar.cs | 2 +- Scripts/Spells/Ninjitsu/AnimalForm.cs | 2 +- Server/Mobile.cs | 8 +- Server/Network/PacketHandlers.cs | 2 +- Server/Notoriety.cs | 2 +- Server/ObjectPropertyList.cs | 2 +- Server/Utility.cs | 6 +- 261 files changed, 1329 insertions(+), 1329 deletions(-) diff --git a/Scripts/Accounting/AccountHandler.cs b/Scripts/Accounting/AccountHandler.cs index 97f6dc28f..0e47e05cd 100644 --- a/Scripts/Accounting/AccountHandler.cs +++ b/Scripts/Accounting/AccountHandler.cs @@ -34,7 +34,7 @@ namespace Server.Misc set => m_LockdownLevel = value; } - private static CityInfo[] StartingCities = new CityInfo[] + private static CityInfo[] StartingCities = new[] { new CityInfo( "New Haven", "New Haven Bank", 1150168, 3667, 2625, 0 ), new CityInfo( "Yew", "The Empath Abbey", 1075072, 633, 858, 0 ), @@ -249,7 +249,7 @@ namespace Server.Misc } } - private static readonly char[] m_ForbiddenChars = new char[] + private static readonly char[] m_ForbiddenChars = new[] { '<', '>', ':', '"', '/', '\\', '|', '?', '*' }; diff --git a/Scripts/Commands/Add.cs b/Scripts/Commands/Add.cs index b7fe477d0..e2e9ab524 100644 --- a/Scripts/Commands/Add.cs +++ b/Scripts/Commands/Add.cs @@ -673,7 +673,7 @@ namespace Server.Commands return type.IsDefined( m_ParsableType, false ); } - private static Type[] m_ParseTypes = new Type[]{ typeof( string ) }; + private static Type[] m_ParseTypes = new[]{ typeof( string ) }; private static object[] m_ParseArgs = new object[1]; public static object ParseParsable( Type type, string value ) @@ -685,7 +685,7 @@ namespace Server.Commands return method.Invoke( null, m_ParseArgs ); } - private static Type[] m_SignedNumerics = new Type[] + private static Type[] m_SignedNumerics = new[] { typeof( Int64 ), typeof( Int32 ), @@ -702,7 +702,7 @@ namespace Server.Commands return false; } - private static Type[] m_UnsignedNumerics = new Type[] + private static Type[] m_UnsignedNumerics = new[] { typeof( UInt64 ), typeof( UInt32 ), diff --git a/Scripts/Commands/Batch.cs b/Scripts/Commands/Batch.cs index 5fa9ff596..d4b5ae83a 100644 --- a/Scripts/Commands/Batch.cs +++ b/Scripts/Commands/Batch.cs @@ -29,7 +29,7 @@ namespace Server.Commands public Batch() { - Commands = new string[]{ "Batch" }; + Commands = new[]{ "Batch" }; ListOptimized = true; m_BatchCommands = new ArrayList(); diff --git a/Scripts/Commands/Docs.cs b/Scripts/Commands/Docs.cs index a171a672a..61e994706 100644 --- a/Scripts/Commands/Docs.cs +++ b/Scripts/Commands/Docs.cs @@ -248,7 +248,7 @@ namespace Server.Commands #region GetPair - private static string[,] m_Aliases = new string[,] + private static string[,] m_Aliases = new[,] { { "System.Object", "object" }, { "System.String", "string" }, diff --git a/Scripts/Commands/GenCategorization.cs b/Scripts/Commands/GenCategorization.cs index 7740f03d7..a9fdeb555 100644 --- a/Scripts/Commands/GenCategorization.cs +++ b/Scripts/Commands/GenCategorization.cs @@ -42,7 +42,7 @@ namespace Server.Commands [Description( "Rebuilds the categorization data file used by the Add command." )] public static void RebuildCategorization_OnCommand( CommandEventArgs e ) { - CategoryEntry root = new CategoryEntry( null, "Add Menu", new CategoryEntry[]{ Items, Mobiles } ); + CategoryEntry root = new CategoryEntry( null, "Add Menu", new[]{ Items, Mobiles } ); Export( root, "Data/objects.xml", "Objects" ); diff --git a/Scripts/Commands/Generic/Commands/Commands.cs b/Scripts/Commands/Generic/Commands/Commands.cs index 445aaa7fb..bc6b562cc 100644 --- a/Scripts/Commands/Generic/Commands/Commands.cs +++ b/Scripts/Commands/Generic/Commands/Commands.cs @@ -84,7 +84,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.Simple | CommandSupport.Complex | CommandSupport.Self; - Commands = new string[]{ "Condition" }; + Commands = new[]{ "Condition" }; ObjectTypes = ObjectTypes.All; Usage = "Condition "; Description = "Checks that the given condition matches a targeted object."; @@ -119,7 +119,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.AllItems; - Commands = new string[]{ "BringToPack" }; + Commands = new[]{ "BringToPack" }; ObjectTypes = ObjectTypes.Items; Usage = "BringToPack"; Description = "Brings a targeted item to your backpack."; @@ -143,7 +143,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.Simple; - Commands = new string[]{ "RefreshHouse" }; + Commands = new[]{ "RefreshHouse" }; ObjectTypes = ObjectTypes.Items; Usage = "RefreshHouse"; Description = "Refreshes a targeted house sign."; @@ -178,7 +178,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.Complex; - Commands = new string[]{ "Count" }; + Commands = new[]{ "Count" }; ObjectTypes = ObjectTypes.All; Usage = "Count"; Description = "Counts the number of objects that a command modifier would use. Generally used with condition arguments."; @@ -200,7 +200,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.AllMobiles; - Commands = new string[]{ "OpenBrowser", "OB" }; + Commands = new[]{ "OpenBrowser", "OB" }; ObjectTypes = ObjectTypes.Mobiles; Usage = "OpenBrowser "; Description = "Opens the web browser of a targeted player to a specified url."; @@ -287,7 +287,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.Counselor; Supports = CommandSupport.All; - Commands = new string[]{ "Increase", "Inc" }; + Commands = new[]{ "Increase", "Inc" }; ObjectTypes = ObjectTypes.Both; Usage = "Increase { ...}"; Description = "Increases the value of a specified property by the specified offset."; @@ -321,7 +321,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.AllMobiles; - Commands = new string[]{ "PrivSound" }; + Commands = new[]{ "PrivSound" }; ObjectTypes = ObjectTypes.Mobiles; Usage = "PrivSound "; Description = "Plays a sound to a given target."; @@ -360,13 +360,13 @@ namespace Server.Commands.Generic if ( inGump ) { - Commands = new string[]{ "Message", "Msg" }; + Commands = new[]{ "Message", "Msg" }; Usage = "Message \"text\""; Description = "Sends a message to a targeted player."; } else { - Commands = new string[]{ "Tell" }; + Commands = new[]{ "Tell" }; Usage = "Tell \"text\""; Description = "Sends a system message to a targeted player."; } @@ -392,7 +392,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.All; - Commands = new string[]{ "AddToPack", "AddToCont" }; + Commands = new[]{ "AddToPack", "AddToCont" }; ObjectTypes = ObjectTypes.Both; ListOptimized = true; Usage = "AddToPack [params] [set { ...}]"; @@ -432,7 +432,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.Simple | CommandSupport.Self; - Commands = new string[]{ "Add" }; + Commands = new[]{ "Add" }; ObjectTypes = ObjectTypes.All; Usage = "Add [ [params] [set { ...}]]"; Description = "Adds an item or npc by name to a targeted location. Optional constructor parameters. Optional set property list. If no arguments are specified, this brings up a categorized add menu."; @@ -493,7 +493,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.Counselor; Supports = CommandSupport.Simple; - Commands = new string[]{ "Teleport", "Tele" }; + Commands = new[]{ "Teleport", "Tele" }; ObjectTypes = ObjectTypes.All; Usage = "Teleport"; Description = "Teleports your character to a targeted location."; @@ -532,7 +532,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.AllMobiles; - Commands = new string[]{ "Dismount" }; + Commands = new[]{ "Dismount" }; ObjectTypes = ObjectTypes.Mobiles; Usage = "Dismount"; Description = "Forcefully dismounts a given target."; @@ -591,7 +591,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.AllNPCs; - Commands = new string[]{ "Restock" }; + Commands = new[]{ "Restock" }; ObjectTypes = ObjectTypes.Mobiles; Usage = "Restock"; Description = "Manually restocks a targeted vendor, refreshing the quantity of every item the vendor sells to the maximum. This also invokes the maximum quantity adjustment algorithms."; @@ -619,7 +619,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.Counselor; Supports = CommandSupport.All; - Commands = new string[]{ "GetType" }; + Commands = new[]{ "GetType" }; ObjectTypes = ObjectTypes.All; Usage = "GetType"; Description = "Gets the type name of a targeted object."; @@ -649,7 +649,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.Counselor; Supports = CommandSupport.All; - Commands = new string[]{ "Get" }; + Commands = new[]{ "Get" }; ObjectTypes = ObjectTypes.All; Usage = "Get "; Description = "Gets one or more property values by name of a targeted object."; @@ -695,7 +695,7 @@ namespace Server.Commands.Generic else Supports = CommandSupport.All; - Commands = new string[]{ command }; + Commands = new[]{ command }; ObjectTypes = objects; Usage = command; Description = String.Format( "Sets the {0} property to {1}.", name, value ); @@ -718,7 +718,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.Counselor; Supports = CommandSupport.All; - Commands = new string[]{ "Set" }; + Commands = new[]{ "Set" }; ObjectTypes = ObjectTypes.Both; Usage = "Set [...]"; Description = "Sets one or more property values by name of a targeted object."; @@ -751,7 +751,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.AllNPCs | CommandSupport.AllItems; - Commands = new string[]{ "Delete", "Remove" }; + Commands = new[]{ "Delete", "Remove" }; ObjectTypes = ObjectTypes.Both; Usage = "Delete"; Description = "Deletes a targeted item or mobile. Does not delete players."; @@ -836,7 +836,7 @@ namespace Server.Commands.Generic AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.AllMobiles; - Commands = value ? new string[]{ "Kill" } : new string[]{ "Resurrect", "Res" }; + Commands = value ? new[]{ "Kill" } : new[]{ "Resurrect", "Res" }; ObjectTypes = ObjectTypes.Mobiles; if ( value ) @@ -919,7 +919,7 @@ namespace Server.Commands.Generic AccessLevel = AccessLevel.Counselor; Supports = CommandSupport.AllMobiles; - Commands = new string[]{ value ? "Hide" : "Unhide" }; + Commands = new[]{ value ? "Hide" : "Unhide" }; ObjectTypes = ObjectTypes.Mobiles; if ( value ) @@ -968,7 +968,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.Administrator; Supports = CommandSupport.AllMobiles; - Commands = new string[]{ "Firewall" }; + Commands = new[]{ "Firewall" }; ObjectTypes = ObjectTypes.Mobiles; Usage = "Firewall"; Description = "Adds a targeted player to the firewall (list of blocked IP addresses). This command does not ban or kick."; @@ -1011,7 +1011,7 @@ namespace Server.Commands.Generic AccessLevel = ( ban ? AccessLevel.Administrator : AccessLevel.GameMaster ); Supports = CommandSupport.AllMobiles; - Commands = new string[]{ ban ? "Ban" : "Kick" }; + Commands = new[]{ ban ? "Ban" : "Kick" }; ObjectTypes = ObjectTypes.Mobiles; if ( ban ) @@ -1073,7 +1073,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.Administrator; Supports = CommandSupport.Simple; - Commands = new string[] { "TraceLockdown" }; + Commands = new[] { "TraceLockdown" }; ObjectTypes = ObjectTypes.Items; Usage = "TraceLockdown"; Description = "Finds the BaseHouse for which a targeted item is locked down or secured."; diff --git a/Scripts/Commands/Generic/Commands/DesignInsert.cs b/Scripts/Commands/Generic/Commands/DesignInsert.cs index 38ac8f27c..304255a12 100644 --- a/Scripts/Commands/Generic/Commands/DesignInsert.cs +++ b/Scripts/Commands/Generic/Commands/DesignInsert.cs @@ -19,7 +19,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.Single | CommandSupport.Area; - Commands = new string[] { "DesignInsert" }; + Commands = new[] { "DesignInsert" }; ObjectTypes = ObjectTypes.Items; Usage = "DesignInsert [allItems=false]"; Description = "Inserts multiple targeted items into a customizable house's design."; diff --git a/Scripts/Commands/Generic/Commands/Interface.cs b/Scripts/Commands/Generic/Commands/Interface.cs index 87f50efad..0724a3cbc 100644 --- a/Scripts/Commands/Generic/Commands/Interface.cs +++ b/Scripts/Commands/Generic/Commands/Interface.cs @@ -14,7 +14,7 @@ namespace Server.Commands.Generic { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.Complex | CommandSupport.Simple; - Commands = new string[]{ "Interface" }; + Commands = new[]{ "Interface" }; ObjectTypes = ObjectTypes.Both; Usage = "Interface [view ]"; Description = "Opens an interface to interact with matched objects. Generally used with condition arguments."; diff --git a/Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs b/Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs index 000125aed..f4ff1fcc0 100644 --- a/Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs +++ b/Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs @@ -120,7 +120,7 @@ namespace Server.Commands.Generic "Parse", BindingFlags.Public | BindingFlags.Static, null, - new Type[] { typeof( string ), typeof( NumberStyles ) }, + new[] { typeof( string ), typeof( NumberStyles ) }, null ); @@ -143,7 +143,7 @@ namespace Server.Commands.Generic "Parse", BindingFlags.Public | BindingFlags.Static, null, - new Type[] { typeof( string ) }, + new[] { typeof( string ) }, null ); @@ -279,7 +279,7 @@ namespace Server.Commands.Generic methodName, BindingFlags.Public | BindingFlags.Static, null, - new Type[] + new[] { typeof( string ), typeof( string ) @@ -319,7 +319,7 @@ namespace Server.Commands.Generic methodName, BindingFlags.Public | BindingFlags.Instance, null, - new Type[] + new[] { typeof( string ) }, @@ -494,7 +494,7 @@ namespace Server.Commands.Generic /* name */ "Verify", /* attr */ MethodAttributes.Public | MethodAttributes.Virtual, /* return */ typeof( bool ), - /* params */ new Type[] { typeof( object ) } ); + /* params */ new[] { typeof( object ) } ); LocalBuilder obj = emitter.CreateLocal( objectType ); LocalBuilder eq = emitter.CreateLocal( typeof( bool ) ); @@ -531,7 +531,7 @@ namespace Server.Commands.Generic emitter.Method, typeof( IConditional ).GetMethod( "Verify", - new Type[] + new[] { typeof( object ) } diff --git a/Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs b/Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs index 6b253efd6..225955580 100644 --- a/Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs +++ b/Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs @@ -48,7 +48,7 @@ namespace Server.Commands.Generic /* name */ "Compare", /* attr */ MethodAttributes.Public | MethodAttributes.Virtual, /* return */ typeof( int ), - /* params */ new Type[] { typeof( object ), typeof( object ) } ); + /* params */ new[] { typeof( object ), typeof( object ) } ); LocalBuilder a = emitter.CreateLocal( objectType ); LocalBuilder b = emitter.CreateLocal( objectType ); @@ -103,7 +103,7 @@ namespace Server.Commands.Generic emitter.Method, typeof( IComparer ).GetMethod( "Compare", - new Type[] + new[] { typeof( object ), typeof( object ) @@ -127,7 +127,7 @@ namespace Server.Commands.Generic /* name */ "Equals", /* attr */ MethodAttributes.Public | MethodAttributes.Virtual, /* return */ typeof( bool ), - /* params */ new Type[] { typeof( object ), typeof( object ) } ); + /* params */ new[] { typeof( object ), typeof( object ) } ); emitter.Generator.Emit( OpCodes.Ldarg_0 ); emitter.Generator.Emit( OpCodes.Ldarg_1 ); @@ -145,7 +145,7 @@ namespace Server.Commands.Generic emitter.Method, typeof( IEqualityComparer ).GetMethod( "Equals", - new Type[] + new[] { typeof( object ), typeof( object ) @@ -163,7 +163,7 @@ namespace Server.Commands.Generic /* name */ "GetHashCode", /* attr */ MethodAttributes.Public | MethodAttributes.Virtual, /* return */ typeof( int ), - /* params */ new Type[] { typeof( object ) } ); + /* params */ new[] { typeof( object ) } ); LocalBuilder obj = emitter.CreateLocal( objectType ); @@ -229,7 +229,7 @@ namespace Server.Commands.Generic emitter.Method, typeof( IEqualityComparer ).GetMethod( "GetHashCode", - new Type[] + new[] { typeof( object ) } diff --git a/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs b/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs index d9d756544..27b829597 100644 --- a/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs +++ b/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs @@ -90,7 +90,7 @@ namespace Server.Commands.Generic /* name */ "Compare", /* attr */ MethodAttributes.Public | MethodAttributes.Virtual, /* return */ typeof( int ), - /* params */ new Type[] { typeof( object ), typeof( object ) } ); + /* params */ new[] { typeof( object ), typeof( object ) } ); LocalBuilder a = emitter.CreateLocal( objectType ); LocalBuilder b = emitter.CreateLocal( objectType ); @@ -148,7 +148,7 @@ namespace Server.Commands.Generic emitter.Method, typeof( IComparer ).GetMethod( "Compare", - new Type[] + new[] { typeof( object ), typeof( object ) diff --git a/Scripts/Commands/Generic/Implementors/AreaCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/AreaCommandImplementor.cs index 51b687c5b..7d842fd9f 100644 --- a/Scripts/Commands/Generic/Implementors/AreaCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/AreaCommandImplementor.cs @@ -11,7 +11,7 @@ namespace Server.Commands.Generic public AreaCommandImplementor() { - Accessors = new string[]{ "Area", "Group" }; + Accessors = new[]{ "Area", "Group" }; SupportRequirement = CommandSupport.Area; SupportsConditionals = true; AccessLevel = AccessLevel.GameMaster; diff --git a/Scripts/Commands/Generic/Implementors/ContainedCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/ContainedCommandImplementor.cs index 5e687812e..fef2b3fd3 100644 --- a/Scripts/Commands/Generic/Implementors/ContainedCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/ContainedCommandImplementor.cs @@ -9,7 +9,7 @@ namespace Server.Commands.Generic { public ContainedCommandImplementor() { - Accessors = new string[]{ "Contained" }; + Accessors = new[]{ "Contained" }; SupportRequirement = CommandSupport.Contained; AccessLevel = AccessLevel.GameMaster; Usage = "Contained [condition]"; diff --git a/Scripts/Commands/Generic/Implementors/FacetCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/FacetCommandImplementor.cs index d4b42a193..cfa3aa878 100644 --- a/Scripts/Commands/Generic/Implementors/FacetCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/FacetCommandImplementor.cs @@ -4,7 +4,7 @@ namespace Server.Commands.Generic { public FacetCommandImplementor() { - Accessors = new string[]{ "Facet" }; + Accessors = new[]{ "Facet" }; SupportRequirement = CommandSupport.Area; SupportsConditionals = true; AccessLevel = AccessLevel.GameMaster; diff --git a/Scripts/Commands/Generic/Implementors/GlobalCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/GlobalCommandImplementor.cs index 984478e5b..d33a19bd4 100644 --- a/Scripts/Commands/Generic/Implementors/GlobalCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/GlobalCommandImplementor.cs @@ -7,7 +7,7 @@ namespace Server.Commands.Generic { public GlobalCommandImplementor() { - Accessors = new string[]{ "Global" }; + Accessors = new[]{ "Global" }; SupportRequirement = CommandSupport.Global; SupportsConditionals = true; AccessLevel = AccessLevel.Administrator; diff --git a/Scripts/Commands/Generic/Implementors/IPAddressCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/IPAddressCommandImplementor.cs index 382a9a30d..b32a1d8a6 100644 --- a/Scripts/Commands/Generic/Implementors/IPAddressCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/IPAddressCommandImplementor.cs @@ -8,7 +8,7 @@ namespace Server.Commands.Generic { public IPAddressCommandImplementor() { - Accessors = new string[]{ "IPAddress" }; + Accessors = new[]{ "IPAddress" }; SupportRequirement = CommandSupport.IPAddress; SupportsConditionals = true; AccessLevel = AccessLevel.Administrator; diff --git a/Scripts/Commands/Generic/Implementors/MultiCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/MultiCommandImplementor.cs index fb6421b51..f34923456 100644 --- a/Scripts/Commands/Generic/Implementors/MultiCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/MultiCommandImplementor.cs @@ -6,7 +6,7 @@ namespace Server.Commands.Generic { public MultiCommandImplementor() { - Accessors = new string[]{ "Multi", "m" }; + Accessors = new[]{ "Multi", "m" }; SupportRequirement = CommandSupport.Multi; AccessLevel = AccessLevel.Counselor; Usage = "Multi "; diff --git a/Scripts/Commands/Generic/Implementors/OnlineCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/OnlineCommandImplementor.cs index 9448a8eaf..288783059 100644 --- a/Scripts/Commands/Generic/Implementors/OnlineCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/OnlineCommandImplementor.cs @@ -9,7 +9,7 @@ namespace Server.Commands.Generic { public OnlineCommandImplementor() { - Accessors = new string[]{ "Online" }; + Accessors = new[]{ "Online" }; SupportRequirement = CommandSupport.Online; SupportsConditionals = true; AccessLevel = AccessLevel.GameMaster; diff --git a/Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs index 891862b6a..b7574ac7f 100644 --- a/Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs @@ -8,7 +8,7 @@ namespace Server.Commands.Generic public RangeCommandImplementor() { - Accessors = new string[]{ "Range" }; + Accessors = new[]{ "Range" }; SupportRequirement = CommandSupport.Area; SupportsConditionals = true; AccessLevel = AccessLevel.GameMaster; diff --git a/Scripts/Commands/Generic/Implementors/RegionCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/RegionCommandImplementor.cs index 098538197..4ea40bc9c 100644 --- a/Scripts/Commands/Generic/Implementors/RegionCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/RegionCommandImplementor.cs @@ -7,7 +7,7 @@ namespace Server.Commands.Generic { public RegionCommandImplementor() { - Accessors = new string[]{ "Region" }; + Accessors = new[]{ "Region" }; SupportRequirement = CommandSupport.Region; SupportsConditionals = true; AccessLevel = AccessLevel.GameMaster; diff --git a/Scripts/Commands/Generic/Implementors/ScreenCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/ScreenCommandImplementor.cs index 4e4b12e40..c90736721 100644 --- a/Scripts/Commands/Generic/Implementors/ScreenCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/ScreenCommandImplementor.cs @@ -4,7 +4,7 @@ namespace Server.Commands.Generic { public ScreenCommandImplementor() { - Accessors = new string[]{ "Screen" }; + Accessors = new[]{ "Screen" }; SupportRequirement = CommandSupport.Area; SupportsConditionals = true; AccessLevel = AccessLevel.GameMaster; diff --git a/Scripts/Commands/Generic/Implementors/SelfCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/SelfCommandImplementor.cs index 34995fb47..6d38795ae 100644 --- a/Scripts/Commands/Generic/Implementors/SelfCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/SelfCommandImplementor.cs @@ -4,7 +4,7 @@ namespace Server.Commands.Generic { public SelfCommandImplementor() { - Accessors = new string[]{ "Self" }; + Accessors = new[]{ "Self" }; SupportRequirement = CommandSupport.Self; AccessLevel = AccessLevel.Counselor; Usage = "Self "; diff --git a/Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs index 44efec3a2..468ea306a 100644 --- a/Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs @@ -4,7 +4,7 @@ namespace Server.Commands.Generic { public SerialCommandImplementor() { - Accessors = new string[]{ "Serial" }; + Accessors = new[]{ "Serial" }; SupportRequirement = CommandSupport.Single; AccessLevel = AccessLevel.Counselor; Usage = "Serial "; diff --git a/Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs index 5902f0267..db39c4561 100644 --- a/Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs @@ -6,7 +6,7 @@ namespace Server.Commands.Generic { public SingleCommandImplementor() { - Accessors = new string[]{ "Single" }; + Accessors = new[]{ "Single" }; SupportRequirement = CommandSupport.Single; AccessLevel = AccessLevel.Counselor; Usage = "Single "; diff --git a/Scripts/Commands/Handlers.cs b/Scripts/Commands/Handlers.cs index 5e0a03c48..e63f2ec3a 100644 --- a/Scripts/Commands/Handlers.cs +++ b/Scripts/Commands/Handlers.cs @@ -377,7 +377,7 @@ namespace Server.Commands private Mobile m_Mobile; private Item m_Item; - public EquipDetailsMenu( Mobile m, Item item ) : base( String.Format( "{0}: {1}", item.Layer, item.GetType().Name ), new string[]{"Move","Delete","Props"}) + public EquipDetailsMenu( Mobile m, Item item ) : base( String.Format( "{0}: {1}", item.Layer, item.GetType().Name ), new[]{"Move","Delete","Props"}) { m_Mobile = m; m_Item = item; diff --git a/Scripts/Commands/Logging.cs b/Scripts/Commands/Logging.cs index 1ba77837e..6166829a0 100644 --- a/Scripts/Commands/Logging.cs +++ b/Scripts/Commands/Logging.cs @@ -93,7 +93,7 @@ namespace Server.Commands } } - private static char[] m_NotSafe = new char[]{ '\\', '/', ':', '*', '?', '"', '<', '>', '|' }; + private static char[] m_NotSafe = new[]{ '\\', '/', ':', '*', '?', '"', '<', '>', '|' }; public static void AppendPath( ref string path, string toAppend ) { diff --git a/Scripts/Commands/Profiling.cs b/Scripts/Commands/Profiling.cs index 5c7809058..621b9cd18 100644 --- a/Scripts/Commands/Profiling.cs +++ b/Scripts/Commands/Profiling.cs @@ -240,7 +240,7 @@ namespace Server.Commands { using ( StreamWriter op = new StreamWriter( "expandedItems.log", true ) ) { - string[] names = new string[] + string[] names = new[] { "Name", "Items", @@ -297,7 +297,7 @@ namespace Server.Commands int[] parms = (int[])table[type]; if ( parms == null ) - table[type] = parms = new int[]{ 0, 0 }; + table[type] = parms = new[]{ 0, 0 }; parms[0]++; parms[1] += item.Amount; diff --git a/Scripts/Commands/Properties.cs b/Scripts/Commands/Properties.cs index 5ffd8c09b..89cccc830 100644 --- a/Scripts/Commands/Properties.cs +++ b/Scripts/Commands/Properties.cs @@ -396,7 +396,7 @@ namespace Server.Commands return ( t == typeofTimeSpan || t.IsDefined( typeofParsable, false ) ); } - private static Type[] m_ParseTypes = new Type[]{ typeof( string ) }; + private static Type[] m_ParseTypes = new[]{ typeof( string ) }; private static object[] m_ParseParams = new object[1]; private static object Parse( object o, Type t, string value ) @@ -408,7 +408,7 @@ namespace Server.Commands return method.Invoke( o, m_ParseParams ); } - private static Type[] m_NumericTypes = new Type[] + private static Type[] m_NumericTypes = new[] { typeof( Byte ), typeof( SByte ), typeof( Int16 ), typeof( UInt16 ), diff --git a/Scripts/Commands/SignParser.cs b/Scripts/Commands/SignParser.cs index 8b5c5ac90..f3a710912 100644 --- a/Scripts/Commands/SignParser.cs +++ b/Scripts/Commands/SignParser.cs @@ -60,12 +60,12 @@ namespace Server.Commands } } - Map[] brit = new Map[]{ Map.Felucca, Map.Trammel }; - Map[] fel = new Map[]{ Map.Felucca }; - Map[] tram = new Map[]{ Map.Trammel }; - Map[] ilsh = new Map[]{ Map.Ilshenar }; - Map[] malas = new Map[]{ Map.Malas }; - Map[] tokuno = new Map[]{ Map.Tokuno }; + Map[] brit = new[]{ Map.Felucca, Map.Trammel }; + Map[] fel = new[]{ Map.Felucca }; + Map[] tram = new[]{ Map.Trammel }; + Map[] ilsh = new[]{ Map.Ilshenar }; + Map[] malas = new[]{ Map.Malas }; + Map[] tokuno = new[]{ Map.Tokuno }; for ( int i = 0; i < list.Count; ++i ) { diff --git a/Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs b/Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs index 1e6166e7e..8205e3a68 100644 --- a/Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs +++ b/Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs @@ -10,7 +10,7 @@ namespace Server.Engines.BulkOrders private const int LabelColor = 0x7FFF; - private static int[,] m_MaterialFilters = new int[,] + private static int[,] m_MaterialFilters = new[,] { { 1044067, 1 }, // Blacksmithy { 1062226, 3 }, // Iron @@ -34,21 +34,21 @@ namespace Server.Engines.BulkOrders { 1062238, 16 } // Barbed }; - private static int[,] m_TypeFilters = new int[,] + private static int[,] m_TypeFilters = new[,] { { 1062229, 0 }, // All { 1062224, 1 }, // Small { 1062225, 2 } // Large }; - private static int[,] m_QualityFilters = new int[,] + private static int[,] m_QualityFilters = new[,] { { 1062229, 0 }, // All { 1011542, 1 }, // Normal { 1060636, 2 } // Exceptional }; - private static int[,] m_AmountFilters = new int[,] + private static int[,] m_AmountFilters = new[,] { { 1062229, 0 }, // All { 1049706, 1 }, // 10 @@ -56,21 +56,21 @@ namespace Server.Engines.BulkOrders { 1062239, 3 } // 20 }; - private static int[][,] m_Filters = new int[][,] - { + private static int[][,] m_Filters = new[] + { m_TypeFilters, m_QualityFilters, m_MaterialFilters, m_AmountFilters }; - private static int[] m_XOffsets_Type = new int[]{ 0, 75, 170 }; - private static int[] m_XOffsets_Quality = new int[]{ 0, 75, 170 }; - private static int[] m_XOffsets_Amount = new int[]{ 0, 75, 180, 275 }; - private static int[] m_XOffsets_Material = new int[]{ 0, 105, 210, 305, 390, 485 }; + private static int[] m_XOffsets_Type = new[]{ 0, 75, 170 }; + private static int[] m_XOffsets_Quality = new[]{ 0, 75, 170 }; + private static int[] m_XOffsets_Amount = new[]{ 0, 75, 180, 275 }; + private static int[] m_XOffsets_Material = new[]{ 0, 105, 210, 305, 390, 485 }; - private static int[] m_XWidths_Small = new int[]{ 50, 50, 70, 50 }; - private static int[] m_XWidths_Large = new int[]{ 80, 50, 50, 50, 50, 50 }; + private static int[] m_XWidths_Small = new[]{ 50, 50, 70, 50 }; + private static int[] m_XWidths_Large = new[]{ 80, 50, 50, 50, 50, 50 }; private void AddFilterList( int x, int y, int[] xOffsets, int yOffset, int[,] filters, int[] xWidths, int filterValue, int filterIndex ) { diff --git a/Scripts/Engines/BulkOrders/LargeSmithBOD.cs b/Scripts/Engines/BulkOrders/LargeSmithBOD.cs index b60685ee9..492859a5d 100644 --- a/Scripts/Engines/BulkOrders/LargeSmithBOD.cs +++ b/Scripts/Engines/BulkOrders/LargeSmithBOD.cs @@ -6,7 +6,7 @@ namespace Server.Engines.BulkOrders [TypeAlias( "Scripts.Engines.BulkOrders.LargeSmithBOD" )] public class LargeSmithBOD : LargeBOD { - public static double[] m_BlacksmithMaterialChances = new double[] + public static double[] m_BlacksmithMaterialChances = new[] { 0.501953125, // None 0.250000000, // Dull Copper diff --git a/Scripts/Engines/BulkOrders/LargeTailorBOD.cs b/Scripts/Engines/BulkOrders/LargeTailorBOD.cs index 8b67d849a..6a1b158c2 100644 --- a/Scripts/Engines/BulkOrders/LargeTailorBOD.cs +++ b/Scripts/Engines/BulkOrders/LargeTailorBOD.cs @@ -5,7 +5,7 @@ namespace Server.Engines.BulkOrders { public class LargeTailorBOD : LargeBOD { - public static double[] m_TailoringMaterialChances = new double[] + public static double[] m_TailoringMaterialChances = new[] { 0.857421875, // None 0.125000000, // Spined diff --git a/Scripts/Engines/BulkOrders/Rewards.cs b/Scripts/Engines/BulkOrders/Rewards.cs index 4c2403bf9..cb9fb6cf3 100644 --- a/Scripts/Engines/BulkOrders/Rewards.cs +++ b/Scripts/Engines/BulkOrders/Rewards.cs @@ -261,7 +261,7 @@ namespace Server.Engines.BulkOrders public static readonly SmithRewardCalculator Instance = new SmithRewardCalculator(); - private RewardType[] m_Types = new RewardType[] + private RewardType[] m_Types = new[] { // Armors new RewardType( 200, typeof( RingmailGloves ), typeof( RingmailChest ), typeof( RingmailArms ), typeof( RingmailLegs ) ), @@ -299,91 +299,91 @@ namespace Server.Engines.BulkOrders return points; } - private static int[][][] m_GoldTable = new int[][][] - { - new int[][] // 1-part (regular) + private static int[][][] m_GoldTable = new[] + { + new[] // 1-part (regular) { - new int[]{ 150, 250, 250, 400, 400, 750, 750, 1200, 1200 }, - new int[]{ 225, 375, 375, 600, 600, 1125, 1125, 1800, 1800 }, - new int[]{ 300, 500, 750, 800, 1050, 1500, 2250, 2400, 4000 } + new[]{ 150, 250, 250, 400, 400, 750, 750, 1200, 1200 }, + new[]{ 225, 375, 375, 600, 600, 1125, 1125, 1800, 1800 }, + new[]{ 300, 500, 750, 800, 1050, 1500, 2250, 2400, 4000 } }, - new int[][] // 1-part (exceptional) + new[] // 1-part (exceptional) { - new int[]{ 250, 400, 400, 750, 750, 1500, 1500, 3000, 3000 }, - new int[]{ 375, 600, 600, 1125, 1125, 2250, 2250, 4500, 4500 }, - new int[]{ 500, 800, 1200, 1500, 2500, 3000, 6000, 6000, 12000 } + new[]{ 250, 400, 400, 750, 750, 1500, 1500, 3000, 3000 }, + new[]{ 375, 600, 600, 1125, 1125, 2250, 2250, 4500, 4500 }, + new[]{ 500, 800, 1200, 1500, 2500, 3000, 6000, 6000, 12000 } }, - new int[][] // Ringmail (regular) + new[] // Ringmail (regular) { - new int[]{ 3000, 5000, 5000, 7500, 7500, 10000, 10000, 15000, 15000 }, - new int[]{ 4500, 7500, 7500, 11250, 11500, 15000, 15000, 22500, 22500 }, - new int[]{ 6000, 10000, 15000, 15000, 20000, 20000, 30000, 30000, 50000 } + new[]{ 3000, 5000, 5000, 7500, 7500, 10000, 10000, 15000, 15000 }, + new[]{ 4500, 7500, 7500, 11250, 11500, 15000, 15000, 22500, 22500 }, + new[]{ 6000, 10000, 15000, 15000, 20000, 20000, 30000, 30000, 50000 } }, - new int[][] // Ringmail (exceptional) + new[] // Ringmail (exceptional) { - new int[]{ 5000, 10000, 10000, 15000, 15000, 25000, 25000, 50000, 50000 }, - new int[]{ 7500, 15000, 15000, 22500, 22500, 37500, 37500, 75000, 75000 }, - new int[]{ 10000, 20000, 30000, 30000, 50000, 50000, 100000, 100000, 200000 } + new[]{ 5000, 10000, 10000, 15000, 15000, 25000, 25000, 50000, 50000 }, + new[]{ 7500, 15000, 15000, 22500, 22500, 37500, 37500, 75000, 75000 }, + new[]{ 10000, 20000, 30000, 30000, 50000, 50000, 100000, 100000, 200000 } }, - new int[][] // Chainmail (regular) + new[] // Chainmail (regular) { - new int[]{ 4000, 7500, 7500, 10000, 10000, 15000, 15000, 25000, 25000 }, - new int[]{ 6000, 11250, 11250, 15000, 15000, 22500, 22500, 37500, 37500 }, - new int[]{ 8000, 15000, 20000, 20000, 30000, 30000, 50000, 50000, 100000 } + new[]{ 4000, 7500, 7500, 10000, 10000, 15000, 15000, 25000, 25000 }, + new[]{ 6000, 11250, 11250, 15000, 15000, 22500, 22500, 37500, 37500 }, + new[]{ 8000, 15000, 20000, 20000, 30000, 30000, 50000, 50000, 100000 } }, - new int[][] // Chainmail (exceptional) + new[] // Chainmail (exceptional) { - new int[]{ 7500, 15000, 15000, 25000, 25000, 50000, 50000, 100000, 100000 }, - new int[]{ 11250, 22500, 22500, 37500, 37500, 75000, 75000, 150000, 150000 }, - new int[]{ 15000, 30000, 50000, 50000, 100000, 100000, 200000, 200000, 200000 } + new[]{ 7500, 15000, 15000, 25000, 25000, 50000, 50000, 100000, 100000 }, + new[]{ 11250, 22500, 22500, 37500, 37500, 75000, 75000, 150000, 150000 }, + new[]{ 15000, 30000, 50000, 50000, 100000, 100000, 200000, 200000, 200000 } }, - new int[][] // Platemail (regular) + new[] // Platemail (regular) { - new int[]{ 5000, 10000, 10000, 15000, 15000, 25000, 25000, 50000, 50000 }, - new int[]{ 7500, 15000, 15000, 22500, 22500, 37500, 37500, 75000, 75000 }, - new int[]{ 10000, 20000, 30000, 30000, 50000, 50000, 100000, 100000, 200000 } + new[]{ 5000, 10000, 10000, 15000, 15000, 25000, 25000, 50000, 50000 }, + new[]{ 7500, 15000, 15000, 22500, 22500, 37500, 37500, 75000, 75000 }, + new[]{ 10000, 20000, 30000, 30000, 50000, 50000, 100000, 100000, 200000 } }, - new int[][] // Platemail (exceptional) + new[] // Platemail (exceptional) { - new int[]{ 10000, 25000, 25000, 50000, 50000, 100000, 100000, 100000, 100000 }, - new int[]{ 15000, 37500, 37500, 75000, 75000, 150000, 150000, 150000, 150000 }, - new int[]{ 20000, 50000, 100000, 100000, 200000, 200000, 200000, 200000, 200000 } + new[]{ 10000, 25000, 25000, 50000, 50000, 100000, 100000, 100000, 100000 }, + new[]{ 15000, 37500, 37500, 75000, 75000, 150000, 150000, 150000, 150000 }, + new[]{ 20000, 50000, 100000, 100000, 200000, 200000, 200000, 200000, 200000 } }, - new int[][] // 2-part weapons (regular) + new[] // 2-part weapons (regular) { - new int[]{ 3000, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 4500, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 6000, 0, 0, 0, 0, 0, 0, 0, 0 } + new[]{ 3000, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 4500, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 6000, 0, 0, 0, 0, 0, 0, 0, 0 } }, - new int[][] // 2-part weapons (exceptional) + new[] // 2-part weapons (exceptional) { - new int[]{ 5000, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 7500, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 10000, 0, 0, 0, 0, 0, 0, 0, 0 } + new[]{ 5000, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 7500, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 10000, 0, 0, 0, 0, 0, 0, 0, 0 } }, - new int[][] // 5-part weapons (regular) + new[] // 5-part weapons (regular) { - new int[]{ 4000, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 6000, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 8000, 0, 0, 0, 0, 0, 0, 0, 0 } + new[]{ 4000, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 6000, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 8000, 0, 0, 0, 0, 0, 0, 0, 0 } }, - new int[][] // 5-part weapons (exceptional) + new[] // 5-part weapons (exceptional) { - new int[]{ 7500, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 11250, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 15000, 0, 0, 0, 0, 0, 0, 0, 0 } + new[]{ 7500, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 11250, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 15000, 0, 0, 0, 0, 0, 0, 0, 0 } }, - new int[][] // 6-part weapons (regular) + new[] // 6-part weapons (regular) { - new int[]{ 4000, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 6000, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 10000, 0, 0, 0, 0, 0, 0, 0, 0 } + new[]{ 4000, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 6000, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 10000, 0, 0, 0, 0, 0, 0, 0, 0 } }, - new int[][] // 6-part weapons (exceptional) + new[] // 6-part weapons (exceptional) { - new int[]{ 7500, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 11250, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[]{ 15000, 0, 0, 0, 0, 0, 0, 0, 0 } + new[]{ 7500, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 11250, 0, 0, 0, 0, 0, 0, 0, 0 }, + new[]{ 15000, 0, 0, 0, 0, 0, 0, 0, 0 } } }; @@ -430,7 +430,7 @@ namespace Server.Engines.BulkOrders public SmithRewardCalculator() { - Groups = new RewardGroup[] + Groups = new[] { new RewardGroup( 0, new RewardItem( 1, SturdyShovel ) ), new RewardGroup( 25, new RewardItem( 1, SturdyPickaxe ) ), @@ -471,13 +471,13 @@ namespace Server.Engines.BulkOrders private static readonly ConstructCallback BearRug = new ConstructCallback( CreateBearRug ); private static readonly ConstructCallback ClothingBlessDeed = new ConstructCallback( CreateCBD ); - private static int[][] m_ClothHues = new int[][] - { - new int[]{ 0x483, 0x48C, 0x488, 0x48A }, - new int[]{ 0x495, 0x48B, 0x486, 0x485 }, - new int[]{ 0x48D, 0x490, 0x48E, 0x491 }, - new int[]{ 0x48F, 0x494, 0x484, 0x497 }, - new int[]{ 0x489, 0x47F, 0x482, 0x47E } + private static int[][] m_ClothHues = new[] + { + new[]{ 0x483, 0x48C, 0x488, 0x48A }, + new[]{ 0x495, 0x48B, 0x486, 0x485 }, + new[]{ 0x48D, 0x490, 0x48E, 0x491 }, + new[]{ 0x48F, 0x494, 0x484, 0x497 }, + new[]{ 0x489, 0x47F, 0x482, 0x47E } }; private static Item CreateCloth( int type ) @@ -492,7 +492,7 @@ namespace Server.Engines.BulkOrders throw new InvalidOperationException(); } - private static int[] m_SandalHues = new int[] + private static int[] m_SandalHues = new[] { 0x489, 0x47F, 0x482, 0x47E, 0x48F, 0x494, @@ -595,107 +595,107 @@ namespace Server.Engines.BulkOrders return points; } - private static int[][][] m_AosGoldTable = new int[][][] - { - new int[][] // 1-part (regular) + private static int[][][] m_AosGoldTable = new[] + { + new[] // 1-part (regular) { - new int[]{ 150, 150, 300, 300 }, - new int[]{ 225, 225, 450, 450 }, - new int[]{ 300, 400, 600, 750 } + new[]{ 150, 150, 300, 300 }, + new[]{ 225, 225, 450, 450 }, + new[]{ 300, 400, 600, 750 } }, - new int[][] // 1-part (exceptional) + new[] // 1-part (exceptional) { - new int[]{ 300, 300, 600, 600 }, - new int[]{ 450, 450, 900, 900 }, - new int[]{ 600, 750, 1200, 1800 } + new[]{ 300, 300, 600, 600 }, + new[]{ 450, 450, 900, 900 }, + new[]{ 600, 750, 1200, 1800 } }, - new int[][] // 4-part (regular) + new[] // 4-part (regular) { - new int[]{ 4000, 4000, 5000, 5000 }, - new int[]{ 6000, 6000, 7500, 7500 }, - new int[]{ 8000, 10000, 10000, 15000 } + new[]{ 4000, 4000, 5000, 5000 }, + new[]{ 6000, 6000, 7500, 7500 }, + new[]{ 8000, 10000, 10000, 15000 } }, - new int[][] // 4-part (exceptional) + new[] // 4-part (exceptional) { - new int[]{ 5000, 5000, 7500, 7500 }, - new int[]{ 7500, 7500, 11250, 11250 }, - new int[]{ 10000, 15000, 15000, 20000 } + new[]{ 5000, 5000, 7500, 7500 }, + new[]{ 7500, 7500, 11250, 11250 }, + new[]{ 10000, 15000, 15000, 20000 } }, - new int[][] // 5-part (regular) + new[] // 5-part (regular) { - new int[]{ 5000, 5000, 7500, 7500 }, - new int[]{ 7500, 7500, 11250, 11250 }, - new int[]{ 10000, 15000, 15000, 20000 } + new[]{ 5000, 5000, 7500, 7500 }, + new[]{ 7500, 7500, 11250, 11250 }, + new[]{ 10000, 15000, 15000, 20000 } }, - new int[][] // 5-part (exceptional) + new[] // 5-part (exceptional) { - new int[]{ 7500, 7500, 10000, 10000 }, - new int[]{ 11250, 11250, 15000, 15000 }, - new int[]{ 15000, 20000, 20000, 30000 } + new[]{ 7500, 7500, 10000, 10000 }, + new[]{ 11250, 11250, 15000, 15000 }, + new[]{ 15000, 20000, 20000, 30000 } }, - new int[][] // 6-part (regular) + new[] // 6-part (regular) { - new int[]{ 7500, 7500, 10000, 10000 }, - new int[]{ 11250, 11250, 15000, 15000 }, - new int[]{ 15000, 20000, 20000, 30000 } + new[]{ 7500, 7500, 10000, 10000 }, + new[]{ 11250, 11250, 15000, 15000 }, + new[]{ 15000, 20000, 20000, 30000 } }, - new int[][] // 6-part (exceptional) + new[] // 6-part (exceptional) { - new int[]{ 10000, 10000, 15000, 15000 }, - new int[]{ 15000, 15000, 22500, 22500 }, - new int[]{ 20000, 30000, 30000, 50000 } + new[]{ 10000, 10000, 15000, 15000 }, + new[]{ 15000, 15000, 22500, 22500 }, + new[]{ 20000, 30000, 30000, 50000 } } }; - private static int[][][] m_OldGoldTable = new int[][][] - { - new int[][] // 1-part (regular) + private static int[][][] m_OldGoldTable = new[] + { + new[] // 1-part (regular) { - new int[]{ 150, 150, 300, 300 }, - new int[]{ 225, 225, 450, 450 }, - new int[]{ 300, 400, 600, 750 } + new[]{ 150, 150, 300, 300 }, + new[]{ 225, 225, 450, 450 }, + new[]{ 300, 400, 600, 750 } }, - new int[][] // 1-part (exceptional) + new[] // 1-part (exceptional) { - new int[]{ 300, 300, 600, 600 }, - new int[]{ 450, 450, 900, 900 }, - new int[]{ 600, 750, 1200, 1800 } + new[]{ 300, 300, 600, 600 }, + new[]{ 450, 450, 900, 900 }, + new[]{ 600, 750, 1200, 1800 } }, - new int[][] // 4-part (regular) + new[] // 4-part (regular) { - new int[]{ 3000, 3000, 4000, 4000 }, - new int[]{ 4500, 4500, 6000, 6000 }, - new int[]{ 6000, 8000, 8000, 10000 } + new[]{ 3000, 3000, 4000, 4000 }, + new[]{ 4500, 4500, 6000, 6000 }, + new[]{ 6000, 8000, 8000, 10000 } }, - new int[][] // 4-part (exceptional) + new[] // 4-part (exceptional) { - new int[]{ 4000, 4000, 5000, 5000 }, - new int[]{ 6000, 6000, 7500, 7500 }, - new int[]{ 8000, 10000, 10000, 15000 } + new[]{ 4000, 4000, 5000, 5000 }, + new[]{ 6000, 6000, 7500, 7500 }, + new[]{ 8000, 10000, 10000, 15000 } }, - new int[][] // 5-part (regular) + new[] // 5-part (regular) { - new int[]{ 4000, 4000, 5000, 5000 }, - new int[]{ 6000, 6000, 7500, 7500 }, - new int[]{ 8000, 10000, 10000, 15000 } + new[]{ 4000, 4000, 5000, 5000 }, + new[]{ 6000, 6000, 7500, 7500 }, + new[]{ 8000, 10000, 10000, 15000 } }, - new int[][] // 5-part (exceptional) + new[] // 5-part (exceptional) { - new int[]{ 5000, 5000, 7500, 7500 }, - new int[]{ 7500, 7500, 11250, 11250 }, - new int[]{ 10000, 15000, 15000, 20000 } + new[]{ 5000, 5000, 7500, 7500 }, + new[]{ 7500, 7500, 11250, 11250 }, + new[]{ 10000, 15000, 15000, 20000 } }, - new int[][] // 6-part (regular) + new[] // 6-part (regular) { - new int[]{ 5000, 5000, 7500, 7500 }, - new int[]{ 7500, 7500, 11250, 11250 }, - new int[]{ 10000, 15000, 15000, 20000 } + new[]{ 5000, 5000, 7500, 7500 }, + new[]{ 7500, 7500, 11250, 11250 }, + new[]{ 10000, 15000, 15000, 20000 } }, - new int[][] // 6-part (exceptional) + new[] // 6-part (exceptional) { - new int[]{ 7500, 7500, 10000, 10000 }, - new int[]{ 11250, 11250, 15000, 15000 }, - new int[]{ 15000, 20000, 20000, 30000 } + new[]{ 7500, 7500, 10000, 10000 }, + new[]{ 11250, 11250, 15000, 15000 }, + new[]{ 15000, 20000, 20000, 30000 } } }; @@ -717,7 +717,7 @@ namespace Server.Engines.BulkOrders public TailorRewardCalculator() { - Groups = new RewardGroup[] + Groups = new[] { new RewardGroup( 0, new RewardItem( 1, Cloth, 0 ) ), new RewardGroup( 50, new RewardItem( 1, Cloth, 1 ) ), diff --git a/Scripts/Engines/BulkOrders/SmallSmithBOD.cs b/Scripts/Engines/BulkOrders/SmallSmithBOD.cs index 91415bcf0..d50a6b57a 100644 --- a/Scripts/Engines/BulkOrders/SmallSmithBOD.cs +++ b/Scripts/Engines/BulkOrders/SmallSmithBOD.cs @@ -8,7 +8,7 @@ namespace Server.Engines.BulkOrders [TypeAlias( "Scripts.Engines.BulkOrders.SmallSmithBOD" )] public class SmallSmithBOD : SmallBOD { - public static double[] m_BlacksmithMaterialChances = new double[] + public static double[] m_BlacksmithMaterialChances = new[] { 0.501953125, // None 0.250000000, // Dull Copper diff --git a/Scripts/Engines/BulkOrders/SmallTailorBOD.cs b/Scripts/Engines/BulkOrders/SmallTailorBOD.cs index 2f533d350..a54291b20 100644 --- a/Scripts/Engines/BulkOrders/SmallTailorBOD.cs +++ b/Scripts/Engines/BulkOrders/SmallTailorBOD.cs @@ -6,7 +6,7 @@ namespace Server.Engines.BulkOrders { public class SmallTailorBOD : SmallBOD { - public static double[] m_TailoringMaterialChances = new double[] + public static double[] m_TailoringMaterialChances = new[] { 0.857421875, // None 0.125000000, // Spined diff --git a/Scripts/Engines/CannedEvil/ChampionSpawnType.cs b/Scripts/Engines/CannedEvil/ChampionSpawnType.cs index ce6023fed..071e37574 100644 --- a/Scripts/Engines/CannedEvil/ChampionSpawnType.cs +++ b/Scripts/Engines/CannedEvil/ChampionSpawnType.cs @@ -38,73 +38,73 @@ namespace Server.Engines.CannedEvil public static ChampionSpawnInfo[] Table => m_Table; - private static readonly ChampionSpawnInfo[] m_Table = new ChampionSpawnInfo[] + private static readonly ChampionSpawnInfo[] m_Table = new[] { - new ChampionSpawnInfo( "Abyss", typeof( Semidar ), new string[]{ "Foe", "Assassin", "Conqueror" }, new Type[][] // Abyss + new ChampionSpawnInfo( "Abyss", typeof( Semidar ), new[]{ "Foe", "Assassin", "Conqueror" }, new[] // Abyss { // Abyss - new Type[]{ typeof( GreaterMongbat ), typeof( Imp ) }, // Level 1 - new Type[]{ typeof( Gargoyle ), typeof( Harpy ) }, // Level 2 - new Type[]{ typeof( FireGargoyle ), typeof( StoneGargoyle ) }, // Level 3 - new Type[]{ typeof( Daemon ), typeof( Succubus ) } // Level 4 + new[]{ typeof( GreaterMongbat ), typeof( Imp ) }, // Level 1 + new[]{ typeof( Gargoyle ), typeof( Harpy ) }, // Level 2 + new[]{ typeof( FireGargoyle ), typeof( StoneGargoyle ) }, // Level 3 + new[]{ typeof( Daemon ), typeof( Succubus ) } // Level 4 } ), - new ChampionSpawnInfo( "Arachnid", typeof( Mephitis ), new string[]{ "Bane", "Killer", "Vanquisher" }, new Type[][] // Arachnid + new ChampionSpawnInfo( "Arachnid", typeof( Mephitis ), new[]{ "Bane", "Killer", "Vanquisher" }, new[] // Arachnid { // Arachnid - new Type[]{ typeof( Scorpion ), typeof( GiantSpider ) }, // Level 1 - new Type[]{ typeof( TerathanDrone ), typeof( TerathanWarrior ) }, // Level 2 - new Type[]{ typeof( DreadSpider ), typeof( TerathanMatriarch ) }, // Level 3 - new Type[]{ typeof( PoisonElemental ), typeof( TerathanAvenger ) } // Level 4 + new[]{ typeof( Scorpion ), typeof( GiantSpider ) }, // Level 1 + new[]{ typeof( TerathanDrone ), typeof( TerathanWarrior ) }, // Level 2 + new[]{ typeof( DreadSpider ), typeof( TerathanMatriarch ) }, // Level 3 + new[]{ typeof( PoisonElemental ), typeof( TerathanAvenger ) } // Level 4 } ), - new ChampionSpawnInfo( "Cold Blood", typeof( Rikktor ), new string[]{ "Blight", "Slayer", "Destroyer" }, new Type[][] // Cold Blood + new ChampionSpawnInfo( "Cold Blood", typeof( Rikktor ), new[]{ "Blight", "Slayer", "Destroyer" }, new[] // Cold Blood { // Cold Blood - new Type[]{ typeof( Lizardman ), typeof( Snake ) }, // Level 1 - new Type[]{ typeof( LavaLizard ), typeof( OphidianWarrior ) }, // Level 2 - new Type[]{ typeof( Drake ), typeof( OphidianArchmage ) }, // Level 3 - new Type[]{ typeof( Dragon ), typeof( OphidianKnight ) } // Level 4 + new[]{ typeof( Lizardman ), typeof( Snake ) }, // Level 1 + new[]{ typeof( LavaLizard ), typeof( OphidianWarrior ) }, // Level 2 + new[]{ typeof( Drake ), typeof( OphidianArchmage ) }, // Level 3 + new[]{ typeof( Dragon ), typeof( OphidianKnight ) } // Level 4 } ), - new ChampionSpawnInfo( "Forest Lord", typeof( LordOaks ), new string[]{ "Enemy", "Curse", "Slaughterer" }, new Type[][] // Forest Lord + new ChampionSpawnInfo( "Forest Lord", typeof( LordOaks ), new[]{ "Enemy", "Curse", "Slaughterer" }, new[] // Forest Lord { // Forest Lord - new Type[]{ typeof( Pixie ), typeof( ShadowWisp ) }, // Level 1 - new Type[]{ typeof( Kirin ), typeof( Wisp ) }, // Level 2 - new Type[]{ typeof( Centaur ), typeof( Unicorn ) }, // Level 3 - new Type[]{ typeof( EtherealWarrior ), typeof( SerpentineDragon ) } // Level 4 + new[]{ typeof( Pixie ), typeof( ShadowWisp ) }, // Level 1 + new[]{ typeof( Kirin ), typeof( Wisp ) }, // Level 2 + new[]{ typeof( Centaur ), typeof( Unicorn ) }, // Level 3 + new[]{ typeof( EtherealWarrior ), typeof( SerpentineDragon ) } // Level 4 } ), - new ChampionSpawnInfo( "Vermin Horde", typeof( Barracoon ), new string[]{ "Adversary", "Subjugator", "Eradicator" }, new Type[][] // Vermin Horde + new ChampionSpawnInfo( "Vermin Horde", typeof( Barracoon ), new[]{ "Adversary", "Subjugator", "Eradicator" }, new[] // Vermin Horde { // Vermin Horde - new Type[]{ typeof( GiantRat ), typeof( Slime ) }, // Level 1 - new Type[]{ typeof( DireWolf ), typeof( Ratman ) }, // Level 2 - new Type[]{ typeof( HellHound ), typeof( RatmanMage ) }, // Level 3 - new Type[]{ typeof( RatmanArcher ), typeof( SilverSerpent ) } // Level 4 + new[]{ typeof( GiantRat ), typeof( Slime ) }, // Level 1 + new[]{ typeof( DireWolf ), typeof( Ratman ) }, // Level 2 + new[]{ typeof( HellHound ), typeof( RatmanMage ) }, // Level 3 + new[]{ typeof( RatmanArcher ), typeof( SilverSerpent ) } // Level 4 } ), - new ChampionSpawnInfo( "Unholy Terror", typeof( Neira ), new string[]{ "Scourge", "Punisher", "Nemesis" }, new Type[][] // Unholy Terror + new ChampionSpawnInfo( "Unholy Terror", typeof( Neira ), new[]{ "Scourge", "Punisher", "Nemesis" }, new[] // Unholy Terror { // Unholy Terror (Core.AOS ? - new Type[]{ typeof( Bogle ), typeof( Ghoul ), typeof( Shade ), typeof( Spectre ), typeof( Wraith ) } // Level 1 (Pre-AoS) - : new Type[]{ typeof( Ghoul ), typeof( Shade ), typeof( Spectre ), typeof( Wraith ) } ), // Level 1 + new[]{ typeof( Bogle ), typeof( Ghoul ), typeof( Shade ), typeof( Spectre ), typeof( Wraith ) } // Level 1 (Pre-AoS) + : new[]{ typeof( Ghoul ), typeof( Shade ), typeof( Spectre ), typeof( Wraith ) } ), // Level 1 - new Type[]{ typeof( BoneMagi ), typeof( Mummy ), typeof( SkeletalMage ) }, // Level 2 - new Type[]{ typeof( BoneKnight ), typeof( Lich ), typeof( SkeletalKnight ) }, // Level 3 - new Type[]{ typeof( LichLord ), typeof( RottingCorpse ) } // Level 4 + new[]{ typeof( BoneMagi ), typeof( Mummy ), typeof( SkeletalMage ) }, // Level 2 + new[]{ typeof( BoneKnight ), typeof( Lich ), typeof( SkeletalKnight ) }, // Level 3 + new[]{ typeof( LichLord ), typeof( RottingCorpse ) } // Level 4 } ), - new ChampionSpawnInfo( "Sleeping Dragon", typeof( Serado ), new string[]{ "Rival", "Challenger", "Antagonist" } , new Type[][] + new ChampionSpawnInfo( "Sleeping Dragon", typeof( Serado ), new[]{ "Rival", "Challenger", "Antagonist" } , new[] { // Unholy Terror - new Type[]{ typeof( DeathwatchBeetleHatchling ), typeof( Lizardman ) }, - new Type[]{ typeof( DeathwatchBeetle ), typeof( Kappa ) }, - new Type[]{ typeof( LesserHiryu ), typeof( RevenantLion ) }, - new Type[]{ typeof( Hiryu ), typeof( Oni ) } + new[]{ typeof( DeathwatchBeetleHatchling ), typeof( Lizardman ) }, + new[]{ typeof( DeathwatchBeetle ), typeof( Kappa ) }, + new[]{ typeof( LesserHiryu ), typeof( RevenantLion ) }, + new[]{ typeof( Hiryu ), typeof( Oni ) } } ), - new ChampionSpawnInfo( "Glade", typeof( Twaulo ), new string[]{ "Banisher", "Enforcer", "Eradicator" } , new Type[][] + new ChampionSpawnInfo( "Glade", typeof( Twaulo ), new[]{ "Banisher", "Enforcer", "Eradicator" } , new[] { // Glade - new Type[]{ typeof( Pixie ), typeof( ShadowWisp ) }, - new Type[]{ typeof( Centaur ), typeof( MLDryad ) }, - new Type[]{ typeof( Satyr ), typeof( CuSidhe ) }, - new Type[]{ typeof( FeralTreefellow ), typeof( RagingGrizzlyBear ) } + new[]{ typeof( Pixie ), typeof( ShadowWisp ) }, + new[]{ typeof( Centaur ), typeof( MLDryad ) }, + new[]{ typeof( Satyr ), typeof( CuSidhe ) }, + new[]{ typeof( FeralTreefellow ), typeof( RagingGrizzlyBear ) } } ), - new ChampionSpawnInfo( "The Corrupt", typeof( Ilhenir ), new string[]{ "Cleanser", "Expunger", "Depurator" } , new Type[][] + new ChampionSpawnInfo( "The Corrupt", typeof( Ilhenir ), new[]{ "Cleanser", "Expunger", "Depurator" } , new[] { // Unholy Terror - new Type[]{ typeof( PlagueSpawn ), typeof( Bogling ) }, - new Type[]{ typeof( PlagueBeast ), typeof( BogThing ) }, - new Type[]{ typeof( PlagueBeastLord ), typeof( InterredGrizzle ) }, - new Type[]{ typeof( FetidEssence ), typeof( PestilentBandage ) } + new[]{ typeof( PlagueSpawn ), typeof( Bogling ) }, + new[]{ typeof( PlagueBeast ), typeof( BogThing ) }, + new[]{ typeof( PlagueBeastLord ), typeof( InterredGrizzle ) }, + new[]{ typeof( FetidEssence ), typeof( PestilentBandage ) } } ) }; diff --git a/Scripts/Engines/ConPVP/Arena.cs b/Scripts/Engines/ConPVP/Arena.cs index 3ae052a95..409b8eb7d 100644 --- a/Scripts/Engines/ConPVP/Arena.cs +++ b/Scripts/Engines/ConPVP/Arena.cs @@ -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 diff --git a/Scripts/Engines/ConPVP/DuelContext.cs b/Scripts/Engines/ConPVP/DuelContext.cs index d83f65909..f7136f958 100644 --- a/Scripts/Engines/ConPVP/DuelContext.cs +++ b/Scripts/Engines/ConPVP/DuelContext.cs @@ -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 ) { diff --git a/Scripts/Engines/ConPVP/Ladder.cs b/Scripts/Engines/ConPVP/Ladder.cs index 4d9fc24f5..257f3e0f8 100644 --- a/Scripts/Engines/ConPVP/Ladder.cs +++ b/Scripts/Engines/ConPVP/Ladder.cs @@ -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 }, diff --git a/Scripts/Engines/ConPVP/RulesetLayout.cs b/Scripts/Engines/ConPVP/RulesetLayout.cs index 9c5cc18ed..3d6063504 100644 --- a/Scripts/Engines/ConPVP/RulesetLayout.cs +++ b/Scripts/Engines/ConPVP/RulesetLayout.cs @@ -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; diff --git a/Scripts/Engines/Craft/Core/CraftItem.cs b/Scripts/Engines/Craft/Core/CraftItem.cs index 44aafc5dd..e146ba7b9 100644 --- a/Scripts/Engines/Craft/Core/CraftItem.cs +++ b/Scripts/Engines/Craft/Core/CraftItem.cs @@ -284,7 +284,7 @@ namespace Server.Engines.Craft } #region Tables - private static int[] m_HeatSources = new int[] + private static int[] m_HeatSources = new[] { 0x461, 0x48E, // Sandstone oven/fireplace 0x92B, 0x96C, // Stone oven/fireplace @@ -300,46 +300,46 @@ namespace Server.Engines.Craft 0x2DD8, 0x2DD8 // Elven Forge }; - private static int[] m_Ovens = new int[] + private static int[] m_Ovens = new[] { 0x461, 0x46F, // Sandstone oven 0x92B, 0x93F, // Stone oven 0x2DDB, 0x2DDC //Elven stove }; - private static int[] m_Mills = new int[] + private static int[] m_Mills = new[] { 0x1920, 0x1921, 0x1922, 0x1923, 0x1924, 0x1295, 0x1926, 0x1928, 0x192C, 0x192D, 0x192E, 0x129F, 0x1930, 0x1931, 0x1932, 0x1934 }; - private static Type[][] m_TypesTable = new Type[][] - { - new Type[]{ typeof( Log ), typeof( Board ) }, - new Type[]{ typeof( HeartwoodLog ), typeof( HeartwoodBoard ) }, - new Type[]{ typeof( BloodwoodLog ), typeof( BloodwoodBoard ) }, - new Type[]{ typeof( FrostwoodLog ), typeof( FrostwoodBoard ) }, - new Type[]{ typeof( OakLog ), typeof( OakBoard ) }, - new Type[]{ typeof( AshLog ), typeof( AshBoard ) }, - new Type[]{ typeof( YewLog ), typeof( YewBoard ) }, - new Type[]{ typeof( Leather ), typeof( Hides ) }, - new Type[]{ typeof( SpinedLeather ), typeof( SpinedHides ) }, - new Type[]{ typeof( HornedLeather ), typeof( HornedHides ) }, - new Type[]{ typeof( BarbedLeather ), typeof( BarbedHides ) }, - new Type[]{ typeof( BlankMap ), typeof( BlankScroll ) }, - new Type[]{ typeof( Cloth ), typeof( UncutCloth ) }, - new Type[]{ typeof( CheeseWheel ), typeof( CheeseWedge ) }, - new Type[]{ typeof( Pumpkin ), typeof( SmallPumpkin ) }, - new Type[]{ typeof( WoodenBowlOfPeas ), typeof( PewterBowlOfPeas ) } + private static Type[][] m_TypesTable = new[] + { + new[]{ typeof( Log ), typeof( Board ) }, + new[]{ typeof( HeartwoodLog ), typeof( HeartwoodBoard ) }, + new[]{ typeof( BloodwoodLog ), typeof( BloodwoodBoard ) }, + new[]{ typeof( FrostwoodLog ), typeof( FrostwoodBoard ) }, + new[]{ typeof( OakLog ), typeof( OakBoard ) }, + new[]{ typeof( AshLog ), typeof( AshBoard ) }, + new[]{ typeof( YewLog ), typeof( YewBoard ) }, + new[]{ typeof( Leather ), typeof( Hides ) }, + new[]{ typeof( SpinedLeather ), typeof( SpinedHides ) }, + new[]{ typeof( HornedLeather ), typeof( HornedHides ) }, + new[]{ typeof( BarbedLeather ), typeof( BarbedHides ) }, + new[]{ typeof( BlankMap ), typeof( BlankScroll ) }, + new[]{ typeof( Cloth ), typeof( UncutCloth ) }, + new[]{ typeof( CheeseWheel ), typeof( CheeseWedge ) }, + new[]{ typeof( Pumpkin ), typeof( SmallPumpkin ) }, + new[]{ typeof( WoodenBowlOfPeas ), typeof( PewterBowlOfPeas ) } }; - private static Type[] m_ColoredItemTable = new Type[] + private static Type[] m_ColoredItemTable = new[] { typeof( BaseWeapon ), typeof( BaseArmor ), typeof( BaseClothing ), typeof( BaseJewel ), typeof( DragonBardingDeed ) }; - private static Type[] m_ColoredResourceTable = new Type[] + private static Type[] m_ColoredResourceTable = new[] { typeof( BaseIngot ), typeof( BaseOre ), typeof( BaseLeather ), typeof( BaseHides ), @@ -347,7 +347,7 @@ namespace Server.Engines.Craft typeof( BaseGranite ), typeof( BaseScales ) }; - private static Type[] m_MarkableTable = new Type[] + private static Type[] m_MarkableTable = new[] { typeof( BaseArmor ), typeof( BaseWeapon ), @@ -361,7 +361,7 @@ namespace Server.Engines.Craft typeof( BaseQuiver ) }; - private static Type[] m_NeverColorTable = new Type[] + private static Type[] m_NeverColorTable = new[] { typeof( OrcHelm ) }; @@ -652,7 +652,7 @@ namespace Server.Engines.Craft } if ( types[i] == null ) - types[i] = new Type[]{ baseType }; + types[i] = new[]{ baseType }; amounts[i] = craftRes.Amount; diff --git a/Scripts/Engines/Craft/DefInscription.cs b/Scripts/Engines/Craft/DefInscription.cs index e08061978..a7a72c3cc 100644 --- a/Scripts/Engines/Craft/DefInscription.cs +++ b/Scripts/Engines/Craft/DefInscription.cs @@ -120,7 +120,7 @@ namespace Server.Engines.Craft SpidersSilk } - private Type[] m_RegTypes = new Type[] + private Type[] m_RegTypes = new[] { typeof( BlackPearl ), typeof( Bloodmoss ), diff --git a/Scripts/Engines/Craft/DefTailoring.cs b/Scripts/Engines/Craft/DefTailoring.cs index 1622d0c45..3079e7b9b 100644 --- a/Scripts/Engines/Craft/DefTailoring.cs +++ b/Scripts/Engines/Craft/DefTailoring.cs @@ -43,7 +43,7 @@ namespace Server.Engines.Craft return 0; } - private static Type[] m_TailorColorables = new Type[] + private static Type[] m_TailorColorables = new[] { typeof( GozaMatEastDeed ), typeof( GozaMatSouthDeed ), typeof( SquareGozaMatEastDeed ), typeof( SquareGozaMatSouthDeed ), diff --git a/Scripts/Engines/Craft/DefTinkering.cs b/Scripts/Engines/Craft/DefTinkering.cs index 47eb9da9d..e9527020e 100644 --- a/Scripts/Engines/Craft/DefTinkering.cs +++ b/Scripts/Engines/Craft/DefTinkering.cs @@ -48,7 +48,7 @@ namespace Server.Engines.Craft return 0; } - private static Type[] m_TinkerColorables = new Type[] + private static Type[] m_TinkerColorables = new[] { typeof( ForkLeft ), typeof( ForkRight ), typeof( SpoonLeft ), typeof( SpoonRight ), diff --git a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs index 0b0f92be7..fd2d0d8c9 100644 --- a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs +++ b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs @@ -613,34 +613,34 @@ namespace Server.Engines.Doom public static int[][] MsgParams = { - new int[]{ 0x66d, 3 }, - new int[]{ 0x66d, 3 }, - new int[]{ 0x34, 3 } + new[]{ 0x66d, 3 }, + new[]{ 0x66d, 3 }, + new[]{ 0x34, 3 } }; /* World data for items */ public static int[][] TA = { - new int[]{316, 64, 5}, /* 3D Coords for levers */ - new int[]{323, 58, 5}, - new int[]{332, 63, 5}, - new int[]{323, 71, 5}, + new[]{316, 64, 5}, /* 3D Coords for levers */ + new[]{323, 58, 5}, + new[]{332, 63, 5}, + new[]{323, 71, 5}, - new int[]{324, 64}, /* 2D Coords for standing regions */ - new int[]{316, 65}, - new int[]{324, 58}, - new int[]{332, 64}, - new int[]{323, 72}, + new[]{324, 64}, /* 2D Coords for standing regions */ + new[]{316, 65}, + new[]{324, 58}, + new[]{332, 64}, + new[]{323, 72}, - new int[]{468, 92, -1}, new int[]{0x181D, 0x482}, /* 3D coord, itemid+hue for L.R. teles */ - new int[]{469, 92, -1}, new int[]{0x1821, 0x3fd}, - new int[]{470, 92, -1}, new int[]{0x1825, 0x66d}, + new[]{468, 92, -1}, new[]{0x181D, 0x482}, /* 3D coord, itemid+hue for L.R. teles */ + new[]{469, 92, -1}, new[]{0x1821, 0x3fd}, + new[]{470, 92, -1}, new[]{0x1825, 0x66d}, - new int[]{319, 70, 18}, new int[]{0x12d8}, /* 3D coord, itemid for statues */ - new int[]{329, 60, 18}, new int[]{0x12d9}, + new[]{319, 70, 18}, new[]{0x12d8}, /* 3D coord, itemid for statues */ + new[]{329, 60, 18}, new[]{0x12d9}, - new int[]{469, 96, 6} /* 3D Coords for Fake Box */ + new[]{469, 96, 6} /* 3D Coords for Fake Box */ }; /* CLILOC data for statue "correct souls" messages */ @@ -664,12 +664,12 @@ namespace Server.Engines.Doom public static int[][] PA = { - new int[]{ 0, 0, 0xA6 }, - new int[]{ 1050001, 0x485, 0xAA }, - new int[]{ 1050003, 0x485, 0xAC }, - new int[]{ 1050056, 0x485, 0xA8 }, - new int[]{ 1050057, 0x485, 0xA4 }, - new int[]{ 1062091, 0x23F3, 0xAC } + new[]{ 0, 0, 0xA6 }, + new[]{ 1050001, 0x485, 0xAA }, + new[]{ 1050003, 0x485, 0xAC }, + new[]{ 1050056, 0x485, 0xA8 }, + new[]{ 1050057, 0x485, 0xA4 }, + new[]{ 1062091, 0x23F3, 0xAC } }; public static Poison[] PA2 = { diff --git a/Scripts/Engines/Ethics/Core/Ethic.cs b/Scripts/Engines/Ethics/Core/Ethic.cs index a929d5fb6..205707fa6 100644 --- a/Scripts/Engines/Ethics/Core/Ethic.cs +++ b/Scripts/Engines/Ethics/Core/Ethic.cs @@ -236,7 +236,7 @@ namespace Server.Ethics public static readonly Ethic Hero = new Hero.HeroEthic(); public static readonly Ethic Evil = new Evil.EvilEthic(); - public static readonly Ethic[] Ethics = new Ethic[] + public static readonly Ethic[] Ethics = new[] { Hero, Evil diff --git a/Scripts/Engines/Factions/Core/Faction.cs b/Scripts/Engines/Factions/Core/Faction.cs index eb0083cd3..9bd88ebe4 100644 --- a/Scripts/Engines/Factions/Core/Faction.cs +++ b/Scripts/Engines/Factions/Core/Faction.cs @@ -12,7 +12,7 @@ using Server.Commands.Generic; namespace Server.Factions { - [CustomEnum( new string[]{ "Minax", "Council of Mages", "True Britannians", "Shadowlords" } )] + [CustomEnum( new[]{ "Minax", "Council of Mages", "True Britannians", "Shadowlords" } )] public abstract class Faction : IComparable { public int ZeroRankOffset; @@ -1299,21 +1299,21 @@ namespace Server.Factions { case FactionKickType.Kick: { - Commands = new string[]{ "FactionKick" }; + Commands = new[]{ "FactionKick" }; Usage = "FactionKick"; Description = "Kicks the targeted player out of his current faction. This does not prevent them from rejoining."; break; } case FactionKickType.Ban: { - Commands = new string[]{ "FactionBan" }; + Commands = new[]{ "FactionBan" }; Usage = "FactionBan"; Description = "Bans the account of a targeted player from joining factions. All players on the account are removed from their current faction, if any."; break; } case FactionKickType.Unban: { - Commands = new string[]{ "FactionUnban" }; + Commands = new[]{ "FactionUnban" }; Usage = "FactionUnban"; Description = "Unbans the account of a targeted player from joining factions."; break; diff --git a/Scripts/Engines/Factions/Core/MerchantTitles.cs b/Scripts/Engines/Factions/Core/MerchantTitles.cs index 6e97c867d..a87443853 100644 --- a/Scripts/Engines/Factions/Core/MerchantTitles.cs +++ b/Scripts/Engines/Factions/Core/MerchantTitles.cs @@ -36,7 +36,7 @@ namespace Server.Factions public class MerchantTitles { - private static MerchantTitleInfo[] m_Info = new MerchantTitleInfo[] + private static MerchantTitleInfo[] m_Info = new[] { new MerchantTitleInfo( SkillName.Inscribe, 90.0, new TextDefinition( 1060773, "Scribe" ), new TextDefinition( 1011468, "SCRIBE" ), new TextDefinition( 1010121, "You now have the faction title of scribe" ) ), new MerchantTitleInfo( SkillName.Carpentry, 90.0, new TextDefinition( 1060774, "Carpenter" ), new TextDefinition( 1011469, "CARPENTER" ), new TextDefinition( 1010122, "You now have the faction title of carpenter" ) ), diff --git a/Scripts/Engines/Factions/Core/Town.cs b/Scripts/Engines/Factions/Core/Town.cs index 04a535664..73f2d59c1 100644 --- a/Scripts/Engines/Factions/Core/Town.cs +++ b/Scripts/Engines/Factions/Core/Town.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace Server.Factions { - [CustomEnum( new string[]{ "Britain", "Magincia", "Minoc", "Moonglow", "Skara Brae", "Trinsic", "Vesper", "Yew" } )] + [CustomEnum( new[]{ "Britain", "Magincia", "Minoc", "Moonglow", "Skara Brae", "Trinsic", "Vesper", "Yew" } )] public abstract class Town : IComparable { private TownDefinition m_Definition; diff --git a/Scripts/Engines/Factions/Definitions/VendorDefinition.cs b/Scripts/Engines/Factions/Definitions/VendorDefinition.cs index 1e14f9230..c08b4fb5e 100644 --- a/Scripts/Engines/Factions/Definitions/VendorDefinition.cs +++ b/Scripts/Engines/Factions/Definitions/VendorDefinition.cs @@ -38,7 +38,7 @@ namespace Server.Factions m_Label = label; } - private static VendorDefinition[] m_Definitions = new VendorDefinition[] + private static VendorDefinition[] m_Definitions = new[] { new VendorDefinition( typeof( FactionBottleVendor ), 0xF0E, 5000, diff --git a/Scripts/Engines/Factions/Gumps/FinanceGump.cs b/Scripts/Engines/Factions/Gumps/FinanceGump.cs index 5ff93886c..a0fbd68b7 100644 --- a/Scripts/Engines/Factions/Gumps/FinanceGump.cs +++ b/Scripts/Engines/Factions/Gumps/FinanceGump.cs @@ -13,7 +13,7 @@ namespace Server.Factions private Faction m_Faction; private Town m_Town; - private static int[] m_PriceOffsets = new int[] + private static int[] m_PriceOffsets = new[] { -30, -25, -20, -15, -10, -5, +50, +100, +150, +200, +250, +300 diff --git a/Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs b/Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs index 79f7dca50..97cb2066e 100644 --- a/Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs +++ b/Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs @@ -38,14 +38,14 @@ namespace Server.Factions new TextDefinition( 1005189, "Members of the Council of Mages will now be beaten with a stick." ), // Moonglow new StrongholdDefinition( - new Rectangle2D[] + new[] { new Rectangle2D( 4463, 1487, 15, 35 ), new Rectangle2D( 4450, 1522, 35, 48 ), }, new Point3D( 4469, 1486, 0 ), new Point3D( 4457, 1544, 0 ), - new Point3D[] + new[] { new Point3D( 4464, 1534, 21 ), new Point3D( 4470, 1536, 21 ), @@ -78,7 +78,7 @@ namespace Server.Factions new Point3D( 3797, 2249, 20 ), new Point3D( 3797, 2246, 20 ) } ), */ - new RankDefinition[] + new[] { new RankDefinition( 10, 991, 8, new TextDefinition( 1060789, "Inquisitor of the Council" ) ), new RankDefinition( 9, 950, 7, new TextDefinition( 1060788, "Archon of Principle" ) ), @@ -91,7 +91,7 @@ namespace Server.Factions new RankDefinition( 2, 200, 4, new TextDefinition( 1060785, "Mystic" ) ), new RankDefinition( 1, 0, 4, new TextDefinition( 1060785, "Mystic" ) ) }, - new GuardDefinition[] + new[] { new GuardDefinition( typeof( FactionHenchman ), 0x1403, 5000, 1000, 10, new TextDefinition( 1011526, "HENCHMAN" ), new TextDefinition( 1011510, "Hire Henchman" ) ), new GuardDefinition( typeof( FactionMercenary ), 0x0F62, 6000, 2000, 10, new TextDefinition( 1011527, "MERCENARY" ), new TextDefinition( 1011511, "Hire Mercenary" ) ), diff --git a/Scripts/Engines/Factions/Instances/Factions/Minax.cs b/Scripts/Engines/Factions/Instances/Factions/Minax.cs index 124d35d14..22d2391b1 100644 --- a/Scripts/Engines/Factions/Instances/Factions/Minax.cs +++ b/Scripts/Engines/Factions/Instances/Factions/Minax.cs @@ -38,13 +38,13 @@ namespace Server.Factions new TextDefinition( 1005191, "Followers of Minax will now be told to go away." ), new TextDefinition( 1005192, "Followers of Minax will now be hanged by their toes." ), new StrongholdDefinition( - new Rectangle2D[] + new[] { new Rectangle2D( 1097, 2570, 70, 50 ) }, new Point3D( 1172, 2593, 0 ), new Point3D( 1117, 2587, 18 ), - new Point3D[] + new[] { new Point3D( 1113, 2601, 18 ), new Point3D( 1113, 2598, 18 ), @@ -55,7 +55,7 @@ namespace Server.Factions new Point3D( 1116, 2595, 18 ), new Point3D( 1116, 2592, 18 ) } ), - new RankDefinition[] + new[] { new RankDefinition( 10, 991, 8, new TextDefinition( 1060784, "Avenger of Mondain" ) ), new RankDefinition( 9, 950, 7, new TextDefinition( 1060783, "Dread Knight" ) ), @@ -68,7 +68,7 @@ namespace Server.Factions new RankDefinition( 2, 200, 4, new TextDefinition( 1060780, "Defiler" ) ), new RankDefinition( 1, 0, 4, new TextDefinition( 1060780, "Defiler" ) ) }, - new GuardDefinition[] + new[] { new GuardDefinition( typeof( FactionHenchman ), 0x1403, 5000, 1000, 10, new TextDefinition( 1011526, "HENCHMAN" ), new TextDefinition( 1011510, "Hire Henchman" ) ), new GuardDefinition( typeof( FactionMercenary ), 0x0F62, 6000, 2000, 10, new TextDefinition( 1011527, "MERCENARY" ), new TextDefinition( 1011511, "Hire Mercenary" ) ), diff --git a/Scripts/Engines/Factions/Instances/Factions/Shadowlords.cs b/Scripts/Engines/Factions/Instances/Factions/Shadowlords.cs index ea61b6dd5..d3f4d749f 100644 --- a/Scripts/Engines/Factions/Instances/Factions/Shadowlords.cs +++ b/Scripts/Engines/Factions/Instances/Factions/Shadowlords.cs @@ -37,14 +37,14 @@ namespace Server.Factions new TextDefinition( 1005185, "Minions of the Shadowlords will now be warned of their impending deaths." ), new TextDefinition( 1005186, "Minions of the Shadowlords will now be attacked at will." ), new StrongholdDefinition( - new Rectangle2D[] + new[] { new Rectangle2D( 960, 688, 8, 9 ), new Rectangle2D( 944, 697, 24, 23 ) }, new Point3D( 969, 768, 0 ), new Point3D( 947, 713, 0 ), - new Point3D[] + new[] { new Point3D( 953, 713, 20 ), new Point3D( 953, 709, 20 ), @@ -55,7 +55,7 @@ namespace Server.Factions new Point3D( 957, 705, 20 ), new Point3D( 957, 701, 20 ) } ), - new RankDefinition[] + new[] { new RankDefinition( 10, 991, 8, new TextDefinition( 1060799, "Purveyor of Darkness" ) ), new RankDefinition( 9, 950, 7, new TextDefinition( 1060798, "Agent of Evil" ) ), @@ -68,7 +68,7 @@ namespace Server.Factions new RankDefinition( 2, 200, 4, new TextDefinition( 1060795, "Servant" ) ), new RankDefinition( 1, 0, 4, new TextDefinition( 1060795, "Servant" ) ) }, - new GuardDefinition[] + new[] { new GuardDefinition( typeof( FactionHenchman ), 0x1403, 5000, 1000, 10, new TextDefinition( 1011526, "HENCHMAN" ), new TextDefinition( 1011510, "Hire Henchman" ) ), new GuardDefinition( typeof( FactionMercenary ), 0x0F62, 6000, 2000, 10, new TextDefinition( 1011527, "MERCENARY" ), new TextDefinition( 1011511, "Hire Mercenary" ) ), diff --git a/Scripts/Engines/Factions/Instances/Factions/TrueBritannians.cs b/Scripts/Engines/Factions/Instances/Factions/TrueBritannians.cs index eb6eb2d60..9681e22ba 100644 --- a/Scripts/Engines/Factions/Instances/Factions/TrueBritannians.cs +++ b/Scripts/Engines/Factions/Instances/Factions/TrueBritannians.cs @@ -37,7 +37,7 @@ namespace Server.Factions new TextDefinition( 1005182, "Followers of Lord British will now be warned of their impending doom." ), new TextDefinition( 1005183, "Followers of Lord British will now be attacked on sight." ), new StrongholdDefinition( - new Rectangle2D[] + new[] { new Rectangle2D( 1292, 1556, 25, 25 ), new Rectangle2D( 1292, 1676, 120, 25 ), @@ -49,7 +49,7 @@ namespace Server.Factions }, new Point3D( 1419, 1622, 20 ), new Point3D( 1330, 1621, 50 ), - new Point3D[] + new[] { new Point3D( 1328, 1627, 50 ), new Point3D( 1328, 1621, 50 ), @@ -60,7 +60,7 @@ namespace Server.Factions new Point3D( 1345, 1621, 50 ), new Point3D( 1345, 1627, 50 ) } ), - new RankDefinition[] + new[] { new RankDefinition( 10, 991, 8, new TextDefinition( 1060794, "Knight of the Codex" ) ), new RankDefinition( 9, 950, 7, new TextDefinition( 1060793, "Knight of Virtue" ) ), @@ -73,7 +73,7 @@ namespace Server.Factions new RankDefinition( 2, 200, 4, new TextDefinition( 1060790, "Defender" ) ), new RankDefinition( 1, 0, 4, new TextDefinition( 1060790, "Defender" ) ) }, - new GuardDefinition[] + new[] { new GuardDefinition( typeof( FactionHenchman ), 0x1403, 5000, 1000, 10, new TextDefinition( 1011526, "HENCHMAN" ), new TextDefinition( 1011510, "Hire Henchman" ) ), new GuardDefinition( typeof( FactionMercenary ), 0x0F62, 6000, 2000, 10, new TextDefinition( 1011527, "MERCENARY" ), new TextDefinition( 1011511, "Hire Mercenary" ) ), diff --git a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs index 19746db32..e578e6af1 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs @@ -268,7 +268,7 @@ namespace Server.Factions Utility.AssignRandomFacialHair( this, HairHue ); } - private static Type[] m_StrongPotions = new Type[] + private static Type[] m_StrongPotions = new[] { typeof( GreaterHealPotion ), typeof( GreaterHealPotion ), typeof( GreaterHealPotion ), typeof( GreaterCurePotion ), typeof( GreaterCurePotion ), typeof( GreaterCurePotion ), @@ -278,7 +278,7 @@ namespace Server.Factions typeof( GreaterExplosionPotion ) }; - private static Type[] m_WeakPotions = new Type[] + private static Type[] m_WeakPotions = new[] { typeof( HealPotion ), typeof( HealPotion ), typeof( HealPotion ), typeof( CurePotion ), typeof( CurePotion ), typeof( CurePotion ), diff --git a/Scripts/Engines/Harvest/Fishing.cs b/Scripts/Engines/Harvest/Fishing.cs index ecf558358..e5ea5e789 100644 --- a/Scripts/Engines/Harvest/Fishing.cs +++ b/Scripts/Engines/Harvest/Fishing.cs @@ -62,9 +62,9 @@ namespace Server.Engines.Harvest fish.ConsumedPerFeluccaHarvest = 1; // The fishing - fish.EffectActions = new int[]{ 12 }; + fish.EffectActions = new[]{ 12 }; fish.EffectSounds = new int[0]; - fish.EffectCounts = new int[]{ 1 }; + fish.EffectCounts = new[]{ 1 }; fish.EffectDelay = TimeSpan.Zero; fish.EffectSoundDelay = TimeSpan.FromSeconds( 8.0 ); @@ -75,12 +75,12 @@ namespace Server.Engines.Harvest fish.PackFullMessage = 503176; // You do not have room in your backpack for a fish. fish.ToolBrokeMessage = 503174; // You broke your fishing pole. - res = new HarvestResource[] + res = new[] { new HarvestResource( 00.0, 00.0, 100.0, 1043297, typeof( Fish ) ) }; - veins = new HarvestVein[] + veins = new[] { new HarvestVein( 100.0, 0.0, res[0], null ) }; @@ -90,7 +90,7 @@ namespace Server.Engines.Harvest if ( Core.ML ) { - fish.BonusResources = new BonusHarvestResource[] + fish.BonusResources = new[] { new BonusHarvestResource( 0, 99.4, null, null ), //set to same chance as mining ml gems new BonusHarvestResource( 80.0, .6, 1072597, typeof( WhitePearl ) ) @@ -123,7 +123,7 @@ namespace Server.Engines.Harvest } } - private static MutateEntry[] m_MutateTable = new MutateEntry[] + private static MutateEntry[] m_MutateTable = new[] { new MutateEntry( 80.0, 80.0, 4080.0, true, typeof( SpecialFishingNet ) ), new MutateEntry( 80.0, 80.0, 4080.0, true, typeof( BigFish ) ), @@ -254,7 +254,7 @@ namespace Server.Engines.Harvest { case 0: // Body parts { - int[] list = new int[] + int[] list = new[] { 0x1CDD, 0x1CE5, // arm 0x1CE0, 0x1CE8, // torso @@ -267,7 +267,7 @@ namespace Server.Engines.Harvest } case 1: // Bone parts { - int[] list = new int[] + int[] list = new[] { 0x1AE0, 0x1AE1, 0x1AE2, 0x1AE3, 0x1AE4, // skulls 0x1B09, 0x1B0A, 0x1B0B, 0x1B0C, 0x1B0D, 0x1B0E, 0x1B0F, 0x1B10, // bone piles @@ -303,7 +303,7 @@ namespace Server.Engines.Harvest } case 6: // Misc { - int[] list = new int[] + int[] list = new[] { 0x1EB5, // unfinished barrel 0xA2A, // stool @@ -550,7 +550,7 @@ namespace Server.Engines.Harvest return true; } - private static int[] m_WaterTiles = new int[] + private static int[] m_WaterTiles = new[] { 0x00A8, 0x00AB, 0x0136, 0x0137, diff --git a/Scripts/Engines/Harvest/Lumberjacking.cs b/Scripts/Engines/Harvest/Lumberjacking.cs index 277774a47..ff9b4a204 100644 --- a/Scripts/Engines/Harvest/Lumberjacking.cs +++ b/Scripts/Engines/Harvest/Lumberjacking.cs @@ -57,9 +57,9 @@ namespace Server.Engines.Harvest lumber.ConsumedPerFeluccaHarvest = 20; // The chopping effect - lumber.EffectActions = new int[]{ 13 }; - lumber.EffectSounds = new int[]{ 0x13E }; - lumber.EffectCounts = (Core.AOS ? new int[]{ 1 } : new int[]{ 1, 2, 2, 2, 3 }); + lumber.EffectActions = new[]{ 13 }; + lumber.EffectSounds = new[]{ 0x13E }; + lumber.EffectCounts = (Core.AOS ? new[]{ 1 } : new[]{ 1, 2, 2, 2, 3 }); lumber.EffectDelay = TimeSpan.FromSeconds( 1.6 ); lumber.EffectSoundDelay = TimeSpan.FromSeconds( 0.9 ); @@ -71,7 +71,7 @@ namespace Server.Engines.Harvest if ( Core.ML ) { - res = new HarvestResource[] + res = new[] { new HarvestResource( 00.0, 00.0, 100.0, 1072540, typeof( Log ) ), new HarvestResource( 65.0, 25.0, 105.0, 1072541, typeof( OakLog ) ), @@ -83,7 +83,7 @@ namespace Server.Engines.Harvest }; - veins = new HarvestVein[] + veins = new[] { new HarvestVein( 49.0, 0.0, res[0], null ), // Ordinary Logs new HarvestVein( 30.0, 0.5, res[1], res[0] ), // Oak @@ -94,7 +94,7 @@ namespace Server.Engines.Harvest new HarvestVein( 01.0, 0.5, res[6], res[0] ), // Frostwood }; - lumber.BonusResources = new BonusHarvestResource[] + lumber.BonusResources = new[] { new BonusHarvestResource( 0, 83.9, null, null ), //Nothing new BonusHarvestResource( 100, 10.0, 1072548, typeof( BarkFragment ) ), @@ -106,12 +106,12 @@ namespace Server.Engines.Harvest } else { - res = new HarvestResource[] + res = new[] { new HarvestResource( 00.0, 00.0, 100.0, 500498, typeof( Log ) ) }; - veins = new HarvestVein[] + veins = new[] { new HarvestVein( 100.0, 0.0, res[0], null ) }; @@ -182,7 +182,7 @@ namespace Server.Engines.Harvest } #region Tile lists - private static int[] m_TreeTiles = new int[] + private static int[] m_TreeTiles = new[] { 0x4CCA, 0x4CCB, 0x4CCC, 0x4CCD, 0x4CD0, 0x4CD3, 0x4CD6, 0x4CD8, 0x4CDA, 0x4CDD, 0x4CE0, 0x4CE3, 0x4CE6, 0x4CF8, 0x4CFB, 0x4CFE, diff --git a/Scripts/Engines/Harvest/Mining.cs b/Scripts/Engines/Harvest/Mining.cs index 6fcd10ea4..7581aaa58 100644 --- a/Scripts/Engines/Harvest/Mining.cs +++ b/Scripts/Engines/Harvest/Mining.cs @@ -60,9 +60,9 @@ namespace Server.Engines.Harvest oreAndStone.ConsumedPerFeluccaHarvest = 2; // The digging effect - oreAndStone.EffectActions = new int[]{ 11 }; - oreAndStone.EffectSounds = new int[]{ 0x125, 0x126 }; - oreAndStone.EffectCounts = new int[]{ 1 }; + oreAndStone.EffectActions = new[]{ 11 }; + oreAndStone.EffectSounds = new[]{ 0x125, 0x126 }; + oreAndStone.EffectCounts = new[]{ 1 }; oreAndStone.EffectDelay = TimeSpan.FromSeconds( 1.6 ); oreAndStone.EffectSoundDelay = TimeSpan.FromSeconds( 0.9 ); @@ -74,7 +74,7 @@ namespace Server.Engines.Harvest oreAndStone.PackFullMessage = 1010481; // Your backpack is full, so the ore you mined is lost. oreAndStone.ToolBrokeMessage = 1044038; // You have worn out your tool! - res = new HarvestResource[] + res = new[] { new HarvestResource( 00.0, 00.0, 100.0, 1007072, typeof( IronOre ), typeof( Granite ) ), new HarvestResource( 65.0, 25.0, 105.0, 1007073, typeof( DullCopperOre ), typeof( DullCopperGranite ), typeof( DullCopperElemental ) ), @@ -87,7 +87,7 @@ namespace Server.Engines.Harvest new HarvestResource( 99.0, 59.0, 139.0, 1007080, typeof( ValoriteOre ), typeof( ValoriteGranite ), typeof( ValoriteElemental ) ) }; - veins = new HarvestVein[] + veins = new[] { new HarvestVein( 49.6, 0.0, res[0], null ), // Iron new HarvestVein( 11.2, 0.5, res[1], res[0] ), // Dull Copper @@ -105,7 +105,7 @@ namespace Server.Engines.Harvest if ( Core.ML ) { - oreAndStone.BonusResources = new BonusHarvestResource[] + oreAndStone.BonusResources = new[] { new BonusHarvestResource( 0, 99.4, null, null ), //Nothing new BonusHarvestResource( 100, .1, 1072562, typeof( BlueDiamond ) ), @@ -152,9 +152,9 @@ namespace Server.Engines.Harvest sand.ConsumedPerFeluccaHarvest = 1; // The digging effect - sand.EffectActions = new int[]{ 11 }; - sand.EffectSounds = new int[]{ 0x125, 0x126 }; - sand.EffectCounts = new int[]{ 6 }; + sand.EffectActions = new[]{ 11 }; + sand.EffectSounds = new[]{ 0x125, 0x126 }; + sand.EffectCounts = new[]{ 6 }; sand.EffectDelay = TimeSpan.FromSeconds( 1.6 ); sand.EffectSoundDelay = TimeSpan.FromSeconds( 0.9 ); @@ -166,12 +166,12 @@ namespace Server.Engines.Harvest sand.PackFullMessage = 1044632; // Your backpack can't hold the sand, and it is lost! sand.ToolBrokeMessage = 1044038; // You have worn out your tool! - res = new HarvestResource[] + res = new[] { new HarvestResource( 100.0, 70.0, 400.0, 1044631, typeof( Sand ) ) }; - veins = new HarvestVein[] + veins = new[] { new HarvestVein( 100.0, 0.0, res[0], null ) }; @@ -260,7 +260,7 @@ namespace Server.Engines.Harvest return base.MutateVein( from, tool, def, bank, toHarvest, vein ); } - private static int[] m_Offsets = new int[] + private static int[] m_Offsets = new[] { -1, -1, -1, 0, @@ -353,7 +353,7 @@ namespace Server.Engines.Harvest } #region Tile lists - private static int[] m_MountainAndCaveTiles = new int[] + private static int[] m_MountainAndCaveTiles = new[] { 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 236, 237, 238, 239, 240, 241, 242, 243, @@ -392,7 +392,7 @@ namespace Server.Engines.Harvest 0x4549, 0x454A, 0x454B, 0x454C, 0x454D, 0x454E, 0x454F }; - private static int[] m_SandTiles = new int[] + private static int[] m_SandTiles = new[] { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, diff --git a/Scripts/Engines/Help/HelpGump.cs b/Scripts/Engines/Help/HelpGump.cs index be851052a..6480a8056 100644 --- a/Scripts/Engines/Help/HelpGump.cs +++ b/Scripts/Engines/Help/HelpGump.cs @@ -11,7 +11,7 @@ namespace Server.Engines.Help { private Mobile m_From; - public ContainedMenu( Mobile from ) : base( "You already have an open help request. We will have someone assist you as soon as possible. What would you like to do?", new string[]{ "Leave my old help request like it is.", "Remove my help request from the queue." } ) + public ContainedMenu( Mobile from ) : base( "You already have an open help request. We will have someone assist you as soon as possible. What would you like to do?", new[]{ "Leave my old help request like it is.", "Remove my help request from the queue." } ) { m_From = from; } diff --git a/Scripts/Engines/Help/PageQueue.cs b/Scripts/Engines/Help/PageQueue.cs index 2431ab2a3..4726aad4a 100644 --- a/Scripts/Engines/Help/PageQueue.cs +++ b/Scripts/Engines/Help/PageQueue.cs @@ -27,7 +27,7 @@ namespace Server.Engines.Help public class PageEntry { // What page types should have a speech log as attachment? - public static readonly PageType[] SpeechLogAttachment = new PageType[] + public static readonly PageType[] SpeechLogAttachment = new[] { PageType.VerbalHarassment }; diff --git a/Scripts/Engines/Help/PageQueueGump.cs b/Scripts/Engines/Help/PageQueueGump.cs index 578baf0d3..c788134de 100644 --- a/Scripts/Engines/Help/PageQueueGump.cs +++ b/Scripts/Engines/Help/PageQueueGump.cs @@ -468,7 +468,7 @@ namespace Server.Engines.Help private PageEntry m_Entry; private Mobile m_Mobile; - private static int[] m_AccessLevelHues = new int[] + private static int[] m_AccessLevelHues = new[] { 2100, 2122, diff --git a/Scripts/Engines/Help/StuckMenu.cs b/Scripts/Engines/Help/StuckMenu.cs index c09a5c5dd..06870c9e6 100644 --- a/Scripts/Engines/Help/StuckMenu.cs +++ b/Scripts/Engines/Help/StuckMenu.cs @@ -22,10 +22,10 @@ namespace Server.Menus.Questions public class StuckMenu : Gump { - private static StuckMenuEntry[] m_Entries = new StuckMenuEntry[] + private static StuckMenuEntry[] m_Entries = new[] { // Britain - new StuckMenuEntry( 1011028, new Point3D[] + new StuckMenuEntry( 1011028, new[] { new Point3D( 1522, 1757, 28 ), new Point3D( 1519, 1619, 10 ), @@ -35,7 +35,7 @@ namespace Server.Menus.Questions } ), // Trinsic - new StuckMenuEntry( 1011029, new Point3D[] + new StuckMenuEntry( 1011029, new[] { new Point3D( 2005, 2754, 30 ), new Point3D( 1993, 2827, 0 ), @@ -45,7 +45,7 @@ namespace Server.Menus.Questions } ), // Vesper - new StuckMenuEntry( 1011030, new Point3D[] + new StuckMenuEntry( 1011030, new[] { new Point3D( 2973, 891, 0 ), new Point3D( 3003, 776, 0 ), @@ -55,7 +55,7 @@ namespace Server.Menus.Questions } ), // Minoc - new StuckMenuEntry( 1011031, new Point3D[] + new StuckMenuEntry( 1011031, new[] { new Point3D( 2498, 392, 0 ), new Point3D( 2433, 541, 0 ), @@ -65,7 +65,7 @@ namespace Server.Menus.Questions } ), // Yew - new StuckMenuEntry( 1011032, new Point3D[] + new StuckMenuEntry( 1011032, new[] { new Point3D( 490, 1166, 0 ), new Point3D( 652, 1098, 0 ), @@ -75,7 +75,7 @@ namespace Server.Menus.Questions } ), // Cove - new StuckMenuEntry( 1011033, new Point3D[] + new StuckMenuEntry( 1011033, new[] { new Point3D( 2230, 1159, 0 ), new Point3D( 2218, 1203, 0 ), @@ -85,10 +85,10 @@ namespace Server.Menus.Questions } ) }; - private static StuckMenuEntry[] m_T2AEntries = new StuckMenuEntry[] + private static StuckMenuEntry[] m_T2AEntries = new[] { // Papua - new StuckMenuEntry( 1011057, new Point3D[] + new StuckMenuEntry( 1011057, new[] { new Point3D( 5720, 3109, -1 ), new Point3D( 5677, 3176, -3 ), @@ -98,7 +98,7 @@ namespace Server.Menus.Questions } ), // Delucia - new StuckMenuEntry( 1011058, new Point3D[] + new StuckMenuEntry( 1011058, new[] { new Point3D( 5216, 4033, 37 ), new Point3D( 5262, 4049, 37 ), diff --git a/Scripts/Engines/MLQuests/Definitions/Bedlam.cs b/Scripts/Engines/MLQuests/Definitions/Bedlam.cs index c2b87910c..ec14236a6 100644 --- a/Scripts/Engines/MLQuests/Definitions/Bedlam.cs +++ b/Scripts/Engines/MLQuests/Definitions/Bedlam.cs @@ -69,7 +69,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1074858; // You had better get going. Master Theophilus isn't likely to kill himself just to save me this embarrassment. CompletionMessage = 1074859; // You look a bit worse for wear! He put up a good fight did he? Hah! That's the spirit … a Master of Bedlam is a match for most. - Objectives.Add( new KillObjective( 1, new Type[] { typeof( MasterTheophilus ) }, "Master Theophilus" ) ); + Objectives.Add( new KillObjective( 1, new[] { typeof( MasterTheophilus ) }, "Master Theophilus" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } diff --git a/Scripts/Engines/MLQuests/Definitions/Heartwood.cs b/Scripts/Engines/MLQuests/Definitions/Heartwood.cs index cc24e0b43..726e9b7f7 100644 --- a/Scripts/Engines/MLQuests/Definitions/Heartwood.cs +++ b/Scripts/Engines/MLQuests/Definitions/Heartwood.cs @@ -18,7 +18,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Rabbit ) }, "rabbits" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Rabbit ) }, "rabbits" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -136,7 +136,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Pig ) }, "pigs" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Pig ) }, "pigs" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -152,7 +152,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Walrus ) }, "walruses" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Walrus ) }, "walruses" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -168,7 +168,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Mongbat ) }, "mongbats" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Mongbat ) }, "mongbats" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -184,7 +184,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Bull ) }, "bulls" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Bull ) }, "bulls" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -200,7 +200,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Sheep ) }, "sheep" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Sheep ) }, "sheep" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -216,7 +216,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Bird ) }, "birds" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Bird ) }, "birds" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -232,7 +232,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( SewerRat ) }, "sewer rats" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( SewerRat ) }, "sewer rats" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -248,8 +248,8 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 5, new Type[] { typeof( Zombie ) }, "zombies" ) ); - Objectives.Add( new KillObjective( 5, new Type[] { typeof( Skeleton ) }, "skeletons" ) ); + Objectives.Add( new KillObjective( 5, new[] { typeof( Zombie ) }, "zombies" ) ); + Objectives.Add( new KillObjective( 5, new[] { typeof( Skeleton ) }, "skeletons" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -265,7 +265,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( GrizzlyBear ) }, "grizzly bears" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( GrizzlyBear ) }, "grizzly bears" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -283,8 +283,8 @@ namespace Server.Engines.MLQuests.Definitions ObjectiveType = ObjectiveType.Any; - Objectives.Add( new KillObjective( 12, new Type[] { typeof( RedSolenWorker ) }, "red solen workers" ) ); - Objectives.Add( new KillObjective( 12, new Type[] { typeof( BlackSolenWorker ) }, "black solen workers" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( RedSolenWorker ) }, "red solen workers" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( BlackSolenWorker ) }, "black solen workers" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -300,7 +300,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073586; // The restless spirts still walk -- you must kill 15 of them. - Objectives.Add( new KillObjective( 15, new Type[] { typeof( Spectre ), typeof( Shade ), typeof( Wraith ) }, "spectres or shades or wraiths" ) ); + Objectives.Add( new KillObjective( 15, new[] { typeof( Spectre ), typeof( Shade ), typeof( Wraith ) }, "spectres or shades or wraiths" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -316,7 +316,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 8, new Type[] { typeof( PatchworkSkeleton ) }, "patchwork skeletons" ) ); + Objectives.Add( new KillObjective( 8, new[] { typeof( PatchworkSkeleton ) }, "patchwork skeletons" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -332,7 +332,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 12, new Type[] { typeof( Ghoul ) }, "ghouls" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( Ghoul ) }, "ghouls" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -348,7 +348,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1074690; // Probably the wiser course of action. InProgressMessage = 1074691; // You still need to kill those troglodytes, remember? - Objectives.Add( new KillObjective( 12, new Type[] { typeof( Troglodyte ) }, "troglodytes" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( Troglodyte ) }, "troglodytes" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -364,7 +364,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073585; // Your task is not done. Continue putting the Skeleton and Bone Knights to rest. - Objectives.Add( new KillObjective( 16, new Type[] { typeof( BoneKnight ), typeof( SkeletalKnight ) }, "bone knights or skeletal knights" ) ); + Objectives.Add( new KillObjective( 16, new[] { typeof( BoneKnight ), typeof( SkeletalKnight ) }, "bone knights or skeletal knights" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -415,8 +415,8 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1074682; // The trog chief and his mutt should be easy enough to find. Just kill them and report back. Easy enough. CompletionMessage = 1074683; // Not half bad. Here's your prize. - Objectives.Add( new KillObjective( 1, new Type[] { typeof( Lurg ) }, "Lurg" ) ); - Objectives.Add( new KillObjective( 1, new Type[] { typeof( Grobu ) }, "Grobu" ) ); + Objectives.Add( new KillObjective( 1, new[] { typeof( Lurg ) }, "Lurg" ) ); + Objectives.Add( new KillObjective( 1, new[] { typeof( Grobu ) }, "Grobu" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -432,7 +432,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Hind ) }, "hinds" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Hind ) }, "hinds" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -448,7 +448,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Boar ) }, "boars" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Boar ) }, "boars" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -464,9 +464,9 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073599; // Four of each, that's all I ask. Water, earth and fire. - Objectives.Add( new KillObjective( 4, new Type[] { typeof( FireElemental ) }, "fire elementals" ) ); - Objectives.Add( new KillObjective( 4, new Type[] { typeof( WaterElemental ) }, "water elementals" ) ); - Objectives.Add( new KillObjective( 4, new Type[] { typeof( EarthElemental ) }, "earth elementals" ) ); + Objectives.Add( new KillObjective( 4, new[] { typeof( FireElemental ) }, "fire elementals" ) ); + Objectives.Add( new KillObjective( 4, new[] { typeof( WaterElemental ) }, "water elementals" ) ); + Objectives.Add( new KillObjective( 4, new[] { typeof( EarthElemental ) }, "earth elementals" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -482,7 +482,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073736; // Continue to seek and kill the Bog Things. - Objectives.Add( new KillObjective( 8, new Type[] { typeof( BogThing ) }, "bog things" ) ); + Objectives.Add( new KillObjective( 8, new[] { typeof( BogThing ) }, "bog things" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -498,7 +498,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073584; // You got rocks in your head? I said to kill 12 earth elementals, okay? - Objectives.Add( new KillObjective( 12, new Type[] { typeof( EarthElemental ) }, "earth elementals" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( EarthElemental ) }, "earth elementals" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -514,7 +514,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 12, new Type[] { typeof( GiantSpider ) }, "giant spiders" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( GiantSpider ) }, "giant spiders" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -530,8 +530,8 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073019; // Hahahaha! I knew it! InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 8, new Type[] { typeof( Corpser ) }, "corpsers" ) ); - Objectives.Add( new KillObjective( 2, new Type[] { typeof( SwampTentacle ) }, "swamp tentacles" ) ); + Objectives.Add( new KillObjective( 8, new[] { typeof( Corpser ) }, "corpsers" ) ); + Objectives.Add( new KillObjective( 2, new[] { typeof( SwampTentacle ) }, "swamp tentacles" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -547,7 +547,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073019; // Hahahaha! I knew it! InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Gibberling ) }, "gibberlings" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Gibberling ) }, "gibberlings" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -563,7 +563,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073019; // Hahahaha! I knew it! InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 12, new Type[] { typeof( FleshGolem ) }, "flesh golems" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( FleshGolem ) }, "flesh golems" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -579,7 +579,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073019; // Hahahaha! I knew it! InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Harpy ) }, "harpies" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Harpy ) }, "harpies" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -595,7 +595,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073019; // Hahahaha! I knew it! InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( PlagueSpawn ) }, "plague spawns" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( PlagueSpawn ) }, "plague spawns" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -611,7 +611,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073019; // Hahahaha! I knew it! InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( LavaLizard ) }, "lava lizards" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( LavaLizard ) }, "lava lizards" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -627,7 +627,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073019; // Hahahaha! I knew it! InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( GoreFiend ) }, "gore fiends" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( GoreFiend ) }, "gore fiends" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -643,7 +643,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073019; // Hahahaha! I knew it! InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( VampireBat ) }, "vampire bats" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( VampireBat ) }, "vampire bats" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -659,7 +659,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073583; // Uh, I don't think you're quite done killing Mummies yet. - Objectives.Add( new KillObjective( 15, new Type[] { typeof( Mummy ) }, "mummies" ) ); + Objectives.Add( new KillObjective( 15, new[] { typeof( Mummy ) }, "mummies" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -675,7 +675,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073735; // Have you killed the Ophidian Knights or Avengers? - Objectives.Add( new KillObjective( 10, new Type[] { typeof( OphidianKnight ) }, "ophidian avengers or ophidian knight-errants" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( OphidianKnight ) }, "ophidian avengers or ophidian knight-errants" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -691,7 +691,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073587; // Don't let the little devils scare you! You kill 12 imps - then we'll talk reward. - Objectives.Add( new KillObjective( 12, new Type[] { typeof( Imp ) }, "imps" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( Imp ) }, "imps" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -707,7 +707,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073740; // Those smoky devils, the Efreets, are still about. - Objectives.Add( new KillObjective( 8, new Type[] { typeof( Efreet ) }, "efreets" ) ); + Objectives.Add( new KillObjective( 8, new[] { typeof( Efreet ) }, "efreets" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -723,7 +723,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073594; // Have you annihilated a dozen Gazers yet, kind traveler? - Objectives.Add( new KillObjective( 12, new Type[] { typeof( Gazer ) }, "gazers" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( Gazer ) }, "gazers" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -739,7 +739,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073738; // I won't be able to pay you until you've gotten enough Gargoyle Enforcers. - Objectives.Add( new KillObjective( 6, new Type[] { typeof( GargoyleEnforcer ) }, "gargoyle enforcers" ) ); + Objectives.Add( new KillObjective( 6, new[] { typeof( GargoyleEnforcer ) }, "gargoyle enforcers" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -755,7 +755,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073590; // Surely, a brave soul like yourself can kill 10 Bone Magi and Skeletal Mages? - Objectives.Add( new KillObjective( 10, new Type[] { typeof( BoneMagi ), typeof( SkeletalMage ) }, "bone mages or skeletal mages" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( BoneMagi ), typeof( SkeletalMage ) }, "bone mages or skeletal mages" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -771,7 +771,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073742; // Dread Spiders? I say keep exterminating the arachnid vermin. - Objectives.Add( new KillObjective( 8, new Type[] { typeof( DreadSpider ) }, "dread spiders" ) ); + Objectives.Add( new KillObjective( 8, new[] { typeof( DreadSpider ) }, "dread spiders" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -787,8 +787,8 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Mongbat ) }, "mongbats" ) ); - Objectives.Add( new KillObjective( 4, new Type[] { typeof( GreaterMongbat ) }, "greater mongbats" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Mongbat ) }, "mongbats" ) ); + Objectives.Add( new KillObjective( 4, new[] { typeof( GreaterMongbat ) }, "greater mongbats" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -806,8 +806,8 @@ namespace Server.Engines.MLQuests.Definitions ObjectiveType = ObjectiveType.Any; - Objectives.Add( new KillObjective( 3, new Type[] { typeof( RedSolenQueen ) }, "red solen queens" ) ); - Objectives.Add( new KillObjective( 3, new Type[] { typeof( BlackSolenQueen ) }, "black solen queens" ) ); + Objectives.Add( new KillObjective( 3, new[] { typeof( RedSolenQueen ) }, "red solen queens" ) ); + Objectives.Add( new KillObjective( 3, new[] { typeof( BlackSolenQueen ) }, "black solen queens" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -823,7 +823,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073588; // Unless you kill at least 10 Terathan Warriors, you won't have any impact on their hive. - Objectives.Add( new KillObjective( 10, new Type[] { typeof( TerathanWarrior ) }, "terathan warriors" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( TerathanWarrior ) }, "terathan warriors" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -839,7 +839,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073598; // You wouldn't try and just pretend you murdered 10 Giant Ice Worms, would you? - Objectives.Add( new KillObjective( 10, new Type[] { typeof( IceSerpent ) }, "giant ice serpents" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( IceSerpent ) }, "giant ice serpents" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -855,8 +855,8 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073591; // The only good orc is a dead orc - and 4 dead Captains and 6 dead Bombers is even better! - Objectives.Add( new KillObjective( 6, new Type[] { typeof( OrcBomber ) }, "orc bombers" ) ); - Objectives.Add( new KillObjective( 4, new Type[] { typeof( OrcCaptain ) }, "orc captain" ) ); + Objectives.Add( new KillObjective( 6, new[] { typeof( OrcBomber ) }, "orc bombers" ) ); + Objectives.Add( new KillObjective( 4, new[] { typeof( OrcCaptain ) }, "orc captain" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -872,7 +872,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Goat ) }, "goats" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Goat ) }, "goats" ) ); Rewards.Add( ItemReward.SmallBagOfTrinkets ); } @@ -888,7 +888,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 12, new Type[] { typeof( Slime ) }, "slimes" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( Slime ) }, "slimes" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -904,9 +904,9 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 8, new Type[] { typeof( Orc ) }, "orcs" ) ); + Objectives.Add( new KillObjective( 8, new[] { typeof( Orc ) }, "orcs" ) ); // TODO: This needs to be orc scouts but they aren't in the SVN - Objectives.Add( new KillObjective( 4, new Type[] { typeof( OrcishLord ) }, "orcish lords" ) ); + Objectives.Add( new KillObjective( 4, new[] { typeof( OrcishLord ) }, "orcish lords" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -922,8 +922,8 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 5, new Type[] { typeof( Ogre ) }, "ogres" ) ); - Objectives.Add( new KillObjective( 5, new Type[] { typeof( Ettin ) }, "ettins" ) ); + Objectives.Add( new KillObjective( 5, new[] { typeof( Ogre ) }, "ogres" ) ); + Objectives.Add( new KillObjective( 5, new[] { typeof( Ettin ) }, "ettins" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -939,7 +939,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Troll ) }, "trolls" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Troll ) }, "trolls" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -955,8 +955,8 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 6, new Type[] { typeof( IceSerpent ) }, "giant ice serpents" ) ); - Objectives.Add( new KillObjective( 6, new Type[] { typeof( FrostSpider ) }, "frost spiders" ) ); + Objectives.Add( new KillObjective( 6, new[] { typeof( IceSerpent ) }, "giant ice serpents" ) ); + Objectives.Add( new KillObjective( 6, new[] { typeof( FrostSpider ) }, "frost spiders" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -972,7 +972,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Lizardman ) }, "lizardmen" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Lizardman ) }, "lizardmen" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -990,8 +990,8 @@ namespace Server.Engines.MLQuests.Definitions ObjectiveType = ObjectiveType.Any; - Objectives.Add( new KillObjective( 10, new Type[] { typeof( RedSolenWarrior ) }, "red solen warriors" ) ); - Objectives.Add( new KillObjective( 10, new Type[] { typeof( BlackSolenWarrior ) }, "black solen warriors" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( RedSolenWarrior ) }, "red solen warriors" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( BlackSolenWarrior ) }, "black solen warriors" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -1007,7 +1007,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073589; // You've got a good start, but to stop the black-eyed fiends, you need to kill a dozen. - Objectives.Add( new KillObjective( 12, new Type[] { typeof( GiantBlackWidow ) }, "giant black widows" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( GiantBlackWidow ) }, "giant black widows" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -1023,7 +1023,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073582; // Go back and kill all 20 bogglings! - Objectives.Add( new KillObjective( 12, new Type[] { typeof( Bogling ) }, "boglings" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( Bogling ) }, "boglings" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -1039,7 +1039,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073744; // How are farmers supposed to work with these Whipping Vines around? - Objectives.Add( new KillObjective( 15, new Type[] { typeof( WhippingVine ) }, "whipping vines" ) ); + Objectives.Add( new KillObjective( 15, new[] { typeof( WhippingVine ) }, "whipping vines" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1055,7 +1055,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073745; // Please, rid us of the Ant Lion infestation. - Objectives.Add( new KillObjective( 12, new Type[] { typeof( AntLion ) }, "ant lions" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( AntLion ) }, "ant lions" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1072,7 +1072,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1073746; // The unholy brutes, the Golems, must be smited! CompletionMessage = 1073787; // Reduced those Golems to component parts? Good, then -- you deserve this reward! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Golem ) }, "golems" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Golem ) }, "golems" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1088,7 +1088,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073746; // The chill won't lift until you eradicate a few Ice Elemenals. - Objectives.Add( new KillObjective( 15, new Type[] { typeof( IceElemental ) }, "ice elementals" ) ); + Objectives.Add( new KillObjective( 15, new[] { typeof( IceElemental ) }, "ice elementals" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1522,7 +1522,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 3, new Type[] { typeof( Succubus ) }, "succubi", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 3, new[] { typeof( Succubus ) }, "succubi", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1538,7 +1538,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 3, new Type[] { typeof( Moloch ) }, "molochs", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 3, new[] { typeof( Moloch ) }, "molochs", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1554,7 +1554,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Daemon ) }, "daemons", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 10, new[] { typeof( Daemon ) }, "daemons", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1570,7 +1570,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( ArcaneDaemon ) }, "arcane daemons", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 10, new[] { typeof( ArcaneDaemon ) }, "arcane daemons", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1586,8 +1586,8 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 3, new Type[] { typeof( PoisonElemental ) }, "poison elementals", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus - Objectives.Add( new KillObjective( 6, new Type[] { typeof( AcidElemental ) }, "acid elementals", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 3, new[] { typeof( PoisonElemental ) }, "poison elementals", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 6, new[] { typeof( AcidElemental ) }, "acid elementals", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1603,9 +1603,9 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( PlagueSpawn ) }, "plague spawns", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus - Objectives.Add( new KillObjective( 3, new Type[] { typeof( PlagueBeast ) }, "plague beasts", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus - Objectives.Add( new KillObjective( 1, new Type[] { typeof( PlagueBeastLord ) }, "plague beast lord", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 10, new[] { typeof( PlagueSpawn ) }, "plague spawns", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 3, new[] { typeof( PlagueBeast ) }, "plague beasts", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus + Objectives.Add( new KillObjective( 1, new[] { typeof( PlagueBeastLord ) }, "plague beast lord", new QuestArea( 1074806, "The Palace of Paroxysmus" ) ) ); // The Palace of Paroxysmus Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1622,7 +1622,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1074672; // You must not waste time. Do not suffer these crystalline abominations to live. CompletionMessage = 1074673; // You have done well. Enjoy this reward. - Objectives.Add( new KillObjective( 5, new Type[] { typeof( CrystalLatticeSeeker ) }, "crystal lattice seekers", new QuestArea( 1074805, "The Prism of Light" ) ) ); // The Prism of Light + Objectives.Add( new KillObjective( 5, new[] { typeof( CrystalLatticeSeeker ) }, "crystal lattice seekers", new QuestArea( 1074805, "The Prism of Light" ) ) ); // The Prism of Light Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1639,7 +1639,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1074672; // You must not waste time. Do not suffer these crystalline abominations to live. CompletionMessage = 1074673; // You have done well. Enjoy this reward. - Objectives.Add( new KillObjective( 3, new Type[] { typeof( CrystalDaemon ) }, "crystal daemons", new QuestArea( 1074805, "The Prism of Light" ) ) ); // The Prism of Light + Objectives.Add( new KillObjective( 3, new[] { typeof( CrystalDaemon ) }, "crystal daemons", new QuestArea( 1074805, "The Prism of Light" ) ) ); // The Prism of Light Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1656,7 +1656,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1074672; // You must not waste time. Do not suffer these crystalline abominations to live. CompletionMessage = 1074673; // You have done well. Enjoy this reward. - Objectives.Add( new KillObjective( 8, new Type[] { typeof( CrystalVortex ) }, "crystal vortices", new QuestArea( 1074805, "The Prism of Light" ) ) ); // The Prism of Light + Objectives.Add( new KillObjective( 8, new[] { typeof( CrystalVortex ) }, "crystal vortices", new QuestArea( 1074805, "The Prism of Light" ) ) ); // The Prism of Light Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -1769,7 +1769,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1072980; // The Black Order's fortress home is well hidden. Legend has it that a humble fishing village disguises the magical portal. // TODO: Verify that this has to be males only (as per the description) - Objectives.Add( new KillObjective( 10, new Type[] { typeof( EliteNinja ) }, "elite ninjas", new QuestArea( 1074804, "The Citadel" ) ) ); // The Citadel + Objectives.Add( new KillObjective( 10, new[] { typeof( EliteNinja ) }, "elite ninjas", new QuestArea( 1074804, "The Citadel" ) ) ); // The Citadel Rewards.Add( ItemReward.BagOfTreasure ); } diff --git a/Scripts/Engines/MLQuests/Definitions/Heritage.cs b/Scripts/Engines/MLQuests/Definitions/Heritage.cs index 23ea8ad54..6b2d2ecc9 100644 --- a/Scripts/Engines/MLQuests/Definitions/Heritage.cs +++ b/Scripts/Engines/MLQuests/Definitions/Heritage.cs @@ -176,7 +176,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072830; // Then begone. I have no time to waste on you, human. InProgressMessage = 1072831; // The timber wolves are easily tracked, human. - Objectives.Add( new KillObjective( 15, new Type[] { typeof( TimberWolf ) }, "timber wolves", new QuestArea( 1074833, "Huntsman's Forest" ) ) ); // Huntsman's Forest + Objectives.Add( new KillObjective( 15, new[] { typeof( TimberWolf ) }, "timber wolves", new QuestArea( 1074833, "Huntsman's Forest" ) ) ); // Huntsman's Forest Rewards.Add( new DummyReward( 1072807 ) ); // The boon of the Huntsman. } @@ -619,8 +619,8 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1074529; // You're not making much progress in the honing-mind-and-body department, are you? CompletionNotice = CompletionNoticeShortReturn; - Objectives.Add( new KillObjective( 5, new Type[] { typeof( Efreet ) }, "efreets", new QuestArea( 1074808, "Fire" ) ) ); // Fire - Objectives.Add( new KillObjective( 5, new Type[] { typeof( IceFiend ) }, "ice fiends", new QuestArea( 1074809, "Ice" ) ) ); // Ice + Objectives.Add( new KillObjective( 5, new[] { typeof( Efreet ) }, "efreets", new QuestArea( 1074808, "Fire" ) ) ); // Fire + Objectives.Add( new KillObjective( 5, new[] { typeof( IceFiend ) }, "ice fiends", new QuestArea( 1074809, "Ice" ) ) ); // Ice Rewards.Add( new DummyReward( 1074875 ) ); // Another step closer to becoming human. } diff --git a/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs b/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs index 1e920fa03..bfaaccad4 100644 --- a/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs +++ b/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs @@ -47,7 +47,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073581; // Until you kill 12 Wailing Banshees, there will be no peace. - Objectives.Add( new KillObjective( 12, new Type[] { typeof( WailingBanshee ) }, "wailing banshees" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( WailingBanshee ) }, "wailing banshees" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -70,7 +70,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 12, new Type[] { typeof( FrenziedOstard ) }, "frenzied ostards" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( FrenziedOstard ) }, "frenzied ostards" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -86,7 +86,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( DireWolf ) }, "dire wolves" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( DireWolf ) }, "dire wolves" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -103,9 +103,9 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1074746; // Perhaps I was unclear. You'll know them when you see them, because you'll see you, and you, and you. Hurry now. CompletionMessage = 1074747; // Are you one of THEM? Ahhhh! Oh, wait, if you were them, then you'd be me. So you're -- you. Good job! - Objectives.Add( new KillObjective( 1, new Type[] { typeof( Guile ) }, "Guile" ) ); - Objectives.Add( new KillObjective( 1, new Type[] { typeof( Irk ) }, "Irk" ) ); - Objectives.Add( new KillObjective( 1, new Type[] { typeof( Spite ) }, "Spite" ) ); + Objectives.Add( new KillObjective( 1, new[] { typeof( Guile ) }, "Guile" ) ); + Objectives.Add( new KillObjective( 1, new[] { typeof( Irk ) }, "Irk" ) ); + Objectives.Add( new KillObjective( 1, new[] { typeof( Spite ) }, "Spite" ) ); Rewards.Add( ItemReward.Strongbox ); } diff --git a/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs b/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs index 33e52c2ae..cd8cf9276 100644 --- a/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs +++ b/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs @@ -137,9 +137,9 @@ namespace Server.Engines.MLQuests.Definitions QuestArea bedlam = new QuestArea( 1074835, "Bedlam" ); // Bedlam - Objectives.Add( new KillObjective( 1, new Type[] { typeof( RedDeath ) }, "Red Death", bedlam ) ); - Objectives.Add( new KillObjective( 10, new Type[] { typeof( GoreFiend ) }, "gore fiends", bedlam ) ); - Objectives.Add( new KillObjective( 8, new Type[] { typeof( RottingCorpse ) }, "rotting corpses", bedlam ) ); + Objectives.Add( new KillObjective( 1, new[] { typeof( RedDeath ) }, "Red Death", bedlam ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( GoreFiend ) }, "gore fiends", bedlam ) ); + Objectives.Add( new KillObjective( 8, new[] { typeof( RottingCorpse ) }, "rotting corpses", bedlam ) ); Rewards.Add( new DummyReward( 1074634 ) ); // Tuition Reimbursement } diff --git a/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs b/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs index dfe88b943..494d3dd55 100644 --- a/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs +++ b/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs @@ -43,7 +43,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1075483; // Fair enough, the bow isn't for everyone. Good day then. InProgressMessage = 1075484; // Return once ye have killed ten sheep with a bow and not a moment before. - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Sheep ) }, 1018270 ) ); // sheep + Objectives.Add( new KillObjective( 10, new[] { typeof( Sheep ) }, 1018270 ) ); // sheep Rewards.Add( ItemReward.BagOfTrinkets ); } diff --git a/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs b/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs index 621cf3987..e56d93808 100644 --- a/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs +++ b/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs @@ -242,7 +242,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073733; // Perhaps you'll change your mind and return at some point. InProgressMessage = 1073741; // There's too much cuteness in the world -- kill those pixies! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Pixie ) }, "pixies" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( Pixie ) }, "pixies" ) ); Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -347,9 +347,9 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072667; // Hrmph. Well maybe another time then. InProgressMessage = 1072668; // Shouldn't you be slaying orcs? - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Orc ) }, "orcs", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary - Objectives.Add( new KillObjective( 5, new Type[] { typeof( OrcBomber ) }, "orc bombers", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary - Objectives.Add( new KillObjective( 3, new Type[] { typeof( OrcBrute ) }, "orc brutes", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 10, new[] { typeof( Orc ) }, "orcs", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 5, new[] { typeof( OrcBomber ) }, "orc bombers", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 3, new[] { typeof( OrcBrute ) }, "orc brutes", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.BagOfTreasure ); } @@ -365,7 +365,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073595; // I don't see 10 tails from Ratman Archers on your belt -- and until I do, no reward for you. - Objectives.Add( new KillObjective( 10, new Type[] { typeof( RatmanArcher ) }, "ratman archers" ) ); + Objectives.Add( new KillObjective( 10, new[] { typeof( RatmanArcher ) }, "ratman archers" ) ); Rewards.Add( ItemReward.BagOfTreasure ); } @@ -381,7 +381,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072270; // Well, okay. But if you decide you are up for it after all, c'mon back and see me. InProgressMessage = 1072271; // You're not quite done yet. Get back to work! - Objectives.Add( new KillObjective( 12, new Type[] { typeof( Ratman ) }, "ratmen" ) ); + Objectives.Add( new KillObjective( 12, new[] { typeof( Ratman ) }, "ratmen" ) ); Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -400,7 +400,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1072572; // Small words. Kill Moug-Guur. Go. Now! CompletionMessage = 1072573; // You're better than I thought you'd be. Not particularly bad, but not entirely inept. - Objectives.Add( new KillObjective( 1, new Type[] { typeof( MougGuur ) }, "Moug-Guur", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 1, new[] { typeof( MougGuur ) }, "Moug-Guur", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.BagOfTreasure ); } @@ -420,7 +420,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1072576; // How difficult is this? The rats live in the tunnels. Go into the tunnels and find the biggest, meanest rat and execute him. Loitering around here won't get the task done. CompletionMessage = 1072577; // It's about time! Could you have taken longer? - Objectives.Add( new KillObjective( 1, new Type[] { typeof( Chiikkaha ) }, "Chiikkaha", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 1, new[] { typeof( Chiikkaha ) }, "Chiikkaha", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.BagOfTreasure ); } @@ -439,7 +439,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1072581; // Hahahaha! I can see the fear in your eyes. Pathetic. Szavetra is waiting for you. CompletionMessage = 1072582; // Amazing! Simply astonishing ... you survived. Well, I supposed I should indulge your avarice with a reward. - Objectives.Add( new KillObjective( 1, new Type[] { typeof( Szavetra ) }, "Szavetra", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 1, new[] { typeof( Szavetra ) }, "Szavetra", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.Strongbox ); } @@ -528,7 +528,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072687; // I quite understand your reluctance. If you reconsider, I'll be here. InProgressMessage = 1072688; // You can't miss those ogres, they're huge and just outside the gates here. - Objectives.Add( new KillObjective( 10, new Type[] { typeof( Ogre ) }, "ogres", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 10, new[] { typeof( Ogre ) }, "ogres", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.BagOfTreasure ); } @@ -547,7 +547,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072708; // Reluctance doesn't become a hero like you. But, as you wish. InProgressMessage = 1072709; // Ogre Lords are pretty easy to recognize. They're the ones ordering the other ogres about in a lordly manner. Striking down their leadership will throw the ogres into confusion and dismay! - Objectives.Add( new KillObjective( 10, new Type[] { typeof( OgreLord ) }, "ogre lords", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 10, new[] { typeof( OgreLord ) }, "ogre lords", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -566,7 +566,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072711; // Oh, I see. *sigh* Perhaps I overestimated your abilities. InProgressMessage = 1072712; // Make sure you fully assess all of the cyclopian tactical abilities! - Objectives.Add( new KillObjective( 6, new Type[] { typeof( Cyclops ) }, "cyclops", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 6, new[] { typeof( Cyclops ) }, "cyclops", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -584,7 +584,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072714; // Certainly. You've done enough to merit a breather. When you're ready for more, report back to me. InProgressMessage = 1072715; // Those titans don't skulk very well. You should be able to track them easily ... their footsteps are easily the largest around. - Objectives.Add( new KillObjective( 3, new Type[] { typeof( Titan ) }, "titans", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 3, new[] { typeof( Titan ) }, "titans", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.LargeBagOfTreasure ); } @@ -600,7 +600,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1072594; // Don't tell me you're a gargoyle sympathizer? *spits* InProgressMessage = 1072595; // Those blasted gargoyles hang around the old tower. That's the best place to hunt them down. - Objectives.Add( new KillObjective( 12, new Type[] { typeof( Gargoyle ) }, "gargoyles", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new KillObjective( 12, new[] { typeof( Gargoyle ) }, "gargoyles", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( ItemReward.BagOfTrinkets ); } @@ -635,7 +635,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1073580; // I hope you'll reconsider. Until then, farwell. InProgressMessage = 1073592; // The Brigands still plague us. Have you killed 20 of their number?
- Objectives.Add( new KillObjective( 20, new Type[] { typeof( Brigand ) }, 1074894 ) ); // Common brigands + Objectives.Add( new KillObjective( 20, new[] { typeof( Brigand ) }, 1074894 ) ); // Common brigands Rewards.Add( ItemReward.BagOfTreasure ); } diff --git a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs index 37defc03c..a5928d887 100644 --- a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs +++ b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs @@ -145,8 +145,8 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1072779; // Every moment you procrastinate, these unnatural creatures damage Sosaria. CompletionMessage = 1074167; // Well done! Well done, indeed. You are worthy to become an arcanist! - Objectives.Add( new KillObjective( 5, new Type[] { typeof( ExodusOverseer ) }, "Exodus Overseers" ) ); - Objectives.Add( new KillObjective( 2, new Type[] { typeof( ExodusMinion ) }, "Exodus Minions" ) ); + Objectives.Add( new KillObjective( 5, new[] { typeof( ExodusOverseer ) }, "Exodus Overseers" ) ); + Objectives.Add( new KillObjective( 2, new[] { typeof( ExodusMinion ) }, "Exodus Minions" ) ); Rewards.Add( new ItemReward( 1031601, typeof( ArcaneCircleScroll ) ) ); // Arcane Circle Rewards.Add( new ItemReward( 1031600, typeof( SpellweavingBook ) ) ); // Spellweaving Spellbook @@ -177,7 +177,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1072773; // You waste my time. The task is simple. Kill 50 rats in an hour. // No completion message - Objectives.Add( new TimedKillObjective( TimeSpan.FromHours( 1 ), 50, new Type[] { typeof( Rat ) }, "rats", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary + Objectives.Add( new TimedKillObjective( TimeSpan.FromHours( 1 ), 50, new[] { typeof( Rat ) }, "rats", new QuestArea( 1074807, "Sanctuary" ) ) ); // Sanctuary Rewards.Add( new DummyReward( 1074872 ) ); // The opportunity to learn the ways of the Arcanist. } @@ -345,7 +345,7 @@ namespace Server.Engines.MLQuests.Definitions InProgressMessage = 1074316; // Mean reapers are all around trees! *giggle* You fix them up, please. CompletionNotice = CompletionNoticeShortReturn; - Objectives.Add( new KillObjective( 20, new Type[] { typeof( Reaper ) }, "reapers" ) ); + Objectives.Add( new KillObjective( 20, new[] { typeof( Reaper ) }, "reapers" ) ); Rewards.Add( new ItemReward( 1031607, typeof( SummonFeyScroll ) ) ); // Summon Fey } @@ -377,7 +377,7 @@ namespace Server.Engines.MLQuests.Definitions // TODO: Verify CompletionMessage = 1074291; // Hah! You showed them! - Objectives.Add( new KillObjective( 50, new Type[] { typeof( Imp ) }, "imps" ) ); + Objectives.Add( new KillObjective( 50, new[] { typeof( Imp ) }, "imps" ) ); Rewards.Add( new DummyReward( 1074873 ) ); // The opportunity to prove yourself worthy of learning to Summon Fiends. (Sufficient spellweaving skill is required to cast the spell) } @@ -425,7 +425,7 @@ namespace Server.Engines.MLQuests.Definitions RefusalMessage = 1074314; // If you're not up for it, so be it. InProgressMessage = 1074318; // You need to vanquish an arcane daemon before the imps will fear you properly. - Objectives.Add( new KillObjective( 1, new Type[] { typeof( ArcaneDaemon ) }, 1029733 ) ); // arcane demon + Objectives.Add( new KillObjective( 1, new[] { typeof( ArcaneDaemon ) }, 1029733 ) ); // arcane demon Rewards.Add( new ItemReward( 1031608, typeof( SummonFiendScroll ) ) ); // Summon Fiend } diff --git a/Scripts/Engines/MLQuests/Items/CraftmansSatchel.cs b/Scripts/Engines/MLQuests/Items/CraftmansSatchel.cs index d651f2a1f..3f92f8824 100644 --- a/Scripts/Engines/MLQuests/Items/CraftmansSatchel.cs +++ b/Scripts/Engines/MLQuests/Items/CraftmansSatchel.cs @@ -6,7 +6,7 @@ namespace Server.Engines.MLQuests.Items { public abstract class BaseCraftmansSatchel : Backpack { - protected static readonly Type[] m_TalismanType = new Type[] { typeof( RandomTalisman ) }; + protected static readonly Type[] m_TalismanType = new[] { typeof( RandomTalisman ) }; public BaseCraftmansSatchel() { diff --git a/Scripts/Engines/MLQuests/MLQuestSystem.cs b/Scripts/Engines/MLQuests/MLQuestSystem.cs index 10bfc5422..de1f423e1 100644 --- a/Scripts/Engines/MLQuests/MLQuestSystem.cs +++ b/Scripts/Engines/MLQuests/MLQuestSystem.cs @@ -182,7 +182,7 @@ namespace Server.Engines.MLQuests { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.Simple; - Commands = new string[] { "ViewQuests" }; + Commands = new[] { "ViewQuests" }; ObjectTypes = ObjectTypes.Mobiles; Usage = "ViewQuests"; Description = "Displays a targeted mobile's quest overview."; @@ -209,7 +209,7 @@ namespace Server.Engines.MLQuests { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.Simple; - Commands = new string[] { "ViewMLContext" }; + Commands = new[] { "ViewMLContext" }; ObjectTypes = ObjectTypes.Mobiles; Usage = "ViewMLContext"; Description = "Opens the ML quest context for a targeted mobile."; @@ -301,7 +301,7 @@ namespace Server.Engines.MLQuests if ( found.Count == 0 ) m.SendMessage( "No matching objects found." ); else - m.SendGump( new InterfaceGump( m, new string[] { "Object" }, found, 0, null ) ); + m.SendGump( new InterfaceGump( m, new[] { "Object" }, found, 0, null ) ); } private static bool FindQuest( IQuestGiver quester, PlayerMobile pm, MLQuestContext context, out MLQuest quest, out MLQuestInstance entry ) diff --git a/Scripts/Engines/MyRunUO/LayerComparer.cs b/Scripts/Engines/MyRunUO/LayerComparer.cs index 4c7f56985..3fc7b5f12 100644 --- a/Scripts/Engines/MyRunUO/LayerComparer.cs +++ b/Scripts/Engines/MyRunUO/LayerComparer.cs @@ -8,7 +8,7 @@ namespace Server.Engines.MyRunUO private static Layer ChainTunic = (Layer)254; private static Layer LeatherShorts = (Layer)253; - private static Layer[] m_DesiredLayerOrder = new Layer[] + private static Layer[] m_DesiredLayerOrder = new[] { Layer.Cloak, Layer.Bracelet, diff --git a/Scripts/Engines/MyRunUO/MyRunUO.cs b/Scripts/Engines/MyRunUO/MyRunUO.cs index d9242822e..7d7211109 100644 --- a/Scripts/Engines/MyRunUO/MyRunUO.cs +++ b/Scripts/Engines/MyRunUO/MyRunUO.cs @@ -298,7 +298,7 @@ namespace Server.Engines.MyRunUO public void ExecuteNonQueryIfNull( string select, string insert ) { - m_Command.Enqueue( new string[]{ select, insert } ); + m_Command.Enqueue( new[]{ select, insert } ); } private void AppendCharEntity( string input, int charIndex, ref StringBuilder sb, char c ) diff --git a/Scripts/Engines/Plants/MainPlantGump.cs b/Scripts/Engines/Plants/MainPlantGump.cs index 54c678778..0f86c4477 100644 --- a/Scripts/Engines/Plants/MainPlantGump.cs +++ b/Scripts/Engines/Plants/MainPlantGump.cs @@ -395,7 +395,7 @@ namespace Server.Engines.Plants if ( from.Backpack == null ) return null; - Item[] items = from.Backpack.FindItemsByType( new Type[] { typeof( BasePotion ), typeof( PotionKeg ) } ); + Item[] items = from.Backpack.FindItemsByType( new[] { typeof( BasePotion ), typeof( PotionKeg ) } ); foreach ( Item item in items ) { diff --git a/Scripts/Engines/Plants/MiscItems/GreenThorns.cs b/Scripts/Engines/Plants/MiscItems/GreenThorns.cs index 7a91811f1..0e11d255e 100644 --- a/Scripts/Engines/Plants/MiscItems/GreenThorns.cs +++ b/Scripts/Engines/Plants/MiscItems/GreenThorns.cs @@ -158,9 +158,9 @@ namespace Server.Items } } - private static TilesAndEffect[] m_Table = new TilesAndEffect[] + private static TilesAndEffect[] m_Table = new[] { - new TilesAndEffect( new int[] + new TilesAndEffect( new[] { 0x71, 0x7C, 0x82, 0xA7, @@ -197,14 +197,14 @@ namespace Server.Items }, typeof( DirtGreenThornsEffect ) ), - new TilesAndEffect( new int[] + new TilesAndEffect( new[] { 0x9, 0x15, 0x150, 0x15C }, typeof( FurrowsGreenThornsEffect ) ), - new TilesAndEffect( new int[] + new TilesAndEffect( new[] { 0x9C4, 0x9EB, 0x3D65, 0x3D65, @@ -216,7 +216,7 @@ namespace Server.Items }, typeof( SwampGreenThornsEffect ) ), - new TilesAndEffect( new int[] + new TilesAndEffect( new[] { 0x10C, 0x10F, 0x114, 0x117, @@ -235,7 +235,7 @@ namespace Server.Items }, typeof( SnowGreenThornsEffect ) ), - new TilesAndEffect( new int[] + new TilesAndEffect( new[] { 0x16, 0x3A, 0x44, 0x4B, diff --git a/Scripts/Engines/Plants/PlantBowl.cs b/Scripts/Engines/Plants/PlantBowl.cs index 533a20ca5..f77ac8a6a 100644 --- a/Scripts/Engines/Plants/PlantBowl.cs +++ b/Scripts/Engines/Plants/PlantBowl.cs @@ -145,7 +145,7 @@ namespace Server.Engines.Plants return contains; } - private static int[] m_DirtPatchTiles = new int[] + private static int[] m_DirtPatchTiles = new[] { 0x9, 0x15, 0x71, 0x7C, diff --git a/Scripts/Engines/Plants/PlantResources.cs b/Scripts/Engines/Plants/PlantResources.cs index bd5a5c5d2..afddc3760 100644 --- a/Scripts/Engines/Plants/PlantResources.cs +++ b/Scripts/Engines/Plants/PlantResources.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Plants { public class PlantResourceInfo { - private static PlantResourceInfo[] m_ResourceList = new PlantResourceInfo[] + private static PlantResourceInfo[] m_ResourceList = new[] { new PlantResourceInfo( PlantType.ElephantEarPlant, PlantHue.BrightRed, typeof( RedLeaves ) ), new PlantResourceInfo( PlantType.PonytailPalm, PlantHue.BrightRed, typeof( RedLeaves ) ), diff --git a/Scripts/Engines/Plants/PlantType.cs b/Scripts/Engines/Plants/PlantType.cs index 201e7e342..933f77686 100644 --- a/Scripts/Engines/Plants/PlantType.cs +++ b/Scripts/Engines/Plants/PlantType.cs @@ -61,7 +61,7 @@ namespace Server.Engines.Plants public class PlantTypeInfo { - private static PlantTypeInfo[] m_Table = new PlantTypeInfo[] + private static PlantTypeInfo[] m_Table = new[] { new PlantTypeInfo( 0xC83, 0, 0, PlantType.CampionFlowers, false, true, true, true, PlantCategory.Default ), new PlantTypeInfo( 0xC86, 0, 0, PlantType.Poppies, false, true, true, true, PlantCategory.Default ), diff --git a/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs b/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs index cecb2c07e..c5408edae 100644 --- a/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs +++ b/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Ambitious { public class AmbitiousQueenQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Ambitious.DontOfferConversation ), typeof( Ambitious.AcceptConversation ), diff --git a/Scripts/Engines/Quests/Collector/CollectorQuest.cs b/Scripts/Engines/Quests/Collector/CollectorQuest.cs index 7616f66ad..ca1c945e9 100644 --- a/Scripts/Engines/Quests/Collector/CollectorQuest.cs +++ b/Scripts/Engines/Quests/Collector/CollectorQuest.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Collector { public class CollectorQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Collector.DontOfferConversation ), typeof( Collector.DeclineConversation ), diff --git a/Scripts/Engines/Quests/Collector/Items/ImageType.cs b/Scripts/Engines/Quests/Collector/Items/ImageType.cs index ceaba9015..350f49246 100644 --- a/Scripts/Engines/Quests/Collector/Items/ImageType.cs +++ b/Scripts/Engines/Quests/Collector/Items/ImageType.cs @@ -31,7 +31,7 @@ namespace Server.Engines.Quests.Collector public class ImageTypeInfo { - private static readonly ImageTypeInfo[] m_Table = new ImageTypeInfo[] + private static readonly ImageTypeInfo[] m_Table = new[] { new ImageTypeInfo( 9734, typeof( Betrayer ), 75, 45 ), new ImageTypeInfo( 9735, typeof( Bogling ), 75, 45 ), diff --git a/Scripts/Engines/Quests/Collector/Items/Obsidian.cs b/Scripts/Engines/Quests/Collector/Items/Obsidian.cs index 73160c2b2..a30eb0d89 100644 --- a/Scripts/Engines/Quests/Collector/Items/Obsidian.cs +++ b/Scripts/Engines/Quests/Collector/Items/Obsidian.cs @@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Collector { public class Obsidian : Item { - private static readonly string[] m_Names = new string[] + private static readonly string[] m_Names = new[] { null, "an aggressive cavalier", diff --git a/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs b/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs index 1d3c5bfb3..fd0a3f6db 100644 --- a/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs +++ b/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs @@ -5,7 +5,7 @@ namespace Server.Items public class EnchantedSextant : Item { //TODO: Trammel/Haven - private static readonly Point2D[] m_TrammelBanks = new Point2D[] + private static readonly Point2D[] m_TrammelBanks = new[] { new Point2D( 652, 820 ), new Point2D( 1813, 2825 ), @@ -27,7 +27,7 @@ namespace Server.Items new Point2D( 5669, 3131 ) }; - private static readonly Point2D[] m_FeluccaBanks = new Point2D[] + private static readonly Point2D[] m_FeluccaBanks = new[] { new Point2D( 652, 820 ), new Point2D( 1813, 2825 ), @@ -49,7 +49,7 @@ namespace Server.Items new Point2D( 5669, 3131 ) }; - private static readonly Point2D[] m_IlshenarBanks = new Point2D[] + private static readonly Point2D[] m_IlshenarBanks = new[] { new Point2D( 854, 680 ), new Point2D( 855, 603 ), @@ -57,7 +57,7 @@ namespace Server.Items new Point2D( 1610, 556 ) }; - private static readonly Point2D[] m_MalasBanks = new Point2D[] + private static readonly Point2D[] m_MalasBanks = new[] { new Point2D( 996, 519 ), new Point2D( 2048, 1345 ) diff --git a/Scripts/Engines/Quests/Core/QuestSystem.cs b/Scripts/Engines/Quests/Core/QuestSystem.cs index 7d48fd710..59aedf437 100644 --- a/Scripts/Engines/Quests/Core/QuestSystem.cs +++ b/Scripts/Engines/Quests/Core/QuestSystem.cs @@ -13,7 +13,7 @@ namespace Server.Engines.Quests public abstract class QuestSystem { - public static readonly Type[] QuestTypes = new Type[] + public static readonly Type[] QuestTypes = new[] { typeof( Doom.TheSummoningQuest ), typeof( Necro.DarkTidesQuest ), diff --git a/Scripts/Engines/Quests/Dark Tides/Conversations.cs b/Scripts/Engines/Quests/Dark Tides/Conversations.cs index cdeab3414..6273094e4 100644 --- a/Scripts/Engines/Quests/Dark Tides/Conversations.cs +++ b/Scripts/Engines/Quests/Dark Tides/Conversations.cs @@ -26,7 +26,7 @@ namespace Server.Engines.Quests.Necro { public override object Message => 1060099; - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1026153, 6178 ), // teleporter new QuestItemInfo( 1049117, 4036 ), // Horn of Retreat @@ -49,7 +49,7 @@ namespace Server.Engines.Quests.Necro { public override object Message => 1060103; - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1026153, 6178 ) // teleporter }; @@ -98,7 +98,7 @@ namespace Server.Engines.Quests.Necro { public override object Message => 1060110; - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1023643, 8787 ) // spellbook }; diff --git a/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs b/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs index c69de0a5f..c9cbdbd5e 100644 --- a/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs +++ b/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Necro { public class DarkTidesQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Necro.AcceptConversation ), typeof( Necro.AnimateMaabusCorpseObjective ), diff --git a/Scripts/Engines/Quests/Dark Tides/Objectives.cs b/Scripts/Engines/Quests/Dark Tides/Objectives.cs index 125c7cc4e..cfc84b62b 100644 --- a/Scripts/Engines/Quests/Dark Tides/Objectives.cs +++ b/Scripts/Engines/Quests/Dark Tides/Objectives.cs @@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Necro { public override object Message => 1060102; - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1023643, 8787 ) // spellbook }; @@ -116,7 +116,7 @@ namespace Server.Engines.Quests.Necro { public override object Message => 1060109; - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1023676, 3679 ) // glowing rune }; @@ -197,7 +197,7 @@ namespace Server.Engines.Quests.Necro { public override object Message => 1060115; - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1026153, 6178 ) // teleporter }; diff --git a/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs b/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs index b7e912a05..398637a08 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Ninja { public class EminosUndertakingQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Ninja.AcceptConversation ), typeof( Ninja.FindZoelConversation ), diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs index a49b20ece..ed5942a63 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Ninja { public class HiddenFigure : BaseQuester { - public static int[] Messages = new int[] + public static int[] Messages = new[] { 1063191, // They won�t find me here. 1063192 // Ah, a quiet hideout. diff --git a/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs b/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs index f891df7b1..5e2d61d98 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Samurai { public class HaochisTrialsQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Samurai.AcceptConversation ), typeof( Samurai.RadarConversation ), diff --git a/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs b/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs index abbedb773..f4c2547f4 100644 --- a/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs +++ b/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Matriarch { public class SolenMatriarchQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Matriarch.DontOfferConversation ), typeof( Matriarch.AcceptConversation ), diff --git a/Scripts/Engines/Quests/Study of the Solen Hive/NestArea.cs b/Scripts/Engines/Quests/Study of the Solen Hive/NestArea.cs index c1e450582..81abddc98 100644 --- a/Scripts/Engines/Quests/Study of the Solen Hive/NestArea.cs +++ b/Scripts/Engines/Quests/Study of the Solen Hive/NestArea.cs @@ -2,7 +2,7 @@ namespace Server.Engines.Quests.Naturalist { public class NestArea { - private static readonly NestArea[] m_Areas = new NestArea[] + private static readonly NestArea[] m_Areas = new[] { new NestArea( false, new Rectangle2D( 5861, 1787, 26, 25 ) ), diff --git a/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs b/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs index c9b1de7b4..94f55db53 100644 --- a/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs +++ b/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Naturalist { public class StudyOfSolenQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( StudyNestsObjective ), typeof( ReturnToNaturalistObjective ), diff --git a/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs b/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs index 56b543b36..68c973ef0 100644 --- a/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs +++ b/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Zento { public class TerribleHatchlingsQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( AcceptConversation ), typeof( DirectionConversation ), diff --git a/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs b/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs index a8db0538e..6cfc93b49 100644 --- a/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs +++ b/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs @@ -95,7 +95,7 @@ namespace Server.Engines.Quests.Doom Delete(); } - private static int[] m_Offsets = new int[] + private static int[] m_Offsets = new[] { -1, -1, -1, 0, diff --git a/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs b/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs index f9e9521d2..7c1867de0 100644 --- a/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs +++ b/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Doom { public class TheSummoningQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Doom.AcceptConversation ), typeof( Doom.CollectBonesObjective ), diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs index 55b79e6b1..393615021 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs @@ -125,7 +125,7 @@ namespace Server.Engines.Quests.Haven } } - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1023676, 0xE68 ) // glowing rune }; @@ -214,7 +214,7 @@ namespace Server.Engines.Quests.Haven } } - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1026153, 0x1822 ), // teleporter new QuestItemInfo( 1048032, 0xE76 ) // a bag @@ -291,7 +291,7 @@ namespace Server.Engines.Quests.Haven } } - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1023637, 0xE34 ) // scroll }; @@ -312,7 +312,7 @@ namespace Server.Engines.Quests.Haven { public override object Message => 1049325; - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1048030, 0x14EB ), // a Treasure Map new QuestItemInfo( 1023969, 0xF81 ), // Fertile Dirt @@ -401,7 +401,7 @@ namespace Server.Engines.Quests.Haven } } - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1023965, 0xF7D ), // Daemon Blood new QuestItemInfo( 1022581, 0xA22 ), // lantern @@ -469,12 +469,12 @@ namespace Server.Engines.Quests.Haven } } - private static QuestItemInfo[] m_Info = new QuestItemInfo[] + private static QuestItemInfo[] m_Info = new[] { new QuestItemInfo( 1017412, 0xF80 ), // Daemon Bone }; - private static QuestItemInfo[] m_InfoPaladin = new QuestItemInfo[] + private static QuestItemInfo[] m_InfoPaladin = new[] { new QuestItemInfo( 1017412, 0xF80 ), // Daemon Bone new QuestItemInfo( 1060577, 0x1F14 ), // Recall Rune diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs index 24a375514..6152fb6c3 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Haven { public class UzeraanTurmoilQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Haven.AcceptConversation ), typeof( Haven.UzeraanTitheConversation ), diff --git a/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs b/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs index e667bd939..836bc0245 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs @@ -24,7 +24,7 @@ namespace Server.Engines.Quests.Hag public class IngredientInfo { - private static IngredientInfo[] m_Table = new IngredientInfo[] + private static IngredientInfo[] m_Table = new[] { // sheep liver new IngredientInfo( 1055020, 5, typeof( Sheep ) ), diff --git a/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs b/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs index 0a73392a9..4610c018a 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Hag { public class FindApprenticeObjective : QuestObjective { - private static Point3D[] m_CorpseLocations = new Point3D[] + private static Point3D[] m_CorpseLocations = new[] { new Point3D( 778, 1158, 0 ), new Point3D( 698, 1443, 0 ), diff --git a/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs b/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs index 24a6a0365..6ab2edcdd 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Hag { public class WitchApprenticeQuest : QuestSystem { - private static Type[] m_TypeReferenceTable = new Type[] + private static Type[] m_TypeReferenceTable = new[] { typeof( Hag.FindApprenticeObjective ), typeof( Hag.FindGrizeldaAboutMurderObjective ), @@ -58,7 +58,7 @@ namespace Server.Engines.Quests.Hag AddConversation( new AcceptConversation() ); } - private static Point3D[] m_ZeefzorpulLocations = new Point3D[] + private static Point3D[] m_ZeefzorpulLocations = new[] { new Point3D( 1226, 1573, 0 ), new Point3D( 1929, 1148, 0 ), diff --git a/Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs b/Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs index 79c39a90b..73fb09b11 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs @@ -399,7 +399,7 @@ namespace Server.Engines.Reports resChart.Items.Add( "Logged Out", countLogged ); resChart.Items.Add( "Unresolved", countUnres ); - return new PieChart[]{ staffChart, resChart }; + return new[]{ staffChart, resChart }; } } } diff --git a/Scripts/Engines/Reports/Rendering/BarGraphRenderer.cs b/Scripts/Engines/Reports/Rendering/BarGraphRenderer.cs index 2993dacb7..edde56458 100644 --- a/Scripts/Engines/Reports/Rendering/BarGraphRenderer.cs +++ b/Scripts/Engines/Reports/Rendering/BarGraphRenderer.cs @@ -347,7 +347,7 @@ namespace Server.Engines.Reports float oh = item.SweepSize; float of = 9.5f; - PointF[] pts = new PointF[] + PointF[] pts = new[] { new PointF( ox, oy ), new PointF( ox + ow, oy ), @@ -358,13 +358,13 @@ namespace Server.Engines.Reports new PointF( ox + of + ow, oy + of + oh ) }; - graph.FillPolygon( barBrush, new PointF[]{ pts[2], pts[3], pts[6], pts[5] } ); + graph.FillPolygon( barBrush, new[]{ pts[2], pts[3], pts[6], pts[5] } ); using ( SolidBrush ltBrsh = new SolidBrush( System.Windows.Forms.ControlPaint.Light(item.ItemColor,0.1f) ) ) - graph.FillPolygon( ltBrsh, new PointF[]{ pts[0], pts[2], pts[5], pts[4] } ); + graph.FillPolygon( ltBrsh, new[]{ pts[0], pts[2], pts[5], pts[4] } ); using ( SolidBrush drkBrush = new SolidBrush( System.Windows.Forms.ControlPaint.Dark(item.ItemColor,0.05f) ) ) - graph.FillPolygon( drkBrush, new PointF[]{ pts[0], pts[1], pts[3], pts[2] } ); + graph.FillPolygon( drkBrush, new[]{ pts[0], pts[1], pts[3], pts[2] } ); graph.DrawLine( pen, pts[0], pts[1] ); graph.DrawLine( pen, pts[0], pts[2] ); diff --git a/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs b/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs index 33b2c2650..844de4c97 100644 --- a/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs +++ b/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs @@ -6,7 +6,7 @@ namespace Server.Items { public abstract class BasePigmentsOfTokuno : Item, IUsesRemaining { - private static Type[] m_Glasses = new Type[] + private static Type[] m_Glasses = new[] { typeof( MaritimeGlasses ), typeof( WizardsGlasses ), @@ -22,7 +22,7 @@ namespace Server.Items typeof( AnthropomorphistGlasses ) }; - private static Type[] m_Replicas = new Type[] + private static Type[] m_Replicas = new[] { typeof( ANecromancerShroud ), typeof( BraveKnightOfTheBritannia ), @@ -49,7 +49,7 @@ namespace Server.Items typeof( Subdue ) }; - private static Type[] m_DyableHeritageItems = new Type[] + private static Type[] m_DyableHeritageItems = new[] { typeof( ChargerOfTheFallen ), typeof( SamuraiHelm ), diff --git a/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs b/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs index 70e3e35ac..b4351774e 100644 --- a/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs +++ b/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs @@ -393,29 +393,29 @@ namespace Server.Items public class PigmentsOfTokuno : BasePigmentsOfTokuno { - private static int[][] m_Table = new int[][] + private static int[][] m_Table = new[] { // Hue, Label - new int[]{ /*PigmentType.None,*/ 0, -1 }, - new int[]{ /*PigmentType.ParagonGold,*/ 0x501, 1070987 }, - new int[]{ /*PigmentType.VioletCouragePurple,*/ 0x486, 1070988 }, - new int[]{ /*PigmentType.InvulnerabilityBlue,*/ 0x4F2, 1070989 }, - new int[]{ /*PigmentType.LunaWhite,*/ 0x47E, 1070990 }, - new int[]{ /*PigmentType.DryadGreen,*/ 0x48F, 1070991 }, - new int[]{ /*PigmentType.ShadowDancerBlack,*/ 0x455, 1070992 }, - new int[]{ /*PigmentType.BerserkerRed,*/ 0x21, 1070993 }, - new int[]{ /*PigmentType.NoxGreen,*/ 0x58C, 1070994 }, - new int[]{ /*PigmentType.RumRed,*/ 0x66C, 1070995 }, - new int[]{ /*PigmentType.FireOrange,*/ 0x54F, 1070996 }, - new int[]{ /*PigmentType.Fadedcoal,*/ 0x96A, 1079579 }, - new int[]{ /*PigmentType.Coal,*/ 0x96B, 1079580 }, - new int[]{ /*PigmentType.FadedGold,*/ 0x972, 1079581 }, - new int[]{ /*PigmentType.StormBronze,*/ 0x977, 1079582 }, - new int[]{ /*PigmentType.Rose,*/ 0x97C, 1079583 }, - new int[]{ /*PigmentType.MidnightCoal,*/ 0x96C, 1079584 }, - new int[]{ /*PigmentType.FadedBronze,*/ 0x975, 1079585 }, - new int[]{ /*PigmentType.FadedRose,*/ 0x97B, 1079586 }, - new int[]{ /*PigmentType.DeepRose,*/ 0x97E, 1079587 } + new[]{ /*PigmentType.None,*/ 0, -1 }, + new[]{ /*PigmentType.ParagonGold,*/ 0x501, 1070987 }, + new[]{ /*PigmentType.VioletCouragePurple,*/ 0x486, 1070988 }, + new[]{ /*PigmentType.InvulnerabilityBlue,*/ 0x4F2, 1070989 }, + new[]{ /*PigmentType.LunaWhite,*/ 0x47E, 1070990 }, + new[]{ /*PigmentType.DryadGreen,*/ 0x48F, 1070991 }, + new[]{ /*PigmentType.ShadowDancerBlack,*/ 0x455, 1070992 }, + new[]{ /*PigmentType.BerserkerRed,*/ 0x21, 1070993 }, + new[]{ /*PigmentType.NoxGreen,*/ 0x58C, 1070994 }, + new[]{ /*PigmentType.RumRed,*/ 0x66C, 1070995 }, + new[]{ /*PigmentType.FireOrange,*/ 0x54F, 1070996 }, + new[]{ /*PigmentType.Fadedcoal,*/ 0x96A, 1079579 }, + new[]{ /*PigmentType.Coal,*/ 0x96B, 1079580 }, + new[]{ /*PigmentType.FadedGold,*/ 0x972, 1079581 }, + new[]{ /*PigmentType.StormBronze,*/ 0x977, 1079582 }, + new[]{ /*PigmentType.Rose,*/ 0x97C, 1079583 }, + new[]{ /*PigmentType.MidnightCoal,*/ 0x96C, 1079584 }, + new[]{ /*PigmentType.FadedBronze,*/ 0x975, 1079585 }, + new[]{ /*PigmentType.FadedRose,*/ 0x97B, 1079586 }, + new[]{ /*PigmentType.DeepRose,*/ 0x97E, 1079587 } }; public static int[] GetInfo( PigmentType type ) diff --git a/Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs b/Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs index ea798f719..8517cba6c 100644 --- a/Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs +++ b/Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs @@ -625,7 +625,7 @@ namespace Server.Items public class AncientUrn : Item { - private static string[] m_Names = new string[] + private static string[] m_Names = new[] { "Akira", "Avaniaga", @@ -917,20 +917,20 @@ namespace Server.Items public class LesserPigmentsOfTokuno : BasePigmentsOfTokuno { - private static int[][] m_Table = new int[][] + private static int[][] m_Table = new[] { // Hue, Label - new int[]{ /*PigmentType.None,*/ 0, -1 }, - new int[]{ /*PigmentType.PaleOrange,*/ 0x02E, 1071458 }, - new int[]{ /*PigmentType.FreshRose,*/ 0x4B9, 1071455 }, - new int[]{ /*PigmentType.ChaosBlue,*/ 0x005, 1071459 }, - new int[]{ /*PigmentType.Silver,*/ 0x3E9, 1071451 }, - new int[]{ /*PigmentType.NobleGold,*/ 0x227, 1071457 }, - new int[]{ /*PigmentType.LightGreen,*/ 0x1C8, 1071454 }, - new int[]{ /*PigmentType.PaleBlue,*/ 0x24F, 1071456 }, - new int[]{ /*PigmentType.FreshPlum,*/ 0x145, 1071450 }, - new int[]{ /*PigmentType.DeepBrown,*/ 0x3F0, 1071452 }, - new int[]{ /*PigmentType.BurntBrown,*/ 0x41A, 1071453 } + new[]{ /*PigmentType.None,*/ 0, -1 }, + new[]{ /*PigmentType.PaleOrange,*/ 0x02E, 1071458 }, + new[]{ /*PigmentType.FreshRose,*/ 0x4B9, 1071455 }, + new[]{ /*PigmentType.ChaosBlue,*/ 0x005, 1071459 }, + new[]{ /*PigmentType.Silver,*/ 0x3E9, 1071451 }, + new[]{ /*PigmentType.NobleGold,*/ 0x227, 1071457 }, + new[]{ /*PigmentType.LightGreen,*/ 0x1C8, 1071454 }, + new[]{ /*PigmentType.PaleBlue,*/ 0x24F, 1071456 }, + new[]{ /*PigmentType.FreshPlum,*/ 0x145, 1071450 }, + new[]{ /*PigmentType.DeepBrown,*/ 0x3F0, 1071452 }, + new[]{ /*PigmentType.BurntBrown,*/ 0x41A, 1071453 } }; public static int[] GetInfo( LesserPigmentType type ) diff --git a/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs b/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs index 13f38cc48..160f7836f 100644 --- a/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs +++ b/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs @@ -21,7 +21,7 @@ namespace Server.Misc { public const int ItemsPerReward = 10; - private static Type[] m_LesserArtifactsTotal = new Type[] + private static Type[] m_LesserArtifactsTotal = new[] { typeof( AncientFarmersKasa ), typeof( AncientSamuraiDo ), typeof( ArmsOfTacticalExcellence ), typeof( BlackLotusHood ), typeof( DaimyosHelm ), typeof( DemonForks ), typeof( DragonNunchaku ), typeof( Exiler ), typeof( GlovesOfTheSun ), @@ -47,10 +47,10 @@ namespace Server.Misc set => _RewardEra = value; } - private static Type[][] m_LesserArtifacts = new Type[][] + private static Type[][] m_LesserArtifacts = new[] { // ToT One Rewards - new Type[] { + new[] { typeof( AncientFarmersKasa ), typeof( AncientSamuraiDo ), typeof( ArmsOfTacticalExcellence ), typeof( BlackLotusHood ), typeof( DaimyosHelm ), typeof( DemonForks ), typeof( DragonNunchaku ), typeof( Exiler ), typeof( GlovesOfTheSun ), typeof( HanzosBow ), typeof( LegsOfStability ), typeof( PeasantsBokuto ), typeof( PilferedDancerFans ), typeof( TheDestroyer ), @@ -58,7 +58,7 @@ namespace Server.Misc typeof( FluteOfRenewal ), typeof( ChestOfHeirlooms ) }, // ToT Two Rewards - new Type[] { + new[] { typeof( MetalPigmentsOfTokuno ), typeof( AncientFarmersKasa ), typeof( AncientSamuraiDo ), typeof( ArmsOfTacticalExcellence ), typeof( MetalPigmentsOfTokuno ), typeof( BlackLotusHood ), typeof( DaimyosHelm ), typeof( DemonForks ), typeof( MetalPigmentsOfTokuno ), typeof( DragonNunchaku ), typeof( Exiler ), typeof( GlovesOfTheSun ), typeof( HanzosBow ), @@ -67,7 +67,7 @@ namespace Server.Misc typeof( MetalPigmentsOfTokuno ), typeof( FluteOfRenewal ), typeof( ChestOfHeirlooms ) }, // ToT Three Rewards - new Type[] { + new[] { typeof( LesserPigmentsOfTokuno ), typeof( AncientFarmersKasa ), typeof( AncientSamuraiDo ), typeof( ArmsOfTacticalExcellence ), typeof( LesserPigmentsOfTokuno ), typeof( BlackLotusHood ), typeof( DaimyosHelm ), typeof( HanzosBow ), typeof( LesserPigmentsOfTokuno ), typeof( DemonForks ), typeof( DragonNunchaku ), typeof( Exiler ), typeof( GlovesOfTheSun ), @@ -432,10 +432,10 @@ namespace Server.Gumps } #region ToT Normal Rewards Table - private static TypeTileButtonInfo[][] m_NormalRewards = new TypeTileButtonInfo[][] + private static TypeTileButtonInfo[][] m_NormalRewards = new[] { // ToT One Rewards - new TypeTileButtonInfo[] { + new[] { new TypeTileButtonInfo( typeof( SwordsOfProsperity ), 0x27A9, 1070963, 1071002 ), new TypeTileButtonInfo( typeof( SwordOfTheStampede ), 0x27A2, 1070964, 1070978 ), new TypeTileButtonInfo( typeof( WindsEdge ), 0x27A3, 1070965, 1071003 ), @@ -448,7 +448,7 @@ namespace Server.Gumps new TypeTileButtonInfo( typeof( PigmentsOfTokuno ), 0x0EFF, 1070933, 1071011 ) }, // ToT Two Rewards - new TypeTileButtonInfo[] { + new[] { new TypeTileButtonInfo( typeof( SwordsOfProsperity ), 0x27A9, 1070963, 1071002 ), new TypeTileButtonInfo( typeof( SwordOfTheStampede ), 0x27A2, 1070964, 1070978 ), new TypeTileButtonInfo( typeof( WindsEdge ), 0x27A3, 1070965, 1071003 ), @@ -461,7 +461,7 @@ namespace Server.Gumps new TypeTileButtonInfo( typeof( PigmentsOfTokuno ), 0x0EFF, 1070933, 1071011 ) }, // ToT Three Rewards - new TypeTileButtonInfo[] { + new[] { new TypeTileButtonInfo( typeof( SwordsOfProsperity ), 0x27A9, 1070963, 1071002 ), new TypeTileButtonInfo( typeof( SwordOfTheStampede ), 0x27A2, 1070964, 1070978 ), new TypeTileButtonInfo( typeof( WindsEdge ), 0x27A3, 1070965, 1071003 ), @@ -478,10 +478,10 @@ namespace Server.Gumps public static TypeTileButtonInfo[][] NormalRewards => m_NormalRewards; #region ToT Pigment Rewards Table - private static PigmentsTileButtonInfo[][] m_PigmentRewards = new PigmentsTileButtonInfo[][] + private static PigmentsTileButtonInfo[][] m_PigmentRewards = new[] { // ToT One Pigment Rewards - new PigmentsTileButtonInfo[] { + new[] { new PigmentsTileButtonInfo( PigmentType.ParagonGold ), new PigmentsTileButtonInfo( PigmentType.VioletCouragePurple ), new PigmentsTileButtonInfo( PigmentType.InvulnerabilityBlue ), @@ -494,7 +494,7 @@ namespace Server.Gumps new PigmentsTileButtonInfo( PigmentType.FireOrange ) }, // ToT Two Pigment Rewards - new PigmentsTileButtonInfo[] { + new[] { new PigmentsTileButtonInfo( PigmentType.FadedCoal ), new PigmentsTileButtonInfo( PigmentType.Coal ), new PigmentsTileButtonInfo( PigmentType.FadedGold ), @@ -506,7 +506,7 @@ namespace Server.Gumps new PigmentsTileButtonInfo( PigmentType.DeepRose ) }, // ToT Three Pigment Rewards - new PigmentsTileButtonInfo[] { + new[] { new PigmentsTileButtonInfo( PigmentType.ParagonGold ), new PigmentsTileButtonInfo( PigmentType.VioletCouragePurple ), new PigmentsTileButtonInfo( PigmentType.InvulnerabilityBlue ), diff --git a/Scripts/Engines/VeteranRewards/RewardSystem.cs b/Scripts/Engines/VeteranRewards/RewardSystem.cs index 78802234f..202a2b988 100644 --- a/Scripts/Engines/VeteranRewards/RewardSystem.cs +++ b/Scripts/Engines/VeteranRewards/RewardSystem.cs @@ -283,7 +283,7 @@ namespace Server.Engines.VeteranRewards RewardCategory houseAddOns = new RewardCategory( 1049754 ); RewardCategory miscellaneous = new RewardCategory( 1078596 ); - m_Categories = new RewardCategory[] + m_Categories = new[] { monsterStatues, cloaksAndRobes, @@ -308,9 +308,9 @@ namespace Server.Engines.VeteranRewards const int Pink = 0x490; const int Crimson = 0x485; - m_Lists = new RewardList[] + m_Lists = new[] { - new RewardList( RewardInterval, 1, new RewardEntry[] + new RewardList( RewardInterval, 1, new[] { new RewardEntry( specialDyeTubs, 1006008, typeof( RewardBlackDyeTub ) ), new RewardEntry( specialDyeTubs, 1006013, typeof( FurnitureDyeTub ) ), @@ -340,7 +340,7 @@ namespace Server.Engines.VeteranRewards new RewardEntry( miscellaneous, 1076155, typeof( RedSoulstone ), Expansion.ML ), new RewardEntry( miscellaneous, 1080523, typeof( CommodityDeedBox ), Expansion.ML ), } ), - new RewardList( RewardInterval, 2, new RewardEntry[] + new RewardList( RewardInterval, 2, new[] { new RewardEntry( specialDyeTubs, 1006052, typeof( LeatherDyeTub ) ), new RewardEntry( cloaksAndRobes, 1006014, typeof( RewardCloak ), Agapite, 1041290 ), @@ -353,7 +353,7 @@ namespace Server.Engines.VeteranRewards new RewardEntry( houseAddOns, 1006049, typeof( FlamingHeadDeed ) ), new RewardEntry( houseAddOns, 1080409, typeof( MinotaurStatueDeed ), Expansion.ML ) } ), - new RewardList( RewardInterval, 3, new RewardEntry[] + new RewardList( RewardInterval, 3, new[] { new RewardEntry( cloaksAndRobes, 1006020, typeof( RewardCloak ), Verite, 1041294 ), new RewardEntry( cloaksAndRobes, 1006021, typeof( RewardRobe ), Verite, 1041295 ), @@ -370,7 +370,7 @@ namespace Server.Engines.VeteranRewards new RewardEntry( houseAddOns, 1080407, typeof( PottedCactusDeed ), Expansion.ML ) } ), - new RewardList( RewardInterval, 4, new RewardEntry[] + new RewardList( RewardInterval, 4, new[] { new RewardEntry( specialDyeTubs, 1049740, typeof( RunebookDyeTub ) ), new RewardEntry( cloaksAndRobes, 1049725, typeof( RewardCloak ), DarkGray, 1049757 ), @@ -392,7 +392,7 @@ namespace Server.Engines.VeteranRewards new RewardEntry( houseAddOns, 1049737, typeof( DecorativeShieldDeed ) ), new RewardEntry( houseAddOns, 1049738, typeof( HangingSkeletonDeed ) ) } ), - new RewardList( RewardInterval, 5, new RewardEntry[] + new RewardList( RewardInterval, 5, new[] { new RewardEntry( specialDyeTubs, 1049741, typeof( StatuetteDyeTub ) ), new RewardEntry( cloaksAndRobes, 1049731, typeof( RewardCloak ), JetBlack, 1049763 ), @@ -412,28 +412,28 @@ namespace Server.Engines.VeteranRewards new RewardEntry( houseAddOns, 1049739, typeof( StoneAnkhDeed ) ), new RewardEntry( houseAddOns, 1080384, typeof( BloodyPentagramDeed ), Expansion.ML ) } ), - new RewardList( RewardInterval, 6, new RewardEntry[] + new RewardList( RewardInterval, 6, new[] { new RewardEntry( houseAddOns, 1076188, typeof( CharacterStatueMaker ), Expansion.ML, StatueType.Jade ), new RewardEntry( houseAddOns, 1076189, typeof( CharacterStatueMaker ), Expansion.ML, StatueType.Marble ), new RewardEntry( houseAddOns, 1076190, typeof( CharacterStatueMaker ), Expansion.ML, StatueType.Bronze ), new RewardEntry( houseAddOns, 1080527, typeof( RewardBrazierDeed ), Expansion.ML ) } ), - new RewardList( RewardInterval, 7, new RewardEntry[] + new RewardList( RewardInterval, 7, new[] { new RewardEntry( houseAddOns, 1076157, typeof( CannonDeed ), Expansion.ML ), new RewardEntry( houseAddOns, 1080550, typeof( TreeStumpDeed ), Expansion.ML ) } ), - new RewardList( RewardInterval, 8, new RewardEntry[] + new RewardList( RewardInterval, 8, new[] { new RewardEntry( miscellaneous, 1076158, typeof( WeaponEngravingTool ), Expansion.ML ) } ), - new RewardList( RewardInterval, 9, new RewardEntry[] + new RewardList( RewardInterval, 9, new[] { new RewardEntry( etherealSteeds, 1076159, typeof( RideablePolarBear ), Expansion.ML ), new RewardEntry( houseAddOns, 1080549, typeof( WallBannerDeed ), Expansion.ML ) } ), - new RewardList( RewardInterval, 10, new RewardEntry[] + new RewardList( RewardInterval, 10, new[] { new RewardEntry( monsterStatues, 1080520, typeof( MonsterStatuette ), Expansion.ML, MonsterStatuetteType.Harrower ), new RewardEntry( monsterStatues, 1080521, typeof( MonsterStatuette ), Expansion.ML, MonsterStatuetteType.Efreet ), @@ -451,12 +451,12 @@ namespace Server.Engines.VeteranRewards new RewardEntry( houseAddOns, 1080397, typeof( AnkhOfSacrificeDeed ), Expansion.ML ) } ), - new RewardList( RewardInterval, 11, new RewardEntry[] + new RewardList( RewardInterval, 11, new[] { new RewardEntry( etherealSteeds, 1113908, typeof( EtherealReptalon ), Expansion.ML ), } ), - new RewardList( RewardInterval, 12, new RewardEntry[] + new RewardList( RewardInterval, 12, new[] { new RewardEntry( etherealSteeds, 1113813, typeof( EtherealHiryu ), Expansion.ML ), } ), diff --git a/Scripts/Gumps/AddDoorGump.cs b/Scripts/Gumps/AddDoorGump.cs index 49cfee792..f8e8de372 100644 --- a/Scripts/Gumps/AddDoorGump.cs +++ b/Scripts/Gumps/AddDoorGump.cs @@ -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 ), diff --git a/Scripts/Gumps/AddGump.cs b/Scripts/Gumps/AddGump.cs index 83ac1573d..e0acd5037 100644 --- a/Scripts/Gumps/AddGump.cs +++ b/Scripts/Gumps/AddGump.cs @@ -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 ); } diff --git a/Scripts/Gumps/AdminGump.cs b/Scripts/Gumps/AdminGump.cs index d84b1f7ce..ae3f356d2 100644 --- a/Scripts/Gumps/AdminGump.cs +++ b/Scripts/Gumps/AdminGump.cs @@ -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 ) { diff --git a/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs b/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs index 7c3dd8f06..dd13db091 100644 --- a/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs +++ b/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs @@ -126,7 +126,7 @@ namespace Server.Guilds public GuildDiplomacyGump( PlayerMobile pm, Guild g, IComparer currentComparer, bool ascending, string filter, int startNumber, GuildDisplayType display, List list, TextDefinition lowerText ) : base( pm, g, list, currentComparer, ascending, filter, startNumber, - new InfoField[] + new[] { new InfoField( 1062954, 280, GuildDiplomacyGump.NameComparer.Instance ), //Guild Name new InfoField( 1062957, 50, GuildDiplomacyGump.AbbrevComparer.Instance ), //Abbrev diff --git a/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs b/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs index b6da071f3..51f4de689 100644 --- a/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs +++ b/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs @@ -106,7 +106,7 @@ namespace Server.Guilds #endregion private static InfoField[] m_Fields = - new InfoField[] + new[] { new InfoField( 1062955, 130, GuildRosterGump.NameComparer.Instance ), //Name new InfoField( 1062956, 80, GuildRosterGump.RankComparer.Instance ), //Rank diff --git a/Scripts/Gumps/HouseGumpAOS.cs b/Scripts/Gumps/HouseGumpAOS.cs index f37bd7b8f..032102177 100644 --- a/Scripts/Gumps/HouseGumpAOS.cs +++ b/Scripts/Gumps/HouseGumpAOS.cs @@ -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, diff --git a/Scripts/Gumps/PlayerVendorGumps.cs b/Scripts/Gumps/PlayerVendorGumps.cs index b2817a25f..64ee004a0 100644 --- a/Scripts/Gumps/PlayerVendorGumps.cs +++ b/Scripts/Gumps/PlayerVendorGumps.cs @@ -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 diff --git a/Scripts/Gumps/PolymorphGump.cs b/Scripts/Gumps/PolymorphGump.cs index d69404286..58d299001 100644 --- a/Scripts/Gumps/PolymorphGump.cs +++ b/Scripts/Gumps/PolymorphGump.cs @@ -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, diff --git a/Scripts/Gumps/Props/PropsGump.cs b/Scripts/Gumps/Props/PropsGump.cs index c27cc81db..c396ae94c 100644 --- a/Scripts/Gumps/Props/PropsGump.cs +++ b/Scripts/Gumps/Props/PropsGump.cs @@ -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 } ); } diff --git a/Scripts/Gumps/Props/SetBodyGump.cs b/Scripts/Gumps/Props/SetBodyGump.cs index 62f8ad812..a4db56ea5 100644 --- a/Scripts/Gumps/Props/SetBodyGump.cs +++ b/Scripts/Gumps/Props/SetBodyGump.cs @@ -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_", diff --git a/Scripts/Gumps/Props/SetCustomEnumGump.cs b/Scripts/Gumps/Props/SetCustomEnumGump.cs index b1a8e1c86..7b1ef928d 100644 --- a/Scripts/Gumps/Props/SetCustomEnumGump.cs +++ b/Scripts/Gumps/Props/SetCustomEnumGump.cs @@ -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 = ""; diff --git a/Scripts/Gumps/SkillsGump.cs b/Scripts/Gumps/SkillsGump.cs index 1f6c4a61a..9f44a5a9b 100644 --- a/Scripts/Gumps/SkillsGump.cs +++ b/Scripts/Gumps/SkillsGump.cs @@ -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, diff --git a/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs b/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs index 90fe1bda5..691467f28 100644 --- a/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs +++ b/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs @@ -24,7 +24,7 @@ namespace Server.Engines.Events private static List m_DeathQueue; - private static Rectangle2D[] m_Cemetaries = new Rectangle2D[] + private static Rectangle2D[] m_Cemetaries = new[] { new Rectangle2D(1272,3712,30,20), // Jhelom new Rectangle2D(1337,1444,48,52), // Britain diff --git a/Scripts/Items/Addons/AddonComponent.cs b/Scripts/Items/Addons/AddonComponent.cs index d72bef273..d72135ca7 100644 --- a/Scripts/Items/Addons/AddonComponent.cs +++ b/Scripts/Items/Addons/AddonComponent.cs @@ -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 ), diff --git a/Scripts/Items/Addons/FlourMillEastAddon.cs b/Scripts/Items/Addons/FlourMillEastAddon.cs index 8e97245e1..39138f026 100644 --- a/Scripts/Items/Addons/FlourMillEastAddon.cs +++ b/Scripts/Items/Addons/FlourMillEastAddon.cs @@ -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 ) diff --git a/Scripts/Items/Addons/FlourMillSouthAddon.cs b/Scripts/Items/Addons/FlourMillSouthAddon.cs index a2fc7d3fa..71a0fd732 100644 --- a/Scripts/Items/Addons/FlourMillSouthAddon.cs +++ b/Scripts/Items/Addons/FlourMillSouthAddon.cs @@ -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 ) diff --git a/Scripts/Items/Aquarium/Aquarium.cs b/Scripts/Items/Aquarium/Aquarium.cs index 6f2df6663..29782b355 100644 --- a/Scripts/Items/Aquarium/Aquarium.cs +++ b/Scripts/Items/Aquarium/Aquarium.cs @@ -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 }; diff --git a/Scripts/Items/Champion Artifacts/Decorative/Pier.cs b/Scripts/Items/Champion Artifacts/Decorative/Pier.cs index 2a467772c..88d621f04 100644 --- a/Scripts/Items/Champion Artifacts/Decorative/Pier.cs +++ b/Scripts/Items/Champion Artifacts/Decorative/Pier.cs @@ -16,7 +16,7 @@ namespace Server.Items * */ - private static int[] m_itemids = new int[] + private static int[] m_itemids = new[] { 0x3486, 0x348b, 0x3ae }; diff --git a/Scripts/Items/Champion Artifacts/Decorative/Web.cs b/Scripts/Items/Champion Artifacts/Decorative/Web.cs index a956b3de7..75a1f00f4 100644 --- a/Scripts/Items/Champion Artifacts/Decorative/Web.cs +++ b/Scripts/Items/Champion Artifacts/Decorative/Web.cs @@ -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 }; diff --git a/Scripts/Items/Construction/Doors/BaseDoor.cs b/Scripts/Items/Construction/Doors/BaseDoor.cs index 773072e42..7c56f0c6e 100644 --- a/Scripts/Items/Construction/Doors/BaseDoor.cs +++ b/Scripts/Items/Construction/Doors/BaseDoor.cs @@ -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 ), diff --git a/Scripts/Items/Containers/FillableContainers.cs b/Scripts/Items/Containers/FillableContainers.cs index ae3b3f37b..32612ef17 100644 --- a/Scripts/Items/Containers/FillableContainers.cs +++ b/Scripts/Items/Containers/FillableContainers.cs @@ -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, diff --git a/Scripts/Items/Containers/ParagonChest.cs b/Scripts/Items/Containers/ParagonChest.cs index 0952ba3b6..3b133fc55 100644 --- a/Scripts/Items/Containers/ParagonChest.cs +++ b/Scripts/Items/Containers/ParagonChest.cs @@ -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 diff --git a/Scripts/Items/Containers/TreasureMapChest.cs b/Scripts/Items/Containers/TreasureMapChest.cs index 4be227e2e..a19b4cbff 100644 --- a/Scripts/Items/Containers/TreasureMapChest.cs +++ b/Scripts/Items/Containers/TreasureMapChest.cs @@ -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 ), diff --git a/Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs b/Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs index ad5904844..ebf919632 100644 --- a/Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs +++ b/Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs @@ -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 ) ), diff --git a/Scripts/Items/Deeds/HairRestylingDeed.cs b/Scripts/Items/Deeds/HairRestylingDeed.cs index 934b587bd..01809f238 100644 --- a/Scripts/Items/Deeds/HairRestylingDeed.cs +++ b/Scripts/Items/Deeds/HairRestylingDeed.cs @@ -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 }; } } diff --git a/Scripts/Items/Food/Beverage.cs b/Scripts/Items/Food/Beverage.cs index bbdba64fa..2e54ca2fc 100644 --- a/Scripts/Items/Food/Beverage.cs +++ b/Scripts/Items/Food/Beverage.cs @@ -814,7 +814,7 @@ namespace Server.Items } } - private static int[] m_SwampTiles = new int[] + private static int[] m_SwampTiles = new[] { 0x9C4, 0x9EB, 0x3D65, 0x3D65, diff --git a/Scripts/Items/Maps/PresetMap.cs b/Scripts/Items/Maps/PresetMap.cs index cbe381565..bd44aa89b 100644 --- a/Scripts/Items/Maps/PresetMap.cs +++ b/Scripts/Items/Maps/PresetMap.cs @@ -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 diff --git a/Scripts/Items/Maps/TreasureMap.cs b/Scripts/Items/Maps/TreasureMap.cs index bd2f30c10..2049e79fb 100644 --- a/Scripts/Items/Maps/TreasureMap.cs +++ b/Scripts/Items/Maps/TreasureMap.cs @@ -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 diff --git a/Scripts/Items/Misc/ClockworkAssembly.cs b/Scripts/Items/Misc/ClockworkAssembly.cs index 8f50b4bfd..45f8f95e8 100644 --- a/Scripts/Items/Misc/ClockworkAssembly.cs +++ b/Scripts/Items/Misc/ClockworkAssembly.cs @@ -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, diff --git a/Scripts/Items/Misc/CommunicationCrystals.cs b/Scripts/Items/Misc/CommunicationCrystals.cs index e598673c5..fc7734e49 100644 --- a/Scripts/Items/Misc/CommunicationCrystals.cs +++ b/Scripts/Items/Misc/CommunicationCrystals.cs @@ -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 ), diff --git a/Scripts/Items/Misc/DeceitBrazier.cs b/Scripts/Items/Misc/DeceitBrazier.cs index 90ce32fa0..1b37b13d7 100644 --- a/Scripts/Items/Misc/DeceitBrazier.cs +++ b/Scripts/Items/Misc/DeceitBrazier.cs @@ -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! diff --git a/Scripts/Items/Misc/FlippableAddonAttribute.cs b/Scripts/Items/Misc/FlippableAddonAttribute.cs index 8170eee3d..4e0f09891 100644 --- a/Scripts/Items/Misc/FlippableAddonAttribute.cs +++ b/Scripts/Items/Misc/FlippableAddonAttribute.cs @@ -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 ) }; diff --git a/Scripts/Items/Misc/HairDye.cs b/Scripts/Items/Misc/HairDye.cs index 73a50807b..ce8d8ad2c 100644 --- a/Scripts/Items/Misc/HairDye.cs +++ b/Scripts/Items/Misc/HairDye.cs @@ -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 ), diff --git a/Scripts/Items/Misc/Key.cs b/Scripts/Items/Misc/Key.cs index 881d5b158..11840f1b4 100644 --- a/Scripts/Items/Misc/Key.cs +++ b/Scripts/Items/Misc/Key.cs @@ -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 ) { diff --git a/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs b/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs index ae8378651..93bd418c4 100644 --- a/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs +++ b/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs @@ -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, diff --git a/Scripts/Items/Misc/PublicMoongate.cs b/Scripts/Items/Misc/PublicMoongate.cs index 917270861..5436d825a 100644 --- a/Scripts/Items/Misc/PublicMoongate.cs +++ b/Scripts/Items/Misc/PublicMoongate.cs @@ -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 diff --git a/Scripts/Items/Misc/SpecialBeardDye.cs b/Scripts/Items/Misc/SpecialBeardDye.cs index d99d8808e..877ef1c75 100644 --- a/Scripts/Items/Misc/SpecialBeardDye.cs +++ b/Scripts/Items/Misc/SpecialBeardDye.cs @@ -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 ), diff --git a/Scripts/Items/Misc/SpecialHairDye.cs b/Scripts/Items/Misc/SpecialHairDye.cs index e4a600f67..d5d54b4fc 100644 --- a/Scripts/Items/Misc/SpecialHairDye.cs +++ b/Scripts/Items/Misc/SpecialHairDye.cs @@ -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 ), diff --git a/Scripts/Items/Misc/WindChimes.cs b/Scripts/Items/Misc/WindChimes.cs index 011414051..59b162c18 100644 --- a/Scripts/Items/Misc/WindChimes.cs +++ b/Scripts/Items/Misc/WindChimes.cs @@ -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; diff --git a/Scripts/Items/Quivers/BaseQuiver.cs b/Scripts/Items/Quivers/BaseQuiver.cs index f4c06d88a..0389992fa 100644 --- a/Scripts/Items/Quivers/BaseQuiver.cs +++ b/Scripts/Items/Quivers/BaseQuiver.cs @@ -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 ) }; diff --git a/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs b/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs index 77f641c12..1739f837c 100644 --- a/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs +++ b/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs @@ -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 ), diff --git a/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs b/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs index a44d14634..06c32f8af 100644 --- a/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs +++ b/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs @@ -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...

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..." ), diff --git a/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs b/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs index b4139d864..d9533300a 100644 --- a/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs +++ b/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs @@ -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 }; diff --git a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs index 6027cc9db..8378fbe6e 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs @@ -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 ), diff --git a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs index 6dd4546cd..81819f517 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs @@ -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 ), diff --git a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs index ddd781865..da39d81a6 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs @@ -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 ), diff --git a/Scripts/Items/Skill Items/Magical/Spellbook.cs b/Scripts/Items/Skill Items/Magical/Spellbook.cs index 8750cc3b2..83c4e4e5a 100644 --- a/Scripts/Items/Skill Items/Magical/Spellbook.cs +++ b/Scripts/Items/Skill Items/Magical/Spellbook.cs @@ -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% diff --git a/Scripts/Items/Skill Items/Misc/RepairDeed.cs b/Scripts/Items/Skill Items/Misc/RepairDeed.cs index 6ba6c6af0..4c800a82c 100644 --- a/Scripts/Items/Skill Items/Misc/RepairDeed.cs +++ b/Scripts/Items/Skill Items/Misc/RepairDeed.cs @@ -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 ), diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs index 313493b6f..696cceffc 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs @@ -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 ); } diff --git a/Scripts/Items/Skill Items/Thief/DisguiseKit.cs b/Scripts/Items/Skill Items/Thief/DisguiseKit.cs index 8ce2ae39a..4db792659 100644 --- a/Scripts/Items/Skill Items/Thief/DisguiseKit.cs +++ b/Scripts/Items/Skill Items/Thief/DisguiseKit.cs @@ -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 diff --git a/Scripts/Items/Skill Items/Tools/BaseRunicTool.cs b/Scripts/Items/Skill Items/Tools/BaseRunicTool.cs index b7dd54beb..2781354f8 100644 --- a/Scripts/Items/Skill Items/Tools/BaseRunicTool.cs +++ b/Scripts/Items/Skill Items/Tools/BaseRunicTool.cs @@ -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, diff --git a/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs b/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs index 8f9b989d9..1ad78c01e 100644 --- a/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs +++ b/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs @@ -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 }; diff --git a/Scripts/Items/Special/Holiday/HolidayBell.cs b/Scripts/Items/Special/Holiday/HolidayBell.cs index 91fbc534e..0e1d0dc66 100644 --- a/Scripts/Items/Special/Holiday/HolidayBell.cs +++ b/Scripts/Items/Special/Holiday/HolidayBell.cs @@ -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 }; diff --git a/Scripts/Items/Special/Holiday/PKHolidayStuff.cs b/Scripts/Items/Special/Holiday/PKHolidayStuff.cs index f6a35aa6b..9bc825c51 100644 --- a/Scripts/Items/Special/Holiday/PKHolidayStuff.cs +++ b/Scripts/Items/Special/Holiday/PKHolidayStuff.cs @@ -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; diff --git a/Scripts/Items/Special/Holiday/SnowGlobes.cs b/Scripts/Items/Special/Holiday/SnowGlobes.cs index ef483f848..aee770646 100644 --- a/Scripts/Items/Special/Holiday/SnowGlobes.cs +++ b/Scripts/Items/Special/Holiday/SnowGlobes.cs @@ -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", diff --git a/Scripts/Items/Special/Holiday/SnowPiles.cs b/Scripts/Items/Special/Holiday/SnowPiles.cs index 5ac226e0b..1f245e101 100644 --- a/Scripts/Items/Special/Holiday/SnowPiles.cs +++ b/Scripts/Items/Special/Holiday/SnowPiles.cs @@ -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() diff --git a/Scripts/Items/Special/Holiday/Snowman.cs b/Scripts/Items/Special/Holiday/Snowman.cs index 540719ebb..347c12f1e 100644 --- a/Scripts/Items/Special/Holiday/Snowman.cs +++ b/Scripts/Items/Special/Holiday/Snowman.cs @@ -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", diff --git a/Scripts/Items/Special/MiniHouses.cs b/Scripts/Items/Special/MiniHouses.cs index 8a0e0dee8..2ef6967a7 100644 --- a/Scripts/Items/Special/MiniHouses.cs +++ b/Scripts/Items/Special/MiniHouses.cs @@ -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 ), diff --git a/Scripts/Items/Special/MonsterStatuette.cs b/Scripts/Items/Special/MonsterStatuette.cs index 548b9f871..24b3dceb8 100644 --- a/Scripts/Items/Special/MonsterStatuette.cs +++ b/Scripts/Items/Special/MonsterStatuette.cs @@ -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 ), diff --git a/Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs b/Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs index da466f8eb..e4f3a4ef3 100644 --- a/Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs +++ b/Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs @@ -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 }; diff --git a/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs b/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs index e1b90e029..74bbcb474 100644 --- a/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs +++ b/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs @@ -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 }; diff --git a/Scripts/Items/Special/Special Scrolls/PowerScroll.cs b/Scripts/Items/Special/Special Scrolls/PowerScroll.cs index 88bcceca5..4af2fcec8 100644 --- a/Scripts/Items/Special/Special Scrolls/PowerScroll.cs +++ b/Scripts/Items/Special/Special Scrolls/PowerScroll.cs @@ -27,7 +27,7 @@ namespace Server.Items public override string DefaultTitle => String.Format( "Power Scroll ({0} Skill):", 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 }; diff --git a/Scripts/Items/Special/Veteran Rewards/Brazier.cs b/Scripts/Items/Special/Veteran Rewards/Brazier.cs index 6c07b0bce..9419ead12 100644 --- a/Scripts/Items/Special/Veteran Rewards/Brazier.cs +++ b/Scripts/Items/Special/Veteran Rewards/Brazier.cs @@ -27,7 +27,7 @@ namespace Server.Items base.OnDelete(); } - private static int[] m_Art = new int[] + private static int[] m_Art = new[] { 0x19AA, 0x19BB }; diff --git a/Scripts/Items/Special/Veteran Rewards/Cannon.cs b/Scripts/Items/Special/Veteran Rewards/Cannon.cs index 0d6ca3190..d30f4b7eb 100644 --- a/Scripts/Items/Special/Veteran Rewards/Cannon.cs +++ b/Scripts/Items/Special/Veteran Rewards/Cannon.cs @@ -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 }; diff --git a/Scripts/Items/Talismans/BaseTalisman.cs b/Scripts/Items/Talismans/BaseTalisman.cs index bc344937a..e0b3aae27 100644 --- a/Scripts/Items/Talismans/BaseTalisman.cs +++ b/Scripts/Items/Talismans/BaseTalisman.cs @@ -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, diff --git a/Scripts/Items/Talismans/TalismanSlayer.cs b/Scripts/Items/Talismans/TalismanSlayer.cs index 8908b5b8e..c7311925f 100644 --- a/Scripts/Items/Talismans/TalismanSlayer.cs +++ b/Scripts/Items/Talismans/TalismanSlayer.cs @@ -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 )*/ diff --git a/Scripts/Items/Weapons/Artifacts/TheDryadBow.cs b/Scripts/Items/Weapons/Artifacts/TheDryadBow.cs index 04ca6eb30..edefd7d85 100644 --- a/Scripts/Items/Weapons/Artifacts/TheDryadBow.cs +++ b/Scripts/Items/Weapons/Artifacts/TheDryadBow.cs @@ -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, diff --git a/Scripts/Items/Weapons/SlayerEntry.cs b/Scripts/Items/Weapons/SlayerEntry.cs index ac3fa6a7f..4e2160143 100644 --- a/Scripts/Items/Weapons/SlayerEntry.cs +++ b/Scripts/Items/Weapons/SlayerEntry.cs @@ -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 diff --git a/Scripts/Items/Weapons/SlayerGroup.cs b/Scripts/Items/Weapons/SlayerGroup.cs index c934ba8ba..1a99741f7 100644 --- a/Scripts/Items/Weapons/SlayerGroup.cs +++ b/Scripts/Items/Weapons/SlayerGroup.cs @@ -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, diff --git a/Scripts/Items/Weapons/Staves/ShepherdsCrook.cs b/Scripts/Items/Weapons/Staves/ShepherdsCrook.cs index af5f437b9..0fe1f82f2 100644 --- a/Scripts/Items/Weapons/Staves/ShepherdsCrook.cs +++ b/Scripts/Items/Weapons/Staves/ShepherdsCrook.cs @@ -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 ), diff --git a/Scripts/Misc/AutoSave.cs b/Scripts/Misc/AutoSave.cs index 35f809d41..11b6e8709 100644 --- a/Scripts/Misc/AutoSave.cs +++ b/Scripts/Misc/AutoSave.cs @@ -88,7 +88,7 @@ namespace Server.Misc World.Save( true, permitBackgroundWrite ); } - private static string[] m_Backups = new string[] + private static string[] m_Backups = new[] { "Third Backup", "Second Backup", diff --git a/Scripts/Misc/CharacterCreation.cs b/Scripts/Misc/CharacterCreation.cs index dbbba5589..717b102f5 100644 --- a/Scripts/Misc/CharacterCreation.cs +++ b/Scripts/Misc/CharacterCreation.cs @@ -926,7 +926,7 @@ namespace Server.Misc { case 1: // Warrior { - skills = new SkillNameValue[] + skills = new[] { new SkillNameValue( SkillName.Anatomy, 30 ), new SkillNameValue( SkillName.Healing, 45 ), @@ -938,7 +938,7 @@ namespace Server.Misc } case 2: // Magician { - skills = new SkillNameValue[] + skills = new[] { new SkillNameValue( SkillName.EvalInt, 30 ), new SkillNameValue( SkillName.Wrestling, 30 ), @@ -950,7 +950,7 @@ namespace Server.Misc } case 3: // Blacksmith { - skills = new SkillNameValue[] + skills = new[] { new SkillNameValue( SkillName.Mining, 30 ), new SkillNameValue( SkillName.ArmsLore, 30 ), @@ -962,7 +962,7 @@ namespace Server.Misc } case 4: // Necromancer { - skills = new SkillNameValue[] + skills = new[] { new SkillNameValue( SkillName.Necromancy, 50 ), new SkillNameValue( SkillName.Focus, 30 ), @@ -975,7 +975,7 @@ namespace Server.Misc } case 5: // Paladin { - skills = new SkillNameValue[] + skills = new[] { new SkillNameValue( SkillName.Chivalry, 51 ), new SkillNameValue( SkillName.Swords, 49 ), @@ -987,7 +987,7 @@ namespace Server.Misc } case 6: //Samurai { - skills = new SkillNameValue[] + skills = new[] { new SkillNameValue( SkillName.Bushido, 50 ), new SkillNameValue( SkillName.Swords, 50 ), @@ -998,7 +998,7 @@ namespace Server.Misc } case 7: //Ninja { - skills = new SkillNameValue[] + skills = new[] { new SkillNameValue( SkillName.Ninjitsu, 50 ), new SkillNameValue( SkillName.Hiding, 50 ), @@ -1141,7 +1141,7 @@ namespace Server.Misc addSkillItems = false; EquipItem( new Kasa() ); - int[] hues = new int[] { 0x1A8, 0xEC, 0x99, 0x90, 0xB5, 0x336, 0x89 }; + int[] hues = new[] { 0x1A8, 0xEC, 0x99, 0x90, 0xB5, 0x336, 0x89 }; //TODO: Verify that's ALL the hues for that above. EquipItem( new TattsukeHakama( hues[Utility.Random(hues.Length)] ) ); diff --git a/Scripts/Misc/DoorGenerator.cs b/Scripts/Misc/DoorGenerator.cs index 058a7fe1b..2982e91b3 100644 --- a/Scripts/Misc/DoorGenerator.cs +++ b/Scripts/Misc/DoorGenerator.cs @@ -5,7 +5,7 @@ namespace Server { public class DoorGenerator { - private static Rectangle2D[] m_BritRegions = new Rectangle2D[] + private static Rectangle2D[] m_BritRegions = new[] { new Rectangle2D( new Point2D( 250, 750 ), new Point2D( 775, 1330 ) ), new Rectangle2D( new Point2D( 525, 2095 ), new Point2D( 925, 2430 ) ), @@ -25,17 +25,17 @@ namespace Server new Rectangle2D( new Point2D( 5120, 2300 ), new Point2D( 6143, 4095 ) ) }; - private static Rectangle2D[] m_IlshRegions = new Rectangle2D[] + private static Rectangle2D[] m_IlshRegions = new[] { new Rectangle2D( new Point2D( 0, 0 ), new Point2D( 288*8, 200*8 ) ) }; - private static Rectangle2D[] m_MalasRegions = new Rectangle2D[] + private static Rectangle2D[] m_MalasRegions = new[] { new Rectangle2D( new Point2D( 0, 0 ), new Point2D( 320*8, 256*8 ) ) }; - private static int[] m_SouthFrames = new int[] + private static int[] m_SouthFrames = new[] { 0x0006, 0x0008, @@ -109,7 +109,7 @@ namespace Server 0x020A }; - private static int[] m_NorthFrames = new int[] + private static int[] m_NorthFrames = new[] { 0x0006, 0x0008, @@ -182,7 +182,7 @@ namespace Server 0x020A }; - private static int[] m_EastFrames = new int[] + private static int[] m_EastFrames = new[] { 0x0007, 0x000A, @@ -256,7 +256,7 @@ namespace Server 0x0209 }; - private static int[] m_WestFrames = new int[] + private static int[] m_WestFrames = new[] { 0x0007, 0x000C, diff --git a/Scripts/Misc/Emitter.cs b/Scripts/Misc/Emitter.cs index 976f8771e..ab20185a0 100644 --- a/Scripts/Misc/Emitter.cs +++ b/Scripts/Misc/Emitter.cs @@ -481,7 +481,7 @@ namespace Server { Type active = this.Active; - MethodInfo compareTo = active.GetMethod( "CompareTo", new Type[] { active } ); + MethodInfo compareTo = active.GetMethod( "CompareTo", new[] { active } ); if ( compareTo == null ) { @@ -517,7 +517,7 @@ namespace Server if ( ifaces.Length > 0 ) { - compareTo = ifaces[0].GetMethod( "CompareTo", new Type[] { active } ); + compareTo = ifaces[0].GetMethod( "CompareTo", new[] { active } ); } else { @@ -527,7 +527,7 @@ namespace Server }, null ); if ( ifaces.Length > 0 ) - compareTo = ifaces[0].GetMethod( "CompareTo", new Type[] { active } ); + compareTo = ifaces[0].GetMethod( "CompareTo", new[] { active } ); } } diff --git a/Scripts/Misc/Gifts/Winter2004/LightOfTheWinterSolstice.cs b/Scripts/Misc/Gifts/Winter2004/LightOfTheWinterSolstice.cs index d1cb42008..03bf42b89 100644 --- a/Scripts/Misc/Gifts/Winter2004/LightOfTheWinterSolstice.cs +++ b/Scripts/Misc/Gifts/Winter2004/LightOfTheWinterSolstice.cs @@ -5,7 +5,7 @@ namespace Server.Items [FlippableAttribute( 0x236E, 0x2371 )] public class LightOfTheWinterSolstice : Item { - private static string[] m_StaffNames = new string[] + private static string[] m_StaffNames = new[] { "Aenima", "Alkiser", diff --git a/Scripts/Misc/Gifts/Winter2004/PileOfGlacialSnow.cs b/Scripts/Misc/Gifts/Winter2004/PileOfGlacialSnow.cs index 92cf8263c..9d8d8ebcd 100644 --- a/Scripts/Misc/Gifts/Winter2004/PileOfGlacialSnow.cs +++ b/Scripts/Misc/Gifts/Winter2004/PileOfGlacialSnow.cs @@ -113,7 +113,7 @@ namespace Server.Items { from.SendMessage( "You may not throw snow here." ); } - else if ( pack != null && pack.FindItemByType( new Type[]{ typeof( SnowPile ), typeof( PileOfGlacialSnow ) } ) != null ) + else if ( pack != null && pack.FindItemByType( new[]{ typeof( SnowPile ), typeof( PileOfGlacialSnow ) } ) != null ) { if ( from.BeginAction( typeof( SnowPile ) ) ) { diff --git a/Scripts/Misc/Gifts/Winter2004/SnowPile.cs b/Scripts/Misc/Gifts/Winter2004/SnowPile.cs index a2d367dee..8ec8fbf5e 100644 --- a/Scripts/Misc/Gifts/Winter2004/SnowPile.cs +++ b/Scripts/Misc/Gifts/Winter2004/SnowPile.cs @@ -99,7 +99,7 @@ namespace Server.Items { from.SendMessage( "You may not throw snow here." ); } - else if ( pack?.FindItemByType( new Type[]{ typeof( SnowPile ), typeof( PileOfGlacialSnow ) } ) != null ) + else if ( pack?.FindItemByType( new[]{ typeof( SnowPile ), typeof( PileOfGlacialSnow ) } ) != null ) { if ( from.BeginAction( typeof( SnowPile ) ) ) { diff --git a/Scripts/Misc/Guild.cs b/Scripts/Misc/Guild.cs index 5956a3ac9..7d465db34 100644 --- a/Scripts/Misc/Guild.cs +++ b/Scripts/Misc/Guild.cs @@ -31,7 +31,7 @@ namespace Server.Guilds public class RankDefinition { - public static RankDefinition[] Ranks = new RankDefinition[] + public static RankDefinition[] Ranks = new[] { new RankDefinition( 1062963, 0, RankFlags.None ), //Ronin new RankDefinition( 1062962, 1, RankFlags.Member ), //Member diff --git a/Scripts/Misc/InhumanSpeech.cs b/Scripts/Misc/InhumanSpeech.cs index 2b43646b8..fd85f4db9 100644 --- a/Scripts/Misc/InhumanSpeech.cs +++ b/Scripts/Misc/InhumanSpeech.cs @@ -32,7 +32,7 @@ namespace Server.Misc m_RatmanSpeech.Flags = IHSFlags.All; - m_RatmanSpeech.Keywords = new string[] + m_RatmanSpeech.Keywords = new[] { "meat", "gold", "kill", "killing", "slay", "sword", "axe", "spell", "magic", "spells", @@ -47,7 +47,7 @@ namespace Server.Misc "jerk", "fool", "foolish", "ugly", "insult", "scum" }; - m_RatmanSpeech.Responses = new string[] + m_RatmanSpeech.Responses = new[] { "meat", "kill", "pound", "crush", "yum yum", "crunch", "destroy", "murder", "eat", "munch", @@ -61,7 +61,7 @@ namespace Server.Misc "loser", "lose", "scum" }; - m_RatmanSpeech.Syllables = new string[] + m_RatmanSpeech.Syllables = new[] { "skrit", @@ -108,7 +108,7 @@ namespace Server.Misc m_OrcSpeech.Flags = IHSFlags.All; - m_OrcSpeech.Keywords = new string[] + m_OrcSpeech.Keywords = new[] { "meat", "gold", "kill", "killing", "slay", "sword", "axe", "spell", "magic", "spells", @@ -123,7 +123,7 @@ namespace Server.Misc "jerk", "fool", "foolish", "ugly", "insult", "scum" }; - m_OrcSpeech.Responses = new string[] + m_OrcSpeech.Responses = new[] { "meat", "kill", "pound", "crush", "yum yum", "crunch", "destroy", "murder", "eat", "munch", @@ -137,7 +137,7 @@ namespace Server.Misc "loser", "lose", "scum" }; - m_OrcSpeech.Syllables = new string[] + m_OrcSpeech.Syllables = new[] { "bu", "du", "fu", "ju", "gu", "ulg", "gug", "gub", "gur", "oog", @@ -195,7 +195,7 @@ namespace Server.Misc m_LizardmanSpeech.Flags = IHSFlags.All; - m_LizardmanSpeech.Keywords = new string[] + m_LizardmanSpeech.Keywords = new[] { "meat", "gold", "kill", "killing", "slay", "sword", "axe", "spell", "magic", "spells", @@ -210,7 +210,7 @@ namespace Server.Misc "jerk", "fool", "foolish", "ugly", "insult", "scum" }; - m_LizardmanSpeech.Responses = new string[] + m_LizardmanSpeech.Responses = new[] { "meat", "kill", "pound", "crush", "yum yum", "crunch", "destroy", "murder", "eat", "munch", @@ -224,7 +224,7 @@ namespace Server.Misc "loser", "lose", "scum" }; - m_LizardmanSpeech.Syllables = new string[] + m_LizardmanSpeech.Syllables = new[] { "ss", "sth", "iss", "is", "ith", "kth", "sith", "this", "its", "sit", "tis", "tsi", @@ -259,7 +259,7 @@ namespace Server.Misc m_WispSpeech.Flags = IHSFlags.OnMovement; - m_WispSpeech.Syllables = new string[] + m_WispSpeech.Syllables = new[] { "b", "c", "d", "f", "g", "h", "i", "j", "k", "l", "m", "n", "p", "r", diff --git a/Scripts/Misc/Loot.cs b/Scripts/Misc/Loot.cs index dc104334e..d132cc9e2 100644 --- a/Scripts/Misc/Loot.cs +++ b/Scripts/Misc/Loot.cs @@ -8,7 +8,7 @@ namespace Server #region List definitions #region Mondain's Legacy - private static Type[] m_MLWeaponTypes = new Type[] + private static Type[] m_MLWeaponTypes = new[] { typeof( AssassinSpike ), typeof( DiamondMace ), typeof( ElvenMachete ), typeof( ElvenSpellblade ), typeof( Leafblade ), typeof( OrnateAxe ), @@ -18,14 +18,14 @@ namespace Server public static Type[] MLWeaponTypes => m_MLWeaponTypes; - private static Type[] m_MLRangedWeaponTypes = new Type[] + private static Type[] m_MLRangedWeaponTypes = new[] { typeof( ElvenCompositeLongbow ), typeof( MagicalShortbow ) }; public static Type[] MLRangedWeaponTypes => m_MLRangedWeaponTypes; - private static Type[] m_MLArmorTypes = new Type[] + private static Type[] m_MLArmorTypes = new[] { typeof( Circlet ), typeof( GemmedCirclet ), typeof( LeafTonlet ), typeof( RavenHelm ), typeof( RoyalCirclet ), typeof( VultureHelm ), @@ -39,7 +39,7 @@ namespace Server public static Type[] MLArmorTypes => m_MLArmorTypes; - private static Type[] m_MLClothingTypes = new Type[] + private static Type[] m_MLClothingTypes = new[] { typeof( MaleElvenRobe ), typeof( FemaleElvenRobe ), typeof( ElvenPants ), typeof( ElvenShirt ), typeof( ElvenDarkShirt ), typeof( ElvenBoots ), @@ -50,7 +50,7 @@ namespace Server #endregion - private static Type[] m_SEWeaponTypes = new Type[] + private static Type[] m_SEWeaponTypes = new[] { typeof( Bokuto ), typeof( Daisho ), typeof( Kama ), typeof( Lajatang ), typeof( NoDachi ), typeof( Nunchaku ), @@ -60,7 +60,7 @@ namespace Server public static Type[] SEWeaponTypes => m_SEWeaponTypes; - private static Type[] m_AosWeaponTypes = new Type[] + private static Type[] m_AosWeaponTypes = new[] { typeof( Scythe ), typeof( BoneHarvester ), typeof( Scepter ), typeof( BladedStaff ), typeof( Pike ), typeof( DoubleBladedStaff ), @@ -69,7 +69,7 @@ namespace Server public static Type[] AosWeaponTypes => m_AosWeaponTypes; - private static Type[] m_WeaponTypes = new Type[] + private static Type[] m_WeaponTypes = new[] { typeof( Axe ), typeof( BattleAxe ), typeof( DoubleAxe ), typeof( ExecutionersAxe ), typeof( Hatchet ), typeof( LargeBattleAxe ), @@ -87,28 +87,28 @@ namespace Server public static Type[] WeaponTypes => m_WeaponTypes; - private static Type[] m_SERangedWeaponTypes = new Type[] + private static Type[] m_SERangedWeaponTypes = new[] { typeof( Yumi ) }; public static Type[] SERangedWeaponTypes => m_SERangedWeaponTypes; - private static Type[] m_AosRangedWeaponTypes = new Type[] + private static Type[] m_AosRangedWeaponTypes = new[] { typeof( CompositeBow ), typeof( RepeatingCrossbow ) }; public static Type[] AosRangedWeaponTypes => m_AosRangedWeaponTypes; - private static Type[] m_RangedWeaponTypes = new Type[] + private static Type[] m_RangedWeaponTypes = new[] { typeof( Bow ), typeof( Crossbow ), typeof( HeavyCrossbow ) }; public static Type[] RangedWeaponTypes => m_RangedWeaponTypes; - private static Type[] m_SEArmorTypes = new Type[] + private static Type[] m_SEArmorTypes = new[] { typeof( ChainHatsuburi ), typeof( LeatherDo ), typeof( LeatherHaidate ), typeof( LeatherHiroSode ), typeof( LeatherJingasa ), typeof( LeatherMempo ), @@ -124,7 +124,7 @@ namespace Server public static Type[] SEArmorTypes => m_SEArmorTypes; - private static Type[] m_ArmorTypes = new Type[] + private static Type[] m_ArmorTypes = new[] { typeof( BoneArms ), typeof( BoneChest ), typeof( BoneGloves ), typeof( BoneLegs ), typeof( BoneHelm ), typeof( ChainChest ), @@ -144,14 +144,14 @@ namespace Server public static Type[] ArmorTypes => m_ArmorTypes; - private static Type[] m_AosShieldTypes = new Type[] + private static Type[] m_AosShieldTypes = new[] { typeof( ChaosShield ), typeof( OrderShield ) }; public static Type[] AosShieldTypes => m_AosShieldTypes; - private static Type[] m_ShieldTypes = new Type[] + private static Type[] m_ShieldTypes = new[] { typeof( BronzeShield ), typeof( Buckler ), typeof( HeaterShield ), typeof( MetalShield ), typeof( MetalKiteShield ), typeof( WoodenKiteShield ), @@ -160,7 +160,7 @@ namespace Server public static Type[] ShieldTypes => m_ShieldTypes; - private static Type[] m_GemTypes = new Type[] + private static Type[] m_GemTypes = new[] { typeof( Amber ), typeof( Amethyst ), typeof( Citrine ), typeof( Diamond ), typeof( Emerald ), typeof( Ruby ), @@ -169,7 +169,7 @@ namespace Server public static Type[] GemTypes => m_GemTypes; - private static Type[] m_JewelryTypes = new Type[] + private static Type[] m_JewelryTypes = new[] { typeof( GoldRing ), typeof( GoldBracelet ), typeof( SilverRing ), typeof( SilverBracelet ) @@ -177,7 +177,7 @@ namespace Server public static Type[] JewelryTypes => m_JewelryTypes; - private static Type[] m_RegTypes = new Type[] + private static Type[] m_RegTypes = new[] { typeof( BlackPearl ), typeof( Bloodmoss ), typeof( Garlic ), typeof( Ginseng ), typeof( MandrakeRoot ), typeof( Nightshade ), @@ -186,7 +186,7 @@ namespace Server public static Type[] RegTypes => m_RegTypes; - private static Type[] m_NecroRegTypes = new Type[] + private static Type[] m_NecroRegTypes = new[] { typeof( BatWing ), typeof( GraveDust ), typeof( DaemonBlood ), typeof( NoxCrystal ), typeof( PigIron ) @@ -194,7 +194,7 @@ namespace Server public static Type[] NecroRegTypes => m_NecroRegTypes; - private static Type[] m_PotionTypes = new Type[] + private static Type[] m_PotionTypes = new[] { typeof( AgilityPotion ), typeof( StrengthPotion ), typeof( RefreshPotion ), typeof( LesserCurePotion ), typeof( LesserHealPotion ), typeof( LesserPoisonPotion ) @@ -202,14 +202,14 @@ namespace Server public static Type[] PotionTypes => m_PotionTypes; - private static Type[] m_SEInstrumentTypes = new Type[] + private static Type[] m_SEInstrumentTypes = new[] { typeof( BambooFlute ) }; public static Type[] SEInstrumentTypes => m_SEInstrumentTypes; - private static Type[] m_InstrumentTypes = new Type[] + private static Type[] m_InstrumentTypes = new[] { typeof( Drums ), typeof( Harp ), typeof( LapHarp ), typeof( Lute ), typeof( Tambourine ), typeof( TambourineTassel ) @@ -217,7 +217,7 @@ namespace Server public static Type[] InstrumentTypes => m_InstrumentTypes; - private static Type[] m_StatueTypes = new Type[] + private static Type[] m_StatueTypes = new[] { typeof( StatueSouth ), typeof( StatueSouth2 ), typeof( StatueNorth ), typeof( StatueWest ), typeof( StatueEast ), typeof( StatueEast2 ), @@ -226,7 +226,7 @@ namespace Server public static Type[] StatueTypes => m_StatueTypes; - private static Type[] m_RegularScrollTypes = new Type[] + private static Type[] m_RegularScrollTypes = new[] { typeof( ReactiveArmorScroll ), typeof( ClumsyScroll ), typeof( CreateFoodScroll ), typeof( FeeblemindScroll ), typeof( HealScroll ), typeof( MagicArrowScroll ), typeof( NightSightScroll ), typeof( WeakenScroll ), @@ -246,7 +246,7 @@ namespace Server typeof( SummonDaemonScroll ), typeof( SummonEarthElementalScroll ), typeof( SummonFireElementalScroll ), typeof( SummonWaterElementalScroll ) }; - private static Type[] m_NecromancyScrollTypes = new Type[] + private static Type[] m_NecromancyScrollTypes = new[] { typeof( AnimateDeadScroll ), typeof( BloodOathScroll ), typeof( CorpseSkinScroll ), typeof( CurseWeaponScroll ), typeof( EvilOmenScroll ), typeof( HorrificBeastScroll ), typeof( LichFormScroll ), typeof( MindRotScroll ), @@ -254,7 +254,7 @@ namespace Server typeof( VampiricEmbraceScroll ), typeof( VengefulSpiritScroll ), typeof( WitherScroll ), typeof( WraithFormScroll ) }; - private static Type[] m_SENecromancyScrollTypes = new Type[] + private static Type[] m_SENecromancyScrollTypes = new[] { typeof( AnimateDeadScroll ), typeof( BloodOathScroll ), typeof( CorpseSkinScroll ), typeof( CurseWeaponScroll ), typeof( EvilOmenScroll ), typeof( HorrificBeastScroll ), typeof( LichFormScroll ), typeof( MindRotScroll ), @@ -266,7 +266,7 @@ namespace Server private static Type[] m_PaladinScrollTypes = new Type[0]; #region Mondain's Legacy - private static Type[] m_ArcanistScrollTypes = new Type[] + private static Type[] m_ArcanistScrollTypes = new[] { typeof( ArcaneCircleScroll ), typeof( GiftOfRenewalScroll ), typeof( ImmolatingWeaponScroll ), typeof( AttuneWeaponScroll ), typeof( ThunderstormScroll ), typeof( NatureFuryScroll ), /*typeof( SummonFeyScroll ), typeof( SummonFiendScroll ),*/ @@ -285,7 +285,7 @@ namespace Server #endregion - private static Type[] m_GrimmochJournalTypes = new Type[] + private static Type[] m_GrimmochJournalTypes = new[] { typeof( GrimmochJournal1 ), typeof( GrimmochJournal2 ), typeof( GrimmochJournal3 ), typeof( GrimmochJournal6 ), typeof( GrimmochJournal7 ), typeof( GrimmochJournal11 ), @@ -294,7 +294,7 @@ namespace Server public static Type[] GrimmochJournalTypes => m_GrimmochJournalTypes; - private static Type[] m_LysanderNotebookTypes = new Type[] + private static Type[] m_LysanderNotebookTypes = new[] { typeof( LysanderNotebook1 ), typeof( LysanderNotebook2 ), typeof( LysanderNotebook3 ), typeof( LysanderNotebook7 ), typeof( LysanderNotebook8 ), typeof( LysanderNotebook11 ) @@ -302,7 +302,7 @@ namespace Server public static Type[] LysanderNotebookTypes => m_LysanderNotebookTypes; - private static Type[] m_TavarasJournalTypes = new Type[] + private static Type[] m_TavarasJournalTypes = new[] { typeof( TavarasJournal1 ), typeof( TavarasJournal2 ), typeof( TavarasJournal3 ), typeof( TavarasJournal6 ), typeof( TavarasJournal7 ), typeof( TavarasJournal8 ), @@ -314,27 +314,27 @@ namespace Server public static Type[] TavarasJournalTypes => m_TavarasJournalTypes; - private static Type[] m_NewWandTypes = new Type[] + private static Type[] m_NewWandTypes = new[] { typeof( FireballWand ), typeof( LightningWand ), typeof( MagicArrowWand ), typeof( GreaterHealWand ), typeof( HarmWand ), typeof( HealWand ) }; public static Type[] NewWandTypes => m_NewWandTypes; - private static Type[] m_WandTypes = new Type[] + private static Type[] m_WandTypes = new[] { typeof( ClumsyWand ), typeof( FeebleWand ), typeof( ManaDrainWand ), typeof( WeaknessWand ) }; public static Type[] WandTypes => m_WandTypes; - private static Type[] m_OldWandTypes = new Type[] + private static Type[] m_OldWandTypes = new[] { typeof( IDWand ) }; public static Type[] OldWandTypes => m_OldWandTypes; - private static Type[] m_SEClothingTypes = new Type[] + private static Type[] m_SEClothingTypes = new[] { typeof( ClothNinjaJacket ), typeof( FemaleKimono ), typeof( Hakama ), typeof( HakamaShita ), typeof( JinBaori ), typeof( Kamishimo ), @@ -344,7 +344,7 @@ namespace Server public static Type[] SEClothingTypes => m_SEClothingTypes; - private static Type[] m_AosClothingTypes = new Type[] + private static Type[] m_AosClothingTypes = new[] { typeof( FurSarong ), typeof( FurCape ), typeof( FlowerGarland ), typeof( GildedDress ), typeof( FurBoots ), typeof( FormalShirt ), @@ -352,7 +352,7 @@ namespace Server public static Type[] AosClothingTypes => m_AosClothingTypes; - private static Type[] m_ClothingTypes = new Type[] + private static Type[] m_ClothingTypes = new[] { typeof( Cloak ), typeof( Bonnet ), typeof( Cap ), typeof( FeatheredHat ), @@ -369,21 +369,21 @@ namespace Server }; public static Type[] ClothingTypes => m_ClothingTypes; - private static Type[] m_SEHatTypes = new Type[] + private static Type[] m_SEHatTypes = new[] { typeof( ClothNinjaHood ), typeof( Kasa ) }; public static Type[] SEHatTypes => m_SEHatTypes; - private static Type[] m_AosHatTypes = new Type[] + private static Type[] m_AosHatTypes = new[] { typeof( FlowerGarland ), typeof( BearMask ), typeof( DeerMask ) //Are Bear& Deer mask inside the Pre-AoS loottables too? }; public static Type[] AosHatTypes => m_AosHatTypes; - private static Type[] m_HatTypes = new Type[] + private static Type[] m_HatTypes = new[] { typeof( SkullCap ), typeof( Bandana ), typeof( FloppyHat ), typeof( Cap ), typeof( WideBrimHat ), typeof( StrawHat ), @@ -393,7 +393,7 @@ namespace Server public static Type[] HatTypes => m_HatTypes; - private static Type[] m_LibraryBookTypes = new Type[] + private static Type[] m_LibraryBookTypes = new[] { typeof( GrammarOfOrcish ), typeof( CallToAnarchy ), typeof( ArmsAndWeaponsPrimer ), typeof( SongOfSamlethe ), typeof( TaleOfThreeTribes ), typeof( GuideToGuilds ), diff --git a/Scripts/Misc/LootPack.cs b/Scripts/Misc/LootPack.cs index 03ce3ecd8..d375fd8dc 100644 --- a/Scripts/Misc/LootPack.cs +++ b/Scripts/Misc/LootPack.cs @@ -92,38 +92,38 @@ namespace Server } } - public static readonly LootPackItem[] Gold = new LootPackItem[] + public static readonly LootPackItem[] Gold = new[] { new LootPackItem( typeof( Gold ), 1 ) }; - public static readonly LootPackItem[] Instruments = new LootPackItem[] + public static readonly LootPackItem[] Instruments = new[] { new LootPackItem( typeof( BaseInstrument ), 1 ) }; - public static readonly LootPackItem[] LowScrollItems = new LootPackItem[] + public static readonly LootPackItem[] LowScrollItems = new[] { new LootPackItem( typeof( ClumsyScroll ), 1 ) }; - public static readonly LootPackItem[] MedScrollItems = new LootPackItem[] + public static readonly LootPackItem[] MedScrollItems = new[] { new LootPackItem( typeof( ArchCureScroll ), 1 ) }; - public static readonly LootPackItem[] HighScrollItems = new LootPackItem[] + public static readonly LootPackItem[] HighScrollItems = new[] { new LootPackItem( typeof( SummonAirElementalScroll ), 1 ) }; - public static readonly LootPackItem[] GemItems = new LootPackItem[] + public static readonly LootPackItem[] GemItems = new[] { new LootPackItem( typeof( Amber ), 1 ) }; - public static readonly LootPackItem[] PotionItems = new LootPackItem[] + public static readonly LootPackItem[] PotionItems = new[] { new LootPackItem( typeof( AgilityPotion ), 1 ), new LootPackItem( typeof( StrengthPotion ), 1 ), @@ -134,7 +134,7 @@ namespace Server }; #region Old Magic Items - public static readonly LootPackItem[] OldMagicItems = new LootPackItem[] + public static readonly LootPackItem[] OldMagicItems = new[] { new LootPackItem( typeof( BaseJewel ), 1 ), new LootPackItem( typeof( BaseArmor ), 4 ), @@ -145,7 +145,7 @@ namespace Server #endregion #region AOS Magic Items - public static readonly LootPackItem[] AosMagicItemsPoor = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsPoor = new[] { new LootPackItem( typeof( BaseWeapon ), 3 ), new LootPackItem( typeof( BaseRanged ), 1 ), @@ -154,7 +154,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 2 ) }; - public static readonly LootPackItem[] AosMagicItemsMeagerType1 = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsMeagerType1 = new[] { new LootPackItem( typeof( BaseWeapon ), 56 ), new LootPackItem( typeof( BaseRanged ), 14 ), @@ -163,7 +163,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 42 ) }; - public static readonly LootPackItem[] AosMagicItemsMeagerType2 = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsMeagerType2 = new[] { new LootPackItem( typeof( BaseWeapon ), 28 ), new LootPackItem( typeof( BaseRanged ), 7 ), @@ -172,7 +172,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 21 ) }; - public static readonly LootPackItem[] AosMagicItemsAverageType1 = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsAverageType1 = new[] { new LootPackItem( typeof( BaseWeapon ), 90 ), new LootPackItem( typeof( BaseRanged ), 23 ), @@ -181,7 +181,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 68 ) }; - public static readonly LootPackItem[] AosMagicItemsAverageType2 = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsAverageType2 = new[] { new LootPackItem( typeof( BaseWeapon ), 54 ), new LootPackItem( typeof( BaseRanged ), 13 ), @@ -190,7 +190,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 40 ) }; - public static readonly LootPackItem[] AosMagicItemsRichType1 = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsRichType1 = new[] { new LootPackItem( typeof( BaseWeapon ), 211 ), new LootPackItem( typeof( BaseRanged ), 53 ), @@ -199,7 +199,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 158 ) }; - public static readonly LootPackItem[] AosMagicItemsRichType2 = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsRichType2 = new[] { new LootPackItem( typeof( BaseWeapon ), 170 ), new LootPackItem( typeof( BaseRanged ), 43 ), @@ -208,7 +208,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 128 ) }; - public static readonly LootPackItem[] AosMagicItemsFilthyRichType1 = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsFilthyRichType1 = new[] { new LootPackItem( typeof( BaseWeapon ), 219 ), new LootPackItem( typeof( BaseRanged ), 55 ), @@ -217,7 +217,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 164 ) }; - public static readonly LootPackItem[] AosMagicItemsFilthyRichType2 = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsFilthyRichType2 = new[] { new LootPackItem( typeof( BaseWeapon ), 239 ), new LootPackItem( typeof( BaseRanged ), 60 ), @@ -226,7 +226,7 @@ namespace Server new LootPackItem( typeof( BaseJewel ), 45 ) }; - public static readonly LootPackItem[] AosMagicItemsUltraRich = new LootPackItem[] + public static readonly LootPackItem[] AosMagicItemsUltraRich = new[] { new LootPackItem( typeof( BaseWeapon ), 276 ), new LootPackItem( typeof( BaseRanged ), 69 ), @@ -237,7 +237,7 @@ namespace Server #endregion #region ML definitions - public static readonly LootPack MlRich = new LootPack( new LootPackEntry[] + public static readonly LootPack MlRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "4d50+450" ), new LootPackEntry( false, AosMagicItemsRichType1, 100.00, 1, 3, 0, 75 ), @@ -248,14 +248,14 @@ namespace Server #endregion #region SE definitions - public static readonly LootPack SePoor = new LootPack( new LootPackEntry[] + public static readonly LootPack SePoor = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "2d10+20" ), new LootPackEntry( false, AosMagicItemsPoor, 1.00, 1, 5, 0, 100 ), new LootPackEntry( false, Instruments, 0.02, 1 ) } ); - public static readonly LootPack SeMeager = new LootPack( new LootPackEntry[] + public static readonly LootPack SeMeager = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "4d10+40" ), new LootPackEntry( false, AosMagicItemsMeagerType1, 20.40, 1, 2, 0, 50 ), @@ -263,7 +263,7 @@ namespace Server new LootPackEntry( false, Instruments, 0.10, 1 ) } ); - public static readonly LootPack SeAverage = new LootPack( new LootPackEntry[] + public static readonly LootPack SeAverage = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "8d10+100" ), new LootPackEntry( false, AosMagicItemsAverageType1, 32.80, 1, 3, 0, 50 ), @@ -272,7 +272,7 @@ namespace Server new LootPackEntry( false, Instruments, 0.40, 1 ) } ); - public static readonly LootPack SeRich = new LootPack( new LootPackEntry[] + public static readonly LootPack SeRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "15d10+225" ), new LootPackEntry( false, AosMagicItemsRichType1, 76.30, 1, 4, 0, 75 ), @@ -281,7 +281,7 @@ namespace Server new LootPackEntry( false, Instruments, 1.00, 1 ) } ); - public static readonly LootPack SeFilthyRich = new LootPack( new LootPackEntry[] + public static readonly LootPack SeFilthyRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "3d100+400" ), new LootPackEntry( false, AosMagicItemsFilthyRichType1, 79.50, 1, 5, 0, 100 ), @@ -290,7 +290,7 @@ namespace Server new LootPackEntry( false, Instruments, 2.00, 1 ) } ); - public static readonly LootPack SeUltraRich = new LootPack( new LootPackEntry[] + public static readonly LootPack SeUltraRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "6d100+600" ), new LootPackEntry( false, AosMagicItemsUltraRich, 100.00, 1, 5, 25, 100 ), @@ -302,7 +302,7 @@ namespace Server new LootPackEntry( false, Instruments, 2.00, 1 ) } ); - public static readonly LootPack SeSuperBoss = new LootPack( new LootPackEntry[] + public static readonly LootPack SeSuperBoss = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "10d100+800" ), new LootPackEntry( false, AosMagicItemsUltraRich, 100.00, 1, 5, 25, 100 ), @@ -320,14 +320,14 @@ namespace Server #endregion #region AOS definitions - public static readonly LootPack AosPoor = new LootPack( new LootPackEntry[] + public static readonly LootPack AosPoor = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "1d10+10" ), new LootPackEntry( false, AosMagicItemsPoor, 0.02, 1, 5, 0, 90 ), new LootPackEntry( false, Instruments, 0.02, 1 ) } ); - public static readonly LootPack AosMeager = new LootPack( new LootPackEntry[] + public static readonly LootPack AosMeager = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "3d10+20" ), new LootPackEntry( false, AosMagicItemsMeagerType1, 1.00, 1, 2, 0, 10 ), @@ -335,7 +335,7 @@ namespace Server new LootPackEntry( false, Instruments, 0.10, 1 ) } ); - public static readonly LootPack AosAverage = new LootPack( new LootPackEntry[] + public static readonly LootPack AosAverage = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "5d10+50" ), new LootPackEntry( false, AosMagicItemsAverageType1, 5.00, 1, 4, 0, 20 ), @@ -344,7 +344,7 @@ namespace Server new LootPackEntry( false, Instruments, 0.40, 1 ) } ); - public static readonly LootPack AosRich = new LootPack( new LootPackEntry[] + public static readonly LootPack AosRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "10d10+150" ), new LootPackEntry( false, AosMagicItemsRichType1, 20.00, 1, 4, 0, 40 ), @@ -353,7 +353,7 @@ namespace Server new LootPackEntry( false, Instruments, 1.00, 1 ) } ); - public static readonly LootPack AosFilthyRich = new LootPack( new LootPackEntry[] + public static readonly LootPack AosFilthyRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "2d100+200" ), new LootPackEntry( false, AosMagicItemsFilthyRichType1, 33.00, 1, 4, 0, 50 ), @@ -363,7 +363,7 @@ namespace Server new LootPackEntry( false, Instruments, 2.00, 1 ) } ); - public static readonly LootPack AosUltraRich = new LootPack( new LootPackEntry[] + public static readonly LootPack AosUltraRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "5d100+500" ), new LootPackEntry( false, AosMagicItemsUltraRich, 100.00, 1, 5, 25, 100 ), @@ -375,7 +375,7 @@ namespace Server new LootPackEntry( false, Instruments, 2.00, 1 ) } ); - public static readonly LootPack AosSuperBoss = new LootPack( new LootPackEntry[] + public static readonly LootPack AosSuperBoss = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "5d100+500" ), new LootPackEntry( false, AosMagicItemsUltraRich, 100.00, 1, 5, 25, 100 ), @@ -393,13 +393,13 @@ namespace Server #endregion #region Pre-AOS definitions - public static readonly LootPack OldPoor = new LootPack( new LootPackEntry[] + public static readonly LootPack OldPoor = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "1d25" ), new LootPackEntry( false, Instruments, 0.02, 1 ) } ); - public static readonly LootPack OldMeager = new LootPack( new LootPackEntry[] + public static readonly LootPack OldMeager = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "5d10+25" ), new LootPackEntry( false, Instruments, 0.10, 1 ), @@ -407,7 +407,7 @@ namespace Server new LootPackEntry( false, OldMagicItems, 0.20, 1, 1, 10, 70 ) } ); - public static readonly LootPack OldAverage = new LootPack( new LootPackEntry[] + public static readonly LootPack OldAverage = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "10d10+50" ), new LootPackEntry( false, Instruments, 0.40, 1 ), @@ -416,7 +416,7 @@ namespace Server new LootPackEntry( false, OldMagicItems, 0.50, 1, 1, 40, 100 ) } ); - public static readonly LootPack OldRich = new LootPack( new LootPackEntry[] + public static readonly LootPack OldRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "10d10+250" ), new LootPackEntry( false, Instruments, 1.00, 1 ), @@ -425,7 +425,7 @@ namespace Server new LootPackEntry( false, OldMagicItems, 1.00, 1, 1, 70, 100 ) } ); - public static readonly LootPack OldFilthyRich = new LootPack( new LootPackEntry[] + public static readonly LootPack OldFilthyRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "2d125+400" ), new LootPackEntry( false, Instruments, 2.00, 1 ), @@ -435,7 +435,7 @@ namespace Server new LootPackEntry( false, OldMagicItems, 5.00, 1, 1, 80, 100 ) } ); - public static readonly LootPack OldUltraRich = new LootPack( new LootPackEntry[] + public static readonly LootPack OldUltraRich = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "5d100+500" ), new LootPackEntry( false, Instruments, 2.00, 1 ), @@ -447,7 +447,7 @@ namespace Server new LootPackEntry( false, OldMagicItems, 100.00, 1, 1, 60, 100 ) } ); - public static readonly LootPack OldSuperBoss = new LootPack( new LootPackEntry[] + public static readonly LootPack OldSuperBoss = new LootPack( new[] { new LootPackEntry( true, Gold, 100.00, "5d100+500" ), new LootPackEntry( false, Instruments, 2.00, 1 ), @@ -475,27 +475,27 @@ namespace Server #endregion - public static readonly LootPack LowScrolls = new LootPack( new LootPackEntry[] + public static readonly LootPack LowScrolls = new LootPack( new[] { new LootPackEntry( false, LowScrollItems, 100.00, 1 ) } ); - public static readonly LootPack MedScrolls = new LootPack( new LootPackEntry[] + public static readonly LootPack MedScrolls = new LootPack( new[] { new LootPackEntry( false, MedScrollItems, 100.00, 1 ) } ); - public static readonly LootPack HighScrolls = new LootPack( new LootPackEntry[] + public static readonly LootPack HighScrolls = new LootPack( new[] { new LootPackEntry( false, HighScrollItems, 100.00, 1 ) } ); - public static readonly LootPack Gems = new LootPack( new LootPackEntry[] + public static readonly LootPack Gems = new LootPack( new[] { new LootPackEntry( false, GemItems, 100.00, 1 ) } ); - public static readonly LootPack Potions = new LootPack( new LootPackEntry[] + public static readonly LootPack Potions = new LootPack( new[] { new LootPackEntry( false, PotionItems, 100.00, 1 ) } ); @@ -806,26 +806,26 @@ namespace Server set => m_Chance = value; } - private static Type[] m_BlankTypes = new Type[]{ typeof( BlankScroll ) }; - private static Type[][] m_NecroTypes = new Type[][] - { - new Type[] // low + private static Type[] m_BlankTypes = new[]{ typeof( BlankScroll ) }; + private static Type[][] m_NecroTypes = new[] + { + new[] // low { typeof( AnimateDeadScroll ), typeof( BloodOathScroll ), typeof( CorpseSkinScroll ), typeof( CurseWeaponScroll ), typeof( EvilOmenScroll ), typeof( HorrificBeastScroll ), typeof( MindRotScroll ), typeof( PainSpikeScroll ), typeof( SummonFamiliarScroll ), typeof( WraithFormScroll ) }, - new Type[] // med + new[] // med { typeof( LichFormScroll ), typeof( PoisonStrikeScroll ), typeof( StrangleScroll ), typeof( WitherScroll ) }, ((Core.SE) ? - new Type[] // high + new[] // high { typeof( VengefulSpiritScroll ), typeof( VampiricEmbraceScroll ), typeof( ExorcismScroll ) } : - new Type[] // high + new[] // high { typeof( VengefulSpiritScroll ), typeof( VampiricEmbraceScroll ) }) diff --git a/Scripts/Misc/MondainsLegacy.cs b/Scripts/Misc/MondainsLegacy.cs index ef30e02b8..78409e2a0 100644 --- a/Scripts/Misc/MondainsLegacy.cs +++ b/Scripts/Misc/MondainsLegacy.cs @@ -8,7 +8,7 @@ namespace Server { public static Type[] Artifacts => m_Artifacts; - private static Type[] m_Artifacts = new Type[] + private static Type[] m_Artifacts = new[] { typeof( AegisOfGrace ), typeof( BladeDance ), typeof( BloodwoodSpirit ), typeof( Bonesmasher ), typeof( Boomstick ), typeof( BrightsightLenses ), typeof( FeyLeggings ), typeof( FleshRipper ), diff --git a/Scripts/Misc/NameVerification.cs b/Scripts/Misc/NameVerification.cs index 744b17016..80a8af6c5 100644 --- a/Scripts/Misc/NameVerification.cs +++ b/Scripts/Misc/NameVerification.cs @@ -4,7 +4,7 @@ namespace Server.Misc { public class NameVerification { - public static readonly char[] SpaceDashPeriodQuote = new char[] + public static readonly char[] SpaceDashPeriodQuote = new[] { ' ', '-', '.', '\'' }; @@ -113,7 +113,7 @@ namespace Server.Misc public static string[] StartDisallowed => m_StartDisallowed; public static string[] Disallowed => m_Disallowed; - private static string[] m_StartDisallowed = new string[] + private static string[] m_StartDisallowed = new[] { "seer", "counselor", @@ -123,7 +123,7 @@ namespace Server.Misc "lord" }; - private static string[] m_Disallowed = new string[] + private static string[] m_Disallowed = new[] { "jigaboo", "chigaboo", diff --git a/Scripts/Misc/ProfanityProtection.cs b/Scripts/Misc/ProfanityProtection.cs index ca7ad9f9f..d3ba42555 100644 --- a/Scripts/Misc/ProfanityProtection.cs +++ b/Scripts/Misc/ProfanityProtection.cs @@ -63,14 +63,14 @@ namespace Server.Misc public static string[] StartDisallowed => m_StartDisallowed; public static string[] Disallowed => m_Disallowed; - private static char[] m_Exceptions = new char[] + private static char[] m_Exceptions = new[] { ' ', '-', '.', '\'', '"', ',', '_', '+', '=', '~', '`', '!', '^', '*', '\\', '/', ';', ':', '<', '>', '[', ']', '{', '}', '?', '|', '(', ')', '%', '$', '&', '#', '@' }; private static string[] m_StartDisallowed = new string[]{}; - private static string[] m_Disallowed = new string[] + private static string[] m_Disallowed = new[] { "jigaboo", "chigaboo", diff --git a/Scripts/Misc/RaceDefinitions.cs b/Scripts/Misc/RaceDefinitions.cs index 9150e0b4a..48bc68532 100644 --- a/Scripts/Misc/RaceDefinitions.cs +++ b/Scripts/Misc/RaceDefinitions.cs @@ -123,7 +123,7 @@ namespace Server.Misc private class Elf : Race { - private static int[] m_SkinHues = new int[] + private static int[] m_SkinHues = new[] { 0x0BF, 0x24D, 0x24E, 0x24F, 0x353, 0x361, 0x367, 0x374, 0x375, 0x376, 0x381, 0x382, 0x383, 0x384, 0x385, 0x389, @@ -131,7 +131,7 @@ namespace Server.Misc 0x51D, 0x53F, 0x579, 0x76B, 0x76C, 0x76D, 0x835, 0x903 }; - private static int[] m_HairHues = new int[] + private static int[] m_HairHues = new[] { 0x034, 0x035, 0x036, 0x037, 0x038, 0x039, 0x058, 0x08E, 0x08F, 0x090, 0x091, 0x092, 0x101, 0x159, 0x15A, 0x15B, @@ -288,7 +288,7 @@ namespace Server.Misc } // Todo Finish body hues - private static readonly int[] m_BodyHues = new int[] + private static readonly int[] m_BodyHues = new[] { 0x86DB, 0x86DC, 0x86DD, 0x86DE, 0x86DF, 0x86E0, 0x86E1, 0x86E2, @@ -308,7 +308,7 @@ namespace Server.Misc return m_BodyHues[Utility.Random(m_BodyHues.Length)] | 0x8000; } - private static readonly int[] m_HornHues = new int[] + private static readonly int[] m_HornHues = new[] { 0x709, 0x70B, 0x70D, 0x70F, 0x711, 0x763, 0x765, 0x768, 0x76B, 0x6F3, 0x6F1, 0x6EF, diff --git a/Scripts/Misc/ResourceInfo.cs b/Scripts/Misc/ResourceInfo.cs index 07914269d..b84be19b1 100644 --- a/Scripts/Misc/ResourceInfo.cs +++ b/Scripts/Misc/ResourceInfo.cs @@ -468,7 +468,7 @@ namespace Server.Items public class CraftResources { - private static CraftResourceInfo[] m_MetalInfo = new CraftResourceInfo[] + private static CraftResourceInfo[] m_MetalInfo = new[] { new CraftResourceInfo( 0x000, 1053109, "Iron", CraftAttributeInfo.Blank, CraftResource.Iron, typeof( IronIngot ), typeof( IronOre ), typeof( Granite ) ), new CraftResourceInfo( 0x973, 1053108, "Dull Copper", CraftAttributeInfo.DullCopper, CraftResource.DullCopper, typeof( DullCopperIngot ), typeof( DullCopperOre ), typeof( DullCopperGranite ) ), @@ -481,7 +481,7 @@ namespace Server.Items new CraftResourceInfo( 0x8AB, 1053101, "Valorite", CraftAttributeInfo.Valorite, CraftResource.Valorite, typeof( ValoriteIngot ), typeof( ValoriteOre ), typeof( ValoriteGranite ) ), }; - private static CraftResourceInfo[] m_ScaleInfo = new CraftResourceInfo[] + private static CraftResourceInfo[] m_ScaleInfo = new[] { new CraftResourceInfo( 0x66D, 1053129, "Red Scales", CraftAttributeInfo.RedScales, CraftResource.RedScales, typeof( RedScales ) ), new CraftResourceInfo( 0x8A8, 1053130, "Yellow Scales", CraftAttributeInfo.YellowScales, CraftResource.YellowScales, typeof( YellowScales ) ), @@ -491,7 +491,7 @@ namespace Server.Items new CraftResourceInfo( 0x8B0, 1053134, "Blue Scales", CraftAttributeInfo.BlueScales, CraftResource.BlueScales, typeof( BlueScales ) ) }; - private static CraftResourceInfo[] m_LeatherInfo = new CraftResourceInfo[] + private static CraftResourceInfo[] m_LeatherInfo = new[] { new CraftResourceInfo( 0x000, 1049353, "Normal", CraftAttributeInfo.Blank, CraftResource.RegularLeather, typeof( Leather ), typeof( Hides ) ), new CraftResourceInfo( 0x283, 1049354, "Spined", CraftAttributeInfo.Spined, CraftResource.SpinedLeather, typeof( SpinedLeather ), typeof( SpinedHides ) ), @@ -499,7 +499,7 @@ namespace Server.Items new CraftResourceInfo( 0x1C1, 1049356, "Barbed", CraftAttributeInfo.Barbed, CraftResource.BarbedLeather, typeof( BarbedLeather ), typeof( BarbedHides ) ) }; - private static CraftResourceInfo[] m_AOSLeatherInfo = new CraftResourceInfo[] + private static CraftResourceInfo[] m_AOSLeatherInfo = new[] { new CraftResourceInfo( 0x000, 1049353, "Normal", CraftAttributeInfo.Blank, CraftResource.RegularLeather, typeof( Leather ), typeof( Hides ) ), new CraftResourceInfo( 0x8AC, 1049354, "Spined", CraftAttributeInfo.Spined, CraftResource.SpinedLeather, typeof( SpinedLeather ), typeof( SpinedHides ) ), @@ -507,7 +507,7 @@ namespace Server.Items new CraftResourceInfo( 0x851, 1049356, "Barbed", CraftAttributeInfo.Barbed, CraftResource.BarbedLeather, typeof( BarbedLeather ), typeof( BarbedHides ) ), }; - private static CraftResourceInfo[] m_WoodInfo = new CraftResourceInfo[] + private static CraftResourceInfo[] m_WoodInfo = new[] { new CraftResourceInfo( 0x000, 1011542, "Normal", CraftAttributeInfo.Blank, CraftResource.RegularWood, typeof( Log ), typeof( Board ) ), new CraftResourceInfo( 0x7DA, 1072533, "Oak", CraftAttributeInfo.OakWood, CraftResource.OakWood, typeof( OakLog ), typeof( OakBoard ) ), diff --git a/Scripts/Misc/SkillCheck.cs b/Scripts/Misc/SkillCheck.cs index 7a4ad72c8..62f9f146d 100644 --- a/Scripts/Misc/SkillCheck.cs +++ b/Scripts/Misc/SkillCheck.cs @@ -11,7 +11,7 @@ namespace Server.Misc public static TimeSpan AntiMacroExpire = TimeSpan.FromMinutes( 5.0 ); //How long do we remember targets/locations? public const int Allowance = 3; //How many times may we use the same location/target for gain private const int LocationSize = 5; //The size of eeach location, make this smaller so players dont have to move as far - private static bool[] UseAntiMacro = new bool[] + private static bool[] UseAntiMacro = new[] { // true if this skill uses the anti-macro code, false if it does not false,// Alchemy = 0, diff --git a/Scripts/Misc/SocketOptions.cs b/Scripts/Misc/SocketOptions.cs index 0b2562730..54984c45d 100644 --- a/Scripts/Misc/SocketOptions.cs +++ b/Scripts/Misc/SocketOptions.cs @@ -9,7 +9,7 @@ namespace Server private const bool NagleEnabled = false; // Should the Nagle algorithm be enabled? This may reduce performance private const int CoalesceBufferSize = 512; // MSS that the core will use when buffering packets - private static IPEndPoint[] m_ListenerEndPoints = new IPEndPoint[] { + private static IPEndPoint[] m_ListenerEndPoints = new[] { new IPEndPoint( IPAddress.Any, 2593 ), // Default: Listen on port 2593 on all IP addresses // Examples: diff --git a/Scripts/Misc/Titles.cs b/Scripts/Misc/Titles.cs index 057028dc5..ef815aaad 100644 --- a/Scripts/Misc/Titles.cs +++ b/Scripts/Misc/Titles.cs @@ -128,7 +128,7 @@ namespace Server.Misc } } - public static string[] HarrowerTitles = new string[] { "Spite", "Opponent", "Hunter", "Venom", "Executioner", "Annihilator", "Champion", "Assailant", "Purifier", "Nullifier" }; + public static string[] HarrowerTitles = new[] { "Spite", "Opponent", "Hunter", "Venom", "Executioner", "Annihilator", "Champion", "Assailant", "Purifier", "Nullifier" }; public static string ComputeTitle( Mobile beholder, Mobile beheld ) { @@ -264,7 +264,7 @@ namespace Server.Misc return highest; } - private static string[,] m_Levels = new string[,] + private static string[,] m_Levels = new[,] { { "Neophyte", "Neophyte", "Neophyte" }, { "Novice", "Novice", "Novice" }, @@ -300,9 +300,9 @@ namespace Server.Misc return (fp - 300) / 100; } - private static FameEntry[] m_FameEntries = new FameEntry[] + private static FameEntry[] m_FameEntries = new[] { - new FameEntry( 1249, new KarmaEntry[] + new FameEntry( 1249, new[] { new KarmaEntry( -10000, "The Outcast {0}" ), new KarmaEntry( -5000, "The Despicable {0}" ), @@ -316,7 +316,7 @@ namespace Server.Misc new KarmaEntry( 9999, "The Honest {0}" ), new KarmaEntry( 10000, "The Trustworthy {0}" ) } ), - new FameEntry( 2499, new KarmaEntry[] + new FameEntry( 2499, new[] { new KarmaEntry( -10000, "The Wretched {0}" ), new KarmaEntry( -5000, "The Dastardly {0}" ), @@ -330,7 +330,7 @@ namespace Server.Misc new KarmaEntry( 9999, "The Commendable {0}" ), new KarmaEntry( 10000, "The Estimable {0}" ) } ), - new FameEntry( 4999, new KarmaEntry[] + new FameEntry( 4999, new[] { new KarmaEntry( -10000, "The Nefarious {0}" ), new KarmaEntry( -5000, "The Wicked {0}" ), @@ -344,7 +344,7 @@ namespace Server.Misc new KarmaEntry( 9999, "The Famed {0}" ), new KarmaEntry( 10000, "The Great {0}" ) } ), - new FameEntry( 9999, new KarmaEntry[] + new FameEntry( 9999, new[] { new KarmaEntry( -10000, "The Dread {0}" ), new KarmaEntry( -5000, "The Evil {0}" ), @@ -358,7 +358,7 @@ namespace Server.Misc new KarmaEntry( 9999, "The Illustrious {0}" ), new KarmaEntry( 10000, "The Glorious {0}" ) } ), - new FameEntry( 10000, new KarmaEntry[] + new FameEntry( 10000, new[] { new KarmaEntry( -10000, "The Dread {1} {0}" ), new KarmaEntry( -5000, "The Evil {1} {0}" ), diff --git a/Scripts/Misc/ToggleItem.cs b/Scripts/Misc/ToggleItem.cs index 90fb69159..4bd532363 100644 --- a/Scripts/Misc/ToggleItem.cs +++ b/Scripts/Misc/ToggleItem.cs @@ -11,7 +11,7 @@ namespace Server.Items { AccessLevel = AccessLevel.GameMaster; Supports = CommandSupport.AllItems; - Commands = new string[]{ "Toggle" }; + Commands = new[]{ "Toggle" }; ObjectTypes = ObjectTypes.Items; Usage = "Toggle"; Description = "Toggles a targeted ToggleItem."; diff --git a/Scripts/Misc/VendorGenerator.cs b/Scripts/Misc/VendorGenerator.cs index 5372d64c5..9bc37fcbe 100644 --- a/Scripts/Misc/VendorGenerator.cs +++ b/Scripts/Misc/VendorGenerator.cs @@ -13,7 +13,7 @@ namespace Server CommandSystem.Register( "VendorGen", AccessLevel.Administrator, new CommandEventHandler( VendorGenerator.VendorGen_OnCommand ) ); } - private static Rectangle2D[] m_BritRegions = new Rectangle2D[] + private static Rectangle2D[] m_BritRegions = new[] { new Rectangle2D( new Point2D( 250, 750 ), new Point2D( 775, 1330 ) ), new Rectangle2D( new Point2D( 525, 2095 ), new Point2D( 925, 2430 ) ), @@ -33,7 +33,7 @@ namespace Server new Rectangle2D( new Point2D( 5120, 2300 ), new Point2D( 6143, 4095 ) ) }; - private static Rectangle2D[] m_IlshRegions = new Rectangle2D[] + private static Rectangle2D[] m_IlshRegions = new[] { new Rectangle2D( new Point2D( 0, 0 ), new Point2D( 288*8, 200*8 ) ) }; diff --git a/Scripts/Misc/Weather.cs b/Scripts/Misc/Weather.cs index 68c9f3656..8e6d6f2f5 100644 --- a/Scripts/Misc/Weather.cs +++ b/Scripts/Misc/Weather.cs @@ -12,7 +12,7 @@ namespace Server.Misc public static void Initialize() { - m_Facets = new Map[]{ Map.Felucca, Map.Trammel }; + m_Facets = new[]{ Map.Felucca, Map.Trammel }; /* Static weather: * @@ -74,7 +74,7 @@ namespace Server.Misc if ( !isValid ) continue; - Weather w = new Weather( m_Facets[i], new Rectangle2D[]{ area }, temperature, chanceOfPercipitation, chanceOfExtremeTemperature, TimeSpan.FromSeconds( 30.0 ) ); + Weather w = new Weather( m_Facets[i], new[]{ area }, temperature, chanceOfPercipitation, chanceOfExtremeTemperature, TimeSpan.FromSeconds( 30.0 ) ); w.m_Bounds = bounds; w.m_MoveSpeed = moveSpeed; diff --git a/Scripts/Misc/WelcomeTimer.cs b/Scripts/Misc/WelcomeTimer.cs index 34e1890cd..ee8c5334c 100644 --- a/Scripts/Misc/WelcomeTimer.cs +++ b/Scripts/Misc/WelcomeTimer.cs @@ -11,7 +11,7 @@ namespace Server.Misc private int m_State, m_Count; private static string[] m_Messages = ( TestCenter.Enabled ? - new string[] + new[] { "Welcome to this test shard. You are able to customize your character's stats and skills at anytime to anything you wish. To see the commands to do this just say 'help'.", "You will find a bank check worth 1,000,000 gold in your bank!", @@ -24,7 +24,7 @@ namespace Server.Misc "You will find 9000 gold pieces deposited into your bank box. Spend it as you see fit and enjoy yourself!", "A bag of PowerScrolls has been placed in your bank box." } : - new string[] + new[] { //Yes, this message is a pathetic message, It's suggested that you change it. "Welcome to this shard.", "Please enjoy your stay." diff --git a/Scripts/Misc/uoamVendors.cs b/Scripts/Misc/uoamVendors.cs index 7918e74a1..a3800100e 100644 --- a/Scripts/Misc/uoamVendors.cs +++ b/Scripts/Misc/uoamVendors.cs @@ -60,7 +60,7 @@ namespace Server if ( split.Length < 3 ) continue; - split = new string[]{ type, split[0], split[1], split[2] }; + split = new[]{ type, split[0], split[1], split[2] }; switch(split[0].ToLower()) { diff --git a/Scripts/Mobiles/AI/BaseAI.cs b/Scripts/Mobiles/AI/BaseAI.cs index 6f40cae8b..87dfc3ae9 100644 --- a/Scripts/Mobiles/AI/BaseAI.cs +++ b/Scripts/Mobiles/AI/BaseAI.cs @@ -295,7 +295,7 @@ namespace Server.Mobiles return (from.Alive && from.InRange(m_Mobile.Location, 3) && m_Mobile.IsHumanInTown()); } - private static SkillName[] m_KeywordTable = new SkillName[] + private static SkillName[] m_KeywordTable = new[] { SkillName.Parry, SkillName.Healing, diff --git a/Scripts/Mobiles/AI/HealerAI.cs b/Scripts/Mobiles/AI/HealerAI.cs index 7b59cf9b4..3de5f87d2 100644 --- a/Scripts/Mobiles/AI/HealerAI.cs +++ b/Scripts/Mobiles/AI/HealerAI.cs @@ -10,10 +10,10 @@ namespace Server.Mobiles private static NeedDelegate m_Cure = new NeedDelegate( NeedCure ); private static NeedDelegate m_GHeal = new NeedDelegate( NeedGHeal ); private static NeedDelegate m_LHeal = new NeedDelegate( NeedLHeal ); - private static NeedDelegate[] m_ACure = new NeedDelegate[] { m_Cure }; - private static NeedDelegate[] m_AGHeal = new NeedDelegate[] { m_GHeal }; - private static NeedDelegate[] m_ALHeal = new NeedDelegate[] { m_LHeal }; - private static NeedDelegate[] m_All = new NeedDelegate[] { m_Cure, m_GHeal, m_LHeal }; + private static NeedDelegate[] m_ACure = new[] { m_Cure }; + private static NeedDelegate[] m_AGHeal = new[] { m_GHeal }; + private static NeedDelegate[] m_ALHeal = new[] { m_LHeal }; + private static NeedDelegate[] m_All = new[] { m_Cure, m_GHeal, m_LHeal }; public HealerAI( BaseCreature m ) : base( m ) { diff --git a/Scripts/Mobiles/AI/MageAI.cs b/Scripts/Mobiles/AI/MageAI.cs index 80c986280..108aeb1f7 100644 --- a/Scripts/Mobiles/AI/MageAI.cs +++ b/Scripts/Mobiles/AI/MageAI.cs @@ -917,7 +917,7 @@ namespace Server.Mobiles return ( m is BaseCreature creature && creature.Summoned && m_Mobile.CanBeHarmful( creature, false ) && !creature.IsAnimatedDead ); } - private static int[] m_Offsets = new int[] + private static int[] m_Offsets = new[] { -1, -1, -1, 0, diff --git a/Scripts/Mobiles/AI/OppositionGroup.cs b/Scripts/Mobiles/AI/OppositionGroup.cs index 8ae174bd7..b9a5c146e 100644 --- a/Scripts/Mobiles/AI/OppositionGroup.cs +++ b/Scripts/Mobiles/AI/OppositionGroup.cs @@ -43,16 +43,16 @@ namespace Server return -1; } - private static OppositionGroup m_TerathansAndOphidians = new OppositionGroup( new Type[][] - { - new Type[] + private static OppositionGroup m_TerathansAndOphidians = new OppositionGroup( new[] + { + new[] { typeof( TerathanAvenger ), typeof( TerathanDrone ), typeof( TerathanMatriarch ), typeof( TerathanWarrior ) }, - new Type[] + new[] { typeof( OphidianArchmage ), typeof( OphidianKnight ), @@ -64,9 +64,9 @@ namespace Server public static OppositionGroup TerathansAndOphidians => m_TerathansAndOphidians; - private static OppositionGroup m_SavagesAndOrcs = new OppositionGroup( new Type[][] - { - new Type[] + private static OppositionGroup m_SavagesAndOrcs = new OppositionGroup( new[] + { + new[] { typeof( Orc ), typeof( OrcBomber ), @@ -76,7 +76,7 @@ namespace Server typeof( OrcishMage ), typeof( SpawnedOrcishLord ) }, - new Type[] + new[] { typeof( Savage ), typeof( SavageRider ), @@ -87,9 +87,9 @@ namespace Server public static OppositionGroup SavagesAndOrcs => m_SavagesAndOrcs; - private static OppositionGroup m_FeyAndUndead = new OppositionGroup( new Type[][] - { - new Type[] + private static OppositionGroup m_FeyAndUndead = new OppositionGroup( new[] + { + new[] { typeof( Centaur ), typeof( EtherealWarrior ), @@ -103,7 +103,7 @@ namespace Server typeof( MLDryad ), typeof( Satyr ) }, - new Type[] + new[] { typeof( AncientLich ), typeof( Bogle ), diff --git a/Scripts/Mobiles/AI/SpeedInfo.cs b/Scripts/Mobiles/AI/SpeedInfo.cs index f431e755f..c5bb8b66c 100644 --- a/Scripts/Mobiles/AI/SpeedInfo.cs +++ b/Scripts/Mobiles/AI/SpeedInfo.cs @@ -87,10 +87,10 @@ namespace Server private static Dictionary m_Table; - private static SpeedInfo[] m_Speeds = new SpeedInfo[] + private static SpeedInfo[] m_Speeds = new[] { /* Slow */ - new SpeedInfo( 0.3, 0.6, new Type[] + new SpeedInfo( 0.3, 0.6, new[] { typeof( AntLion ), typeof( ArcticOgreLord ), typeof( BogThing ), typeof( Bogle ), typeof( BoneKnight ), typeof( EarthElemental ), @@ -105,7 +105,7 @@ namespace Server typeof( Juggernaut ), typeof( Yamandon ), typeof( Serado ) } ), /* Fast */ - new SpeedInfo( 0.2, 0.4, new Type[] + new SpeedInfo( 0.2, 0.4, new[] { typeof( LordOaks ), typeof( Silvani ), typeof( AirElemental ), typeof( AncientWyrm ), typeof( Balron ), typeof( BladeSpirits ), @@ -131,7 +131,7 @@ namespace Server #endregion } ), /* Very Fast */ - new SpeedInfo( 0.175, 0.350, new Type[] + new SpeedInfo( 0.175, 0.350, new[] { typeof( Barracoon ), typeof( Mephitis ), typeof( Neira ), typeof( Rikktor ), typeof( Semidar ), typeof( EnergyVortex ), @@ -144,7 +144,7 @@ namespace Server typeof( FanDancer ), typeof( FactionDeathKnight ) } ), /* Medium */ - new SpeedInfo( 0.25, 0.5, new Type[] + new SpeedInfo( 0.25, 0.5, new[] { typeof( AcidElemental ), typeof( AgapiteElemental ), typeof( Alligator ), typeof( AncientLich ), typeof( Betrayer ), typeof( Bird ), diff --git a/Scripts/Mobiles/Animals/Mounts/Horse.cs b/Scripts/Mobiles/Animals/Mounts/Horse.cs index 53a2a2fb1..2ee230cf3 100644 --- a/Scripts/Mobiles/Animals/Mounts/Horse.cs +++ b/Scripts/Mobiles/Animals/Mounts/Horse.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class Horse : BaseMount { public override string CorpseName => "a horse corpse"; - private static int[] m_IDs = new int[] + private static int[] m_IDs = new[] { 0xC8, 0x3E9F, 0xE2, 0x3EA0, diff --git a/Scripts/Mobiles/BaseCreature.cs b/Scripts/Mobiles/BaseCreature.cs index 6ec9b9d1f..052174d8e 100644 --- a/Scripts/Mobiles/BaseCreature.cs +++ b/Scripts/Mobiles/BaseCreature.cs @@ -1107,7 +1107,7 @@ namespace Server.Mobiles return ( (double)chance / 1000 ); } - private static Type[] m_AnimateDeadTypes = new Type[] + private static Type[] m_AnimateDeadTypes = new[] { typeof( MoundOfMaggots ), typeof( HellSteed ), typeof( SkeletalMount ), typeof( WailingBanshee ), typeof( Wraith ), typeof( SkeletalDragon ), @@ -1810,12 +1810,12 @@ namespace Server.Mobiles writer.Write( m_HomeMap ); } - private static double[] m_StandardActiveSpeeds = new double[] + private static double[] m_StandardActiveSpeeds = new[] { 0.175, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4, 0.5, 0.6, 0.8 }; - private static double[] m_StandardPassiveSpeeds = new double[] + private static double[] m_StandardPassiveSpeeds = new[] { 0.350, 0.2, 0.4, 0.5, 0.6, 0.8, 1.0, 1.2, 1.6, 2.0 }; @@ -2100,22 +2100,22 @@ namespace Server.Mobiles public override bool ShouldCheckStatTimers => false; #region Food - private static Type[] m_Eggs = new Type[] + private static Type[] m_Eggs = new[] { typeof( FriedEggs ), typeof( Eggs ) }; - private static Type[] m_Fish = new Type[] + private static Type[] m_Fish = new[] { typeof( FishSteak ), typeof( RawFishSteak ) }; - private static Type[] m_GrainsAndHay = new Type[] + private static Type[] m_GrainsAndHay = new[] { typeof( BreadLoaf ), typeof( FrenchBread ), typeof( SheafOfHay ) }; - private static Type[] m_Meat = new Type[] + private static Type[] m_Meat = new[] { /* Cooked */ typeof( Bacon ), typeof( CookedBird ), typeof( Sausage ), @@ -2131,7 +2131,7 @@ namespace Server.Mobiles typeof( Torso ), typeof( RightArm ), typeof( RightLeg ) }; - private static Type[] m_FruitsAndVegies = new Type[] + private static Type[] m_FruitsAndVegies = new[] { typeof( HoneydewMelon ), typeof( YellowGourd ), typeof( GreenGourd ), typeof( Banana ), typeof( Bananas ), typeof( Lemon ), typeof( Lime ), @@ -2141,7 +2141,7 @@ namespace Server.Mobiles typeof( Onion ), typeof( Lettuce ), typeof( Pumpkin ) }; - private static Type[] m_Gold = new Type[] + private static Type[] m_Gold = new[] { // white wyrms eat gold.. typeof( Gold ) diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs index 734e91bed..3e01775f9 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs @@ -68,7 +68,7 @@ namespace Server.Mobiles { if ( from != null && !willKill && amount > 5 && from.Player && 5 > Utility.Random( 100 ) ) { - string[] toSay = new string[] + string[] toSay = new[] { "{0}!! You will have to do better than that!", "{0}!! Prepare to meet your doom!", diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs index f562ea51f..ffe340d1d 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs @@ -101,7 +101,7 @@ namespace Server.Mobiles { int[][] coord = { - new int[]{-4,-6}, new int[]{4,-6}, new int[]{0,-8}, new int[]{-5,5}, new int[]{5,5} + new[]{-4,-6}, new[]{4,-6}, new[]{0,-8}, new[]{-5,5}, new[]{5,5} }; for( int i=0; i<5; i++ ) diff --git a/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs b/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs index cd2672bd3..81a67610d 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs @@ -53,7 +53,7 @@ namespace Server.Mobiles Talk( ferret ); } - private static string[] m_Vocabulary = new string[] + private static string[] m_Vocabulary = new[] { "dook", "dook dook", diff --git a/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs b/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs index 0797c3080..1dbd512ad 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs @@ -13,7 +13,7 @@ namespace Server.Mobiles public override Type[] UniqueList => new [] { typeof( Subdue ) }; public override Type[] SharedList => new Type[] { }; - public override Type[] DecorativeList => new Type[] + public override Type[] DecorativeList => new[] { typeof(ArtifactLargeVase), typeof(ArtifactVase), diff --git a/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs b/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs index ffbf34d0e..93dc9ba36 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs @@ -9,11 +9,11 @@ namespace Server.Mobiles public override string CorpseName => "a corpse of Twaulo"; public override ChampionSkullType SkullType => ChampionSkullType.Pain; - public override Type[] UniqueList => new Type[] { typeof( Quell ) }; - public override Type[] SharedList => new Type[] { typeof( TheMostKnowledgePerson ), typeof( OblivionsNeedle ) }; - public override Type[] DecorativeList => new Type[] { typeof( Pier ), typeof( MonsterStatuette ) }; + public override Type[] UniqueList => new[] { typeof( Quell ) }; + public override Type[] SharedList => new[] { typeof( TheMostKnowledgePerson ), typeof( OblivionsNeedle ) }; + public override Type[] DecorativeList => new[] { typeof( Pier ), typeof( MonsterStatuette ) }; - public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.DreadHorn }; + public override MonsterStatuetteType[] StatueTypes => new[] { MonsterStatuetteType.DreadHorn }; public override string DefaultName => "Twaulo"; diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs index 56bacc26c..6c40da325 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs @@ -112,7 +112,7 @@ namespace Server.Mobiles public static Type[] Artifacts => m_Artifacts; - private static Type[] m_Artifacts = new Type[] + private static Type[] m_Artifacts = new[] { // Decorations typeof( CandelabraOfSouls ), diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs index f71a7bd01..fb78b5f21 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class OphidianArchmage : BaseCreature { public override string CorpseName => "an ophidian corpse"; - private static string[] m_Names = new string[] + private static string[] m_Names = new[] { "an ophidian justicar", "an ophidian zealot" diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs index 4308137b5..6dd6de571 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles public class OphidianMage : BaseCreature { public override string CorpseName => "an ophidian corpse"; - private static string[] m_Names = new string[] + private static string[] m_Names = new[] { "an ophidian apprentice mage", "an ophidian shaman" diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs index c75b8e511..8228f75de 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles public class OphidianKnight : BaseCreature { public override string CorpseName => "an ophidian corpse"; - private static string[] m_Names = new string[] + private static string[] m_Names = new[] { "an ophidian knight-errant", "an ophidian avenger" diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs index c395b2af6..4adb748df 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs @@ -3,7 +3,7 @@ namespace Server.Mobiles public class OphidianWarrior : BaseCreature { public override string CorpseName => "an ophidian corpse"; - private static string[] m_Names = new string[] + private static string[] m_Names = new[] { "an ophidian warrior", "an ophidian enforcer" diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index aba67f3d1..0149cdd2c 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -1501,7 +1501,7 @@ namespace Server.Mobiles public SkillName[] AnimalFormRestrictedSkills => m_AnimalFormRestrictedSkills; - private SkillName[] m_AnimalFormRestrictedSkills = new SkillName[] + private SkillName[] m_AnimalFormRestrictedSkills = new[] { SkillName.ArmsLore, SkillName.Begging, SkillName.Discordance, SkillName.Forensics, SkillName.Inscribe, SkillName.ItemID, SkillName.Meditation, SkillName.Peacemaking, @@ -4418,7 +4418,7 @@ namespace Server.Mobiles return false; } - private static Point3D[] m_TrammelDeathDestinations = new Point3D[] + private static Point3D[] m_TrammelDeathDestinations = new[] { new Point3D( 1481, 1612, 20 ), new Point3D( 2708, 2153, 0 ), @@ -4437,7 +4437,7 @@ namespace Server.Mobiles new Point3D( 3665, 2587, 0 ) }; - private static Point3D[] m_IlshenarDeathDestinations = new Point3D[] + private static Point3D[] m_IlshenarDeathDestinations = new[] { new Point3D( 1216, 468, -13 ), new Point3D( 723, 1367, -60 ), @@ -4450,13 +4450,13 @@ namespace Server.Mobiles new Point3D( 1722, 219, 96 ) }; - private static Point3D[] m_MalasDeathDestinations = new Point3D[] + private static Point3D[] m_MalasDeathDestinations = new[] { new Point3D( 2079, 1376, -70 ), new Point3D( 944, 519, -71 ) }; - private static Point3D[] m_TokunoDeathDestinations = new Point3D[] + private static Point3D[] m_TokunoDeathDestinations = new[] { new Point3D( 1166, 801, 27 ), new Point3D( 782, 1228, 25 ), diff --git a/Scripts/Mobiles/Special/Barracoon.cs b/Scripts/Mobiles/Special/Barracoon.cs index 1e31cb40e..4fd18b317 100644 --- a/Scripts/Mobiles/Special/Barracoon.cs +++ b/Scripts/Mobiles/Special/Barracoon.cs @@ -10,15 +10,15 @@ namespace Server.Mobiles { public override ChampionSkullType SkullType => ChampionSkullType.Greed; - public override Type[] UniqueList => new Type[] { typeof( FangOfRactus ) }; - public override Type[] SharedList => new Type[] { typeof( EmbroideredOakLeafCloak ), + public override Type[] UniqueList => new[] { typeof( FangOfRactus ) }; + public override Type[] SharedList => new[] { typeof( EmbroideredOakLeafCloak ), typeof( DjinnisRing ), typeof( DetectiveBoots ), typeof( GuantletsOfAnger ) }; - public override Type[] DecorativeList => new Type[] { typeof( SwampTile ), typeof( MonsterStatuette ) }; + public override Type[] DecorativeList => new[] { typeof( SwampTile ), typeof( MonsterStatuette ) }; - public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.Slime }; + public override MonsterStatuetteType[] StatueTypes => new[] { MonsterStatuetteType.Slime }; public override string DefaultName => "Barracoon"; diff --git a/Scripts/Mobiles/Special/Harrower.cs b/Scripts/Mobiles/Special/Harrower.cs index 89ac2f24c..c38ec4448 100644 --- a/Scripts/Mobiles/Special/Harrower.cs +++ b/Scripts/Mobiles/Special/Harrower.cs @@ -7,9 +7,9 @@ namespace Server.Mobiles { public class Harrower : BaseCreature { - public Type[] UniqueList => new Type[] { typeof( AcidProofRobe ) }; - public Type[] SharedList => new Type[] { typeof( TheRobeOfBritanniaAri ) }; - public Type[] DecorativeList => new Type[] { typeof( EvilIdolSkull ), typeof( SkullPole ) }; + public Type[] UniqueList => new[] { typeof( AcidProofRobe ) }; + public Type[] SharedList => new[] { typeof( TheRobeOfBritanniaAri ) }; + public Type[] DecorativeList => new[] { typeof( EvilIdolSkull ), typeof( SkullPole ) }; private bool m_TrueForm; private Item m_GateItem; @@ -28,7 +28,7 @@ namespace Server.Mobiles } } - private static SpawnEntry[] m_Entries = new SpawnEntry[] + private static SpawnEntry[] m_Entries = new[] { new SpawnEntry( new Point3D( 5242, 945, -40 ), new Point3D( 1176, 2638, 0 ) ), // Destard new SpawnEntry( new Point3D( 5225, 798, 0 ), new Point3D( 1176, 2638, 0 ) ), // Destard @@ -118,7 +118,7 @@ namespace Server.Mobiles public override bool Unprovokable => true; public override Poison PoisonImmune => Poison.Lethal; - private static readonly double[] m_Offsets = new double[] + private static readonly double[] m_Offsets = new[] { Math.Cos( 000.0 / 180.0 * Math.PI ), Math.Sin( 000.0 / 180.0 * Math.PI ), Math.Cos( 040.0 / 180.0 * Math.PI ), Math.Sin( 040.0 / 180.0 * Math.PI ), @@ -502,7 +502,7 @@ namespace Server.Mobiles { private Mobile m_Owner; - private static int[] m_Offsets = new int[] + private static int[] m_Offsets = new[] { -1, -1, -1, 0, diff --git a/Scripts/Mobiles/Special/LordOaks.cs b/Scripts/Mobiles/Special/LordOaks.cs index ad95a1e90..53defff7e 100644 --- a/Scripts/Mobiles/Special/LordOaks.cs +++ b/Scripts/Mobiles/Special/LordOaks.cs @@ -11,15 +11,15 @@ namespace Server.Mobiles public override ChampionSkullType SkullType => ChampionSkullType.Enlightenment; - public override Type[] UniqueList => new Type[] { typeof( OrcChieftainHelm ) }; - public override Type[] SharedList => new Type[] { typeof( RoyalGuardSurvivalKnife ), + public override Type[] UniqueList => new[] { typeof( OrcChieftainHelm ) }; + public override Type[] SharedList => new[] { typeof( RoyalGuardSurvivalKnife ), typeof( DjinnisRing ), typeof( LieutenantOfTheBritannianRoyalGuard ), typeof( SamaritanRobe ), typeof( DetectiveBoots ), typeof( TheMostKnowledgePerson ) }; - public override Type[] DecorativeList => new Type[] { typeof( WaterTile ), + public override Type[] DecorativeList => new[] { typeof( WaterTile ), typeof( WindSpirit ), typeof( Pier ), typeof( DirtPatch )}; diff --git a/Scripts/Mobiles/Special/Mephitis.cs b/Scripts/Mobiles/Special/Mephitis.cs index cf9d34904..7c3fa7f14 100644 --- a/Scripts/Mobiles/Special/Mephitis.cs +++ b/Scripts/Mobiles/Special/Mephitis.cs @@ -8,11 +8,11 @@ namespace Server.Mobiles { public override ChampionSkullType SkullType => ChampionSkullType.Venom; - public override Type[] UniqueList => new Type[] { typeof( Calm ) }; - public override Type[] SharedList => new Type[] { typeof(OblivionsNeedle), typeof(ANecromancerShroud), typeof(EmbroideredOakLeafCloak), typeof(TheMostKnowledgePerson) }; - public override Type[] DecorativeList => new Type[] { typeof( Web ), typeof( MonsterStatuette ) }; + public override Type[] UniqueList => new[] { typeof( Calm ) }; + public override Type[] SharedList => new[] { typeof(OblivionsNeedle), typeof(ANecromancerShroud), typeof(EmbroideredOakLeafCloak), typeof(TheMostKnowledgePerson) }; + public override Type[] DecorativeList => new[] { typeof( Web ), typeof( MonsterStatuette ) }; - public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.Spider }; + public override MonsterStatuetteType[] StatueTypes => new[] { MonsterStatuetteType.Spider }; public override string DefaultName => "Mephitis"; diff --git a/Scripts/Mobiles/Special/Neira.cs b/Scripts/Mobiles/Special/Neira.cs index 808ae83c7..3adae0eb6 100644 --- a/Scripts/Mobiles/Special/Neira.cs +++ b/Scripts/Mobiles/Special/Neira.cs @@ -8,12 +8,12 @@ namespace Server.Mobiles { public override ChampionSkullType SkullType => ChampionSkullType.Death; - public override Type[] UniqueList => new Type[] { typeof( ShroudOfDeciet ) }; - public override Type[] SharedList => new Type[] { typeof( ANecromancerShroud ), + public override Type[] UniqueList => new[] { typeof( ShroudOfDeciet ) }; + public override Type[] SharedList => new[] { typeof( ANecromancerShroud ), typeof( CaptainJohnsHat ) }; - public override Type[] DecorativeList => new Type[] { typeof( WallBlood ), typeof( TatteredAncientMummyWrapping ) }; + public override Type[] DecorativeList => new[] { typeof( WallBlood ), typeof( TatteredAncientMummyWrapping ) }; public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { }; diff --git a/Scripts/Mobiles/Special/Paragon.cs b/Scripts/Mobiles/Special/Paragon.cs index b9366c6ac..d296af2fe 100644 --- a/Scripts/Mobiles/Special/Paragon.cs +++ b/Scripts/Mobiles/Special/Paragon.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public static double ChestChance = .10; // Chance that a paragon will carry a paragon chest public static double ChocolateIngredientChance = .20; // Chance that a paragon will drop a chocolatiering ingredient - public static Map[] Maps = new Map[] // Maps that paragons will spawn on + public static Map[] Maps = new[] // Maps that paragons will spawn on { Map.Ilshenar }; @@ -42,7 +42,7 @@ namespace Server.Mobiles } } - public static Type[] Artifacts = new Type[] + public static Type[] Artifacts = new[] { typeof( GoldBricks ), typeof( PhillipsWoodenSteed ), typeof( AlchemistsBauble ), typeof( ArcticDeathDealer ), diff --git a/Scripts/Mobiles/Special/Rikktor.cs b/Scripts/Mobiles/Special/Rikktor.cs index 20cf9ff18..8db8bcba5 100644 --- a/Scripts/Mobiles/Special/Rikktor.cs +++ b/Scripts/Mobiles/Special/Rikktor.cs @@ -9,16 +9,16 @@ namespace Server.Mobiles { public override ChampionSkullType SkullType => ChampionSkullType.Power; - public override Type[] UniqueList => new Type[] { typeof( CrownOfTalKeesh ) }; - public override Type[] SharedList => new Type[] { typeof( TheMostKnowledgePerson ), + public override Type[] UniqueList => new[] { typeof( CrownOfTalKeesh ) }; + public override Type[] SharedList => new[] { typeof( TheMostKnowledgePerson ), typeof( BraveKnightOfTheBritannia ), typeof( LieutenantOfTheBritannianRoyalGuard ) }; - public override Type[] DecorativeList => new Type[] { typeof( LavaTile ), + public override Type[] DecorativeList => new[] { typeof( LavaTile ), typeof( MonsterStatuette ), typeof( MonsterStatuette ) }; - public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.OphidianArchMage, + public override MonsterStatuetteType[] StatueTypes => new[] { MonsterStatuetteType.OphidianArchMage, MonsterStatuetteType.OphidianWarrior }; public override string DefaultName => "Rikktor"; diff --git a/Scripts/Mobiles/Special/Semidar.cs b/Scripts/Mobiles/Special/Semidar.cs index 490cbd644..6f98bfc6c 100644 --- a/Scripts/Mobiles/Special/Semidar.cs +++ b/Scripts/Mobiles/Special/Semidar.cs @@ -9,9 +9,9 @@ namespace Server.Mobiles { public override ChampionSkullType SkullType => ChampionSkullType.Pain; - public override Type[] UniqueList => new Type[] { typeof( GladiatorsCollar ) }; - public override Type[] SharedList => new Type[] { typeof(RoyalGuardSurvivalKnife), typeof(ANecromancerShroud), typeof(LieutenantOfTheBritannianRoyalGuard) }; - public override Type[] DecorativeList => new Type[] { typeof( LavaTile ), typeof( DemonSkull ) }; + public override Type[] UniqueList => new[] { typeof( GladiatorsCollar ) }; + public override Type[] SharedList => new[] { typeof(RoyalGuardSurvivalKnife), typeof(ANecromancerShroud), typeof(LieutenantOfTheBritannianRoyalGuard) }; + public override Type[] DecorativeList => new[] { typeof( LavaTile ), typeof( DemonSkull ) }; public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { }; diff --git a/Scripts/Mobiles/Special/Serado.cs b/Scripts/Mobiles/Special/Serado.cs index f8069bcde..86eabfbc0 100644 --- a/Scripts/Mobiles/Special/Serado.cs +++ b/Scripts/Mobiles/Special/Serado.cs @@ -9,13 +9,13 @@ namespace Server.Mobiles { public override ChampionSkullType SkullType => ChampionSkullType.Power; - public override Type[] UniqueList => new Type[] { typeof( Pacify ) }; - public override Type[] SharedList => new Type[] { typeof( BraveKnightOfTheBritannia ), + public override Type[] UniqueList => new[] { typeof( Pacify ) }; + public override Type[] SharedList => new[] { typeof( BraveKnightOfTheBritannia ), typeof( DetectiveBoots ), typeof( EmbroideredOakLeafCloak ), typeof( LieutenantOfTheBritannianRoyalGuard ) }; - public override Type[] DecorativeList => new Type[] { typeof( Futon ), typeof( SwampTile ) }; + public override Type[] DecorativeList => new[] { typeof( Futon ), typeof( SwampTile ) }; public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { }; diff --git a/Scripts/Mobiles/Townfolk/BaseEscortable.cs b/Scripts/Mobiles/Townfolk/BaseEscortable.cs index 688f5fee2..b69ded8c9 100644 --- a/Scripts/Mobiles/Townfolk/BaseEscortable.cs +++ b/Scripts/Mobiles/Townfolk/BaseEscortable.cs @@ -111,7 +111,7 @@ namespace Server.Mobiles // Classic list // Used when: !MLQuestSystem.Enabled && !Core.ML - private static string[] m_TownNames = new string[] + private static string[] m_TownNames = new[] { "Cove", "Britain", "Jhelom", "Minoc", "Ocllo", "Trinsic", @@ -121,7 +121,7 @@ namespace Server.Mobiles // ML list, pre-ML quest system // Used when: !MLQuestSystem.Enabled && Core.ML - private static string[] m_MLTownNames = new string[] + private static string[] m_MLTownNames = new[] { "Cove", "Serpent's Hold", "Jhelom", "Nujel'm" diff --git a/Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs b/Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs index 9bfc08566..bba94e336 100644 --- a/Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs +++ b/Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs @@ -5,14 +5,14 @@ namespace Server.Mobiles { public class SeekerOfAdventure : BaseEscortable { - private static string[] m_Dungeons = new string[] + private static string[] m_Dungeons = new[] { "Covetous", "Deceit", "Despise", "Destard", "Hythloth", "Shame", // Old Code for Pre-ML shards. "Wrong" }; - private static string[] m_MLDestinations = new string[] + private static string[] m_MLDestinations = new[] { "Cove", "Serpent's Hold", "Jhelom", // ML List "Nujel'm" diff --git a/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs b/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs index c2f553fe1..fa9f316c0 100644 --- a/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs +++ b/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs @@ -24,23 +24,23 @@ namespace Server.Mobiles public static readonly object Vendor = new object(); public static readonly object Price = new object(); - private static HairstylistBuyInfo[] m_SellList = new HairstylistBuyInfo[] + private static HairstylistBuyInfo[] m_SellList = new[] { - new HairstylistBuyInfo( 1018357, 50000, false, typeof( ChangeHairstyleGump ), new object[] + new HairstylistBuyInfo( 1018357, 50000, false, typeof( ChangeHairstyleGump ), new[] { From, Vendor, Price, false, ChangeHairstyleEntry.HairEntries } ), - new HairstylistBuyInfo( 1018358, 50000, true, typeof( ChangeHairstyleGump ), new object[] + new HairstylistBuyInfo( 1018358, 50000, true, typeof( ChangeHairstyleGump ), new[] { From, Vendor, Price, true, ChangeHairstyleEntry.BeardEntries } ), - new HairstylistBuyInfo( 1018359, 50, false, typeof( ChangeHairHueGump ), new object[] + new HairstylistBuyInfo( 1018359, 50, false, typeof( ChangeHairHueGump ), new[] { From, Vendor, Price, true, true, ChangeHairHueEntry.RegularEntries } ), - new HairstylistBuyInfo( 1018360, 500000, false, typeof( ChangeHairHueGump ), new object[] + new HairstylistBuyInfo( 1018360, 500000, false, typeof( ChangeHairHueGump ), new[] { From, Vendor, Price, true, true, ChangeHairHueEntry.BrightEntries } ), - new HairstylistBuyInfo( 1018361, 30000, false, typeof( ChangeHairHueGump ), new object[] + new HairstylistBuyInfo( 1018361, 30000, false, typeof( ChangeHairHueGump ), new[] { From, Vendor, Price, true, false, ChangeHairHueEntry.RegularEntries } ), - new HairstylistBuyInfo( 1018362, 30000, true, typeof( ChangeHairHueGump ), new object[] + new HairstylistBuyInfo( 1018362, 30000, true, typeof( ChangeHairHueGump ), new[] { From, Vendor, Price, false, true, ChangeHairHueEntry.RegularEntries } ), - new HairstylistBuyInfo( 1018363, 500000, false, typeof( ChangeHairHueGump ), new object[] + new HairstylistBuyInfo( 1018363, 500000, false, typeof( ChangeHairHueGump ), new[] { From, Vendor, Price, true, false, ChangeHairHueEntry.BrightEntries } ), - new HairstylistBuyInfo( 1018364, 500000, true, typeof( ChangeHairHueGump ), new object[] + new HairstylistBuyInfo( 1018364, 500000, true, typeof( ChangeHairHueGump ), new[] { From, Vendor, Price, false, true, ChangeHairHueEntry.BrightEntries } ) }; @@ -252,7 +252,7 @@ namespace Server.Mobiles m_Hues[i] = start + i; } - public static readonly ChangeHairHueEntry[] BrightEntries = new ChangeHairHueEntry[] + public static readonly ChangeHairHueEntry[] BrightEntries = new[] { new ChangeHairHueEntry( "*****", 12, 10 ), new ChangeHairHueEntry( "*****", 32, 5 ), @@ -264,7 +264,7 @@ namespace Server.Mobiles new ChangeHairHueEntry( "*****", 1153, 2 ) }; - public static readonly ChangeHairHueEntry[] RegularEntries = new ChangeHairHueEntry[] + public static readonly ChangeHairHueEntry[] RegularEntries = new[] { new ChangeHairHueEntry( "*****", 1602, 26 ), new ChangeHairHueEntry( "*****", 1628, 27 ), @@ -406,7 +406,7 @@ namespace Server.Mobiles m_ItemID = itemID; } - public static readonly ChangeHairstyleEntry[] HairEntries = new ChangeHairstyleEntry[] + public static readonly ChangeHairstyleEntry[] HairEntries = new[] { new ChangeHairstyleEntry( 50700, 70 - 137, 20 - 60, 0x203B ), new ChangeHairstyleEntry( 60710, 193 - 260, 18 - 60, 0x2045 ), @@ -420,7 +420,7 @@ namespace Server.Mobiles new ChangeHairstyleEntry( 0, 0, 0, 0 ) }; - public static readonly ChangeHairstyleEntry[] BeardEntries = new ChangeHairstyleEntry[] + public static readonly ChangeHairstyleEntry[] BeardEntries = new[] { new ChangeHairstyleEntry( 50800, 120 - 187, 30 - 80, 0x2040 ), new ChangeHairstyleEntry( 50904, 243 - 310, 33 - 80, 0x204B ), diff --git a/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs b/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs index 20bf5b08c..6bd221baf 100644 --- a/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs +++ b/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs @@ -595,7 +595,7 @@ namespace Server.Mobiles } } - private static Entry[] m_Entries = new Entry[] + private static Entry[] m_Entries = new[] { new Entry( "Alchemist" ), new Entry( "Animal Tamer" ), diff --git a/Scripts/Mobiles/Vendors/PlayerVendor.cs b/Scripts/Mobiles/Vendors/PlayerVendor.cs index 0690b12cd..89edcfe51 100644 --- a/Scripts/Mobiles/Vendors/PlayerVendor.cs +++ b/Scripts/Mobiles/Vendors/PlayerVendor.cs @@ -1459,7 +1459,7 @@ namespace Server.Mobiles string firstWord; - int sep = text.IndexOfAny( new char[] { ' ', ',' } ); + int sep = text.IndexOfAny( new[] { ' ', ',' } ); if ( sep >= 0 ) firstWord = text.Substring( 0, sep ); else diff --git a/Scripts/Mobiles/Vendors/RentedVendor.cs b/Scripts/Mobiles/Vendors/RentedVendor.cs index e6f98d033..f87cc6998 100644 --- a/Scripts/Mobiles/Vendors/RentedVendor.cs +++ b/Scripts/Mobiles/Vendors/RentedVendor.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles { public class VendorRentalDuration { - public static readonly VendorRentalDuration[] Instances = new VendorRentalDuration[] + public static readonly VendorRentalDuration[] Instances = new[] { new VendorRentalDuration( TimeSpan.FromDays( 7.0 ), 1062361 ), // 1 Week new VendorRentalDuration( TimeSpan.FromDays( 14.0 ), 1062362 ), // 2 Weeks diff --git a/Scripts/Multis/Boats/BaseBoat.cs b/Scripts/Multis/Boats/BaseBoat.cs index 07d85ba43..849cd524a 100644 --- a/Scripts/Multis/Boats/BaseBoat.cs +++ b/Scripts/Multis/Boats/BaseBoat.cs @@ -14,9 +14,9 @@ namespace Server.Multis public abstract class BaseBoat : BaseMulti { - private static Rectangle2D[] m_BritWrap = new Rectangle2D[]{ new Rectangle2D( 16, 16, 5120 - 32, 4096 - 32 ), new Rectangle2D( 5136, 2320, 992, 1760 ) }; - private static Rectangle2D[] m_IlshWrap = new Rectangle2D[]{ new Rectangle2D( 16, 16, 2304 - 32, 1600 - 32 ) }; - private static Rectangle2D[] m_TokunoWrap = new Rectangle2D[] { new Rectangle2D( 16, 16, 1448 - 32, 1448 - 32 ) }; + private static Rectangle2D[] m_BritWrap = new[]{ new Rectangle2D( 16, 16, 5120 - 32, 4096 - 32 ), new Rectangle2D( 5136, 2320, 992, 1760 ) }; + private static Rectangle2D[] m_IlshWrap = new[]{ new Rectangle2D( 16, 16, 2304 - 32, 1600 - 32 ) }; + private static Rectangle2D[] m_TokunoWrap = new[] { new Rectangle2D( 16, 16, 1448 - 32, 1448 - 32 ) }; private static TimeSpan BoatDecayDelay = TimeSpan.FromDays( 9.0 ); diff --git a/Scripts/Multis/Boats/Strandedness.cs b/Scripts/Multis/Boats/Strandedness.cs index 30400f9c2..ce14f9efd 100644 --- a/Scripts/Multis/Boats/Strandedness.cs +++ b/Scripts/Multis/Boats/Strandedness.cs @@ -2,7 +2,7 @@ namespace Server.Misc { public class Strandedness { - private static Point2D[] m_Felucca = new Point2D[] + private static Point2D[] m_Felucca = new[] { new Point2D( 2528, 3568 ), new Point2D( 2376, 3400 ), new Point2D( 2528, 3896 ), new Point2D( 2168, 3904 ), new Point2D( 1136, 3416 ), new Point2D( 1432, 3648 ), @@ -39,7 +39,7 @@ namespace Server.Misc private static Point2D[] m_Trammel = m_Felucca; - private static Point2D[] m_Ilshenar = new Point2D[] + private static Point2D[] m_Ilshenar = new[] { new Point2D( 1252, 1180 ), new Point2D( 1562, 1090 ), new Point2D( 1444, 1016 ), new Point2D( 1324, 968 ), new Point2D( 1418, 806 ), new Point2D( 1722, 874 ), @@ -49,7 +49,7 @@ namespace Server.Misc new Point2D( 1358, 866 ), new Point2D( 510, 302 ), new Point2D( 510, 392 ) }; - private static Point2D[] m_Tokuno = new Point2D[] + private static Point2D[] m_Tokuno = new[] { //Makoto-Jima new Point2D( 837, 1351 ), new Point2D( 941, 1241 ), new Point2D( 959, 1185 ), diff --git a/Scripts/Multis/HouseFoundation.cs b/Scripts/Multis/HouseFoundation.cs index 6e4a1c729..fe7ff2683 100644 --- a/Scripts/Multis/HouseFoundation.cs +++ b/Scripts/Multis/HouseFoundation.cs @@ -574,7 +574,7 @@ namespace Server.Multis { MultiComponentList mcl = Components; - return new Rectangle2D[] { new Rectangle2D( mcl.Min.X, mcl.Min.Y, mcl.Width, mcl.Height ) }; + return new[] { new Rectangle2D( mcl.Min.X, mcl.Min.Y, mcl.Width, mcl.Height ) }; } } @@ -1138,7 +1138,7 @@ namespace Server.Multis /* Stair block IDs * (sorted ascending) */ - private static int[] m_BlockIDs = new int[] + private static int[] m_BlockIDs = new[] { 0x3EE, 0x709, 0x71E, 0x721, 0x738, 0x750, 0x76C, 0x788, @@ -1150,7 +1150,7 @@ namespace Server.Multis * (sorted ascending) * Use this for stairs in the proper N,W,S,E sequence */ - private static int[] m_StairSeqs = new int[] + private static int[] m_StairSeqs = new[] { 0x3EF, 0x70A, 0x722, 0x739, 0x751, 0x76D, 0x789, 0x7A4 @@ -1160,7 +1160,7 @@ namespace Server.Multis * Listed in order: north, west, south, east * Use this for stairs not in the proper sequence */ - private static int[] m_StairIDs = new int[] + private static int[] m_StairIDs = new[] { 0x71F, 0x736, 0x737, 0x749, 0x35D4, 0x35D3, 0x35D6, 0x35D5, diff --git a/Scripts/Multis/HousePlacement.cs b/Scripts/Multis/HousePlacement.cs index 57c804e61..543b6ab45 100644 --- a/Scripts/Multis/HousePlacement.cs +++ b/Scripts/Multis/HousePlacement.cs @@ -24,7 +24,7 @@ namespace Server.Multis private const int YardSize = 5; // Any land tile which matches one of these ID numbers is considered a road and cannot be placed over. - private static int[] m_RoadIDs = new int[] + private static int[] m_RoadIDs = new[] { 0x0071, 0x0078, 0x00E8, 0x00EB, diff --git a/Scripts/Multis/HousePlacementTool.cs b/Scripts/Multis/HousePlacementTool.cs index 20d027362..7813db543 100644 --- a/Scripts/Multis/HousePlacementTool.cs +++ b/Scripts/Multis/HousePlacementTool.cs @@ -642,7 +642,7 @@ namespace Server.Items } } - private static HousePlacementEntry[] m_ClassicHouses = new HousePlacementEntry[] + private static HousePlacementEntry[] m_ClassicHouses = new[] { new HousePlacementEntry( typeof( SmallOldHouse ), 1011303, 425, 212, 489, 244, 10, 37000, 0, 4, 0, 0x0064 ), new HousePlacementEntry( typeof( SmallOldHouse ), 1011304, 425, 212, 489, 244, 10, 37000, 0, 4, 0, 0x0066 ), @@ -669,7 +669,7 @@ namespace Server.Items public static HousePlacementEntry[] ClassicHouses => m_ClassicHouses; - private static HousePlacementEntry[] m_TwoStoryFoundations = new HousePlacementEntry[] + private static HousePlacementEntry[] m_TwoStoryFoundations = new[] { new HousePlacementEntry( typeof( HouseFoundation ), 1060241, 425, 212, 489, 244, 10, 30500, 0, 4, 0, 0x13EC ), // 7x7 2-Story Customizable House new HousePlacementEntry( typeof( HouseFoundation ), 1060242, 580, 290, 667, 333, 14, 34500, 0, 5, 0, 0x13ED ), // 7x8 2-Story Customizable House @@ -723,7 +723,7 @@ namespace Server.Items public static HousePlacementEntry[] TwoStoryFoundations => m_TwoStoryFoundations; - private static HousePlacementEntry[] m_ThreeStoryFoundations = new HousePlacementEntry[] + private static HousePlacementEntry[] m_ThreeStoryFoundations = new[] { new HousePlacementEntry( typeof( HouseFoundation ), 1060272, 1150, 575, 1323, 661, 24, 73500, 0, 8, 0, 0x140B ), // 9x14 3-Story Customizable House new HousePlacementEntry( typeof( HouseFoundation ), 1060284, 1200, 600, 1380, 690, 26, 81000, 0, 8, 0, 0x1417 ), // 10x14 3-Story Customizable House diff --git a/Scripts/Multis/Houses.cs b/Scripts/Multis/Houses.cs index 24f9c2f4e..1402ab3bc 100644 --- a/Scripts/Multis/Houses.cs +++ b/Scripts/Multis/Houses.cs @@ -5,7 +5,7 @@ namespace Server.Multis { public class SmallOldHouse : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7 ), new Rectangle2D( -1, 4, 3, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D(-3,-3,7,7 ), new Rectangle2D( -1, 4, 3, 1 ) }; public override Rectangle2D[] Area => AreaArray; public override Point3D BaseBanLocation => new Point3D( 2, 4, 0 ); @@ -56,7 +56,7 @@ namespace Server.Multis public class GuildHouse : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 14, 14 ), new Rectangle2D( -2, 7, 4, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -7, -7, 14, 14 ), new Rectangle2D( -2, 7, 4, 1 ) }; public override int DefaultPrice => 144500; @@ -100,7 +100,7 @@ namespace Server.Multis public class TwoStoryHouse : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, 0, 14, 7 ), new Rectangle2D( -7, -7, 9, 7 ), new Rectangle2D( -4, 7, 4, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -7, 0, 14, 7 ), new Rectangle2D( -7, -7, 9, 7 ), new Rectangle2D( -4, 7, 4, 1 ) }; public override Rectangle2D[] Area => AreaArray; public override Point3D BaseBanLocation => new Point3D( 2, 8, 0 ); @@ -148,7 +148,7 @@ namespace Server.Multis public class Tower : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 16, 14 ), new Rectangle2D( -1, 7, 4, 2 ), new Rectangle2D( -11, 0, 4, 7 ), new Rectangle2D( 9, 0, 4, 7 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -7, -7, 16, 14 ), new Rectangle2D( -1, 7, 4, 2 ), new Rectangle2D( -11, 0, 4, 7 ), new Rectangle2D( 9, 0, 4, 7 ) }; public override int DefaultPrice => 433200; @@ -192,7 +192,7 @@ namespace Server.Multis public class Keep : BaseHouse//warning: ODD shape! { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -11, -11, 7, 8 ), new Rectangle2D( -11, 5, 7, 8 ), new Rectangle2D( 6, -11, 7, 8 ), new Rectangle2D( 6, 5, 7, 8 ), new Rectangle2D( -9, -3, 5, 8 ), new Rectangle2D( 6, -3, 5, 8 ), new Rectangle2D( -4, -9, 10, 20 ), new Rectangle2D( -1, 11, 4, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -11, -11, 7, 8 ), new Rectangle2D( -11, 5, 7, 8 ), new Rectangle2D( 6, -11, 7, 8 ), new Rectangle2D( 6, 5, 7, 8 ), new Rectangle2D( -9, -3, 5, 8 ), new Rectangle2D( 6, -3, 5, 8 ), new Rectangle2D( -4, -9, 10, 20 ), new Rectangle2D( -1, 11, 4, 1 ) }; public override int DefaultPrice => 665200; @@ -229,7 +229,7 @@ namespace Server.Multis public class Castle : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -15, -15, 31, 31 ), new Rectangle2D( -1, 16, 4, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -15, -15, 31, 31 ), new Rectangle2D( -1, 16, 4, 1 ) }; public override int DefaultPrice => 1022800; @@ -270,7 +270,7 @@ namespace Server.Multis public class LargePatioHouse : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 15, 14 ), new Rectangle2D( -5, 7, 4, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -7, -7, 15, 14 ), new Rectangle2D( -5, 7, 4, 1 ) }; public override int DefaultPrice => 152800; @@ -314,7 +314,7 @@ namespace Server.Multis public class LargeMarbleHouse : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 15, 14 ), new Rectangle2D( -6, 7, 6, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -7, -7, 15, 14 ), new Rectangle2D( -6, 7, 6, 1 ) }; public override int DefaultPrice => 192000; @@ -354,7 +354,7 @@ namespace Server.Multis public class SmallTower : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -3, -3, 8, 7 ), new Rectangle2D( 2, 4, 3, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -3, -3, 8, 7 ), new Rectangle2D( 2, 4, 3, 1 ) }; public override int DefaultPrice => 88500; @@ -393,7 +393,7 @@ namespace Server.Multis public class LogCabin : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -3, -6, 8, 13 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -3, -6, 8, 13 ) }; public override int DefaultPrice => 97800; @@ -434,7 +434,7 @@ namespace Server.Multis public class SandStonePatio : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -5, -4, 12, 8 ), new Rectangle2D( -2, 4, 3, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -5, -4, 12, 8 ), new Rectangle2D( -2, 4, 3, 1 ) }; public override int DefaultPrice => 90900; @@ -474,7 +474,7 @@ namespace Server.Multis public class TwoStoryVilla : BaseHouse { - public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -5, -5, 11, 11 ), new Rectangle2D( 2, 6, 4, 1 ) }; + public static Rectangle2D[] AreaArray = new[]{ new Rectangle2D( -5, -5, 11, 11 ), new Rectangle2D( 2, 6, 4, 1 ) }; public override int DefaultPrice => 136500; @@ -523,8 +523,8 @@ namespace Server.Multis public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0]; - public static Rectangle2D[] AreaArray1 = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7), new Rectangle2D( -1, 4, 4, 1 ) }; - public static Rectangle2D[] AreaArray2 = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7), new Rectangle2D( -2, 4, 3, 1 ) }; + public static Rectangle2D[] AreaArray1 = new[]{ new Rectangle2D(-3,-3,7,7), new Rectangle2D( -1, 4, 4, 1 ) }; + public static Rectangle2D[] AreaArray2 = new[]{ new Rectangle2D(-3,-3,7,7), new Rectangle2D( -2, 4, 3, 1 ) }; public SmallShop( Mobile owner, int id ) : base( id, owner, 425, 3 ) { diff --git a/Scripts/Skills/Stealth.cs b/Scripts/Skills/Stealth.cs index 5311e27c0..7f052606e 100644 --- a/Scripts/Skills/Stealth.cs +++ b/Scripts/Skills/Stealth.cs @@ -14,7 +14,7 @@ namespace Server.SkillHandlers public static double HidingRequirement => ( Core.ML ? 30.0 : ( Core.SE ? 50.0 : 80.0 ) ); public static int[,] ArmorTable => m_ArmorTable; - private static int[,] m_ArmorTable = new int[,] + private static int[,] m_ArmorTable = new[,] { // Gorget Gloves Helmet Arms Legs Chest Shield /* Cloth */ { 0, 0, 0, 0, 0, 0, 0 }, diff --git a/Scripts/Skills/Tracking.cs b/Scripts/Skills/Tracking.cs index 51739cafd..840c56ebd 100644 --- a/Scripts/Skills/Tracking.cs +++ b/Scripts/Skills/Tracking.cs @@ -124,7 +124,7 @@ namespace Server.SkillHandlers private Mobile m_From; private int m_Range; - private static TrackTypeDelegate[] m_Delegates = new TrackTypeDelegate[] + private static TrackTypeDelegate[] m_Delegates = new[] { new TrackTypeDelegate( IsAnimal ), new TrackTypeDelegate( IsMonster ), diff --git a/Scripts/SpecialSystems/Engines/PreventInaccess.cs b/Scripts/SpecialSystems/Engines/PreventInaccess.cs index 4ece79c12..853ef08c9 100644 --- a/Scripts/SpecialSystems/Engines/PreventInaccess.cs +++ b/Scripts/SpecialSystems/Engines/PreventInaccess.cs @@ -19,7 +19,7 @@ namespace Server.Misc { public static readonly bool Enabled = true; - private static readonly LocationInfo[] m_Destinations = new LocationInfo[] + private static readonly LocationInfo[] m_Destinations = new[] { new LocationInfo( new Point3D( 5275, 1163, 0 ), Map.Felucca ), // Jail new LocationInfo( new Point3D( 5275, 1163, 0 ), Map.Trammel ), diff --git a/Scripts/Spells/Base/MagerySpell.cs b/Scripts/Spells/Base/MagerySpell.cs index 45ac05bd8..731da43bd 100644 --- a/Scripts/Spells/Base/MagerySpell.cs +++ b/Scripts/Spells/Base/MagerySpell.cs @@ -38,7 +38,7 @@ namespace Server.Spells max = avg + ChanceOffset; } - private static int[] m_ManaTable = new int[] { 4, 6, 9, 11, 14, 20, 40, 50 }; + private static int[] m_ManaTable = new[] { 4, 6, 9, 11, 14, 20, 40, 50 }; public override int GetMana() { diff --git a/Scripts/Spells/Base/SpellHelper.cs b/Scripts/Spells/Base/SpellHelper.cs index 517786189..72af63c5c 100644 --- a/Scripts/Spells/Base/SpellHelper.cs +++ b/Scripts/Spells/Base/SpellHelper.cs @@ -437,7 +437,7 @@ namespace Server.Spells return (noto != Notoriety.Innocent || from.Kills >= 5); } - private static int[] m_Offsets = new int[] + private static int[] m_Offsets = new[] { -1, -1, -1, 0, @@ -563,7 +563,7 @@ namespace Server.Spells private delegate bool TravelValidator( Map map, Point3D loc ); - private static TravelValidator[] m_Validators = new TravelValidator[] + private static TravelValidator[] m_Validators = new[] { new TravelValidator( IsFeluccaT2A ), new TravelValidator( IsKhaldun ), @@ -586,7 +586,7 @@ namespace Server.Spells new TravelValidator( IsMLDungeon ) }; - private static bool[,] m_Rules = new bool[,] + private static bool[,] m_Rules = new[,] { /*T2A(Fel), Khaldun, Ilshenar, Wind(Tram), Wind(Fel), Dungeons(Fel), Solen(Tram), Solen(Fel), CrystalCave(Malas), Gauntlet(Malas), Gauntlet(Ferry), SafeZone, Stronghold, ChampionSpawn, Dungeons(Tokuno[Malas]), LampRoom(Doom), GuardianRoom(Doom), Heartwood, MLDungeons */ /* Recall From */ { false, false, true, true, false, false, true, false, false, false, false, true, true, false, true, false, false, false, false }, diff --git a/Scripts/Spells/Base/SpellRegistry.cs b/Scripts/Spells/Base/SpellRegistry.cs index 16115b24b..f63964189 100644 --- a/Scripts/Spells/Base/SpellRegistry.cs +++ b/Scripts/Spells/Base/SpellRegistry.cs @@ -127,7 +127,7 @@ namespace Server.Spells return null; } - private static string[] m_CircleNames = new string[] + private static string[] m_CircleNames = new[] { "First", "Second", diff --git a/Scripts/Spells/Fifth/Incognito.cs b/Scripts/Spells/Fifth/Incognito.cs index c413afe9a..5bac70b3f 100644 --- a/Scripts/Spells/Fifth/Incognito.cs +++ b/Scripts/Spells/Fifth/Incognito.cs @@ -135,7 +135,7 @@ namespace Server.Spells.Fifth return ( t != null ); } - private static int[] m_HairIDs = new int[] + private static int[] m_HairIDs = new[] { 0x2044, 0x2045, 0x2046, 0x203C, 0x203B, 0x203D, @@ -143,7 +143,7 @@ namespace Server.Spells.Fifth 0x204A, 0x0000 }; - private static int[] m_BeardIDs = new int[] + private static int[] m_BeardIDs = new[] { 0x203E, 0x203F, 0x2040, 0x2041, 0x204B, 0x204C, diff --git a/Scripts/Spells/Fifth/SummonCreature.cs b/Scripts/Spells/Fifth/SummonCreature.cs index b77d349c3..dbcf6afd4 100644 --- a/Scripts/Spells/Fifth/SummonCreature.cs +++ b/Scripts/Spells/Fifth/SummonCreature.cs @@ -22,7 +22,7 @@ namespace Server.Spells.Fifth // NOTE: Creature list based on 1hr of summon/release on OSI. - private static Type[] m_Types = new Type[] + private static Type[] m_Types = new[] { typeof( PolarBear ), typeof( GrizzlyBear ), diff --git a/Scripts/Spells/First/CreateFood.cs b/Scripts/Spells/First/CreateFood.cs index 3711c7baa..8d1d5cfe8 100644 --- a/Scripts/Spells/First/CreateFood.cs +++ b/Scripts/Spells/First/CreateFood.cs @@ -20,7 +20,7 @@ namespace Server.Spells.First { } - private static FoodInfo[] m_Food = new FoodInfo[] + private static FoodInfo[] m_Food = new[] { new FoodInfo( typeof( Grapes ), "a grape bunch" ), new FoodInfo( typeof( Ham ), "a ham" ), diff --git a/Scripts/Spells/Necromancy/AnimateDeadSpell.cs b/Scripts/Spells/Necromancy/AnimateDeadSpell.cs index a99c7d6c5..283b56521 100644 --- a/Scripts/Spells/Necromancy/AnimateDeadSpell.cs +++ b/Scripts/Spells/Necromancy/AnimateDeadSpell.cs @@ -76,12 +76,12 @@ namespace Server.Spells.Necromancy return null; } - private static CreatureGroup[] m_Groups = new CreatureGroup[] + private static CreatureGroup[] m_Groups = new[] { // Undead group--empty new CreatureGroup( SlayerGroup.GetEntryByName( SlayerName.Silver ).Types, new SummonEntry[0] ), // Insects - new CreatureGroup( new Type[] + new CreatureGroup( new[] { typeof( DreadSpider ), typeof( FrostSpider ), typeof( GiantSpider ), typeof( GiantBlackWidow ), typeof( BlackSolenInfiltratorQueen ), typeof( BlackSolenInfiltratorWarrior ), @@ -92,22 +92,22 @@ namespace Server.Spells.Necromancy typeof( TerathanWarrior ) // TODO: Giant beetle? Ant lion? Ophidians? }, - new SummonEntry[] + new[] { new SummonEntry( 0, typeof( MoundOfMaggots ) ) } ), // Mounts - new CreatureGroup( new Type[] + new CreatureGroup( new[] { typeof( Horse ), typeof( Nightmare ), typeof( FireSteed ), typeof( Kirin ), typeof( Unicorn ) - }, new SummonEntry[] + }, new[] { new SummonEntry( 10000, typeof( HellSteed ) ), new SummonEntry( 0, typeof( SkeletalMount ) ) } ), // Elementals - new CreatureGroup( new Type[] + new CreatureGroup( new[] { typeof( BloodElemental ), typeof( EarthElemental ), typeof( SummonedEarthElemental ), typeof( AgapiteElemental ), typeof( BronzeElemental ), typeof( CopperElemental ), @@ -116,18 +116,18 @@ namespace Server.Spells.Necromancy typeof( FireElemental ), typeof( SummonedFireElemental ), typeof( SnowElemental ), typeof( AirElemental ), typeof( SummonedAirElemental ), typeof( WaterElemental ), typeof( SummonedAirElemental ), typeof ( AcidElemental ) - }, new SummonEntry[] + }, new[] { new SummonEntry( 5000, typeof( WailingBanshee ) ), new SummonEntry( 0, typeof( Wraith ) ) } ), // Dragons - new CreatureGroup( new Type[] + new CreatureGroup( new[] { typeof( AncientWyrm ), typeof( Dragon ), typeof( GreaterDragon ), typeof( SerpentineDragon ), typeof( ShadowWyrm ), typeof( SkeletalDragon ), typeof( WhiteWyrm ), typeof( Drake ), typeof( Wyvern ), typeof( LesserHiryu ), typeof( Hiryu ) - }, new SummonEntry[] + }, new[] { new SummonEntry( 18000, typeof( SkeletalDragon ) ), new SummonEntry( 10000, typeof( FleshGolem ) ), @@ -138,7 +138,7 @@ namespace Server.Spells.Necromancy new SummonEntry( 0, typeof( PatchworkSkeleton ) ) } ), // Default group - new CreatureGroup( new Type[0], new SummonEntry[] + new CreatureGroup( new Type[0], new[] { new SummonEntry( 18000, typeof( LichLord ) ), new SummonEntry( 10000, typeof( FleshGolem ) ), diff --git a/Scripts/Spells/Necromancy/Exorcism.cs b/Scripts/Spells/Necromancy/Exorcism.cs index 25abfab1d..725098e6c 100644 --- a/Scripts/Spells/Necromancy/Exorcism.cs +++ b/Scripts/Spells/Necromancy/Exorcism.cs @@ -164,7 +164,7 @@ namespace Server.Spells.Necromancy return closest; } - private static readonly Point3D[] m_BritanniaLocs = new Point3D[] + private static readonly Point3D[] m_BritanniaLocs = new[] { new Point3D( 1470, 843, 0 ), new Point3D( 1857, 865, -1 ), @@ -176,7 +176,7 @@ namespace Server.Spells.Necromancy new Point3D( 2500, 3931, 3 ), new Point3D( 4264, 3707, 0 ) }; - private static readonly Point3D[] m_IllshLocs = new Point3D[] + private static readonly Point3D[] m_IllshLocs = new[] { new Point3D( 1222, 474, -17 ), new Point3D( 718, 1360, -60), @@ -186,11 +186,11 @@ namespace Server.Spells.Necromancy new Point3D( 1538, 1341, -3 ), new Point3D( 528, 223, -38 ) }; - private static readonly Point3D[] m_MalasLocs = new Point3D[] + private static readonly Point3D[] m_MalasLocs = new[] { new Point3D ( 976, 517, -30 ) }; - private static readonly Point3D[] m_TokunoLocs = new Point3D[] + private static readonly Point3D[] m_TokunoLocs = new[] { new Point3D( 710, 1162, 25 ), new Point3D( 1034, 515, 18 ), diff --git a/Scripts/Spells/Necromancy/SummonFamiliar.cs b/Scripts/Spells/Necromancy/SummonFamiliar.cs index 1b281c7a4..f19e08268 100644 --- a/Scripts/Spells/Necromancy/SummonFamiliar.cs +++ b/Scripts/Spells/Necromancy/SummonFamiliar.cs @@ -54,7 +54,7 @@ namespace Server.Spells.Necromancy FinishSequence(); } - private static SummonFamiliarEntry[] m_Entries = new SummonFamiliarEntry[] + private static SummonFamiliarEntry[] m_Entries = new[] { new SummonFamiliarEntry( typeof( HordeMinionFamiliar ), 1060146, 30.0, 30.0 ), // Horde Minion new SummonFamiliarEntry( typeof( ShadowWispFamiliar ), 1060142, 50.0, 50.0 ), // Shadow Wisp diff --git a/Scripts/Spells/Ninjitsu/AnimalForm.cs b/Scripts/Spells/Ninjitsu/AnimalForm.cs index aafdd4182..5638d6146 100644 --- a/Scripts/Spells/Ninjitsu/AnimalForm.cs +++ b/Scripts/Spells/Ninjitsu/AnimalForm.cs @@ -366,7 +366,7 @@ namespace Server.Spells.Ninjitsu } } - private static AnimalFormEntry[] m_Entries = new AnimalFormEntry[] + private static AnimalFormEntry[] m_Entries = new[] { new AnimalFormEntry( typeof( Kirin ), 1029632, 9632, 0, 1070811, 100.0, 0x84, 0, 0, false, true, false ), new AnimalFormEntry( typeof( Unicorn ), 1018214, 9678, 0, 1070812, 100.0, 0x7A, 0, 0, false, true, false ), diff --git a/Server/Mobile.cs b/Server/Mobile.cs index b6aea8fa0..a29856844 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -345,7 +345,7 @@ namespace Server Locked } - [CustomEnum( new string[] { "North", "Right", "East", "Down", "South", "Left", "West", "Up" } )] + [CustomEnum( new[] { "North", "Right", "East", "Down", "South", "Left", "West", "Up" } )] [Flags] public enum Direction : byte { @@ -5705,7 +5705,7 @@ namespace Server } } - private static string[] m_AccessLevelNames = new string[] + private static string[] m_AccessLevelNames = new[] { "a player", "a counselor", @@ -8210,7 +8210,7 @@ namespace Server } } - private static int[] m_InvalidBodies = new int[] + private static int[] m_InvalidBodies = new[] { 32, 95, @@ -10418,7 +10418,7 @@ namespace Server } } - private static string[] m_GuildTypes = new string[] + private static string[] m_GuildTypes = new[] { "", " (Chaos)", diff --git a/Server/Network/PacketHandlers.cs b/Server/Network/PacketHandlers.cs index b9ba0ac80..0c88897bc 100644 --- a/Server/Network/PacketHandlers.cs +++ b/Server/Network/PacketHandlers.cs @@ -1572,7 +1572,7 @@ namespace Server.Network } } - public static int[] m_ValidAnimations = new int[] + public static int[] m_ValidAnimations = new[] { 6, 21, 32, 33, 100, 101, 102, diff --git a/Server/Notoriety.cs b/Server/Notoriety.cs index 9c7a52f97..d94178d49 100644 --- a/Server/Notoriety.cs +++ b/Server/Notoriety.cs @@ -40,7 +40,7 @@ namespace Server set => m_Handler = value; } - private static int[] m_Hues = new int[] + private static int[] m_Hues = new[] { 0x000, 0x059, diff --git a/Server/ObjectPropertyList.cs b/Server/ObjectPropertyList.cs index 6aa1cee84..da2f8efca 100644 --- a/Server/ObjectPropertyList.cs +++ b/Server/ObjectPropertyList.cs @@ -146,7 +146,7 @@ namespace Server } // Each of these are localized to "~1_NOTHING~" which allows the string argument to be used - private static int[] m_StringNumbers = new int[] + private static int[] m_StringNumbers = new[] { 1042971, 1070722 diff --git a/Server/Utility.cs b/Server/Utility.cs index d306dafcd..f1d59bc9d 100644 --- a/Server/Utility.cs +++ b/Server/Utility.cs @@ -1029,7 +1029,7 @@ namespace Server #endregion - private static SkillName[] m_AllSkills = new SkillName[] + private static SkillName[] m_AllSkills = new[] { SkillName.Alchemy, SkillName.Anatomy, @@ -1088,7 +1088,7 @@ namespace Server SkillName.Spellweaving }; - private static SkillName[] m_CombatSkills = new SkillName[] + private static SkillName[] m_CombatSkills = new[] { SkillName.Archery, SkillName.Swords, @@ -1097,7 +1097,7 @@ namespace Server SkillName.Wrestling }; - private static SkillName[] m_CraftSkills = new SkillName[] + private static SkillName[] m_CraftSkills = new[] { SkillName.Alchemy, SkillName.Blacksmith,