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

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ namespace Server.Items
private int m_HitPoints;
private Mobile m_Crafter;
private ClothingQuality m_Quality;
private bool m_PlayerConstructed;
protected CraftResource m_Resource;
private int m_StrReq = -1;
@ -104,11 +103,7 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public bool PlayerConstructed
{
get => m_PlayerConstructed;
set => m_PlayerConstructed = value;
}
public bool PlayerConstructed { get; set; }
public virtual CraftResource DefaultResource => CraftResource.None;
@ -744,7 +739,7 @@ namespace Server.Items
SetSaveFlag( ref flags, SaveFlag.Resistances, !m_AosResistances.IsEmpty );
SetSaveFlag( ref flags, SaveFlag.MaxHitPoints, m_MaxHitPoints != 0 );
SetSaveFlag( ref flags, SaveFlag.HitPoints, m_HitPoints != 0 );
SetSaveFlag( ref flags, SaveFlag.PlayerConstructed, m_PlayerConstructed != false );
SetSaveFlag( ref flags, SaveFlag.PlayerConstructed, PlayerConstructed != false );
SetSaveFlag( ref flags, SaveFlag.Crafter, m_Crafter != null );
SetSaveFlag( ref flags, SaveFlag.Quality, m_Quality != ClothingQuality.Regular );
SetSaveFlag( ref flags, SaveFlag.StrReq, m_StrReq != -1 );
@ -839,7 +834,7 @@ namespace Server.Items
m_StrReq = -1;
if ( GetSaveFlag( flags, SaveFlag.PlayerConstructed ) )
m_PlayerConstructed = true;
PlayerConstructed = true;
break;
}
@ -860,7 +855,7 @@ namespace Server.Items
}
case 2:
{
m_PlayerConstructed = reader.ReadBool();
PlayerConstructed = reader.ReadBool();
goto case 1;
}
case 1:
@ -878,7 +873,7 @@ namespace Server.Items
}
if ( version < 2 )
m_PlayerConstructed = true; // we don't know, so, assume it's crafted
PlayerConstructed = true; // we don't know, so, assume it's crafted
if ( version < 3 )
{
@ -951,7 +946,7 @@ namespace Server.Items
Item res = (Item)Activator.CreateInstance( resourceType );
ScissorHelper( from, res, m_PlayerConstructed ? (item.Resources.GetAt( 0 ).Amount / 2) : 1 );
ScissorHelper( from, res, PlayerConstructed ? (item.Resources.GetAt( 0 ).Amount / 2) : 1 );
res.LootType = LootType.Regular;

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

@ -156,14 +156,9 @@ namespace Server.Items
public class RewardCloak : BaseCloak, IRewardItem
{
private int m_LabelNumber;
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int Number
@ -211,7 +206,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
if ( Core.ML && IsRewardItem )
list.Add( RewardSystem.GetRewardYearLabel( this, new object[]{ Hue, m_LabelNumber } ) ); // X Year Veteran Reward
}
@ -220,7 +215,7 @@ namespace Server.Items
if ( !base.CanEquip( m ) )
return false;
return !m_IsRewardItem || RewardSystem.CheckIsUsableBy( m, this, new object[]{ Hue, m_LabelNumber } );
return !IsRewardItem || RewardSystem.CheckIsUsableBy( m, this, new object[]{ Hue, m_LabelNumber } );
}
[Constructible]
@ -253,7 +248,7 @@ namespace Server.Items
writer.Write( (int) 0 ); // version
writer.Write( (int) m_LabelNumber );
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -267,7 +262,7 @@ namespace Server.Items
case 0:
{
m_LabelNumber = reader.ReadInt();
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}

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

@ -7,14 +7,8 @@ namespace Server.Items
{
public abstract class BaseHat : BaseClothing, IShipwreckedItem
{
private bool m_IsShipwreckedItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsShipwreckedItem
{
get => m_IsShipwreckedItem;
set => m_IsShipwreckedItem = value;
}
public bool IsShipwreckedItem { get; set; }
public BaseHat( int itemID ) : this( itemID, 0 )
{
@ -34,7 +28,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
writer.Write( m_IsShipwreckedItem );
writer.Write( IsShipwreckedItem );
}
public override void Deserialize( GenericReader reader )
@ -47,7 +41,7 @@ namespace Server.Items
{
case 1:
{
m_IsShipwreckedItem = reader.ReadBool();
IsShipwreckedItem = reader.ReadBool();
break;
}
}
@ -57,7 +51,7 @@ namespace Server.Items
{
base.AddEquipInfoAttributes( from, attrs );
if ( m_IsShipwreckedItem )
if ( IsShipwreckedItem )
attrs.Add( new EquipInfoAttribute( 1041645 ) ); // recovered from a shipwreck
}
@ -65,7 +59,7 @@ namespace Server.Items
{
base.AddNameProperties( list );
if ( m_IsShipwreckedItem )
if ( IsShipwreckedItem )
list.Add( 1041645 ); // recovered from a shipwreck
}

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

@ -231,14 +231,9 @@ namespace Server.Items
public class RewardRobe : BaseOuterTorso, IRewardItem
{
private int m_LabelNumber;
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int Number
@ -286,7 +281,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
if ( Core.ML && IsRewardItem )
list.Add( RewardSystem.GetRewardYearLabel( this, new object[]{ Hue, m_LabelNumber } ) ); // X Year Veteran Reward
}
@ -295,7 +290,7 @@ namespace Server.Items
if ( !base.CanEquip( m ) )
return false;
return !m_IsRewardItem || RewardSystem.CheckIsUsableBy( m, this, new object[]{ Hue, m_LabelNumber } );
return !IsRewardItem || RewardSystem.CheckIsUsableBy( m, this, new object[]{ Hue, m_LabelNumber } );
}
[Constructible]
@ -328,7 +323,7 @@ namespace Server.Items
writer.Write( (int) 0 ); // version
writer.Write( (int) m_LabelNumber );
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -342,7 +337,7 @@ namespace Server.Items
case 0:
{
m_LabelNumber = reader.ReadInt();
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}
@ -356,14 +351,9 @@ namespace Server.Items
public class RewardDress : BaseOuterTorso, IRewardItem
{
private int m_LabelNumber;
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int Number
@ -411,7 +401,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( m_IsRewardItem )
if ( IsRewardItem )
list.Add( RewardSystem.GetRewardYearLabel( this, new object[]{ Hue, m_LabelNumber } ) ); // X Year Veteran Reward
}
@ -420,7 +410,7 @@ namespace Server.Items
if ( !base.CanEquip( m ) )
return false;
return !m_IsRewardItem || RewardSystem.CheckIsUsableBy( m, this, new object[]{ Hue, m_LabelNumber } );
return !IsRewardItem || RewardSystem.CheckIsUsableBy( m, this, new object[]{ Hue, m_LabelNumber } );
}
[Constructible]
@ -453,7 +443,7 @@ namespace Server.Items
writer.Write( (int) 0 ); // version
writer.Write( (int) m_LabelNumber );
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -467,7 +457,7 @@ namespace Server.Items
case 0:
{
m_LabelNumber = reader.ReadInt();
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}