Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,84 +1,89 @@
|
|||
namespace Server.Factions
|
||||
{
|
||||
public class FactionDefinition
|
||||
{
|
||||
public int Sort { get; }
|
||||
public class FactionDefinition
|
||||
{
|
||||
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)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
public int HuePrimary { get; }
|
||||
public int Sort{ get; }
|
||||
|
||||
public int HueSecondary { get; }
|
||||
public int HuePrimary{ get; }
|
||||
|
||||
public int HueJoin { get; }
|
||||
public int HueSecondary{ get; }
|
||||
|
||||
public int HueBroadcast { get; }
|
||||
public int HueJoin{ get; }
|
||||
|
||||
public int WarHorseBody { get; }
|
||||
public int HueBroadcast{ get; }
|
||||
|
||||
public int WarHorseItem { get; }
|
||||
public int WarHorseBody{ get; }
|
||||
|
||||
public string FriendlyName { get; }
|
||||
public int WarHorseItem{ get; }
|
||||
|
||||
public string Keyword { get; }
|
||||
public string FriendlyName{ get; }
|
||||
|
||||
public string Abbreviation { get; }
|
||||
public string Keyword{ get; }
|
||||
|
||||
public TextDefinition Name { get; }
|
||||
public string Abbreviation{ get; }
|
||||
|
||||
public TextDefinition PropName { get; }
|
||||
public TextDefinition Name{ get; }
|
||||
|
||||
public TextDefinition Header { get; }
|
||||
public TextDefinition PropName{ get; }
|
||||
|
||||
public TextDefinition About { get; }
|
||||
public TextDefinition Header{ get; }
|
||||
|
||||
public TextDefinition CityControl { get; }
|
||||
public TextDefinition About{ get; }
|
||||
|
||||
public TextDefinition SigilControl { get; }
|
||||
public TextDefinition CityControl{ get; }
|
||||
|
||||
public TextDefinition SignupName { get; }
|
||||
public TextDefinition SigilControl{ get; }
|
||||
|
||||
public TextDefinition FactionStoneName { get; }
|
||||
public TextDefinition SignupName{ get; }
|
||||
|
||||
public TextDefinition OwnerLabel { get; }
|
||||
public TextDefinition FactionStoneName{ get; }
|
||||
|
||||
public TextDefinition GuardIgnore { get; }
|
||||
public TextDefinition OwnerLabel{ get; }
|
||||
|
||||
public TextDefinition GuardWarn { get; }
|
||||
public TextDefinition GuardIgnore{ get; }
|
||||
|
||||
public TextDefinition GuardAttack { get; }
|
||||
public TextDefinition GuardWarn{ get; }
|
||||
|
||||
public StrongholdDefinition Stronghold { get; }
|
||||
public TextDefinition GuardAttack{ get; }
|
||||
|
||||
public RankDefinition[] Ranks { get; }
|
||||
public StrongholdDefinition Stronghold{ get; }
|
||||
|
||||
public GuardDefinition[] Guards { get; }
|
||||
public RankDefinition[] Ranks{ 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 )
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
public GuardDefinition[] Guards{ get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -4,45 +4,45 @@ using Server.Mobiles;
|
|||
|
||||
namespace Server.Factions
|
||||
{
|
||||
public class FactionItemDefinition
|
||||
{
|
||||
public int SilverCost { get; }
|
||||
public class FactionItemDefinition
|
||||
{
|
||||
private static FactionItemDefinition m_MetalArmor = new FactionItemDefinition(1000, typeof(Blacksmith));
|
||||
private static FactionItemDefinition m_Weapon = new FactionItemDefinition(1000, typeof(Blacksmith));
|
||||
private static FactionItemDefinition m_RangedWeapon = new FactionItemDefinition(1000, typeof(Bowyer));
|
||||
private static FactionItemDefinition m_LeatherArmor = new FactionItemDefinition(750, typeof(Tailor));
|
||||
private static FactionItemDefinition m_Clothing = new FactionItemDefinition(200, typeof(Tailor));
|
||||
private static FactionItemDefinition m_Scroll = new FactionItemDefinition(500, typeof(Mage));
|
||||
|
||||
public Type VendorType { get; }
|
||||
public FactionItemDefinition(int silverCost, Type vendorType)
|
||||
{
|
||||
SilverCost = silverCost;
|
||||
VendorType = vendorType;
|
||||
}
|
||||
|
||||
public FactionItemDefinition( int silverCost, Type vendorType )
|
||||
{
|
||||
SilverCost = silverCost;
|
||||
VendorType = vendorType;
|
||||
}
|
||||
public int SilverCost{ get; }
|
||||
|
||||
private static FactionItemDefinition m_MetalArmor = new FactionItemDefinition( 1000, typeof( Blacksmith ) );
|
||||
private static FactionItemDefinition m_Weapon = new FactionItemDefinition( 1000, typeof( Blacksmith ) );
|
||||
private static FactionItemDefinition m_RangedWeapon = new FactionItemDefinition( 1000, typeof( Bowyer ) );
|
||||
private static FactionItemDefinition m_LeatherArmor = new FactionItemDefinition( 750, typeof( Tailor ) );
|
||||
private static FactionItemDefinition m_Clothing = new FactionItemDefinition( 200, typeof( Tailor ) );
|
||||
private static FactionItemDefinition m_Scroll = new FactionItemDefinition( 500, typeof( Mage ) );
|
||||
public Type VendorType{ get; }
|
||||
|
||||
public static FactionItemDefinition Identify( Item item )
|
||||
{
|
||||
if ( item is BaseArmor armor )
|
||||
{
|
||||
if ( CraftResources.GetType( armor.Resource ) == CraftResourceType.Leather )
|
||||
return m_LeatherArmor;
|
||||
public static FactionItemDefinition Identify(Item item)
|
||||
{
|
||||
if (item is BaseArmor armor)
|
||||
{
|
||||
if (CraftResources.GetType(armor.Resource) == CraftResourceType.Leather)
|
||||
return m_LeatherArmor;
|
||||
|
||||
return m_MetalArmor;
|
||||
}
|
||||
return m_MetalArmor;
|
||||
}
|
||||
|
||||
if ( item is BaseRanged )
|
||||
return m_RangedWeapon;
|
||||
if ( item is BaseWeapon )
|
||||
return m_Weapon;
|
||||
if ( item is BaseClothing )
|
||||
return m_Clothing;
|
||||
if ( item is SpellScroll )
|
||||
return m_Scroll;
|
||||
if (item is BaseRanged)
|
||||
return m_RangedWeapon;
|
||||
if (item is BaseWeapon)
|
||||
return m_Weapon;
|
||||
if (item is BaseClothing)
|
||||
return m_Clothing;
|
||||
if (item is SpellScroll)
|
||||
return m_Scroll;
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,33 +2,34 @@ using System;
|
|||
|
||||
namespace Server.Factions
|
||||
{
|
||||
public class GuardDefinition
|
||||
{
|
||||
public Type Type { get; }
|
||||
public class GuardDefinition
|
||||
{
|
||||
public GuardDefinition(Type type, int itemID, int price, int upkeep, int maximum, TextDefinition header,
|
||||
TextDefinition label)
|
||||
{
|
||||
Type = type;
|
||||
|
||||
public int Price { get; }
|
||||
Price = price;
|
||||
Upkeep = upkeep;
|
||||
Maximum = maximum;
|
||||
ItemID = itemID;
|
||||
|
||||
public int Upkeep { get; }
|
||||
Header = header;
|
||||
Label = label;
|
||||
}
|
||||
|
||||
public int Maximum { get; }
|
||||
public Type Type{ get; }
|
||||
|
||||
public int ItemID { get; }
|
||||
public int Price{ get; }
|
||||
|
||||
public TextDefinition Header { get; }
|
||||
public int Upkeep{ get; }
|
||||
|
||||
public TextDefinition Label { get; }
|
||||
public int Maximum{ get; }
|
||||
|
||||
public GuardDefinition( Type type, int itemID, int price, int upkeep, int maximum, TextDefinition header, TextDefinition label )
|
||||
{
|
||||
Type = type;
|
||||
public int ItemID{ get; }
|
||||
|
||||
Price = price;
|
||||
Upkeep = upkeep;
|
||||
Maximum = maximum;
|
||||
ItemID = itemID;
|
||||
public TextDefinition Header{ get; }
|
||||
|
||||
Header = header;
|
||||
Label = label;
|
||||
}
|
||||
}
|
||||
public TextDefinition Label{ get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
namespace Server.Factions
|
||||
{
|
||||
public class RankDefinition
|
||||
{
|
||||
public int Rank { get; }
|
||||
public class RankDefinition
|
||||
{
|
||||
public RankDefinition(int rank, int required, int maxWearables, TextDefinition title)
|
||||
{
|
||||
Rank = rank;
|
||||
Required = required;
|
||||
Title = title;
|
||||
MaxWearables = maxWearables;
|
||||
}
|
||||
|
||||
public int Required { get; }
|
||||
public int Rank{ get; }
|
||||
|
||||
public int MaxWearables { get; }
|
||||
public int Required{ get; }
|
||||
|
||||
public TextDefinition Title { get; }
|
||||
public int MaxWearables{ get; }
|
||||
|
||||
public RankDefinition( int rank, int required, int maxWearables, TextDefinition title )
|
||||
{
|
||||
Rank = rank;
|
||||
Required = required;
|
||||
Title = title;
|
||||
MaxWearables = maxWearables;
|
||||
}
|
||||
}
|
||||
public TextDefinition Title{ get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
namespace Server.Factions
|
||||
{
|
||||
public class StrongholdDefinition
|
||||
{
|
||||
public Rectangle2D[] Area { get; }
|
||||
public class StrongholdDefinition
|
||||
{
|
||||
public StrongholdDefinition(Rectangle2D[] area, Point3D joinStone, Point3D factionStone, Point3D[] monoliths)
|
||||
{
|
||||
Area = area;
|
||||
JoinStone = joinStone;
|
||||
FactionStone = factionStone;
|
||||
Monoliths = monoliths;
|
||||
}
|
||||
|
||||
public Point3D JoinStone { get; }
|
||||
public Rectangle2D[] Area{ get; }
|
||||
|
||||
public Point3D FactionStone { get; }
|
||||
public Point3D JoinStone{ get; }
|
||||
|
||||
public Point3D[] Monoliths { get; }
|
||||
public Point3D FactionStone{ get; }
|
||||
|
||||
public StrongholdDefinition( Rectangle2D[] area, Point3D joinStone, Point3D factionStone, Point3D[] monoliths )
|
||||
{
|
||||
Area = area;
|
||||
JoinStone = joinStone;
|
||||
FactionStone = factionStone;
|
||||
Monoliths = monoliths;
|
||||
}
|
||||
}
|
||||
public Point3D[] Monoliths{ get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,48 +1,51 @@
|
|||
namespace Server.Factions
|
||||
{
|
||||
public class TownDefinition
|
||||
{
|
||||
public int Sort { get; }
|
||||
public class TownDefinition
|
||||
{
|
||||
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)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
public int SigilID { get; }
|
||||
public int Sort{ get; }
|
||||
|
||||
public string Region { get; }
|
||||
public int SigilID{ get; }
|
||||
|
||||
public string FriendlyName { get; }
|
||||
public string Region{ get; }
|
||||
|
||||
public TextDefinition TownName { get; }
|
||||
public string FriendlyName{ get; }
|
||||
|
||||
public TextDefinition TownStoneHeader { get; }
|
||||
public TextDefinition TownName{ get; }
|
||||
|
||||
public TextDefinition StrongholdMonolithName { get; }
|
||||
public TextDefinition TownStoneHeader{ get; }
|
||||
|
||||
public TextDefinition TownMonolithName { get; }
|
||||
public TextDefinition StrongholdMonolithName{ get; }
|
||||
|
||||
public TextDefinition TownStoneName { get; }
|
||||
public TextDefinition TownMonolithName{ get; }
|
||||
|
||||
public TextDefinition SigilName { get; }
|
||||
public TextDefinition TownStoneName{ get; }
|
||||
|
||||
public TextDefinition CorruptedSigilName { get; }
|
||||
public TextDefinition SigilName{ get; }
|
||||
|
||||
public Point3D Monolith { get; }
|
||||
public TextDefinition CorruptedSigilName{ get; }
|
||||
|
||||
public Point3D TownStone { get; }
|
||||
public Point3D Monolith{ 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 )
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
public Point3D TownStone{ get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -2,72 +2,73 @@ using System;
|
|||
|
||||
namespace Server.Factions
|
||||
{
|
||||
public class VendorDefinition
|
||||
{
|
||||
public Type Type { get; }
|
||||
public class VendorDefinition
|
||||
{
|
||||
public VendorDefinition(Type type, int itemID, int price, int upkeep, int maximum, TextDefinition header,
|
||||
TextDefinition label)
|
||||
{
|
||||
Type = type;
|
||||
|
||||
public int Price { get; }
|
||||
Price = price;
|
||||
Upkeep = upkeep;
|
||||
Maximum = maximum;
|
||||
ItemID = itemID;
|
||||
|
||||
public int Upkeep { get; }
|
||||
Header = header;
|
||||
Label = label;
|
||||
}
|
||||
|
||||
public int Maximum { get; }
|
||||
public Type Type{ get; }
|
||||
|
||||
public int ItemID { get; }
|
||||
public int Price{ get; }
|
||||
|
||||
public TextDefinition Header { get; }
|
||||
public int Upkeep{ get; }
|
||||
|
||||
public TextDefinition Label { get; }
|
||||
public int Maximum{ get; }
|
||||
|
||||
public VendorDefinition( Type type, int itemID, int price, int upkeep, int maximum, TextDefinition header, TextDefinition label )
|
||||
{
|
||||
Type = type;
|
||||
public int ItemID{ get; }
|
||||
|
||||
Price = price;
|
||||
Upkeep = upkeep;
|
||||
Maximum = maximum;
|
||||
ItemID = itemID;
|
||||
public TextDefinition Header{ get; }
|
||||
|
||||
Header = header;
|
||||
Label = label;
|
||||
}
|
||||
public TextDefinition Label{ get; }
|
||||
|
||||
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" )
|
||||
)
|
||||
};
|
||||
}
|
||||
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")
|
||||
)
|
||||
};
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue