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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Items/Deeds/CommodityDeed.cs
View file

@ -98,7 +98,7 @@ namespace Server.Items
base.OnDelete();
}
public override int LabelNumber{ get{ return m_Commodity == null ? 1047016 : 1047017; } }
public override int LabelNumber => m_Commodity == null ? 1047016 : 1047017;
public override void GetProperties( ObjectPropertyList list )
{
@ -144,7 +144,7 @@ namespace Server.Items
BankBox box = from.FindBankNoCreate();
CommodityDeedBox cox = CommodityDeedBox.Find( this );
// Veteran Rewards mods
if ( m_Commodity != null )
{
@ -234,7 +234,7 @@ namespace Server.Items
CommodityDeedBox cox = CommodityDeedBox.Find( m_Deed );
// Veteran Rewards mods
if ( box != null && m_Deed.IsChildOf( box ) && ((Item)targeted).IsChildOf( box ) ||
if ( box != null && m_Deed.IsChildOf( box ) && ((Item)targeted).IsChildOf( box ) ||
cox != null && cox.IsSecure && ((Item)targeted).IsChildOf( cox ) )
{
if ( m_Deed.SetCommodity( (Item) targeted ) )
@ -268,4 +268,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Deeds/DragonBardingDeed.cs
View file

@ -12,7 +12,7 @@ namespace Server.Items
private Mobile m_Crafter;
private CraftResource m_Resource;
public override int LabelNumber{ get{ return m_Exceptional ? 1053181 : 1053012; } } // dragon barding deed
public override int LabelNumber => m_Exceptional ? 1053181 : 1053012; // dragon barding deed
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Crafter{ get{ return m_Crafter; } set{ m_Crafter = value; InvalidateProperties(); } }
@ -146,4 +146,4 @@ namespace Server.Items
#endregion
}
}
}

14
Scripts/Items/Deeds/HairRestylingDeed.cs
View file

@ -10,7 +10,7 @@ namespace Server.Items
{
public class HairRestylingDeed : Item
{
public override int LabelNumber{ get{ return 1041061; } } // a coupon for a free hair restyling
public override int LabelNumber => 1041061; // a coupon for a free hair restyling
[Constructible]
public HairRestylingDeed() : base( 0x14F0 )
@ -103,8 +103,8 @@ namespace Server.Items
m_Deed.Delete();
}
}
/*
gump data: bgX, bgY, htmlX, htmlY, imgX, imgY, butX, butY
/*
gump data: bgX, bgY, htmlX, htmlY, imgX, imgY, butX, butY
*/
int[][] LayoutArray =
@ -127,8 +127,8 @@ namespace Server.Items
*/
int[][] HumanArray = /* why on earth cant these utilies be consistent with hex/dec */
{
new int[] { 0 },
new int[] { 1011064, 1011064, 0, 0, 0, 0 }, // bald
new int[] { 0 },
new int[] { 1011064, 1011064, 0, 0, 0, 0 }, // bald
new int[] { 1011052, 1011052, 0x203B, 0x203B, 0xed1c, 0xC60C }, // Short
new int[] { 1011053, 1011053, 0x203C, 0x203C, 0xed1d, 0xc60d }, // Long
new int[] { 1011054, 1011054, 0x203D, 0x203D, 0xed1e, 0xc60e }, // Ponytail
@ -139,7 +139,7 @@ namespace Server.Items
new int[] { 1011050, 1011050, 0x204A, 0x204A, 0xED29, 0xED29 }, // Topknot
new int[] { 1011396, 1011396, 0x2047, 0x2047, 0xed25, 0xc618 } // Curly
};
int[][] ElvenArray =
int[][] ElvenArray =
{
new int[] { 0 },
new int[] { 1011064, 1011064, 0, 0, 0, 0, }, // bald
@ -154,4 +154,4 @@ namespace Server.Items
};
}
}
}
}

6
Scripts/Items/Deeds/HolidayTreeDeed.cs
View file

@ -10,7 +10,7 @@ namespace Server.Items
{
public class HolidayTreeDeed : Item
{
public override int LabelNumber{ get{ return 1041116; } } // a deed for a holiday tree
public override int LabelNumber => 1041116; // a deed for a holiday tree
[Constructible]
public HolidayTreeDeed() : base( 0x14F0 )
@ -108,7 +108,7 @@ namespace Server.Items
this.Delete();
HolidayTree tree = new HolidayTree( from, type, loc );
BaseHouse house = BaseHouse.FindHouseAt( tree );
if ( house != null )
if ( house != null )
house.Addons.Add( tree );
}
@ -161,4 +161,4 @@ namespace Server.Items
}
}
}
}
}

2
Scripts/Items/Deeds/NewPlayerTicket.cs
View file

@ -18,7 +18,7 @@ namespace Server.Items
set{ m_Owner = value; }
}
public override int LabelNumber{ get{ return 1062094; } } // a young player ticket
public override int LabelNumber => 1062094; // a young player ticket
[Constructible]
public NewPlayerTicket() : base( 0x14EF )

2
Scripts/Items/Deeds/VendorRentalContract.cs
View file

@ -12,7 +12,7 @@ namespace Server.Items
{
public class VendorRentalContract : Item
{
public override int LabelNumber{ get{ return 1062332; } } // a vendor rental contract
public override int LabelNumber => 1062332; // a vendor rental contract
private VendorRentalDuration m_Duration;
private int m_Price;