Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,74 +1,68 @@
|
|||
using System;
|
||||
using Server.Items;
|
||||
using Server.Events.Halloween;
|
||||
using Server.Items;
|
||||
|
||||
namespace Server.Engines.Events
|
||||
{
|
||||
public class PumpkinPatchSpawner
|
||||
{
|
||||
private static Timer m_Timer;
|
||||
public class PumpkinPatchSpawner
|
||||
{
|
||||
private static Timer m_Timer;
|
||||
|
||||
private static Rectangle2D[] m_PumpkinFields =
|
||||
{
|
||||
new Rectangle2D( 4557, 1471, 20, 10 ),
|
||||
new Rectangle2D( 796, 2152, 36, 24 ),
|
||||
new Rectangle2D( 816, 2251, 16, 8 ),
|
||||
new Rectangle2D( 816, 2261, 16, 8 ),
|
||||
new Rectangle2D( 816, 2271, 16, 8 ),
|
||||
new Rectangle2D( 816, 2281, 16, 8 ),
|
||||
new Rectangle2D( 835, 2344, 16, 16 ),
|
||||
new Rectangle2D( 816, 2344, 16, 24 )
|
||||
};
|
||||
private static Rectangle2D[] m_PumpkinFields =
|
||||
{
|
||||
new Rectangle2D(4557, 1471, 20, 10),
|
||||
new Rectangle2D(796, 2152, 36, 24),
|
||||
new Rectangle2D(816, 2251, 16, 8),
|
||||
new Rectangle2D(816, 2261, 16, 8),
|
||||
new Rectangle2D(816, 2271, 16, 8),
|
||||
new Rectangle2D(816, 2281, 16, 8),
|
||||
new Rectangle2D(835, 2344, 16, 16),
|
||||
new Rectangle2D(816, 2344, 16, 24)
|
||||
};
|
||||
|
||||
public static void Initialize()
|
||||
{
|
||||
DateTime now = DateTime.UtcNow;
|
||||
public static void Initialize()
|
||||
{
|
||||
DateTime now = DateTime.UtcNow;
|
||||
|
||||
if ( DateTime.UtcNow >= HolidaySettings.StartHalloween && DateTime.UtcNow <= HolidaySettings.FinishHalloween )
|
||||
{
|
||||
m_Timer = Timer.DelayCall( TimeSpan.Zero, TimeSpan.FromMinutes( .50 ), 0, PumpkinPatchSpawnerCallback);
|
||||
}
|
||||
}
|
||||
if (DateTime.UtcNow >= HolidaySettings.StartHalloween && DateTime.UtcNow <= HolidaySettings.FinishHalloween)
|
||||
m_Timer = Timer.DelayCall(TimeSpan.Zero, TimeSpan.FromMinutes(.50), 0, PumpkinPatchSpawnerCallback);
|
||||
}
|
||||
|
||||
protected static void PumpkinPatchSpawnerCallback()
|
||||
{
|
||||
AddPumpkin( Map.Felucca );
|
||||
AddPumpkin( Map.Trammel );
|
||||
}
|
||||
protected static void PumpkinPatchSpawnerCallback()
|
||||
{
|
||||
AddPumpkin(Map.Felucca);
|
||||
AddPumpkin(Map.Trammel);
|
||||
}
|
||||
|
||||
private static void AddPumpkin( Map map )
|
||||
{
|
||||
for( int i = 0; i < m_PumpkinFields.Length; i++ )
|
||||
{
|
||||
Rectangle2D rect = m_PumpkinFields[ i ];
|
||||
private static void AddPumpkin(Map map)
|
||||
{
|
||||
for (int i = 0; i < m_PumpkinFields.Length; i++)
|
||||
{
|
||||
Rectangle2D rect = m_PumpkinFields[i];
|
||||
|
||||
int spawncount = ( ( rect.Height * rect.Width ) / 20 );
|
||||
int pumpkins = 0;
|
||||
int spawncount = rect.Height * rect.Width / 20;
|
||||
int pumpkins = 0;
|
||||
|
||||
foreach( Item item in map.GetItemsInBounds( rect ) )
|
||||
{
|
||||
if ( item is HalloweenPumpkin )
|
||||
{
|
||||
pumpkins++;
|
||||
}
|
||||
}
|
||||
foreach (Item item in map.GetItemsInBounds(rect))
|
||||
if (item is HalloweenPumpkin)
|
||||
pumpkins++;
|
||||
|
||||
if ( spawncount > pumpkins )
|
||||
{
|
||||
Item item = new HalloweenPumpkin();
|
||||
if (spawncount > pumpkins)
|
||||
{
|
||||
Item item = new HalloweenPumpkin();
|
||||
|
||||
item.MoveToWorld( RandomPointIn( rect, map ), map );
|
||||
}
|
||||
}
|
||||
}
|
||||
item.MoveToWorld(RandomPointIn(rect, map), map);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Point3D RandomPointIn( Rectangle2D rect, Map map )
|
||||
{
|
||||
int x = Utility.Random( rect.X, rect.Width );
|
||||
int y = Utility.Random( rect.Y, rect.Height );
|
||||
int z = map.GetAverageZ( x, y );
|
||||
private static Point3D RandomPointIn(Rectangle2D rect, Map map)
|
||||
{
|
||||
int x = Utility.Random(rect.X, rect.Width);
|
||||
int y = Utility.Random(rect.Y, rect.Height);
|
||||
int z = map.GetAverageZ(x, y);
|
||||
|
||||
return new Point3D( x, y, z );
|
||||
}
|
||||
}
|
||||
}
|
||||
return new Point3D(x, y, z);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,38 +1,38 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
|
||||
public class CreepyCake : Food
|
||||
{
|
||||
public override string DefaultName => "Creepy Cake";
|
||||
public class CreepyCake : Food
|
||||
{
|
||||
[Constructible]
|
||||
public CreepyCake()
|
||||
: base(0x9e9)
|
||||
{
|
||||
Hue = 0x3E4;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public CreepyCake()
|
||||
: base( 0x9e9 )
|
||||
{
|
||||
Hue = 0x3E4;
|
||||
}
|
||||
public CreepyCake(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public CreepyCake( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override string DefaultName => "Creepy Cake";
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( ( int )0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,39 +1,39 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
|
||||
public class HarvestWine : BeverageBottle
|
||||
{
|
||||
public override string DefaultName => "Harvest Wine";
|
||||
public override double DefaultWeight => 1;
|
||||
public class HarvestWine : BeverageBottle
|
||||
{
|
||||
[Constructible]
|
||||
public HarvestWine()
|
||||
: base(BeverageType.Wine)
|
||||
{
|
||||
Hue = 0xe0;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public HarvestWine()
|
||||
: base( BeverageType.Wine )
|
||||
{
|
||||
Hue = 0xe0;
|
||||
}
|
||||
public HarvestWine(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public HarvestWine( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override string DefaultName => "Harvest Wine";
|
||||
public override double DefaultWeight => 1;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( ( int )0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,35 +1,35 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
public class MrPlainsCookies : Food
|
||||
{
|
||||
public override string DefaultName => "Mr Plain's Cookies";
|
||||
public class MrPlainsCookies : Food
|
||||
{
|
||||
[Constructible]
|
||||
public MrPlainsCookies()
|
||||
: base(0x160C)
|
||||
{
|
||||
Weight = 1.0;
|
||||
FillFactor = 4;
|
||||
Hue = 0xF4;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MrPlainsCookies( )
|
||||
: base( 0x160C )
|
||||
{
|
||||
Weight = 1.0;
|
||||
FillFactor = 4;
|
||||
Hue = 0xF4;
|
||||
}
|
||||
public MrPlainsCookies(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public MrPlainsCookies( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override string DefaultName => "Mr Plain's Cookies";
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( ( int )0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,42 +1,42 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
|
||||
public class MurkyMilk : Pitcher
|
||||
{
|
||||
public override string DefaultName => "Murky Milk";
|
||||
public override int MaxQuantity => 5;
|
||||
public override double DefaultWeight => 1;
|
||||
public class MurkyMilk : Pitcher
|
||||
{
|
||||
[Constructible]
|
||||
public MurkyMilk()
|
||||
: base(BeverageType.Milk)
|
||||
{
|
||||
Hue = 0x3e5;
|
||||
Quantity = MaxQuantity;
|
||||
ItemID = Utility.RandomBool() ? 0x09F0 : 0x09AD;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MurkyMilk( )
|
||||
: base( BeverageType.Milk )
|
||||
{
|
||||
Hue = 0x3e5;
|
||||
Quantity = MaxQuantity;
|
||||
ItemID = ( Utility.RandomBool() ) ? 0x09F0 : 0x09AD;
|
||||
}
|
||||
public MurkyMilk(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public MurkyMilk( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override string DefaultName => "Murky Milk";
|
||||
public override int MaxQuantity => 5;
|
||||
public override double DefaultWeight => 1;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( ( int )0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,37 +1,37 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
|
||||
public class PumpkinPizza : CheesePizza
|
||||
{
|
||||
public override string DefaultName => "Pumpkin Pizza";
|
||||
public class PumpkinPizza : CheesePizza
|
||||
{
|
||||
[Constructible]
|
||||
public PumpkinPizza()
|
||||
{
|
||||
Hue = 0xF3;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PumpkinPizza( )
|
||||
{
|
||||
Hue = 0xF3;
|
||||
}
|
||||
public PumpkinPizza(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public PumpkinPizza( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override string DefaultName => "Pumpkin Pizza";
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( ( int )0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,37 +1,37 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
|
||||
public class GrimWarning : Item
|
||||
{
|
||||
public override double DefaultWeight => 1;
|
||||
public class GrimWarning : Item
|
||||
{
|
||||
[Constructible]
|
||||
public GrimWarning()
|
||||
: base(0x42BD)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public GrimWarning ()
|
||||
: base( 0x42BD )
|
||||
{
|
||||
}
|
||||
public GrimWarning(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public GrimWarning( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override double DefaultWeight => 1;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( ( int )0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,37 +1,37 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
/*
|
||||
first seen halloween 2009. subsequently in 2010,
|
||||
2011 and 2012. GM Beggar-only Semi-Rare Treats
|
||||
*/
|
||||
|
||||
public class SkullsOnPike : Item
|
||||
{
|
||||
public override double DefaultWeight => 1;
|
||||
public class SkullsOnPike : Item
|
||||
{
|
||||
[Constructible]
|
||||
public SkullsOnPike()
|
||||
: base(0x42B5)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SkullsOnPike()
|
||||
: base( 0x42B5 )
|
||||
{
|
||||
}
|
||||
public SkullsOnPike(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public SkullsOnPike( Serial serial )
|
||||
: base( serial )
|
||||
{
|
||||
}
|
||||
public override double DefaultWeight => 1;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( ( int )0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue