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

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