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

@ -4,301 +4,298 @@ using Server.Multis;
namespace Server.Items
{
public enum HolidayTreeType
{
Classic,
Modern
}
public enum HolidayTreeType
{
Classic,
Modern
}
public class HolidayTree : Item, IAddon
{
private ArrayList m_Components;
public class HolidayTree : Item, IAddon
{
private ArrayList m_Components;
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Placer { get; set; }
public HolidayTree(Mobile from, HolidayTreeType type, Point3D loc) : base(1)
{
Movable = false;
MoveToWorld(loc, from.Map);
private class Ornament : Item
{
public override int LabelNumber => 1041118; // a tree ornament
Placer = from;
m_Components = new ArrayList();
public Ornament( int itemID ) : base( itemID )
{
Movable = false;
}
switch (type)
{
case HolidayTreeType.Classic:
{
ItemID = 0xCD7;
public Ornament( Serial serial ) : base( serial )
{
}
AddItem(0, 0, 0, new TreeTrunk(this, 0xCD6));
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
AddOrnament(0, 0, 2, 0xF22);
AddOrnament(0, 0, 9, 0xF18);
AddOrnament(0, 0, 15, 0xF20);
AddOrnament(0, 0, 19, 0xF17);
AddOrnament(0, 0, 20, 0xF24);
AddOrnament(0, 0, 20, 0xF1F);
AddOrnament(0, 0, 20, 0xF19);
AddOrnament(0, 0, 21, 0xF1B);
AddOrnament(0, 0, 28, 0xF2F);
AddOrnament(0, 0, 30, 0xF23);
AddOrnament(0, 0, 32, 0xF2A);
AddOrnament(0, 0, 33, 0xF30);
AddOrnament(0, 0, 34, 0xF29);
AddOrnament(0, 1, 7, 0xF16);
AddOrnament(0, 1, 7, 0xF1E);
AddOrnament(0, 1, 12, 0xF0F);
AddOrnament(0, 1, 13, 0xF13);
AddOrnament(0, 1, 18, 0xF12);
AddOrnament(0, 1, 19, 0xF15);
AddOrnament(0, 1, 25, 0xF28);
AddOrnament(0, 1, 29, 0xF1A);
AddOrnament(0, 1, 37, 0xF2B);
AddOrnament(1, 0, 13, 0xF10);
AddOrnament(1, 0, 14, 0xF1C);
AddOrnament(1, 0, 16, 0xF14);
AddOrnament(1, 0, 17, 0xF26);
AddOrnament(1, 0, 22, 0xF27);
writer.Write( (int) 0 ); // version
}
break;
}
case HolidayTreeType.Modern:
{
ItemID = 0x1B7E;
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
AddOrnament(0, 0, 2, 0xF2F);
AddOrnament(0, 0, 2, 0xF20);
AddOrnament(0, 0, 2, 0xF22);
AddOrnament(0, 0, 5, 0xF30);
AddOrnament(0, 0, 5, 0xF15);
AddOrnament(0, 0, 5, 0xF1F);
AddOrnament(0, 0, 5, 0xF2B);
AddOrnament(0, 0, 6, 0xF0F);
AddOrnament(0, 0, 7, 0xF1E);
AddOrnament(0, 0, 7, 0xF24);
AddOrnament(0, 0, 8, 0xF29);
AddOrnament(0, 0, 9, 0xF18);
AddOrnament(0, 0, 14, 0xF1C);
AddOrnament(0, 0, 15, 0xF13);
AddOrnament(0, 0, 15, 0xF20);
AddOrnament(0, 0, 16, 0xF26);
AddOrnament(0, 0, 17, 0xF12);
AddOrnament(0, 0, 18, 0xF17);
AddOrnament(0, 0, 20, 0xF1B);
AddOrnament(0, 0, 23, 0xF28);
AddOrnament(0, 0, 25, 0xF18);
AddOrnament(0, 0, 25, 0xF2A);
AddOrnament(0, 1, 7, 0xF16);
int version = reader.ReadInt();
}
}
break;
}
}
}
private class TreeTrunk : Item
{
private HolidayTree m_Tree;
public HolidayTree(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1041117; // a tree for the holidays
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Placer{ get; set; }
public TreeTrunk( HolidayTree tree, int itemID ) : base( itemID )
{
Movable = false;
MoveToWorld( tree.Location, tree.Map );
public override int LabelNumber => 1041117; // a tree for the holidays
m_Tree = tree;
}
public bool CouldFit(IPoint3D p, Map map)
{
return map.CanFit((Point3D)p, 20);
}
public TreeTrunk( Serial serial ) : base( serial )
{
}
Item IAddon.Deed => new HolidayTreeDeed();
public override void OnDoubleClick( Mobile from )
{
if ( m_Tree != null && !m_Tree.Deleted )
m_Tree.OnDoubleClick( from );
}
public override void OnAfterDelete()
{
for (int i = 0; i < m_Components.Count; ++i)
((Item)m_Components[i]).Delete();
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
private void AddOrnament(int x, int y, int z, int itemID)
{
AddItem(x + 1, y + 1, z + 11, new Ornament(itemID));
}
writer.Write( (int) 0 ); // version
private void AddItem(int x, int y, int z, Item item)
{
item.MoveToWorld(new Point3D(Location.X + x, Location.Y + y, Location.Z + z), Map);
writer.Write( m_Tree );
}
m_Components.Add(item);
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
int version = reader.ReadInt();
writer.Write(1); // version
switch ( version )
{
case 0:
{
m_Tree = reader.ReadItem() as HolidayTree;
writer.Write(Placer);
if ( m_Tree == null )
Delete();
writer.Write(m_Components.Count);
break;
}
}
}
}
for (int i = 0; i < m_Components.Count; ++i)
writer.Write((Item)m_Components[i]);
}
public override int LabelNumber => 1041117; // a tree for the holidays
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
public HolidayTree( Mobile from, HolidayTreeType type, Point3D loc ) : base( 1 )
{
Movable = false;
MoveToWorld( loc, from.Map );
int version = reader.ReadInt();
Placer = from;
m_Components = new ArrayList();
switch (version)
{
case 1:
{
Placer = reader.ReadMobile();
switch ( type )
{
case HolidayTreeType.Classic:
{
ItemID = 0xCD7;
goto case 0;
}
case 0:
{
int count = reader.ReadInt();
AddItem( 0, 0, 0, new TreeTrunk( this, 0xCD6 ) );
m_Components = new ArrayList(count);
AddOrnament( 0, 0, 2, 0xF22 );
AddOrnament( 0, 0, 9, 0xF18 );
AddOrnament( 0, 0, 15, 0xF20 );
AddOrnament( 0, 0, 19, 0xF17 );
AddOrnament( 0, 0, 20, 0xF24 );
AddOrnament( 0, 0, 20, 0xF1F );
AddOrnament( 0, 0, 20, 0xF19 );
AddOrnament( 0, 0, 21, 0xF1B );
AddOrnament( 0, 0, 28, 0xF2F );
AddOrnament( 0, 0, 30, 0xF23 );
AddOrnament( 0, 0, 32, 0xF2A );
AddOrnament( 0, 0, 33, 0xF30 );
AddOrnament( 0, 0, 34, 0xF29 );
AddOrnament( 0, 1, 7, 0xF16 );
AddOrnament( 0, 1, 7, 0xF1E );
AddOrnament( 0, 1, 12, 0xF0F );
AddOrnament( 0, 1, 13, 0xF13 );
AddOrnament( 0, 1, 18, 0xF12 );
AddOrnament( 0, 1, 19, 0xF15 );
AddOrnament( 0, 1, 25, 0xF28 );
AddOrnament( 0, 1, 29, 0xF1A );
AddOrnament( 0, 1, 37, 0xF2B );
AddOrnament( 1, 0, 13, 0xF10 );
AddOrnament( 1, 0, 14, 0xF1C );
AddOrnament( 1, 0, 16, 0xF14 );
AddOrnament( 1, 0, 17, 0xF26 );
AddOrnament( 1, 0, 22, 0xF27 );
for (int i = 0; i < count; ++i)
{
Item item = reader.ReadItem();
break;
}
case HolidayTreeType.Modern:
{
ItemID = 0x1B7E;
if (item != null)
m_Components.Add(item);
}
AddOrnament( 0, 0, 2, 0xF2F );
AddOrnament( 0, 0, 2, 0xF20 );
AddOrnament( 0, 0, 2, 0xF22 );
AddOrnament( 0, 0, 5, 0xF30 );
AddOrnament( 0, 0, 5, 0xF15 );
AddOrnament( 0, 0, 5, 0xF1F );
AddOrnament( 0, 0, 5, 0xF2B );
AddOrnament( 0, 0, 6, 0xF0F );
AddOrnament( 0, 0, 7, 0xF1E );
AddOrnament( 0, 0, 7, 0xF24 );
AddOrnament( 0, 0, 8, 0xF29 );
AddOrnament( 0, 0, 9, 0xF18 );
AddOrnament( 0, 0, 14, 0xF1C );
AddOrnament( 0, 0, 15, 0xF13 );
AddOrnament( 0, 0, 15, 0xF20 );
AddOrnament( 0, 0, 16, 0xF26 );
AddOrnament( 0, 0, 17, 0xF12 );
AddOrnament( 0, 0, 18, 0xF17 );
AddOrnament( 0, 0, 20, 0xF1B );
AddOrnament( 0, 0, 23, 0xF28 );
AddOrnament( 0, 0, 25, 0xF18 );
AddOrnament( 0, 0, 25, 0xF2A );
AddOrnament( 0, 1, 7, 0xF16 );
break;
}
}
break;
}
}
}
Timer.DelayCall(TimeSpan.Zero, ValidatePlacement);
}
public override void OnAfterDelete()
{
for ( int i = 0; i < m_Components.Count; ++i )
((Item)m_Components[i]).Delete();
}
public void ValidatePlacement()
{
BaseHouse house = BaseHouse.FindHouseAt(this);
private void AddOrnament( int x, int y, int z, int itemID )
{
AddItem( x + 1, y + 1, z + 11, new Ornament( itemID ) );
}
private void AddItem( int x, int y, int z, Item item )
{
item.MoveToWorld( new Point3D( Location.X + x, Location.Y + y, Location.Z + z ), Map );
m_Components.Add( item );
}
public HolidayTree( Serial serial ) : base( serial )
{
}
public bool CouldFit( IPoint3D p, Map map )
{
return map.CanFit( (Point3D)p, 20 );
}
Item IAddon.Deed => new HolidayTreeDeed();
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 1 ); // version
writer.Write( Placer );
writer.Write( (int) m_Components.Count );
for ( int i = 0; i < m_Components.Count; ++i )
writer.Write( (Item)m_Components[i] );
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
switch ( version )
{
case 1:
{
Placer = reader.ReadMobile();
goto case 0;
}
case 0:
{
int count = reader.ReadInt();
m_Components = new ArrayList( count );
for ( int i = 0; i < count; ++i )
{
Item item = reader.ReadItem();
if ( item != null )
m_Components.Add( item );
}
break;
}
}
Timer.DelayCall( TimeSpan.Zero, ValidatePlacement );
}
public void ValidatePlacement()
{
BaseHouse house = BaseHouse.FindHouseAt( this );
if ( house == null )
{
HolidayTreeDeed deed = new HolidayTreeDeed();
deed.MoveToWorld( Location, Map );
Delete();
}
}
if (house == null)
{
HolidayTreeDeed deed = new HolidayTreeDeed();
deed.MoveToWorld(Location, Map);
Delete();
}
}
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( GetWorldLocation(), 1 ) )
{
if ( Placer == null || from == Placer || from.AccessLevel >= AccessLevel.GameMaster )
{
from.AddToBackpack( new HolidayTreeDeed() );
public override void OnDoubleClick(Mobile from)
{
if (from.InRange(GetWorldLocation(), 1))
{
if (Placer == null || from == Placer || from.AccessLevel >= AccessLevel.GameMaster)
{
from.AddToBackpack(new HolidayTreeDeed());
Delete();
Delete();
BaseHouse house = BaseHouse.FindHouseAt( this );
BaseHouse house = BaseHouse.FindHouseAt(this);
if ( house != null && house.Addons.Contains( this ) )
{
house.Addons.Remove( this );
}
if (house != null && house.Addons.Contains(this)) house.Addons.Remove(this);
from.SendLocalizedMessage( 503393 ); // A deed for the tree has been placed in your backpack.
}
else
{
from.SendLocalizedMessage( 503396 ); // You cannot take this tree down.
}
}
else
{
from.SendLocalizedMessage( 500446 ); // That is too far away.
}
}
}
}
from.SendLocalizedMessage(503393); // A deed for the tree has been placed in your backpack.
}
else
{
from.SendLocalizedMessage(503396); // You cannot take this tree down.
}
}
else
{
from.SendLocalizedMessage(500446); // That is too far away.
}
}
private class Ornament : Item
{
public Ornament(int itemID) : base(itemID)
{
Movable = false;
}
public Ornament(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1041118; // a tree ornament
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
private class TreeTrunk : Item
{
private HolidayTree m_Tree;
public TreeTrunk(HolidayTree tree, int itemID) : base(itemID)
{
Movable = false;
MoveToWorld(tree.Location, tree.Map);
m_Tree = tree;
}
public TreeTrunk(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1041117; // a tree for the holidays
public override void OnDoubleClick(Mobile from)
{
if (m_Tree != null && !m_Tree.Deleted)
m_Tree.OnDoubleClick(from);
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(m_Tree);
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
switch (version)
{
case 0:
{
m_Tree = reader.ReadItem() as HolidayTree;
if (m_Tree == null)
Delete();
break;
}
}
}
}
}
}