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

Fixes implicit array initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 13:14:20 -07:00
parent 7d3a0ca265
commit fee83ce560
189 changed files with 440 additions and 808 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs
View file

@ -10,8 +10,7 @@ namespace Server.Engines.BulkOrders
private const int LabelColor = 0x7FFF;
private static int[,] m_MaterialFilters = new[,]
{
private static int[,] m_MaterialFilters = {
{ 1044067, 1 }, // Blacksmithy
{ 1062226, 3 }, // Iron
{ 1018332, 4 }, // Dull Copper
@ -34,43 +33,39 @@ namespace Server.Engines.BulkOrders
{ 1062238, 16 } // Barbed
};
private static int[,] m_TypeFilters = new[,]
{
private static int[,] m_TypeFilters = {
{ 1062229, 0 }, // All
{ 1062224, 1 }, // Small
{ 1062225, 2 } // Large
};
private static int[,] m_QualityFilters = new[,]
{
private static int[,] m_QualityFilters = {
{ 1062229, 0 }, // All
{ 1011542, 1 }, // Normal
{ 1060636, 2 } // Exceptional
};
private static int[,] m_AmountFilters = new[,]
{
private static int[,] m_AmountFilters = {
{ 1062229, 0 }, // All
{ 1049706, 1 }, // 10
{ 1016007, 2 }, // 15
{ 1062239, 3 } // 20
};
private static int[][,] m_Filters = new[]
{
private static int[][,] m_Filters = {
m_TypeFilters,
m_QualityFilters,
m_MaterialFilters,
m_AmountFilters
};
private static int[] m_XOffsets_Type = new[]{ 0, 75, 170 };
private static int[] m_XOffsets_Quality = new[]{ 0, 75, 170 };
private static int[] m_XOffsets_Amount = new[]{ 0, 75, 180, 275 };
private static int[] m_XOffsets_Material = new[]{ 0, 105, 210, 305, 390, 485 };
private static int[] m_XOffsets_Type = { 0, 75, 170 };
private static int[] m_XOffsets_Quality = { 0, 75, 170 };
private static int[] m_XOffsets_Amount = { 0, 75, 180, 275 };
private static int[] m_XOffsets_Material = { 0, 105, 210, 305, 390, 485 };
private static int[] m_XWidths_Small = new[]{ 50, 50, 70, 50 };
private static int[] m_XWidths_Large = new[]{ 80, 50, 50, 50, 50, 50 };
private static int[] m_XWidths_Small = { 50, 50, 70, 50 };
private static int[] m_XWidths_Large = { 80, 50, 50, 50, 50, 50 };
private void AddFilterList( int x, int y, int[] xOffsets, int yOffset, int[,] filters, int[] xWidths, int filterValue, int filterIndex )
{

3
Scripts/Engines/BulkOrders/LargeSmithBOD.cs
View file

@ -6,8 +6,7 @@ namespace Server.Engines.BulkOrders
[TypeAlias( "Scripts.Engines.BulkOrders.LargeSmithBOD" )]
public class LargeSmithBOD : LargeBOD
{
public static double[] m_BlacksmithMaterialChances = new[]
{
public static double[] m_BlacksmithMaterialChances = {
0.501953125, // None
0.250000000, // Dull Copper
0.125000000, // Shadow Iron

3
Scripts/Engines/BulkOrders/LargeTailorBOD.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.BulkOrders
{
public class LargeTailorBOD : LargeBOD
{
public static double[] m_TailoringMaterialChances = new[]
{
public static double[] m_TailoringMaterialChances = {
0.857421875, // None
0.125000000, // Spined
0.015625000, // Horned

18
Scripts/Engines/BulkOrders/Rewards.cs
View file

@ -261,8 +261,7 @@ namespace Server.Engines.BulkOrders
public static readonly SmithRewardCalculator Instance = new SmithRewardCalculator();
private RewardType[] m_Types = new[]
{
private RewardType[] m_Types = {
// Armors
new RewardType( 200, typeof( RingmailGloves ), typeof( RingmailChest ), typeof( RingmailArms ), typeof( RingmailLegs ) ),
new RewardType( 300, typeof( ChainCoif ), typeof( ChainLegs ), typeof( ChainChest ) ),
@ -299,8 +298,7 @@ namespace Server.Engines.BulkOrders
return points;
}
private static int[][][] m_GoldTable = new[]
{
private static int[][][] m_GoldTable = {
new[] // 1-part (regular)
{
new[]{ 150, 250, 250, 400, 400, 750, 750, 1200, 1200 },
@ -471,8 +469,7 @@ namespace Server.Engines.BulkOrders
private static readonly ConstructCallback BearRug = new ConstructCallback( CreateBearRug );
private static readonly ConstructCallback ClothingBlessDeed = new ConstructCallback( CreateCBD );
private static int[][] m_ClothHues = new[]
{
private static int[][] m_ClothHues = {
new[]{ 0x483, 0x48C, 0x488, 0x48A },
new[]{ 0x495, 0x48B, 0x486, 0x485 },
new[]{ 0x48D, 0x490, 0x48E, 0x491 },
@ -492,8 +489,7 @@ namespace Server.Engines.BulkOrders
throw new InvalidOperationException();
}
private static int[] m_SandalHues = new[]
{
private static int[] m_SandalHues = {
0x489, 0x47F, 0x482,
0x47E, 0x48F, 0x494,
0x484, 0x497
@ -595,8 +591,7 @@ namespace Server.Engines.BulkOrders
return points;
}
private static int[][][] m_AosGoldTable = new[]
{
private static int[][][] m_AosGoldTable = {
new[] // 1-part (regular)
{
new[]{ 150, 150, 300, 300 },
@ -647,8 +642,7 @@ namespace Server.Engines.BulkOrders
}
};
private static int[][][] m_OldGoldTable = new[]
{
private static int[][][] m_OldGoldTable = {
new[] // 1-part (regular)
{
new[]{ 150, 150, 300, 300 },

3
Scripts/Engines/BulkOrders/SmallSmithBOD.cs
View file

@ -8,8 +8,7 @@ namespace Server.Engines.BulkOrders
[TypeAlias( "Scripts.Engines.BulkOrders.SmallSmithBOD" )]
public class SmallSmithBOD : SmallBOD
{
public static double[] m_BlacksmithMaterialChances = new[]
{
public static double[] m_BlacksmithMaterialChances = {
0.501953125, // None
0.250000000, // Dull Copper
0.125000000, // Shadow Iron

3
Scripts/Engines/BulkOrders/SmallTailorBOD.cs
View file

@ -6,8 +6,7 @@ namespace Server.Engines.BulkOrders
{
public class SmallTailorBOD : SmallBOD
{
public static double[] m_TailoringMaterialChances = new[]
{
public static double[] m_TailoringMaterialChances = {
0.857421875, // None
0.125000000, // Spined
0.015625000, // Horned