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

3
Scripts/Engines/CannedEvil/ChampionSpawnType.cs
View file

@ -38,8 +38,7 @@ namespace Server.Engines.CannedEvil
public static ChampionSpawnInfo[] Table => m_Table;
private static readonly ChampionSpawnInfo[] m_Table = new[]
{
private static readonly ChampionSpawnInfo[] m_Table = {
new ChampionSpawnInfo( "Abyss", typeof( Semidar ), new[]{ "Foe", "Assassin", "Conqueror" }, new[] // Abyss
{ // Abyss
new[]{ typeof( GreaterMongbat ), typeof( Imp ) }, // Level 1

9
Scripts/Engines/ConPVP/Arena.cs
View file

@ -400,8 +400,7 @@ namespace Server.Engines.ConPVP
}
#region Offsets & Rotation
private static Point2D[] m_EdgeOffsets = new[]
{
private static Point2D[] m_EdgeOffsets = {
/*
* /\
* /\/\
@ -423,8 +422,7 @@ namespace Server.Engines.ConPVP
};
// nw corner
private static Point2D[] m_CornerOffsets = new[]
{
private static Point2D[] m_CornerOffsets = {
/*
* /\
* /\/\
@ -444,8 +442,7 @@ namespace Server.Engines.ConPVP
new Point2D( 3, 0 )
};
private static int[][,] m_Rotate = new[]
{
private static int[][,] m_Rotate = {
new[,]{ { +1, 0 }, { 0, +1 } }, // west
new[,]{ { -1, 0 }, { 0, -1 } }, // east
new[,]{ { 0, +1 }, { +1, 0 } }, // north

16
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -744,7 +744,7 @@ namespace Server.Engines.ConPVP
StopSDTimers();
Type[] types = new[]{ typeof( BeginGump ), typeof( DuelContextGump ), typeof( ParticipantGump ), typeof( PickRulesetGump ), typeof( ReadyGump ), typeof( ReadyUpGump ), typeof( RulesetGump ) };
Type[] types = { typeof( BeginGump ), typeof( DuelContextGump ), typeof( ParticipantGump ), typeof( PickRulesetGump ), typeof( ReadyGump ), typeof( ReadyUpGump ), typeof( RulesetGump ) };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -1531,8 +1531,8 @@ namespace Server.Engines.ConPVP
public void CloseAllGumps()
{
Type[] types = new[]{ typeof( DuelContextGump ), typeof( ParticipantGump ), typeof( RulesetGump ) };
int[] defs = new[]{ -1, -1, -1 };
Type[] types = { typeof( DuelContextGump ), typeof( ParticipantGump ), typeof( RulesetGump ) };
int[] defs = { -1, -1, -1 };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -1559,8 +1559,8 @@ namespace Server.Engines.ConPVP
if ( m_StartedReadyCountdown )
return; // sanity
Type[] types = new[]{ typeof( DuelContextGump ), typeof( ReadyUpGump ), typeof( ReadyGump ) };
int[] defs = new[]{ -1, -1, -1 };
Type[] types = { typeof( DuelContextGump ), typeof( ReadyUpGump ), typeof( ReadyGump ) };
int[] defs = { -1, -1, -1 };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -1965,7 +1965,7 @@ namespace Server.Engines.ConPVP
BeginAutoTie();
}
Type[] types = new[]{ typeof( ReadyGump ), typeof( ReadyUpGump ), typeof( BeginGump ) };
Type[] types = { typeof( ReadyGump ), typeof( ReadyUpGump ), typeof( BeginGump ) };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -2287,7 +2287,7 @@ namespace Server.Engines.ConPVP
m_ReadyWait = true;
m_ReadyCount = -1;
Type[] types = new[]{ typeof( ReadyUpGump ) };
Type[] types = { typeof( ReadyUpGump ) };
for ( int i = 0; i < m_Participants.Count; ++i )
{
@ -2523,7 +2523,7 @@ namespace Server.Engines.ConPVP
bool isAllReady = true;
Type[] types = new[]{ typeof( ReadyGump ) };
Type[] types = { typeof( ReadyGump ) };
for ( int i = 0; i < m_Participants.Count; ++i )
{

12
Scripts/Engines/ConPVP/Ladder.cs
View file

@ -72,8 +72,7 @@ namespace Server.Engines.ConPVP
public class Ladder
{
private static int[] m_ShortLevels = new[]
{
private static int[] m_ShortLevels = {
1,
2,
3, 3,
@ -97,8 +96,7 @@ namespace Server.Engines.ConPVP
return m_ShortLevels[xp / 100];
}
private static int[] m_BaseXP = new[]
{
private static int[] m_BaseXP = {
0, 100, 200, 400, 600, 900, 1200, 1600, 2000, 2500
};
@ -116,8 +114,7 @@ namespace Server.Engines.ConPVP
}
}
private static int[] m_LossFactors = new[]
{
private static int[] m_LossFactors = {
10,
11, 11,
25, 25,
@ -133,8 +130,7 @@ namespace Server.Engines.ConPVP
return m_LossFactors[level - 1];
}
private static int[,] m_OffsetScalar = new[,]
{
private static int[,] m_OffsetScalar = {
/* { win, los } */
/* -6 */ { 175, 25 },
/* -5 */ { 165, 35 },

24
Scripts/Engines/Craft/Core/CraftItem.cs
View file

@ -284,8 +284,7 @@ namespace Server.Engines.Craft
}
#region Tables
private static int[] m_HeatSources = new[]
{
private static int[] m_HeatSources = {
0x461, 0x48E, // Sandstone oven/fireplace
0x92B, 0x96C, // Stone oven/fireplace
0xDE3, 0xDE9, // Campfire
@ -300,21 +299,18 @@ namespace Server.Engines.Craft
0x2DD8, 0x2DD8 // Elven Forge
};
private static int[] m_Ovens = new[]
{
private static int[] m_Ovens = {
0x461, 0x46F, // Sandstone oven
0x92B, 0x93F, // Stone oven
0x2DDB, 0x2DDC //Elven stove
};
private static int[] m_Mills = new[]
{
private static int[] m_Mills = {
0x1920, 0x1921, 0x1922, 0x1923, 0x1924, 0x1295, 0x1926, 0x1928,
0x192C, 0x192D, 0x192E, 0x129F, 0x1930, 0x1931, 0x1932, 0x1934
};
private static Type[][] m_TypesTable = new[]
{
private static Type[][] m_TypesTable = {
new[]{ typeof( Log ), typeof( Board ) },
new[]{ typeof( HeartwoodLog ), typeof( HeartwoodBoard ) },
new[]{ typeof( BloodwoodLog ), typeof( BloodwoodBoard ) },
@ -333,22 +329,19 @@ namespace Server.Engines.Craft
new[]{ typeof( WoodenBowlOfPeas ), typeof( PewterBowlOfPeas ) }
};
private static Type[] m_ColoredItemTable = new[]
{
private static Type[] m_ColoredItemTable = {
typeof( BaseWeapon ), typeof( BaseArmor ), typeof( BaseClothing ),
typeof( BaseJewel ), typeof( DragonBardingDeed )
};
private static Type[] m_ColoredResourceTable = new[]
{
private static Type[] m_ColoredResourceTable = {
typeof( BaseIngot ), typeof( BaseOre ),
typeof( BaseLeather ), typeof( BaseHides ),
typeof( UncutCloth ), typeof( Cloth ),
typeof( BaseGranite ), typeof( BaseScales )
};
private static Type[] m_MarkableTable = new[]
{
private static Type[] m_MarkableTable = {
typeof( BaseArmor ),
typeof( BaseWeapon ),
typeof( BaseClothing ),
@ -361,8 +354,7 @@ namespace Server.Engines.Craft
typeof( BaseQuiver )
};
private static Type[] m_NeverColorTable = new[]
{
private static Type[] m_NeverColorTable = {
typeof( OrcHelm )
};
#endregion

3
Scripts/Engines/Craft/DefInscription.cs
View file

@ -120,8 +120,7 @@ namespace Server.Engines.Craft
SpidersSilk
}
private Type[] m_RegTypes = new[]
{
private Type[] m_RegTypes = {
typeof( BlackPearl ),
typeof( Bloodmoss ),
typeof( Garlic ),

3
Scripts/Engines/Craft/DefTailoring.cs
View file

@ -43,8 +43,7 @@ namespace Server.Engines.Craft
return 0;
}
private static Type[] m_TailorColorables = new[]
{
private static Type[] m_TailorColorables = {
typeof( GozaMatEastDeed ), typeof( GozaMatSouthDeed ),
typeof( SquareGozaMatEastDeed ), typeof( SquareGozaMatSouthDeed ),
typeof( BrocadeGozaMatEastDeed ), typeof( BrocadeGozaMatSouthDeed ),

3
Scripts/Engines/Craft/DefTinkering.cs
View file

@ -48,8 +48,7 @@ namespace Server.Engines.Craft
return 0;
}
private static Type[] m_TinkerColorables = new[]
{
private static Type[] m_TinkerColorables = {
typeof( ForkLeft ), typeof( ForkRight ),
typeof( SpoonLeft ), typeof( SpoonRight ),
typeof( KnifeLeft ), typeof( KnifeRight ),

3
Scripts/Engines/Ethics/Core/Ethic.cs
View file

@ -236,8 +236,7 @@ namespace Server.Ethics
public static readonly Ethic Hero = new Hero.HeroEthic();
public static readonly Ethic Evil = new Evil.EvilEthic();
public static readonly Ethic[] Ethics = new[]
{
public static readonly Ethic[] Ethics = {
Hero,
Evil
};

3
Scripts/Engines/Factions/Core/MerchantTitles.cs
View file

@ -36,8 +36,7 @@ namespace Server.Factions
public class MerchantTitles
{
private static MerchantTitleInfo[] m_Info = new[]
{
private static MerchantTitleInfo[] m_Info = {
new MerchantTitleInfo( SkillName.Inscribe, 90.0, new TextDefinition( 1060773, "Scribe" ), new TextDefinition( 1011468, "SCRIBE" ), new TextDefinition( 1010121, "You now have the faction title of scribe" ) ),
new MerchantTitleInfo( SkillName.Carpentry, 90.0, new TextDefinition( 1060774, "Carpenter" ), new TextDefinition( 1011469, "CARPENTER" ), new TextDefinition( 1010122, "You now have the faction title of carpenter" ) ),
new MerchantTitleInfo( SkillName.Tinkering, 90.0, new TextDefinition( 1022984, "Tinker" ), new TextDefinition( 1011470, "TINKER" ), new TextDefinition( 1010123, "You now have the faction title of tinker" ) ),

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

@ -38,8 +38,7 @@ namespace Server.Factions
m_Label = label;
}
private static VendorDefinition[] m_Definitions = new[]
{
private static VendorDefinition[] m_Definitions = {
new VendorDefinition( typeof( FactionBottleVendor ), 0xF0E,
5000,
1000,

3
Scripts/Engines/Factions/Gumps/FinanceGump.cs
View file

@ -13,8 +13,7 @@ namespace Server.Factions
private Faction m_Faction;
private Town m_Town;
private static int[] m_PriceOffsets = new[]
{
private static int[] m_PriceOffsets = {
-30, -25, -20, -15, -10, -5,
+50, +100, +150, +200, +250, +300
};

6
Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
View file

@ -268,8 +268,7 @@ namespace Server.Factions
Utility.AssignRandomFacialHair( this, HairHue );
}
private static Type[] m_StrongPotions = new[]
{
private static Type[] m_StrongPotions = {
typeof( GreaterHealPotion ), typeof( GreaterHealPotion ), typeof( GreaterHealPotion ),
typeof( GreaterCurePotion ), typeof( GreaterCurePotion ), typeof( GreaterCurePotion ),
typeof( GreaterStrengthPotion ), typeof( GreaterStrengthPotion ),
@ -278,8 +277,7 @@ namespace Server.Factions
typeof( GreaterExplosionPotion )
};
private static Type[] m_WeakPotions = new[]
{
private static Type[] m_WeakPotions = {
typeof( HealPotion ), typeof( HealPotion ), typeof( HealPotion ),
typeof( CurePotion ), typeof( CurePotion ), typeof( CurePotion ),
typeof( StrengthPotion ), typeof( StrengthPotion ),

15
Scripts/Engines/Harvest/Fishing.cs
View file

@ -123,8 +123,7 @@ namespace Server.Engines.Harvest
}
}
private static MutateEntry[] m_MutateTable = new[]
{
private static MutateEntry[] m_MutateTable = {
new MutateEntry( 80.0, 80.0, 4080.0, true, typeof( SpecialFishingNet ) ),
new MutateEntry( 80.0, 80.0, 4080.0, true, typeof( BigFish ) ),
new MutateEntry( 90.0, 80.0, 4080.0, true, typeof( TreasureMap ) ),
@ -254,8 +253,7 @@ namespace Server.Engines.Harvest
{
case 0: // Body parts
{
int[] list = new[]
{
int[] list = {
0x1CDD, 0x1CE5, // arm
0x1CE0, 0x1CE8, // torso
0x1CE1, 0x1CE9, // head
@ -267,8 +265,7 @@ namespace Server.Engines.Harvest
}
case 1: // Bone parts
{
int[] list = new[]
{
int[] list = {
0x1AE0, 0x1AE1, 0x1AE2, 0x1AE3, 0x1AE4, // skulls
0x1B09, 0x1B0A, 0x1B0B, 0x1B0C, 0x1B0D, 0x1B0E, 0x1B0F, 0x1B10, // bone piles
0x1B15, 0x1B16 // pelvis bones
@ -303,8 +300,7 @@ namespace Server.Engines.Harvest
}
case 6: // Misc
{
int[] list = new[]
{
int[] list = {
0x1EB5, // unfinished barrel
0xA2A, // stool
0xC1F, // broken clock
@ -550,8 +546,7 @@ namespace Server.Engines.Harvest
return true;
}
private static int[] m_WaterTiles = new[]
{
private static int[] m_WaterTiles = {
0x00A8, 0x00AB,
0x0136, 0x0137,
0x5797, 0x579C,

3
Scripts/Engines/Harvest/Lumberjacking.cs
View file

@ -182,8 +182,7 @@ namespace Server.Engines.Harvest
}
#region Tile lists
private static int[] m_TreeTiles = new[]
{
private static int[] m_TreeTiles = {
0x4CCA, 0x4CCB, 0x4CCC, 0x4CCD, 0x4CD0, 0x4CD3, 0x4CD6, 0x4CD8,
0x4CDA, 0x4CDD, 0x4CE0, 0x4CE3, 0x4CE6, 0x4CF8, 0x4CFB, 0x4CFE,
0x4D01, 0x4D41, 0x4D42, 0x4D43, 0x4D44, 0x4D57, 0x4D58, 0x4D59,

9
Scripts/Engines/Harvest/Mining.cs
View file

@ -260,8 +260,7 @@ namespace Server.Engines.Harvest
return base.MutateVein( from, tool, def, bank, toHarvest, vein );
}
private static int[] m_Offsets = new[]
{
private static int[] m_Offsets = {
-1, -1,
-1, 0,
-1, 1,
@ -353,8 +352,7 @@ namespace Server.Engines.Harvest
}
#region Tile lists
private static int[] m_MountainAndCaveTiles = new[]
{
private static int[] m_MountainAndCaveTiles = {
220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
230, 231, 236, 237, 238, 239, 240, 241, 242, 243,
244, 245, 246, 247, 252, 253, 254, 255, 256, 257,
@ -392,8 +390,7 @@ namespace Server.Engines.Harvest
0x4549, 0x454A, 0x454B, 0x454C, 0x454D, 0x454E, 0x454F
};
private static int[] m_SandTiles = new[]
{
private static int[] m_SandTiles = {
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
42, 43, 44, 45, 46, 47, 48, 49, 50, 51,

3
Scripts/Engines/Help/PageQueue.cs
View file

@ -27,8 +27,7 @@ namespace Server.Engines.Help
public class PageEntry
{
// What page types should have a speech log as attachment?
public static readonly PageType[] SpeechLogAttachment = new[]
{
public static readonly PageType[] SpeechLogAttachment = {
PageType.VerbalHarassment
};

3
Scripts/Engines/Help/PageQueueGump.cs
View file

@ -469,8 +469,7 @@ namespace Server.Engines.Help
private PageEntry m_Entry;
private Mobile m_Mobile;
private static int[] m_AccessLevelHues = new[]
{
private static int[] m_AccessLevelHues = {
2100,
2122,
2117,

6
Scripts/Engines/Help/StuckMenu.cs
View file

@ -22,8 +22,7 @@ namespace Server.Menus.Questions
public class StuckMenu : Gump
{
private static StuckMenuEntry[] m_Entries = new[]
{
private static StuckMenuEntry[] m_Entries = {
// Britain
new StuckMenuEntry( 1011028, new[]
{
@ -85,8 +84,7 @@ namespace Server.Menus.Questions
} )
};
private static StuckMenuEntry[] m_T2AEntries = new[]
{
private static StuckMenuEntry[] m_T2AEntries = {
// Papua
new StuckMenuEntry( 1011057, new[]
{

2
Scripts/Engines/MLQuests/Items/CraftmansSatchel.cs
View file

@ -6,7 +6,7 @@ namespace Server.Engines.MLQuests.Items
{
public abstract class BaseCraftmansSatchel : Backpack
{
protected static readonly Type[] m_TalismanType = new[] { typeof( RandomTalisman ) };
protected static readonly Type[] m_TalismanType = { typeof( RandomTalisman ) };
public BaseCraftmansSatchel()
{

3
Scripts/Engines/MyRunUO/LayerComparer.cs
View file

@ -8,8 +8,7 @@ namespace Server.Engines.MyRunUO
private static Layer ChainTunic = (Layer)254;
private static Layer LeatherShorts = (Layer)253;
private static Layer[] m_DesiredLayerOrder = new[]
{
private static Layer[] m_DesiredLayerOrder = {
Layer.Cloak,
Layer.Bracelet,
Layer.Ring,

3
Scripts/Engines/Plants/MiscItems/GreenThorns.cs
View file

@ -158,8 +158,7 @@ namespace Server.Items
}
}
private static TilesAndEffect[] m_Table = new[]
{
private static TilesAndEffect[] m_Table = {
new TilesAndEffect( new[]
{
0x71, 0x7C,

3
Scripts/Engines/Plants/PlantBowl.cs
View file

@ -145,8 +145,7 @@ namespace Server.Engines.Plants
return contains;
}
private static int[] m_DirtPatchTiles = new[]
{
private static int[] m_DirtPatchTiles = {
0x9, 0x15,
0x71, 0x7C,
0x82, 0xA7,

3
Scripts/Engines/Plants/PlantResources.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Plants
{
public class PlantResourceInfo
{
private static PlantResourceInfo[] m_ResourceList = new[]
{
private static PlantResourceInfo[] m_ResourceList = {
new PlantResourceInfo( PlantType.ElephantEarPlant, PlantHue.BrightRed, typeof( RedLeaves ) ),
new PlantResourceInfo( PlantType.PonytailPalm, PlantHue.BrightRed, typeof( RedLeaves ) ),
new PlantResourceInfo( PlantType.CenturyPlant, PlantHue.BrightRed, typeof( RedLeaves ) ),

3
Scripts/Engines/Plants/PlantType.cs
View file

@ -61,8 +61,7 @@ namespace Server.Engines.Plants
public class PlantTypeInfo
{
private static PlantTypeInfo[] m_Table = new[]
{
private static PlantTypeInfo[] m_Table = {
new PlantTypeInfo( 0xC83, 0, 0, PlantType.CampionFlowers, false, true, true, true, PlantCategory.Default ),
new PlantTypeInfo( 0xC86, 0, 0, PlantType.Poppies, false, true, true, true, PlantCategory.Default ),
new PlantTypeInfo( 0xC88, 0, 10, PlantType.Snowdrops, false, true, true, true, PlantCategory.Default ),

3
Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs
View file

@ -6,8 +6,7 @@ namespace Server.Engines.Quests.Ambitious
{
public class AmbitiousQueenQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( DontOfferConversation ),
typeof( AcceptConversation ),
typeof( DuringKillQueensConversation ),

3
Scripts/Engines/Quests/Collector/CollectorQuest.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Quests.Collector
{
public class CollectorQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( DontOfferConversation ),
typeof( DeclineConversation ),
typeof( AcceptConversation ),

3
Scripts/Engines/Quests/Collector/Items/ImageType.cs
View file

@ -31,8 +31,7 @@ namespace Server.Engines.Quests.Collector
public class ImageTypeInfo
{
private static readonly ImageTypeInfo[] m_Table = new[]
{
private static readonly ImageTypeInfo[] m_Table = {
new ImageTypeInfo( 9734, typeof( Betrayer ), 75, 45 ),
new ImageTypeInfo( 9735, typeof( Bogling ), 75, 45 ),
new ImageTypeInfo( 9736, typeof( BogThing ), 60, 47 ),

3
Scripts/Engines/Quests/Collector/Items/Obsidian.cs
View file

@ -7,8 +7,7 @@ namespace Server.Engines.Quests.Collector
{
public class Obsidian : Item
{
private static readonly string[] m_Names = new[]
{
private static readonly string[] m_Names = {
null,
"an aggressive cavalier",
"a beguiling rogue",

12
Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs
View file

@ -5,8 +5,7 @@ namespace Server.Items
public class EnchantedSextant : Item
{
//TODO: Trammel/Haven
private static readonly Point2D[] m_TrammelBanks = new[]
{
private static readonly Point2D[] m_TrammelBanks = {
new Point2D( 652, 820 ),
new Point2D( 1813, 2825 ),
new Point2D( 3734, 2149 ),
@ -27,8 +26,7 @@ namespace Server.Items
new Point2D( 5669, 3131 )
};
private static readonly Point2D[] m_FeluccaBanks = new[]
{
private static readonly Point2D[] m_FeluccaBanks = {
new Point2D( 652, 820 ),
new Point2D( 1813, 2825 ),
new Point2D( 3734, 2149 ),
@ -49,16 +47,14 @@ namespace Server.Items
new Point2D( 5669, 3131 )
};
private static readonly Point2D[] m_IlshenarBanks = new[]
{
private static readonly Point2D[] m_IlshenarBanks = {
new Point2D( 854, 680 ),
new Point2D( 855, 603 ),
new Point2D( 1226, 554 ),
new Point2D( 1610, 556 )
};
private static readonly Point2D[] m_MalasBanks = new[]
{
private static readonly Point2D[] m_MalasBanks = {
new Point2D( 996, 519 ),
new Point2D( 2048, 1345 )
};

3
Scripts/Engines/Quests/Core/QuestSystem.cs
View file

@ -13,8 +13,7 @@ namespace Server.Engines.Quests
public abstract class QuestSystem
{
public static readonly Type[] QuestTypes = new[]
{
public static readonly Type[] QuestTypes = {
typeof( Doom.TheSummoningQuest ),
typeof( Necro.DarkTidesQuest ),
typeof( Haven.UzeraanTurmoilQuest ),

9
Scripts/Engines/Quests/Dark Tides/Conversations.cs
View file

@ -26,8 +26,7 @@ namespace Server.Engines.Quests.Necro
{
public override object Message => 1060099;
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1026153, 6178 ), // teleporter
new QuestItemInfo( 1049117, 4036 ), // Horn of Retreat
new QuestItemInfo( 1048032, 3702 ) // a bag
@ -49,8 +48,7 @@ namespace Server.Engines.Quests.Necro
{
public override object Message => 1060103;
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1026153, 6178 ) // teleporter
};
@ -98,8 +96,7 @@ namespace Server.Engines.Quests.Necro
{
public override object Message => 1060110;
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1023643, 8787 ) // spellbook
};

3
Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Quests.Necro
{
public class DarkTidesQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( AcceptConversation ),
typeof( AnimateMaabusCorpseObjective ),
typeof( BankerConversation ),

9
Scripts/Engines/Quests/Dark Tides/Objectives.cs
View file

@ -7,8 +7,7 @@ namespace Server.Engines.Quests.Necro
{
public override object Message => 1060102;
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1023643, 8787 ) // spellbook
};
@ -116,8 +115,7 @@ namespace Server.Engines.Quests.Necro
{
public override object Message => 1060109;
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1023676, 3679 ) // glowing rune
};
@ -197,8 +195,7 @@ namespace Server.Engines.Quests.Necro
{
public override object Message => 1060115;
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1026153, 6178 ) // teleporter
};

3
Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Quests.Ninja
{
public class EminosUndertakingQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( AcceptConversation ),
typeof( FindZoelConversation ),
typeof( RadarConversation ),

3
Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs
View file

@ -6,8 +6,7 @@ namespace Server.Engines.Quests.Ninja
{
public class HiddenFigure : BaseQuester
{
public static int[] Messages = new[]
{
public static int[] Messages = {
1063191, // They won<6F>t find me here.
1063192 // Ah, a quiet hideout.
};

3
Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Quests.Samurai
{
public class HaochisTrialsQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( AcceptConversation ),
typeof( RadarConversation ),
typeof( FirstTrialIntroConversation ),

3
Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs
View file

@ -6,8 +6,7 @@ namespace Server.Engines.Quests.Matriarch
{
public class SolenMatriarchQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( DontOfferConversation ),
typeof( AcceptConversation ),
typeof( DuringKillInfiltratorsConversation ),

3
Scripts/Engines/Quests/Study of the Solen Hive/NestArea.cs
View file

@ -2,8 +2,7 @@ namespace Server.Engines.Quests.Naturalist
{
public class NestArea
{
private static readonly NestArea[] m_Areas = new[]
{
private static readonly NestArea[] m_Areas = {
new NestArea( false, new Rectangle2D( 5861, 1787, 26, 25 ) ),
new NestArea( false, new Rectangle2D( 5734, 1788, 14, 50 ),

3
Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Quests.Naturalist
{
public class StudyOfSolenQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( StudyNestsObjective ),
typeof( ReturnToNaturalistObjective ),
typeof( DontOfferConversation ),

3
Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Quests.Zento
{
public class TerribleHatchlingsQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( AcceptConversation ),
typeof( DirectionConversation ),
typeof( TakeCareConversation ),

3
Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs
View file

@ -95,8 +95,7 @@ namespace Server.Engines.Quests.Doom
Delete();
}
private static int[] m_Offsets = new[]
{
private static int[] m_Offsets = {
-1, -1,
-1, 0,
-1, 1,

3
Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs
View file

@ -6,8 +6,7 @@ namespace Server.Engines.Quests.Doom
{
public class TheSummoningQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( AcceptConversation ),
typeof( CollectBonesObjective ),
typeof( VanquishDaemonConversation ),

21
Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs
View file

@ -125,8 +125,7 @@ namespace Server.Engines.Quests.Haven
}
}
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1023676, 0xE68 ) // glowing rune
};
@ -214,8 +213,7 @@ namespace Server.Engines.Quests.Haven
}
}
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1026153, 0x1822 ), // teleporter
new QuestItemInfo( 1048032, 0xE76 ) // a bag
};
@ -291,8 +289,7 @@ namespace Server.Engines.Quests.Haven
}
}
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1023637, 0xE34 ) // scroll
};
@ -312,8 +309,7 @@ namespace Server.Engines.Quests.Haven
{
public override object Message => 1049325;
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1048030, 0x14EB ), // a Treasure Map
new QuestItemInfo( 1023969, 0xF81 ), // Fertile Dirt
new QuestItemInfo( 1049117, 0xFC4 ) // Horn of Retreat
@ -401,8 +397,7 @@ namespace Server.Engines.Quests.Haven
}
}
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1023965, 0xF7D ), // Daemon Blood
new QuestItemInfo( 1022581, 0xA22 ), // lantern
};
@ -469,13 +464,11 @@ namespace Server.Engines.Quests.Haven
}
}
private static QuestItemInfo[] m_Info = new[]
{
private static QuestItemInfo[] m_Info = {
new QuestItemInfo( 1017412, 0xF80 ), // Daemon Bone
};
private static QuestItemInfo[] m_InfoPaladin = new[]
{
private static QuestItemInfo[] m_InfoPaladin = {
new QuestItemInfo( 1017412, 0xF80 ), // Daemon Bone
new QuestItemInfo( 1060577, 0x1F14 ), // Recall Rune
};

3
Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Quests.Haven
{
public class UzeraanTurmoilQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( AcceptConversation ),
typeof( UzeraanTitheConversation ),
typeof( UzeraanFirstTaskConversation ),

3
Scripts/Engines/Quests/Witch Apprentice/Ingredient.cs
View file

@ -24,8 +24,7 @@ namespace Server.Engines.Quests.Hag
public class IngredientInfo
{
private static IngredientInfo[] m_Table = new[]
{
private static IngredientInfo[] m_Table = {
// sheep liver
new IngredientInfo( 1055020, 5, typeof( Sheep ) ),
// rabbit's foot

3
Scripts/Engines/Quests/Witch Apprentice/Objectives.cs
View file

@ -6,8 +6,7 @@ namespace Server.Engines.Quests.Hag
{
public class FindApprenticeObjective : QuestObjective
{
private static Point3D[] m_CorpseLocations = new[]
{
private static Point3D[] m_CorpseLocations = {
new Point3D( 778, 1158, 0 ),
new Point3D( 698, 1443, 0 ),
new Point3D( 785, 1548, 0 ),

6
Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs
View file

@ -5,8 +5,7 @@ namespace Server.Engines.Quests.Hag
{
public class WitchApprenticeQuest : QuestSystem
{
private static Type[] m_TypeReferenceTable = new[]
{
private static Type[] m_TypeReferenceTable = {
typeof( FindApprenticeObjective ),
typeof( FindGrizeldaAboutMurderObjective ),
typeof( KillImpsObjective ),
@ -58,8 +57,7 @@ namespace Server.Engines.Quests.Hag
AddConversation( new AcceptConversation() );
}
private static Point3D[] m_ZeefzorpulLocations = new[]
{
private static Point3D[] m_ZeefzorpulLocations = {
new Point3D( 1226, 1573, 0 ),
new Point3D( 1929, 1148, 0 ),
new Point3D( 1366, 2723, 0 ),

3
Scripts/Engines/Reports/Rendering/BarGraphRenderer.cs
View file

@ -347,8 +347,7 @@ namespace Server.Engines.Reports
float oh = item.SweepSize;
float of = 9.5f;
PointF[] pts = new[]
{
PointF[] pts = {
new PointF( ox, oy ),
new PointF( ox + ow, oy ),
new PointF( ox + of, oy + of ),

9
Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs
View file

@ -6,8 +6,7 @@ namespace Server.Items
{
public abstract class BasePigmentsOfTokuno : Item, IUsesRemaining
{
private static Type[] m_Glasses = new[]
{
private static Type[] m_Glasses = {
typeof( MaritimeGlasses ),
typeof( WizardsGlasses ),
typeof( TradeGlasses ),
@ -22,8 +21,7 @@ namespace Server.Items
typeof( AnthropomorphistGlasses )
};
private static Type[] m_Replicas = new[]
{
private static Type[] m_Replicas = {
typeof( ANecromancerShroud ),
typeof( BraveKnightOfTheBritannia ),
typeof( CaptainJohnsHat ),
@ -49,8 +47,7 @@ namespace Server.Items
typeof( Subdue )
};
private static Type[] m_DyableHeritageItems = new[]
{
private static Type[] m_DyableHeritageItems = {
typeof( ChargerOfTheFallen ),
typeof( SamuraiHelm ),
typeof( HolySword ),

3
Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs
View file

@ -393,8 +393,7 @@ namespace Server.Items
public class PigmentsOfTokuno : BasePigmentsOfTokuno
{
private static int[][] m_Table = new[]
{
private static int[][] m_Table = {
// Hue, Label
new[]{ /*PigmentType.None,*/ 0, -1 },
new[]{ /*PigmentType.ParagonGold,*/ 0x501, 1070987 },

6
Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs
View file

@ -625,8 +625,7 @@ namespace Server.Items
public class AncientUrn : Item
{
private static string[] m_Names = new[]
{
private static string[] m_Names = {
"Akira",
"Avaniaga",
"Aya",
@ -917,8 +916,7 @@ namespace Server.Items
public class LesserPigmentsOfTokuno : BasePigmentsOfTokuno
{
private static int[][] m_Table = new[]
{
private static int[][] m_Table = {
// Hue, Label
new[]{ /*PigmentType.None,*/ 0, -1 },
new[]{ /*PigmentType.PaleOrange,*/ 0x02E, 1071458 },

12
Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs
View file

@ -21,8 +21,7 @@ namespace Server.Misc
{
public const int ItemsPerReward = 10;
private static Type[] m_LesserArtifactsTotal = new[]
{
private static Type[] m_LesserArtifactsTotal = {
typeof( AncientFarmersKasa ), typeof( AncientSamuraiDo ), typeof( ArmsOfTacticalExcellence ), typeof( BlackLotusHood ),
typeof( DaimyosHelm ), typeof( DemonForks ), typeof( DragonNunchaku ), typeof( Exiler ), typeof( GlovesOfTheSun ),
typeof( HanzosBow ), typeof( LegsOfStability ), typeof( PeasantsBokuto ), typeof( PilferedDancerFans ), typeof( TheDestroyer ),
@ -47,8 +46,7 @@ namespace Server.Misc
set => _RewardEra = value;
}
private static Type[][] m_LesserArtifacts = new[]
{
private static Type[][] m_LesserArtifacts = {
// ToT One Rewards
new[] {
typeof( AncientFarmersKasa ), typeof( AncientSamuraiDo ), typeof( ArmsOfTacticalExcellence ), typeof( BlackLotusHood ),
@ -432,8 +430,7 @@ namespace Server.Gumps
}
#region ToT Normal Rewards Table
private static TypeTileButtonInfo[][] m_NormalRewards = new[]
{
private static TypeTileButtonInfo[][] m_NormalRewards = {
// ToT One Rewards
new[] {
new TypeTileButtonInfo( typeof( SwordsOfProsperity ), 0x27A9, 1070963, 1071002 ),
@ -478,8 +475,7 @@ namespace Server.Gumps
public static TypeTileButtonInfo[][] NormalRewards => m_NormalRewards;
#region ToT Pigment Rewards Table
private static PigmentsTileButtonInfo[][] m_PigmentRewards = new[]
{
private static PigmentsTileButtonInfo[][] m_PigmentRewards = {
// ToT One Pigment Rewards
new[] {
new PigmentsTileButtonInfo( PigmentType.ParagonGold ),