Upgrades code style - First batch (#22)

Scripts/Engines/MLQuests/Definitions/BaseEscort.cs

@@ -6,7 +6,7 @@ namespace Server.Engines.MLQuests.Definitions
 	// Base class for escorts providing the AwardHumanInNeed option
 	public class BaseEscort : MLQuest
 	{
-		public virtual bool AwardHumanInNeed { get { return true; } }
+		public virtual bool AwardHumanInNeed  => true;
 
 		public BaseEscort()
 		{

Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs

@@ -12,7 +12,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class VilePoison : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( ARockAndAHardPlace ); } }
+		public override Type NextQuest => typeof( ARockAndAHardPlace );
 
 		public VilePoison()
 		{
@@ -42,7 +42,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class ARockAndAHardPlace : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( SympatheticMagic ); } }
+		public override Type NextQuest => typeof( SympatheticMagic );
 		public override bool IsChainTriggered => true;
 
 		public ARockAndAHardPlace()
@@ -64,7 +64,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class SympatheticMagic : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( AlreadyDead ); } }
+		public override Type NextQuest => typeof( AlreadyDead );
 		public override bool IsChainTriggered => true;
 
 		public SympatheticMagic()
@@ -84,7 +84,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class AlreadyDead : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( Eureka ); } }
+		public override Type NextQuest => typeof( Eureka );
 		public override bool IsChainTriggered => true;
 
 		public AlreadyDead()
@@ -114,7 +114,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class Eureka : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( SubContracting ); } }
+		public override Type NextQuest => typeof( SubContracting );
 		public override bool IsChainTriggered => true;
 
 		public Eureka()

Scripts/Engines/MLQuests/Definitions/Britannia.cs

@@ -14,7 +14,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class Aemaeth1 : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( Aemaeth2 ); } }
+		public override Type NextQuest => typeof( Aemaeth2 );
 
 		public Aemaeth1()
 		{

Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs

@@ -14,7 +14,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class HonestBeggar : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( ReginasThanks ); } }
+		public override Type NextQuest => typeof( ReginasThanks );
 
 		public HonestBeggar()
 		{

Scripts/Engines/MLQuests/Definitions/LostItems.cs

@@ -35,9 +35,9 @@ namespace Server.Engines.MLQuests.Definitions
 	public class BatteredBucket : TransientQuestGiverItem
 	{
 		// Original label, doesn't fit the expiration message well
-		//public override int LabelNumber { get { return 1073129; } } // A battered bucket.
+		//public override int LabelNumber => 1073129; // A battered bucket.
 
-		public override string DefaultName { get { return "battered bucket"; } }
+		public override string DefaultName => "battered bucket";
 
 		[Constructible]
 		public BatteredBucket()

Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs

@@ -15,7 +15,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class MistakenIdentity : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( YouScratchMyBack ); } }
+		public override Type NextQuest => typeof( YouScratchMyBack );
 
 		public MistakenIdentity()
 		{
@@ -42,7 +42,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class YouScratchMyBack : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( FoolingAernya ); } }
+		public override Type NextQuest => typeof( FoolingAernya );
 		public override bool IsChainTriggered => true;
 
 		public YouScratchMyBack()
@@ -72,7 +72,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class FoolingAernya : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( NotQuiteThatEasy ); } }
+		public override Type NextQuest => typeof( NotQuiteThatEasy );
 		public override bool IsChainTriggered => true;
 
 		public FoolingAernya()
@@ -93,7 +93,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class NotQuiteThatEasy : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( ConvinceMe ); } }
+		public override Type NextQuest => typeof( ConvinceMe );
 		public override bool IsChainTriggered => true;
 
 		public NotQuiteThatEasy()
@@ -126,7 +126,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class ConvinceMe : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( TuitionReimbursement ); } }
+		public override Type NextQuest => typeof( TuitionReimbursement );
 		public override bool IsChainTriggered => true;
 
 		public ConvinceMe()

Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs

@@ -1383,7 +1383,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class GustarShroud : BaseOuterTorso
 	{
-		public override string DefaultName{ get{ return " "; } }
+		public override string DefaultName => " ";
 		[Constructible]
 		public GustarShroud()  : base( 0x2684 )
 		{

Scripts/Engines/MLQuests/Definitions/Sanctuary.cs

@@ -393,7 +393,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class MougGuurMustDie : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( LeaderOfThePack ); } }
+		public override Type NextQuest => typeof( LeaderOfThePack );
 
 		public MougGuurMustDie()
 		{
@@ -412,7 +412,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class LeaderOfThePack : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( SayonaraSzavetra ); } }
+		public override Type NextQuest => typeof( SayonaraSzavetra );
 		public override bool IsChainTriggered => true;
 
 		public LeaderOfThePack()
@@ -522,7 +522,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class Marauders : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( TheBrainsOfTheOperation ); } }
+		public override Type NextQuest => typeof( TheBrainsOfTheOperation );
 
 		public Marauders()
 		{
@@ -540,7 +540,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class TheBrainsOfTheOperation : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( TheBrawn ); } }
+		public override Type NextQuest => typeof( TheBrawn );
 		public override bool IsChainTriggered => true;
 
 		public TheBrainsOfTheOperation()
@@ -559,7 +559,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class TheBrawn : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( TheBiggerTheyAre ); } }
+		public override Type NextQuest => typeof( TheBiggerTheyAre );
 		public override bool IsChainTriggered => true;
 
 		public TheBrawn()

Scripts/Engines/MLQuests/Definitions/Spellweaving.cs

@@ -37,7 +37,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class Patience : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( NeedsOfTheManyHeartwood1 ); } }
+		public override Type NextQuest => typeof( NeedsOfTheManyHeartwood1 );
 
 		public Patience()
 		{
@@ -74,7 +74,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class NeedsOfTheManyHeartwood1 : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( NeedsOfTheManyHeartwood2 ); } }
+		public override Type NextQuest => typeof( NeedsOfTheManyHeartwood2 );
 		public override bool IsChainTriggered => true;
 
 		public NeedsOfTheManyHeartwood1()
@@ -94,7 +94,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class NeedsOfTheManyHeartwood2 : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( MakingAContributionHeartwood ); } }
+		public override Type NextQuest => typeof( MakingAContributionHeartwood );
 		public override bool IsChainTriggered => true;
 
 		public NeedsOfTheManyHeartwood2()
@@ -114,7 +114,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class MakingAContributionHeartwood : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( UnnaturalCreations ); } }
+		public override Type NextQuest => typeof( UnnaturalCreations );
 		public override bool IsChainTriggered => true;
 
 		public MakingAContributionHeartwood()
@@ -168,7 +168,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class Discipline : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( NeedsOfTheManySanctuary ); } }
+		public override Type NextQuest => typeof( NeedsOfTheManySanctuary );
 
 		public Discipline()
 		{
@@ -195,7 +195,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class NeedsOfTheManySanctuary : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( MakingAContributionSanctuary ); } }
+		public override Type NextQuest => typeof( MakingAContributionSanctuary );
 		public override bool IsChainTriggered => true;
 
 		public NeedsOfTheManySanctuary()
@@ -215,7 +215,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class MakingAContributionSanctuary : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( SuppliesForSanctuary ); } }
+		public override Type NextQuest => typeof( SuppliesForSanctuary );
 		public override bool IsChainTriggered => true;
 
 		public MakingAContributionSanctuary()
@@ -235,7 +235,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class SuppliesForSanctuary : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( TheHumanBlight ); } }
+		public override Type NextQuest => typeof( TheHumanBlight );
 		public override bool IsChainTriggered => true;
 
 		public SuppliesForSanctuary()
@@ -288,7 +288,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class FriendOfTheFey : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( TokenOfFriendship ); } }
+		public override Type NextQuest => typeof( TokenOfFriendship );
 
 		public FriendOfTheFey()
 		{
@@ -316,7 +316,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class TokenOfFriendship : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( Alliance ); } }
+		public override Type NextQuest => typeof( Alliance );
 		public override bool IsChainTriggered => true;
 
 		public TokenOfFriendship()
@@ -367,7 +367,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class FiendishFriends : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( CrackingTheWhipI ); } }
+		public override Type NextQuest => typeof( CrackingTheWhipI );
 
 		public FiendishFriends()
 		{
@@ -396,7 +396,7 @@ namespace Server.Engines.MLQuests.Definitions
 	// TODO: Verify
 	public class CrackingTheWhipI : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( CrackingTheWhipII ); } }
+		public override Type NextQuest => typeof( CrackingTheWhipII );
 		public override bool IsChainTriggered => true;
 
 		public CrackingTheWhipI()

Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs

@@ -14,7 +14,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class TheAncientWorld : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( TheGoldenHorn ); } }
+		public override Type NextQuest => typeof( TheGoldenHorn );
 
 		public TheAncientWorld()
 		{
@@ -41,7 +41,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class TheGoldenHorn : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( Bullish ); } }
+		public override Type NextQuest => typeof( Bullish );
 		public override bool IsChainTriggered => true;
 
 		public TheGoldenHorn()
@@ -61,7 +61,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class Bullish : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( LostCivilization ); } }
+		public override Type NextQuest => typeof( LostCivilization );
 		public override bool IsChainTriggered => true;
 
 		public Bullish()

Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs

@@ -14,7 +14,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class UnfadingMemoriesPartOne : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( UnfadingMemoriesPartTwo ); } }
+		public override Type NextQuest => typeof( UnfadingMemoriesPartTwo );
 
 		public UnfadingMemoriesPartOne()
 		{
@@ -42,7 +42,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class UnfadingMemoriesPartTwo : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( UnfadingMemoriesPartThree ); } }
+		public override Type NextQuest => typeof( UnfadingMemoriesPartThree );
 		public override bool IsChainTriggered => true;
 
 		public UnfadingMemoriesPartTwo()

Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs

@@ -12,7 +12,7 @@ namespace Server.Engines.MLQuests.Definitions
 {
 	public class WarriorsOfTheGemkeeper : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( CloseEnough ); } }
+		public override Type NextQuest => typeof( CloseEnough );
 
 		public WarriorsOfTheGemkeeper()
 		{
@@ -31,7 +31,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class CloseEnough : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( TakingTheBullByTheHorns ); } }
+		public override Type NextQuest => typeof( TakingTheBullByTheHorns );
 		public override bool IsChainTriggered => true;
 
 		public CloseEnough()
@@ -51,7 +51,7 @@ namespace Server.Engines.MLQuests.Definitions
 
 	public class TakingTheBullByTheHorns : MLQuest
 	{
-		public override Type NextQuest { get { return typeof( EmissaryToTheMinotaur ); } }
+		public override Type NextQuest => typeof( EmissaryToTheMinotaur );
 		public override bool IsChainTriggered => true;
 
 		public TakingTheBullByTheHorns()

Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs

@@ -36,9 +36,9 @@ namespace Server.Engines.MLQuests.Gumps
 			private ButtonGraphic m_Graphic;
 			private int m_ButtonID;
 
-			public ButtonPosition Position { get { return m_Position; } }
-			public ButtonGraphic Graphic { get { return m_Graphic; } }
-			public int ButtonID { get { return m_ButtonID; } }
+			public ButtonPosition Position  => m_Position;
+			public ButtonGraphic Graphic  => m_Graphic;
+			public int ButtonID  => m_ButtonID;
 
 			public ButtonInfo( ButtonPosition position, ButtonGraphic graphic, int buttonID )
 			{

Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs

@@ -117,9 +117,7 @@ namespace Server.Engines.MLQuests.Gumps
 
 		private static void CloseCurrent( NetState ns )
 		{
-			RaceChangeState state;
-
-			if ( m_Pending.TryGetValue( ns, out state ) )
+			if (m_Pending.TryGetValue( ns, out RaceChangeState state ))
 			{
 				state.m_Timeout.Stop();
 				m_Pending.Remove( ns );
@@ -190,9 +188,7 @@ namespace Server.Engines.MLQuests.Gumps
 
 		private static void RaceChangeReply( NetState state, PacketReader pvSrc )
 		{
-			RaceChangeState raceChangeState;
-
-			if ( !m_Pending.TryGetValue( state, out raceChangeState ) )
+			if (!m_Pending.TryGetValue( state, out RaceChangeState raceChangeState ))
 				return;
 
 			CloseCurrent( state );
@@ -289,7 +285,7 @@ namespace Server.Engines.MLQuests.Gumps
 
 	public class RaceChangeDeed : Item, IRaceChanger
 	{
-		public override string DefaultName { get { return "a race change deed"; } }
+		public override string DefaultName => "a race change deed";
 
 		[Constructible]
 		public RaceChangeDeed()

Scripts/Engines/MLQuests/Items/ABauble.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class ABauble : Item
 	{
-		public override int LabelNumber{ get{ return 1073137; } } // A bauble
+		public override int LabelNumber => 1073137; // A bauble
 
 		[Constructible]
 		public ABauble() : base( 0x23B )

Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class APersonalLetterAddressedToAhie : TransientItem
 	{
-		public override int LabelNumber{ get{ return 1073128; } } // A personal letter addressed to: Ahie
+		public override int LabelNumber => 1073128; // A personal letter addressed to: Ahie
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class AlchemistsBandage : Item
 	{
-		public override int LabelNumber{ get{ return 1075452; } } // Alchemist's Bandage
+		public override int LabelNumber => 1075452; // Alchemist's Bandage
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/AnOldNecklace.cs

@@ -5,10 +5,10 @@ namespace Server.Items
 {
 	public class AnOldNecklace : Necklace
 	{
-		public override int LabelNumber{ get{ return 1075525; } } // an old necklace
+		public override int LabelNumber => 1075525; // an old necklace
 
 		[Constructible]
-		public AnOldNecklace() : base()
+		public AnOldNecklace()
 		{
 			Hue = 0x222;
 		}

Scripts/Engines/MLQuests/Items/AnOldRing.cs

@@ -5,10 +5,10 @@ namespace Server.Items
 {
 	public class AnOldRing : GoldRing
 	{
-		public override int LabelNumber{ get{ return 1075524; } } // an old ring
+		public override int LabelNumber => 1075524; // an old ring
 
 		[Constructible]
-		public AnOldRing() : base()
+		public AnOldRing()
 		{
 			Hue = 0x222;
 		}

Scripts/Engines/MLQuests/Items/AndrosGratitude.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class AndrosGratitude : SmithHammer
 	{
-		public override int LabelNumber{ get{ return 1075345; } } // Andros Gratitude
+		public override int LabelNumber => 1075345; // Andros Gratitude
 
 		[Constructible]
 		public AndrosGratitude() : base( 10 )

Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class BasinOfCrystalClearWater : Item
 	{
-		public override int LabelNumber{ get{ return 1075303; } } // Basin of Crystal-Clear Water
+		public override int LabelNumber => 1075303; // Basin of Crystal-Clear Water
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/BedlamTeleporter.cs

@@ -8,7 +8,7 @@ namespace Server.Engines.MLQuests.Items
 {
 	public class BedlamTeleporter : Item
 	{
-		public override int LabelNumber { get { return 1074161; } } // Access to Bedlam by invitation only
+		public override int LabelNumber => 1074161; // Access to Bedlam by invitation only
 
 		private static readonly Point3D PointDest = new Point3D( 120, 1682, 0 );
 		private static readonly Map MapDest = Map.Malas;

Scripts/Engines/MLQuests/Items/Bleach.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class Bleach : PigmentsOfTokuno
 	{
-		public override int LabelNumber { get { return 1075375; } } // Bleach
+		public override int LabelNumber => 1075375; // Bleach
 
 		[Constructible]
 		public Bleach() : base( PigmentType.None )

Scripts/Engines/MLQuests/Items/BridesLetter.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class BridesLetter : Item
 	{
-		public override int LabelNumber{ get{ return 1075301; } } // Bride's Letter
+		public override int LabelNumber => 1075301; // Bride's Letter
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class CompletedTuitionReimbursementForm : Item
 	{
-		public override int LabelNumber{ get{ return 1074625; } } // Completed Tuition Reimbursement Form
+		public override int LabelNumber => 1074625; // Completed Tuition Reimbursement Form
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/CrateForSledge.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class CrateForSledge : TransientItem
 	{
-		public override int LabelNumber{ get{ return 1074520; } } // Crate for Sledge
+		public override int LabelNumber => 1074520; // Crate for Sledge
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class DreadSpiderSilk : Item
 	{
-		public override int LabelNumber{ get{ return 1075319; } } // Dread Spider Silk
+		public override int LabelNumber => 1075319; // Dread Spider Silk
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/FragmentOfAMap.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class FragmentOfAMap : Item
 	{
-		public override int LabelNumber{ get{ return 1074533; } } // Fragment of a Map
+		public override int LabelNumber => 1074533; // Fragment of a Map
 
 		[Constructible]
 		public FragmentOfAMap() : base( 0x14ED )

Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class FragmentOfAMapDelivery : Item
 	{
-		public override int LabelNumber{ get{ return 1074533; } } // Fragment of a Map
+		public override int LabelNumber => 1074533; // Fragment of a Map
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/FriendOfTheLibraryToken.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class FriendOfTheLibraryToken : Item
 	{
-		public override int LabelNumber{ get{ return 1073136; } } // Friend of the Library Token (allows donations to be made)
+		public override int LabelNumber => 1073136; // Friend of the Library Token (allows donations to be made)
 
 		[Constructible]
 		public FriendOfTheLibraryToken() : base( 0x2F58 )

Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class FriendsOfTheLibraryApplication : Item
 	{
-		public override int LabelNumber{ get{ return 1073131; } } // Friends of the Library Application
+		public override int LabelNumber => 1073131; // Friends of the Library Application
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/GamanHorns.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class GamanHorns : Item
 	{
-		public override int LabelNumber{ get{ return 1074557; } } // Gaman Horns
+		public override int LabelNumber => 1074557; // Gaman Horns
 
 		[Constructible]
 		public GamanHorns() : this( 1 )

Scripts/Engines/MLQuests/Items/GiftForArielle.cs

@@ -5,8 +5,8 @@ namespace Server.Items
 {
 	public class GiftForArielle : BaseContainer
 	{
-		public override int LabelNumber{ get{ return 1074356; } } // gift for arielle
-		public override int DefaultGumpID { get { return 0x41; } }
+		public override int LabelNumber => 1074356; // gift for arielle
+		public override int DefaultGumpID => 0x41;
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/KirinBrains.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class KirinBrains : Item
 	{
-		public override int LabelNumber{ get{ return 1074612; } } // Ki-Rin Brains
+		public override int LabelNumber => 1074612; // Ki-Rin Brains
 
 		[Constructible]
 		public KirinBrains() : base( 0x1CF0 )

Scripts/Engines/MLQuests/Items/MiniatureMushroom.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class MiniatureMushroom : Food
 	{
-		public override int LabelNumber{ get{ return 1073138; } } // Miniature mushroom
+		public override int LabelNumber => 1073138; // Miniature mushroom
 
 		[Constructible]
 		public MiniatureMushroom() : base( 0xD16 )

Scripts/Engines/MLQuests/Items/MirrorOfPurification.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class MirrorOfPurification : Item
 	{
-		public override int LabelNumber{ get{ return 1075304; } } // Mirror of Purification
+		public override int LabelNumber => 1075304; // Mirror of Purification
 
 		[Constructible]
 		public MirrorOfPurification() : base( 0x1008 )

Scripts/Engines/MLQuests/Items/NotarizedApplication.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class NotarizedApplication : Item
 	{
-		public override int LabelNumber{ get{ return 1073135; } } // Notarized Application
+		public override int LabelNumber => 1073135; // Notarized Application
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class OfficialSealingWax : Item
 	{
-		public override int LabelNumber{ get{ return 1072744; } } // Official Sealing Wax
+		public override int LabelNumber => 1072744; // Official Sealing Wax
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/PeppercornFishsteak.cs

@@ -5,10 +5,10 @@ namespace Server.Items
 {
 	public class PeppercornFishsteak : FishSteak
 	{
-		public override int LabelNumber{ get{ return 1075557; } } // peppercorn fishsteak
+		public override int LabelNumber => 1075557; // peppercorn fishsteak
 
 		[Constructible]
-		public PeppercornFishsteak() : base()
+		public PeppercornFishsteak()
 		{
 			Hue = 0x222;
 		}

Scripts/Engines/MLQuests/Items/PixieLeg.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class PixieLeg : ChickenLeg
 	{
-		public override int LabelNumber{ get{ return 1074613; } } // Pixie Leg
+		public override int LabelNumber => 1074613; // Pixie Leg
 
 		[Constructible]
 		public PixieLeg() : this( 1 )

Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class PortraitOfTheBride : Item
 	{
-		public override int LabelNumber{ get{ return 1075300; } } // Portrait of the Bride
+		public override int LabelNumber => 1075300; // Portrait of the Bride
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/PrismaticAmber.cs

@@ -5,10 +5,10 @@ namespace Server.Items
 {
 	public class PrismaticAmber : Amber
 	{
-		public override int LabelNumber{ get{ return 1075299; } } // Prismatic Amber
+		public override int LabelNumber => 1075299; // Prismatic Amber
 
 		[Constructible]
-		public PrismaticAmber() : base()
+		public PrismaticAmber()
 		{
 		}
 

Scripts/Engines/MLQuests/Items/PrismaticCrystal.cs

@@ -9,7 +9,7 @@ namespace Server.Items
 {
 	public class PrismaticCrystal : Item
 	{
-		public override int LabelNumber{ get{ return 1074269; } } // prismatic crystal
+		public override int LabelNumber => 1074269; // prismatic crystal
 
 		[Constructible]
 		public PrismaticCrystal() : base( 0x2DA )

Scripts/Engines/MLQuests/Items/ReginasLetter.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class ReginasLetter : Item
 	{
-		public override int LabelNumber{ get{ return 1075306; } } // Regina's Letter
+		public override int LabelNumber => 1075306; // Regina's Letter
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/ReginasRing.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class ReginasRing : SilverRing
 	{
-		public override int LabelNumber{ get{ return 1075305; } } // Regina's Ring
+		public override int LabelNumber => 1075305; // Regina's Ring
 
 		public override bool Nontransferable => true;
 
@@ -16,7 +16,7 @@ namespace Server.Items
 		}
 
 		[Constructible]
-		public ReginasRing() : base()
+		public ReginasRing()
 		{
 			LootType = LootType.Blessed;
 		}

Scripts/Engines/MLQuests/Items/SapOfSosaria.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class SapOfSosaria : Item
 	{
-		public override int LabelNumber{ get{ return 1074178; } } // Sap of Sosaria
+		public override int LabelNumber => 1074178; // Sap of Sosaria
 
 		[Constructible]
 		public SapOfSosaria() : this( 1 )

Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs

@@ -5,8 +5,8 @@ namespace Server.Items
 {
 	public class SealedNotesForJamal : Item
 	{
-		public override int LabelNumber{ get{ return 1074998; } } // Sealed Notes For Jamal
-		public override double DefaultWeight{ get{ return 1.0; } }
+		public override int LabelNumber => 1074998; // Sealed Notes For Jamal
+		public override double DefaultWeight => 1.0;
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class SealingWaxOrderAddressedToPetrus : Item
 	{
-		public override int LabelNumber{ get{ return 1073132; } } // Sealing Wax Order addressed to Petrus
+		public override int LabelNumber => 1073132; // Sealing Wax Order addressed to Petrus
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class SignedTuitionReimbursementForm : Item
 	{
-		public override int LabelNumber{ get{ return 1074614; } } // Signed Tuition Reimbursement Form
+		public override int LabelNumber => 1074614; // Signed Tuition Reimbursement Form
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/SpecialTreatForDrithen.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class SpecialTreatForDrithen : Item
 	{
-		public override int LabelNumber{ get{ return 1074517; } } // Special Treat for Drithen
+		public override int LabelNumber => 1074517; // Special Treat for Drithen
 
 		[Constructible]
 		public SpecialTreatForDrithen() : base( 0x21B )

Scripts/Engines/MLQuests/Items/SpeckledPoisonSac.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class SpeckledPoisonSac : TransientItem
 	{
-		public override int LabelNumber{ get{ return 1073133; } } // Speckled Poison Sac
+		public override int LabelNumber => 1073133; // Speckled Poison Sac
 
 		[Constructible]
 		public SpeckledPoisonSac() : base( 0x23A, TimeSpan.FromHours( 1 ) )

Scripts/Engines/MLQuests/Items/SpiritBottle.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class SpiritBottle : Item
 	{
-		public override int LabelNumber{ get{ return 1075283; } } // Spirit bottle
+		public override int LabelNumber => 1075283; // Spirit bottle
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/StoutWhip.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class StoutWhip : Item
 	{
-		public override int LabelNumber{ get{ return 1074812; } } // Stout Whip
+		public override int LabelNumber => 1074812; // Stout Whip
 
 		[Constructible]
 		public StoutWhip() : base( 0x166F )

Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class TaintedTreeSample : Item // On OSI the base class is Kindling, and it's ignitable...
 	{
-		public override int LabelNumber{ get{ return 1074997; } } // Tainted Tree Sample
+		public override int LabelNumber => 1074997; // Tainted Tree Sample
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/TransparentHeart.cs

@@ -5,10 +5,10 @@ namespace Server.Items
 {
 	public class TransparentHeart : GoldEarrings
 	{
-		public override int LabelNumber{ get{ return 1075400; } } // Transparent Heart
+		public override int LabelNumber => 1075400; // Transparent Heart
 
 		[Constructible]
-		public TransparentHeart() : base()
+		public TransparentHeart()
 		{
 			LootType = LootType.Blessed;
 			Hue = 0x4AB;

Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class TuitionReimbursementForm : Item
 	{
-		public override int LabelNumber{ get{ return 1074610; } } // Tuition Reimbursement Form (in triplicate)
+		public override int LabelNumber => 1074610; // Tuition Reimbursement Form (in triplicate)
 
 		public override bool Nontransferable => true;
 

Scripts/Engines/MLQuests/Items/UnicornRibs.cs

@@ -5,7 +5,7 @@ namespace Server.Items
 {
 	public class UnicornRibs : Item
 	{
-		public override int LabelNumber{ get{ return 1074611; } } // Unicorn Ribs
+		public override int LabelNumber => 1074611; // Unicorn Ribs
 
 		[Constructible]
 		public UnicornRibs() : this( 1 )

Scripts/Engines/MLQuests/MLQuest.cs

@@ -122,8 +122,8 @@ namespace Server.Engines.MLQuests
 			get { return ( m_OneTimeOnly || m_HasRestartDelay ); }
 		}
 
-		public virtual bool IsChainTriggered { get { return false; } }
-		public virtual Type NextQuest { get { return null; } }
+		public virtual bool IsChainTriggered  => false;
+		public virtual Type NextQuest  => null;
 
 		public TextDefinition Title { get { return m_Title; } set { m_Title = value; } }
 		public TextDefinition Description { get { return m_Description; } set { m_Description = value; } }
@@ -336,7 +336,7 @@ namespace Server.Engines.MLQuests
 			quest.m_Deserialized = true;
 		}
 
-		public virtual int Version { get { return 0; } }
+		public virtual int Version  => 0;
 
 		public virtual void Refresh( int oldVersion )
 		{

Scripts/Engines/MLQuests/MLQuestSystem.cs

@@ -18,7 +18,7 @@ namespace Server.Engines.MLQuests
 {
 	public static class MLQuestSystem
 	{
-		public static bool Enabled { get { return Core.ML; } }
+		public static bool Enabled  => Core.ML;
 
 		public const int MaxConcurrentQuests = 10;
 		public const int SpeechColor = 0x3B2;
@@ -120,9 +120,7 @@ namespace Server.Engines.MLQuests
 
 		private static void RegisterQuestGiver( MLQuest quest, Type questerType )
 		{
-			List<MLQuest> questList;
-
-			if ( !m_QuestGivers.TryGetValue( questerType, out questList ) )
+			if (!m_QuestGivers.TryGetValue( questerType, out List<MLQuest> questList ))
 				m_QuestGivers[questerType] = questList = new List<MLQuest>();
 
 			questList.Add( quest );
@@ -254,9 +252,8 @@ namespace Server.Engines.MLQuests
 			}
 
 			Type index = ScriptCompiler.FindTypeByName( e.GetString( 0 ) );
-			MLQuest quest;
 
-			if ( index == null || !m_Quests.TryGetValue( index, out quest ) )
+			if ( index == null || !m_Quests.TryGetValue( index, out MLQuest quest ) )
 			{
 				m.SendMessage( "Invalid quest type name." );
 				return;
@@ -590,17 +587,14 @@ namespace Server.Engines.MLQuests
 
 		public static MLQuestContext GetContext( PlayerMobile pm )
 		{
-			MLQuestContext context;
-			m_Contexts.TryGetValue( pm, out context );
+			m_Contexts.TryGetValue( pm, out MLQuestContext context );
 
 			return context;
 		}
 
 		public static MLQuestContext GetOrCreateContext( PlayerMobile pm )
 		{
-			MLQuestContext context;
-
-			if ( !m_Contexts.TryGetValue( pm, out context ) )
+			if (!m_Contexts.TryGetValue( pm, out MLQuestContext context ))
 				m_Contexts[pm] = context = new MLQuestContext( pm );
 
 			return context;
@@ -763,20 +757,14 @@ namespace Server.Engines.MLQuests
 
 		public static MLQuest FindQuest( Type questType )
 		{
-			MLQuest result;
-			m_Quests.TryGetValue( questType, out result );
+			m_Quests.TryGetValue( questType, out MLQuest result );
 
 			return result;
 		}
 
 		public static List<MLQuest> FindQuestList( Type questerType )
 		{
-			List<MLQuest> result;
-
-			if ( m_QuestGivers.TryGetValue( questerType, out result ) )
-				return result;
-
-			return EmptyList;
+			return m_QuestGivers.TryGetValue(questerType, out List<MLQuest> result) ? result : EmptyList;
 		}
 	}
 }

Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs

@@ -268,10 +268,10 @@ namespace Server.Engines.MLQuests.Mobiles
 			typeof( TheJoysOfLife )
 		};
 
-		public override TextDefinition[] Offer { get { return m_Offer; } }
-		public override TextDefinition[] Incomplete { get { return m_Incomplete; } }
-		public override TextDefinition[] Complete { get { return m_Complete; } }
-		public override Type[] Needed { get { return m_Needed; } }
+		public override TextDefinition[] Offer => m_Offer;
+		public override TextDefinition[] Incomplete => m_Incomplete;
+		public override TextDefinition[] Complete => m_Complete;
+		public override Type[] Needed => m_Needed;
 
 		public override string DefaultName => "Darius";
 
@@ -365,10 +365,10 @@ namespace Server.Engines.MLQuests.Mobiles
 			typeof( AllSeasonAdventurer )
 		};
 
-		public override TextDefinition[] Offer { get { return m_Offer; } }
-		public override TextDefinition[] Incomplete { get { return m_Incomplete; } }
-		public override TextDefinition[] Complete { get { return m_Complete; } }
-		public override Type[] Needed { get { return m_Needed; } }
+		public override TextDefinition[] Offer => m_Offer;
+		public override TextDefinition[] Incomplete => m_Incomplete;
+		public override TextDefinition[] Complete => m_Complete;
+		public override Type[] Needed => m_Needed;
 
 		public override string DefaultName => "Nedrick";
 

Scripts/Engines/MLQuests/Objectives/BaseObjective.cs

@@ -9,8 +9,8 @@ namespace Server.Engines.MLQuests.Objectives
 {
 	public abstract class BaseObjective
 	{
-		public virtual bool IsTimed { get { return false; } }
-		public virtual TimeSpan Duration { get { return TimeSpan.Zero; } }
+		public virtual bool IsTimed  => false;
+		public virtual TimeSpan Duration  => TimeSpan.Zero;
 
 		public BaseObjective()
 		{
@@ -146,7 +146,7 @@ namespace Server.Engines.MLQuests.Objectives
 			DeliverObjective
 		}
 
-		public virtual DataType ExtraDataType { get { return DataType.None; } }
+		public virtual DataType ExtraDataType  => DataType.None;
 
 		public virtual void Serialize( GenericWriter writer )
 		{

Scripts/Engines/MLQuests/Objectives/CollectObjective.cs

@@ -117,7 +117,7 @@ namespace Server.Engines.MLQuests.Objectives
 		private TimeSpan m_Duration;
 
 		public override bool IsTimed => true;
-		public override TimeSpan Duration { get { return m_Duration; } }
+		public override TimeSpan Duration => m_Duration;
 
 		public TimedCollectObjective( TimeSpan duration, int amount, Type type, TextDefinition name )
 			: base( amount, type, name )

Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs

@@ -132,7 +132,7 @@ namespace Server.Engines.MLQuests.Objectives
 		private TimeSpan m_Duration;
 
 		public override bool IsTimed => true;
-		public override TimeSpan Duration { get { return m_Duration; } }
+		public override TimeSpan Duration => m_Duration;
 
 		public TimedDeliverObjective( TimeSpan duration, Type delivery, int amount, TextDefinition name, Type destination )
 			: this( duration, delivery, amount, name, destination, true )
@@ -272,7 +272,7 @@ namespace Server.Engines.MLQuests.Objectives
 			// No extra instance stuff printed for this objective
 		}
 
-		public override DataType ExtraDataType { get { return DataType.DeliverObjective; } }
+		public override DataType ExtraDataType => DataType.DeliverObjective;
 
 		public override void Serialize( GenericWriter writer )
 		{

Scripts/Engines/MLQuests/Objectives/EscortObjective.cs

@@ -274,7 +274,7 @@ namespace Server.Engines.MLQuests.Objectives
 			// No extra instance stuff printed for this objective
 		}
 
-		public override DataType ExtraDataType { get { return DataType.EscortObjective; } }
+		public override DataType ExtraDataType => DataType.EscortObjective;
 
 		public override void Serialize( GenericWriter writer )
 		{

Scripts/Engines/MLQuests/Objectives/KillObjective.cs

@@ -97,7 +97,7 @@ namespace Server.Engines.MLQuests.Objectives
 		private TimeSpan m_Duration;
 
 		public override bool IsTimed => true;
-		public override TimeSpan Duration { get { return m_Duration; } }
+		public override TimeSpan Duration => m_Duration;
 
 		public TimedKillObjective( TimeSpan duration, int amount, Type[] types, TextDefinition name )
 			: this( duration, amount, types, name, null )
@@ -182,7 +182,7 @@ namespace Server.Engines.MLQuests.Objectives
 			y += 16;
 		}
 
-		public override DataType ExtraDataType { get { return DataType.KillObjective; } }
+		public override DataType ExtraDataType => DataType.KillObjective;
 
 		public override void Serialize( GenericWriter writer )
 		{

Scripts/Engines/MLQuests/QuesterNameAttribute.cs

@@ -9,7 +9,7 @@ namespace Server.Engines.MLQuests
 	{
 		private string m_QuesterName;
 
-		public string QuesterName { get { return m_QuesterName; } }
+		public string QuesterName  => m_QuesterName;
 
 		public QuesterNameAttribute( string questerName )
 		{
@@ -24,9 +24,7 @@ namespace Server.Engines.MLQuests
 			if ( t == null )
 				return "";
 
-			string result;
-
-			if ( m_Cache.TryGetValue( t, out result ) )
+			if (m_Cache.TryGetValue( t, out string result ))
 				return result;
 
 			object[] attributes = t.GetCustomAttributes( m_Type, false );