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

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

5
Scripts/Items/Misc/ArcaneGem.cs
View file

@ -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 )

2
Scripts/Items/Misc/BankCheck.cs
View file

@ -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(); }
}

26
Scripts/Items/Misc/BulletinBoards.cs
View file

@ -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
Scripts/Items/Misc/ClockworkAssembly.cs
View file

@ -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 )

22
Scripts/Items/Misc/CommunicationCrystals.cs
View file

@ -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 )

90
Scripts/Items/Misc/Corpses/Corpse.cs
View file

@ -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()
{

5
Scripts/Items/Misc/Corpses/CorpseNameAttribute.cs
View file

@ -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 )
{

8
Scripts/Items/Misc/DeceitBrazier.cs
View file

@ -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

225
Scripts/Items/Misc/EffectController.cs
View file

@ -56,96 +56,145 @@ namespace Server.Items
private int m_TriggerRange;
[CommandProperty( AccessLevel.GameMaster )]
public ECEffectType EffectType{ get{ return m_EffectType; } set{ m_EffectType = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public EffectTriggerType TriggerType{ get{ return m_TriggerType; } set{ m_TriggerType = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public EffectLayer EffectLayer{ get{ return m_EffectLayer; } set{ m_EffectLayer = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan EffectDelay{ get{ return m_EffectDelay; } set{ m_EffectDelay = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan TriggerDelay{ get{ return m_TriggerDelay; } set{ m_TriggerDelay = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan SoundDelay{ get{ return m_SoundDelay; } set{ m_SoundDelay = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public Item SourceItem{ get{ return m_Source as Item; } set{ m_Source = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile SourceMobile{ get{ return m_Source as Mobile; } set{ m_Source = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public bool SourceNull{ get{ return ( m_Source == null ); } set{ if ( value ) m_Source = null; } }
[CommandProperty( AccessLevel.GameMaster )]
public Item TargetItem{ get{ return m_Target as Item; } set{ m_Target = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile TargetMobile{ get{ return m_Target as Mobile; } set{ m_Target = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public bool TargetNull{ get{ return ( m_Target == null ); } set{ if ( value ) m_Target = null; } }
[CommandProperty( AccessLevel.GameMaster )]
public EffectController Sequence{ get{ return m_Trigger; } set{ m_Trigger = value; } }
[CommandProperty( AccessLevel.GameMaster )]
private bool FixedDirection{ get{ return m_FixedDirection; } set{ m_FixedDirection = value; } }
[CommandProperty( AccessLevel.GameMaster )]
private bool Explodes{ get{ return m_Explodes; } set{ m_Explodes = value; } }
[CommandProperty( AccessLevel.GameMaster )]
private bool PlaySoundAtTrigger{ get{ return m_PlaySoundAtTrigger; } set{ m_PlaySoundAtTrigger = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int EffectItemID{ get{ return m_ItemID; } set{ m_ItemID = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int EffectHue{ get{ return m_Hue; } set{ m_Hue = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int RenderMode{ get{ return m_RenderMode; } set{ m_RenderMode = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int Speed{ get{ return m_Speed; } set{ m_Speed = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int Duration{ get{ return m_Duration; } set{ m_Duration = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int ParticleEffect{ get{ return m_ParticleEffect; } set{ m_ParticleEffect = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int ExplodeParticleEffect{ get{ return m_ExplodeParticleEffect; } set{ m_ExplodeParticleEffect = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int ExplodeSound{ get{ return m_ExplodeSound; } set{ m_ExplodeSound = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int Unknown{ get{ return m_Unknown; } set{ m_Unknown = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int SoundID{ get{ return m_SoundID; } set{ m_SoundID = value; } }
[CommandProperty( AccessLevel.GameMaster )]
public int TriggerRange{ get{ return m_TriggerRange; } set{ m_TriggerRange = value; } }
public override string DefaultName
{
get { return "Effect Controller"; }
public ECEffectType EffectType{ get => m_EffectType;
set => m_EffectType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public EffectTriggerType TriggerType{ get => m_TriggerType;
set => m_TriggerType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public EffectLayer EffectLayer{ get => m_EffectLayer;
set => m_EffectLayer = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan EffectDelay{ get => m_EffectDelay;
set => m_EffectDelay = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan TriggerDelay{ get => m_TriggerDelay;
set => m_TriggerDelay = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan SoundDelay{ get => m_SoundDelay;
set => m_SoundDelay = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Item SourceItem{ get => m_Source as Item;
set => m_Source = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile SourceMobile{ get => m_Source as Mobile;
set => m_Source = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool SourceNull{ get => ( m_Source == null );
set{ if ( value ) m_Source = null; } }
[CommandProperty( AccessLevel.GameMaster )]
public Item TargetItem{ get => m_Target as Item;
set => m_Target = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile TargetMobile{ get => m_Target as Mobile;
set => m_Target = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool TargetNull{ get => ( m_Target == null );
set{ if ( value ) m_Target = null; } }
[CommandProperty( AccessLevel.GameMaster )]
public EffectController Sequence{ get => m_Trigger;
set => m_Trigger = value;
}
[CommandProperty( AccessLevel.GameMaster )]
private bool FixedDirection{ get => m_FixedDirection;
set => m_FixedDirection = value;
}
[CommandProperty( AccessLevel.GameMaster )]
private bool Explodes{ get => m_Explodes;
set => m_Explodes = value;
}
[CommandProperty( AccessLevel.GameMaster )]
private bool PlaySoundAtTrigger{ get => m_PlaySoundAtTrigger;
set => m_PlaySoundAtTrigger = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int EffectItemID{ get => m_ItemID;
set => m_ItemID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int EffectHue{ get => m_Hue;
set => m_Hue = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int RenderMode{ get => m_RenderMode;
set => m_RenderMode = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Speed{ get => m_Speed;
set => m_Speed = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Duration{ get => m_Duration;
set => m_Duration = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ParticleEffect{ get => m_ParticleEffect;
set => m_ParticleEffect = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ExplodeParticleEffect{ get => m_ExplodeParticleEffect;
set => m_ExplodeParticleEffect = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ExplodeSound{ get => m_ExplodeSound;
set => m_ExplodeSound = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Unknown{ get => m_Unknown;
set => m_Unknown = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int SoundID{ get => m_SoundID;
set => m_SoundID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int TriggerRange{ get => m_TriggerRange;
set => m_TriggerRange = value;
}
public override string DefaultName => "Effect Controller";
[Constructible]
public EffectController() : base( 0x1B72 )
{

8
Scripts/Items/Misc/EffectItem.cs
View file

@ -44,13 +44,7 @@ namespace Server.Items
new FreeTimer( this, duration ).Start();
}
public override bool Decays
{
get
{
return true;
}
}
public override bool Decays => true;
public EffectItem( Serial serial ) : base( serial )
{

5
Scripts/Items/Misc/Firebomb.cs
View file

@ -193,10 +193,7 @@ namespace Server.Items
{
private Firebomb m_Bomb;
public Firebomb Bomb
{
get { return m_Bomb; }
}
public Firebomb Bomb => m_Bomb;
public ThrowTarget( Firebomb bomb )
: base( 12, true, TargetFlags.None )

5
Scripts/Items/Misc/FlippableAddonAttribute.cs
View file

@ -16,10 +16,7 @@ namespace Server.Items
private Direction[] m_Directions;
public Direction[] Directions
{
get { return m_Directions; }
}
public Direction[] Directions => m_Directions;
public FlippableAddonAttribute( params Direction[] directions )
{

5
Scripts/Items/Misc/FlippableAttribute.cs
View file

@ -63,10 +63,7 @@ namespace Server.Items
{
private int[] m_ItemIDs;
public int[] ItemIDs
{
get { return m_ItemIDs; }
}
public int[] ItemIDs => m_ItemIDs;
public FlippableAttribute()
: this( null )

5
Scripts/Items/Misc/Gold.cs
View file

@ -6,10 +6,7 @@ namespace Server.Items
{
public class Gold : Item
{
public override double DefaultWeight
{
get { return ( Core.ML ? ( 0.02 / 3 ) : 0.02 ); }
}
public override double DefaultWeight => ( Core.ML ? ( 0.02 / 3 ) : 0.02 );
[Constructible]
public Gold() : this( 1 )

24
Scripts/Items/Misc/HairDye.cs
View file

@ -55,29 +55,11 @@ namespace Server.Items
private int m_HueStart;
private int m_HueCount;
public string Name
{
get
{
return m_Name;
}
}
public string Name => m_Name;
public int HueStart
{
get
{
return m_HueStart;
}
}
public int HueStart => m_HueStart;
public int HueCount
{
get
{
return m_HueCount;
}
}
public int HueCount => m_HueCount;
public HairDyeEntry( string name, int hueStart, int hueCount )
{

3
Scripts/Items/Misc/InteriorDecorator.cs
View file

@ -18,7 +18,8 @@ namespace Server.Items
private DecorateCommand m_Command;
[CommandProperty( AccessLevel.GameMaster )]
public DecorateCommand Command{ get{ return m_Command; } set{ m_Command = value; InvalidateProperties(); } }
public DecorateCommand Command{ get => m_Command;
set{ m_Command = value; InvalidateProperties(); } }
[Constructible]
public InteriorDecorator() : base( 0xFC1 )

30
Scripts/Items/Misc/Key.cs
View file

@ -92,10 +92,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public string Description
{
get
{
return m_Description;
}
get => m_Description;
set
{
m_Description = value;
@ -106,24 +103,15 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int MaxRange
{
get
{
return m_MaxRange;
}
get => m_MaxRange;
set
{
m_MaxRange = value;
}
set => m_MaxRange = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public uint KeyValue
{
get
{
return m_KeyVal;
}
get => m_KeyVal;
set
{
@ -135,15 +123,9 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Item Link
{
get
{
return m_Link;
}
get => m_Link;
set
{
m_Link = value;
}
set => m_Link = value;
}
public override void Serialize( GenericWriter writer )

5
Scripts/Items/Misc/LOSBlocker.cs
View file

@ -10,10 +10,7 @@ namespace Server.Items
TileData.ItemTable[0x21A2].Height = 20;
}
public override string DefaultName
{
get { return "no line of sight"; }
}
public override string DefaultName => "no line of sight";
[Constructible]
public LOSBlocker() : base( 0x21A2 )

5
Scripts/Items/Misc/Moonstone.cs
View file

@ -16,10 +16,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public MoonstoneType Type
{
get
{
return m_Type;
}
get => m_Type;
set
{
m_Type = value;

14
Scripts/Items/Misc/MorphItem.cs
View file

@ -12,33 +12,33 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int InactiveItemID
{
get{ return m_InactiveItemID; }
set{ m_InactiveItemID = value; }
get => m_InactiveItemID;
set => m_InactiveItemID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ActiveItemID
{
get{ return m_ActiveItemID; }
set{ m_ActiveItemID = value; }
get => m_ActiveItemID;
set => m_ActiveItemID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int InRange
{
get{ return m_InRange; }
get => m_InRange;
set{ if ( value > 18 ) value = 18; m_InRange = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public int OutRange
{
get{ return m_OutRange; }
get => m_OutRange;
set{ if ( value > 18 ) value = 18; m_OutRange = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public int CurrentRange{ get{ return ItemID == InactiveItemID ? InRange : OutRange; } }
public int CurrentRange => ItemID == InactiveItemID ? InRange : OutRange;
[Constructible]
public MorphItem( int inactiveItemID, int activeItemID, int range ) : this( inactiveItemID, activeItemID, range, range )

5
Scripts/Items/Misc/OilCloth.cs
View file

@ -8,10 +8,7 @@ namespace Server.Items
{
public override int LabelNumber => 1041498; // oil cloth
public override double DefaultWeight
{
get { return 1.0; }
}
public override double DefaultWeight => 1.0;
[Constructible]
public OilCloth() : base( 0x175D )

29
Scripts/Items/Misc/PlayerBulletinBoards.cs
View file

@ -74,29 +74,26 @@ namespace Server.Items
private string m_Title;
private SecureLevel m_Level;
public List<PlayerBBMessage> Messages
{
get{ return m_Messages; }
}
public List<PlayerBBMessage> Messages => m_Messages;
public PlayerBBMessage Greeting
{
get{ return m_Greeting; }
set{ m_Greeting = value; }
get => m_Greeting;
set => m_Greeting = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string Title
{
get{ return m_Title; }
set{ m_Title = value; }
get => m_Title;
set => m_Title = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level
{
get{ return m_Level; }
set{ m_Level = value; }
get => m_Level;
set => m_Level = value;
}
public BasePlayerBB( int itemID ) : base( itemID )
@ -335,22 +332,22 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public DateTime Time
{
get{ return m_Time; }
set{ m_Time = value; }
get => m_Time;
set => m_Time = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Poster
{
get{ return m_Poster; }
set{ m_Poster = value; }
get => m_Poster;
set => m_Poster = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string Message
{
get{ return m_Message; }
set{ m_Message = value; }
get => m_Message;
set => m_Message = value;
}
public PlayerBBMessage( DateTime time, Mobile poster, string message )

5
Scripts/Items/Misc/PowerCrystal.cs
View file

@ -4,10 +4,7 @@ namespace Server.Items
{
public class PowerCrystal : Item
{
public override string DefaultName
{
get { return "power crystal"; }
}
public override string DefaultName => "power crystal";
[Constructible]
public PowerCrystal() : base( 0x1F1C )

17
Scripts/Items/Misc/PowerGenerator.cs
View file

@ -62,8 +62,12 @@ namespace Server.Items
private int m_X;
private int m_Y;
public int X{ get{ return m_X; } set{ m_X = value; } }
public int Y{ get{ return m_Y; } set{ m_Y = value; } }
public int X{ get => m_X;
set => m_X = value;
}
public int Y{ get => m_Y;
set => m_Y = value;
}
public Node( int x, int y )
{
@ -78,7 +82,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int SideLength
{
get{ return m_SideLength; }
get => m_SideLength;
set
{
if ( value < 3 )
@ -94,12 +98,9 @@ namespace Server.Items
}
}
public Node[] Path{ get{ return m_Path; } }
public Node[] Path => m_Path;
public override string DefaultName
{
get { return "a control panel"; }
}
public override string DefaultName => "a control panel";
public ControlPanel( int sideLength ) : base( 0xBDC )
{

48
Scripts/Items/Misc/PublicMoongate.cs
View file

@ -157,21 +157,9 @@ namespace Server.Items
private Point3D m_Location;
private int m_Number;
public Point3D Location
{
get
{
return m_Location;
}
}
public Point3D Location => m_Location;
public int Number
{
get
{
return m_Number;
}
}
public int Number => m_Number;
public PMEntry( Point3D loc, int number )
{
@ -186,37 +174,13 @@ namespace Server.Items
private Map m_Map;
private PMEntry[] m_Entries;
public int Number
{
get
{
return m_Number;
}
}
public int Number => m_Number;
public int SelNumber
{
get
{
return m_SelNumber;
}
}
public int SelNumber => m_SelNumber;
public Map Map
{
get
{
return m_Map;
}
}
public Map Map => m_Map;
public PMEntry[] Entries
{
get
{
return m_Entries;
}
}
public PMEntry[] Entries => m_Entries;
public PMList( int number, int selNumber, Map map, PMEntry[] entries )
{

12
Scripts/Items/Misc/SerpentPillar.cs
View file

@ -11,22 +11,22 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get{ return m_Active; }
set{ m_Active = value; }
get => m_Active;
set => m_Active = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string Word
{
get{ return m_Word; }
set{ m_Word = value; }
get => m_Word;
set => m_Word = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Rectangle2D Destination
{
get{ return m_Destination; }
set{ m_Destination = value; }
get => m_Destination;
set => m_Destination = value;
}
[Constructible]

24
Scripts/Items/Misc/SpecialBeardDye.cs
View file

@ -56,29 +56,11 @@ namespace Server.Items
private int m_HueStart;
private int m_HueCount;
public string Name
{
get
{
return m_Name;
}
}
public string Name => m_Name;
public int HueStart
{
get
{
return m_HueStart;
}
}
public int HueStart => m_HueStart;
public int HueCount
{
get
{
return m_HueCount;
}
}
public int HueCount => m_HueCount;
public SpecialBeardDyeEntry( string name, int hueStart, int hueCount )
{

29
Scripts/Items/Misc/SpecialHairDye.cs
View file

@ -5,10 +5,7 @@ namespace Server.Items
{
public class SpecialHairDye : Item
{
public override string DefaultName
{
get { return "Special Hair Dye"; }
}
public override string DefaultName => "Special Hair Dye";
[Constructible]
public SpecialHairDye() : base( 0xE26 )
@ -60,29 +57,11 @@ namespace Server.Items
private int m_HueStart;
private int m_HueCount;
public string Name
{
get
{
return m_Name;
}
}
public string Name => m_Name;
public int HueStart
{
get
{
return m_HueStart;
}
}
public int HueStart => m_HueStart;
public int HueCount
{
get
{
return m_HueCount;
}
}
public int HueCount => m_HueCount;
public SpecialHairDyeEntry( string name, int hueStart, int hueCount )
{

2
Scripts/Items/Misc/Static.cs
View file

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

5
Scripts/Items/Misc/SwarmOfFlies.cs
View file

@ -2,10 +2,7 @@ namespace Server.Items
{
public class SwarmOfFlies : Item
{
public override string DefaultName
{
get { return "a swarm of flies"; }
}
public override string DefaultName => "a swarm of flies";
[Constructible]
public SwarmOfFlies() : base( 0x91B )

85
Scripts/Items/Misc/Teleporter.cs
View file

@ -20,70 +20,70 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public bool SourceEffect
{
get { return m_SourceEffect; }
get => m_SourceEffect;
set { m_SourceEffect = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool DestEffect
{
get { return m_DestEffect; }
get => m_DestEffect;
set { m_DestEffect = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public int SoundID
{
get { return m_SoundID; }
get => m_SoundID;
set { m_SoundID = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public TimeSpan Delay
{
get { return m_Delay; }
get => m_Delay;
set { m_Delay = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool Active
{
get { return m_Active; }
get => m_Active;
set { m_Active = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public Point3D PointDest
{
get { return m_PointDest; }
get => m_PointDest;
set { m_PointDest = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public Map MapDest
{
get { return m_MapDest; }
get => m_MapDest;
set { m_MapDest = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool Creatures
{
get { return m_Creatures; }
get => m_Creatures;
set { m_Creatures = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool CombatCheck
{
get { return m_CombatCheck; }
get => m_CombatCheck;
set { m_CombatCheck = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool CriminalCheck
{
get { return m_CriminalCheck; }
get => m_CriminalCheck;
set { m_CriminalCheck = value; InvalidateProperties(); }
}
@ -302,28 +302,28 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public SkillName Skill
{
get { return m_Skill; }
get => m_Skill;
set { m_Skill = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public double Required
{
get { return m_Required; }
get => m_Required;
set { m_Required = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public string MessageString
{
get { return m_MessageString; }
get => m_MessageString;
set { m_MessageString = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public int MessageNumber
{
get { return m_MessageNumber; }
get => m_MessageNumber;
set { m_MessageNumber = value; InvalidateProperties(); }
}
@ -429,21 +429,21 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public string Substring
{
get { return m_Substring; }
get => m_Substring;
set { m_Substring = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public int Keyword
{
get { return m_Keyword; }
get => m_Keyword;
set { m_Keyword = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public int Range
{
get { return m_Range; }
get => m_Range;
set { m_Range = value; InvalidateProperties(); }
}
@ -573,36 +573,36 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public int StartNumber
{
get { return m_StartNumber; }
set { m_StartNumber = value; }
get => m_StartNumber;
set => m_StartNumber = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public string StartMessage
{
get { return m_StartMessage; }
set { m_StartMessage = value; }
get => m_StartMessage;
set => m_StartMessage = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public int ProgressNumber
{
get { return m_ProgressNumber; }
set { m_ProgressNumber = value; }
get => m_ProgressNumber;
set => m_ProgressNumber = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public string ProgressMessage
{
get { return m_ProgressMessage; }
set { m_ProgressMessage = value; }
get => m_ProgressMessage;
set => m_ProgressMessage = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public bool ShowTimeRemaining
{
get { return m_ShowTimeRemaining; }
set { m_ShowTimeRemaining = value; }
get => m_ShowTimeRemaining;
set => m_ShowTimeRemaining = value;
}
[Constructible]
@ -732,8 +732,8 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public TimeSpan TimeoutDelay
{
get { return m_TimeoutDelay; }
set { m_TimeoutDelay = value; }
get => m_TimeoutDelay;
set => m_TimeoutDelay = value;
}
[Constructible]
@ -846,8 +846,8 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public TimeoutTeleporter Teleporter
{
get { return m_Teleporter; }
set { m_Teleporter = value; }
get => m_Teleporter;
set => m_Teleporter = value;
}
[Constructible]
@ -868,10 +868,7 @@ namespace Server.Items
return true;
}
public override string DefaultName
{
get { return "timeout teleporter goal"; }
}
public override string DefaultName => "timeout teleporter goal";
public TimeoutGoal(Serial serial)
: base(serial)
@ -919,63 +916,63 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public bool DenyMounted
{
get { return GetFlag(ConditionFlag.DenyMounted); }
get => GetFlag(ConditionFlag.DenyMounted);
set { SetFlag(ConditionFlag.DenyMounted, value); InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool DenyFollowers
{
get { return GetFlag(ConditionFlag.DenyFollowers); }
get => GetFlag(ConditionFlag.DenyFollowers);
set { SetFlag(ConditionFlag.DenyFollowers, value); InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool DenyPackContents
{
get { return GetFlag(ConditionFlag.DenyPackContents); }
get => GetFlag(ConditionFlag.DenyPackContents);
set { SetFlag(ConditionFlag.DenyPackContents, value); InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool DenyHolding
{
get { return GetFlag(ConditionFlag.DenyHolding); }
get => GetFlag(ConditionFlag.DenyHolding);
set { SetFlag(ConditionFlag.DenyHolding, value); InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool DenyEquipment
{
get { return GetFlag(ConditionFlag.DenyEquipment); }
get => GetFlag(ConditionFlag.DenyEquipment);
set { SetFlag(ConditionFlag.DenyEquipment, value); InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool DenyTransformed
{
get { return GetFlag(ConditionFlag.DenyTransformed); }
get => GetFlag(ConditionFlag.DenyTransformed);
set { SetFlag(ConditionFlag.DenyTransformed, value); InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool StaffOnly
{
get { return GetFlag(ConditionFlag.StaffOnly); }
get => GetFlag(ConditionFlag.StaffOnly);
set { SetFlag(ConditionFlag.StaffOnly, value); InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool DenyPackEthereals
{
get { return GetFlag(ConditionFlag.DenyPackEthereals); }
get => GetFlag(ConditionFlag.DenyPackEthereals);
set { SetFlag(ConditionFlag.DenyPackEthereals, value); InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public bool DeadOnly
{
get { return GetFlag(ConditionFlag.DeadOnly); }
get => GetFlag(ConditionFlag.DeadOnly);
set { SetFlag(ConditionFlag.DeadOnly, value); InvalidateProperties(); }
}

5
Scripts/Items/Misc/TrashBarrel.cs
View file

@ -10,10 +10,7 @@ namespace Server.Items
public override int DefaultMaxWeight => 0; // A value of 0 signals unlimited weight
public override bool IsDecoContainer
{
get{ return false; }
}
public override bool IsDecoContainer => false;
[Constructible]
public TrashBarrel() : base( 0xE77 )

5
Scripts/Items/Misc/TrashChest.cs
View file

@ -5,10 +5,7 @@ namespace Server.Items
{
public override int DefaultMaxWeight => 0; // A value of 0 signals unlimited weight
public override bool IsDecoContainer
{
get{ return false; }
}
public override bool IsDecoContainer => false;
[Constructible]
public TrashChest() : base( 0xE41 )

5
Scripts/Items/Misc/UnholyBone.cs
View file

@ -7,10 +7,7 @@ namespace Server.Items
{
private SpawnTimer m_Timer;
public override string DefaultName
{
get { return "unholy bone"; }
}
public override string DefaultName => "unholy bone";
[Constructible]
public UnholyBone() : base( 0xF7E )

24
Scripts/Items/Misc/WarningItem.cs
View file

@ -14,29 +14,29 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public string WarningString
{
get{ return m_WarningString; }
set{ m_WarningString = value; }
get => m_WarningString;
set => m_WarningString = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int WarningNumber
{
get{ return m_WarningNumber; }
set{ m_WarningNumber = value; }
get => m_WarningNumber;
set => m_WarningNumber = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Range
{
get{ return m_Range; }
get => m_Range;
set{ if ( value > 18 ) value = 18; m_Range = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan ResetDelay
{
get{ return m_ResetDelay; }
set{ m_ResetDelay = value; }
get => m_ResetDelay;
set => m_ResetDelay = value;
}
[Constructible]
@ -89,7 +89,7 @@ namespace Server.Items
}
}
public virtual bool OnlyToTriggerer{ get{ return false; } }
public virtual bool OnlyToTriggerer => false;
public virtual int NeighborRange => 5;
public virtual void Broadcast( Mobile triggerer )
@ -175,15 +175,15 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public string HintString
{
get{ return m_HintString; }
set{ m_HintString = value; }
get => m_HintString;
set => m_HintString = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HintNumber
{
get{ return m_HintNumber; }
set{ m_HintNumber = value; }
get => m_HintNumber;
set => m_HintNumber = value;
}
public override bool OnlyToTriggerer => true;

10
Scripts/Items/Misc/Waypoint.cs
View file

@ -19,10 +19,7 @@ namespace Server.Items
private WayPoint m_Next;
public override string DefaultName
{
get { return "AI Way Point"; }
}
public override string DefaultName => "AI Way Point";
[Constructible]
public WayPoint() : base( 0x1f14 )
@ -41,10 +38,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public WayPoint NextPoint
{
get
{
return m_Next;
}
get => m_Next;
set
{
if ( m_Next != this )

7
Scripts/Items/Misc/WindChimes.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool TurnedOn
{
get{ return m_TurnedOn; }
get => m_TurnedOn;
set{ m_TurnedOn = value; InvalidateProperties(); }
}
@ -21,10 +21,7 @@ namespace Server.Items
private static int[] m_Sounds = new int[] { 0x505, 0x506, 0x507 };
public static int[] Sounds
{
get{ return m_Sounds; }
}
public static int[] Sounds => m_Sounds;
public override bool HandlesOnMovement => m_TurnedOn && IsLockedDown;