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

Fixes body expression style.

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

20
Scripts/Items/Skill Items/Camping/Campfire.cs
View file

@ -50,10 +50,7 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime Created
{
get{ return m_Created; }
}
public DateTime Created => m_Created;
[CommandProperty( AccessLevel.GameMaster )]
public CampfireStatus Status
@ -186,19 +183,16 @@ namespace Server.Items
private DateTime m_Start;
private bool m_Safe;
public PlayerMobile Player{ get{ return m_Player; } }
public Campfire Fire{ get{ return m_Fire; } }
public DateTime Start{ get{ return m_Start; } }
public PlayerMobile Player => m_Player;
public Campfire Fire => m_Fire;
public DateTime Start => m_Start;
public bool Valid
{
get{ return !Fire.Deleted && Fire.Status != CampfireStatus.Off && Player.Map == Fire.Map && Player.InRange( Fire, Campfire.SecureRange ); }
}
public bool Valid => !Fire.Deleted && Fire.Status != CampfireStatus.Off && Player.Map == Fire.Map && Player.InRange( Fire, Campfire.SecureRange );
public bool Safe
{
get{ return Valid && m_Safe; }
set{ m_Safe = value; }
get => Valid && m_Safe;
set => m_Safe = value;
}
public CampfireEntry( PlayerMobile player, Campfire fire )

4
Scripts/Items/Skill Items/Carpenter Items/Board.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get { return m_Resource; }
get => m_Resource;
set { m_Resource = value; InvalidateProperties(); }
}
@ -30,7 +30,7 @@ namespace Server.Items
}
}
bool ICommodity.IsDeedable { get { return true; } }
bool ICommodity.IsDeedable => true;
[Constructible]
public Board()

47
Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -180,22 +180,31 @@ namespace Server.Items
private int m_AnimalWeight;
[CommandProperty( AccessLevel.GameMaster )]
public int WestID{ get{ return m_WestID; } set{ m_WestID = value; } }
public int WestID{ get => m_WestID;
set => m_WestID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int NorthID{ get{ return m_NorthID; } set{ m_NorthID = value; } }
public int NorthID{ get => m_NorthID;
set => m_NorthID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int DeedNumber{ get{ return m_DeedNumber; } set{ m_DeedNumber = value; } }
public int DeedNumber{ get => m_DeedNumber;
set => m_DeedNumber = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int AddonNumber{ get{ return m_AddonNumber; } set{ m_AddonNumber = value; InvalidateProperties(); } }
public int AddonNumber{ get => m_AddonNumber;
set{ m_AddonNumber = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Hunter{ get{ return m_Hunter; } set{ m_Hunter = value; InvalidateProperties(); } }
public Mobile Hunter{ get => m_Hunter;
set{ m_Hunter = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public int AnimalWeight{ get{ return m_AnimalWeight; } set{ m_AnimalWeight = value; InvalidateProperties(); } }
public int AnimalWeight{ get => m_AnimalWeight;
set{ m_AnimalWeight = value; InvalidateProperties(); } }
public override int LabelNumber => m_AddonNumber;
@ -312,10 +321,7 @@ namespace Server.Items
}
}
public Item Deed
{
get{ return new TrophyDeed( m_WestID, m_NorthID, m_DeedNumber, m_AddonNumber, m_Hunter, m_AnimalWeight ); }
}
public Item Deed => new TrophyDeed( m_WestID, m_NorthID, m_DeedNumber, m_AddonNumber, m_Hunter, m_AnimalWeight );
public override void OnDoubleClick( Mobile from )
{
@ -348,22 +354,31 @@ namespace Server.Items
private int m_AnimalWeight;
[CommandProperty( AccessLevel.GameMaster )]
public int WestID{ get{ return m_WestID; } set{ m_WestID = value; } }
public int WestID{ get => m_WestID;
set => m_WestID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int NorthID{ get{ return m_NorthID; } set{ m_NorthID = value; } }
public int NorthID{ get => m_NorthID;
set => m_NorthID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int DeedNumber{ get{ return m_DeedNumber; } set{ m_DeedNumber = value; InvalidateProperties(); } }
public int DeedNumber{ get => m_DeedNumber;
set{ m_DeedNumber = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public int AddonNumber{ get{ return m_AddonNumber; } set{ m_AddonNumber = value; } }
public int AddonNumber{ get => m_AddonNumber;
set => m_AddonNumber = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Hunter{ get{ return m_Hunter; } set{ m_Hunter = value; InvalidateProperties(); } }
public Mobile Hunter{ get => m_Hunter;
set{ m_Hunter = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public int AnimalWeight{ get{ return m_AnimalWeight; } set{ m_AnimalWeight = value; InvalidateProperties(); } }
public int AnimalWeight{ get => m_AnimalWeight;
set{ m_AnimalWeight = value; InvalidateProperties(); } }
public override int LabelNumber => m_DeedNumber;

8
Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs
View file

@ -20,15 +20,15 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Map TargetMap
{
get{ return m_TargetMap; }
set{ m_TargetMap = value; }
get => m_TargetMap;
set => m_TargetMap = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Level
{
get{ return m_Level; }
set{ m_Level = Math.Max( 1, Math.Min( value, 4 ) ); }
get => m_Level;
set => m_Level = Math.Max( 1, Math.Min( value, 4 ) );
}
[Constructible]

30
Scripts/Items/Skill Items/Fishing/Misc/SOS.cs
View file

@ -23,15 +23,12 @@ namespace Server.Items
private int m_MessageIndex;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsAncient
{
get{ return ( m_Level >= 4 ); }
}
public bool IsAncient => ( m_Level >= 4 );
[CommandProperty( AccessLevel.GameMaster )]
public int Level
{
get{ return m_Level; }
get => m_Level;
set
{
m_Level = Math.Max( 1, Math.Min( value, 4 ) );
@ -43,22 +40,22 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Map TargetMap
{
get{ return m_TargetMap; }
set{ m_TargetMap = value; }
get => m_TargetMap;
set => m_TargetMap = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D TargetLocation
{
get{ return m_TargetLocation; }
set{ m_TargetLocation = value; }
get => m_TargetLocation;
set => m_TargetLocation = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int MessageIndex
{
get{ return m_MessageIndex; }
set{ m_MessageIndex = value; }
get => m_MessageIndex;
set => m_MessageIndex = value;
}
public void UpdateHue()
@ -304,9 +301,9 @@ namespace Server.Items
private int m_Width, m_Height;
private string m_Message;
public int Width{ get{ return m_Width; } }
public int Height{ get{ return m_Height; } }
public string Message{ get{ return m_Message; } }
public int Width => m_Width;
public int Height => m_Height;
public string Message => m_Message;
public MessageEntry( int width, int height, string message )
{
@ -331,10 +328,7 @@ namespace Server.Items
new MessageEntry( 280, 250, "...was a cad and a boor, no matter what momma s...rew him overboard! Oh, Anna, 'twas so exciting!<br> Unfort...y he grabbe...est, and all his riches went with him!<br> ...sked the captain, and he says we're at {0}<br>...so maybe..." )
};
public static MessageEntry[] Entries
{
get{ return m_Entries; }
}
public static MessageEntry[] Entries => m_Entries;
}
}
}

5
Scripts/Items/Skill Items/Fishing/Misc/ShipwreckedItem.cs
View file

@ -67,10 +67,7 @@ namespace Server.Items
public bool IsShipwreckedItem
{
get
{
return true; //It's a ShipwreckedItem item. 'Course it's gonna be a Shipwreckeditem
}
get => true;
set
{
}

4
Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs
View file

@ -15,8 +15,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool InUse
{
get{ return m_InUse; }
set{ m_InUse = value; }
get => m_InUse;
set => m_InUse = value;
}
[Constructible]

9
Scripts/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs
View file

@ -23,21 +23,21 @@ 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 ToolQuality Quality
{
get{ return m_Quality; }
get => m_Quality;
set{ UnscaleUses(); m_Quality = value; InvalidateProperties(); ScaleUses(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get { return m_UsesRemaining; }
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
@ -60,7 +60,8 @@ namespace Server.Items
return 100;
}
public bool ShowUsesRemaining{ get{ return true; } set{} }
public bool ShowUsesRemaining{ get => true;
set{} }
public abstract HarvestSystem HarvestSystem{ get; }

5
Scripts/Items/Skill Items/Harvest Tools/ProspectorsTool.cs
View file

@ -11,11 +11,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 => 1049065; // prospector's tool

6
Scripts/Items/Skill Items/Lumberjack/Log.cs
View file

@ -8,12 +8,12 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get { return m_Resource; }
get => m_Resource;
set { m_Resource = value; InvalidateProperties(); }
}
int ICommodity.DescriptionNumber { get { return CraftResources.IsStandard( m_Resource ) ? LabelNumber : 1075062 + ( (int)m_Resource - (int)CraftResource.RegularWood ); } }
bool ICommodity.IsDeedable { get { return true; } }
int ICommodity.DescriptionNumber => CraftResources.IsStandard( m_Resource ) ? LabelNumber : 1075062 + ( (int)m_Resource - (int)CraftResource.RegularWood );
bool ICommodity.IsDeedable => true;
[Constructible]
public Log() : this( 1 )

4
Scripts/Items/Skill Items/Magical/Misc/BlankScroll.cs
View file

@ -15,8 +15,8 @@ namespace Server.Items
Amount = amount;
}
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => (Core.ML);
public BlankScroll( Serial serial ) : base( serial )
{

4
Scripts/Items/Skill Items/Magical/Misc/Bottle.cs
View file

@ -2,8 +2,8 @@ namespace Server.Items
{
public class Bottle : 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 Bottle() : this( 1 )

60
Scripts/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -17,43 +17,25 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Target
{
get
{
return m_Target;
}
set
{
m_Target = value;
}
get => m_Target;
set => m_Target = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Map TargetMap
{
get
{
return m_TargetMap;
}
set
{
m_TargetMap = value;
}
get => m_TargetMap;
set => m_TargetMap = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Dispellable
{
get
{
return m_bDispellable;
}
set
{
m_bDispellable = value;
}
get => m_bDispellable;
set => m_bDispellable = value;
}
public virtual bool ShowFeluccaWarning{ get{ return false; } }
public virtual bool ShowFeluccaWarning => false;
[Constructible]
public Moongate() : this( Point3D.Zero, null )
@ -273,50 +255,50 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int GumpWidth
{
get{ return m_GumpWidth; }
set{ m_GumpWidth = value; }
get => m_GumpWidth;
set => m_GumpWidth = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int GumpHeight
{
get{ return m_GumpHeight; }
set{ m_GumpHeight = value; }
get => m_GumpHeight;
set => m_GumpHeight = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int TitleColor
{
get{ return m_TitleColor; }
set{ m_TitleColor = value; }
get => m_TitleColor;
set => m_TitleColor = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int MessageColor
{
get{ return m_MessageColor; }
set{ m_MessageColor = value; }
get => m_MessageColor;
set => m_MessageColor = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int TitleNumber
{
get{ return m_TitleNumber; }
set{ m_TitleNumber = value; }
get => m_TitleNumber;
set => m_TitleNumber = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int MessageNumber
{
get{ return m_MessageNumber; }
set{ m_MessageNumber = value; }
get => m_MessageNumber;
set => m_MessageNumber = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string MessageString
{
get{ return m_MessageString; }
set{ m_MessageString = value; }
get => m_MessageString;
set => m_MessageString = value;
}
[Constructible]

10
Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs
View file

@ -10,10 +10,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Held
{
get
{
return m_Held;
}
get => m_Held;
set
{
if ( m_Held != value )
@ -28,10 +25,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public PotionEffect Type
{
get
{
return m_Type;
}
get => m_Type;
set
{
m_Type = value;

25
Scripts/Items/Skill Items/Magical/Misc/RecallRune.cs
View file

@ -78,10 +78,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.Counselor, AccessLevel.GameMaster )]
public string Description
{
get
{
return m_Description;
}
get => m_Description;
set
{
m_Description = value;
@ -92,10 +89,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.Counselor, AccessLevel.GameMaster )]
public bool Marked
{
get
{
return m_Marked;
}
get => m_Marked;
set
{
if ( m_Marked != value )
@ -110,23 +104,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.Counselor, AccessLevel.GameMaster )]
public Point3D Target
{
get
{
return m_Target;
}
set
{
m_Target = value;
}
get => m_Target;
set => m_Target = value;
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.GameMaster )]
public Map TargetMap
{
get
{
return m_TargetMap;
}
get => m_TargetMap;
set
{
if ( m_TargetMap != value )

11
Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -43,10 +43,7 @@ namespace Server.Items
public PotionEffect PotionEffect
{
get
{
return m_PotionEffect;
}
get => m_PotionEffect;
set
{
m_PotionEffect = value;
@ -54,8 +51,8 @@ namespace Server.Items
}
}
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => (Core.ML);
public override int LabelNumber => 1041314 + (int)m_PotionEffect;
@ -71,7 +68,7 @@ namespace Server.Items
{
}
public virtual bool RequireFreeHand{ get{ return true; } }
public virtual bool RequireFreeHand => true;
public static bool HasFreeHand( Mobile m )
{

7
Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -140,10 +140,7 @@ namespace Server.Items
{
private BaseConflagrationPotion m_Potion;
public BaseConflagrationPotion Potion
{
get{ return m_Potion; }
}
public BaseConflagrationPotion Potion => m_Potion;
public ThrowTarget( BaseConflagrationPotion potion ) : base( 12, true, TargetFlags.None )
{
@ -185,7 +182,7 @@ namespace Server.Items
private DateTime m_End;
private Timer m_Timer;
public Mobile From{ get{ return m_From; } }
public Mobile From => m_From;
public override bool BlocksFit => true;

5
Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs
View file

@ -160,10 +160,7 @@ namespace Server.Items
{
private BaseConfusionBlastPotion m_Potion;
public BaseConfusionBlastPotion Potion
{
get{ return m_Potion; }
}
public BaseConfusionBlastPotion Potion => m_Potion;
public ThrowTarget( BaseConfusionBlastPotion potion ) : base( 12, true, TargetFlags.None )
{

10
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs
View file

@ -7,15 +7,9 @@ namespace Server.Items
private Poison m_Poison;
private double m_Chance;
public Poison Poison
{
get{ return m_Poison; }
}
public Poison Poison => m_Poison;
public double Chance
{
get{ return m_Chance; }
}
public double Chance => m_Chance;
public CureLevelInfo( Poison poison, double chance )
{

5
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -166,10 +166,7 @@ namespace Server.Items
{
private BaseExplosionPotion m_Potion;
public BaseExplosionPotion Potion
{
get{ return m_Potion; }
}
public BaseExplosionPotion Potion => m_Potion;
public ThrowTarget( BaseExplosionPotion potion ) : base( 12, true, TargetFlags.None )
{

75
Scripts/Items/Skill Items/Magical/Runebook.cs
View file

@ -18,7 +18,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public BookQuality Quality
{
get{ return m_Quality; }
get => m_Quality;
set{ m_Quality = value; InvalidateProperties(); }
}
@ -36,31 +36,28 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextUse
{
get{ return m_NextUse; }
set{ m_NextUse = value; }
get => m_NextUse;
set => m_NextUse = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Crafter
{
get{ return m_Crafter; }
get => m_Crafter;
set{ m_Crafter = value; InvalidateProperties(); }
}
[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 string Description
{
get
{
return m_Description;
}
get => m_Description;
set
{
m_Description = value;
@ -71,39 +68,21 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int CurCharges
{
get
{
return m_CurCharges;
}
set
{
m_CurCharges = value;
}
get => m_CurCharges;
set => m_CurCharges = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int MaxCharges
{
get
{
return m_MaxCharges;
}
set
{
m_MaxCharges = value;
}
get => m_MaxCharges;
set => m_MaxCharges = value;
}
public List<Mobile> Openers
{
get
{
return m_Openers;
}
set
{
m_Openers = value;
}
get => m_Openers;
set => m_Openers = value;
}
public override int LabelNumber => 1041267; // runebook
@ -131,13 +110,7 @@ namespace Server.Items
{
}
public List<RunebookEntry> Entries
{
get
{
return m_Entries;
}
}
public List<RunebookEntry> Entries => m_Entries;
public RunebookEntry Default
{
@ -480,25 +453,13 @@ namespace Server.Items
private string m_Description;
private BaseHouse m_House;
public Point3D Location
{
get{ return m_Location; }
}
public Point3D Location => m_Location;
public Map Map
{
get{ return m_Map; }
}
public Map Map => m_Map;
public string Description
{
get{ return m_Description; }
}
public string Description => m_Description;
public BaseHouse House
{
get{ return m_House; }
}
public BaseHouse House => m_House;
public RunebookEntry( Point3D loc, Map map, string desc, BaseHouse house )
{

12
Scripts/Items/Skill Items/Magical/Scrolls/SpellScroll.cs
View file

@ -8,16 +8,10 @@ namespace Server.Items
{
private int m_SpellID;
public int SpellID
{
get
{
return m_SpellID;
}
}
public int SpellID => m_SpellID;
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => (Core.ML);
public SpellScroll( Serial serial ) : base( serial )
{

33
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -34,14 +34,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public string EngravedText
{
get{ return m_EngravedText; }
get => m_EngravedText;
set{ m_EngravedText = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public BookQuality Quality
{
get{ return m_Quality; }
get => m_Quality;
set{ m_Quality = value; InvalidateProperties(); }
}
@ -302,20 +302,20 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public AosAttributes Attributes
{
get{ return m_AosAttributes; }
get => m_AosAttributes;
set{}
}
[CommandProperty( AccessLevel.GameMaster )]
public AosSkillBonuses SkillBonuses
{
get{ return m_AosSkillBonuses; }
get => m_AosSkillBonuses;
set{}
}
public virtual SpellbookType SpellbookType{ get{ return SpellbookType.Regular; } }
public virtual int BookOffset{ get{ return 0; } }
public virtual int BookCount{ get{ return 64; } }
public virtual SpellbookType SpellbookType => SpellbookType.Regular;
public virtual int BookOffset => 0;
public virtual int BookCount => 64;
private ulong m_Content;
private int m_Count;
@ -386,10 +386,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public ulong Content
{
get
{
return m_Content;
}
get => m_Content;
set
{
if ( m_Content != value )
@ -410,13 +407,7 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public int SpellCount
{
get
{
return m_Count;
}
}
public int SpellCount => m_Count;
[Constructible]
public Spellbook() : this( (ulong)0 )
@ -560,7 +551,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Crafter
{
get{ return m_Crafter; }
get => m_Crafter;
set{ m_Crafter = value; InvalidateProperties(); }
}
@ -700,14 +691,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public SlayerName Slayer
{
get { return m_Slayer; }
get => m_Slayer;
set { m_Slayer = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public SlayerName Slayer2
{
get { return m_Slayer2; }
get => m_Slayer2;
set { m_Slayer2 = value; InvalidateProperties(); }
}

15
Scripts/Items/Skill Items/Misc/Bandage.cs
View file

@ -10,10 +10,7 @@ namespace Server.Items
{
public static int Range = ( Core.AOS ? 2 : 1 );
public override double DefaultWeight
{
get { return 0.1; }
}
public override double DefaultWeight => 0.1;
public static void Initialize()
{
@ -165,10 +162,12 @@ namespace Server.Items
private int m_Slips;
private Timer m_Timer;
public Mobile Healer{ get{ return m_Healer; } }
public Mobile Patient{ get{ return m_Patient; } }
public int Slips{ get{ return m_Slips; } set{ m_Slips = value; } }
public Timer Timer{ get{ return m_Timer; } }
public Mobile Healer => m_Healer;
public Mobile Patient => m_Patient;
public int Slips{ get => m_Slips;
set => m_Slips = value;
}
public Timer Timer => m_Timer;
public void Slip()
{

2
Scripts/Items/Skill Items/Misc/RecipeScroll.cs
View file

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

8
Scripts/Items/Skill Items/Misc/RepairDeed.cs
View file

@ -13,7 +13,7 @@ namespace Server.Items
private Type[] m_NearbyTypes;
private TextDefinition m_NotNearbyMessage, m_Name;
public TextDefinition NotNearbyMessage{ get { return m_NotNearbyMessage; } }
public TextDefinition NotNearbyMessage => m_NotNearbyMessage;
public TextDefinition Name => m_Name;
@ -72,21 +72,21 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public RepairSkillType RepairSkill
{
get { return m_Skill; }
get => m_Skill;
set { m_Skill = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public double SkillLevel
{
get { return m_SkillLevel; }
get => m_SkillLevel;
set { m_SkillLevel = Math.Max( Math.Min( value, 120.0 ), 0 ) ; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Crafter
{
get { return m_Crafter; }
get => m_Crafter;
set { m_Crafter = value; InvalidateProperties(); }
}

26
Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -27,49 +27,49 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int SuccessSound
{
get{ return m_WellSound; }
set{ m_WellSound = value; }
get => m_WellSound;
set => m_WellSound = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int FailureSound
{
get{ return m_BadlySound; }
set{ m_BadlySound = value; }
get => m_BadlySound;
set => m_BadlySound = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public SlayerName Slayer
{
get{ return m_Slayer; }
get => m_Slayer;
set{ m_Slayer = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public SlayerName Slayer2
{
get{ return m_Slayer2; }
get => m_Slayer2;
set{ m_Slayer2 = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public InstrumentQuality Quality
{
get{ return m_Quality; }
get => m_Quality;
set{ UnscaleUses(); m_Quality = value; InvalidateProperties(); ScaleUses(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Crafter
{
get{ return m_Crafter; }
get => m_Crafter;
set{ m_Crafter = value; InvalidateProperties(); }
}
public virtual int InitMinUses{ get{ return 350; } }
public virtual int InitMaxUses{ get{ return 450; } }
public virtual int InitMinUses => 350;
public virtual int InitMaxUses => 450;
public virtual TimeSpan ChargeReplenishRate { get { return TimeSpan.FromMinutes( 5.0 ); } }
public virtual TimeSpan ChargeReplenishRate => TimeSpan.FromMinutes( 5.0 );
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
@ -83,7 +83,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public DateTime LastReplenished
{
get { return m_LastReplenished; }
get => m_LastReplenished;
set { m_LastReplenished = value; CheckReplenishUses(); }
}
@ -91,7 +91,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool ReplenishesCharges
{
get { return m_ReplenishesCharges; }
get => m_ReplenishesCharges;
set
{
if ( value != m_ReplenishesCharges && value )

7
Scripts/Items/Skill Items/Ninjitsu/EggBomb.cs
View file

@ -2,11 +2,8 @@ namespace Server.Items
{
public class EggBomb : Item
{
public override int LabelNumber
{
get { return 1030249; }
}
public override int LabelNumber => 1030249;
[Constructible]
public EggBomb() : base( 0x2808 )
{

11
Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs
View file

@ -17,7 +17,7 @@ namespace Server.Items
public virtual int WeaponMinRange => 0;
public virtual int WeaponMaxRange => 6;
public virtual int WeaponDamage { get { return Utility.RandomMinMax(4, 6); } }
public virtual int WeaponDamage => Utility.RandomMinMax(4, 6);
public Type AmmoType => typeof(FukiyaDarts);
@ -28,25 +28,26 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get { return m_UsesRemaining; }
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get{ return m_Poison; }
get => m_Poison;
set{ m_Poison = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int PoisonCharges
{
get { return m_PoisonCharges; }
get => m_PoisonCharges;
set { m_PoisonCharges = value; InvalidateProperties(); }
}
public bool ShowUsesRemaining{ get{ return true; } set{} }
public bool ShowUsesRemaining{ get => true;
set{} }
[Constructible]
public Fukiya() : base( 0x27AA )

9
Scripts/Items/Skill Items/Ninjitsu/FukiyaDarts.cs
View file

@ -13,25 +13,26 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get { return m_UsesRemaining; }
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get{ return m_Poison; }
get => m_Poison;
set{ m_Poison = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int PoisonCharges
{
get { return m_PoisonCharges; }
get => m_PoisonCharges;
set { m_PoisonCharges = value; InvalidateProperties(); }
}
public bool ShowUsesRemaining{ get{ return true; } set{} }
public bool ShowUsesRemaining{ get => true;
set{} }
[Constructible]
public FukiyaDarts() : this( 1 )

11
Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
View file

@ -19,7 +19,7 @@ namespace Server.Items
public virtual int WeaponMinRange => 2;
public virtual int WeaponMaxRange => 10;
public virtual int WeaponDamage { get { return Utility.RandomMinMax(3, 5); } }
public virtual int WeaponDamage => Utility.RandomMinMax(3, 5);
public virtual Type AmmoType => typeof(Shuriken);
@ -30,25 +30,26 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get { return m_UsesRemaining; }
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get{ return m_Poison; }
get => m_Poison;
set{ m_Poison = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int PoisonCharges
{
get { return m_PoisonCharges; }
get => m_PoisonCharges;
set { m_PoisonCharges = value; InvalidateProperties(); }
}
public bool ShowUsesRemaining{ get{ return true; } set{} }
public bool ShowUsesRemaining{ get => true;
set{} }
[Constructible]
public LeatherNinjaBelt() : base( 0x2790 )

9
Scripts/Items/Skill Items/Ninjitsu/Shuriken.cs
View file

@ -14,25 +14,26 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get { return m_UsesRemaining; }
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get{ return m_Poison; }
get => m_Poison;
set{ m_Poison = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int PoisonCharges
{
get { return m_PoisonCharges; }
get => m_PoisonCharges;
set { m_PoisonCharges = value; InvalidateProperties(); }
}
public bool ShowUsesRemaining{ get{ return true; } set{} }
public bool ShowUsesRemaining{ get => true;
set{} }
[Constructible]
public Shuriken() : this( 1 )

5
Scripts/Items/Skill Items/Specialized/GlassblowingBook.cs
View file

@ -4,10 +4,7 @@ namespace Server.Items
{
public class GlassblowingBook : Item
{
public override string DefaultName
{
get { return "Crafting Glass With Glassblowing"; }
}
public override string DefaultName => "Crafting Glass With Glassblowing";
[Constructible]
public GlassblowingBook() : base( 0xFF4 )

5
Scripts/Items/Skill Items/Specialized/MasonryBook.cs
View file

@ -4,10 +4,7 @@ namespace Server.Items
{
public class MasonryBook : Item
{
public override string DefaultName
{
get { return "Making Valuables With Stonecrafting"; }
}
public override string DefaultName => "Making Valuables With Stonecrafting";
[Constructible]
public MasonryBook() : base( 0xFBE )

4
Scripts/Items/Skill Items/Specialized/Sand.cs
View file

@ -3,8 +3,8 @@ namespace Server.Items
[FlippableAttribute( 0x11EA, 0x11EB )]
public class Sand : Item, ICommodity
{
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return true; } }
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override int LabelNumber => 1044626; // sand

5
Scripts/Items/Skill Items/Specialized/SandMiningBook.cs
View file

@ -4,10 +4,7 @@ namespace Server.Items
{
public class SandMiningBook : Item
{
public override string DefaultName
{
get { return "Find Glass-Quality Sand"; }
}
public override string DefaultName => "Find Glass-Quality Sand";
[Constructible]
public SandMiningBook() : base( 0xFF4 )

5
Scripts/Items/Skill Items/Specialized/StoneMiningBook.cs
View file

@ -4,10 +4,7 @@ namespace Server.Items
{
public class StoneMiningBook : Item
{
public override string DefaultName
{
get { return "Mining For Quality Stone"; }
}
public override string DefaultName => "Mining For Quality Stone";
[Constructible]
public StoneMiningBook() : base( 0xFBE )

14
Scripts/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs
View file

@ -9,10 +9,10 @@ namespace Server.Items
private string m_NameString;
private int[] m_Hues;
public int Name{ get{ return m_Name; } }
public string NameString{ get{ return m_NameString; } }
public int Name => m_Name;
public string NameString => m_NameString;
public int[] Hues{ get{ return m_Hues; } }
public int[] Hues => m_Hues;
public CustomHueGroup( int name, int[] hues )
{
@ -34,10 +34,10 @@ namespace Server.Items
private int m_Title;
private string m_TitleString;
public bool DefaultSupported{ get{ return m_DefaultSupported; } }
public CustomHueGroup[] Groups{ get{ return m_Groups; } }
public int Title{ get{ return m_Title; } }
public string TitleString{ get{ return m_TitleString; } }
public bool DefaultSupported => m_DefaultSupported;
public CustomHueGroup[] Groups => m_Groups;
public int Title => m_Title;
public string TitleString => m_TitleString;
public CustomHuePicker( CustomHueGroup[] groups, bool defaultSupported )
{

56
Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs
View file

@ -17,32 +17,17 @@ namespace Server.Items
private int m_DyedHue;
private SecureLevel m_SecureLevel;
public virtual CustomHuePicker CustomHuePicker{ get{ return null; } }
public virtual CustomHuePicker CustomHuePicker => null;
public virtual bool AllowRunebooks
{
get{ return false; }
}
public virtual bool AllowRunebooks => false;
public virtual bool AllowFurniture
{
get{ return false; }
}
public virtual bool AllowFurniture => false;
public virtual bool AllowStatuettes
{
get{ return false; }
}
public virtual bool AllowStatuettes => false;
public virtual bool AllowLeather
{
get{ return false; }
}
public virtual bool AllowLeather => false;
public virtual bool AllowDyables
{
get{ return true; }
}
public virtual bool AllowDyables => true;
public override void Serialize( GenericWriter writer )
{
@ -81,23 +66,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool Redyable
{
get
{
return m_Redyable;
}
set
{
m_Redyable = value;
}
get => m_Redyable;
set => m_Redyable = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int DyedHue
{
get
{
return m_DyedHue;
}
get => m_DyedHue;
set
{
if ( m_Redyable )
@ -111,14 +87,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;
}
[Constructible]
@ -142,10 +112,10 @@ namespace Server.Items
public virtual bool MetallicHues => false;
// Select the clothing to dye.
public virtual int TargetMessage{ get{ return 500859; } }
public virtual int TargetMessage => 500859;
// You can not dye that.
public virtual int FailMessage{ get{ return 1042083; } }
public virtual int FailMessage => 1042083;
public override void OnDoubleClick( Mobile from )
{

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs
View file

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

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs
View file

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

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs
View file

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

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs
View file

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

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs
View file

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

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs
View file

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

5
Scripts/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -364,9 +364,6 @@ namespace Server.Items
private static Dictionary<Mobile, Timer> m_Timers = new Dictionary<Mobile, Timer>();
public static Dictionary<Mobile, Timer> Timers
{
get { return m_Timers; }
}
public static Dictionary<Mobile, Timer> Timers => m_Timers;
}
}

7
Scripts/Items/Skill Items/Thief/DisguisePersistance.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
{
private static DisguisePersistance m_Instance;
public static DisguisePersistance Instance{ get{ return m_Instance; } }
public static DisguisePersistance Instance => m_Instance;
public override string DefaultName
{
get { return "Disguise Persistance - Internal"; }
}
public override string DefaultName => "Disguise Persistance - Internal";
public DisguisePersistance() : base( 1 )
{

5
Scripts/Items/Skill Items/Tinkering/Clocks.cs
View file

@ -19,10 +19,7 @@ namespace Server.Items
{
private static DateTime m_ServerStart;
public static DateTime ServerStart
{
get{ return m_ServerStart; }
}
public static DateTime ServerStart => m_ServerStart;
public static void Initialize()
{

2
Scripts/Items/Skill Items/Tools/BaseRunicTool.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get{ return m_Resource; }
get => m_Resource;
set{ m_Resource = value; Hue = CraftResources.GetHue( m_Resource ); InvalidateProperties(); }
}

9
Scripts/Items/Skill Items/Tools/BaseTool.cs
View file

@ -20,21 +20,21 @@ 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 ToolQuality Quality
{
get{ return m_Quality; }
get => m_Quality;
set{ UnscaleUses(); m_Quality = value; InvalidateProperties(); ScaleUses(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int UsesRemaining
{
get { return m_UsesRemaining; }
get => m_UsesRemaining;
set { m_UsesRemaining = value; InvalidateProperties(); }
}
@ -59,7 +59,8 @@ namespace Server.Items
return 100;
}
public bool ShowUsesRemaining{ get{ return true; } set{} }
public bool ShowUsesRemaining{ get => true;
set{} }
public abstract CraftSystem CraftSystem{ get; }