Fixes body expression style.

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

View file

@ -345,8 +345,8 @@ namespace Server
public int this[AosAttribute attribute]
{
get { return GetValue( (int)attribute ); }
set { SetValue( (int)attribute, value ); }
get => GetValue( (int)attribute );
set => SetValue( (int)attribute, value );
}
public override string ToString()
@ -389,76 +389,124 @@ namespace Server
}
[CommandProperty( AccessLevel.GameMaster )]
public int RegenHits { get { return this[AosAttribute.RegenHits]; } set { this[AosAttribute.RegenHits] = value; } }
public int RegenHits { get => this[AosAttribute.RegenHits];
set => this[AosAttribute.RegenHits] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int RegenStam { get { return this[AosAttribute.RegenStam]; } set { this[AosAttribute.RegenStam] = value; } }
public int RegenStam { get => this[AosAttribute.RegenStam];
set => this[AosAttribute.RegenStam] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int RegenMana { get { return this[AosAttribute.RegenMana]; } set { this[AosAttribute.RegenMana] = value; } }
public int RegenMana { get => this[AosAttribute.RegenMana];
set => this[AosAttribute.RegenMana] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int DefendChance { get { return this[AosAttribute.DefendChance]; } set { this[AosAttribute.DefendChance] = value; } }
public int DefendChance { get => this[AosAttribute.DefendChance];
set => this[AosAttribute.DefendChance] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int AttackChance { get { return this[AosAttribute.AttackChance]; } set { this[AosAttribute.AttackChance] = value; } }
public int AttackChance { get => this[AosAttribute.AttackChance];
set => this[AosAttribute.AttackChance] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int BonusStr { get { return this[AosAttribute.BonusStr]; } set { this[AosAttribute.BonusStr] = value; } }
public int BonusStr { get => this[AosAttribute.BonusStr];
set => this[AosAttribute.BonusStr] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int BonusDex { get { return this[AosAttribute.BonusDex]; } set { this[AosAttribute.BonusDex] = value; } }
public int BonusDex { get => this[AosAttribute.BonusDex];
set => this[AosAttribute.BonusDex] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int BonusInt { get { return this[AosAttribute.BonusInt]; } set { this[AosAttribute.BonusInt] = value; } }
public int BonusInt { get => this[AosAttribute.BonusInt];
set => this[AosAttribute.BonusInt] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int BonusHits { get { return this[AosAttribute.BonusHits]; } set { this[AosAttribute.BonusHits] = value; } }
public int BonusHits { get => this[AosAttribute.BonusHits];
set => this[AosAttribute.BonusHits] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int BonusStam { get { return this[AosAttribute.BonusStam]; } set { this[AosAttribute.BonusStam] = value; } }
public int BonusStam { get => this[AosAttribute.BonusStam];
set => this[AosAttribute.BonusStam] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int BonusMana { get { return this[AosAttribute.BonusMana]; } set { this[AosAttribute.BonusMana] = value; } }
public int BonusMana { get => this[AosAttribute.BonusMana];
set => this[AosAttribute.BonusMana] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int WeaponDamage { get { return this[AosAttribute.WeaponDamage]; } set { this[AosAttribute.WeaponDamage] = value; } }
public int WeaponDamage { get => this[AosAttribute.WeaponDamage];
set => this[AosAttribute.WeaponDamage] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int WeaponSpeed { get { return this[AosAttribute.WeaponSpeed]; } set { this[AosAttribute.WeaponSpeed] = value; } }
public int WeaponSpeed { get => this[AosAttribute.WeaponSpeed];
set => this[AosAttribute.WeaponSpeed] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int SpellDamage { get { return this[AosAttribute.SpellDamage]; } set { this[AosAttribute.SpellDamage] = value; } }
public int SpellDamage { get => this[AosAttribute.SpellDamage];
set => this[AosAttribute.SpellDamage] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int CastRecovery { get { return this[AosAttribute.CastRecovery]; } set { this[AosAttribute.CastRecovery] = value; } }
public int CastRecovery { get => this[AosAttribute.CastRecovery];
set => this[AosAttribute.CastRecovery] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int CastSpeed { get { return this[AosAttribute.CastSpeed]; } set { this[AosAttribute.CastSpeed] = value; } }
public int CastSpeed { get => this[AosAttribute.CastSpeed];
set => this[AosAttribute.CastSpeed] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int LowerManaCost { get { return this[AosAttribute.LowerManaCost]; } set { this[AosAttribute.LowerManaCost] = value; } }
public int LowerManaCost { get => this[AosAttribute.LowerManaCost];
set => this[AosAttribute.LowerManaCost] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int LowerRegCost { get { return this[AosAttribute.LowerRegCost]; } set { this[AosAttribute.LowerRegCost] = value; } }
public int LowerRegCost { get => this[AosAttribute.LowerRegCost];
set => this[AosAttribute.LowerRegCost] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ReflectPhysical { get { return this[AosAttribute.ReflectPhysical]; } set { this[AosAttribute.ReflectPhysical] = value; } }
public int ReflectPhysical { get => this[AosAttribute.ReflectPhysical];
set => this[AosAttribute.ReflectPhysical] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int EnhancePotions { get { return this[AosAttribute.EnhancePotions]; } set { this[AosAttribute.EnhancePotions] = value; } }
public int EnhancePotions { get => this[AosAttribute.EnhancePotions];
set => this[AosAttribute.EnhancePotions] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Luck { get { return this[AosAttribute.Luck]; } set { this[AosAttribute.Luck] = value; } }
public int Luck { get => this[AosAttribute.Luck];
set => this[AosAttribute.Luck] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int SpellChanneling { get { return this[AosAttribute.SpellChanneling]; } set { this[AosAttribute.SpellChanneling] = value; } }
public int SpellChanneling { get => this[AosAttribute.SpellChanneling];
set => this[AosAttribute.SpellChanneling] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int NightSight { get { return this[AosAttribute.NightSight]; } set { this[AosAttribute.NightSight] = value; } }
public int NightSight { get => this[AosAttribute.NightSight];
set => this[AosAttribute.NightSight] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int IncreasedKarmaLoss { get { return this[AosAttribute.IncreasedKarmaLoss]; } set { this[AosAttribute.IncreasedKarmaLoss] = value; } }
public int IncreasedKarmaLoss { get => this[AosAttribute.IncreasedKarmaLoss];
set => this[AosAttribute.IncreasedKarmaLoss] = value;
}
}
[Flags]
@ -541,8 +589,8 @@ namespace Server
public int this[AosWeaponAttribute attribute]
{
get { return GetValue( (int)attribute ); }
set { SetValue( (int)attribute, value ); }
get => GetValue( (int)attribute );
set => SetValue( (int)attribute, value );
}
public override string ToString()
@ -551,79 +599,129 @@ namespace Server
}
[CommandProperty( AccessLevel.GameMaster )]
public int LowerStatReq { get { return this[AosWeaponAttribute.LowerStatReq]; } set { this[AosWeaponAttribute.LowerStatReq] = value; } }
public int LowerStatReq { get => this[AosWeaponAttribute.LowerStatReq];
set => this[AosWeaponAttribute.LowerStatReq] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int SelfRepair { get { return this[AosWeaponAttribute.SelfRepair]; } set { this[AosWeaponAttribute.SelfRepair] = value; } }
public int SelfRepair { get => this[AosWeaponAttribute.SelfRepair];
set => this[AosWeaponAttribute.SelfRepair] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitLeechHits { get { return this[AosWeaponAttribute.HitLeechHits]; } set { this[AosWeaponAttribute.HitLeechHits] = value; } }
public int HitLeechHits { get => this[AosWeaponAttribute.HitLeechHits];
set => this[AosWeaponAttribute.HitLeechHits] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitLeechStam { get { return this[AosWeaponAttribute.HitLeechStam]; } set { this[AosWeaponAttribute.HitLeechStam] = value; } }
public int HitLeechStam { get => this[AosWeaponAttribute.HitLeechStam];
set => this[AosWeaponAttribute.HitLeechStam] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitLeechMana { get { return this[AosWeaponAttribute.HitLeechMana]; } set { this[AosWeaponAttribute.HitLeechMana] = value; } }
public int HitLeechMana { get => this[AosWeaponAttribute.HitLeechMana];
set => this[AosWeaponAttribute.HitLeechMana] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitLowerAttack { get { return this[AosWeaponAttribute.HitLowerAttack]; } set { this[AosWeaponAttribute.HitLowerAttack] = value; } }
public int HitLowerAttack { get => this[AosWeaponAttribute.HitLowerAttack];
set => this[AosWeaponAttribute.HitLowerAttack] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitLowerDefend { get { return this[AosWeaponAttribute.HitLowerDefend]; } set { this[AosWeaponAttribute.HitLowerDefend] = value; } }
public int HitLowerDefend { get => this[AosWeaponAttribute.HitLowerDefend];
set => this[AosWeaponAttribute.HitLowerDefend] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitMagicArrow { get { return this[AosWeaponAttribute.HitMagicArrow]; } set { this[AosWeaponAttribute.HitMagicArrow] = value; } }
public int HitMagicArrow { get => this[AosWeaponAttribute.HitMagicArrow];
set => this[AosWeaponAttribute.HitMagicArrow] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitHarm { get { return this[AosWeaponAttribute.HitHarm]; } set { this[AosWeaponAttribute.HitHarm] = value; } }
public int HitHarm { get => this[AosWeaponAttribute.HitHarm];
set => this[AosWeaponAttribute.HitHarm] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitFireball { get { return this[AosWeaponAttribute.HitFireball]; } set { this[AosWeaponAttribute.HitFireball] = value; } }
public int HitFireball { get => this[AosWeaponAttribute.HitFireball];
set => this[AosWeaponAttribute.HitFireball] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitLightning { get { return this[AosWeaponAttribute.HitLightning]; } set { this[AosWeaponAttribute.HitLightning] = value; } }
public int HitLightning { get => this[AosWeaponAttribute.HitLightning];
set => this[AosWeaponAttribute.HitLightning] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitDispel { get { return this[AosWeaponAttribute.HitDispel]; } set { this[AosWeaponAttribute.HitDispel] = value; } }
public int HitDispel { get => this[AosWeaponAttribute.HitDispel];
set => this[AosWeaponAttribute.HitDispel] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitColdArea { get { return this[AosWeaponAttribute.HitColdArea]; } set { this[AosWeaponAttribute.HitColdArea] = value; } }
public int HitColdArea { get => this[AosWeaponAttribute.HitColdArea];
set => this[AosWeaponAttribute.HitColdArea] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitFireArea { get { return this[AosWeaponAttribute.HitFireArea]; } set { this[AosWeaponAttribute.HitFireArea] = value; } }
public int HitFireArea { get => this[AosWeaponAttribute.HitFireArea];
set => this[AosWeaponAttribute.HitFireArea] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitPoisonArea { get { return this[AosWeaponAttribute.HitPoisonArea]; } set { this[AosWeaponAttribute.HitPoisonArea] = value; } }
public int HitPoisonArea { get => this[AosWeaponAttribute.HitPoisonArea];
set => this[AosWeaponAttribute.HitPoisonArea] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitEnergyArea { get { return this[AosWeaponAttribute.HitEnergyArea]; } set { this[AosWeaponAttribute.HitEnergyArea] = value; } }
public int HitEnergyArea { get => this[AosWeaponAttribute.HitEnergyArea];
set => this[AosWeaponAttribute.HitEnergyArea] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitPhysicalArea { get { return this[AosWeaponAttribute.HitPhysicalArea]; } set { this[AosWeaponAttribute.HitPhysicalArea] = value; } }
public int HitPhysicalArea { get => this[AosWeaponAttribute.HitPhysicalArea];
set => this[AosWeaponAttribute.HitPhysicalArea] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ResistPhysicalBonus { get { return this[AosWeaponAttribute.ResistPhysicalBonus]; } set { this[AosWeaponAttribute.ResistPhysicalBonus] = value; } }
public int ResistPhysicalBonus { get => this[AosWeaponAttribute.ResistPhysicalBonus];
set => this[AosWeaponAttribute.ResistPhysicalBonus] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ResistFireBonus { get { return this[AosWeaponAttribute.ResistFireBonus]; } set { this[AosWeaponAttribute.ResistFireBonus] = value; } }
public int ResistFireBonus { get => this[AosWeaponAttribute.ResistFireBonus];
set => this[AosWeaponAttribute.ResistFireBonus] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ResistColdBonus { get { return this[AosWeaponAttribute.ResistColdBonus]; } set { this[AosWeaponAttribute.ResistColdBonus] = value; } }
public int ResistColdBonus { get => this[AosWeaponAttribute.ResistColdBonus];
set => this[AosWeaponAttribute.ResistColdBonus] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ResistPoisonBonus { get { return this[AosWeaponAttribute.ResistPoisonBonus]; } set { this[AosWeaponAttribute.ResistPoisonBonus] = value; } }
public int ResistPoisonBonus { get => this[AosWeaponAttribute.ResistPoisonBonus];
set => this[AosWeaponAttribute.ResistPoisonBonus] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ResistEnergyBonus { get { return this[AosWeaponAttribute.ResistEnergyBonus]; } set { this[AosWeaponAttribute.ResistEnergyBonus] = value; } }
public int ResistEnergyBonus { get => this[AosWeaponAttribute.ResistEnergyBonus];
set => this[AosWeaponAttribute.ResistEnergyBonus] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int UseBestSkill { get { return this[AosWeaponAttribute.UseBestSkill]; } set { this[AosWeaponAttribute.UseBestSkill] = value; } }
public int UseBestSkill { get => this[AosWeaponAttribute.UseBestSkill];
set => this[AosWeaponAttribute.UseBestSkill] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int MageWeapon { get { return this[AosWeaponAttribute.MageWeapon]; } set { this[AosWeaponAttribute.MageWeapon] = value; } }
public int MageWeapon { get => this[AosWeaponAttribute.MageWeapon];
set => this[AosWeaponAttribute.MageWeapon] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int DurabilityBonus { get { return this[AosWeaponAttribute.DurabilityBonus]; } set { this[AosWeaponAttribute.DurabilityBonus] = value; } }
public int DurabilityBonus { get => this[AosWeaponAttribute.DurabilityBonus];
set => this[AosWeaponAttribute.DurabilityBonus] = value;
}
}
[Flags]
@ -685,8 +783,8 @@ namespace Server
public int this[AosArmorAttribute attribute]
{
get { return GetValue( (int)attribute ); }
set { SetValue( (int)attribute, value ); }
get => GetValue( (int)attribute );
set => SetValue( (int)attribute, value );
}
public override string ToString()
@ -695,16 +793,24 @@ namespace Server
}
[CommandProperty( AccessLevel.GameMaster )]
public int LowerStatReq { get { return this[AosArmorAttribute.LowerStatReq]; } set { this[AosArmorAttribute.LowerStatReq] = value; } }
public int LowerStatReq { get => this[AosArmorAttribute.LowerStatReq];
set => this[AosArmorAttribute.LowerStatReq] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int SelfRepair { get { return this[AosArmorAttribute.SelfRepair]; } set { this[AosArmorAttribute.SelfRepair] = value; } }
public int SelfRepair { get => this[AosArmorAttribute.SelfRepair];
set => this[AosArmorAttribute.SelfRepair] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int MageArmor { get { return this[AosArmorAttribute.MageArmor]; } set { this[AosArmorAttribute.MageArmor] = value; } }
public int MageArmor { get => this[AosArmorAttribute.MageArmor];
set => this[AosArmorAttribute.MageArmor] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int DurabilityBonus { get { return this[AosArmorAttribute.DurabilityBonus]; } set { this[AosArmorAttribute.DurabilityBonus] = value; } }
public int DurabilityBonus { get => this[AosArmorAttribute.DurabilityBonus];
set => this[AosArmorAttribute.DurabilityBonus] = value;
}
}
public sealed class AosSkillBonuses : BaseAttributes
@ -911,34 +1017,54 @@ namespace Server
[CommandProperty( AccessLevel.GameMaster )]
public double Skill_1_Value { get { return GetBonus( 0 ); } set { SetBonus( 0, value ); } }
public double Skill_1_Value { get => GetBonus( 0 );
set => SetBonus( 0, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public SkillName Skill_1_Name { get { return GetSkill( 0 ); } set { SetSkill( 0, value ); } }
public SkillName Skill_1_Name { get => GetSkill( 0 );
set => SetSkill( 0, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public double Skill_2_Value { get { return GetBonus( 1 ); } set { SetBonus( 1, value ); } }
public double Skill_2_Value { get => GetBonus( 1 );
set => SetBonus( 1, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public SkillName Skill_2_Name { get { return GetSkill( 1 ); } set { SetSkill( 1, value ); } }
public SkillName Skill_2_Name { get => GetSkill( 1 );
set => SetSkill( 1, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public double Skill_3_Value { get { return GetBonus( 2 ); } set { SetBonus( 2, value ); } }
public double Skill_3_Value { get => GetBonus( 2 );
set => SetBonus( 2, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public SkillName Skill_3_Name { get { return GetSkill( 2 ); } set { SetSkill( 2, value ); } }
public SkillName Skill_3_Name { get => GetSkill( 2 );
set => SetSkill( 2, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public double Skill_4_Value { get { return GetBonus( 3 ); } set { SetBonus( 3, value ); } }
public double Skill_4_Value { get => GetBonus( 3 );
set => SetBonus( 3, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public SkillName Skill_4_Name { get { return GetSkill( 3 ); } set { SetSkill( 3, value ); } }
public SkillName Skill_4_Name { get => GetSkill( 3 );
set => SetSkill( 3, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public double Skill_5_Value { get { return GetBonus( 4 ); } set { SetBonus( 4, value ); } }
public double Skill_5_Value { get => GetBonus( 4 );
set => SetBonus( 4, value );
}
[CommandProperty( AccessLevel.GameMaster )]
public SkillName Skill_5_Name { get { return GetSkill( 4 ); } set { SetSkill( 4, value ); } }
public SkillName Skill_5_Name { get => GetSkill( 4 );
set => SetSkill( 4, value );
}
}
[Flags]
@ -972,8 +1098,8 @@ namespace Server
public int this[AosElementAttribute attribute]
{
get { return GetValue( (int)attribute ); }
set { SetValue( (int)attribute, value ); }
get => GetValue( (int)attribute );
set => SetValue( (int)attribute, value );
}
public override string ToString()
@ -982,25 +1108,39 @@ namespace Server
}
[CommandProperty( AccessLevel.GameMaster )]
public int Physical { get { return this[AosElementAttribute.Physical]; } set { this[AosElementAttribute.Physical] = value; } }
public int Physical { get => this[AosElementAttribute.Physical];
set => this[AosElementAttribute.Physical] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Fire { get { return this[AosElementAttribute.Fire]; } set { this[AosElementAttribute.Fire] = value; } }
public int Fire { get => this[AosElementAttribute.Fire];
set => this[AosElementAttribute.Fire] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Cold { get { return this[AosElementAttribute.Cold]; } set { this[AosElementAttribute.Cold] = value; } }
public int Cold { get => this[AosElementAttribute.Cold];
set => this[AosElementAttribute.Cold] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Poison { get { return this[AosElementAttribute.Poison]; } set { this[AosElementAttribute.Poison] = value; } }
public int Poison { get => this[AosElementAttribute.Poison];
set => this[AosElementAttribute.Poison] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Energy { get { return this[AosElementAttribute.Energy]; } set { this[AosElementAttribute.Energy] = value; } }
public int Energy { get => this[AosElementAttribute.Energy];
set => this[AosElementAttribute.Energy] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Chaos { get { return this[AosElementAttribute.Chaos]; } set { this[AosElementAttribute.Chaos] = value; } }
public int Chaos { get => this[AosElementAttribute.Chaos];
set => this[AosElementAttribute.Chaos] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Direct { get { return this[AosElementAttribute.Direct]; } set { this[AosElementAttribute.Direct] = value; } }
public int Direct { get => this[AosElementAttribute.Direct];
set => this[AosElementAttribute.Direct] = value;
}
}
[PropertyObject]
@ -1012,7 +1152,7 @@ namespace Server
private static int[] m_Empty = new int[0];
public bool IsEmpty { get { return (m_Names == 0); } }
public bool IsEmpty => (m_Names == 0);
public Item Owner => m_Owner;
public BaseAttributes( Item owner )

View file

@ -15,10 +15,7 @@ namespace Server.Misc
private static bool m_Restarting;
private static DateTime m_RestartTime;
public static bool Restarting
{
get{ return m_Restarting; }
}
public static bool Restarting => m_Restarting;
public static void Initialize()
{

View file

@ -20,8 +20,8 @@ namespace Server.Misc
public static bool SavesEnabled
{
get{ return m_SavesEnabled; }
set{ m_SavesEnabled = value; }
get => m_SavesEnabled;
set => m_SavesEnabled = value;
}
[Usage( "SetSaves <true | false>" )]

View file

@ -31,62 +31,32 @@ namespace Server.Misc
public static ClientVersion Required
{
get
{
return m_Required;
}
set
{
m_Required = value;
}
get => m_Required;
set => m_Required = value;
}
public static bool AllowRegular
{
get
{
return m_AllowRegular;
}
set
{
m_AllowRegular = value;
}
get => m_AllowRegular;
set => m_AllowRegular = value;
}
public static bool AllowUOTD
{
get
{
return m_AllowUOTD;
}
set
{
m_AllowUOTD = value;
}
get => m_AllowUOTD;
set => m_AllowUOTD = value;
}
public static bool AllowGod
{
get
{
return m_AllowGod;
}
set
{
m_AllowGod = value;
}
get => m_AllowGod;
set => m_AllowGod = value;
}
public static TimeSpan KickDelay
{
get
{
return m_KickDelay;
}
set
{
m_KickDelay = value;
}
get => m_KickDelay;
set => m_KickDelay = value;
}
public static void Initialize()

View file

@ -63,15 +63,9 @@ namespace Server
private Type[] m_ArgumentTypes;
public TypeBuilder Type
{
get { return m_TypeBuilder; }
}
public TypeBuilder Type => m_TypeBuilder;
public ILGenerator Generator
{
get { return m_Generator; }
}
public ILGenerator Generator => m_Generator;
private class CallInfo
{
@ -95,10 +89,7 @@ namespace Server
private Dictionary<Type, Queue<LocalBuilder>> m_Temps;
public MethodBuilder Method
{
get { return m_Builder; }
}
public MethodBuilder Method => m_Builder;
public MethodEmitter( TypeBuilder typeBuilder )
{
@ -464,10 +455,7 @@ namespace Server
m_Generator.Emit( OpCodes.Xor );
}
public Type Active
{
get { return m_Stack.Peek(); }
}
public Type Active => m_Stack.Peek();
public void Chain( Property prop )
{

View file

@ -29,10 +29,10 @@ namespace Server.Misc
private int angle;
private int quadrant;
public Point2D Point{ get{ return point; } }
public int Angle{ get{ return angle; } }
public int Quadrant{ get{ return quadrant; } }
public Point2D Point => point;
public int Angle => angle;
public int Quadrant => quadrant;
public CirclePoint( Point2D point, int angle, int quadrant )
{
this.point = point;

View file

@ -28,7 +28,9 @@ namespace Server.Items
private string m_Dipper;
[CommandProperty( AccessLevel.GameMaster )]
public string Dipper{ get{ return m_Dipper; } set{ m_Dipper = value; } }
public string Dipper{ get => m_Dipper;
set => m_Dipper = value;
}
[Constructible]
public LightOfTheWinterSolstice() : this( m_StaffNames[Utility.Random( m_StaffNames.Length )] )

View file

@ -74,10 +74,7 @@ namespace Server.Items
}
}
public Item Deed
{
get{ return new MistletoeDeed( this.Hue ); }
}
public Item Deed => new MistletoeDeed( this.Hue );
public override void OnDoubleClick( Mobile from )
{

View file

@ -39,17 +39,17 @@ namespace Server.Guilds
new RankDefinition( 1062960, 3, RankFlags.Member | RankFlags.ControlWarStatus ), //Warlord
new RankDefinition( 1062959, 4, RankFlags.All ) //Leader
};
public static RankDefinition Leader{ get{ return Ranks[4]; } }
public static RankDefinition Member{ get{ return Ranks[1]; } }
public static RankDefinition Lowest{ get{ return Ranks[0]; } }
public static RankDefinition Leader => Ranks[4];
public static RankDefinition Member => Ranks[1];
public static RankDefinition Lowest => Ranks[0];
private TextDefinition m_Name;
private int m_Rank;
private RankFlags m_Flags;
public TextDefinition Name{ get{ return m_Name; } }
public int Rank{ get{ return m_Rank; } }
public RankFlags Flags{ get{ return m_Flags; } }
public TextDefinition Name => m_Name;
public int Rank => m_Rank;
public RankFlags Flags => m_Flags;
public RankDefinition( TextDefinition name, int rank, RankFlags flags )
{
@ -79,20 +79,14 @@ namespace Server.Guilds
{
private static Dictionary<string, AllianceInfo> m_Alliances = new Dictionary<string, AllianceInfo>();
public static Dictionary<string, AllianceInfo> Alliances
{
get{ return m_Alliances; }
}
public static Dictionary<string, AllianceInfo> Alliances => m_Alliances;
private string m_Name;
private Guild m_Leader;
private List<Guild> m_Members;
private List<Guild> m_PendingMembers;
public string Name
{
get{ return m_Name; }
}
public string Name => m_Name;
public void CalculateAllianceLeader()
{
@ -374,7 +368,7 @@ namespace Server.Guilds
public class AllianceRosterGump : GuildDiplomacyGump
{
protected override bool AllowAdvancedSearch{ get{ return false; } }
protected override bool AllowAdvancedSearch => false;
private AllianceInfo m_Alliance;
@ -427,36 +421,32 @@ namespace Server.Guilds
public int Kills
{
get{ return m_Kills; }
set{ m_Kills = value; }
get => m_Kills;
set => m_Kills = value;
}
public int MaxKills
{
get{ return m_MaxKills; }
set{ m_MaxKills = value; }
get => m_MaxKills;
set => m_MaxKills = value;
}
public TimeSpan WarLength
{
get{ return m_WarLength; }
set{ m_WarLength = value; }
}
public Guild Opponent
{
get{ return m_Opponent; }
}
public Guild Guild
{
get{ return m_Guild; }
get => m_WarLength;
set => m_WarLength = value;
}
public Guild Opponent => m_Opponent;
public Guild Guild => m_Guild;
public DateTime WarBeginning
{
get{ return m_WarBeginning; }
set{ m_WarBeginning = value; }
get => m_WarBeginning;
set => m_WarBeginning = value;
}
public bool WarRequester
{
get{ return m_WarRequester; }
set{ m_WarRequester = value; }
get => m_WarRequester;
set => m_WarRequester = value;
}
public WarDeclaration( Guild g, Guild opponent, int maxKills, TimeSpan warLength, bool warRequester )
@ -673,8 +663,8 @@ namespace Server.Guilds
}
#endregion
public static bool NewGuildSystem{ get{ return Core.SE; } }
public static bool OrderChaos{ get{ return !Core.SE; } }
public static bool NewGuildSystem => Core.SE;
public static bool OrderChaos => !Core.SE;
public static readonly int RegistrationFee = 25000;
public static readonly int AbbrevLimit = 4;
@ -721,40 +711,16 @@ namespace Server.Guilds
}
[CommandProperty( AccessLevel.Counselor )]
public string AllianceName
{
get
{
return Alliance?.Name;
}
}
public string AllianceName => Alliance?.Name;
[CommandProperty( AccessLevel.Counselor )]
public Guild AllianceLeader
{
get
{
return Alliance?.Leader;
}
}
public Guild AllianceLeader => Alliance?.Leader;
[CommandProperty( AccessLevel.Counselor )]
public bool IsAllianceMember
{
get
{
return Alliance?.IsMember( this ) == true;
}
}
public bool IsAllianceMember => Alliance?.IsMember( this ) == true;
[CommandProperty( AccessLevel.Counselor )]
public bool IsAlliancePendingMember
{
get
{
return Alliance?.IsPendingMember( this ) == true;
}
}
public bool IsAlliancePendingMember => Alliance?.IsPendingMember( this ) == true;
public static Guild GetAllianceLeader( Guild g )
{
@ -770,14 +736,9 @@ namespace Server.Guilds
#region New Wars
public List<WarDeclaration> PendingWars
{
get{ return m_PendingWars; }
}
public List<WarDeclaration> AcceptedWars
{
get{ return m_AcceptedWars; }
}
public List<WarDeclaration> PendingWars => m_PendingWars;
public List<WarDeclaration> AcceptedWars => m_AcceptedWars;
public WarDeclaration FindPendingWar( Guild g )
@ -1047,13 +1008,7 @@ namespace Server.Guilds
}
public override bool Disbanded
{
get
{
return ( m_Leader == null || m_Leader.Deleted );
}
}
public override bool Disbanded => ( m_Leader == null || m_Leader.Deleted );
public override void OnDelete( Mobile mob )
{
@ -1600,36 +1555,21 @@ namespace Server.Guilds
[CommandProperty( AccessLevel.GameMaster )]
public Item Guildstone
{
get
{
return m_Guildstone;
}
set
{
m_Guildstone = value;
}
get => m_Guildstone;
set => m_Guildstone = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Item Teleporter
{
get
{
return m_Teleporter;
}
set
{
m_Teleporter = value;
}
get => m_Teleporter;
set => m_Teleporter = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public override string Name
{
get
{
return m_Name;
}
get => m_Name;
set
{
m_Name = value;
@ -1643,23 +1583,14 @@ namespace Server.Guilds
[CommandProperty( AccessLevel.GameMaster )]
public string Website
{
get
{
return m_Website;
}
set
{
m_Website = value;
}
get => m_Website;
set => m_Website = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public override string Abbreviation
{
get
{
return m_Abbreviation;
}
get => m_Abbreviation;
set
{
m_Abbreviation = value;
@ -1673,23 +1604,14 @@ namespace Server.Guilds
[CommandProperty( AccessLevel.GameMaster )]
public string Charter
{
get
{
return m_Charter;
}
set
{
m_Charter = value;
}
get => m_Charter;
set => m_Charter = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public override GuildType Type
{
get
{
return OrderChaos ? m_Type : GuildType.Regular;
}
get => OrderChaos ? m_Type : GuildType.Regular;
set
{
if ( m_Type != value )
@ -1705,96 +1627,31 @@ namespace Server.Guilds
[CommandProperty( AccessLevel.GameMaster )]
public DateTime LastFealty
{
get
{
return m_LastFealty;
}
set
{
m_LastFealty = value;
}
get => m_LastFealty;
set => m_LastFealty = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime TypeLastChange
{
get
{
return m_TypeLastChange;
}
}
public DateTime TypeLastChange => m_TypeLastChange;
public List<Guild> Allies
{
get
{
return m_Allies;
}
}
public List<Guild> Allies => m_Allies;
public List<Guild> Enemies
{
get
{
return m_Enemies;
}
}
public List<Guild> Enemies => m_Enemies;
public List<Guild> AllyDeclarations
{
get
{
return m_AllyDeclarations;
}
}
public List<Guild> AllyDeclarations => m_AllyDeclarations;
public List<Guild> AllyInvitations
{
get
{
return m_AllyInvitations;
}
}
public List<Guild> AllyInvitations => m_AllyInvitations;
public List<Guild> WarDeclarations
{
get
{
return m_WarDeclarations;
}
}
public List<Guild> WarDeclarations => m_WarDeclarations;
public List<Guild> WarInvitations
{
get
{
return m_WarInvitations;
}
}
public List<Guild> WarInvitations => m_WarInvitations;
public List<Mobile> Candidates
{
get
{
return m_Candidates;
}
}
public List<Mobile> Candidates => m_Candidates;
public List<Mobile> Accepted
{
get
{
return m_Accepted;
}
}
public List<Mobile> Accepted => m_Accepted;
public List<Mobile> Members => m_Members;
public List<Mobile> Members
{
get
{
return m_Members;
}
}
#endregion
}
}

View file

@ -22,81 +22,81 @@ namespace Server
private DateTime m_TimeReceived;
[CommandProperty( AccessLevel.GameMaster )]
public int CpuModel{ get{ return m_CpuModel; } }
public int CpuModel => m_CpuModel;
[CommandProperty( AccessLevel.GameMaster )]
public int CpuClockSpeed{ get{ return m_CpuClockSpeed; } }
public int CpuClockSpeed => m_CpuClockSpeed;
[CommandProperty( AccessLevel.GameMaster )]
public int CpuQuantity{ get{ return m_CpuQuantity; } }
public int CpuQuantity => m_CpuQuantity;
[CommandProperty( AccessLevel.GameMaster )]
public int OSMajor{ get{ return m_OSMajor; } }
public int OSMajor => m_OSMajor;
[CommandProperty( AccessLevel.GameMaster )]
public int OSMinor{ get{ return m_OSMinor; } }
public int OSMinor => m_OSMinor;
[CommandProperty( AccessLevel.GameMaster )]
public int OSRevision{ get{ return m_OSRevision; } }
public int OSRevision => m_OSRevision;
[CommandProperty( AccessLevel.GameMaster )]
public int InstanceID{ get{ return m_InstanceID; } }
public int InstanceID => m_InstanceID;
[CommandProperty( AccessLevel.GameMaster )]
public int ScreenWidth{ get{ return m_ScreenWidth; } }
public int ScreenWidth => m_ScreenWidth;
[CommandProperty( AccessLevel.GameMaster )]
public int ScreenHeight{ get{ return m_ScreenHeight; } }
public int ScreenHeight => m_ScreenHeight;
[CommandProperty( AccessLevel.GameMaster )]
public int ScreenDepth{ get{ return m_ScreenDepth; } }
public int ScreenDepth => m_ScreenDepth;
[CommandProperty( AccessLevel.GameMaster )]
public int PhysicalMemory{ get{ return m_PhysicalMemory; } }
public int PhysicalMemory => m_PhysicalMemory;
[CommandProperty( AccessLevel.GameMaster )]
public int CpuManufacturer{ get{ return m_CpuManufacturer; } }
public int CpuManufacturer => m_CpuManufacturer;
[CommandProperty( AccessLevel.GameMaster )]
public int CpuFamily{ get{ return m_CpuFamily; } }
public int CpuFamily => m_CpuFamily;
[CommandProperty( AccessLevel.GameMaster )]
public int VCVendorID{ get{ return m_VCVendorID; } }
public int VCVendorID => m_VCVendorID;
[CommandProperty( AccessLevel.GameMaster )]
public int VCDeviceID{ get{ return m_VCDeviceID; } }
public int VCDeviceID => m_VCDeviceID;
[CommandProperty( AccessLevel.GameMaster )]
public int VCMemory{ get{ return m_VCMemory; } }
public int VCMemory => m_VCMemory;
[CommandProperty( AccessLevel.GameMaster )]
public int DXMajor{ get{ return m_DXMajor; } }
public int DXMajor => m_DXMajor;
[CommandProperty( AccessLevel.GameMaster )]
public int DXMinor{ get{ return m_DXMinor; } }
public int DXMinor => m_DXMinor;
[CommandProperty( AccessLevel.GameMaster )]
public string VCDescription{ get{ return m_VCDescription; } }
public string VCDescription => m_VCDescription;
[CommandProperty( AccessLevel.GameMaster )]
public string Language{ get{ return m_Language; } }
public string Language => m_Language;
[CommandProperty( AccessLevel.GameMaster )]
public int Distribution{ get{ return m_Distribution; } }
public int Distribution => m_Distribution;
[CommandProperty( AccessLevel.GameMaster )]
public int ClientsRunning{ get{ return m_ClientsRunning; } }
public int ClientsRunning => m_ClientsRunning;
[CommandProperty( AccessLevel.GameMaster )]
public int ClientsInstalled{ get{ return m_ClientsInstalled; } }
public int ClientsInstalled => m_ClientsInstalled;
[CommandProperty( AccessLevel.GameMaster )]
public int PartialInstalled{ get{ return m_PartialInstalled; } }
public int PartialInstalled => m_PartialInstalled;
[CommandProperty( AccessLevel.GameMaster )]
public string Unknown{ get{ return m_Unknown; } }
public string Unknown => m_Unknown;
[CommandProperty( AccessLevel.GameMaster )]
[CommandProperty( AccessLevel.GameMaster )]
public DateTime TimeReceived => m_TimeReceived;
public static void Initialize()

View file

@ -287,13 +287,13 @@ namespace Server.Misc
public string[] Syllables
{
get{ return m_Syllables; }
set{ m_Syllables = value; }
get => m_Syllables;
set => m_Syllables = value;
}
public string[] Keywords
{
get{ return m_Keywords; }
get => m_Keywords;
set
{
m_Keywords = value;
@ -305,26 +305,26 @@ namespace Server.Misc
public string[] Responses
{
get{ return m_Responses; }
set{ m_Responses = value; }
get => m_Responses;
set => m_Responses = value;
}
public int Hue
{
get{ return m_Hue; }
set{ m_Hue = value; }
get => m_Hue;
set => m_Hue = value;
}
public int Sound
{
get{ return m_Sound; }
set{ m_Sound = value; }
get => m_Sound;
set => m_Sound = value;
}
public IHSFlags Flags
{
get{ return m_Flags; }
set{ m_Flags = value; }
get => m_Flags;
set => m_Flags = value;
}
public string GetRandomSyllable()

View file

@ -33,11 +33,11 @@ namespace Server.Misc
string m_Country_LocalName;
bool m_HasLocalInfo;
public string Code{ get{ return m_Code; } }
public string Language{ get{ return m_Language; } }
public string Country{ get{ return m_Country; } }
public string Language_LocalName{ get{ return m_Language_LocalName; } }
public string Country_LocalName{ get{ return m_Country_LocalName; } }
public string Code => m_Code;
public string Language => m_Language;
public string Country => m_Country;
public string Language_LocalName => m_Language_LocalName;
public string Country_LocalName => m_Country_LocalName;
public InternationalCode( string code, string language, string country ) : this( code, language, country, null, null )
{
@ -316,8 +316,8 @@ namespace Server.Misc
private string m_Code;
private int m_Count;
public string Code{ get{ return m_Code; } }
public int Count{ get{ return m_Count; } }
public string Code => m_Code;
public int Count => m_Count;
public InternationalCodeCounter( string code )
{

View file

@ -15,7 +15,7 @@ namespace Server
public static int LevelOverride
{
get{ return m_LevelOverride; }
get => m_LevelOverride;
set
{
m_LevelOverride = value;

View file

@ -16,15 +16,15 @@ namespace Server
typeof( WildStaff )
};
public static Type[] MLWeaponTypes{ get{ return m_MLWeaponTypes; } }
public static Type[] MLWeaponTypes => m_MLWeaponTypes;
private static Type[] m_MLRangedWeaponTypes = new Type[]
{
typeof( ElvenCompositeLongbow ), typeof( MagicalShortbow )
};
public static Type[] MLRangedWeaponTypes{ get{ return m_MLRangedWeaponTypes; } }
public static Type[] MLRangedWeaponTypes => m_MLRangedWeaponTypes;
private static Type[] m_MLArmorTypes = new Type[]
{
typeof( Circlet ), typeof( GemmedCirclet ), typeof( LeafTonlet ),
@ -37,7 +37,7 @@ namespace Server
typeof( HidePauldrons )
};
public static Type[] MLArmorTypes{ get{ return m_MLArmorTypes; } }
public static Type[] MLArmorTypes => m_MLArmorTypes;
private static Type[] m_MLClothingTypes = new Type[]
{
@ -46,7 +46,8 @@ namespace Server
typeof( VultureHelm ), typeof( WoodlandBelt )
};
public static Type[] MLClothingTypes{ get{ return m_MLClothingTypes; } }
public static Type[] MLClothingTypes => m_MLClothingTypes;
#endregion
private static Type[] m_SEWeaponTypes = new Type[]
@ -57,7 +58,7 @@ namespace Server
typeof( Tetsubo ), typeof( Wakizashi )
};
public static Type[] SEWeaponTypes{ get{ return m_SEWeaponTypes; } }
public static Type[] SEWeaponTypes => m_SEWeaponTypes;
private static Type[] m_AosWeaponTypes = new Type[]
{
@ -66,7 +67,7 @@ namespace Server
typeof( Lance ), typeof( CrescentBlade )
};
public static Type[] AosWeaponTypes{ get{ return m_AosWeaponTypes; } }
public static Type[] AosWeaponTypes => m_AosWeaponTypes;
private static Type[] m_WeaponTypes = new Type[]
{
@ -84,28 +85,28 @@ namespace Server
typeof( Dagger ), typeof( SkinningKnife ), typeof( ShepherdsCrook )
};
public static Type[] WeaponTypes{ get{ return m_WeaponTypes; } }
public static Type[] WeaponTypes => m_WeaponTypes;
private static Type[] m_SERangedWeaponTypes = new Type[]
{
typeof( Yumi )
};
public static Type[] SERangedWeaponTypes{ get{ return m_SERangedWeaponTypes; } }
public static Type[] SERangedWeaponTypes => m_SERangedWeaponTypes;
private static Type[] m_AosRangedWeaponTypes = new Type[]
{
typeof( CompositeBow ), typeof( RepeatingCrossbow )
};
public static Type[] AosRangedWeaponTypes{ get{ return m_AosRangedWeaponTypes; } }
public static Type[] AosRangedWeaponTypes => m_AosRangedWeaponTypes;
private static Type[] m_RangedWeaponTypes = new Type[]
{
typeof( Bow ), typeof( Crossbow ), typeof( HeavyCrossbow )
};
public static Type[] RangedWeaponTypes{ get{ return m_RangedWeaponTypes; } }
public static Type[] RangedWeaponTypes => m_RangedWeaponTypes;
private static Type[] m_SEArmorTypes = new Type[]
{
@ -121,7 +122,7 @@ namespace Server
typeof( StuddedSuneate )
};
public static Type[] SEArmorTypes{ get{ return m_SEArmorTypes; } }
public static Type[] SEArmorTypes => m_SEArmorTypes;
private static Type[] m_ArmorTypes = new Type[]
{
@ -141,14 +142,14 @@ namespace Server
typeof( StuddedGorget ), typeof( StuddedLegs )
};
public static Type[] ArmorTypes{ get{ return m_ArmorTypes; } }
public static Type[] ArmorTypes => m_ArmorTypes;
private static Type[] m_AosShieldTypes = new Type[]
{
typeof( ChaosShield ), typeof( OrderShield )
};
public static Type[] AosShieldTypes{ get{ return m_AosShieldTypes; } }
public static Type[] AosShieldTypes => m_AosShieldTypes;
private static Type[] m_ShieldTypes = new Type[]
{
@ -157,7 +158,7 @@ namespace Server
typeof( WoodenShield )
};
public static Type[] ShieldTypes{ get{ return m_ShieldTypes; } }
public static Type[] ShieldTypes => m_ShieldTypes;
private static Type[] m_GemTypes = new Type[]
{
@ -166,7 +167,7 @@ namespace Server
typeof( Sapphire ), typeof( StarSapphire ), typeof( Tourmaline )
};
public static Type[] GemTypes{ get{ return m_GemTypes; } }
public static Type[] GemTypes => m_GemTypes;
private static Type[] m_JewelryTypes = new Type[]
{
@ -174,7 +175,7 @@ namespace Server
typeof( SilverRing ), typeof( SilverBracelet )
};
public static Type[] JewelryTypes{ get{ return m_JewelryTypes; } }
public static Type[] JewelryTypes => m_JewelryTypes;
private static Type[] m_RegTypes = new Type[]
{
@ -183,7 +184,7 @@ namespace Server
typeof( SulfurousAsh ), typeof( SpidersSilk )
};
public static Type[] RegTypes{ get{ return m_RegTypes; } }
public static Type[] RegTypes => m_RegTypes;
private static Type[] m_NecroRegTypes = new Type[]
{
@ -191,7 +192,7 @@ namespace Server
typeof( NoxCrystal ), typeof( PigIron )
};
public static Type[] NecroRegTypes{ get{ return m_NecroRegTypes; } }
public static Type[] NecroRegTypes => m_NecroRegTypes;
private static Type[] m_PotionTypes = new Type[]
{
@ -199,14 +200,14 @@ namespace Server
typeof( LesserCurePotion ), typeof( LesserHealPotion ), typeof( LesserPoisonPotion )
};
public static Type[] PotionTypes{ get{ return m_PotionTypes; } }
public static Type[] PotionTypes => m_PotionTypes;
private static Type[] m_SEInstrumentTypes = new Type[]
{
typeof( BambooFlute )
};
public static Type[] SEInstrumentTypes{ get{ return m_SEInstrumentTypes; } }
public static Type[] SEInstrumentTypes => m_SEInstrumentTypes;
private static Type[] m_InstrumentTypes = new Type[]
{
@ -214,7 +215,7 @@ namespace Server
typeof( Lute ), typeof( Tambourine ), typeof( TambourineTassel )
};
public static Type[] InstrumentTypes{ get{ return m_InstrumentTypes; } }
public static Type[] InstrumentTypes => m_InstrumentTypes;
private static Type[] m_StatueTypes = new Type[]
{
@ -223,7 +224,7 @@ namespace Server
typeof( StatueSouthEast ), typeof( BustSouth ), typeof( BustEast )
};
public static Type[] StatueTypes{ get{ return m_StatueTypes; } }
public static Type[] StatueTypes => m_StatueTypes;
private static Type[] m_RegularScrollTypes = new Type[]
{
@ -274,12 +275,14 @@ namespace Server
};
#endregion
public static Type[] RegularScrollTypes{ get{ return m_RegularScrollTypes; } }
public static Type[] NecromancyScrollTypes{ get{ return m_NecromancyScrollTypes; } }
public static Type[] SENecromancyScrollTypes{ get{ return m_SENecromancyScrollTypes; } }
public static Type[] PaladinScrollTypes{ get{ return m_PaladinScrollTypes; } }
public static Type[] RegularScrollTypes => m_RegularScrollTypes;
public static Type[] NecromancyScrollTypes => m_NecromancyScrollTypes;
public static Type[] SENecromancyScrollTypes => m_SENecromancyScrollTypes;
public static Type[] PaladinScrollTypes => m_PaladinScrollTypes;
#region Mondain's Legacy
public static Type[] ArcanistScrollTypes{ get{ return m_ArcanistScrollTypes; } }
public static Type[] ArcanistScrollTypes => m_ArcanistScrollTypes;
#endregion
private static Type[] m_GrimmochJournalTypes = new Type[]
@ -289,7 +292,7 @@ namespace Server
typeof( GrimmochJournal14 ), typeof( GrimmochJournal17 ), typeof( GrimmochJournal23 )
};
public static Type[] GrimmochJournalTypes{ get{ return m_GrimmochJournalTypes; } }
public static Type[] GrimmochJournalTypes => m_GrimmochJournalTypes;
private static Type[] m_LysanderNotebookTypes = new Type[]
{
@ -297,7 +300,7 @@ namespace Server
typeof( LysanderNotebook7 ), typeof( LysanderNotebook8 ), typeof( LysanderNotebook11 )
};
public static Type[] LysanderNotebookTypes{ get{ return m_LysanderNotebookTypes; } }
public static Type[] LysanderNotebookTypes => m_LysanderNotebookTypes;
private static Type[] m_TavarasJournalTypes = new Type[]
{
@ -308,7 +311,7 @@ namespace Server
typeof( TavarasJournal19 )
};
public static Type[] TavarasJournalTypes{ get{ return m_TavarasJournalTypes; } }
public static Type[] TavarasJournalTypes => m_TavarasJournalTypes;
private static Type[] m_NewWandTypes = new Type[]
@ -316,20 +319,20 @@ namespace Server
typeof( FireballWand ), typeof( LightningWand ), typeof( MagicArrowWand ),
typeof( GreaterHealWand ), typeof( HarmWand ), typeof( HealWand )
};
public static Type[] NewWandTypes{ get{ return m_NewWandTypes; } }
public static Type[] NewWandTypes => m_NewWandTypes;
private static Type[] m_WandTypes = new Type[]
{
typeof( ClumsyWand ), typeof( FeebleWand ),
typeof( ManaDrainWand ), typeof( WeaknessWand )
};
public static Type[] WandTypes{ get{ return m_WandTypes; } }
public static Type[] WandTypes => m_WandTypes;
private static Type[] m_OldWandTypes = new Type[]
{
typeof( IDWand )
};
public static Type[] OldWandTypes{ get{ return m_OldWandTypes; } }
public static Type[] OldWandTypes => m_OldWandTypes;
private static Type[] m_SEClothingTypes = new Type[]
{
@ -339,7 +342,7 @@ namespace Server
typeof( SamuraiTabi ), typeof( TattsukeHakama ), typeof( Waraji )
};
public static Type[] SEClothingTypes{ get{ return m_SEClothingTypes; } }
public static Type[] SEClothingTypes => m_SEClothingTypes;
private static Type[] m_AosClothingTypes = new Type[]
{
@ -347,7 +350,7 @@ namespace Server
typeof( GildedDress ), typeof( FurBoots ), typeof( FormalShirt ),
};
public static Type[] AosClothingTypes{ get{ return m_AosClothingTypes; } }
public static Type[] AosClothingTypes => m_AosClothingTypes;
private static Type[] m_ClothingTypes = new Type[]
{
@ -364,21 +367,21 @@ namespace Server
typeof( PlainDress ), typeof( Robe ), typeof( ShortPants ),
typeof( HalfApron )
};
public static Type[] ClothingTypes{ get{ return m_ClothingTypes; } }
public static Type[] ClothingTypes => m_ClothingTypes;
private static Type[] m_SEHatTypes = new Type[]
{
typeof( ClothNinjaHood ), typeof( Kasa )
};
public static Type[] SEHatTypes{ get{ return m_SEHatTypes; } }
public static Type[] SEHatTypes => m_SEHatTypes;
private static Type[] m_AosHatTypes = new Type[]
{
typeof( FlowerGarland ), typeof( BearMask ), typeof( DeerMask ) //Are Bear& Deer mask inside the Pre-AoS loottables too?
};
public static Type[] AosHatTypes{ get{ return m_AosHatTypes; } }
public static Type[] AosHatTypes => m_AosHatTypes;
private static Type[] m_HatTypes = new Type[]
{
@ -388,7 +391,7 @@ namespace Server
typeof( FeatheredHat ), typeof( TricorneHat ), typeof( JesterHat )
};
public static Type[] HatTypes{ get{ return m_HatTypes; } }
public static Type[] HatTypes => m_HatTypes;
private static Type[] m_LibraryBookTypes = new Type[]
{
@ -404,7 +407,7 @@ namespace Server
typeof( VirtueBook )
};
public static Type[] LibraryBookTypes{ get{ return m_LibraryBookTypes; } }
public static Type[] LibraryBookTypes => m_LibraryBookTypes;
#endregion

View file

@ -465,13 +465,14 @@ namespace Server
#endregion
#region Generic accessors
public static LootPack Poor{ get{ return Core.SE ? SePoor : Core.AOS ? AosPoor : OldPoor; } }
public static LootPack Meager{ get{ return Core.SE ? SeMeager : Core.AOS ? AosMeager : OldMeager; } }
public static LootPack Average{ get{ return Core.SE ? SeAverage : Core.AOS ? AosAverage : OldAverage; } }
public static LootPack Rich{ get{ return Core.SE ? SeRich : Core.AOS ? AosRich : OldRich; } }
public static LootPack FilthyRich{ get{ return Core.SE ? SeFilthyRich : Core.AOS ? AosFilthyRich : OldFilthyRich; } }
public static LootPack UltraRich{ get{ return Core.SE ? SeUltraRich : Core.AOS ? AosUltraRich : OldUltraRich; } }
public static LootPack SuperBoss{ get{ return Core.SE ? SeSuperBoss : Core.AOS ? AosSuperBoss : OldSuperBoss; } }
public static LootPack Poor => Core.SE ? SePoor : Core.AOS ? AosPoor : OldPoor;
public static LootPack Meager => Core.SE ? SeMeager : Core.AOS ? AosMeager : OldMeager;
public static LootPack Average => Core.SE ? SeAverage : Core.AOS ? AosAverage : OldAverage;
public static LootPack Rich => Core.SE ? SeRich : Core.AOS ? AosRich : OldRich;
public static LootPack FilthyRich => Core.SE ? SeFilthyRich : Core.AOS ? AosFilthyRich : OldFilthyRich;
public static LootPack UltraRich => Core.SE ? SeUltraRich : Core.AOS ? AosUltraRich : OldUltraRich;
public static LootPack SuperBoss => Core.SE ? SeSuperBoss : Core.AOS ? AosSuperBoss : OldSuperBoss;
#endregion
public static readonly LootPack LowScrolls = new LootPack( new LootPackEntry[]
@ -528,38 +529,38 @@ namespace Server
public int Chance
{
get{ return m_Chance; }
set{ m_Chance = value; }
get => m_Chance;
set => m_Chance = value;
}
public LootPackDice Quantity
{
get{ return m_Quantity; }
set{ m_Quantity = value; }
get => m_Quantity;
set => m_Quantity = value;
}
public int MaxProps
{
get{ return m_MaxProps; }
set{ m_MaxProps = value; }
get => m_MaxProps;
set => m_MaxProps = value;
}
public int MinIntensity
{
get{ return m_MinIntensity; }
set{ m_MinIntensity = value; }
get => m_MinIntensity;
set => m_MinIntensity = value;
}
public int MaxIntensity
{
get{ return m_MaxIntensity; }
set{ m_MaxIntensity = value; }
get => m_MaxIntensity;
set => m_MaxIntensity = value;
}
public LootPackItem[] Items
{
get{ return m_Items; }
set{ m_Items = value; }
get => m_Items;
set => m_Items = value;
}
private static bool IsInTokuno( Mobile m )
@ -795,14 +796,14 @@ namespace Server
public Type Type
{
get{ return m_Type; }
set{ m_Type = value; }
get => m_Type;
set => m_Type = value;
}
public int Chance
{
get{ return m_Chance; }
set{ m_Chance = value; }
get => m_Chance;
set => m_Chance = value;
}
private static Type[] m_BlankTypes = new Type[]{ typeof( BlankScroll ) };
@ -907,20 +908,20 @@ namespace Server
public int Count
{
get{ return m_Count; }
set{ m_Count = value; }
get => m_Count;
set => m_Count = value;
}
public int Sides
{
get{ return m_Sides; }
set{ m_Sides = value; }
get => m_Sides;
set => m_Sides = value;
}
public int Bonus
{
get{ return m_Bonus; }
set{ m_Bonus = value; }
get => m_Bonus;
set => m_Bonus = value;
}
public int Roll()

View file

@ -10,8 +10,8 @@ namespace Server
private string m_Type;
private string[] m_List;
public string Type{ get{ return m_Type; } }
public string[] List{ get{ return m_List; } }
public string Type => m_Type;
public string[] List => m_List;
public bool ContainsName( string name )
{

View file

@ -75,7 +75,9 @@ namespace Server
private int m_LastDamage;
private int m_Index;
public Mobile From{ get{ return m_From; } set{ m_From = value; } }
public Mobile From{ get => m_From;
set => m_From = value;
}
public PoisonTimer( Mobile m, PoisonImpl p ) : base( p.m_Delay, p.m_Interval )
{

View file

@ -59,9 +59,9 @@ namespace Server.Misc
e.Blocked = !OnProfanityDetected( from, e.Speech );
}
public static char[] Exceptions{ get{ return m_Exceptions; } }
public static string[] StartDisallowed{ get{ return m_StartDisallowed; } }
public static string[] Disallowed{ get{ return m_Disallowed; } }
public static char[] Exceptions => m_Exceptions;
public static string[] StartDisallowed => m_StartDisallowed;
public static string[] Disallowed => m_Disallowed;
private static char[] m_Exceptions = new char[]
{

View file

@ -74,31 +74,77 @@ namespace Server.Items
private int m_RunicMinIntensity;
private int m_RunicMaxIntensity;
public int WeaponFireDamage{ get{ return m_WeaponFireDamage; } set{ m_WeaponFireDamage = value; } }
public int WeaponColdDamage{ get{ return m_WeaponColdDamage; } set{ m_WeaponColdDamage = value; } }
public int WeaponPoisonDamage{ get{ return m_WeaponPoisonDamage; } set{ m_WeaponPoisonDamage = value; } }
public int WeaponEnergyDamage{ get{ return m_WeaponEnergyDamage; } set{ m_WeaponEnergyDamage = value; } }
public int WeaponChaosDamage{ get{ return m_WeaponChaosDamage; } set{ m_WeaponChaosDamage = value; } }
public int WeaponDirectDamage{ get{ return m_WeaponDirectDamage; } set{ m_WeaponDirectDamage = value; } }
public int WeaponDurability{ get{ return m_WeaponDurability; } set{ m_WeaponDurability = value; } }
public int WeaponLuck{ get{ return m_WeaponLuck; } set{ m_WeaponLuck = value; } }
public int WeaponGoldIncrease{ get{ return m_WeaponGoldIncrease; } set{ m_WeaponGoldIncrease = value; } }
public int WeaponLowerRequirements{ get{ return m_WeaponLowerRequirements; } set{ m_WeaponLowerRequirements = value; } }
public int WeaponFireDamage{ get => m_WeaponFireDamage;
set => m_WeaponFireDamage = value;
}
public int WeaponColdDamage{ get => m_WeaponColdDamage;
set => m_WeaponColdDamage = value;
}
public int WeaponPoisonDamage{ get => m_WeaponPoisonDamage;
set => m_WeaponPoisonDamage = value;
}
public int WeaponEnergyDamage{ get => m_WeaponEnergyDamage;
set => m_WeaponEnergyDamage = value;
}
public int WeaponChaosDamage{ get => m_WeaponChaosDamage;
set => m_WeaponChaosDamage = value;
}
public int WeaponDirectDamage{ get => m_WeaponDirectDamage;
set => m_WeaponDirectDamage = value;
}
public int WeaponDurability{ get => m_WeaponDurability;
set => m_WeaponDurability = value;
}
public int WeaponLuck{ get => m_WeaponLuck;
set => m_WeaponLuck = value;
}
public int WeaponGoldIncrease{ get => m_WeaponGoldIncrease;
set => m_WeaponGoldIncrease = value;
}
public int WeaponLowerRequirements{ get => m_WeaponLowerRequirements;
set => m_WeaponLowerRequirements = value;
}
public int ArmorPhysicalResist{ get{ return m_ArmorPhysicalResist; } set{ m_ArmorPhysicalResist = value; } }
public int ArmorFireResist{ get{ return m_ArmorFireResist; } set{ m_ArmorFireResist = value; } }
public int ArmorColdResist{ get{ return m_ArmorColdResist; } set{ m_ArmorColdResist = value; } }
public int ArmorPoisonResist{ get{ return m_ArmorPoisonResist; } set{ m_ArmorPoisonResist = value; } }
public int ArmorEnergyResist{ get{ return m_ArmorEnergyResist; } set{ m_ArmorEnergyResist = value; } }
public int ArmorDurability{ get{ return m_ArmorDurability; } set{ m_ArmorDurability = value; } }
public int ArmorLuck{ get{ return m_ArmorLuck; } set{ m_ArmorLuck = value; } }
public int ArmorGoldIncrease{ get{ return m_ArmorGoldIncrease; } set{ m_ArmorGoldIncrease = value; } }
public int ArmorLowerRequirements{ get{ return m_ArmorLowerRequirements; } set{ m_ArmorLowerRequirements = value; } }
public int ArmorPhysicalResist{ get => m_ArmorPhysicalResist;
set => m_ArmorPhysicalResist = value;
}
public int ArmorFireResist{ get => m_ArmorFireResist;
set => m_ArmorFireResist = value;
}
public int ArmorColdResist{ get => m_ArmorColdResist;
set => m_ArmorColdResist = value;
}
public int ArmorPoisonResist{ get => m_ArmorPoisonResist;
set => m_ArmorPoisonResist = value;
}
public int ArmorEnergyResist{ get => m_ArmorEnergyResist;
set => m_ArmorEnergyResist = value;
}
public int ArmorDurability{ get => m_ArmorDurability;
set => m_ArmorDurability = value;
}
public int ArmorLuck{ get => m_ArmorLuck;
set => m_ArmorLuck = value;
}
public int ArmorGoldIncrease{ get => m_ArmorGoldIncrease;
set => m_ArmorGoldIncrease = value;
}
public int ArmorLowerRequirements{ get => m_ArmorLowerRequirements;
set => m_ArmorLowerRequirements = value;
}
public int RunicMinAttributes{ get{ return m_RunicMinAttributes; } set{ m_RunicMinAttributes = value; } }
public int RunicMaxAttributes{ get{ return m_RunicMaxAttributes; } set{ m_RunicMaxAttributes = value; } }
public int RunicMinIntensity{ get{ return m_RunicMinIntensity; } set{ m_RunicMinIntensity = value; } }
public int RunicMaxIntensity{ get{ return m_RunicMaxIntensity; } set{ m_RunicMaxIntensity = value; } }
public int RunicMinAttributes{ get => m_RunicMinAttributes;
set => m_RunicMinAttributes = value;
}
public int RunicMaxAttributes{ get => m_RunicMaxAttributes;
set => m_RunicMaxAttributes = value;
}
public int RunicMinIntensity{ get => m_RunicMinIntensity;
set => m_RunicMinIntensity = value;
}
public int RunicMaxIntensity{ get => m_RunicMaxIntensity;
set => m_RunicMaxIntensity = value;
}
public CraftAttributeInfo()
{
@ -399,12 +445,12 @@ namespace Server.Items
private CraftResource m_Resource;
private Type[] m_ResourceTypes;
public int Hue{ get{ return m_Hue; } }
public int Number{ get{ return m_Number; } }
public string Name{ get{ return m_Name; } }
public CraftAttributeInfo AttributeInfo{ get{ return m_AttributeInfo; } }
public CraftResource Resource{ get{ return m_Resource; } }
public Type[] ResourceTypes{ get{ return m_ResourceTypes; } }
public int Hue => m_Hue;
public int Number => m_Number;
public string Name => m_Name;
public CraftAttributeInfo AttributeInfo => m_AttributeInfo;
public CraftResource Resource => m_Resource;
public Type[] ResourceTypes => m_ResourceTypes;
public CraftResourceInfo( int hue, int number, string name, CraftAttributeInfo attributeInfo, CraftResource resource, params Type[] resourceTypes )
{
@ -697,28 +743,10 @@ namespace Server.Items
m_Name = name;
}
public int Level
{
get
{
return m_Level;
}
}
public int Level => m_Level;
public int Hue
{
get
{
return m_Hue;
}
}
public int Hue => m_Hue;
public string Name
{
get
{
return m_Name;
}
}
public string Name => m_Name;
}
}

View file

@ -22,35 +22,35 @@ namespace Server.Misc
public ShardPollOption[] Options
{
get{ return m_Options; }
set{ m_Options = value; }
get => m_Options;
set => m_Options = value;
}
public IPAddress[] Addresses
{
get{ return m_Addresses; }
set{ m_Addresses = value; }
get => m_Addresses;
set => m_Addresses = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public string Title
{
get{ return m_Title; }
set{ m_Title = ShardPollPrompt.UrlToHref( value ); }
get => m_Title;
set => m_Title = ShardPollPrompt.UrlToHref( value );
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public TimeSpan Duration
{
get{ return m_Duration; }
set{ m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public DateTime StartTime
{
get{ return m_StartTime; }
set{ m_StartTime = value; }
get => m_StartTime;
set => m_StartTime = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
@ -80,7 +80,7 @@ namespace Server.Misc
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public bool Active
{
get{ return m_Active; }
get => m_Active;
set
{
if ( m_Active == value )
@ -144,10 +144,7 @@ namespace Server.Misc
m_Options[old.Length] = option;
}
public override string DefaultName
{
get { return "shard poller"; }
}
public override string DefaultName => "shard poller";
[Constructible( AccessLevel.Administrator )]
public ShardPoller() : base( 0x1047 )
@ -291,11 +288,14 @@ namespace Server.Misc
private int m_LineBreaks;
private IPAddress[] m_Voters;
public string Title{ get{ return m_Title; } set{ m_Title = value; m_LineBreaks = GetBreaks( m_Title ); } }
public int LineBreaks{ get{ return m_LineBreaks; } }
public string Title{ get => m_Title;
set{ m_Title = value; m_LineBreaks = GetBreaks( m_Title ); } }
public int LineBreaks => m_LineBreaks;
public int Votes{ get{ return m_Voters.Length; } }
public IPAddress[] Voters{ get{ return m_Voters; } set{ m_Voters = value; } }
public int Votes => m_Voters.Length;
public IPAddress[] Voters{ get => m_Voters;
set => m_Voters = value;
}
public ShardPollOption( string title )
{
@ -402,7 +402,7 @@ namespace Server.Misc
private bool m_Editing;
private Queue<ShardPoller> m_Polls;
public bool Editing{ get{ return m_Editing; } }
public bool Editing => m_Editing;
public void QueuePoll( ShardPoller poller )
{

View file

@ -14,7 +14,7 @@ namespace Server
public int Number => m_Number;
public string String => m_String;
public bool IsEmpty { get { return ( m_Number <= 0 && m_String == null ); } }
public bool IsEmpty => ( m_Number <= 0 && m_String == null );
public TextDefinition() : this( 0, null )
{

View file

@ -43,22 +43,22 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int InactiveItemID
{
get { return m_InactiveItemID; }
set { m_InactiveItemID = value; }
get => m_InactiveItemID;
set => m_InactiveItemID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ActiveItemID
{
get { return m_ActiveItemID; }
set { m_ActiveItemID = value; }
get => m_ActiveItemID;
set => m_ActiveItemID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool PlayersCanToggle
{
get { return m_PlayersCanToggle; }
set { m_PlayersCanToggle = value; }
get => m_PlayersCanToggle;
set => m_PlayersCanToggle = value;
}
[Constructible]

View file

@ -111,21 +111,37 @@ namespace Server.Misc
private int m_ChanceOfPercipitation;
private int m_ChanceOfExtremeTemperature;
public Map Facet{ get{ return m_Facet; } }
public Rectangle2D[] Area{ get{ return m_Area; } set{ m_Area = value; } }
public int Temperature{ get{ return m_Temperature; } set{ m_Temperature = value; } }
public int ChanceOfPercipitation{ get{ return m_ChanceOfPercipitation; } set{ m_ChanceOfPercipitation = value; } }
public int ChanceOfExtremeTemperature{ get{ return m_ChanceOfExtremeTemperature; } set{ m_ChanceOfExtremeTemperature = value; } }
public Map Facet => m_Facet;
public Rectangle2D[] Area{ get => m_Area;
set => m_Area = value;
}
public int Temperature{ get => m_Temperature;
set => m_Temperature = value;
}
public int ChanceOfPercipitation{ get => m_ChanceOfPercipitation;
set => m_ChanceOfPercipitation = value;
}
public int ChanceOfExtremeTemperature{ get => m_ChanceOfExtremeTemperature;
set => m_ChanceOfExtremeTemperature = value;
}
// For dynamic weather:
private Rectangle2D m_Bounds;
private int m_MoveSpeed;
private int m_MoveAngleX, m_MoveAngleY;
public Rectangle2D Bounds{ get{ return m_Bounds; } set{ m_Bounds = value; } }
public int MoveSpeed{ get{ return m_MoveSpeed; } set{ m_MoveSpeed = value; } }
public int MoveAngleX{ get{ return m_MoveAngleX; } set{ m_MoveAngleX = value; } }
public int MoveAngleY{ get{ return m_MoveAngleY; } set{ m_MoveAngleY = value; } }
public Rectangle2D Bounds{ get => m_Bounds;
set => m_Bounds = value;
}
public int MoveSpeed{ get => m_MoveSpeed;
set => m_MoveSpeed = value;
}
public int MoveAngleX{ get => m_MoveAngleX;
set => m_MoveAngleX = value;
}
public int MoveAngleY{ get => m_MoveAngleY;
set => m_MoveAngleY = value;
}
public static bool CheckIntersection( Rectangle2D r1, Rectangle2D r2 )
{
@ -337,10 +353,7 @@ namespace Server.Misc
public class WeatherMap : MapItem
{
public override string DefaultName
{
get { return "weather map"; }
}
public override string DefaultName => "weather map";
[Constructible]
public WeatherMap()

View file

@ -20,8 +20,8 @@ namespace Server.Misc
public static DFAlgorithm DFA
{
get{ return m_DFA; }
set{ m_DFA = value; }
get => m_DFA;
set => m_DFA = value;
}
public static void FatigueOnDamage( Mobile m, int damage )