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

132
Scripts/Engines/Factions/Definitions/FactionDefinition.cs
View file

@ -2,97 +2,83 @@ namespace Server.Factions
{
public class FactionDefinition
{
private int m_Sort;
public int Sort { get; }
private int m_HuePrimary;
private int m_HueSecondary;
private int m_HueJoin;
private int m_HueBroadcast;
public int HuePrimary { get; }
private int m_WarHorseBody;
private int m_WarHorseItem;
public int HueSecondary { get; }
private string m_FriendlyName;
private string m_Keyword;
private string m_Abbreviation;
public int HueJoin { get; }
private TextDefinition m_Name;
private TextDefinition m_PropName;
private TextDefinition m_Header;
private TextDefinition m_About;
private TextDefinition m_CityControl;
private TextDefinition m_SigilControl;
private TextDefinition m_SignupName;
private TextDefinition m_FactionStoneName;
private TextDefinition m_OwnerLabel;
public int HueBroadcast { get; }
private TextDefinition m_GuardIgnore, m_GuardWarn, m_GuardAttack;
public int WarHorseBody { get; }
private StrongholdDefinition m_Stronghold;
public int WarHorseItem { get; }
private RankDefinition[] m_Ranks;
private GuardDefinition[] m_Guards;
public string FriendlyName { get; }
public int Sort => m_Sort;
public string Keyword { get; }
public int HuePrimary => m_HuePrimary;
public int HueSecondary => m_HueSecondary;
public int HueJoin => m_HueJoin;
public int HueBroadcast => m_HueBroadcast;
public string Abbreviation { get; }
public int WarHorseBody => m_WarHorseBody;
public int WarHorseItem => m_WarHorseItem;
public TextDefinition Name { get; }
public string FriendlyName => m_FriendlyName;
public string Keyword => m_Keyword;
public string Abbreviation => m_Abbreviation;
public TextDefinition PropName { get; }
public TextDefinition Name => m_Name;
public TextDefinition PropName => m_PropName;
public TextDefinition Header => m_Header;
public TextDefinition About => m_About;
public TextDefinition CityControl => m_CityControl;
public TextDefinition SigilControl => m_SigilControl;
public TextDefinition SignupName => m_SignupName;
public TextDefinition FactionStoneName => m_FactionStoneName;
public TextDefinition OwnerLabel => m_OwnerLabel;
public TextDefinition Header { get; }
public TextDefinition GuardIgnore => m_GuardIgnore;
public TextDefinition GuardWarn => m_GuardWarn;
public TextDefinition GuardAttack => m_GuardAttack;
public TextDefinition About { get; }
public StrongholdDefinition Stronghold => m_Stronghold;
public TextDefinition CityControl { get; }
public RankDefinition[] Ranks => m_Ranks;
public GuardDefinition[] Guards => m_Guards;
public TextDefinition SigilControl { get; }
public TextDefinition SignupName { get; }
public TextDefinition FactionStoneName { get; }
public TextDefinition OwnerLabel { get; }
public TextDefinition GuardIgnore { get; }
public TextDefinition GuardWarn { get; }
public TextDefinition GuardAttack { get; }
public StrongholdDefinition Stronghold { get; }
public RankDefinition[] Ranks { get; }
public GuardDefinition[] Guards { get; }
public FactionDefinition( int sort, int huePrimary, int hueSecondary, int hueJoin, int hueBroadcast, int warHorseBody, int warHorseItem, string friendlyName, string keyword, string abbreviation, TextDefinition name, TextDefinition propName, TextDefinition header, TextDefinition about, TextDefinition cityControl, TextDefinition sigilControl, TextDefinition signupName, TextDefinition factionStoneName, TextDefinition ownerLabel, TextDefinition guardIgnore, TextDefinition guardWarn, TextDefinition guardAttack, StrongholdDefinition stronghold, RankDefinition[] ranks, GuardDefinition[] guards )
{
m_Sort = sort;
m_HuePrimary = huePrimary;
m_HueSecondary = hueSecondary;
m_HueJoin = hueJoin;
m_HueBroadcast = hueBroadcast;
m_WarHorseBody = warHorseBody;
m_WarHorseItem = warHorseItem;
m_FriendlyName = friendlyName;
m_Keyword = keyword;
m_Abbreviation = abbreviation;
m_Name = name;
m_PropName = propName;
m_Header = header;
m_About = about;
m_CityControl = cityControl;
m_SigilControl = sigilControl;
m_SignupName = signupName;
m_FactionStoneName = factionStoneName;
m_OwnerLabel = ownerLabel;
m_GuardIgnore = guardIgnore;
m_GuardWarn = guardWarn;
m_GuardAttack = guardAttack;
m_Stronghold = stronghold;
m_Ranks = ranks;
m_Guards = guards;
Sort = sort;
HuePrimary = huePrimary;
HueSecondary = hueSecondary;
HueJoin = hueJoin;
HueBroadcast = hueBroadcast;
WarHorseBody = warHorseBody;
WarHorseItem = warHorseItem;
FriendlyName = friendlyName;
Keyword = keyword;
Abbreviation = abbreviation;
Name = name;
PropName = propName;
Header = header;
About = about;
CityControl = cityControl;
SigilControl = sigilControl;
SignupName = signupName;
FactionStoneName = factionStoneName;
OwnerLabel = ownerLabel;
GuardIgnore = guardIgnore;
GuardWarn = guardWarn;
GuardAttack = guardAttack;
Stronghold = stronghold;
Ranks = ranks;
Guards = guards;
}
}
}

10
Scripts/Engines/Factions/Definitions/FactionItemDefinition.cs
View file

@ -6,16 +6,14 @@ namespace Server.Factions
{
public class FactionItemDefinition
{
private int m_SilverCost;
private Type m_VendorType;
public int SilverCost { get; }
public int SilverCost => m_SilverCost;
public Type VendorType => m_VendorType;
public Type VendorType { get; }
public FactionItemDefinition( int silverCost, Type vendorType )
{
m_SilverCost = silverCost;
m_VendorType = vendorType;
SilverCost = silverCost;
VendorType = vendorType;
}
private static FactionItemDefinition m_MetalArmor = new FactionItemDefinition( 1000, typeof( Blacksmith ) );

35
Scripts/Engines/Factions/Definitions/GuardDefinition.cs
View file

@ -4,38 +4,31 @@ namespace Server.Factions
{
public class GuardDefinition
{
private Type m_Type;
public Type Type { get; }
private int m_Price;
private int m_Upkeep;
private int m_Maximum;
public int Price { get; }
private int m_ItemID;
public int Upkeep { get; }
private TextDefinition m_Header;
private TextDefinition m_Label;
public int Maximum { get; }
public Type Type => m_Type;
public int ItemID { get; }
public int Price => m_Price;
public int Upkeep => m_Upkeep;
public int Maximum => m_Maximum;
public int ItemID => m_ItemID;
public TextDefinition Header { get; }
public TextDefinition Header => m_Header;
public TextDefinition Label => m_Label;
public TextDefinition Label { get; }
public GuardDefinition( Type type, int itemID, int price, int upkeep, int maximum, TextDefinition header, TextDefinition label )
{
m_Type = type;
Type = type;
m_Price = price;
m_Upkeep = upkeep;
m_Maximum = maximum;
m_ItemID = itemID;
Price = price;
Upkeep = upkeep;
Maximum = maximum;
ItemID = itemID;
m_Header = header;
m_Label = label;
Header = header;
Label = label;
}
}
}

22
Scripts/Engines/Factions/Definitions/RankDefinition.cs
View file

@ -2,22 +2,20 @@ namespace Server.Factions
{
public class RankDefinition
{
private int m_Rank;
private int m_Required;
private int m_MaxWearables;
private TextDefinition m_Title;
public int Rank { get; }
public int Rank => m_Rank;
public int Required => m_Required;
public int MaxWearables => m_MaxWearables;
public TextDefinition Title => m_Title;
public int Required { get; }
public int MaxWearables { get; }
public TextDefinition Title { get; }
public RankDefinition( int rank, int required, int maxWearables, TextDefinition title )
{
m_Rank = rank;
m_Required = required;
m_Title = title;
m_MaxWearables = maxWearables;
Rank = rank;
Required = required;
Title = title;
MaxWearables = maxWearables;
}
}
}

20
Scripts/Engines/Factions/Definitions/StrongholdDefintion.cs
View file

@ -2,24 +2,20 @@ namespace Server.Factions
{
public class StrongholdDefinition
{
private Rectangle2D[] m_Area;
private Point3D m_JoinStone;
private Point3D m_FactionStone;
private Point3D[] m_Monoliths;
public Rectangle2D[] Area { get; }
public Rectangle2D[] Area => m_Area;
public Point3D JoinStone { get; }
public Point3D JoinStone => m_JoinStone;
public Point3D FactionStone => m_FactionStone;
public Point3D FactionStone { get; }
public Point3D[] Monoliths => m_Monoliths;
public Point3D[] Monoliths { get; }
public StrongholdDefinition( Rectangle2D[] area, Point3D joinStone, Point3D factionStone, Point3D[] monoliths )
{
m_Area = area;
m_JoinStone = joinStone;
m_FactionStone = factionStone;
m_Monoliths = monoliths;
Area = area;
JoinStone = joinStone;
FactionStone = factionStone;
Monoliths = monoliths;
}
}
}

69
Scripts/Engines/Factions/Definitions/TownDefinition.cs
View file

@ -2,56 +2,47 @@ namespace Server.Factions
{
public class TownDefinition
{
private int m_Sort;
private int m_SigilID;
public int Sort { get; }
private string m_Region;
public int SigilID { get; }
private string m_FriendlyName;
public string Region { get; }
private TextDefinition m_TownName;
private TextDefinition m_TownStoneHeader;
private TextDefinition m_StrongholdMonolithName;
private TextDefinition m_TownMonolithName;
private TextDefinition m_TownStoneName;
private TextDefinition m_SigilName;
private TextDefinition m_CorruptedSigilName;
public string FriendlyName { get; }
private Point3D m_Monolith;
private Point3D m_TownStone;
public TextDefinition TownName { get; }
public int Sort => m_Sort;
public int SigilID => m_SigilID;
public TextDefinition TownStoneHeader { get; }
public string Region => m_Region;
public string FriendlyName => m_FriendlyName;
public TextDefinition StrongholdMonolithName { get; }
public TextDefinition TownName => m_TownName;
public TextDefinition TownStoneHeader => m_TownStoneHeader;
public TextDefinition StrongholdMonolithName => m_StrongholdMonolithName;
public TextDefinition TownMonolithName => m_TownMonolithName;
public TextDefinition TownStoneName => m_TownStoneName;
public TextDefinition SigilName => m_SigilName;
public TextDefinition CorruptedSigilName => m_CorruptedSigilName;
public TextDefinition TownMonolithName { get; }
public Point3D Monolith => m_Monolith;
public Point3D TownStone => m_TownStone;
public TextDefinition TownStoneName { get; }
public TextDefinition SigilName { get; }
public TextDefinition CorruptedSigilName { get; }
public Point3D Monolith { get; }
public Point3D TownStone { get; }
public TownDefinition( int sort, int sigilID, string region, string friendlyName, TextDefinition townName, TextDefinition townStoneHeader, TextDefinition strongholdMonolithName, TextDefinition townMonolithName, TextDefinition townStoneName, TextDefinition sigilName, TextDefinition corruptedSigilName, Point3D monolith, Point3D townStone )
{
m_Sort = sort;
m_SigilID = sigilID;
m_Region = region;
m_FriendlyName = friendlyName;
m_TownName = townName;
m_TownStoneHeader = townStoneHeader;
m_StrongholdMonolithName = strongholdMonolithName;
m_TownMonolithName = townMonolithName;
m_TownStoneName = townStoneName;
m_SigilName = sigilName;
m_CorruptedSigilName = corruptedSigilName;
m_Monolith = monolith;
m_TownStone = townStone;
Sort = sort;
SigilID = sigilID;
Region = region;
FriendlyName = friendlyName;
TownName = townName;
TownStoneHeader = townStoneHeader;
StrongholdMonolithName = strongholdMonolithName;
TownMonolithName = townMonolithName;
TownStoneName = townStoneName;
SigilName = sigilName;
CorruptedSigilName = corruptedSigilName;
Monolith = monolith;
TownStone = townStone;
}
}
}

112
Scripts/Engines/Factions/Definitions/VendorDefinition.cs
View file

@ -4,78 +4,70 @@ namespace Server.Factions
{
public class VendorDefinition
{
private Type m_Type;
public Type Type { get; }
private int m_Price;
private int m_Upkeep;
private int m_Maximum;
public int Price { get; }
private int m_ItemID;
public int Upkeep { get; }
private TextDefinition m_Header;
private TextDefinition m_Label;
public int Maximum { get; }
public Type Type => m_Type;
public int ItemID { get; }
public int Price => m_Price;
public int Upkeep => m_Upkeep;
public int Maximum => m_Maximum;
public int ItemID => m_ItemID;
public TextDefinition Header { get; }
public TextDefinition Header => m_Header;
public TextDefinition Label => m_Label;
public TextDefinition Label { get; }
public VendorDefinition( Type type, int itemID, int price, int upkeep, int maximum, TextDefinition header, TextDefinition label )
{
m_Type = type;
Type = type;
m_Price = price;
m_Upkeep = upkeep;
m_Maximum = maximum;
m_ItemID = itemID;
Price = price;
Upkeep = upkeep;
Maximum = maximum;
ItemID = itemID;
m_Header = header;
m_Label = label;
Header = header;
Label = label;
}
private static VendorDefinition[] m_Definitions = {
new VendorDefinition( typeof( FactionBottleVendor ), 0xF0E,
5000,
1000,
10,
new TextDefinition( 1011549, "POTION BOTTLE VENDOR" ),
new TextDefinition( 1011544, "Buy Potion Bottle Vendor" )
),
new VendorDefinition( typeof( FactionBoardVendor ), 0x1BD7,
3000,
500,
10,
new TextDefinition( 1011552, "WOOD VENDOR" ),
new TextDefinition( 1011545, "Buy Wooden Board Vendor" )
),
new VendorDefinition( typeof( FactionOreVendor ), 0x19B8,
3000,
500,
10,
new TextDefinition( 1011553, "IRON ORE VENDOR" ),
new TextDefinition( 1011546, "Buy Iron Ore Vendor" )
),
new VendorDefinition( typeof( FactionReagentVendor ), 0xF86,
5000,
1000,
10,
new TextDefinition( 1011554, "REAGENT VENDOR" ),
new TextDefinition( 1011547, "Buy Reagent Vendor" )
),
new VendorDefinition( typeof( FactionHorseVendor ), 0x20DD,
5000,
1000,
1,
new TextDefinition( 1011556, "HORSE BREEDER" ),
new TextDefinition( 1011555, "Buy Horse Breeder" )
)
};
public static VendorDefinition[] Definitions => m_Definitions;
public static VendorDefinition[] Definitions { get; } =
{
new VendorDefinition( typeof( FactionBottleVendor ), 0xF0E,
5000,
1000,
10,
new TextDefinition( 1011549, "POTION BOTTLE VENDOR" ),
new TextDefinition( 1011544, "Buy Potion Bottle Vendor" )
),
new VendorDefinition( typeof( FactionBoardVendor ), 0x1BD7,
3000,
500,
10,
new TextDefinition( 1011552, "WOOD VENDOR" ),
new TextDefinition( 1011545, "Buy Wooden Board Vendor" )
),
new VendorDefinition( typeof( FactionOreVendor ), 0x19B8,
3000,
500,
10,
new TextDefinition( 1011553, "IRON ORE VENDOR" ),
new TextDefinition( 1011546, "Buy Iron Ore Vendor" )
),
new VendorDefinition( typeof( FactionReagentVendor ), 0xF86,
5000,
1000,
10,
new TextDefinition( 1011554, "REAGENT VENDOR" ),
new TextDefinition( 1011547, "Buy Reagent Vendor" )
),
new VendorDefinition( typeof( FactionHorseVendor ), 0x20DD,
5000,
1000,
1,
new TextDefinition( 1011556, "HORSE BREEDER" ),
new TextDefinition( 1011555, "Buy Horse Breeder" )
)
};
}
}