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

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

42
Projects/Scripts/Engines/MLQuests/Objectives/BaseObjective.cs
View file

@ -34,13 +34,13 @@ namespace Server.Engines.MLQuests.Objectives
EndTime = DateTime.UtcNow + obj.Duration;
}
public MLQuestInstance Instance{ get; }
public MLQuestInstance Instance { get; }
public bool IsTimed => EndTime != DateTime.MinValue;
public DateTime EndTime{ get; set; }
public DateTime EndTime { get; set; }
public bool Expired{ get; set; }
public bool Expired { get; set; }
public virtual DataType ExtraDataType => DataType.None;
@ -142,32 +142,32 @@ namespace Server.Engines.MLQuests.Objectives
switch (extraDataType)
{
case DataType.EscortObjective:
{
bool completed = reader.ReadBool();
{
bool completed = reader.ReadBool();
if (objInstance is EscortObjectiveInstance instance)
instance.HasCompleted = completed;
if (objInstance is EscortObjectiveInstance instance)
instance.HasCompleted = completed;
break;
}
break;
}
case DataType.KillObjective:
{
int slain = reader.ReadInt();
{
int slain = reader.ReadInt();
if (objInstance is KillObjectiveInstance instance)
instance.Slain = slain;
if (objInstance is KillObjectiveInstance instance)
instance.Slain = slain;
break;
}
break;
}
case DataType.DeliverObjective:
{
bool completed = reader.ReadBool();
{
bool completed = reader.ReadBool();
if (objInstance is DeliverObjectiveInstance instance)
instance.HasCompleted = completed;
if (objInstance is DeliverObjectiveInstance instance)
instance.HasCompleted = completed;
break;
}
break;
}
}
}
}

17
Projects/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs
View file

@ -23,11 +23,11 @@ namespace Server.Engines.MLQuests.Objectives
}
}
public int DesiredAmount{ get; set; }
public int DesiredAmount { get; set; }
public Type AcceptedType{ get; set; }
public Type AcceptedType { get; set; }
public TextDefinition Name{ get; set; }
public TextDefinition Name { get; set; }
public virtual bool ShowDetailed => true;
@ -75,8 +75,6 @@ namespace Server.Engines.MLQuests.Objectives
public override BaseObjectiveInstance CreateInstance(MLQuestInstance instance) => new CollectObjectiveInstance(this, instance);
}
#region Timed
public class TimedCollectObjective : CollectObjective
{
public TimedCollectObjective(TimeSpan duration, int amount, Type type, TextDefinition name)
@ -84,18 +82,16 @@ namespace Server.Engines.MLQuests.Objectives
Duration = duration;
public override bool IsTimed => true;
public override TimeSpan Duration{ get; }
public override TimeSpan Duration { get; }
}
#endregion
public class CollectObjectiveInstance : BaseObjectiveInstance
{
public CollectObjectiveInstance(CollectObjective objective, MLQuestInstance instance)
: base(instance, objective) =>
Objective = objective;
public CollectObjective Objective{ get; set; }
public CollectObjective Objective { get; set; }
private int GetCurrentTotal()
{
@ -124,8 +120,7 @@ namespace Server.Engines.MLQuests.Objectives
Item[] items = pack.FindItemsByType(checkType, false);
foreach (Item item in items)
if (item.QuestItem && !MLQuestSystem.CanMarkQuestItem(pm, item, checkType)
) // does another quest still need this item? (OSI just unmarks everything)
if (item.QuestItem && !MLQuestSystem.CanMarkQuestItem(pm, item, checkType)) // does another quest still need this item? (OSI just unmarks everything)
item.QuestItem = false;
}

20
Projects/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs
View file

@ -27,15 +27,15 @@ namespace Server.Engines.MLQuests.Objectives
}
}
public Type Delivery{ get; set; }
public Type Delivery { get; set; }
public int Amount{ get; set; }
public int Amount { get; set; }
public TextDefinition Name{ get; set; }
public TextDefinition Name { get; set; }
public Type Destination{ get; set; }
public Type Destination { get; set; }
public bool SpawnsDelivery{ get; set; }
public bool SpawnsDelivery { get; set; }
public virtual void SpawnDelivery(Container pack)
{
@ -90,8 +90,6 @@ namespace Server.Engines.MLQuests.Objectives
public override BaseObjectiveInstance CreateInstance(MLQuestInstance instance) => new DeliverObjectiveInstance(this, instance);
}
#region Timed
public class TimedDeliverObjective : DeliverObjective
{
public TimedDeliverObjective(TimeSpan duration, Type delivery, int amount, TextDefinition name, Type destination,
@ -100,20 +98,18 @@ namespace Server.Engines.MLQuests.Objectives
Duration = duration;
public override bool IsTimed => true;
public override TimeSpan Duration{ get; }
public override TimeSpan Duration { get; }
}
#endregion
public class DeliverObjectiveInstance : BaseObjectiveInstance
{
public DeliverObjectiveInstance(DeliverObjective objective, MLQuestInstance instance)
: base(instance, objective) =>
Objective = objective;
public DeliverObjective Objective{ get; set; }
public DeliverObjective Objective { get; set; }
public bool HasCompleted{ get; set; }
public bool HasCompleted { get; set; }
public override DataType ExtraDataType => DataType.DeliverObjective;

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();

6
Projects/Scripts/Engines/MLQuests/Objectives/GainSkillObjective.cs
View file

@ -29,9 +29,9 @@ namespace Server.Engines.MLQuests.Objectives
m_Flags |= GainSkillObjectiveFlags.Accelerate;
}
public SkillName Skill{ get; set; }
public SkillName Skill { get; set; }
public int ThresholdFixed{ get; set; }
public int ThresholdFixed { get; set; }
public bool UseReal
{
@ -91,7 +91,7 @@ namespace Server.Engines.MLQuests.Objectives
: base(instance, objective) =>
Objective = objective;
public GainSkillObjective Objective{ get; set; }
public GainSkillObjective Objective { get; set; }
public bool Handles(SkillName skill) => Objective.Skill == skill;

25
Projects/Scripts/Engines/MLQuests/Objectives/KillObjective.cs
View file

@ -6,8 +6,7 @@ namespace Server.Engines.MLQuests.Objectives
{
public class KillObjective : BaseObjective
{
public KillObjective(
public KillObjective(
int amount = 0, Type[] types = null, TextDefinition name = null, QuestArea area = null)
{
DesiredAmount = amount;
@ -16,13 +15,13 @@ namespace Server.Engines.MLQuests.Objectives
Area = area;
}
public int DesiredAmount{ get; set; }
public int DesiredAmount { get; set; }
public Type[] AcceptedTypes{ get; set; }
public Type[] AcceptedTypes { get; set; }
public TextDefinition Name{ get; set; }
public TextDefinition Name { get; set; }
public QuestArea Area{ get; set; }
public QuestArea Area { get; set; }
public override void WriteToGump(Gump g, ref int y)
{
@ -38,8 +37,6 @@ namespace Server.Engines.MLQuests.Objectives
y += 16;
#region Location
if (Area != null)
{
g.AddHtmlLocalized(103, y, 312, 20, 1018327, 0x15F90); // Location
@ -51,15 +48,11 @@ namespace Server.Engines.MLQuests.Objectives
y += 16;
}
#endregion
}
public override BaseObjectiveInstance CreateInstance(MLQuestInstance instance) => new KillObjectiveInstance(this, instance);
}
#region Timed
public class TimedKillObjective : KillObjective
{
public TimedKillObjective(TimeSpan duration, int amount, Type[] types, TextDefinition name, QuestArea area = null)
@ -67,11 +60,9 @@ namespace Server.Engines.MLQuests.Objectives
Duration = duration;
public override bool IsTimed => true;
public override TimeSpan Duration{ get; }
public override TimeSpan Duration { get; }
}
#endregion
public class KillObjectiveInstance : BaseObjectiveInstance
{
public KillObjectiveInstance(KillObjective objective, MLQuestInstance instance)
@ -81,9 +72,9 @@ namespace Server.Engines.MLQuests.Objectives
Slain = 0;
}
public KillObjective Objective{ get; set; }
public KillObjective Objective { get; set; }
public int Slain{ get; set; }
public int Slain { get; set; }
public override DataType ExtraDataType => DataType.KillObjective;