Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -3,38 +3,40 @@ using Server.Items;
namespace Server.Events.Halloween
{
class HolidaySettings
{
public static DateTime StartHalloween // YY MM DD
=> new DateTime( 2012, 10, 24 );
internal class HolidaySettings
{
private static Type[] m_GMBeggarTreats =
{
typeof(CreepyCake),
typeof(PumpkinPizza),
typeof(GrimWarning),
typeof(HarvestWine),
typeof(MurkyMilk),
typeof(MrPlainsCookies),
typeof(SkullsOnPike),
typeof(ChairInAGhostCostume),
typeof(ExcellentIronMaiden),
typeof(HalloweenGuillotine),
typeof(ColoredSmallWebs)
};
public static DateTime FinishHalloween => new DateTime( 2012, 11, 15 );
private static Type[] m_Treats =
{
typeof(Lollipops),
typeof(WrappedCandy),
typeof(JellyBeans),
typeof(Taffy),
typeof(NougatSwirl)
};
public static Item RandomGMBeggerItem => ( Item )Activator.CreateInstance( m_GMBeggarTreats[ Utility.Random( m_GMBeggarTreats.Length ) ] );
public static Item RandomTreat => (Item)Activator.CreateInstance ( m_Treats[ Utility.Random( m_Treats.Length ) ]);
public static DateTime StartHalloween // YY MM DD
=> new DateTime(2012, 10, 24);
private static Type[] m_GMBeggarTreats =
{
typeof( CreepyCake ),
typeof( PumpkinPizza ),
typeof( GrimWarning ),
typeof( HarvestWine ),
typeof( MurkyMilk ),
typeof( MrPlainsCookies ),
typeof( SkullsOnPike ),
typeof( ChairInAGhostCostume ),
typeof( ExcellentIronMaiden ),
typeof( HalloweenGuillotine ),
typeof( ColoredSmallWebs )
};
public static DateTime FinishHalloween => new DateTime(2012, 11, 15);
private static Type[] m_Treats =
{
typeof( Lollipops ),
typeof( WrappedCandy ),
typeof( JellyBeans ),
typeof( Taffy ),
typeof( NougatSwirl )
};
}
}
public static Item RandomGMBeggerItem =>
(Item)Activator.CreateInstance(m_GMBeggarTreats[Utility.Random(m_GMBeggarTreats.Length)]);
public static Item RandomTreat => (Item)Activator.CreateInstance(m_Treats[Utility.Random(m_Treats.Length)]);
}
}