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

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

126
Scripts/Engines/MLQuests/MLQuest.cs
View file

@ -15,84 +15,29 @@ namespace Server.Engines.MLQuests
public class MLQuest
{
private bool m_Deserialized;
private bool m_SaveEnabled;
public bool Deserialized { get; set; }
public bool Deserialized
{
get => m_Deserialized;
set => m_Deserialized = value;
}
public bool SaveEnabled
{
get => m_SaveEnabled;
set => m_SaveEnabled = value;
}
private bool m_Activated;
private List<BaseObjective> m_Objectives;
private ObjectiveType m_ObjectiveType;
private List<BaseReward> m_Rewards;
private List<MLQuestInstance> m_Instances;
private TextDefinition m_Title;
private TextDefinition m_Description;
private TextDefinition m_RefuseMessage;
private TextDefinition m_InProgressMessage;
private TextDefinition m_CompletionMessage;
private TextDefinition m_CompletionNotice;
public bool SaveEnabled { get; set; }
// TODO: Flags? (Deserialized, SaveEnabled, Activated)
private bool m_OneTimeOnly;
private bool m_HasRestartDelay;
public bool Activated
{
get => m_Activated;
set => m_Activated = value;
}
public bool Activated { get; set; }
public List<BaseObjective> Objectives
{
get => m_Objectives;
set => m_Objectives = value;
}
public List<BaseObjective> Objectives { get; set; }
public ObjectiveType ObjectiveType
{
get => m_ObjectiveType;
set => m_ObjectiveType = value;
}
public ObjectiveType ObjectiveType { get; set; }
public List<BaseReward> Rewards
{
get => m_Rewards;
set => m_Rewards = value;
}
public List<BaseReward> Rewards { get; set; }
public List<MLQuestInstance> Instances
{
get => m_Instances;
set => m_Instances = value;
}
public List<MLQuestInstance> Instances { get; set; }
public bool OneTimeOnly
{
get => m_OneTimeOnly;
set => m_OneTimeOnly = value;
}
public bool OneTimeOnly { get; set; }
public bool HasRestartDelay
{
get => m_HasRestartDelay;
set => m_HasRestartDelay = value;
}
public bool HasRestartDelay { get; set; }
public bool HasObjective<T>() where T : BaseObjective
{
foreach ( BaseObjective obj in m_Objectives )
foreach ( BaseObjective obj in Objectives )
{
if ( obj is T )
return true;
@ -107,29 +52,22 @@ namespace Server.Engines.MLQuests
public bool RequiresCollection => HasObjective<CollectObjective>() || HasObjective<DeliverObjective>();
public virtual bool RecordCompletion => ( m_OneTimeOnly || m_HasRestartDelay );
public virtual bool RecordCompletion => ( OneTimeOnly || HasRestartDelay );
public virtual bool IsChainTriggered => false;
public virtual Type NextQuest => null;
public TextDefinition Title { get => m_Title;
set => m_Title = value;
}
public TextDefinition Description { get => m_Description;
set => m_Description = value;
}
public TextDefinition RefusalMessage { get => m_RefuseMessage;
set => m_RefuseMessage = value;
}
public TextDefinition InProgressMessage { get => m_InProgressMessage;
set => m_InProgressMessage = value;
}
public TextDefinition CompletionMessage { get => m_CompletionMessage;
set => m_CompletionMessage = value;
}
public TextDefinition CompletionNotice { get => m_CompletionNotice;
set => m_CompletionNotice = value;
}
public TextDefinition Title { get; set; }
public TextDefinition Description { get; set; }
public TextDefinition RefusalMessage { get; set; }
public TextDefinition InProgressMessage { get; set; }
public TextDefinition CompletionMessage { get; set; }
public TextDefinition CompletionNotice { get; set; }
public static readonly TextDefinition CompletionNoticeDefault = new TextDefinition( 1072273 ); // You've completed a quest! Don't forget to collect your reward.
public static readonly TextDefinition CompletionNoticeShort = new TextDefinition( 1046258 ); // Your quest is complete.
@ -138,15 +76,15 @@ namespace Server.Engines.MLQuests
public MLQuest()
{
m_Activated = false;
m_Objectives = new List<BaseObjective>();
m_ObjectiveType = ObjectiveType.All;
m_Rewards = new List<BaseReward>();
m_CompletionNotice = CompletionNoticeDefault;
Activated = false;
Objectives = new List<BaseObjective>();
ObjectiveType = ObjectiveType.All;
Rewards = new List<BaseReward>();
CompletionNotice = CompletionNoticeDefault;
m_Instances = new List<MLQuestInstance>();
Instances = new List<MLQuestInstance>();
m_SaveEnabled = true;
SaveEnabled = true;
}
public virtual void Generate()
@ -208,7 +146,7 @@ namespace Server.Engines.MLQuests
public virtual bool CanOffer( IQuestGiver quester, PlayerMobile pm, MLQuestContext context, bool message )
{
if ( !m_Activated || quester.Deleted )
if ( !Activated || quester.Deleted )
return false;
if ( context != null )
@ -253,7 +191,7 @@ namespace Server.Engines.MLQuests
}
}
foreach ( BaseObjective obj in m_Objectives )
foreach ( BaseObjective obj in Objectives )
{
if ( !obj.CanOffer( quester, pm, message ) )
return false;
@ -333,7 +271,7 @@ namespace Server.Engines.MLQuests
return; // not saved or no longer exists
quest.Refresh( oldVersion );
quest.m_Deserialized = true;
quest.Deserialized = true;
}
public virtual int Version => 0;