Upgrades code style - First batch (#22)

This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions

View file

@ -23,7 +23,7 @@ namespace Server.Engines.Quests.Ambitious
typeof( Ambitious.GetRewardObjective )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -66,10 +66,10 @@ namespace Server.Engines.Quests.Ambitious
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } }
public override TimeSpan RestartDelay => TimeSpan.Zero;
public override bool IsTutorial => false;
public override int Picture{ get{ return 0x15C9; } }
public override int Picture => 0x15C9;
private bool m_RedSolen;

View file

@ -16,7 +16,7 @@ namespace Server.Engines.Quests.Ambitious
}
}
public override int MaxProgress{ get{ return 5; } }
public override int MaxProgress => 5;
public KillQueensObjective()
{
@ -172,4 +172,4 @@ namespace Server.Engines.Quests.Ambitious
writer.Write( (bool) m_Gold );
}
}
}
}

View file

@ -54,7 +54,7 @@ namespace Server.Engines.Quests.Collector
typeof( Collector.MakeRoomObjective )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -91,10 +91,10 @@ namespace Server.Engines.Quests.Collector
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } }
public override TimeSpan RestartDelay => TimeSpan.Zero;
public override bool IsTutorial => false;
public override int Picture{ get{ return 0x15A9; } }
public override int Picture => 0x15A9;
public CollectorQuest( PlayerMobile from ) : base( from )
{

View file

@ -90,11 +90,11 @@ namespace Server.Engines.Quests.Collector
private int m_X;
private int m_Y;
public int Figurine { get { return m_Figurine; } }
public Type Type { get { return m_Type; } }
public int Figurine => m_Figurine;
public Type Type => m_Type;
public int Name { get { return m_Figurine < 0x4000 ? 1020000 + m_Figurine : 1078872 + m_Figurine; } }
public int X { get { return m_X; } }
public int Y { get { return m_Y; } }
public int X => m_X;
public int Y => m_Y;
public ImageTypeInfo( int figurine, Type type, int x, int y )
{
@ -104,4 +104,4 @@ namespace Server.Engines.Quests.Collector
m_Y = y;
}
}
}
}

View file

@ -120,7 +120,7 @@ namespace Server.Engines.Quests.Collector
set { m_StatueName = value; InvalidateProperties(); }
}
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
[Constructible]
public Obsidian() : base( 0x1EA7 )
@ -261,4 +261,4 @@ namespace Server.Engines.Quests.Collector
m_StatueName = Utility.Intern( reader.ReadString() );
}
}
}
}

View file

@ -15,7 +15,7 @@ namespace Server.Engines.Quests.Collector
}
}
public override int MaxProgress{ get{ return 6; } }
public override int MaxProgress => 6;
public FishPearlsObjective()
{
@ -530,4 +530,4 @@ namespace Server.Engines.Quests.Collector
{
}
}
}
}

View file

@ -34,7 +34,7 @@ namespace Server.Engines.Quests
public override bool IsActiveVendor => false;
public override bool IsInvulnerable => true;
public override bool DisallowAllMoves => true;
public override bool ClickTitle{ get { return false; } }
public override bool ClickTitle => false;
public override bool CanTeach => false;
public virtual int TalkNumber{ get{ return 6146; } } // Talk

View file

@ -6,7 +6,7 @@ namespace Server.Engines.Quests
{
public abstract class DynamicTeleporter : Item
{
public override int LabelNumber{ get{ return 1049382; } } // a magical teleporter
public override int LabelNumber => 1049382; // a magical teleporter
public DynamicTeleporter() : this( 0x1822, 0x482 )
{
@ -67,4 +67,4 @@ namespace Server.Engines.Quests
int version = reader.ReadInt();
}
}
}
}

View file

@ -68,7 +68,7 @@ namespace Server.Items
private const double m_LongDistance = 300.0;
private const double m_ShortDistance = 5.0;
public override int LabelNumber { get { return 1046226; } } // an enchanted sextant
public override int LabelNumber => 1046226; // an enchanted sextant
[Constructible]
public EnchantedSextant() : base( 0x1058 )
@ -190,4 +190,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

View file

@ -34,7 +34,7 @@ namespace Server.Engines.Quests
set{ m_Charges = value; InvalidateProperties(); }
}
public override int LabelNumber{ get{ return 1049117; } } // Horn of Retreat
public override int LabelNumber => 1049117; // Horn of Retreat
[Constructible]
public HornOfRetreat() : base( 0xFC4 )
@ -146,7 +146,7 @@ namespace Server.Engines.Quests
public class HornOfRetreatMoongate : Moongate
{
public override int LabelNumber{ get{ return 1049114; } } // Sanctuary Gate
public override int LabelNumber => 1049114; // Sanctuary Gate
private Mobile m_Caster;
@ -203,4 +203,4 @@ namespace Server.Engines.Quests
Delete();
}
}
}
}

View file

@ -16,7 +16,7 @@ namespace Server.Engines.Quests
public abstract bool CanDrop( PlayerMobile pm );
public virtual bool Accepted { get { return Deleted; } }
public virtual bool Accepted => Deleted;
public override bool DropToWorld( Mobile from, Point3D p )
{
@ -118,4 +118,4 @@ namespace Server.Engines.Quests
int version = reader.ReadInt();
}
}
}
}

View file

@ -106,7 +106,7 @@ namespace Server.Engines.Quests.Necro
new QuestItemInfo( 1048032, 3702 ) // a bag
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public ReanimateMaabusConversation()
{
@ -157,7 +157,7 @@ namespace Server.Engines.Quests.Necro
new QuestItemInfo( 1026153, 6178 ) // teleporter
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public MaabasConversation()
{
@ -282,7 +282,7 @@ namespace Server.Engines.Quests.Necro
new QuestItemInfo( 1023643, 8787 ) // spellbook
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public VaultOfSecretsConversation()
{

View file

@ -46,7 +46,7 @@ namespace Server.Engines.Quests.Necro
typeof( Necro.HorusRewardConversation )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -99,10 +99,10 @@ namespace Server.Engines.Quests.Necro
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } }
public override TimeSpan RestartDelay => TimeSpan.MaxValue;
public override bool IsTutorial => true;
public override int Picture{ get{ return 0x15B5; } }
public override int Picture => 0x15B5;
public DarkTidesQuest( PlayerMobile from ) : base( from )
{

View file

@ -8,7 +8,7 @@ namespace Server.Engines.Quests.Necro
{
public class KronusScroll : QuestItem
{
public override int LabelNumber { get { return 1060149; } } // Calling of Kronus
public override int LabelNumber => 1060149; // Calling of Kronus
[Constructible]
public KronusScroll() : base( 0x227A )
@ -163,4 +163,4 @@ namespace Server.Engines.Quests.Necro
int version = reader.ReadInt();
}
}
}
}

View file

@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Necro
private Point3D m_SpawnLocation;
[CommandProperty( AccessLevel.GameMaster )]
public Maabus Maabus { get { return m_Maabus; } }
public Maabus Maabus => m_Maabus;
[CommandProperty( AccessLevel.GameMaster )]
public Point3D SpawnLocation { get { return m_SpawnLocation; } set { m_SpawnLocation = value; } }
@ -155,4 +155,4 @@ namespace Server.Engines.Quests.Necro
m_EmptyItemID = reader.ReadInt();
}
}
}
}

View file

@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Necro
{
public class ScrollOfAbraxus : QuestItem
{
public override int LabelNumber { get { return 1028827; } } // Scroll of Abraxus
public override int LabelNumber => 1028827; // Scroll of Abraxus
[Constructible]
public ScrollOfAbraxus() : base( 0x227B )
@ -105,42 +105,42 @@ namespace Server.Engines.Quests.Necro
AddImage( 340, 255, 9005 );
/* Security at the Crystal Cave<BR><BR>
*
*
* We have taken great measuresto ensure the safety of the
* Scroll of Calling, which we have so valiantly taken from
* the Necromancer Maabus during the battle of the wood
* nearly 200 years ago.<BR><BR>
*
*
* The scroll must never fall into the hands of the
* Necromancers again, lest they use it to summon the ancient
* daemon Kronus. The scroll of calling is a necessity in the
* series of dark rites the Necromancers must perform to once again
* re-awaken Kronus.<BR><BR>
*
*
* Should Kronus ever rise again, the days of the Paladins, and
* indeed humanity as we know it will be numbered.<BR><BR>
*
*
* For this reason, we have posted the honorable Horus, former
* General of the Northern Legions to guard the entrance of the
* Crystal Cave where we keep the Scroll of Calling. Horus was
* infused with magical life from the tree Urywen during his last
* battle. The power gave him eternal life, but it also,
* unfortunately, took his eye sight.<BR><BR>
*
*
* Since Horus cannot see those he admits to the Crystal Cave,
* he will only allow those that know the secret password to enter.
* Speak the following word to Horus and he shall grant you passage
* to the Crystal Cave:<BR><BR>
*
*
* <I>Urywen</I><BR><BR>
*
*
* Do not speak this password anywhere except when seeking passage
* into the Crystal Cave, as our adversaries are lurking in the
* shadows they are everywhere.<BR><BR>Go with the light, friend.<BR><BR>
*
* shadows <EFBFBD> they are everywhere.<BR><BR>Go with the light, friend.<BR><BR>
*
* <I>- Frater Melkeer</I>
*/
AddHtmlLocalized( 25, 36, 350, 210, 1060116, 1, false, true );
}
}
}
}

View file

@ -54,9 +54,9 @@ namespace Server.Engines.Quests.Necro
return base.IsHarmfulCriminal( target );
}
public override bool ClickTitle{ get { return false; } }
public override bool ClickTitle => false;
public override bool PlayerRangeSensitive{ get { return false; } }
public override bool PlayerRangeSensitive => false;
public override void OnThink()
{
@ -238,4 +238,4 @@ namespace Server.Engines.Quests.Necro
Delete();
}
}
}
}

View file

@ -23,7 +23,7 @@ namespace Server.Engines.Quests.Necro
new QuestItemInfo( 1023643, 8787 ) // spellbook
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public AnimateMaabusCorpseObjective()
{
@ -188,7 +188,7 @@ namespace Server.Engines.Quests.Necro
new QuestItemInfo( 1023676, 3679 ) // glowing rune
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public FindVaultOfSecretsObjective()
{
@ -307,7 +307,7 @@ namespace Server.Engines.Quests.Necro
new QuestItemInfo( 1026153, 6178 ) // teleporter
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public ReturnToCrystalCaveObjective()
{
@ -639,4 +639,4 @@ namespace Server.Engines.Quests.Necro
System.AddConversation( new BankerConversation() );
}
}
}
}

View file

@ -44,7 +44,7 @@ namespace Server.Engines.Quests.Ninja
typeof( Ninja.GiveEminoSwordObjective )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -64,10 +64,10 @@ namespace Server.Engines.Quests.Ninja
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } }
public override TimeSpan RestartDelay => TimeSpan.MaxValue;
public override bool IsTutorial => true;
public override int Picture{ get{ return 0x15D5; } }
public override int Picture => 0x15D5;
public EminosUndertakingQuest( PlayerMobile from ) : base( from )
{

View file

@ -6,14 +6,14 @@ namespace Server.Engines.Quests.Ninja
{
public class BlueNinjaQuestTeleporter : DynamicTeleporter
{
public override int LabelNumber{ get{ return 1026157; } } // teleporter
public override int LabelNumber => 1026157; // teleporter
[Constructible]
public BlueNinjaQuestTeleporter() : base( 0x51C, 0x2 )
{
}
public override int NotWorkingMessage{ get{ return 1063198; } } // You stand on the strange floor tile but nothing happens.
public override int NotWorkingMessage => 1063198; // You stand on the strange floor tile but nothing happens.
public override bool GetDestination( PlayerMobile player, ref Point3D loc, ref Map map )
{
@ -48,4 +48,4 @@ namespace Server.Engines.Quests.Ninja
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Ninja
{
public class EminosKatana : QuestItem
{
public override int LabelNumber{ get{ return 1063214; } } // Daimyo Emino's Katana
public override int LabelNumber => 1063214; // Daimyo Emino's Katana
[Constructible]
public EminosKatana() : base( 0x13FF )
@ -45,4 +45,4 @@ namespace Server.Engines.Quests.Ninja
int version = reader.ReadEncodedInt();
}
}
}
}

View file

@ -6,14 +6,14 @@ namespace Server.Engines.Quests.Ninja
{
public class GreenNinjaQuestTeleporter : DynamicTeleporter
{
public override int LabelNumber{ get{ return 1026157; } } // teleporter
public override int LabelNumber => 1026157; // teleporter
[Constructible]
public GreenNinjaQuestTeleporter() : base( 0x51C, 0x17E )
{
}
public override int NotWorkingMessage{ get{ return 1063198; } } // You stand on the strange floor tile but nothing happens.
public override int NotWorkingMessage => 1063198; // You stand on the strange floor tile but nothing happens.
public override bool GetDestination( PlayerMobile player, ref Point3D loc, ref Map map )
{
@ -48,4 +48,4 @@ namespace Server.Engines.Quests.Ninja
int version = reader.ReadInt();
}
}
}
}

View file

@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Ninja
{
public class NoteForZoel : QuestItem
{
public override int LabelNumber{ get{ return 1063186; } } // A Note for Zoel
public override int LabelNumber => 1063186; // A Note for Zoel
[Constructible]
public NoteForZoel() : base( 0x14EF )
@ -45,4 +45,4 @@ namespace Server.Engines.Quests.Ninja
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,14 +6,14 @@ namespace Server.Engines.Quests.Ninja
{
public class WhiteNinjaQuestTeleporter : DynamicTeleporter
{
public override int LabelNumber{ get{ return 1026157; } } // teleporter
public override int LabelNumber => 1026157; // teleporter
[Constructible]
public WhiteNinjaQuestTeleporter() : base( 0x51C, 0x47E )
{
}
public override int NotWorkingMessage{ get{ return 1063198; } } // You stand on the strange floor tile but nothing happens.
public override int NotWorkingMessage => 1063198; // You stand on the strange floor tile but nothing happens.
public override bool GetDestination( PlayerMobile player, ref Point3D loc, ref Map map )
{
@ -56,4 +56,4 @@ namespace Server.Engines.Quests.Ninja
int version = reader.ReadInt();
}
}
}
}

View file

@ -30,7 +30,7 @@ namespace Server.Engines.Quests.Ninja
AddItem( new ThighBoots() );
}
public override int TalkNumber{ get{ return -1; } }
public override int TalkNumber => -1;
public override void OnTalk( PlayerMobile player, bool contextMenu )
{

View file

@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Ninja
{
public static int[] Messages = new int[]
{
1063191, // They wont find me here.
1063191, // They won<EFBFBD>t find me here.
1063192 // Ah, a quiet hideout.
};
@ -64,7 +64,7 @@ namespace Server.Engines.Quests.Ninja
return 3;
}
public override int TalkNumber{ get{ return -1; } }
public override int TalkNumber => -1;
public override void OnTalk( PlayerMobile player, bool contextMenu )
{
@ -93,4 +93,4 @@ namespace Server.Engines.Quests.Ninja
m_Message = reader.ReadInt();
}
}
}
}

View file

@ -34,7 +34,7 @@ namespace Server.Engines.Quests.Ninja
AddItem( new FloppyHat() );
}
public override int TalkNumber{ get{ return -1; } }
public override int TalkNumber => -1;
public override void OnTalk( PlayerMobile player, bool contextMenu )
{

View file

@ -80,7 +80,7 @@ namespace Server.Engines.Quests.Ninja
public bool TaughtHowToUseSkills
{
get{ return m_TaughtHowToUseSkills; }
get{ return m_TaughtHowToUseSkills; }
set{ m_TaughtHowToUseSkills = value; }
}
@ -152,8 +152,8 @@ namespace Server.Engines.Quests.Ninja
{
get
{
/* Bring the note to Elite Ninja Zoel and speak with him again.
* He is near the cave entrance. You can hand the note to Zoel
/* Bring the note to Elite Ninja Zoel and speak with him again.
* He is near the cave entrance. You can hand the note to Zoel
* by dragging it and dropping it on his body.
*/
return 1063185;
@ -208,7 +208,7 @@ namespace Server.Engines.Quests.Ninja
{
get
{
// Go back through the blue teleporter and tell Daimyo Emino what youve overheard.
// Go back through the blue teleporter and tell Daimyo Emino what you<EFBFBD>ve overheard.
return 1063197;
}
}
@ -229,9 +229,9 @@ namespace Server.Engines.Quests.Ninja
{
get
{
/* Take the white teleporter and check the chests for the sword.
* Leave everything else behind. Avoid damage from traps you may
* encounter. To use a potion, make sure at least one hand is
/* Take the white teleporter and check the chests for the sword.
* Leave everything else behind. Avoid damage from traps you may
* encounter. To use a potion, make sure at least one hand is
* free and double click on the bottle.
*/
return 1063200;
@ -262,8 +262,8 @@ namespace Server.Engines.Quests.Ninja
{
get
{
/* Walk through the hallway being careful
* to avoid the traps. You may be able to
/* Walk through the hallway being careful
* to avoid the traps. You may be able to
* time the traps to avoid injury.
*/
return 1063202;
@ -338,7 +338,7 @@ namespace Server.Engines.Quests.Ninja
{
}
public override int MaxProgress{ get{ return 3; } }
public override int MaxProgress => 3;
public override void RenderProgress( BaseQuestGump gump )
{
@ -390,4 +390,4 @@ namespace Server.Engines.Quests.Ninja
{
}
}
}
}

View file

@ -47,7 +47,7 @@ namespace Server.Engines.Quests.Samurai
typeof( Samurai.SeventhTrialReturnObjective )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -78,10 +78,10 @@ namespace Server.Engines.Quests.Samurai
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } }
public override TimeSpan RestartDelay => TimeSpan.MaxValue;
public override bool IsTutorial => true;
public override int Picture{ get{ return 0x15D7; } }
public override int Picture => 0x15D7;
public HaochisTrialsQuest( PlayerMobile from ) : base( from )
{

View file

@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Samurai
{
public class HaochisKatana : QuestItem
{
public override int LabelNumber{ get{ return 1063165; } } // Daimyo Haochi's Katana
public override int LabelNumber => 1063165; // Daimyo Haochi's Katana
[Constructible]
public HaochisKatana() : base( 0x13FF )
@ -43,4 +43,4 @@ namespace Server.Engines.Quests.Samurai
int version = reader.ReadEncodedInt();
}
}
}
}

View file

@ -9,8 +9,8 @@ namespace Server.Engines.Quests.Samurai
{
private static readonly TimeSpan LitDuration = TimeSpan.FromSeconds( 20.0 );
public override int LitSound{ get{ return 0; } }
public override int UnlitSound{ get{ return 0; } }
public override int LitSound => 0;
public override int UnlitSound => 0;
[Constructible]
public HonorCandle()
@ -76,4 +76,4 @@ namespace Server.Engines.Quests.Samurai
int version = reader.ReadEncodedInt();
}
}
}
}

View file

@ -65,7 +65,7 @@ namespace Server.Engines.Quests.Samurai
private int m_CursedSoulsKilled;
private int m_YoungRoninKilled;
public override int MaxProgress{ get{ return 3; } }
public override int MaxProgress => 3;
public override void OnKill( BaseCreature creature, Container corpse )
{
@ -410,7 +410,7 @@ namespace Server.Engines.Quests.Samurai
{
get
{
// Retrieve Daimyo Haochis katana from the treasure room.
// Retrieve Daimyo Haochi<EFBFBD>s katana from the treasure room.
return 1063072;
}
}
@ -514,7 +514,7 @@ namespace Server.Engines.Quests.Samurai
}
}
public override int MaxProgress{ get{ return 3; } }
public override int MaxProgress => 3;
public SeventhTrialIntroObjective()
{
@ -552,4 +552,4 @@ namespace Server.Engines.Quests.Samurai
System.AddConversation( new EndConversation() );
}
}
}
}

View file

@ -16,7 +16,7 @@ namespace Server.Engines.Quests.Matriarch
}
}
public override int MaxProgress{ get{ return 7; } }
public override int MaxProgress => 7;
public KillInfiltratorsObjective()
{
@ -107,7 +107,7 @@ namespace Server.Engines.Quests.Matriarch
}
}
public override int MaxProgress{ get{ return 40; } }
public override int MaxProgress => 40;
public GatherWaterObjective()
{
@ -213,4 +213,4 @@ namespace Server.Engines.Quests.Matriarch
System.AddConversation( new EndConversation() );
}
}
}
}

View file

@ -26,7 +26,7 @@ namespace Server.Engines.Quests.Matriarch
typeof( Matriarch.GetRewardObjective )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -93,10 +93,10 @@ namespace Server.Engines.Quests.Matriarch
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } }
public override TimeSpan RestartDelay => TimeSpan.Zero;
public override bool IsTutorial => false;
public override int Picture{ get{ return 0x15C9; } }
public override int Picture => 0x15C9;
private bool m_RedSolen;

View file

@ -14,7 +14,7 @@ namespace Server.Engines.Quests.Naturalist
/* Find an entrance to the Solen Hive, and search within for the Solen
* Egg Nests. Each Nest must be studied for some time without a break in
* concentration in order to gather useful information.<BR><BR>
*
*
* Once you have completed your study of the Nests, return to the Naturalist
* who gave you this task.
*/
@ -22,7 +22,7 @@ namespace Server.Engines.Quests.Naturalist
}
}
public override int MaxProgress{ get{ return NestArea.NonSpecialCount; } }
public override int MaxProgress => NestArea.NonSpecialCount;
private NestArea m_CurrentNest;
private DateTime m_StudyBegin;
@ -200,4 +200,4 @@ namespace Server.Engines.Quests.Naturalist
gump.AddLabel( 130, 280, 0x64, count );
}
}
}
}

View file

@ -18,7 +18,7 @@ namespace Server.Engines.Quests.Naturalist
typeof( FullBackpackConversation )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -65,10 +65,10 @@ namespace Server.Engines.Quests.Naturalist
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } }
public override TimeSpan RestartDelay => TimeSpan.Zero;
public override bool IsTutorial => false;
public override int Picture{ get{ return 0x15C7; } }
public override int Picture => 0x15C7;
private Naturalist m_Naturalist;

View file

@ -56,7 +56,7 @@ namespace Server.Engines.Quests.Zento
get
{
/* Great job! One less terrible hatchling in the Waste!<BR><BR>
*
*
* Once you've killed 10 of the Deathwatch Beetle Hatchlings,
* return to Ansella for your reward!
*/
@ -132,7 +132,7 @@ namespace Server.Engines.Quests.Zento
}
}
public override int MaxProgress{ get{ return 10; } }
public override int MaxProgress => 10;
public ThirdKillObjective( int startingProgress )
{
@ -175,4 +175,4 @@ namespace Server.Engines.Quests.Zento
System.AddConversation( new EndConversation() );
}
}
}
}

View file

@ -19,7 +19,7 @@ namespace Server.Engines.Quests.Zento
typeof( ReturnObjective )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -46,10 +46,10 @@ namespace Server.Engines.Quests.Zento
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } }
public override TimeSpan RestartDelay => TimeSpan.MaxValue;
public override bool IsTutorial => true;
public override int Picture{ get{ return 0x15CF; } }
public override int Picture => 0x15CF;
public TerribleHatchlingsQuest( PlayerMobile from ) : base( from )
{

View file

@ -8,7 +8,7 @@ namespace Server.Engines.Quests.Doom
{
public class BellOfTheDead : Item
{
public override int LabelNumber{ get{ return 1050018; } } // bell of the dead
public override int LabelNumber => 1050018; // bell of the dead
[Constructible]
public BellOfTheDead() : base( 0x91A )
@ -132,4 +132,4 @@ namespace Server.Engines.Quests.Doom
m_Chyloth.Delete();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Doom
{
public class ChylothStaff : BlackStaff
{
public override int LabelNumber{ get{ return 1041111; } } // a magic staff
public override int LabelNumber => 1041111; // a magic staff
[Constructible]
public ChylothStaff()
@ -32,4 +32,4 @@ namespace Server.Engines.Quests.Doom
int version = reader.ReadInt();
}
}
}
}

View file

@ -4,7 +4,7 @@ namespace Server.Engines.Quests.Doom
{
public class GoldenSkull : Item
{
public override int LabelNumber{ get{ return 1061619; } } // a golden skull
public override int LabelNumber => 1061619; // a golden skull
[Constructible]
public GoldenSkull() : base( Utility.Random( 0x1AE2, 3 ) )
@ -32,4 +32,4 @@ namespace Server.Engines.Quests.Doom
int version = reader.ReadInt();
}
}
}
}

View file

@ -4,7 +4,7 @@ namespace Server.Engines.Quests.Doom
{
public class GrandGrimoire : Item
{
public override int LabelNumber{ get{ return 1060801; } } // The Grand Grimoire
public override int LabelNumber => 1060801; // The Grand Grimoire
[Constructible]
public GrandGrimoire() : base( 0xEFA )
@ -33,4 +33,4 @@ namespace Server.Engines.Quests.Doom
int version = reader.ReadInt();
}
}
}
}

View file

@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Doom
{
public class Victoria : BaseQuester
{
public override int TalkNumber{ get{ return 6159; } } // Ask about Chyloth
public override int TalkNumber => 6159; // Ask about Chyloth
public override string DefaultName => "Victoria";
public override bool ClickTitle => true;
public override bool IsActiveVendor => true;

View file

@ -16,11 +16,11 @@ namespace Server.Engines.Quests.Doom
/* Find 1000 Daemon bones and hand them
* to Victoria as you find them.
*/
return 1050026;
return 1050026;
}
}
public override int MaxProgress{ get{ return 1000; } }
public override int MaxProgress => 1000;
public CollectBonesObjective()
{
@ -188,4 +188,4 @@ namespace Server.Engines.Quests.Doom
writer.Write( (Item) m_CorpseWithSkull );
}
}
}
}

View file

@ -15,7 +15,7 @@ namespace Server.Engines.Quests.Doom
typeof( Doom.VanquishDaemonObjective )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
private Victoria m_Victoria;
private bool m_WaitForSummon;
@ -74,8 +74,8 @@ namespace Server.Engines.Quests.Doom
}
public override bool IsTutorial => false;
public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } }
public override int Picture{ get{ return 0x15B5; } }
public override TimeSpan RestartDelay => TimeSpan.Zero;
public override int Picture => 0x15B5;
// NOTE: Quest not entirely OSI-accurate: some changes made to prevent numerous OSI bugs

View file

@ -210,7 +210,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1023676, 0xE68 ) // glowing rune
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public UzeraanFirstTaskConversation()
{
@ -300,7 +300,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1048032, 0xE76 ) // a bag
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public UzeraanReportConversation()
{
@ -376,7 +376,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1023637, 0xE34 ) // scroll
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public SchmendrickConversation()
{
@ -438,7 +438,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1049117, 0xFC4 ) // Horn of Retreat
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public UzeraanScrollOfPowerConversation()
{
@ -546,7 +546,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1022581, 0xA22 ), // lantern
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public UzeraanFertileDirtConversation()
{

View file

@ -19,7 +19,7 @@ namespace Server.Engines.Quests.Haven
private MilitiaCanoneer m_Canoneer;
[CommandProperty( AccessLevel.GameMaster )]
public CannonDirection CannonDirection { get { return m_CannonDirection; } }
public CannonDirection CannonDirection => m_CannonDirection;
[CommandProperty( AccessLevel.GameMaster )]
public MilitiaCanoneer Canoneer { get { return m_Canoneer; } set { m_Canoneer = value; } }
@ -95,7 +95,7 @@ namespace Server.Engines.Quests.Haven
target.Damage( 9999, from );
}
public override bool HandlesOnMovement { get { return m_Canoneer != null && !m_Canoneer.Deleted && m_Canoneer.Active; } }
public override bool HandlesOnMovement => m_Canoneer != null && !m_Canoneer.Deleted && m_Canoneer.Active;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
@ -178,4 +178,4 @@ namespace Server.Engines.Quests.Haven
int version = reader.ReadInt();
}
}
}
}

View file

@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Haven
{
public class SchmendrickScrollOfPower : QuestItem
{
public override int LabelNumber { get { return 1049118; } } // a scroll with ancient markings
public override int LabelNumber => 1049118; // a scroll with ancient markings
public SchmendrickScrollOfPower() : base( 0xE34 )
{
@ -43,4 +43,4 @@ namespace Server.Engines.Quests.Haven
int version = reader.ReadInt();
}
}
}
}

View file

@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Haven
{
public override bool IsActiveVendor => true;
public override bool DisallowAllMoves => false;
public override bool ClickTitle{ get { return true; } }
public override bool ClickTitle => true;
public override bool CanTeach => true;
public override string DefaultName => "Anwin Brenna";
@ -168,8 +168,8 @@ namespace Server.Engines.Quests.Haven
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{

View file

@ -38,7 +38,7 @@ namespace Server.Engines.Quests.Haven
{
/* Go to the shrine inside of Uzeraan's Mansion, near the front doors and
* <a href = "?ForceTopic109">tithe</a> at least 500 gold.<BR><BR>
*
*
* Return to Uzeraan when you are done.
*/
return 1060386;
@ -103,7 +103,7 @@ namespace Server.Engines.Quests.Haven
{
private KillHordeMinionsStep m_Step;
public KillHordeMinionsStep Step { get { return m_Step; } }
public KillHordeMinionsStep Step => m_Step;
public override object Message
{
@ -114,7 +114,7 @@ namespace Server.Engines.Quests.Haven
case KillHordeMinionsStep.First:
/* Find the mountain pass beyond the house which lies at the
* end of the runic road.<BR><BR>
*
*
* Assist the city Militia by slaying <I>Horde Minions</I>
*/
return 1049089;
@ -267,7 +267,7 @@ namespace Server.Engines.Quests.Haven
{
/* It's no use... The <I>Horde Minions</I> are too many.
* They are appearing out of nowhere.<BR><BR>
*
*
* Return to Uzeraan and report your findings.
*/
return 1049091;
@ -292,7 +292,7 @@ namespace Server.Engines.Quests.Haven
{
/* Prepare for battle and step onto the teleporter,
* located against the wall in the main hall of Uzeraan's mansion.<BR><BR>
*
*
* Find Schmendrick within the mines.
*/
return 1049120;
@ -348,7 +348,7 @@ namespace Server.Engines.Quests.Haven
get
{
/* You have obtained the scroll of power! Find your way out of the cave.<BR><BR>
*
*
* Hand the scroll to Uzeraan (drag and drop) once you arrive in his mansion.
*/
return 1049324;
@ -373,7 +373,7 @@ namespace Server.Engines.Quests.Haven
{
/* Find the Dryad in the woods of Haven and get a patch
* of fertile dirt from her.<BR><BR>
*
*
* Use Uzeraan's teleporter to get there if necessary.
*/
return 1049358;
@ -397,7 +397,7 @@ namespace Server.Engines.Quests.Haven
get
{
/* You have acquired the <I>Fertile Dirt</I>!<BR><BR>
*
*
* Return to the mansion (<a href = "?ForceTopic13">North-East</a>
* of the Dryad's Grove) and hand it to Uzeraan.
*/
@ -422,7 +422,7 @@ namespace Server.Engines.Quests.Haven
get
{
/* Bring back a vial of blood.<BR><BR>
*
*
* Follow the road leading north from the mansion and walk into the hut
* to find the chest that contains the vial
*/
@ -486,7 +486,7 @@ namespace Server.Engines.Quests.Haven
get
{
/* You have the vial of blood!<BR><BR>
*
*
* Return to Uzeraan's mansion and hand him the vial.
*/
return 1049332;
@ -528,7 +528,7 @@ namespace Server.Engines.Quests.Haven
else
{
/* Use Uzeraan's teleporter to get to the Haunted graveyard.<BR><BR>
*
*
* Slay the undead until you find a <I>Daemon Bone</I>.
*/
return 1049362;
@ -635,4 +635,4 @@ namespace Server.Engines.Quests.Haven
System.AddConversation( new BankerConversation() );
}
}
}
}

View file

@ -44,7 +44,7 @@ namespace Server.Engines.Quests.Haven
typeof( Haven.FewReagentsConversation )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -82,7 +82,7 @@ namespace Server.Engines.Quests.Haven
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } }
public override TimeSpan RestartDelay => TimeSpan.MaxValue;
public override bool IsTutorial => true;
public override int Picture

View file

@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Hag
{
private int m_Uses;
public override int LabelNumber{ get{ return 1055060; } } // Grizelda's Extra Strength Hangover Cure
public override int LabelNumber => 1055060; // Grizelda's Extra Strength Hangover Cure
[CommandProperty( AccessLevel.GameMaster )]
public int Uses
@ -87,4 +87,4 @@ namespace Server.Engines.Quests.Hag
}
}
}
}
}

View file

@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Hag
{
public class MagicFlute : Item
{
public override int LabelNumber{ get{ return 1055051; } } // magic flute
public override int LabelNumber => 1055051; // magic flute
[Constructible]
public MagicFlute() : base( 0x1421 )
@ -74,4 +74,4 @@ namespace Server.Engines.Quests.Hag
int version = reader.ReadInt();
}
}
}
}

View file

@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Hag
{
public class MoonfireBrew : Item
{
public override int LabelNumber{ get{ return 1055065; } } // a bottle of magical moonfire brew
public override int LabelNumber => 1055065; // a bottle of magical moonfire brew
[Constructible]
public MoonfireBrew() : base( 0xF04 )
@ -31,4 +31,4 @@ namespace Server.Engines.Quests.Hag
int version = reader.ReadInt();
}
}
}
}

View file

@ -165,7 +165,7 @@ namespace Server.Engines.Quests.Hag
}
}
public override int MaxProgress{ get{ return m_MaxProgress; } }
public override int MaxProgress => m_MaxProgress;
public KillImpsObjective( bool init )
{
@ -473,7 +473,7 @@ namespace Server.Engines.Quests.Hag
public void NextStep()
{
System.From.SendLocalizedMessage( 1055046 ); // You have completed your current task on the Hag's Magic Brew Recipe list.
if ( Step < 3 )
System.AddObjective( new FindIngredientObjective( m_Ingredients ) );
else
@ -525,4 +525,4 @@ namespace Server.Engines.Quests.Hag
System.AddConversation( new EndConversation() );
}
}
}
}

View file

@ -32,7 +32,7 @@ namespace Server.Engines.Quests.Hag
typeof( Hag.RecentlyFinishedConversation )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -86,10 +86,10 @@ namespace Server.Engines.Quests.Hag
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.FromMinutes( 5.0 ); } }
public override TimeSpan RestartDelay => TimeSpan.FromMinutes( 5.0 );
public override bool IsTutorial => false;
public override int Picture{ get{ return 0x15D3; } }
public override int Picture => 0x15D3;
public WitchApprenticeQuest( PlayerMobile from ) : base( from )
{