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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Scripts/Engines/Quests/Core/BaseQuester.cs
View file

@ -26,7 +26,7 @@ namespace Server.Engines.Quests
public abstract class BaseQuester : BaseVendor
{
protected List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override bool IsActiveVendor => false;
public override bool IsInvulnerable => true;
@ -34,7 +34,8 @@ namespace Server.Engines.Quests
public override bool ClickTitle => false;
public override bool CanTeach => false;
public virtual int TalkNumber{ get{ return 6146; } } // Talk
public virtual int TalkNumber // Talk
=> 6146;
public override void InitSBInfo()
{

3
Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs
View file

@ -18,7 +18,8 @@ namespace Server.Engines.Quests
public abstract bool GetDestination( PlayerMobile player, ref Point3D loc, ref Map map );
public virtual int NotWorkingMessage{ get{ return 500309; } } // Nothing Happens.
public virtual int NotWorkingMessage // Nothing Happens.
=> 500309;
public override bool OnMoveOver( Mobile m )
{

10
Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs
View file

@ -12,21 +12,21 @@ namespace Server.Engines.Quests
[CommandProperty( AccessLevel.GameMaster )]
public Point3D DestLoc
{
get{ return m_DestLoc; }
set{ m_DestLoc = value; }
get => m_DestLoc;
set => m_DestLoc = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Map DestMap
{
get{ return m_DestMap; }
set{ m_DestMap = value; }
get => m_DestMap;
set => m_DestMap = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get{ return m_Charges; }
get => m_Charges;
set{ m_Charges = value; InvalidateProperties(); }
}

12
Scripts/Engines/Quests/Core/QuestConversation.cs
View file

@ -11,19 +11,19 @@ namespace Server.Engines.Quests
public abstract object Message{ get; }
public virtual QuestItemInfo[] Info{ get{ return null; } }
public virtual bool Logged{ get{ return true; } }
public virtual QuestItemInfo[] Info => null;
public virtual bool Logged => true;
public QuestSystem System
{
get{ return m_System; }
set{ m_System = value; }
get => m_System;
set => m_System = value;
}
public bool HasBeenRead
{
get{ return m_HasBeenRead; }
set{ m_HasBeenRead = value; }
get => m_HasBeenRead;
set => m_HasBeenRead = value;
}
public QuestConversation()

8
Scripts/Engines/Quests/Core/QuestItemInfo.cs
View file

@ -9,14 +9,14 @@ namespace Server.Engines.Quests
public object Name
{
get{ return m_Name; }
set{ m_Name = value; }
get => m_Name;
set => m_Name = value;
}
public int ItemID
{
get{ return m_ItemID; }
set{ m_ItemID = value; }
get => m_ItemID;
set => m_ItemID = value;
}
public QuestItemInfo( object name, int itemID )

28
Scripts/Engines/Quests/Core/QuestObjective.cs
View file

@ -15,42 +15,36 @@ namespace Server.Engines.Quests
public abstract object Message{ get; }
public virtual int MaxProgress{ get{ return 1; } }
public virtual QuestItemInfo[] Info{ get{ return null; } }
public virtual int MaxProgress => 1;
public virtual QuestItemInfo[] Info => null;
public QuestSystem System
{
get{ return m_System; }
set{ m_System = value; }
get => m_System;
set => m_System = value;
}
public bool HasBeenRead
{
get{ return m_HasBeenRead; }
set{ m_HasBeenRead = value; }
get => m_HasBeenRead;
set => m_HasBeenRead = value;
}
public int CurProgress
{
get{ return m_CurProgress; }
get => m_CurProgress;
set{ m_CurProgress = value; CheckCompletionStatus(); }
}
public bool HasCompleted
{
get{ return m_HasCompleted; }
set{ m_HasCompleted = value; }
get => m_HasCompleted;
set => m_HasCompleted = value;
}
public virtual bool Completed
{
get{ return m_CurProgress >= MaxProgress; }
}
public virtual bool Completed => m_CurProgress >= MaxProgress;
public bool IsSingleObjective
{
get{ return ( MaxProgress == 1 ); }
}
public bool IsSingleObjective => ( MaxProgress == 1 );
public QuestObjective()
{

8
Scripts/Engines/Quests/Core/QuestRestartInfo.cs
View file

@ -9,14 +9,14 @@ namespace Server.Engines.Quests
public Type QuestType
{
get{ return m_QuestType; }
set{ m_QuestType = value; }
get => m_QuestType;
set => m_QuestType = value;
}
public DateTime RestartTime
{
get{ return m_RestartTime; }
set{ m_RestartTime = value; }
get => m_RestartTime;
set => m_RestartTime = value;
}
public void Reset( TimeSpan restartDelay )

12
Scripts/Engines/Quests/Core/QuestSystem.cs
View file

@ -44,20 +44,20 @@ namespace Server.Engines.Quests
public PlayerMobile From
{
get{ return m_From; }
set{ m_From = value; }
get => m_From;
set => m_From = value;
}
public ArrayList Objectives
{
get{ return m_Objectives; }
set{ m_Objectives = value; }
get => m_Objectives;
set => m_Objectives = value;
}
public ArrayList Conversations
{
get{ return m_Conversations; }
set{ m_Conversations = value; }
get => m_Conversations;
set => m_Conversations = value;
}
private Timer m_Timer;

2
Scripts/Engines/Quests/Core/Regions/CancelQuestRegion.cs
View file

@ -9,7 +9,7 @@ namespace Server.Engines.Quests
{
private Type m_Quest;
public Type Quest{ get{ return m_Quest; } }
public Type Quest => m_Quest;
public CancelQuestRegion( XmlElement xml, Map map, Region parent ) : base( xml, map, parent )
{

4
Scripts/Engines/Quests/Core/Regions/QuestCompleteObjectiveRegion.cs
View file

@ -10,8 +10,8 @@ namespace Server.Engines.Quests
private Type m_Quest;
private Type m_Objective;
public Type Quest{ get{ return m_Quest ; } }
public Type Objective{ get{ return m_Objective; } }
public Type Quest => m_Quest;
public Type Objective => m_Objective;
public QuestCompleteObjectiveRegion( XmlElement xml, Map map, Region parent ) : base( xml, map, parent )
{

8
Scripts/Engines/Quests/Core/Regions/QuestNoEntryRegion.cs
View file

@ -12,10 +12,10 @@ namespace Server.Engines.Quests
private Type m_MaxObjective;
private int m_Message;
public Type Quest{ get{ return m_Quest; } }
public Type MinObjective{ get{ return m_MinObjective; } }
public Type MaxObjective{ get{ return m_MaxObjective; } }
public int Message{ get{ return m_Message; } }
public Type Quest => m_Quest;
public Type MinObjective => m_MinObjective;
public Type MaxObjective => m_MaxObjective;
public int Message => m_Message;
public QuestNoEntryRegion( XmlElement xml, Map map, Region parent ) : base( xml, map, parent )
{

2
Scripts/Engines/Quests/Core/Regions/QuestOfferRegion.cs
View file

@ -9,7 +9,7 @@ namespace Server.Engines.Quests
{
private Type m_Quest;
public Type Quest{ get{ return m_Quest ; } }
public Type Quest => m_Quest;
public QuestOfferRegion( XmlElement xml, Map map, Region parent ) : base( xml, map, parent )
{