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

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

100
Scripts/Engines/MLQuests/Objectives/KillObjective.cs
View file

@ -6,34 +6,13 @@ namespace Server.Engines.MLQuests.Objectives
{
public class KillObjective : BaseObjective
{
private int m_DesiredAmount;
private Type[] m_AcceptedTypes; // Example of Type[] requirement on OSI: killing X bone magis or skeletal mages (probably the same type on OSI though?)
private TextDefinition m_Name;
private QuestArea m_Area;
public int DesiredAmount { get; set; }
public int DesiredAmount
{
get => m_DesiredAmount;
set => m_DesiredAmount = value;
}
public Type[] AcceptedTypes { get; set; }
public Type[] AcceptedTypes
{
get => m_AcceptedTypes;
set => m_AcceptedTypes = value;
}
public TextDefinition Name { get; set; }
public TextDefinition Name
{
get => m_Name;
set => m_Name = value;
}
public QuestArea Area
{
get => m_Area;
set => m_Area = value;
}
public QuestArea Area { get; set; }
public KillObjective()
: this( 0, null, null, null )
@ -47,35 +26,35 @@ namespace Server.Engines.MLQuests.Objectives
public KillObjective( int amount, Type[] types, TextDefinition name, QuestArea area )
{
m_DesiredAmount = amount;
m_AcceptedTypes = types;
m_Name = name;
m_Area = area;
DesiredAmount = amount;
AcceptedTypes = types;
Name = name;
Area = area;
}
public override void WriteToGump( Gump g, ref int y )
{
string amount = m_DesiredAmount.ToString();
string amount = DesiredAmount.ToString();
g.AddHtmlLocalized( 98, y, 312, 16, 1072204, 0x15F90, false, false ); // Slay
g.AddLabel( 133, y, 0x481, amount );
if ( m_Name.Number > 0 )
g.AddHtmlLocalized( 133 + amount.Length * 15, y, 190, 18, m_Name.Number, 0x77BF, false, false );
else if ( m_Name.String != null )
g.AddLabel( 133 + amount.Length * 15, y, 0x481, m_Name.String );
if ( Name.Number > 0 )
g.AddHtmlLocalized( 133 + amount.Length * 15, y, 190, 18, Name.Number, 0x77BF, false, false );
else if ( Name.String != null )
g.AddLabel( 133 + amount.Length * 15, y, 0x481, Name.String );
y += 16;
#region Location
if ( m_Area != null )
if ( Area != null )
{
g.AddHtmlLocalized( 103, y, 312, 20, 1018327, 0x15F90, false, false ); // Location
if ( m_Area.Name.Number > 0 )
g.AddHtmlLocalized( 223, y, 312, 20, m_Area.Name.Number, 0xFFFFFF, false, false );
else if ( m_Area.Name.String != null )
g.AddLabel( 223, y, 0x481, m_Area.Name.String );
if ( Area.Name.Number > 0 )
g.AddHtmlLocalized( 223, y, 312, 20, Area.Name.Number, 0xFFFFFF, false, false );
else if ( Area.Name.String != null )
g.AddLabel( 223, y, 0x481, Area.Name.String );
y += 16;
}
@ -92,10 +71,8 @@ namespace Server.Engines.MLQuests.Objectives
public class TimedKillObjective : KillObjective
{
private TimeSpan m_Duration;
public override bool IsTimed => true;
public override TimeSpan Duration => m_Duration;
public override TimeSpan Duration { get; }
public TimedKillObjective( TimeSpan duration, int amount, Type[] types, TextDefinition name )
: this( duration, amount, types, name, null )
@ -105,7 +82,7 @@ namespace Server.Engines.MLQuests.Objectives
public TimedKillObjective( TimeSpan duration, int amount, Type[] types, TextDefinition name, QuestArea area )
: base( amount, types, name, area )
{
m_Duration = duration;
Duration = duration;
}
}
@ -113,45 +90,34 @@ namespace Server.Engines.MLQuests.Objectives
public class KillObjectiveInstance : BaseObjectiveInstance
{
private KillObjective m_Objective;
private int m_Slain;
public KillObjective Objective { get; set; }
public KillObjective Objective
{
get => m_Objective;
set => m_Objective = value;
}
public int Slain
{
get => m_Slain;
set => m_Slain = value;
}
public int Slain { get; set; }
public KillObjectiveInstance( KillObjective objective, MLQuestInstance instance )
: base( instance, objective )
{
m_Objective = objective;
m_Slain = 0;
Objective = objective;
Slain = 0;
}
public bool AddKill( Mobile mob, Type type )
{
int desired = m_Objective.DesiredAmount;
int desired = Objective.DesiredAmount;
foreach ( Type acceptedType in m_Objective.AcceptedTypes )
foreach ( Type acceptedType in Objective.AcceptedTypes )
{
if ( acceptedType.IsAssignableFrom( type ) )
{
if ( m_Objective.Area != null && !m_Objective.Area.Contains( mob ) )
if ( Objective.Area != null && !Objective.Area.Contains( mob ) )
return false;
PlayerMobile pm = Instance.Player;
if ( ++m_Slain >= desired )
if ( ++Slain >= desired )
pm.SendLocalizedMessage( 1075050 ); // You have killed all the required quest creatures of this type.
else
pm.SendLocalizedMessage( 1075051, ( desired - m_Slain ).ToString() ); // You have killed a quest creature. ~1_val~ more left.
pm.SendLocalizedMessage( 1075051, ( desired - Slain ).ToString() ); // You have killed a quest creature. ~1_val~ more left.
return true;
}
@ -162,17 +128,17 @@ namespace Server.Engines.MLQuests.Objectives
public override bool IsCompleted()
{
return ( m_Slain >= m_Objective.DesiredAmount );
return ( Slain >= Objective.DesiredAmount );
}
public override void WriteToGump( Gump g, ref int y )
{
m_Objective.WriteToGump( g, ref y );
Objective.WriteToGump( g, ref y );
base.WriteToGump( g, ref y );
g.AddHtmlLocalized( 103, y, 120, 16, 3000087, 0x15F90, false, false ); // Total
g.AddLabel( 223, y, 0x481, m_Slain.ToString() );
g.AddLabel( 223, y, 0x481, Slain.ToString() );
y += 16;
g.AddHtmlLocalized( 103, y, 120, 16, 1074782, 0x15F90, false, false ); // Return to
@ -186,7 +152,7 @@ namespace Server.Engines.MLQuests.Objectives
{
base.Serialize( writer );
writer.Write( m_Slain );
writer.Write( Slain );
}
}
}