Fixes body expression style.

This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions

View file

@ -35,29 +35,11 @@
public class EarringsOfProtection : BaseJewel
{
[CommandProperty( AccessLevel.GameMaster )]
public virtual AosElementAttribute Attribute
{
get
{
return m_Attribute;
}
}
public virtual AosElementAttribute Attribute => m_Attribute;
public override int LabelNumber
{
get
{
return GetItemData( m_Attribute, true );
}
}
public override int LabelNumber => GetItemData( m_Attribute, true );
public override int Hue
{
get
{
return GetItemData( m_Attribute, false );
}
}
public override int Hue => GetItemData( m_Attribute, false );
private AosElementAttribute m_Attribute;

View file

@ -24,18 +24,15 @@ namespace Server.Items
private List<MusicName> m_Tracks;
public List<MusicName> Tracks
{
get { return m_Tracks; }
}
public List<MusicName> Tracks => m_Tracks;
private SecureLevel m_Level;
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level
{
get { return m_Level; }
set { m_Level = value; }
get => m_Level;
set => m_Level = value;
}
[Constructible]

View file

@ -5,28 +5,19 @@ namespace Server.Items
[Flippable( 0x1053, 0x1054 )]
public class DawnsMusicGear : Item
{
public static DawnsMusicGear RandomCommon
{
get { return new DawnsMusicGear( DawnsMusicBox.RandomTrack( DawnsMusicRarity.Common ) ); }
}
public static DawnsMusicGear RandomCommon => new DawnsMusicGear( DawnsMusicBox.RandomTrack( DawnsMusicRarity.Common ) );
public static DawnsMusicGear RandomUncommon
{
get { return new DawnsMusicGear( DawnsMusicBox.RandomTrack( DawnsMusicRarity.Uncommon ) ); }
}
public static DawnsMusicGear RandomUncommon => new DawnsMusicGear( DawnsMusicBox.RandomTrack( DawnsMusicRarity.Uncommon ) );
public static DawnsMusicGear RandomRare
{
get { return new DawnsMusicGear( DawnsMusicBox.RandomTrack( DawnsMusicRarity.Rare ) ); }
}
public static DawnsMusicGear RandomRare => new DawnsMusicGear( DawnsMusicBox.RandomTrack( DawnsMusicRarity.Rare ) );
private MusicName m_Music;
[CommandProperty( AccessLevel.GameMaster )]
public MusicName Music
{
get { return m_Music; }
set { m_Music = value; }
get => m_Music;
set => m_Music = value;
}
[Constructible]

View file

@ -11,17 +11,11 @@
{
private int m_Name;
public int Name
{
get { return m_Name; }
}
public int Name => m_Name;
private DawnsMusicRarity m_Rarity;
public DawnsMusicRarity Rarity
{
get { return m_Rarity; }
}
public DawnsMusicRarity Rarity => m_Rarity;
public DawnsMusicInfo( int name, DawnsMusicRarity rarity )
{

View file

@ -56,17 +56,14 @@ namespace Server.Items
[FlippableAttribute( 0x2AC0, 0x2AC3 )]
public class FountainOfLife : BaseAddonContainer
{
public override BaseAddonContainerDeed Deed
{
get { return new FountainOfLifeDeed( m_Charges ); }
}
public override BaseAddonContainerDeed Deed => new FountainOfLifeDeed( m_Charges );
public override bool OnDragLift( Mobile from )
{
return false;
}
public virtual TimeSpan RechargeTime { get { return TimeSpan.FromDays( 1 ); } }
public virtual TimeSpan RechargeTime => TimeSpan.FromDays( 1 );
public override int LabelNumber => 1075197; // Fountain of Life
public override int DefaultGumpID => 0x484;
@ -78,7 +75,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get { return m_Charges; }
get => m_Charges;
set { m_Charges = Math.Min( value, 10 ); InvalidateProperties(); }
}
@ -230,7 +227,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get { return m_Charges; }
get => m_Charges;
set { m_Charges = Math.Min( value, 10 ); InvalidateProperties(); }
}

View file

@ -11,10 +11,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Bonus
{
get
{
return m_Bonus;
}
get => m_Bonus;
set
{
m_Bonus = value;

View file

@ -146,10 +146,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Bonus
{
get
{
return m_Bonus;
}
get => m_Bonus;
set
{
m_Bonus = value;

View file

@ -10,11 +10,12 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get { return m_UsesRemaining; }
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
public bool ShowUsesRemaining{ get{ return true; } set{} }
public bool ShowUsesRemaining{ get => true;
set{} }
public override int LabelNumber => 1049082; // powder of fortifying

View file

@ -7,7 +7,7 @@ namespace Server.Items
public class AwesomeDisturbingPortraitComponent : AddonComponent
{
public override int LabelNumber => 1074479; // Disturbing portrait
public bool FacingSouth { get { return ItemID < 0x2A61; } }
public bool FacingSouth => ItemID < 0x2A61;
private InternalTimer m_Timer;

View file

@ -23,14 +23,14 @@ namespace Server.Items
[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 int Petals
{
get{ return m_Petals; }
get => m_Petals;
set
{
if ( value >= 10 )

View file

@ -16,8 +16,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;
}
[Constructible]

View file

@ -13,8 +13,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int ClosedID
{
get { return m_ClosedID; }
set { m_ClosedID = value; }
get => m_ClosedID;
set => m_ClosedID = value;
}
public CurtainsComponent( int itemID, int closedID ) : base( itemID )

View file

@ -13,7 +13,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Fruits
{
get { return m_Fruits; }
get => m_Fruits;
set
{
if ( value < 0 )

View file

@ -18,8 +18,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Placer
{
get{ return m_Placer; }
set{ m_Placer = value; }
get => m_Placer;
set => m_Placer = value;
}
private class Ornament : Item
@ -212,10 +212,7 @@ namespace Server.Items
return map.CanFit( (Point3D)p, 20 );
}
Item IAddon.Deed
{
get{ return new HolidayTreeDeed(); }
}
Item IAddon.Deed => new HolidayTreeDeed();
public override void Serialize( GenericWriter writer )
{

View file

@ -37,18 +37,17 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public int SoundID
{
get { return m_SoundID; }
get => m_SoundID;
set { m_SoundID = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public string Giver { get { return m_Maker; } set { m_Maker = value; } }
public override string DefaultName
{
get { return String.Format("A Holiday Bell From {0}", Giver); }
public string Giver { get => m_Maker;
set => m_Maker = value;
}
public override string DefaultName => String.Format("A Holiday Bell From {0}", Giver);
private string m_Maker;
private int m_SoundID;

View file

@ -9,8 +9,8 @@ namespace Server.Items
public static Dictionary<Mobile, CandyCaneTimer> ToothAches
{
get { return m_ToothAches; }
set { m_ToothAches = value; }
get => m_ToothAches;
set => m_ToothAches = value;
}
public static void Initialize()
@ -24,7 +24,9 @@ namespace Server.Items
private Mobile m_Eater;
public Mobile Eater => m_Eater;
public int Eaten { get { return m_Eaten; } set { m_Eaten = value; } }
public int Eaten { get => m_Eaten;
set => m_Eaten = value;
}
public CandyCaneTimer( Mobile eater )
: base( TimeSpan.FromSeconds( 30 ), TimeSpan.FromSeconds( 30 ) )

View file

@ -2,8 +2,8 @@
{
public class GiftBoxHues
{
public static int RandomGiftBoxHue{ get { return m_NormalHues[Utility.Random(m_NormalHues.Length)]; }}
public static int RandomNeonBoxHue{ get { return m_NeonHues[Utility.Random(m_NeonHues.Length)]; }}
public static int RandomGiftBoxHue => m_NormalHues[Utility.Random(m_NormalHues.Length)];
public static int RandomNeonBoxHue => m_NeonHues[Utility.Random(m_NeonHues.Length)];
/* there's possibly a couple more, but this is what we could verify on OSI */

View file

@ -2,7 +2,7 @@ namespace Server.Items
{
public class Coal : Item
{
public override string DefaultName{ get { return "Coal"; }}
public override string DefaultName => "Coal";
[Constructible]
public Coal() : base( 0x19b9 )
@ -31,7 +31,8 @@ namespace Server.Items
public class BadCard : Item
{
public override int LabelNumber{ get { return 1041428; }} // Maybe next year youll get a better...
public override int LabelNumber // Maybe next year youll get a better...
=> 1041428;
[Constructible]
public BadCard() : base( 0x14ef )

View file

@ -63,7 +63,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public SnowGlobeTypeOne Place
{
get { return m_Type; }
get => m_Type;
set { m_Type = value; InvalidateProperties(); }
}
@ -165,7 +165,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public SnowGlobeTypeTwo Place
{
get { return m_Type; }
get => m_Type;
set { m_Type = value; InvalidateProperties(); }
}
@ -251,7 +251,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public SnowGlobeTypeThree Place
{
get { return m_Type; }
get => m_Type;
set { m_Type = value; InvalidateProperties(); }
}

View file

@ -74,7 +74,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public string Title
{
get{ return m_Title; }
get => m_Title;
set{ m_Title = value; InvalidateProperties(); }
}

View file

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

View file

@ -13,46 +13,37 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public HouseRaffleStone Stone
{
get { return m_Stone; }
get => m_Stone;
set { m_Stone = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public Point3D PlotLocation
{
get { return m_PlotLocation; }
get => m_PlotLocation;
set { m_PlotLocation = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public Map PlotFacet
{
get { return m_Facet; }
get => m_Facet;
set { m_Facet = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public Mobile AwardedTo
{
get { return m_AwardedTo; }
get => m_AwardedTo;
set { m_AwardedTo = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public bool IsExpired
{
get { return ( m_Stone == null || m_Stone.Deleted || m_Stone.IsExpired ); }
}
public bool IsExpired => ( m_Stone == null || m_Stone.Deleted || m_Stone.IsExpired );
public override string DefaultName
{
get { return "a writ of lease"; }
}
public override string DefaultName => "a writ of lease";
public override double DefaultWeight
{
get { return 1.0; }
}
public override double DefaultWeight => 1.0;
[Constructible]
public HouseRaffleDeed()

View file

@ -16,20 +16,11 @@ namespace Server.Items
private IPAddress m_Address;
private DateTime m_Date;
public Mobile From
{
get { return m_From; }
}
public Mobile From => m_From;
public IPAddress Address
{
get { return m_Address; }
}
public IPAddress Address => m_Address;
public DateTime Date
{
get { return m_Date; }
}
public DateTime Date => m_Date;
public RaffleEntry( Mobile from )
{
@ -111,7 +102,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public HouseRaffleState CurrentState
{
get { return m_State; }
get => m_State;
set
{
if ( m_State != value )
@ -133,7 +124,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public Rectangle2D PlotBounds
{
get { return m_Bounds; }
get => m_Bounds;
set
{
m_Bounds = value;
@ -146,7 +137,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public Map PlotFacet
{
get { return m_Facet; }
get => m_Facet;
set
{
m_Facet = value;
@ -159,28 +150,28 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public Mobile Winner
{
get { return m_Winner; }
get => m_Winner;
set { m_Winner = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public HouseRaffleDeed Deed
{
get { return m_Deed; }
set { m_Deed = value; }
get => m_Deed;
set => m_Deed = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public DateTime Started
{
get { return m_Started; }
get => m_Started;
set { m_Started = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public TimeSpan Duration
{
get { return m_Duration; }
get => m_Duration;
set { m_Duration = value; InvalidateProperties(); }
}
@ -199,14 +190,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public HouseRaffleExpireAction ExpireAction
{
get { return m_ExpireAction; }
set { m_ExpireAction = value; }
get => m_ExpireAction;
set => m_ExpireAction = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public int TicketPrice
{
get { return m_TicketPrice; }
get => m_TicketPrice;
set
{
m_TicketPrice = Math.Max( 0, value );
@ -214,20 +205,11 @@ namespace Server.Items
}
}
public List<RaffleEntry> Entries
{
get { return m_Entries; }
}
public List<RaffleEntry> Entries => m_Entries;
public override string DefaultName
{
get { return "a house raffle stone"; }
}
public override string DefaultName => "a house raffle stone";
public override bool DisplayWeight
{
get { return false; }
}
public override bool DisplayWeight => false;
private static List<HouseRaffleStone> m_AllStones = new List<HouseRaffleStone>();

View file

@ -9,7 +9,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public MiniHouseType Type
{
get{ return m_Type; }
get => m_Type;
set{ m_Type = value; Construct(); }
}
@ -86,7 +86,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public MiniHouseType Type
{
get{ return m_Type; }
get => m_Type;
set{ m_Type = value; InvalidateProperties(); }
}
@ -178,8 +178,8 @@ namespace Server.Items
private int[] m_Graphics;
private int m_LabelNumber;
public int[] Graphics{ get{ return m_Graphics; } }
public int LabelNumber{ get{ return m_LabelNumber; } }
public int[] Graphics => m_Graphics;
public int LabelNumber => m_LabelNumber;
public MiniHouseInfo( int start, int count, int labelNumber )
{

View file

@ -55,9 +55,9 @@ namespace Server.Items
private int m_ItemID;
private int[] m_Sounds;
public int LabelNumber{ get{ return m_LabelNumber; } }
public int ItemID{ get{ return m_ItemID; } }
public int[] Sounds{ get{ return m_Sounds; } }
public int LabelNumber => m_LabelNumber;
public int ItemID => m_ItemID;
public int[] Sounds => m_Sounds;
public MonsterStatuetteInfo( int labelNumber, int itemID, int baseSoundID )
{
@ -137,21 +137,21 @@ 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 bool TurnedOn
{
get{ return m_TurnedOn; }
get => m_TurnedOn;
set{ m_TurnedOn = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public MonsterStatuetteType Type
{
get{ return m_Type; }
get => m_Type;
set
{
m_Type = value;
@ -170,15 +170,9 @@ namespace Server.Items
}
}
public override int LabelNumber
{
get{ return MonsterStatuetteInfo.GetInfo( m_Type ).LabelNumber; }
}
public override int LabelNumber => MonsterStatuetteInfo.GetInfo( m_Type ).LabelNumber;
public override double DefaultWeight
{
get { return 1.0; }
}
public override double DefaultWeight => 1.0;
[Constructible]
public MonsterStatuette() : this( MonsterStatuetteType.Crocodile )

View file

@ -5,15 +5,9 @@ namespace Server.Items
{
public class PlagueBeastBlood : PlagueBeastComponent
{
public bool Patched
{
get { return ItemID == 0x1765; }
}
public bool Patched => ItemID == 0x1765;
public bool Starting
{
get { return ItemID == 0x122C; }
}
public bool Starting => ItemID == 0x122C;
private Timer m_Timer;

View file

@ -79,24 +79,15 @@ namespace Server.Items
public PlagueBeastOrgan Organ
{
get { return m_Organ; }
set { m_Organ = value; }
get => m_Organ;
set => m_Organ = value;
}
public bool IsBrain
{
get { return ItemID == 0x1CF0; }
}
public bool IsBrain => ItemID == 0x1CF0;
public bool IsGland
{
get { return ItemID == 0x1CEF; }
}
public bool IsGland => ItemID == 0x1CEF;
public bool IsReceptacle
{
get { return ItemID == 0x9DF; }
}
public bool IsReceptacle => ItemID == 0x9DF;
public PlagueBeastComponent( int itemID, int hue ) : this( itemID, hue, false )
{

View file

@ -11,8 +11,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool Cut
{
get { return m_Cut; }
set { m_Cut = value; }
get => m_Cut;
set => m_Cut = value;
}
public override string DefaultName => "a plague beast mutation core";

View file

@ -10,25 +10,22 @@ namespace Server.Items
private List<PlagueBeastComponent> m_Components;
public List<PlagueBeastComponent> Components
{
get { return m_Components; }
}
public List<PlagueBeastComponent> Components => m_Components;
private int m_BrainHue;
public int BrainHue
{
get { return m_BrainHue; }
set { m_BrainHue = value; }
get => m_BrainHue;
set => m_BrainHue = value;
}
private bool m_Opened;
public bool Opened
{
get { return m_Opened; }
set { m_Opened = value; }
get => m_Opened;
set => m_Opened = value;
}
private Timer m_Timer;
@ -466,10 +463,7 @@ namespace Server.Items
{
private int m_Brains;
public bool Complete
{
get { return m_Brains >= 4; }
}
public bool Complete => m_Brains >= 4;
public PlagueBeastMainOrgan()
{

View file

@ -7,10 +7,7 @@ namespace Server.Items
{
private bool m_Cut;
public bool Cut
{
get { return m_Cut; }
}
public bool Cut => m_Cut;
private Timer m_Timer;

View file

@ -9,18 +9,15 @@
public override int DefaultGumpID => 0x3e;
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool IsEmpty { get { return ( m_Quantity <= 0 ); } }
public virtual bool IsEmpty => ( m_Quantity <= 0 );
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool IsFull { get { return ( m_Quantity >= MaxQuantity ); } }
public virtual bool IsFull => ( m_Quantity >= MaxQuantity );
[CommandProperty( AccessLevel.GameMaster )]
public virtual int Quantity
{
get
{
return m_Quantity;
}
get => m_Quantity;
set
{
if ( value != m_Quantity )

View file

@ -32,7 +32,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get{ return m_Charges; }
get => m_Charges;
set
{
if ( value > this.MaxCharges )
@ -49,7 +49,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Recharges
{
get{ return m_Recharges; }
get => m_Recharges;
set
{
if ( value > this.MaxRecharges )
@ -64,19 +64,19 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public int MaxCharges{ get{ return 30; } }
public int MaxCharges => 30;
[CommandProperty( AccessLevel.GameMaster )]
public int MaxRecharges{ get{ return 255; } }
public int MaxRecharges => 255;
public string TranslocationItemName{ get{ return "bag of sending"; } }
public string TranslocationItemName => "bag of sending";
public override int LabelNumber => 1054104; // a bag of sending
[CommandProperty( AccessLevel.GameMaster )]
public BagOfSendingHue BagOfSendingHue
{
get{ return m_BagOfSendingHue; }
get => m_BagOfSendingHue;
set
{
m_BagOfSendingHue = value;

View file

@ -20,7 +20,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get{ return m_Charges; }
get => m_Charges;
set
{
if ( value > this.MaxCharges )
@ -37,7 +37,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Recharges
{
get{ return m_Recharges; }
get => m_Recharges;
set
{
if ( value > this.MaxRecharges )
@ -52,12 +52,12 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public int MaxCharges{ get{ return 20; } }
public int MaxCharges => 20;
[CommandProperty( AccessLevel.GameMaster )]
public int MaxRecharges{ get{ return 255; } }
public int MaxRecharges => 255;
public string TranslocationItemName{ get{ return "crystal ball of pet summoning"; } }
public string TranslocationItemName => "crystal ball of pet summoning";
[CommandProperty( AccessLevel.GameMaster )]
public BaseCreature Pet
@ -80,7 +80,7 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public string PetName{ get{ return m_PetName; } }
public string PetName => m_PetName;
[Constructible]
public BallOfSummoning() : base( 0xE2E )
@ -399,13 +399,7 @@ namespace Server.Items
public override double CastDelayFastScalar => 0;
public override TimeSpan CastDelayBase
{
get
{
return TimeSpan.FromSeconds( 2.0 );
}
}
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override int GetMana()
{

View file

@ -20,7 +20,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get{ return m_Charges; }
get => m_Charges;
set
{
if ( value > this.MaxCharges )
@ -37,7 +37,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Recharges
{
get{ return m_Recharges; }
get => m_Recharges;
set
{
if ( value > this.MaxRecharges )
@ -52,17 +52,17 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public int MaxCharges{ get{ return 20; } }
public int MaxCharges => 20;
[CommandProperty( AccessLevel.GameMaster )]
public int MaxRecharges{ get{ return 255; } }
public int MaxRecharges => 255;
public string TranslocationItemName{ get{ return "bracelet of binding"; } }
public string TranslocationItemName => "bracelet of binding";
[CommandProperty( AccessLevel.GameMaster )]
public string Inscription
{
get{ return m_Inscription; }
get => m_Inscription;
set
{
m_Inscription = value;
@ -80,7 +80,7 @@ namespace Server.Items
return m_Bound;
}
set{ m_Bound = value; }
set => m_Bound = value;
}
[Constructible]

View file

@ -2,8 +2,8 @@ namespace Server.Items
{
public class ZoogiFungus : Item, ICommodity
{
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => (Core.ML);
[Constructible]
public ZoogiFungus() : this( 1 )

View file

@ -20,14 +20,14 @@ namespace Server.Items
[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 virtual int ActiveItemID
{
get { return m_ActiveItemID; }
get => m_ActiveItemID;
set
{
m_ActiveItemID = value;
@ -40,7 +40,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public virtual int InactiveItemID
{
get { return m_InactiveItemID; }
get => m_InactiveItemID;
set
{
m_InactiveItemID = value;
@ -59,28 +59,28 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public string Account
{
get{ return m_Account; }
set{ m_Account = value; }
get => m_Account;
set => m_Account = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string LastUserName
{
get{ return m_LastUserName; }
get => m_LastUserName;
set{ m_LastUserName = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public SkillName Skill
{
get{ return m_Skill; }
get => m_Skill;
set{ m_Skill = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public double SkillValue
{
get{ return m_SkillValue; }
get => m_SkillValue;
set
{
m_SkillValue = value;
@ -95,10 +95,7 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsEmpty
{
get{ return m_SkillValue <= 0.0; }
}
public bool IsEmpty => m_SkillValue <= 0.0;
[Constructible]
public SoulStone() : this( null )
@ -849,10 +846,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get
{
return m_UsesRemaining;
}
get => m_UsesRemaining;
set
{
m_UsesRemaining = value; InvalidateProperties();
@ -915,7 +909,8 @@ namespace Server.Items
}
public bool ShowUsesRemaining{ get{ return true; } set{} }
public bool ShowUsesRemaining{ get => true;
set{} }
}
[Flippable]
@ -989,7 +984,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -13,10 +13,8 @@ namespace Server.Items
/* DO NOT USE! Only used in serialization of special scrolls that originally derived from Item */
private bool m_InheritsItem;
protected bool InheritsItem
{
get{ return m_InheritsItem; }
}
protected bool InheritsItem => m_InheritsItem;
#endregion
public abstract int Message{ get; }
@ -39,15 +37,15 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public SkillName Skill
{
get { return m_Skill; }
set { m_Skill = value; }
get => m_Skill;
set => m_Skill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public double Value
{
get { return m_Value; }
set { m_Value = value; }
get => m_Value;
set => m_Value = value;
}
public virtual string GetNameLocalized()

View file

@ -9,10 +9,14 @@ namespace Server.Items
public override string DefaultName => "a Valentine's card";
[CommandProperty(AccessLevel.GameMaster)]
public virtual string From { get { return m_From; } set { m_From = value; } }
public virtual string From { get => m_From;
set => m_From = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public virtual string To { get { return m_To; } set { m_To = value; } }
public virtual string To { get => m_To;
set => m_To = value;
}
private static string Unsigned = "___";

View file

@ -169,7 +169,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -246,7 +246,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -26,14 +26,11 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
public bool FacingSouth
{
get{ return ( ItemID & 0x1 ) == 0; }
}
public bool FacingSouth => ( ItemID & 0x1 ) == 0;
[Constructible]
public Banner( int itemID ) : base( itemID )
@ -121,7 +118,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
[Constructible]

View file

@ -48,7 +48,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -139,7 +139,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -14,7 +14,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -135,7 +135,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -67,15 +67,12 @@ namespace Server.Items
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public CannonDirection CannonDirection
{
get{ return m_CannonDirection; }
}
public CannonDirection CannonDirection => m_CannonDirection;
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get{ return m_Charges; }
get => m_Charges;
set
{
m_Charges = value;
@ -88,7 +85,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set
{
m_IsRewardItem = value;
@ -381,14 +378,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Charges
{
get{ return m_Charges; }
get => m_Charges;
set{ m_Charges = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -13,7 +13,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -20,7 +20,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -75,7 +75,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -26,7 +26,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -121,7 +121,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -27,7 +27,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -117,7 +117,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -26,7 +26,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -123,7 +123,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -34,25 +34,22 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
set{ m_IsRewardItem = value; }
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
private MiningCartType m_CartType;
[CommandProperty( AccessLevel.GameMaster )]
public MiningCartType CartType
{
get{ return m_CartType; }
}
public MiningCartType CartType => m_CartType;
private int m_Gems;
[CommandProperty( AccessLevel.GameMaster )]
public int Gems
{
get{ return m_Gems; }
set{ m_Gems = value; }
get => m_Gems;
set => m_Gems = value;
}
private int m_Ore;
@ -60,8 +57,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Ore
{
get{ return m_Ore; }
set{ m_Ore = value; }
get => m_Ore;
set => m_Ore = value;
}
private Timer m_Timer;
@ -327,7 +324,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -336,8 +333,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Gems
{
get{ return m_Gems; }
set{ m_Gems = value; }
get => m_Gems;
set => m_Gems = value;
}
private int m_Ore;
@ -345,8 +342,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Ore
{
get{ return m_Ore; }
set{ m_Ore = value; }
get => m_Ore;
set => m_Ore = value;
}
[Constructible]

View file

@ -29,7 +29,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -104,7 +104,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -13,7 +13,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get { return m_IsRewardItem; }
get => m_IsRewardItem;
set { m_IsRewardItem = value; InvalidateProperties(); }
}
@ -66,7 +66,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -59,7 +59,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -148,7 +148,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -25,7 +25,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -34,7 +34,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Logs
{
get{ return m_Logs; }
get => m_Logs;
set{ m_Logs = value; InvalidateProperties(); }
}
@ -177,7 +177,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -186,7 +186,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Logs
{
get{ return m_Logs; }
get => m_Logs;
set{ m_Logs = value; InvalidateProperties(); }
}

View file

@ -63,7 +63,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -72,7 +72,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool East
{
get{ return m_East; }
get => m_East;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}
@ -276,7 +276,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}

View file

@ -16,20 +16,20 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get{ return m_UsesRemaining; }
get => m_UsesRemaining;
set{ m_UsesRemaining = value; InvalidateProperties(); }
}
public virtual bool ShowUsesRemaining
{
get{ return true; }
get => true;
set{}
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
get => m_IsRewardItem;
set{ m_IsRewardItem = value; InvalidateProperties(); }
}