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
|
|
@ -3,115 +3,117 @@ using Server.Network;
|
|||
|
||||
namespace Server.Items
|
||||
{
|
||||
public class Hold : Container
|
||||
{
|
||||
private BaseBoat m_Boat;
|
||||
public class Hold : Container
|
||||
{
|
||||
private BaseBoat m_Boat;
|
||||
|
||||
public Hold( BaseBoat boat ) : base( 0x3EAE )
|
||||
{
|
||||
m_Boat = boat;
|
||||
Movable = false;
|
||||
}
|
||||
public Hold(BaseBoat boat) : base(0x3EAE)
|
||||
{
|
||||
m_Boat = boat;
|
||||
Movable = false;
|
||||
}
|
||||
|
||||
public Hold( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public Hold(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public void SetFacing( Direction dir )
|
||||
{
|
||||
switch ( dir )
|
||||
{
|
||||
case Direction.East: ItemID = 0x3E65; break;
|
||||
case Direction.West: ItemID = 0x3E93; break;
|
||||
case Direction.North: ItemID = 0x3EAE; break;
|
||||
case Direction.South: ItemID = 0x3EB9; break;
|
||||
}
|
||||
}
|
||||
public override bool IsDecoContainer => false;
|
||||
|
||||
public override bool OnDragDrop( Mobile from, Item item )
|
||||
{
|
||||
if ( m_Boat == null || !m_Boat.Contains( from ) || m_Boat.IsMoving )
|
||||
return false;
|
||||
public void SetFacing(Direction dir)
|
||||
{
|
||||
switch (dir)
|
||||
{
|
||||
case Direction.East:
|
||||
ItemID = 0x3E65;
|
||||
break;
|
||||
case Direction.West:
|
||||
ItemID = 0x3E93;
|
||||
break;
|
||||
case Direction.North:
|
||||
ItemID = 0x3EAE;
|
||||
break;
|
||||
case Direction.South:
|
||||
ItemID = 0x3EB9;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return base.OnDragDrop( from, item );
|
||||
}
|
||||
public override bool OnDragDrop(Mobile from, Item item)
|
||||
{
|
||||
if (m_Boat == null || !m_Boat.Contains(from) || m_Boat.IsMoving)
|
||||
return false;
|
||||
|
||||
public override bool OnDragDropInto( Mobile from, Item item, Point3D p )
|
||||
{
|
||||
if ( m_Boat == null || !m_Boat.Contains( from ) || m_Boat.IsMoving )
|
||||
return false;
|
||||
return base.OnDragDrop(from, item);
|
||||
}
|
||||
|
||||
return base.OnDragDropInto( from, item, p );
|
||||
}
|
||||
public override bool OnDragDropInto(Mobile from, Item item, Point3D p)
|
||||
{
|
||||
if (m_Boat == null || !m_Boat.Contains(from) || m_Boat.IsMoving)
|
||||
return false;
|
||||
|
||||
public override bool CheckItemUse( Mobile from, Item item )
|
||||
{
|
||||
if ( item != this && (m_Boat == null || !m_Boat.Contains( from ) || m_Boat.IsMoving) )
|
||||
return false;
|
||||
return base.OnDragDropInto(from, item, p);
|
||||
}
|
||||
|
||||
return base.CheckItemUse( from, item );
|
||||
}
|
||||
public override bool CheckItemUse(Mobile from, Item item)
|
||||
{
|
||||
if (item != this && (m_Boat == null || !m_Boat.Contains(from) || m_Boat.IsMoving))
|
||||
return false;
|
||||
|
||||
public override bool CheckLift( Mobile from, Item item, ref LRReason reject )
|
||||
{
|
||||
if ( m_Boat == null || !m_Boat.Contains( from ) || m_Boat.IsMoving )
|
||||
return false;
|
||||
return base.CheckItemUse(from, item);
|
||||
}
|
||||
|
||||
return base.CheckLift( from, item, ref reject );
|
||||
}
|
||||
public override bool CheckLift(Mobile from, Item item, ref LRReason reject)
|
||||
{
|
||||
if (m_Boat == null || !m_Boat.Contains(from) || m_Boat.IsMoving)
|
||||
return false;
|
||||
|
||||
public override void OnAfterDelete()
|
||||
{
|
||||
m_Boat?.Delete();
|
||||
}
|
||||
return base.CheckLift(from, item, ref reject);
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( m_Boat == null || !m_Boat.Contains( from ) )
|
||||
{
|
||||
m_Boat.TillerMan?.Say( 502490 ); // You must be on the ship to open the hold.
|
||||
}
|
||||
else if ( m_Boat.IsMoving )
|
||||
{
|
||||
m_Boat.TillerMan?.Say( 502491 ); // I can not open the hold while the ship is moving.
|
||||
}
|
||||
else
|
||||
{
|
||||
base.OnDoubleClick( from );
|
||||
}
|
||||
}
|
||||
public override void OnAfterDelete()
|
||||
{
|
||||
m_Boat?.Delete();
|
||||
}
|
||||
|
||||
public override bool IsDecoContainer => false;
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (m_Boat == null || !m_Boat.Contains(from))
|
||||
m_Boat.TillerMan?.Say(502490); // You must be on the ship to open the hold.
|
||||
else if (m_Boat.IsMoving)
|
||||
m_Boat.TillerMan?.Say(502491); // I can not open the hold while the ship is moving.
|
||||
else
|
||||
base.OnDoubleClick(from);
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 0 );
|
||||
writer.Write(0);
|
||||
|
||||
writer.Write( m_Boat );
|
||||
}
|
||||
writer.Write(m_Boat);
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_Boat = reader.ReadItem() as BaseBoat;
|
||||
switch (version)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_Boat = reader.ReadItem() as BaseBoat;
|
||||
|
||||
if ( m_Boat == null || Parent != null )
|
||||
Delete();
|
||||
if (m_Boat == null || Parent != null)
|
||||
Delete();
|
||||
|
||||
Movable = false;
|
||||
Movable = false;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue