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

fix(cleanup): Cleans up attribute syntax (#734)

Browse source
This commit is contained in:
Kamron Batman 2021-08-26 18:30:16 -07:00 • committed by GitHub
parent 996fdeb011
commit db59bf6dd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 38 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Server/Geometry/Rectangle2D.cs
View file

@ -15,7 +15,9 @@
namespace Server namespace Server
{ {
[NoSort, Parsable, PropertyObject] [NoSort]
[Parsable]
[PropertyObject]
public struct Rectangle2D public struct Rectangle2D
{ {
private Point2D m_Start; private Point2D m_Start;

3
Projects/Server/Geometry/Rectangle3D.cs
View file

@ -15,7 +15,8 @@
namespace Server namespace Server
{ {
[NoSort, PropertyObject] [NoSort]
[PropertyObject]
public struct Rectangle3D public struct Rectangle3D
{ {
private Point3D m_Start; private Point3D m_Start;

3
Projects/Server/Items/Item.cs
View file

@ -486,7 +486,8 @@ namespace Server
[CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)] [CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)]
public int PileWeight => (int)Math.Ceiling(Weight * Amount); public int PileWeight => (int)Math.Ceiling(Weight * Amount);
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public virtual int Hue public virtual int Hue
{ {
get => m_Hue; get => m_Hue;

22
Projects/Server/Mobiles/Mobile.cs
View file

@ -1281,7 +1281,8 @@ namespace Server
public virtual int Luck => 0; public virtual int Luck => 0;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public int HueMod public int HueMod
{ {
get => m_HueMod; get => m_HueMod;
@ -1296,7 +1297,8 @@ namespace Server
} }
} }
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public virtual int Hue public virtual int Hue
{ {
get => m_HueMod != -1 ? m_HueMod : m_Hue; get => m_HueMod != -1 ? m_HueMod : m_Hue;
@ -1700,18 +1702,11 @@ namespace Server
} }
} }
[Body, CommandProperty(AccessLevel.GameMaster)] [Body]
[CommandProperty(AccessLevel.GameMaster)]
public Body Body public Body Body
{ {
get get => IsBodyMod ? m_BodyMod : m_Body;
{
if (IsBodyMod)
{
return m_BodyMod;
}
return m_Body;
}
set set
{ {
if (m_Body != value && !IsBodyMod) if (m_Body != value && !IsBodyMod)
@ -1726,7 +1721,8 @@ namespace Server
} }
} }
[Body, CommandProperty(AccessLevel.GameMaster)] [Body]
[CommandProperty(AccessLevel.GameMaster)]
public int BodyValue public int BodyValue
{ {
get => Body.BodyID; get => Body.BodyID;

3
Projects/UOContent/Items/Addons/AddonComponent.cs
View file

@ -110,7 +110,8 @@ namespace Server.Items
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
public Point3D _offset; public Point3D _offset;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;

3
Projects/UOContent/Items/Addons/AddonContainerComponent.cs
View file

@ -25,7 +25,8 @@ namespace Server.Items
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
public Point3D _offset; public Point3D _offset;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;

3
Projects/UOContent/Items/Addons/BaseAddon.cs
View file

@ -42,7 +42,8 @@ namespace Server.Items
public virtual bool ShareHue => true; public virtual bool ShareHue => true;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;

3
Projects/UOContent/Items/Addons/BaseAddonContainer.cs
View file

@ -20,7 +20,8 @@ namespace Server.Items
public override bool DisplayWeight => false; public override bool DisplayWeight => false;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;

3
Projects/UOContent/Items/Armor/BaseArmor.cs
View file

@ -566,7 +566,8 @@ namespace Server.Items
public virtual Race RequiredRace => null; public virtual Race RequiredRace => null;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;

12
Projects/UOContent/Items/Construction/Ankhs.cs
View file

@ -130,7 +130,8 @@ namespace Server.Items
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;
@ -221,7 +222,8 @@ namespace Server.Items
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;
@ -317,7 +319,8 @@ namespace Server.Items
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;
@ -410,7 +413,8 @@ namespace Server.Items
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;

3
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -123,7 +123,8 @@ namespace Server.Items
public virtual int VirtualDamageBonus => 0; public virtual int VirtualDamageBonus => 0;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;

3
Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -43,7 +43,8 @@ namespace Server.Mobiles
public virtual bool AllowMaleRider => true; public virtual bool AllowMaleRider => true;
public virtual bool AllowFemaleRider => true; public virtual bool AllowFemaleRider => true;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue]
[CommandProperty(AccessLevel.GameMaster)]
public override int Hue public override int Hue
{ {
get => base.Hue; get => base.Hue;