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

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;
}