Fixes body expression style.
This commit is contained in:
parent
3f0a72a62f
commit
33f5e77a24
957 changed files with 7424 additions and 15973 deletions
|
|
@ -61,7 +61,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Number
|
||||
{
|
||||
get{ return m_LabelNumber; }
|
||||
get => m_LabelNumber;
|
||||
set{ m_LabelNumber = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -111,36 +111,21 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public BaseAddon Addon
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Addon;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Addon = value;
|
||||
}
|
||||
get => m_Addon;
|
||||
set => m_Addon = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Point3D Offset
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Offset;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Offset = value;
|
||||
}
|
||||
get => m_Offset;
|
||||
set => m_Offset = value;
|
||||
}
|
||||
|
||||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get
|
||||
{
|
||||
return base.Hue;
|
||||
}
|
||||
get => base.Hue;
|
||||
set
|
||||
{
|
||||
base.Hue = value;
|
||||
|
|
@ -150,8 +135,8 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public virtual bool NeedsWall{ get{ return false; } }
|
||||
public virtual Point3D WallPosition{ get{ return Point3D.Zero; } }
|
||||
public virtual bool NeedsWall => false;
|
||||
public virtual Point3D WallPosition => Point3D.Zero;
|
||||
|
||||
[Constructible]
|
||||
public AddonComponent( int itemID ) : base( itemID )
|
||||
|
|
|
|||
|
|
@ -14,21 +14,21 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public BaseAddonContainer Addon
|
||||
{
|
||||
get { return m_Addon; }
|
||||
set { m_Addon = value; }
|
||||
get => m_Addon;
|
||||
set => m_Addon = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Point3D Offset
|
||||
{
|
||||
get { return m_Offset; }
|
||||
set { m_Offset = value; }
|
||||
get => m_Offset;
|
||||
set => m_Offset = value;
|
||||
}
|
||||
|
||||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get { return base.Hue; }
|
||||
get => base.Hue;
|
||||
set
|
||||
{
|
||||
base.Hue = value;
|
||||
|
|
|
|||
|
|
@ -17,43 +17,43 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double MinSkill
|
||||
{
|
||||
get{ return m_MinSkill; }
|
||||
set{ m_MinSkill = value; }
|
||||
get => m_MinSkill;
|
||||
set => m_MinSkill = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double MaxSkill
|
||||
{
|
||||
get{ return m_MaxSkill; }
|
||||
set{ m_MaxSkill = value; }
|
||||
get => m_MaxSkill;
|
||||
set => m_MaxSkill = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime LastUse
|
||||
{
|
||||
get{ return m_LastUse; }
|
||||
set{ m_LastUse = value; }
|
||||
get => m_LastUse;
|
||||
set => m_LastUse = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool FacingEast
|
||||
{
|
||||
get{ return ( ItemID == 0x100A ); }
|
||||
set{ ItemID = value ? 0x100A : 0x100B; }
|
||||
get => ( ItemID == 0x100A );
|
||||
set => ItemID = value ? 0x100A : 0x100B;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Arrows
|
||||
{
|
||||
get{ return m_Arrows; }
|
||||
set{ m_Arrows = value; }
|
||||
get => m_Arrows;
|
||||
set => m_Arrows = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Bolts
|
||||
{
|
||||
get{ return m_Bolts; }
|
||||
set{ m_Bolts = value; }
|
||||
get => m_Bolts;
|
||||
set => m_Bolts = value;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
|
|
@ -102,8 +102,12 @@ namespace Server.Items
|
|||
private int m_Total;
|
||||
private int m_Count;
|
||||
|
||||
public int Total{ get{ return m_Total; } set{ m_Total = value; } }
|
||||
public int Count{ get{ return m_Count; } set{ m_Count = value; } }
|
||||
public int Total{ get => m_Total;
|
||||
set => m_Total = value;
|
||||
}
|
||||
public int Count{ get => m_Count;
|
||||
set => m_Count = value;
|
||||
}
|
||||
|
||||
public void Record( int score )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,20 +17,11 @@ namespace Server.Items
|
|||
private List<Mobile> m_Yes;
|
||||
private List<Mobile> m_No;
|
||||
|
||||
public string[] Topic
|
||||
{
|
||||
get{ return m_Topic; }
|
||||
}
|
||||
public string[] Topic => m_Topic;
|
||||
|
||||
public List<Mobile> Yes
|
||||
{
|
||||
get{ return m_Yes; }
|
||||
}
|
||||
public List<Mobile> Yes => m_Yes;
|
||||
|
||||
public List<Mobile> No
|
||||
{
|
||||
get{ return m_No; }
|
||||
}
|
||||
public List<Mobile> No => m_No;
|
||||
|
||||
[Constructible]
|
||||
public BallotBox() : base( 0x9A8 )
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get{ return m_Resource; }
|
||||
get => m_Resource;
|
||||
set
|
||||
{
|
||||
if ( m_Resource != value )
|
||||
|
|
@ -64,7 +64,7 @@ namespace Server.Items
|
|||
m_Components = new List<AddonComponent>();
|
||||
}
|
||||
|
||||
public virtual bool RetainDeedHue{ get{ return false; } }
|
||||
public virtual bool RetainDeedHue => false;
|
||||
|
||||
public virtual void OnChop( Mobile from )
|
||||
{
|
||||
|
|
@ -104,20 +104,11 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public virtual BaseAddonDeed Deed{ get{ return null; } }
|
||||
public virtual BaseAddonDeed Deed => null;
|
||||
|
||||
Item IAddon.Deed
|
||||
{
|
||||
get{ return this.Deed; }
|
||||
}
|
||||
Item IAddon.Deed => this.Deed;
|
||||
|
||||
public List<AddonComponent> Components
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Components;
|
||||
}
|
||||
}
|
||||
public List<AddonComponent> Components => m_Components;
|
||||
|
||||
public BaseAddon( Serial serial ) : base( serial )
|
||||
{
|
||||
|
|
@ -237,15 +228,12 @@ namespace Server.Items
|
|||
c.Delete();
|
||||
}
|
||||
|
||||
public virtual bool ShareHue{ get{ return true; } }
|
||||
public virtual bool ShareHue => true;
|
||||
|
||||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get
|
||||
{
|
||||
return base.Hue;
|
||||
}
|
||||
get => base.Hue;
|
||||
set
|
||||
{
|
||||
if ( base.Hue != value )
|
||||
|
|
|
|||
|
|
@ -11,10 +11,7 @@ namespace Server.Items
|
|||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get
|
||||
{
|
||||
return base.Hue;
|
||||
}
|
||||
get => base.Hue;
|
||||
set
|
||||
{
|
||||
if ( base.Hue != value )
|
||||
|
|
@ -37,7 +34,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get { return m_Resource; }
|
||||
get => m_Resource;
|
||||
set
|
||||
{
|
||||
if ( m_Resource != value )
|
||||
|
|
@ -50,10 +47,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
Item IAddon.Deed
|
||||
{
|
||||
get { return this.Deed; }
|
||||
}
|
||||
Item IAddon.Deed => this.Deed;
|
||||
|
||||
public virtual bool RetainDeedHue => false;
|
||||
public virtual bool NeedsWall => false;
|
||||
|
|
@ -63,10 +57,7 @@ namespace Server.Items
|
|||
|
||||
private List<AddonContainerComponent> m_Components;
|
||||
|
||||
public List<AddonContainerComponent> Components
|
||||
{
|
||||
get { return m_Components; }
|
||||
}
|
||||
public List<AddonContainerComponent> Components => m_Components;
|
||||
|
||||
public BaseAddonContainer( int itemID ) : base( itemID )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get{ return m_Resource; }
|
||||
get => m_Resource;
|
||||
set
|
||||
{
|
||||
if ( m_Resource != value )
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get{ return m_Resource; }
|
||||
get => m_Resource;
|
||||
set
|
||||
{
|
||||
if ( m_Resource != value )
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace Server.Items
|
|||
public override bool NeedsWall => true;
|
||||
public override Point3D WallPosition => this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 );
|
||||
|
||||
public bool East{ get{ return this.ItemID == 0x1E2F; } }
|
||||
public bool East => this.ItemID == 0x1E2F;
|
||||
|
||||
[Constructible]
|
||||
public DartBoard() : this( true )
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public bool Spinning{ get{ return m_Timer != null; } }
|
||||
public bool Spinning => m_Timer != null;
|
||||
|
||||
public void BeginSpin( SpinCallback callback, Mobile from, int hue )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public bool Spinning{ get{ return m_Timer != null; } }
|
||||
public bool Spinning => m_Timer != null;
|
||||
|
||||
public void BeginSpin( SpinCallback callback, Mobile from, int hue )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class FireColumnAddon : BaseAddon
|
||||
{
|
||||
public override bool ShareHue
|
||||
{
|
||||
get { return false; }
|
||||
}
|
||||
public override bool ShareHue => false;
|
||||
|
||||
[Constructible]
|
||||
public FireColumnAddon()
|
||||
|
|
|
|||
|
|
@ -25,35 +25,23 @@ namespace Server.Items
|
|||
private Timer m_Timer;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxFlour
|
||||
{
|
||||
get{ return 2; }
|
||||
}
|
||||
public int MaxFlour => 2;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CurFlour
|
||||
{
|
||||
get{ return m_Flour; }
|
||||
get => m_Flour;
|
||||
set{ m_Flour = Math.Max( 0, Math.Min( value, MaxFlour ) ); UpdateStage(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool HasFlour
|
||||
{
|
||||
get{ return ( m_Flour > 0 ); }
|
||||
}
|
||||
public bool HasFlour => ( m_Flour > 0 );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsFull
|
||||
{
|
||||
get{ return ( m_Flour >= MaxFlour ); }
|
||||
}
|
||||
public bool IsFull => ( m_Flour >= MaxFlour );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsWorking
|
||||
{
|
||||
get{ return ( m_Timer != null ); }
|
||||
}
|
||||
public bool IsWorking => ( m_Timer != null );
|
||||
|
||||
public void StartWorking( Mobile from )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,35 +11,23 @@ namespace Server.Items
|
|||
private Timer m_Timer;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxFlour
|
||||
{
|
||||
get{ return 2; }
|
||||
}
|
||||
public int MaxFlour => 2;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CurFlour
|
||||
{
|
||||
get{ return m_Flour; }
|
||||
get => m_Flour;
|
||||
set{ m_Flour = Math.Max( 0, Math.Min( value, MaxFlour ) ); UpdateStage(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool HasFlour
|
||||
{
|
||||
get{ return ( m_Flour > 0 ); }
|
||||
}
|
||||
public bool HasFlour => ( m_Flour > 0 );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsFull
|
||||
{
|
||||
get{ return ( m_Flour >= MaxFlour ); }
|
||||
}
|
||||
public bool IsFull => ( m_Flour >= MaxFlour );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsWorking
|
||||
{
|
||||
get{ return ( m_Timer != null ); }
|
||||
}
|
||||
public bool IsWorking => ( m_Timer != null );
|
||||
|
||||
public void StartWorking( Mobile from )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,10 +4,7 @@ namespace Server.Items
|
|||
{
|
||||
public class JackOLantern : BaseAddon
|
||||
{
|
||||
public override bool ShareHue
|
||||
{
|
||||
get { return false; }
|
||||
}
|
||||
public override bool ShareHue => false;
|
||||
|
||||
private AddonComponent GetComponent( int itemID, int hue )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,7 +11,9 @@ namespace Server.Items
|
|||
|
||||
private int m_Phase;
|
||||
|
||||
public int Phase{ get{ return m_Phase; } set{ m_Phase = value; } }
|
||||
public int Phase{ get => m_Phase;
|
||||
set => m_Phase = value;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public LoomEastAddon()
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ namespace Server.Items
|
|||
|
||||
private int m_Phase;
|
||||
|
||||
public int Phase{ get{ return m_Phase; } set{ m_Phase = value; } }
|
||||
public int Phase{ get => m_Phase;
|
||||
set => m_Phase = value;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public LoomSouthAddon()
|
||||
|
|
|
|||
|
|
@ -13,22 +13,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double MinSkill
|
||||
{
|
||||
get{ return m_MinSkill; }
|
||||
set{ m_MinSkill = value; }
|
||||
get => m_MinSkill;
|
||||
set => m_MinSkill = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double MaxSkill
|
||||
{
|
||||
get{ return m_MaxSkill; }
|
||||
set{ m_MaxSkill = value; }
|
||||
get => m_MaxSkill;
|
||||
set => m_MaxSkill = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Swinging
|
||||
{
|
||||
get{ return ( m_Timer != null ); }
|
||||
}
|
||||
public bool Swinging => ( m_Timer != null );
|
||||
|
||||
public PickpocketDip( int itemID ) : base( itemID )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class PyramidAddon : BaseAddon
|
||||
{
|
||||
public override bool ShareHue
|
||||
{
|
||||
get { return false; }
|
||||
}
|
||||
public override bool ShareHue => false;
|
||||
|
||||
[Constructible]
|
||||
public PyramidAddon()
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Active
|
||||
{
|
||||
get { return m_Active; }
|
||||
get => m_Active;
|
||||
set
|
||||
{
|
||||
m_Active = value;
|
||||
|
|
@ -25,21 +25,21 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Point3D TeleOffset
|
||||
{
|
||||
get { return m_TeleOffset; }
|
||||
set { m_TeleOffset = value; }
|
||||
get => m_TeleOffset;
|
||||
set => m_TeleOffset = value;
|
||||
}
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public Point3D TelePoint
|
||||
{
|
||||
get { return new Point3D( Location.X + TeleOffset.X, Location.Y + TeleOffset.Y, Location.Z + TeleOffset.Z ); }
|
||||
set { m_TeleOffset = new Point3D( value.X - Location.X, value.Y - Location.Y, value.Z - Location.Z ); }
|
||||
get => new Point3D( Location.X + TeleOffset.X, Location.Y + TeleOffset.Y, Location.Z + TeleOffset.Z );
|
||||
set => m_TeleOffset = new Point3D( value.X - Location.X, value.Y - Location.Y, value.Z - Location.Z );
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public SHTeleComponent TeleDest
|
||||
{
|
||||
get { return m_TeleDest; }
|
||||
get => m_TeleDest;
|
||||
set
|
||||
{
|
||||
m_TeleDest = value;
|
||||
|
|
@ -49,10 +49,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "a hole"; }
|
||||
}
|
||||
public override string DefaultName => "a hole";
|
||||
|
||||
[Constructible]
|
||||
public SHTeleComponent() : this( 0x1775 )
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public bool Spinning{ get{ return m_Timer != null; } }
|
||||
public bool Spinning => m_Timer != null;
|
||||
|
||||
public void BeginSpin( SpinCallback callback, Mobile from, int hue )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public bool Spinning{ get{ return m_Timer != null; } }
|
||||
public bool Spinning => m_Timer != null;
|
||||
|
||||
public void BeginSpin( SpinCallback callback, Mobile from, int hue )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,22 +13,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double MinSkill
|
||||
{
|
||||
get{ return m_MinSkill; }
|
||||
set{ m_MinSkill = value; }
|
||||
get => m_MinSkill;
|
||||
set => m_MinSkill = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public double MaxSkill
|
||||
{
|
||||
get{ return m_MaxSkill; }
|
||||
set{ m_MaxSkill = value; }
|
||||
get => m_MaxSkill;
|
||||
set => m_MaxSkill = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Swinging
|
||||
{
|
||||
get{ return ( m_Timer != null ); }
|
||||
}
|
||||
public bool Swinging => ( m_Timer != null );
|
||||
|
||||
[Constructible]
|
||||
public TrainingDummy() : this( 0x1074 )
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ namespace Server.Items
|
|||
|
||||
public int Quantity
|
||||
{
|
||||
get{ return 500; }
|
||||
get => 500;
|
||||
set{}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ namespace Server.Items
|
|||
|
||||
public int Quantity
|
||||
{
|
||||
get{ return 500; }
|
||||
get => 500;
|
||||
set{}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,10 +14,7 @@ namespace Server.Items
|
|||
private int m_LiveCreatures;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int LiveCreatures
|
||||
{
|
||||
get{ return m_LiveCreatures; }
|
||||
}
|
||||
public int LiveCreatures => m_LiveCreatures;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int DeadCreatures
|
||||
|
|
@ -57,10 +54,7 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsFull
|
||||
{
|
||||
get{ return ( Items.Count >= MaxItems ); }
|
||||
}
|
||||
public bool IsFull => ( Items.Count >= MaxItems );
|
||||
|
||||
// vacation info
|
||||
private int m_VacationLeft;
|
||||
|
|
@ -68,7 +62,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int VacationLeft
|
||||
{
|
||||
get{ return m_VacationLeft; }
|
||||
get => m_VacationLeft;
|
||||
set{ m_VacationLeft = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -79,37 +73,31 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AquariumState Food
|
||||
{
|
||||
get{ return m_Food; }
|
||||
get => m_Food;
|
||||
set{ m_Food = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AquariumState Water
|
||||
{
|
||||
get{ return m_Water; }
|
||||
get => m_Water;
|
||||
set{ m_Water = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool OptimalState
|
||||
{
|
||||
get{ return ( m_Food.State == (int) FoodState.Full && m_Water.State == (int) WaterState.Strong ); }
|
||||
}
|
||||
public bool OptimalState => ( m_Food.State == (int) FoodState.Full && m_Water.State == (int) WaterState.Strong );
|
||||
|
||||
// events
|
||||
private List<int> m_Events;
|
||||
private bool m_RewardAvailable;
|
||||
private bool m_EvaluateDay;
|
||||
|
||||
public List<int> Events
|
||||
{
|
||||
get{ return m_Events; }
|
||||
}
|
||||
public List<int> Events => m_Events;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool RewardAvailable
|
||||
{
|
||||
get{ return m_RewardAvailable; }
|
||||
get => m_RewardAvailable;
|
||||
set{ m_RewardAvailable = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -941,10 +929,8 @@ namespace Server.Items
|
|||
0x1C2, 0x1C3, 0x2A3, 0x47E, 0x51D
|
||||
};
|
||||
|
||||
public static int[] FishHues
|
||||
{
|
||||
get{ return m_FishHues; }
|
||||
}
|
||||
public static int[] FishHues => m_FishHues;
|
||||
|
||||
#endregion
|
||||
|
||||
#region Context entries
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int State
|
||||
{
|
||||
get{ return m_State; }
|
||||
get => m_State;
|
||||
set
|
||||
{
|
||||
m_State = value;
|
||||
|
|
@ -45,22 +45,22 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Maintain
|
||||
{
|
||||
get{ return m_Maintain; }
|
||||
set{ m_Maintain = value; }
|
||||
get => m_Maintain;
|
||||
set => m_Maintain = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Improve
|
||||
{
|
||||
get{ return m_Improve; }
|
||||
set{ m_Improve = value; }
|
||||
get => m_Improve;
|
||||
set => m_Improve = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Added
|
||||
{
|
||||
get{ return m_Added; }
|
||||
set{ m_Added = value; }
|
||||
get => m_Added;
|
||||
set => m_Added = value;
|
||||
}
|
||||
|
||||
public AquariumState()
|
||||
|
|
|
|||
|
|
@ -9,10 +9,7 @@ namespace Server.Items
|
|||
private Timer m_Timer;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Dead
|
||||
{
|
||||
get{ return ( ItemID == 0x3B0C ); }
|
||||
}
|
||||
public bool Dead => ( ItemID == 0x3B0C );
|
||||
|
||||
[Constructible]
|
||||
public BaseFish( int itemID ) : base( itemID )
|
||||
|
|
|
|||
|
|
@ -9,10 +9,7 @@ namespace Server.Items
|
|||
public override int LabelNumber => 1074499; // A fish bowl
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Empty
|
||||
{
|
||||
get{ return ( Items.Count == 0 ); }
|
||||
}
|
||||
public bool Empty => ( Items.Count == 0 );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public BaseFish Fish
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ namespace Server.Items
|
|||
|
||||
public FactionItem FactionItemState
|
||||
{
|
||||
get{ return m_FactionState; }
|
||||
get => m_FactionState;
|
||||
set
|
||||
{
|
||||
m_FactionState = value;
|
||||
|
|
@ -68,35 +68,35 @@ namespace Server.Items
|
|||
private AMA m_Meditate = (AMA)(-1);
|
||||
|
||||
|
||||
public virtual bool AllowMaleWearer{ get{ return true; } }
|
||||
public virtual bool AllowFemaleWearer{ get{ return true; } }
|
||||
public virtual bool AllowMaleWearer => true;
|
||||
public virtual bool AllowFemaleWearer => true;
|
||||
|
||||
public abstract AMT MaterialType{ get; }
|
||||
|
||||
public virtual int RevertArmorBase{ get{ return ArmorBase; } }
|
||||
public virtual int ArmorBase{ get{ return 0; } }
|
||||
public virtual int RevertArmorBase => ArmorBase;
|
||||
public virtual int ArmorBase => 0;
|
||||
|
||||
public virtual AMA DefMedAllowance{ get{ return AMA.None; } }
|
||||
public virtual AMA AosMedAllowance{ get{ return DefMedAllowance; } }
|
||||
public virtual AMA OldMedAllowance{ get{ return DefMedAllowance; } }
|
||||
public virtual AMA DefMedAllowance => AMA.None;
|
||||
public virtual AMA AosMedAllowance => DefMedAllowance;
|
||||
public virtual AMA OldMedAllowance => DefMedAllowance;
|
||||
|
||||
|
||||
public virtual int AosStrBonus{ get{ return 0; } }
|
||||
public virtual int AosDexBonus{ get{ return 0; } }
|
||||
public virtual int AosIntBonus{ get{ return 0; } }
|
||||
public virtual int AosStrReq{ get{ return 0; } }
|
||||
public virtual int AosDexReq{ get{ return 0; } }
|
||||
public virtual int AosIntReq{ get{ return 0; } }
|
||||
public virtual int AosStrBonus => 0;
|
||||
public virtual int AosDexBonus => 0;
|
||||
public virtual int AosIntBonus => 0;
|
||||
public virtual int AosStrReq => 0;
|
||||
public virtual int AosDexReq => 0;
|
||||
public virtual int AosIntReq => 0;
|
||||
|
||||
|
||||
public virtual int OldStrBonus{ get{ return 0; } }
|
||||
public virtual int OldDexBonus{ get{ return 0; } }
|
||||
public virtual int OldIntBonus{ get{ return 0; } }
|
||||
public virtual int OldStrReq{ get{ return 0; } }
|
||||
public virtual int OldDexReq{ get{ return 0; } }
|
||||
public virtual int OldIntReq{ get{ return 0; } }
|
||||
public virtual int OldStrBonus => 0;
|
||||
public virtual int OldDexBonus => 0;
|
||||
public virtual int OldIntBonus => 0;
|
||||
public virtual int OldStrReq => 0;
|
||||
public virtual int OldDexReq => 0;
|
||||
public virtual int OldIntReq => 0;
|
||||
|
||||
public virtual bool CanFortify{ get{ return true; } }
|
||||
public virtual bool CanFortify => true;
|
||||
|
||||
public override void OnAfterDuped( Item newItem )
|
||||
{
|
||||
|
|
@ -111,8 +111,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AMA MeditationAllowance
|
||||
{
|
||||
get{ return ( m_Meditate == (AMA)(-1) ? Core.AOS ? AosMedAllowance : OldMedAllowance : m_Meditate ); }
|
||||
set{ m_Meditate = value; }
|
||||
get => ( m_Meditate == (AMA)(-1) ? Core.AOS ? AosMedAllowance : OldMedAllowance : m_Meditate );
|
||||
set => m_Meditate = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
|
|
@ -130,13 +130,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public double BaseArmorRatingScaled
|
||||
{
|
||||
get
|
||||
{
|
||||
return ( BaseArmorRating * ArmorScalar );
|
||||
}
|
||||
}
|
||||
public double BaseArmorRatingScaled => ( BaseArmorRating * ArmorScalar );
|
||||
|
||||
public virtual double ArmorRating
|
||||
{
|
||||
|
|
@ -167,77 +161,68 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public double ArmorRatingScaled
|
||||
{
|
||||
get
|
||||
{
|
||||
return ( ArmorRating * ArmorScalar );
|
||||
}
|
||||
}
|
||||
public double ArmorRatingScaled => ( ArmorRating * ArmorScalar );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int StrBonus
|
||||
{
|
||||
get{ return ( m_StrBonus == -1 ? Core.AOS ? AosStrBonus : OldStrBonus : m_StrBonus ); }
|
||||
get => ( m_StrBonus == -1 ? Core.AOS ? AosStrBonus : OldStrBonus : m_StrBonus );
|
||||
set{ m_StrBonus = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int DexBonus
|
||||
{
|
||||
get{ return ( m_DexBonus == -1 ? Core.AOS ? AosDexBonus : OldDexBonus : m_DexBonus ); }
|
||||
get => ( m_DexBonus == -1 ? Core.AOS ? AosDexBonus : OldDexBonus : m_DexBonus );
|
||||
set{ m_DexBonus = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int IntBonus
|
||||
{
|
||||
get{ return ( m_IntBonus == -1 ? Core.AOS ? AosIntBonus : OldIntBonus : m_IntBonus ); }
|
||||
get => ( m_IntBonus == -1 ? Core.AOS ? AosIntBonus : OldIntBonus : m_IntBonus );
|
||||
set{ m_IntBonus = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int StrRequirement
|
||||
{
|
||||
get{ return ( m_StrReq == -1 ? Core.AOS ? AosStrReq : OldStrReq : m_StrReq ); }
|
||||
get => ( m_StrReq == -1 ? Core.AOS ? AosStrReq : OldStrReq : m_StrReq );
|
||||
set{ m_StrReq = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int DexRequirement
|
||||
{
|
||||
get{ return ( m_DexReq == -1 ? Core.AOS ? AosDexReq : OldDexReq : m_DexReq ); }
|
||||
get => ( m_DexReq == -1 ? Core.AOS ? AosDexReq : OldDexReq : m_DexReq );
|
||||
set{ m_DexReq = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int IntRequirement
|
||||
{
|
||||
get{ return ( m_IntReq == -1 ? Core.AOS ? AosIntReq : OldIntReq : m_IntReq ); }
|
||||
get => ( m_IntReq == -1 ? Core.AOS ? AosIntReq : OldIntReq : m_IntReq );
|
||||
set{ m_IntReq = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Identified
|
||||
{
|
||||
get{ return m_Identified; }
|
||||
get => m_Identified;
|
||||
set{ m_Identified = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool PlayerConstructed
|
||||
{
|
||||
get{ return m_PlayerConstructed; }
|
||||
set{ m_PlayerConstructed = value; }
|
||||
get => m_PlayerConstructed;
|
||||
set => m_PlayerConstructed = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Resource;
|
||||
}
|
||||
get => m_Resource;
|
||||
set
|
||||
{
|
||||
if ( m_Resource != value )
|
||||
|
|
@ -277,17 +262,14 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxHitPoints
|
||||
{
|
||||
get{ return m_MaxHitPoints; }
|
||||
get => m_MaxHitPoints;
|
||||
set{ m_MaxHitPoints = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int HitPoints
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_HitPoints;
|
||||
}
|
||||
get => m_HitPoints;
|
||||
set
|
||||
{
|
||||
if ( value != m_HitPoints && MaxHitPoints > 0 )
|
||||
|
|
@ -308,7 +290,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Crafter
|
||||
{
|
||||
get{ return m_Crafter; }
|
||||
get => m_Crafter;
|
||||
set{ m_Crafter = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -316,29 +298,23 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public ArmorQuality Quality
|
||||
{
|
||||
get{ return m_Quality; }
|
||||
get => m_Quality;
|
||||
set{ UnscaleDurability(); m_Quality = value; Invalidate(); InvalidateProperties(); ScaleDurability(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public ArmorDurabilityLevel Durability
|
||||
{
|
||||
get{ return m_Durability; }
|
||||
get => m_Durability;
|
||||
set{ UnscaleDurability(); m_Durability = value; ScaleDurability(); InvalidateProperties(); }
|
||||
}
|
||||
|
||||
public virtual int ArtifactRarity
|
||||
{
|
||||
get{ return 0; }
|
||||
}
|
||||
public virtual int ArtifactRarity => 0;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public ArmorProtectionLevel ProtectionLevel
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Protection;
|
||||
}
|
||||
get => m_Protection;
|
||||
set
|
||||
{
|
||||
if ( m_Protection != value )
|
||||
|
|
@ -356,21 +332,21 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosAttributes Attributes
|
||||
{
|
||||
get{ return m_AosAttributes; }
|
||||
get => m_AosAttributes;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosArmorAttributes ArmorAttributes
|
||||
{
|
||||
get{ return m_AosArmorAttributes; }
|
||||
get => m_AosArmorAttributes;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosSkillBonuses SkillBonuses
|
||||
{
|
||||
get{ return m_AosSkillBonuses; }
|
||||
get => m_AosSkillBonuses;
|
||||
set{}
|
||||
}
|
||||
|
||||
|
|
@ -399,25 +375,30 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int PhysicalBonus{ get{ return m_PhysicalBonus; } set{ m_PhysicalBonus = value; InvalidateProperties(); } }
|
||||
public int PhysicalBonus{ get => m_PhysicalBonus;
|
||||
set{ m_PhysicalBonus = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int FireBonus{ get{ return m_FireBonus; } set{ m_FireBonus = value; InvalidateProperties(); } }
|
||||
public int FireBonus{ get => m_FireBonus;
|
||||
set{ m_FireBonus = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int ColdBonus{ get{ return m_ColdBonus; } set{ m_ColdBonus = value; InvalidateProperties(); } }
|
||||
public int ColdBonus{ get => m_ColdBonus;
|
||||
set{ m_ColdBonus = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int PoisonBonus{ get{ return m_PoisonBonus; } set{ m_PoisonBonus = value; InvalidateProperties(); } }
|
||||
public int PoisonBonus{ get => m_PoisonBonus;
|
||||
set{ m_PoisonBonus = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int EnergyBonus{ get{ return m_EnergyBonus; } set{ m_EnergyBonus = value; InvalidateProperties(); } }
|
||||
public int EnergyBonus{ get => m_EnergyBonus;
|
||||
set{ m_EnergyBonus = value; InvalidateProperties(); } }
|
||||
|
||||
public virtual int BasePhysicalResistance{ get{ return 0; } }
|
||||
public virtual int BaseFireResistance{ get{ return 0; } }
|
||||
public virtual int BaseColdResistance{ get{ return 0; } }
|
||||
public virtual int BasePoisonResistance{ get{ return 0; } }
|
||||
public virtual int BaseEnergyResistance{ get{ return 0; } }
|
||||
public virtual int BasePhysicalResistance => 0;
|
||||
public virtual int BaseFireResistance => 0;
|
||||
public virtual int BaseColdResistance => 0;
|
||||
public virtual int BasePoisonResistance => 0;
|
||||
public virtual int BaseEnergyResistance => 0;
|
||||
|
||||
public override int PhysicalResistance => BasePhysicalResistance + GetProtOffset() + GetResourceAttrs().ArmorPhysicalResist + m_PhysicalBonus;
|
||||
public override int FireResistance => BaseFireResistance + GetProtOffset() + GetResourceAttrs().ArmorFireResist + m_FireBonus;
|
||||
|
|
@ -425,8 +406,8 @@ namespace Server.Items
|
|||
public override int PoisonResistance => BasePoisonResistance + GetProtOffset() + GetResourceAttrs().ArmorPoisonResist + m_PoisonBonus;
|
||||
public override int EnergyResistance => BaseEnergyResistance + GetProtOffset() + GetResourceAttrs().ArmorEnergyResist + m_EnergyBonus;
|
||||
|
||||
public virtual int InitMinHits{ get{ return 0; } }
|
||||
public virtual int InitMaxHits{ get{ return 0; } }
|
||||
public virtual int InitMinHits => 0;
|
||||
public virtual int InitMaxHits => 0;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public ArmorBodyType BodyPosition
|
||||
|
|
@ -584,14 +565,8 @@ namespace Server.Items
|
|||
|
||||
public static double[] ArmorScalars
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_ArmorScalars;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_ArmorScalars = value;
|
||||
}
|
||||
get => m_ArmorScalars;
|
||||
set => m_ArmorScalars = value;
|
||||
}
|
||||
|
||||
public static void ValidateMobile( Mobile m )
|
||||
|
|
@ -1123,7 +1098,7 @@ namespace Server.Items
|
|||
m_PlayerConstructed = true; // we don't know, so, assume it's crafted
|
||||
}
|
||||
|
||||
public virtual CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
|
||||
public virtual CraftResource DefaultResource => CraftResource.Iron;
|
||||
|
||||
public BaseArmor( int itemID ) : base( itemID )
|
||||
{
|
||||
|
|
@ -1347,7 +1322,7 @@ namespace Server.Items
|
|||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get{ return base.Hue; }
|
||||
get => base.Hue;
|
||||
set{ base.Hue = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosWeaponAttributes WeaponAttributes
|
||||
{
|
||||
get{ return m_AosWeaponAttributes; }
|
||||
get => m_AosWeaponAttributes;
|
||||
set{}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -83,22 +83,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxArcaneCharges
|
||||
{
|
||||
get{ return m_MaxArcaneCharges; }
|
||||
get => m_MaxArcaneCharges;
|
||||
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CurArcaneCharges
|
||||
{
|
||||
get{ return m_CurArcaneCharges; }
|
||||
get => m_CurArcaneCharges;
|
||||
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsArcane
|
||||
{
|
||||
get{ return ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 ); }
|
||||
}
|
||||
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
|
||||
|
||||
public void Update()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -82,22 +82,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxArcaneCharges
|
||||
{
|
||||
get{ return m_MaxArcaneCharges; }
|
||||
get => m_MaxArcaneCharges;
|
||||
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CurArcaneCharges
|
||||
{
|
||||
get{ return m_CurArcaneCharges; }
|
||||
get => m_CurArcaneCharges;
|
||||
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsArcane
|
||||
{
|
||||
get{ return ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 ); }
|
||||
}
|
||||
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
|
||||
|
||||
public void Update()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string PlayerName
|
||||
{
|
||||
get { return m_PlayerName; }
|
||||
set { m_PlayerName = value; }
|
||||
get => m_PlayerName;
|
||||
set => m_PlayerName = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public HeadType HeadType
|
||||
{
|
||||
get { return m_HeadType; }
|
||||
set { m_HeadType = value; }
|
||||
get => m_HeadType;
|
||||
set => m_HeadType = value;
|
||||
}
|
||||
|
||||
public override string DefaultName
|
||||
|
|
|
|||
|
|
@ -15,14 +15,8 @@ namespace Server.Items
|
|||
|
||||
public string[] Lines
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Lines;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Lines = value;
|
||||
}
|
||||
get => m_Lines;
|
||||
set => m_Lines = value;
|
||||
}
|
||||
|
||||
public BookPageInfo()
|
||||
|
|
@ -65,34 +59,28 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string Title
|
||||
{
|
||||
get { return m_Title; }
|
||||
get => m_Title;
|
||||
set { m_Title = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string Author
|
||||
{
|
||||
get { return m_Author; }
|
||||
get => m_Author;
|
||||
set { m_Author = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Writable
|
||||
{
|
||||
get { return m_Writable; }
|
||||
set { m_Writable = value; }
|
||||
get => m_Writable;
|
||||
set => m_Writable = value;
|
||||
}
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public int PagesCount
|
||||
{
|
||||
get { return m_Pages.Length; }
|
||||
}
|
||||
public int PagesCount => m_Pages.Length;
|
||||
|
||||
public BookPageInfo[] Pages
|
||||
{
|
||||
get { return m_Pages; }
|
||||
}
|
||||
public BookPageInfo[] Pages => m_Pages;
|
||||
|
||||
[Constructible]
|
||||
public BaseBook( int itemID ) : this( itemID, 20, true )
|
||||
|
|
@ -145,7 +133,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public virtual BookContent DefaultContent{ get{ return null; } }
|
||||
public virtual BookContent DefaultContent => null;
|
||||
|
||||
public BaseBook( Serial serial ) : base( serial )
|
||||
{
|
||||
|
|
@ -463,14 +451,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public SecureLevel Level
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_SecureLevel;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_SecureLevel = value;
|
||||
}
|
||||
get => m_SecureLevel;
|
||||
set => m_SecureLevel = value;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ namespace Server.Items
|
|||
|
||||
private BookPageInfo[] m_Pages;
|
||||
|
||||
public string Title{ get{ return m_Title; } }
|
||||
public string Author{ get{ return m_Author; } }
|
||||
public string Title => m_Title;
|
||||
public string Author => m_Author;
|
||||
|
||||
public BookPageInfo[] Pages{ get{ return m_Pages; } }
|
||||
public BookPageInfo[] Pages => m_Pages;
|
||||
|
||||
public BookContent( string title, string author, params BookPageInfo[] pages )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Level
|
||||
{
|
||||
get{ return m_Level; }
|
||||
get => m_Level;
|
||||
set{ m_Level = Math.Max( Math.Min( 2, value), 0 ); Attributes.BonusInt = 2 + m_Level; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace Server.Items
|
|||
|
||||
public FactionItem FactionItemState
|
||||
{
|
||||
get{ return m_FactionState; }
|
||||
get => m_FactionState;
|
||||
set
|
||||
{
|
||||
m_FactionState = value;
|
||||
|
|
@ -40,7 +40,7 @@ namespace Server.Items
|
|||
}
|
||||
#endregion
|
||||
|
||||
public virtual bool CanFortify{ get{ return true; } }
|
||||
public virtual bool CanFortify => true;
|
||||
|
||||
private int m_MaxHitPoints;
|
||||
private int m_HitPoints;
|
||||
|
|
@ -58,17 +58,14 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxHitPoints
|
||||
{
|
||||
get{ return m_MaxHitPoints; }
|
||||
get => m_MaxHitPoints;
|
||||
set{ m_MaxHitPoints = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int HitPoints
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_HitPoints;
|
||||
}
|
||||
get => m_HitPoints;
|
||||
set
|
||||
{
|
||||
if ( value != m_HitPoints && MaxHitPoints > 0 )
|
||||
|
|
@ -88,73 +85,73 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Crafter
|
||||
{
|
||||
get{ return m_Crafter; }
|
||||
get => m_Crafter;
|
||||
set{ m_Crafter = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int StrRequirement
|
||||
{
|
||||
get{ return ( m_StrReq == -1 ? (Core.AOS ? AosStrReq : OldStrReq) : m_StrReq ); }
|
||||
get => ( m_StrReq == -1 ? (Core.AOS ? AosStrReq : OldStrReq) : m_StrReq );
|
||||
set{ m_StrReq = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public ClothingQuality Quality
|
||||
{
|
||||
get{ return m_Quality; }
|
||||
get => m_Quality;
|
||||
set{ m_Quality = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool PlayerConstructed
|
||||
{
|
||||
get{ return m_PlayerConstructed; }
|
||||
set{ m_PlayerConstructed = value; }
|
||||
get => m_PlayerConstructed;
|
||||
set => m_PlayerConstructed = value;
|
||||
}
|
||||
|
||||
public virtual CraftResource DefaultResource{ get{ return CraftResource.None; } }
|
||||
public virtual CraftResource DefaultResource => CraftResource.None;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get{ return m_Resource; }
|
||||
get => m_Resource;
|
||||
set{ m_Resource = value; Hue = CraftResources.GetHue( m_Resource ); InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosAttributes Attributes
|
||||
{
|
||||
get{ return m_AosAttributes; }
|
||||
get => m_AosAttributes;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosArmorAttributes ClothingAttributes
|
||||
{
|
||||
get{ return m_AosClothingAttributes; }
|
||||
get => m_AosClothingAttributes;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosSkillBonuses SkillBonuses
|
||||
{
|
||||
get{ return m_AosSkillBonuses; }
|
||||
get => m_AosSkillBonuses;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosElementAttributes Resistances
|
||||
{
|
||||
get{ return m_AosResistances; }
|
||||
get => m_AosResistances;
|
||||
set{}
|
||||
}
|
||||
|
||||
public virtual int BasePhysicalResistance{ get{ return 0; } }
|
||||
public virtual int BaseFireResistance{ get{ return 0; } }
|
||||
public virtual int BaseColdResistance{ get{ return 0; } }
|
||||
public virtual int BasePoisonResistance{ get{ return 0; } }
|
||||
public virtual int BaseEnergyResistance{ get{ return 0; } }
|
||||
public virtual int BasePhysicalResistance => 0;
|
||||
public virtual int BaseFireResistance => 0;
|
||||
public virtual int BaseColdResistance => 0;
|
||||
public virtual int BasePoisonResistance => 0;
|
||||
public virtual int BaseEnergyResistance => 0;
|
||||
|
||||
public override int PhysicalResistance => BasePhysicalResistance + m_AosResistances.Physical;
|
||||
public override int FireResistance => BaseFireResistance + m_AosResistances.Fire;
|
||||
|
|
@ -162,11 +159,11 @@ namespace Server.Items
|
|||
public override int PoisonResistance => BasePoisonResistance + m_AosResistances.Poison;
|
||||
public override int EnergyResistance => BaseEnergyResistance + m_AosResistances.Energy;
|
||||
|
||||
public virtual int ArtifactRarity{ get{ return 0; } }
|
||||
public virtual int ArtifactRarity => 0;
|
||||
|
||||
public virtual int BaseStrBonus{ get{ return 0; } }
|
||||
public virtual int BaseDexBonus{ get{ return 0; } }
|
||||
public virtual int BaseIntBonus{ get{ return 0; } }
|
||||
public virtual int BaseStrBonus => 0;
|
||||
public virtual int BaseDexBonus => 0;
|
||||
public virtual int BaseIntBonus => 0;
|
||||
|
||||
public override bool AllowSecureTrade( Mobile from, Mobile to, Mobile newOwner, bool accepted )
|
||||
{
|
||||
|
|
@ -228,15 +225,15 @@ namespace Server.Items
|
|||
return base.CanEquip( from );
|
||||
}
|
||||
|
||||
public virtual int AosStrReq{ get{ return 10; } }
|
||||
public virtual int OldStrReq{ get{ return 0; } }
|
||||
public virtual int AosStrReq => 10;
|
||||
public virtual int OldStrReq => 0;
|
||||
|
||||
public virtual int InitMinHits{ get{ return 0; } }
|
||||
public virtual int InitMaxHits{ get{ return 0; } }
|
||||
public virtual int InitMinHits => 0;
|
||||
public virtual int InitMaxHits => 0;
|
||||
|
||||
public virtual bool AllowMaleWearer{ get{ return true; } }
|
||||
public virtual bool AllowFemaleWearer{ get{ return true; } }
|
||||
public virtual bool CanBeBlessed{ get{ return true; } }
|
||||
public virtual bool AllowMaleWearer => true;
|
||||
public virtual bool AllowFemaleWearer => true;
|
||||
public virtual bool CanBeBlessed => true;
|
||||
|
||||
public int ComputeStatReq( StatType type )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,22 +41,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxArcaneCharges
|
||||
{
|
||||
get{ return m_MaxArcaneCharges; }
|
||||
get => m_MaxArcaneCharges;
|
||||
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CurArcaneCharges
|
||||
{
|
||||
get{ return m_CurArcaneCharges; }
|
||||
get => m_CurArcaneCharges;
|
||||
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsArcane
|
||||
{
|
||||
get{ return ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 ); }
|
||||
}
|
||||
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
|
||||
|
||||
public void Update()
|
||||
{
|
||||
|
|
@ -164,14 +161,14 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsRewardItem
|
||||
{
|
||||
get{ return m_IsRewardItem; }
|
||||
set{ m_IsRewardItem = value; }
|
||||
get => m_IsRewardItem;
|
||||
set => m_IsRewardItem = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Number
|
||||
{
|
||||
get{ return m_LabelNumber; }
|
||||
get => m_LabelNumber;
|
||||
set{ m_LabelNumber = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsShipwreckedItem
|
||||
{
|
||||
get { return m_IsShipwreckedItem; }
|
||||
set { m_IsShipwreckedItem = value; }
|
||||
get => m_IsShipwreckedItem;
|
||||
set => m_IsShipwreckedItem = value;
|
||||
}
|
||||
|
||||
public BaseHat( int itemID ) : this( itemID, 0 )
|
||||
|
|
@ -698,10 +698,7 @@ namespace Server.Items
|
|||
return false;
|
||||
}
|
||||
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "a mask of orcish kin"; }
|
||||
}
|
||||
public override string DefaultName => "a mask of orcish kin";
|
||||
|
||||
[Constructible]
|
||||
public OrcishKinMask() : this( 0x8A4 )
|
||||
|
|
|
|||
|
|
@ -105,10 +105,7 @@ namespace Server.Items
|
|||
|
||||
private static TimeSpan m_DefaultDecayTime = TimeSpan.FromMinutes(1.0);
|
||||
|
||||
public override bool DisplayLootType
|
||||
{
|
||||
get{ return false; }
|
||||
}
|
||||
public override bool DisplayLootType => false;
|
||||
|
||||
[Constructible]
|
||||
public DeathRobe()
|
||||
|
|
@ -241,14 +238,14 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsRewardItem
|
||||
{
|
||||
get{ return m_IsRewardItem; }
|
||||
set{ m_IsRewardItem = value; }
|
||||
get => m_IsRewardItem;
|
||||
set => m_IsRewardItem = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Number
|
||||
{
|
||||
get{ return m_LabelNumber; }
|
||||
get => m_LabelNumber;
|
||||
set{ m_LabelNumber = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -366,14 +363,14 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsRewardItem
|
||||
{
|
||||
get{ return m_IsRewardItem; }
|
||||
set{ m_IsRewardItem = value; }
|
||||
get => m_IsRewardItem;
|
||||
set => m_IsRewardItem = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Number
|
||||
{
|
||||
get{ return m_LabelNumber; }
|
||||
get => m_LabelNumber;
|
||||
set{ m_LabelNumber = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -491,22 +488,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxArcaneCharges
|
||||
{
|
||||
get{ return m_MaxArcaneCharges; }
|
||||
get => m_MaxArcaneCharges;
|
||||
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CurArcaneCharges
|
||||
{
|
||||
get{ return m_CurArcaneCharges; }
|
||||
get => m_CurArcaneCharges;
|
||||
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsArcane
|
||||
{
|
||||
get{ return ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 ); }
|
||||
}
|
||||
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
|
||||
|
||||
public void Update()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -132,22 +132,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxArcaneCharges
|
||||
{
|
||||
get{ return m_MaxArcaneCharges; }
|
||||
get => m_MaxArcaneCharges;
|
||||
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CurArcaneCharges
|
||||
{
|
||||
get{ return m_CurArcaneCharges; }
|
||||
get => m_CurArcaneCharges;
|
||||
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsArcane
|
||||
{
|
||||
get{ return ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 ); }
|
||||
}
|
||||
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
|
||||
|
||||
public override void OnSingleClick( Mobile from )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ namespace Server.Items
|
|||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get{ return base.Hue; }
|
||||
get => base.Hue;
|
||||
set{ base.Hue = value; if ( m_Item.Hue != value ) m_Item.Hue = value; }
|
||||
}
|
||||
|
||||
|
|
@ -233,7 +233,7 @@ namespace Server.Items
|
|||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get{ return base.Hue; }
|
||||
get => base.Hue;
|
||||
set{ base.Hue = value; if ( m_Item.Hue != value ) m_Item.Hue = value; }
|
||||
}
|
||||
|
||||
|
|
@ -302,7 +302,7 @@ namespace Server.Items
|
|||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get{ return base.Hue; }
|
||||
get => base.Hue;
|
||||
set{ base.Hue = value; if ( m_Item.Hue != value ) m_Item.Hue = value; }
|
||||
}
|
||||
|
||||
|
|
@ -403,7 +403,7 @@ namespace Server.Items
|
|||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get{ return base.Hue; }
|
||||
get => base.Hue;
|
||||
set{ base.Hue = value; if ( m_Item.Hue != value ) m_Item.Hue = value; }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -198,36 +198,21 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Locked
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Locked;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Locked = value;
|
||||
}
|
||||
get => m_Locked;
|
||||
set => m_Locked = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public uint KeyValue
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_KeyValue;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_KeyValue = value;
|
||||
}
|
||||
get => m_KeyValue;
|
||||
set => m_KeyValue = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Open
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Open;
|
||||
}
|
||||
get => m_Open;
|
||||
set
|
||||
{
|
||||
if ( m_Open != value )
|
||||
|
|
@ -317,66 +302,36 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int OpenedID
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_OpenedID;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_OpenedID = value;
|
||||
}
|
||||
get => m_OpenedID;
|
||||
set => m_OpenedID = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int ClosedID
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_ClosedID;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_ClosedID = value;
|
||||
}
|
||||
get => m_ClosedID;
|
||||
set => m_ClosedID = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int OpenedSound
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_OpenedSound;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_OpenedSound = value;
|
||||
}
|
||||
get => m_OpenedSound;
|
||||
set => m_OpenedSound = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int ClosedSound
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_ClosedSound;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_ClosedSound = value;
|
||||
}
|
||||
get => m_ClosedSound;
|
||||
set => m_ClosedSound = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Point3D Offset
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Offset;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Offset = value;
|
||||
}
|
||||
get => m_Offset;
|
||||
set => m_Offset = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
|
|
@ -389,13 +344,10 @@ namespace Server.Items
|
|||
|
||||
return m_Link;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Link = value;
|
||||
}
|
||||
set => m_Link = value;
|
||||
}
|
||||
|
||||
public virtual bool UseChainedFunctionality{ get{ return false; } }
|
||||
public virtual bool UseChainedFunctionality => false;
|
||||
|
||||
public List<BaseDoor> GetChain()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -98,15 +98,15 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DoorFacing Facing
|
||||
{
|
||||
get{ return m_Facing; }
|
||||
set{ m_Facing = value; }
|
||||
get => m_Facing;
|
||||
set => m_Facing = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public SecureLevel Level
|
||||
{
|
||||
get{ return m_Level; }
|
||||
set{ m_Level = value; }
|
||||
get => m_Level;
|
||||
set => m_Level = value;
|
||||
}
|
||||
|
||||
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@ namespace Server.Items
|
|||
public override int LabelNumber => m_LabelNumber;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Number{ get{ return m_LabelNumber; } set{ m_LabelNumber = value; InvalidateProperties(); } }
|
||||
public int Number{ get => m_LabelNumber;
|
||||
set{ m_LabelNumber = value; InvalidateProperties(); } }
|
||||
|
||||
[Constructible]
|
||||
public LocalizedSign( SignType type, SignFacing facing, int labelNumber ) : base( ( 0xB95 + (2 * (int)type) ) + (int)facing )
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string Subtext
|
||||
{
|
||||
get { return m_Subtext; }
|
||||
get => m_Subtext;
|
||||
set { m_Subtext = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,45 +12,27 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public TreasureLevel Level
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_TreasureLevel;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_TreasureLevel = value;
|
||||
}
|
||||
get => m_TreasureLevel;
|
||||
set => m_TreasureLevel = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public short MaxSpawnTime
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_MaxSpawnTime;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_MaxSpawnTime = value;
|
||||
}
|
||||
get => m_MaxSpawnTime;
|
||||
set => m_MaxSpawnTime = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public short MinSpawnTime
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_MinSpawnTime;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_MinSpawnTime = value;
|
||||
}
|
||||
get => m_MinSpawnTime;
|
||||
set => m_MinSpawnTime = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public override bool Locked {
|
||||
get { return base.Locked; }
|
||||
get => base.Locked;
|
||||
set {
|
||||
if ( base.Locked != value ) {
|
||||
base.Locked = value;
|
||||
|
|
@ -61,10 +43,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public override bool IsDecoContainer
|
||||
{
|
||||
get{ return false; }
|
||||
}
|
||||
public override bool IsDecoContainer => false;
|
||||
|
||||
public BaseTreasureChest( int itemID ) : this( itemID, TreasureLevel.Level2 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public FillableContentType ContentType
|
||||
{
|
||||
get { return FillableContent.Lookup( m_Content ); }
|
||||
set { Content = FillableContent.Lookup( value ); }
|
||||
get => FillableContent.Lookup( m_Content );
|
||||
set => Content = FillableContent.Lookup( value );
|
||||
}
|
||||
|
||||
public FillableContent Content
|
||||
{
|
||||
get { return m_Content; }
|
||||
get => m_Content;
|
||||
set
|
||||
{
|
||||
if ( m_Content == value )
|
||||
|
|
@ -701,7 +701,7 @@ namespace Server.Items
|
|||
public int Level => m_Level;
|
||||
public Type[] Vendors => m_Vendors;
|
||||
|
||||
public FillableContentType TypeID { get { return Lookup( this ); } }
|
||||
public FillableContentType TypeID => Lookup( this );
|
||||
|
||||
public FillableContent( int level, Type[] vendors, FillableEntry[] entries )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,62 +15,35 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Picker
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Picker;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Picker = value;
|
||||
}
|
||||
get => m_Picker;
|
||||
set => m_Picker = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxLockLevel
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_MaxLockLevel;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_MaxLockLevel = value;
|
||||
}
|
||||
get => m_MaxLockLevel;
|
||||
set => m_MaxLockLevel = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int LockLevel
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_LockLevel;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_LockLevel = value;
|
||||
}
|
||||
get => m_LockLevel;
|
||||
set => m_LockLevel = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int RequiredSkill
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_RequiredSkill;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_RequiredSkill = value;
|
||||
}
|
||||
get => m_RequiredSkill;
|
||||
set => m_RequiredSkill = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public virtual bool Locked
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Locked;
|
||||
}
|
||||
get => m_Locked;
|
||||
set
|
||||
{
|
||||
m_Locked = value;
|
||||
|
|
@ -85,35 +58,17 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public uint KeyValue
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_KeyValue;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_KeyValue = value;
|
||||
}
|
||||
get => m_KeyValue;
|
||||
set => m_KeyValue = value;
|
||||
}
|
||||
|
||||
public override bool TrapOnOpen
|
||||
{
|
||||
get
|
||||
{
|
||||
return !m_TrapOnLockpick;
|
||||
}
|
||||
}
|
||||
public override bool TrapOnOpen => !m_TrapOnLockpick;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool TrapOnLockpick
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_TrapOnLockpick;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_TrapOnLockpick = value;
|
||||
}
|
||||
get => m_TrapOnLockpick;
|
||||
set => m_TrapOnLockpick = value;
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
|
|
@ -403,8 +358,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsShipwreckedItem
|
||||
{
|
||||
get { return m_IsShipwreckedItem; }
|
||||
set { m_IsShipwreckedItem = value; }
|
||||
get => m_IsShipwreckedItem;
|
||||
set => m_IsShipwreckedItem = value;
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool AutoLock
|
||||
{
|
||||
get { return m_AutoLock; }
|
||||
get => m_AutoLock;
|
||||
set
|
||||
{
|
||||
m_AutoLock = value;
|
||||
|
|
@ -81,15 +81,19 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Map TargetMap { get { return m_TargetMap; } set { m_TargetMap = value; } }
|
||||
public Map TargetMap { get => m_TargetMap;
|
||||
set => m_TargetMap = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Point3D Target { get { return m_Target; } set { m_Target = value; } }
|
||||
public Point3D Target { get => m_Target;
|
||||
set => m_Target = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Bone
|
||||
{
|
||||
get { return ItemID == 0xECA; }
|
||||
get => ItemID == 0xECA;
|
||||
set
|
||||
{
|
||||
ItemID = value ? 0xECA : 0xE79;
|
||||
|
|
@ -98,13 +102,12 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string Description { get { return m_Description; } set { m_Description = value; } }
|
||||
|
||||
public override bool IsDecoContainer
|
||||
{
|
||||
get{ return false; }
|
||||
public string Description { get => m_Description;
|
||||
set => m_Description = value;
|
||||
}
|
||||
|
||||
public override bool IsDecoContainer => false;
|
||||
|
||||
[Constructible]
|
||||
public MarkContainer() : this( false )
|
||||
{
|
||||
|
|
@ -137,7 +140,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public override bool Locked
|
||||
{
|
||||
get { return base.Locked; }
|
||||
get => base.Locked;
|
||||
set
|
||||
{
|
||||
base.Locked = value;
|
||||
|
|
|
|||
|
|
@ -24,10 +24,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Owner
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Owner;
|
||||
}
|
||||
get => m_Owner;
|
||||
set
|
||||
{
|
||||
m_Owner = value;
|
||||
|
|
@ -91,13 +88,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public override TimeSpan DecayTime
|
||||
{
|
||||
get
|
||||
{
|
||||
return TimeSpan.FromMinutes( 30.0 );
|
||||
}
|
||||
}
|
||||
public override TimeSpan DecayTime => TimeSpan.FromMinutes( 30.0 );
|
||||
|
||||
public override void AddNameProperty( ObjectPropertyList list )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,43 +20,25 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public TrapType TrapType
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_TrapType;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_TrapType = value;
|
||||
}
|
||||
get => m_TrapType;
|
||||
set => m_TrapType = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int TrapPower
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_TrapPower;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_TrapPower = value;
|
||||
}
|
||||
get => m_TrapPower;
|
||||
set => m_TrapPower = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int TrapLevel
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_TrapLevel;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_TrapLevel = value;
|
||||
}
|
||||
get => m_TrapLevel;
|
||||
set => m_TrapLevel = value;
|
||||
}
|
||||
|
||||
public virtual bool TrapOnOpen{ get{ return true; } }
|
||||
public virtual bool TrapOnOpen => true;
|
||||
|
||||
public TrappableContainer( int itemID ) : base( itemID )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -33,16 +33,22 @@ namespace Server.Items
|
|||
private List<Mobile> m_Guardians;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Level{ get{ return m_Level; } set{ m_Level = value; } }
|
||||
public int Level{ get => m_Level;
|
||||
set => m_Level = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Owner{ get{ return m_Owner; } set{ m_Owner = value; } }
|
||||
public Mobile Owner{ get => m_Owner;
|
||||
set => m_Owner = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime DeleteTime{ get{ return m_DeleteTime; } }
|
||||
public DateTime DeleteTime => m_DeleteTime;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Temporary{ get{ return m_Temporary; } set{ m_Temporary = value; } }
|
||||
public bool Temporary{ get => m_Temporary;
|
||||
set => m_Temporary = value;
|
||||
}
|
||||
|
||||
public List<Mobile> Guardians => m_Guardians;
|
||||
|
||||
|
|
@ -332,10 +338,7 @@ namespace Server.Items
|
|||
return false;
|
||||
}
|
||||
|
||||
public override bool IsDecoContainer
|
||||
{
|
||||
get{ return false; }
|
||||
}
|
||||
public override bool IsDecoContainer => false;
|
||||
|
||||
public override bool CheckItemUse( Mobile from, Item item )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1418,8 +1418,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsOn
|
||||
{
|
||||
get{ return this.ItemID == 0x24BF; }
|
||||
set{ this.ItemID = value ? 0x24BF : 0x24C0; }
|
||||
get => this.ItemID == 0x24BF;
|
||||
set => this.ItemID = value ? 0x24BF : 0x24C0;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@ namespace Server.Items
|
|||
private Type m_Type;
|
||||
private int m_Hue;
|
||||
|
||||
public Map Map{ get{ return m_Map; } }
|
||||
public Point3D Location{ get{ return m_Location; } }
|
||||
public int MinDelay{ get{ return m_MinDelay; } }
|
||||
public int MaxDelay{ get{ return m_MaxDelay; } }
|
||||
public Type Type{ get{ return m_Type; } }
|
||||
public int Hue{ get{ return m_Hue; } }
|
||||
public Map Map => m_Map;
|
||||
public Point3D Location => m_Location;
|
||||
public int MinDelay => m_MinDelay;
|
||||
public int MaxDelay => m_MaxDelay;
|
||||
public Type Type => m_Type;
|
||||
public int Hue => m_Hue;
|
||||
|
||||
public StealableEntry( Map map, Point3D location, int minDelay, int maxDelay, Type type ) : this( map, location, minDelay, maxDelay, type, 0 )
|
||||
{
|
||||
|
|
@ -158,7 +158,7 @@ namespace Server.Items
|
|||
new StealableEntry( Map.Malas, new Point3D( 178, 629, -1 ), 18432, 27648, typeof( ManStatuetteEastArtifact ) )
|
||||
};
|
||||
|
||||
public static StealableEntry[] Entries{ get{ return m_Entries; } }
|
||||
public static StealableEntry[] Entries => m_Entries;
|
||||
|
||||
private static Type[] m_TypesOfEntries = null;
|
||||
public static Type[] TypesOfEntires
|
||||
|
|
@ -179,7 +179,7 @@ namespace Server.Items
|
|||
|
||||
private static StealableArtifactsSpawner m_Instance;
|
||||
|
||||
public static StealableArtifactsSpawner Instance{ get{ return m_Instance; } }
|
||||
public static StealableArtifactsSpawner Instance => m_Instance;
|
||||
|
||||
private static int GetLampPostHue()
|
||||
{
|
||||
|
|
@ -254,11 +254,11 @@ namespace Server.Items
|
|||
private Item m_Item;
|
||||
private DateTime m_NextRespawn;
|
||||
|
||||
public StealableEntry Entry{ get{ return m_Entry; } }
|
||||
public StealableEntry Entry => m_Entry;
|
||||
|
||||
public Item Item
|
||||
{
|
||||
get{ return m_Item; }
|
||||
get => m_Item;
|
||||
set
|
||||
{
|
||||
if ( m_Item != null && value == null )
|
||||
|
|
@ -282,8 +282,8 @@ namespace Server.Items
|
|||
|
||||
public DateTime NextRespawn
|
||||
{
|
||||
get{ return m_NextRespawn; }
|
||||
set{ m_NextRespawn = value; }
|
||||
get => m_NextRespawn;
|
||||
set => m_NextRespawn = value;
|
||||
}
|
||||
|
||||
public StealableInstance( StealableEntry entry ) : this( entry, null, DateTime.UtcNow )
|
||||
|
|
@ -313,10 +313,7 @@ namespace Server.Items
|
|||
private StealableInstance[] m_Artifacts;
|
||||
private Hashtable m_Table;
|
||||
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "Stealable Artifacts Spawner - Internal"; }
|
||||
}
|
||||
public override string DefaultName => "Stealable Artifacts Spawner - Internal";
|
||||
|
||||
private StealableArtifactsSpawner() : base( 1 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,10 +6,7 @@ namespace Server.Items
|
|||
{
|
||||
public class BarkeepContract : Item
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "a barkeep contract"; }
|
||||
}
|
||||
public override string DefaultName => "a barkeep contract";
|
||||
|
||||
[Constructible]
|
||||
public BarkeepContract() : base( 0x14F0 )
|
||||
|
|
|
|||
|
|
@ -53,10 +53,7 @@ namespace Server.Items
|
|||
|
||||
public class ClothingBlessDeed : Item // Create the item class which is derived from the base item class
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "a clothing bless deed"; }
|
||||
}
|
||||
public override string DefaultName => "a clothing bless deed";
|
||||
|
||||
[Constructible]
|
||||
public ClothingBlessDeed() : base( 0x14F0 )
|
||||
|
|
|
|||
|
|
@ -14,13 +14,7 @@ namespace Server.Items
|
|||
private Item m_Commodity;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Item Commodity
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Commodity;
|
||||
}
|
||||
}
|
||||
public Item Commodity => m_Commodity;
|
||||
|
||||
public bool SetCommodity( Item item )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,13 +14,16 @@ namespace Server.Items
|
|||
public override int LabelNumber => m_Exceptional ? 1053181 : 1053012; // dragon barding deed
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Crafter{ get{ return m_Crafter; } set{ m_Crafter = value; InvalidateProperties(); } }
|
||||
public Mobile Crafter{ get => m_Crafter;
|
||||
set{ m_Crafter = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Exceptional{ get{ return m_Exceptional; } set{ m_Exceptional = value; InvalidateProperties(); } }
|
||||
public bool Exceptional{ get => m_Exceptional;
|
||||
set{ m_Exceptional = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource{ get{ return m_Resource; } set{ m_Resource = value; Hue = CraftResources.GetHue( value ); InvalidateProperties(); } }
|
||||
public CraftResource Resource{ get => m_Resource;
|
||||
set{ m_Resource = value; Hue = CraftResources.GetHue( value ); InvalidateProperties(); } }
|
||||
|
||||
public DragonBardingDeed() : base( 0x14F0 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,10 +7,7 @@ namespace Server.Items
|
|||
{
|
||||
public class NameChangeDeed : Item
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "a name change deed"; }
|
||||
}
|
||||
public override string DefaultName => "a name change deed";
|
||||
|
||||
[Constructible]
|
||||
public NameChangeDeed() : base( 0x14F0 )
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Owner
|
||||
{
|
||||
get{ return m_Owner; }
|
||||
set{ m_Owner = value; }
|
||||
get => m_Owner;
|
||||
set => m_Owner = value;
|
||||
}
|
||||
|
||||
public override int LabelNumber => 1062094; // a young player ticket
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ namespace Server.Items
|
|||
|
||||
public VendorRentalDuration Duration
|
||||
{
|
||||
get{ return m_Duration; }
|
||||
get => m_Duration;
|
||||
set
|
||||
{
|
||||
if ( value != null )
|
||||
|
|
@ -32,20 +32,20 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Price
|
||||
{
|
||||
get{ return m_Price; }
|
||||
set{ m_Price = value; }
|
||||
get => m_Price;
|
||||
set => m_Price = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool LandlordRenew
|
||||
{
|
||||
get{ return m_LandlordRenew; }
|
||||
set{ m_LandlordRenew = value; }
|
||||
get => m_LandlordRenew;
|
||||
set => m_LandlordRenew = value;
|
||||
}
|
||||
|
||||
public Mobile Offeree
|
||||
{
|
||||
get{ return m_Offeree; }
|
||||
get => m_Offeree;
|
||||
set
|
||||
{
|
||||
if ( m_OfferExpireTimer != null )
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public virtual bool ShowQuantity { get { return ( MaxQuantity > 1 ); } }
|
||||
public virtual bool ShowQuantity => ( MaxQuantity > 1 );
|
||||
public virtual bool Fillable => true;
|
||||
public virtual bool Pourable => true;
|
||||
|
||||
|
|
@ -577,41 +577,32 @@ namespace Server.Items
|
|||
public abstract int ComputeItemID();
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsEmpty
|
||||
{
|
||||
get { return ( m_Quantity <= 0 ); }
|
||||
}
|
||||
public bool IsEmpty => ( m_Quantity <= 0 );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool ContainsAlchohol
|
||||
{
|
||||
get { return ( !IsEmpty && m_Content != BeverageType.Milk && m_Content != BeverageType.Water ); }
|
||||
}
|
||||
public bool ContainsAlchohol => ( !IsEmpty && m_Content != BeverageType.Milk && m_Content != BeverageType.Water );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsFull
|
||||
{
|
||||
get { return ( m_Quantity >= MaxQuantity ); }
|
||||
}
|
||||
public bool IsFull => ( m_Quantity >= MaxQuantity );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Poison Poison
|
||||
{
|
||||
get { return m_Poison; }
|
||||
set { m_Poison = value; }
|
||||
get => m_Poison;
|
||||
set => m_Poison = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Poisoner
|
||||
{
|
||||
get { return m_Poisoner; }
|
||||
set { m_Poisoner = value; }
|
||||
get => m_Poisoner;
|
||||
set => m_Poisoner = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public BeverageType Content
|
||||
{
|
||||
get { return m_Content; }
|
||||
get => m_Content;
|
||||
set
|
||||
{
|
||||
m_Content = value;
|
||||
|
|
@ -630,7 +621,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Quantity
|
||||
{
|
||||
get { return m_Quantity; }
|
||||
get => m_Quantity;
|
||||
set
|
||||
{
|
||||
if ( value < 0 )
|
||||
|
|
|
|||
|
|
@ -10,14 +10,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CookingLevel
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_CookingLevel;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_CookingLevel = value;
|
||||
}
|
||||
get => m_CookingLevel;
|
||||
set => m_CookingLevel = value;
|
||||
}
|
||||
|
||||
public CookableFood( int itemID, int cookingLevel ) : base( itemID )
|
||||
|
|
@ -706,10 +700,7 @@ namespace Server.Items
|
|||
// ********** BrightlyColoredEggs **********
|
||||
public class BrightlyColoredEggs : CookableFood
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "brightly colored eggs"; }
|
||||
}
|
||||
public override string DefaultName => "brightly colored eggs";
|
||||
|
||||
[Constructible]
|
||||
public BrightlyColoredEggs() : base( 0x9B5, 15 )
|
||||
|
|
@ -848,10 +839,7 @@ namespace Server.Items
|
|||
|
||||
public class RawFishSteak : CookableFood
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public RawFishSteak() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -410,7 +410,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Quantity
|
||||
{
|
||||
get{ return m_Quantity; }
|
||||
get => m_Quantity;
|
||||
set
|
||||
{
|
||||
m_Quantity = Math.Min(20, Math.Max(0, value));
|
||||
|
|
|
|||
|
|
@ -12,22 +12,22 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Poisoner
|
||||
{
|
||||
get { return m_Poisoner; }
|
||||
set { m_Poisoner = value; }
|
||||
get => m_Poisoner;
|
||||
set => m_Poisoner = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Poison Poison
|
||||
{
|
||||
get { return m_Poison; }
|
||||
set { m_Poison = value; }
|
||||
get => m_Poison;
|
||||
set => m_Poison = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int FillFactor
|
||||
{
|
||||
get { return m_FillFactor; }
|
||||
set { m_FillFactor = value; }
|
||||
get => m_FillFactor;
|
||||
set => m_FillFactor = value;
|
||||
}
|
||||
|
||||
public Food( int itemID ) : this( 1, itemID )
|
||||
|
|
@ -280,10 +280,7 @@ namespace Server.Items
|
|||
|
||||
public class FishSteak : Food
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public FishSteak() : this( 1 )
|
||||
|
|
@ -317,10 +314,7 @@ namespace Server.Items
|
|||
|
||||
public class CheeseWheel : Food
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public CheeseWheel() : this( 1 )
|
||||
|
|
@ -354,10 +348,7 @@ namespace Server.Items
|
|||
|
||||
public class CheeseWedge : Food
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public CheeseWedge() : this( 1 )
|
||||
|
|
@ -391,10 +382,7 @@ namespace Server.Items
|
|||
|
||||
public class CheeseSlice : Food
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public CheeseSlice() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public SecureLevel Level
|
||||
{
|
||||
get{ return m_Level; }
|
||||
set{ m_Level = value; }
|
||||
get => m_Level;
|
||||
set => m_Level = value;
|
||||
}
|
||||
|
||||
public BaseBoard( int itemID ) : base( itemID )
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ namespace Server.Items
|
|||
|
||||
public BaseBoard Board
|
||||
{
|
||||
get { return m_Board; }
|
||||
set { m_Board = value; }
|
||||
get => m_Board;
|
||||
set => m_Board = value;
|
||||
}
|
||||
|
||||
public override bool IsVirtualItem => true;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class PieceWhiteChecker : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "white checker"; }
|
||||
}
|
||||
public override string DefaultName => "white checker";
|
||||
|
||||
public PieceWhiteChecker( BaseBoard board ) : base( 0x3584, board )
|
||||
{
|
||||
|
|
@ -30,10 +27,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceBlackChecker : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "black checker"; }
|
||||
}
|
||||
public override string DefaultName => "black checker";
|
||||
|
||||
public PieceBlackChecker( BaseBoard board ) : base( 0x358B, board )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class PieceWhiteKing : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "white king"; }
|
||||
}
|
||||
public override string DefaultName => "white king";
|
||||
|
||||
public PieceWhiteKing( BaseBoard board ) : base( 0x3587, board )
|
||||
{
|
||||
|
|
@ -30,10 +27,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceBlackKing : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "black king"; }
|
||||
}
|
||||
public override string DefaultName => "black king";
|
||||
|
||||
public PieceBlackKing( BaseBoard board ) : base( 0x358E, board )
|
||||
{
|
||||
|
|
@ -58,10 +52,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceWhiteQueen : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "white queen"; }
|
||||
}
|
||||
public override string DefaultName => "white queen";
|
||||
|
||||
public PieceWhiteQueen( BaseBoard board ) : base( 0x358A, board )
|
||||
{
|
||||
|
|
@ -86,10 +77,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceBlackQueen : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "black queen"; }
|
||||
}
|
||||
public override string DefaultName => "black queen";
|
||||
|
||||
public PieceBlackQueen( BaseBoard board ) : base( 0x3591, board )
|
||||
{
|
||||
|
|
@ -114,10 +102,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceWhiteRook : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "white rook"; }
|
||||
}
|
||||
public override string DefaultName => "white rook";
|
||||
|
||||
public PieceWhiteRook( BaseBoard board ) : base( 0x3586, board )
|
||||
{
|
||||
|
|
@ -142,10 +127,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceBlackRook : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "black rook"; }
|
||||
}
|
||||
public override string DefaultName => "black rook";
|
||||
|
||||
public PieceBlackRook( BaseBoard board ) : base( 0x358D, board )
|
||||
{
|
||||
|
|
@ -170,10 +152,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceWhiteBishop : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "white bishop"; }
|
||||
}
|
||||
public override string DefaultName => "white bishop";
|
||||
|
||||
public PieceWhiteBishop( BaseBoard board ) : base( 0x3585, board )
|
||||
{
|
||||
|
|
@ -198,10 +177,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceBlackBishop : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "black bishop"; }
|
||||
}
|
||||
public override string DefaultName => "black bishop";
|
||||
|
||||
public PieceBlackBishop( BaseBoard board ) : base( 0x358C, board )
|
||||
{
|
||||
|
|
@ -226,10 +202,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceWhiteKnight : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "white knight"; }
|
||||
}
|
||||
public override string DefaultName => "white knight";
|
||||
|
||||
public PieceWhiteKnight( BaseBoard board ) : base( 0x3588, board )
|
||||
{
|
||||
|
|
@ -254,10 +227,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceBlackKnight : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "black knight"; }
|
||||
}
|
||||
public override string DefaultName => "black knight";
|
||||
|
||||
public PieceBlackKnight( BaseBoard board ) : base( 0x358F, board )
|
||||
{
|
||||
|
|
@ -282,10 +252,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceWhitePawn : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "white pawn"; }
|
||||
}
|
||||
public override string DefaultName => "white pawn";
|
||||
|
||||
public PieceWhitePawn( BaseBoard board ) : base( 0x3589, board )
|
||||
{
|
||||
|
|
@ -310,10 +277,7 @@ namespace Server.Items
|
|||
|
||||
public class PieceBlackPawn : BasePiece
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "black pawn"; }
|
||||
}
|
||||
public override string DefaultName => "black pawn";
|
||||
|
||||
public PieceBlackPawn( BaseBoard board ) : base( 0x3590, board )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,10 +28,7 @@ namespace Server.Engines.Mahjong
|
|||
m_Wind = wind;
|
||||
}
|
||||
|
||||
public MahjongPieceDim Dimensions
|
||||
{
|
||||
get { return GetDimensions( m_Position, m_Direction ); }
|
||||
}
|
||||
public MahjongPieceDim Dimensions => GetDimensions( m_Position, m_Direction );
|
||||
|
||||
public void Move( Point2D position, MahjongPieceDirection direction, MahjongWind wind )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,14 +31,14 @@ namespace Server.Engines.Mahjong
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public SecureLevel Level
|
||||
{
|
||||
get{ return m_Level; }
|
||||
set{ m_Level = value; }
|
||||
get => m_Level;
|
||||
set => m_Level = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool ShowScores
|
||||
{
|
||||
get { return m_ShowScores; }
|
||||
get => m_ShowScores;
|
||||
set
|
||||
{
|
||||
if ( m_ShowScores == value )
|
||||
|
|
@ -58,7 +58,7 @@ namespace Server.Engines.Mahjong
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool SpectatorVision
|
||||
{
|
||||
get { return m_SpectatorVision; }
|
||||
get => m_SpectatorVision;
|
||||
set
|
||||
{
|
||||
if ( m_SpectatorVision == value )
|
||||
|
|
|
|||
|
|
@ -37,15 +37,9 @@ namespace Server.Engines.Mahjong
|
|||
m_Flipped = flipped;
|
||||
}
|
||||
|
||||
public MahjongPieceDim Dimensions
|
||||
{
|
||||
get { return GetDimensions( m_Position, m_Direction ); }
|
||||
}
|
||||
public MahjongPieceDim Dimensions => GetDimensions( m_Position, m_Direction );
|
||||
|
||||
public bool IsMovable
|
||||
{
|
||||
get { return m_Game.GetStackLevel( Dimensions ) <= m_StackLevel; }
|
||||
}
|
||||
public bool IsMovable => m_Game.GetStackLevel( Dimensions ) <= m_StackLevel;
|
||||
|
||||
public void Move( Point2D position, MahjongPieceDirection direction, bool flip, int validHandArea )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,10 +19,7 @@ namespace Server.Engines.Mahjong
|
|||
m_Position = position;
|
||||
}
|
||||
|
||||
public MahjongPieceDim Dimensions
|
||||
{
|
||||
get { return GetDimensions( m_Position ); }
|
||||
}
|
||||
public MahjongPieceDim Dimensions => GetDimensions( m_Position );
|
||||
|
||||
public void Move( Point2D position )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class Amber : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public Amber() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class Amethyst : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public Amethyst() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class Citrine : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public Citrine() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class Diamond : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public Diamond() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class Emerald : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public Emerald() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class Ruby : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public Ruby() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class Sapphire : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public Sapphire() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class StarSapphire : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public StarSapphire() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Items
|
|||
{
|
||||
public class Tourmaline : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.1; }
|
||||
}
|
||||
public override double DefaultWeight => 0.1;
|
||||
|
||||
[Constructible]
|
||||
public Tourmaline() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -16,25 +16,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string GuildName
|
||||
{
|
||||
get { return m_GuildName; }
|
||||
get => m_GuildName;
|
||||
set { m_GuildName = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string GuildAbbrev
|
||||
{
|
||||
get { return m_GuildAbbrev; }
|
||||
get => m_GuildAbbrev;
|
||||
set { m_GuildAbbrev = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Guild Guild
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Guild;
|
||||
}
|
||||
}
|
||||
public Guild Guild => m_Guild;
|
||||
|
||||
public override int LabelNumber => 1041429; // a guildstone
|
||||
|
||||
|
|
@ -228,10 +222,7 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
#region IAddon Members
|
||||
public Item Deed
|
||||
{
|
||||
get { return new GuildstoneDeed( m_Guild, m_GuildName, m_GuildAbbrev ); }
|
||||
}
|
||||
public Item Deed => new GuildstoneDeed( m_Guild, m_GuildName, m_GuildAbbrev );
|
||||
|
||||
public bool CouldFit( IPoint3D p, Map map )
|
||||
{
|
||||
|
|
@ -283,25 +274,19 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string GuildName
|
||||
{
|
||||
get { return m_GuildName; }
|
||||
get => m_GuildName;
|
||||
set { m_GuildName = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string GuildAbbrev
|
||||
{
|
||||
get { return m_GuildAbbrev; }
|
||||
get => m_GuildAbbrev;
|
||||
set { m_GuildAbbrev = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Guild Guild
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Guild;
|
||||
}
|
||||
}
|
||||
public Guild Guild => m_Guild;
|
||||
|
||||
[Constructible]
|
||||
public GuildstoneDeed() : this( null, null )
|
||||
|
|
|
|||
|
|
@ -31,17 +31,14 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxHitPoints
|
||||
{
|
||||
get{ return m_MaxHitPoints; }
|
||||
get => m_MaxHitPoints;
|
||||
set{ m_MaxHitPoints = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int HitPoints
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_HitPoints;
|
||||
}
|
||||
get => m_HitPoints;
|
||||
set
|
||||
{
|
||||
if ( value != m_HitPoints && MaxHitPoints > 0 )
|
||||
|
|
@ -61,35 +58,35 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.Player )]
|
||||
public AosAttributes Attributes
|
||||
{
|
||||
get{ return m_AosAttributes; }
|
||||
get => m_AosAttributes;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosElementAttributes Resistances
|
||||
{
|
||||
get{ return m_AosResistances; }
|
||||
get => m_AosResistances;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AosSkillBonuses SkillBonuses
|
||||
{
|
||||
get{ return m_AosSkillBonuses; }
|
||||
get => m_AosSkillBonuses;
|
||||
set{}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public CraftResource Resource
|
||||
{
|
||||
get{ return m_Resource; }
|
||||
get => m_Resource;
|
||||
set{ m_Resource = value; Hue = CraftResources.GetHue( m_Resource ); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public GemType GemType
|
||||
{
|
||||
get{ return m_GemType; }
|
||||
get => m_GemType;
|
||||
set{ m_GemType = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
@ -98,10 +95,10 @@ namespace Server.Items
|
|||
public override int ColdResistance => m_AosResistances.Cold;
|
||||
public override int PoisonResistance => m_AosResistances.Poison;
|
||||
public override int EnergyResistance => m_AosResistances.Energy;
|
||||
public virtual int BaseGemTypeNumber{ get{ return 0; } }
|
||||
public virtual int BaseGemTypeNumber => 0;
|
||||
|
||||
public virtual int InitMinHits{ get{ return 0; } }
|
||||
public virtual int InitMaxHits{ get{ return 0; } }
|
||||
public virtual int InitMinHits => 0;
|
||||
public virtual int InitMaxHits => 0;
|
||||
|
||||
public override int LabelNumber
|
||||
{
|
||||
|
|
@ -124,7 +121,7 @@ namespace Server.Items
|
|||
jewel.m_AosSkillBonuses = new AosSkillBonuses( newItem, m_AosSkillBonuses );
|
||||
}
|
||||
|
||||
public virtual int ArtifactRarity{ get{ return 0; } }
|
||||
public virtual int ArtifactRarity => 0;
|
||||
|
||||
public BaseJewel( int itemID, Layer layer ) : base( itemID )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Burning
|
||||
{
|
||||
get { return m_Burning; }
|
||||
get => m_Burning;
|
||||
set
|
||||
{
|
||||
if ( m_Burning != value )
|
||||
|
|
@ -39,15 +39,15 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool BurntOut
|
||||
{
|
||||
get { return m_BurntOut; }
|
||||
set { m_BurntOut = value; }
|
||||
get => m_BurntOut;
|
||||
set => m_BurntOut = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Protected
|
||||
{
|
||||
get { return m_Protected; }
|
||||
set { m_Protected = value; }
|
||||
get => m_Protected;
|
||||
set => m_Protected = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
|
|
@ -63,7 +63,7 @@ namespace Server.Items
|
|||
return m_Duration;
|
||||
}
|
||||
|
||||
set { m_Duration = value; }
|
||||
set => m_Duration = value;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
|
|
|
|||
|
|
@ -66,8 +66,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsShipwreckedItem
|
||||
{
|
||||
get { return m_IsShipwreckedItem; }
|
||||
set { m_IsShipwreckedItem = value; }
|
||||
get => m_IsShipwreckedItem;
|
||||
set => m_IsShipwreckedItem = value;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,35 +22,32 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Protected
|
||||
{
|
||||
get { return m_Protected; }
|
||||
set { m_Protected = value; }
|
||||
get => m_Protected;
|
||||
set => m_Protected = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Rectangle2D Bounds
|
||||
{
|
||||
get { return m_Bounds; }
|
||||
set { m_Bounds = value; }
|
||||
get => m_Bounds;
|
||||
set => m_Bounds = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Width
|
||||
{
|
||||
get { return m_Width; }
|
||||
set { m_Width = value; }
|
||||
get => m_Width;
|
||||
set => m_Width = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Height
|
||||
{
|
||||
get { return m_Height; }
|
||||
set { m_Height = value; }
|
||||
get => m_Height;
|
||||
set => m_Height = value;
|
||||
}
|
||||
|
||||
public List<Point2D> Pins
|
||||
{
|
||||
get { return m_Pins; }
|
||||
}
|
||||
public List<Point2D> Pins => m_Pins;
|
||||
|
||||
[Constructible]
|
||||
public MapItem() : base( 0x14EC )
|
||||
|
|
|
|||
|
|
@ -66,10 +66,10 @@ namespace Server.Items
|
|||
private int m_Width, m_Height;
|
||||
private Rectangle2D m_Bounds;
|
||||
|
||||
public int Name{ get{ return m_Name; } }
|
||||
public int Width{ get{ return m_Width; } }
|
||||
public int Height{ get{ return m_Height; } }
|
||||
public Rectangle2D Bounds{ get{ return m_Bounds; } }
|
||||
public int Name => m_Name;
|
||||
public int Width => m_Width;
|
||||
public int Height => m_Height;
|
||||
public Rectangle2D Bounds => m_Bounds;
|
||||
|
||||
public PresetMapEntry( int name, int width, int height, int xLeft, int yTop, int xRight, int yBottom )
|
||||
{
|
||||
|
|
@ -111,7 +111,7 @@ namespace Server.Items
|
|||
new PresetMapEntry( 1041202, 200, 200, 0000, 0512, 1792, 2048 ) // map of Yew to Britain
|
||||
};
|
||||
|
||||
public static PresetMapEntry[] Table{ get{ return m_Table; } }
|
||||
public static PresetMapEntry[] Table => m_Table;
|
||||
}
|
||||
|
||||
public enum PresetMapType
|
||||
|
|
|
|||
|
|
@ -18,22 +18,29 @@ namespace Server.Items
|
|||
private Point2D m_Location;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Level{ get{ return m_Level; } set{ m_Level = value; InvalidateProperties(); } }
|
||||
public int Level{ get => m_Level;
|
||||
set{ m_Level = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Completed{ get{ return m_Completed; } set{ m_Completed = value; InvalidateProperties(); } }
|
||||
public bool Completed{ get => m_Completed;
|
||||
set{ m_Completed = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile CompletedBy{ get{ return m_CompletedBy; } set{ m_CompletedBy = value; InvalidateProperties(); } }
|
||||
public Mobile CompletedBy{ get => m_CompletedBy;
|
||||
set{ m_CompletedBy = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Decoder{ get{ return m_Decoder; } set{ m_Decoder = value; InvalidateProperties(); } }
|
||||
public Mobile Decoder{ get => m_Decoder;
|
||||
set{ m_Decoder = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Map ChestMap{ get{ return m_Map; } set{ m_Map = value; InvalidateProperties(); } }
|
||||
public Map ChestMap{ get => m_Map;
|
||||
set{ m_Map = value; InvalidateProperties(); } }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Point2D ChestLocation{ get{ return m_Location; } set{ m_Location = value; } }
|
||||
public Point2D ChestLocation{ get => m_Location;
|
||||
set => m_Location = value;
|
||||
}
|
||||
|
||||
private static Point2D[] m_Locations;
|
||||
private static Point2D[] m_HavenLocations;
|
||||
|
|
|
|||
|
|
@ -26,13 +26,7 @@ namespace Server.Items
|
|||
ArmorAttributes.SelfRepair = 2;
|
||||
}
|
||||
|
||||
public override Race RequiredRace
|
||||
{
|
||||
get
|
||||
{
|
||||
return Race.Elf;
|
||||
}
|
||||
}
|
||||
public override Race RequiredRace => Race.Elf;
|
||||
|
||||
public AegisOfGrace( Serial serial ) : base( serial )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,10 +5,7 @@ namespace Server.Items
|
|||
{
|
||||
public class ArcaneGem : Item
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "arcane gem"; }
|
||||
}
|
||||
public override string DefaultName => "arcane gem";
|
||||
|
||||
[Constructible]
|
||||
public ArcaneGem() : base( 0x1EA7 )
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Worth
|
||||
{
|
||||
get{ return m_Worth; }
|
||||
get => m_Worth;
|
||||
set{ m_Worth = value; InvalidateProperties(); }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string BoardName
|
||||
{
|
||||
get{ return m_BoardName; }
|
||||
set{ m_BoardName = value; }
|
||||
get => m_BoardName;
|
||||
set => m_BoardName = value;
|
||||
}
|
||||
|
||||
public BaseBulletinBoard( int itemID ) : base( itemID )
|
||||
|
|
@ -368,16 +368,18 @@ namespace Server.Items
|
|||
m_PostedEquip = list.ToArray();
|
||||
}
|
||||
|
||||
public Mobile Poster{ get{ return m_Poster; } }
|
||||
public BulletinMessage Thread{ get{ return m_Thread; } }
|
||||
public string Subject{ get{ return m_Subject; } }
|
||||
public DateTime Time{ get{ return m_Time; } }
|
||||
public DateTime LastPostTime{ get{ return m_LastPostTime; } set{ m_LastPostTime = value; } }
|
||||
public string PostedName{ get{ return m_PostedName; } }
|
||||
public int PostedBody{ get{ return m_PostedBody; } }
|
||||
public int PostedHue{ get{ return m_PostedHue; } }
|
||||
public BulletinEquip[] PostedEquip{ get{ return m_PostedEquip; } }
|
||||
public string[] Lines{ get{ return m_Lines; } }
|
||||
public Mobile Poster => m_Poster;
|
||||
public BulletinMessage Thread => m_Thread;
|
||||
public string Subject => m_Subject;
|
||||
public DateTime Time => m_Time;
|
||||
public DateTime LastPostTime{ get => m_LastPostTime;
|
||||
set => m_LastPostTime = value;
|
||||
}
|
||||
public string PostedName => m_PostedName;
|
||||
public int PostedBody => m_PostedBody;
|
||||
public int PostedHue => m_PostedHue;
|
||||
public BulletinEquip[] PostedEquip => m_PostedEquip;
|
||||
public string[] Lines => m_Lines;
|
||||
|
||||
public BulletinMessage( Serial serial ) : base( serial )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,10 +5,7 @@ namespace Server.Items
|
|||
{
|
||||
public class ClockworkAssembly : Item
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "clockwork assembly"; }
|
||||
}
|
||||
public override string DefaultName => "clockwork assembly";
|
||||
|
||||
[Constructible]
|
||||
public ClockworkAssembly() : base( 0x1EA8 )
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ namespace Server.Items
|
|||
private Type m_Type;
|
||||
private int m_Amount;
|
||||
|
||||
public Type Type{ get{ return m_Type; } }
|
||||
public int Amount{ get{ return m_Amount; } }
|
||||
public Type Type => m_Type;
|
||||
public int Amount => m_Amount;
|
||||
|
||||
private CrystalRechargeInfo( Type type, int amount )
|
||||
{
|
||||
|
|
@ -55,7 +55,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Active
|
||||
{
|
||||
get{ return this.ItemID == 0x1ECD; }
|
||||
get => this.ItemID == 0x1ECD;
|
||||
set
|
||||
{
|
||||
this.ItemID = value ? 0x1ECD : 0x1ED0;
|
||||
|
|
@ -66,7 +66,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Charges
|
||||
{
|
||||
get{ return m_Charges; }
|
||||
get => m_Charges;
|
||||
set
|
||||
{
|
||||
m_Charges = value;
|
||||
|
|
@ -74,10 +74,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public List<ReceiverCrystal> Receivers
|
||||
{
|
||||
get{ return m_Receivers; }
|
||||
}
|
||||
public List<ReceiverCrystal> Receivers => m_Receivers;
|
||||
|
||||
[Constructible]
|
||||
public BroadcastCrystal() : this( 2000 )
|
||||
|
|
@ -122,10 +119,7 @@ namespace Server.Items
|
|||
LabelTo( from, 1060746, Receivers.Count.ToString() ); // links: ~1_val~
|
||||
}
|
||||
|
||||
public override bool HandlesOnSpeech
|
||||
{
|
||||
get{ return true; }
|
||||
}
|
||||
public override bool HandlesOnSpeech => true;
|
||||
|
||||
public override void OnSpeech( SpeechEventArgs e )
|
||||
{
|
||||
|
|
@ -304,7 +298,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Active
|
||||
{
|
||||
get{ return this.ItemID == 0x1ED1; }
|
||||
get => this.ItemID == 0x1ED1;
|
||||
set
|
||||
{
|
||||
this.ItemID = value ? 0x1ED1 : 0x1ED0;
|
||||
|
|
@ -315,7 +309,7 @@ namespace Server.Items
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public BroadcastCrystal Sender
|
||||
{
|
||||
get{ return m_Sender; }
|
||||
get => m_Sender;
|
||||
set
|
||||
{
|
||||
if ( m_Sender != null )
|
||||
|
|
|
|||
|
|
@ -114,7 +114,9 @@ namespace Server.Items
|
|||
private Item m_Item;
|
||||
|
||||
private bool m_Perpetual; //Needed for Rummaged stuff. CONTRARY to the Patchlog, cause a later FoF contradicts it. Verify on OSI.
|
||||
public bool Perpetual { get { return m_Perpetual; } set { m_Perpetual = value; } }
|
||||
public bool Perpetual { get => m_Perpetual;
|
||||
set => m_Perpetual = value;
|
||||
}
|
||||
|
||||
public InstancedItemInfo( Item i, Mobile m )
|
||||
{
|
||||
|
|
@ -249,16 +251,13 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public override bool IsDecoContainer
|
||||
{
|
||||
get{ return false; }
|
||||
}
|
||||
public override bool IsDecoContainer => false;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime TimeOfDeath
|
||||
{
|
||||
get{ return m_TimeOfDeath; }
|
||||
set{ m_TimeOfDeath = value; }
|
||||
get => m_TimeOfDeath;
|
||||
set => m_TimeOfDeath = value;
|
||||
}
|
||||
|
||||
public override bool DisplayWeight => false;
|
||||
|
|
@ -267,109 +266,82 @@ namespace Server.Items
|
|||
public FacialHairInfo FacialHair => m_FacialHair;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsBones
|
||||
{
|
||||
get { return GetFlag( CorpseFlag.IsBones ); }
|
||||
}
|
||||
public bool IsBones => GetFlag( CorpseFlag.IsBones );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Devoured
|
||||
{
|
||||
get { return (m_Devourer != null); }
|
||||
}
|
||||
public bool Devoured => (m_Devourer != null);
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Carved
|
||||
{
|
||||
get{ return GetFlag( CorpseFlag.Carved ); }
|
||||
set { SetFlag( CorpseFlag.Carved, value ); }
|
||||
get => GetFlag( CorpseFlag.Carved );
|
||||
set => SetFlag( CorpseFlag.Carved, value );
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool VisitedByTaxidermist
|
||||
{
|
||||
get { return GetFlag( CorpseFlag.VisitedByTaxidermist ); }
|
||||
set { SetFlag( CorpseFlag.VisitedByTaxidermist, value ); }
|
||||
get => GetFlag( CorpseFlag.VisitedByTaxidermist );
|
||||
set => SetFlag( CorpseFlag.VisitedByTaxidermist, value );
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Channeled
|
||||
{
|
||||
get { return GetFlag( CorpseFlag.Channeled ); }
|
||||
set { SetFlag( CorpseFlag.Channeled, value ); }
|
||||
get => GetFlag( CorpseFlag.Channeled );
|
||||
set => SetFlag( CorpseFlag.Channeled, value );
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Animated
|
||||
{
|
||||
get { return GetFlag( CorpseFlag.Animated ); }
|
||||
set { SetFlag( CorpseFlag.Animated, value ); }
|
||||
get => GetFlag( CorpseFlag.Animated );
|
||||
set => SetFlag( CorpseFlag.Animated, value );
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool SelfLooted
|
||||
{
|
||||
get { return GetFlag( CorpseFlag.SelfLooted ); }
|
||||
set { SetFlag( CorpseFlag.SelfLooted, value ); }
|
||||
get => GetFlag( CorpseFlag.SelfLooted );
|
||||
set => SetFlag( CorpseFlag.SelfLooted, value );
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public AccessLevel AccessLevel
|
||||
{
|
||||
get{ return m_AccessLevel; }
|
||||
}
|
||||
public AccessLevel AccessLevel => m_AccessLevel;
|
||||
|
||||
public List<Mobile> Aggressors
|
||||
{
|
||||
get{ return m_Aggressors; }
|
||||
}
|
||||
public List<Mobile> Aggressors => m_Aggressors;
|
||||
|
||||
public List<Mobile> Looters
|
||||
{
|
||||
get{ return m_Looters; }
|
||||
}
|
||||
public List<Mobile> Looters => m_Looters;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Killer
|
||||
{
|
||||
get{ return m_Killer; }
|
||||
}
|
||||
public Mobile Killer => m_Killer;
|
||||
|
||||
public List<Item> EquipItems
|
||||
{
|
||||
get{ return m_EquipItems; }
|
||||
}
|
||||
public List<Item> EquipItems => m_EquipItems;
|
||||
|
||||
public List<Item> RestoreEquip
|
||||
{
|
||||
get { return m_RestoreEquip; }
|
||||
set { m_RestoreEquip = value; }
|
||||
get => m_RestoreEquip;
|
||||
set => m_RestoreEquip = value;
|
||||
}
|
||||
|
||||
public Guild Guild
|
||||
{
|
||||
get{ return m_Guild; }
|
||||
}
|
||||
public Guild Guild => m_Guild;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Kills
|
||||
{
|
||||
get{ return m_Kills; }
|
||||
set{ m_Kills = value; }
|
||||
get => m_Kills;
|
||||
set => m_Kills = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Criminal
|
||||
{
|
||||
get { return GetFlag( CorpseFlag.Criminal ); }
|
||||
set { SetFlag( CorpseFlag.Criminal, value ); }
|
||||
get => GetFlag( CorpseFlag.Criminal );
|
||||
set => SetFlag( CorpseFlag.Criminal, value );
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Owner
|
||||
{
|
||||
get{ return m_Owner; }
|
||||
}
|
||||
public Mobile Owner => m_Owner;
|
||||
|
||||
public void TurnToBones()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,10 +7,7 @@ namespace Server
|
|||
{
|
||||
private string m_Name;
|
||||
|
||||
public string Name
|
||||
{
|
||||
get{ return m_Name; }
|
||||
}
|
||||
public string Name => m_Name;
|
||||
|
||||
public CorpseNameAttribute( string name )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -77,10 +77,14 @@ namespace Server.Items
|
|||
public DateTime NextSpawn => m_NextSpawn;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int SpawnRange { get { return m_SpawnRange; } set { m_SpawnRange = value; } }
|
||||
public int SpawnRange { get => m_SpawnRange;
|
||||
set => m_SpawnRange = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public TimeSpan NextSpawnDelay { get { return m_NextSpawnDelay; } set { m_NextSpawnDelay = value; } }
|
||||
public TimeSpan NextSpawnDelay { get => m_NextSpawnDelay;
|
||||
set => m_NextSpawnDelay = value;
|
||||
}
|
||||
|
||||
public override int LabelNumber => 1023633; // Brazier
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue