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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Projects/Scripts/Engines/MLQuests/Objectives/EscortObjective.cs
View file

@ -9,12 +9,12 @@ namespace Server.Engines.MLQuests.Objectives
{
public EscortObjective(QuestArea destination = null) => Destination = destination;
public QuestArea Destination{ get; set; }
public QuestArea Destination { get; set; }
public override bool CanOffer(IQuestGiver quester, PlayerMobile pm, bool message)
{
if (quester is BaseCreature creature && creature.Controlled ||
quester is BaseEscortable escortable && escortable.IsBeingDeleted)
if ((quester is BaseCreature creature && creature.Controlled) ||
(quester is BaseEscortable escortable && escortable.IsBeingDeleted))
return false;
MLQuestContext context = MLQuestSystem.GetContext(pm);
@ -73,9 +73,9 @@ namespace Server.Engines.MLQuests.Objectives
public class EscortObjectiveInstance : BaseObjectiveInstance
{
private BaseCreature m_Escort;
private readonly BaseCreature m_Escort;
private DateTime m_LastSeenEscorter;
private EscortObjective m_Objective;
private readonly EscortObjective m_Objective;
private Timer m_Timer;
public EscortObjectiveInstance(EscortObjective objective, MLQuestInstance instance)
@ -92,7 +92,7 @@ namespace Server.Engines.MLQuests.Objectives
instance.Quester.GetType().Name);
}
public bool HasCompleted{ get; set; }
public bool HasCompleted { get; set; }
public override DataType ExtraDataType => DataType.EscortObjective;
@ -212,7 +212,7 @@ namespace Server.Engines.MLQuests.Objectives
}
// Note: this sound is sent twice on OSI (once here and once in Cancel())
//m_Player.SendSound( 0x5B3 ); // private sound
// m_Player.SendSound( 0x5B3 ); // private sound
pm.SendLocalizedMessage(1071194); // You have failed your escort quest...
if (!instance.Removed)
@ -230,7 +230,7 @@ namespace Server.Engines.MLQuests.Objectives
public override void OnPlayerDeath()
{
// Note: OSI also cancels it when the quest is already complete
if ( /*IsCompleted() ||*/ Instance.Removed)
if (/*IsCompleted() ||*/ Instance.Removed)
return;
Instance.Cancel();