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

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

47
Scripts/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs
View file

@ -5,58 +5,53 @@ namespace Server.Items
{
public class CustomHueGroup
{
private int m_Name;
private string m_NameString;
private int[] m_Hues;
public int Name { get; }
public int Name => m_Name;
public string NameString => m_NameString;
public string NameString { get; }
public int[] Hues => m_Hues;
public int[] Hues { get; }
public CustomHueGroup( int name, int[] hues )
{
m_Name = name;
m_Hues = hues;
Name = name;
Hues = hues;
}
public CustomHueGroup( string name, int[] hues )
{
m_NameString = name;
m_Hues = hues;
NameString = name;
Hues = hues;
}
}
public class CustomHuePicker
{
private CustomHueGroup[] m_Groups;
private bool m_DefaultSupported;
private int m_Title;
private string m_TitleString;
public bool DefaultSupported { get; }
public bool DefaultSupported => m_DefaultSupported;
public CustomHueGroup[] Groups => m_Groups;
public int Title => m_Title;
public string TitleString => m_TitleString;
public CustomHueGroup[] Groups { get; }
public int Title { get; }
public string TitleString { get; }
public CustomHuePicker( CustomHueGroup[] groups, bool defaultSupported )
{
m_Groups = groups;
m_DefaultSupported = defaultSupported;
Groups = groups;
DefaultSupported = defaultSupported;
}
public CustomHuePicker( CustomHueGroup[] groups, bool defaultSupported, int title )
{
m_Groups = groups;
m_DefaultSupported = defaultSupported;
m_Title = title;
Groups = groups;
DefaultSupported = defaultSupported;
Title = title;
}
public CustomHuePicker( CustomHueGroup[] groups, bool defaultSupported, string title )
{
m_Groups = groups;
m_DefaultSupported = defaultSupported;
m_TitleString = title;
Groups = groups;
DefaultSupported = defaultSupported;
TitleString = title;
}
public static readonly CustomHuePicker SpecialDyeTub = new CustomHuePicker( new[]

11
Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs
View file

@ -15,7 +15,6 @@ namespace Server.Items
{
private bool m_Redyable;
private int m_DyedHue;
private SecureLevel m_SecureLevel;
public virtual CustomHuePicker CustomHuePicker => null;
@ -35,7 +34,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
writer.Write( (int)m_SecureLevel );
writer.Write( (int)Level );
writer.Write( (bool) m_Redyable );
writer.Write( (int) m_DyedHue );
}
@ -50,7 +49,7 @@ namespace Server.Items
{
case 1:
{
m_SecureLevel = (SecureLevel)reader.ReadInt();
Level = (SecureLevel)reader.ReadInt();
goto case 0;
}
case 0:
@ -85,11 +84,7 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level
{
get => m_SecureLevel;
set => m_SecureLevel = value;
}
public SecureLevel Level { get; set; }
[Constructible]
public DyeTub() : base( 0xFAB )

16
Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs
View file

@ -8,14 +8,8 @@ namespace Server.Items
public override int FailMessage => 501021; // That is not a piece of furniture.
public override int LabelNumber => 1041246; // Furniture Dye Tub
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[Constructible]
public FurnitureDyeTub()
@ -25,7 +19,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( m_IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
if ( IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
return;
base.OnDoubleClick( from );
@ -39,7 +33,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
if ( Core.ML && IsRewardItem )
list.Add( 1076217 ); // 1st Year Veteran Reward
}
@ -49,7 +43,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -62,7 +56,7 @@ namespace Server.Items
{
case 1:
{
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}

16
Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs
View file

@ -9,14 +9,8 @@ namespace Server.Items
public override int LabelNumber => 1041284; // Leather Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[Constructible]
public LeatherDyeTub()
@ -26,7 +20,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( m_IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
if ( IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
return;
base.OnDoubleClick( from );
@ -40,7 +34,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
if ( Core.ML && IsRewardItem )
list.Add( 1076218 ); // 2nd Year Veteran Reward
}
@ -50,7 +44,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -63,7 +57,7 @@ namespace Server.Items
{
case 1:
{
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}

16
Scripts/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs
View file

@ -4,14 +4,8 @@ namespace Server.Items
{
public override int LabelNumber => 1006008; // Black Dye Tub
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[Constructible]
public RewardBlackDyeTub()
@ -23,7 +17,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( m_IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
if ( IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
return;
base.OnDoubleClick( from );
@ -37,7 +31,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
if ( Core.ML && IsRewardItem )
list.Add( 1076217 ); // 1st Year Veteran Reward
}
@ -47,7 +41,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -60,7 +54,7 @@ namespace Server.Items
{
case 1:
{
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}

16
Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs
View file

@ -9,14 +9,8 @@ namespace Server.Items
public override int LabelNumber => 1049740; // Runebook Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[Constructible]
public RunebookDyeTub()
@ -26,7 +20,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( m_IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
if ( IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
return;
base.OnDoubleClick( from );
@ -40,7 +34,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
if ( Core.ML && IsRewardItem )
list.Add( 1076220 ); // 4th Year Veteran Reward
}
@ -50,7 +44,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -63,7 +57,7 @@ namespace Server.Items
{
case 1:
{
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}

16
Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs
View file

@ -7,14 +7,8 @@ namespace Server.Items
public override CustomHuePicker CustomHuePicker => CustomHuePicker.SpecialDyeTub;
public override int LabelNumber => 1041285; // Special Dye Tub
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[Constructible]
public SpecialDyeTub()
@ -24,7 +18,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) )
if ( IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) )
return;
base.OnDoubleClick( from );
@ -38,7 +32,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
if ( Core.ML && IsRewardItem )
list.Add( 1076217 ); // 1st Year Veteran Reward
}
@ -48,7 +42,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -61,7 +55,7 @@ namespace Server.Items
{
case 1:
{
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}

16
Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs
View file

@ -9,14 +9,8 @@ namespace Server.Items
public override int LabelNumber => 1049741; // Reward Statuette Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem
{
get => m_IsRewardItem;
set => m_IsRewardItem = value;
}
public bool IsRewardItem { get; set; }
[Constructible]
public StatuetteDyeTub()
@ -26,7 +20,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( m_IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
if ( IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) )
return;
base.OnDoubleClick( from );
@ -40,7 +34,7 @@ namespace Server.Items
{
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
if ( Core.ML && IsRewardItem )
list.Add( 1076221 ); // 5th Year Veteran Reward
}
@ -50,7 +44,7 @@ namespace Server.Items
writer.Write( (int) 1 ); // version
writer.Write( (bool) m_IsRewardItem );
writer.Write( (bool) IsRewardItem );
}
public override void Deserialize( GenericReader reader )
@ -63,7 +57,7 @@ namespace Server.Items
{
case 1:
{
m_IsRewardItem = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}