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

65
Scripts/Items/Clothing/BaseClothing.cs
View file

@ -27,7 +27,7 @@ namespace Server.Items
public FactionItem FactionItemState
{
get{ return m_FactionState; }
get => m_FactionState;
set
{
m_FactionState = value;
@ -40,7 +40,7 @@ namespace Server.Items
}
#endregion
public virtual bool CanFortify{ get{ return true; } }
public virtual bool CanFortify => true;
private int m_MaxHitPoints;
private int m_HitPoints;
@ -58,17 +58,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int MaxHitPoints
{
get{ return m_MaxHitPoints; }
get => m_MaxHitPoints;
set{ m_MaxHitPoints = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int HitPoints
{
get
{
return m_HitPoints;
}
get => m_HitPoints;
set
{
if ( value != m_HitPoints && MaxHitPoints > 0 )
@ -88,73 +85,73 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Crafter
{
get{ return m_Crafter; }
get => m_Crafter;
set{ m_Crafter = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int StrRequirement
{
get{ return ( m_StrReq == -1 ? (Core.AOS ? AosStrReq : OldStrReq) : m_StrReq ); }
get => ( m_StrReq == -1 ? (Core.AOS ? AosStrReq : OldStrReq) : m_StrReq );
set{ m_StrReq = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public ClothingQuality Quality
{
get{ return m_Quality; }
get => m_Quality;
set{ m_Quality = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool PlayerConstructed
{
get{ return m_PlayerConstructed; }
set{ m_PlayerConstructed = value; }
get => m_PlayerConstructed;
set => m_PlayerConstructed = value;
}
public virtual CraftResource DefaultResource{ get{ return CraftResource.None; } }
public virtual CraftResource DefaultResource => CraftResource.None;
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get{ return m_Resource; }
get => m_Resource;
set{ m_Resource = value; Hue = CraftResources.GetHue( m_Resource ); InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public AosAttributes Attributes
{
get{ return m_AosAttributes; }
get => m_AosAttributes;
set{}
}
[CommandProperty( AccessLevel.GameMaster )]
public AosArmorAttributes ClothingAttributes
{
get{ return m_AosClothingAttributes; }
get => m_AosClothingAttributes;
set{}
}
[CommandProperty( AccessLevel.GameMaster )]
public AosSkillBonuses SkillBonuses
{
get{ return m_AosSkillBonuses; }
get => m_AosSkillBonuses;
set{}
}
[CommandProperty( AccessLevel.GameMaster )]
public AosElementAttributes Resistances
{
get{ return m_AosResistances; }
get => m_AosResistances;
set{}
}
public virtual int BasePhysicalResistance{ get{ return 0; } }
public virtual int BaseFireResistance{ get{ return 0; } }
public virtual int BaseColdResistance{ get{ return 0; } }
public virtual int BasePoisonResistance{ get{ return 0; } }
public virtual int BaseEnergyResistance{ get{ return 0; } }
public virtual int BasePhysicalResistance => 0;
public virtual int BaseFireResistance => 0;
public virtual int BaseColdResistance => 0;
public virtual int BasePoisonResistance => 0;
public virtual int BaseEnergyResistance => 0;
public override int PhysicalResistance => BasePhysicalResistance + m_AosResistances.Physical;
public override int FireResistance => BaseFireResistance + m_AosResistances.Fire;
@ -162,11 +159,11 @@ namespace Server.Items
public override int PoisonResistance => BasePoisonResistance + m_AosResistances.Poison;
public override int EnergyResistance => BaseEnergyResistance + m_AosResistances.Energy;
public virtual int ArtifactRarity{ get{ return 0; } }
public virtual int ArtifactRarity => 0;
public virtual int BaseStrBonus{ get{ return 0; } }
public virtual int BaseDexBonus{ get{ return 0; } }
public virtual int BaseIntBonus{ get{ return 0; } }
public virtual int BaseStrBonus => 0;
public virtual int BaseDexBonus => 0;
public virtual int BaseIntBonus => 0;
public override bool AllowSecureTrade( Mobile from, Mobile to, Mobile newOwner, bool accepted )
{
@ -228,15 +225,15 @@ namespace Server.Items
return base.CanEquip( from );
}
public virtual int AosStrReq{ get{ return 10; } }
public virtual int OldStrReq{ get{ return 0; } }
public virtual int AosStrReq => 10;
public virtual int OldStrReq => 0;
public virtual int InitMinHits{ get{ return 0; } }
public virtual int InitMaxHits{ get{ return 0; } }
public virtual int InitMinHits => 0;
public virtual int InitMaxHits => 0;
public virtual bool AllowMaleWearer{ get{ return true; } }
public virtual bool AllowFemaleWearer{ get{ return true; } }
public virtual bool CanBeBlessed{ get{ return true; } }
public virtual bool AllowMaleWearer => true;
public virtual bool AllowFemaleWearer => true;
public virtual bool CanBeBlessed => true;
public int ComputeStatReq( StatType type )
{

15
Scripts/Items/Clothing/Cloaks.cs
View file

@ -41,22 +41,19 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int MaxArcaneCharges
{
get{ return m_MaxArcaneCharges; }
get => m_MaxArcaneCharges;
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int CurArcaneCharges
{
get{ return m_CurArcaneCharges; }
get => m_CurArcaneCharges;
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsArcane
{
get{ return ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 ); }
}
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
public void Update()
{
@ -164,14 +161,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
set{ m_IsRewardItem = value; }
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Number
{
get{ return m_LabelNumber; }
get => m_LabelNumber;
set{ m_LabelNumber = value; InvalidateProperties(); }
}

9
Scripts/Items/Clothing/Hats.cs
View file

@ -12,8 +12,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsShipwreckedItem
{
get { return m_IsShipwreckedItem; }
set { m_IsShipwreckedItem = value; }
get => m_IsShipwreckedItem;
set => m_IsShipwreckedItem = value;
}
public BaseHat( int itemID ) : this( itemID, 0 )
@ -698,10 +698,7 @@ namespace Server.Items
return false;
}
public override string DefaultName
{
get { return "a mask of orcish kin"; }
}
public override string DefaultName => "a mask of orcish kin";
[Constructible]
public OrcishKinMask() : this( 0x8A4 )

26
Scripts/Items/Clothing/OuterTorso.cs
View file

@ -105,10 +105,7 @@ namespace Server.Items
private static TimeSpan m_DefaultDecayTime = TimeSpan.FromMinutes(1.0);
public override bool DisplayLootType
{
get{ return false; }
}
public override bool DisplayLootType => false;
[Constructible]
public DeathRobe()
@ -241,14 +238,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
set{ m_IsRewardItem = value; }
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Number
{
get{ return m_LabelNumber; }
get => m_LabelNumber;
set{ m_LabelNumber = value; InvalidateProperties(); }
}
@ -366,14 +363,14 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get{ return m_IsRewardItem; }
set{ m_IsRewardItem = value; }
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Number
{
get{ return m_LabelNumber; }
get => m_LabelNumber;
set{ m_LabelNumber = value; InvalidateProperties(); }
}
@ -491,22 +488,19 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int MaxArcaneCharges
{
get{ return m_MaxArcaneCharges; }
get => m_MaxArcaneCharges;
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int CurArcaneCharges
{
get{ return m_CurArcaneCharges; }
get => m_CurArcaneCharges;
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsArcane
{
get{ return ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 ); }
}
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
public void Update()
{

9
Scripts/Items/Clothing/Shoes.cs
View file

@ -132,22 +132,19 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int MaxArcaneCharges
{
get{ return m_MaxArcaneCharges; }
get => m_MaxArcaneCharges;
set{ m_MaxArcaneCharges = value; InvalidateProperties(); Update(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int CurArcaneCharges
{
get{ return m_CurArcaneCharges; }
get => m_CurArcaneCharges;
set{ m_CurArcaneCharges = value; InvalidateProperties(); Update(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsArcane
{
get{ return ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 ); }
}
public bool IsArcane => ( m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0 );
public override void OnSingleClick( Mobile from )
{