warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

201
Scripts/Items/Special/Rares/Containers/BaseWaterContainer.cs
View file

@ -1,129 +1,120 @@
namespace Server.Items
{
public abstract class BaseWaterContainer : Container, IHasQuantity
{
public abstract int voidItem_ID { get; }
public abstract int fullItem_ID { get; }
public abstract int MaxQuantity { get; }
public abstract class BaseWaterContainer : Container, IHasQuantity
{
private int m_Quantity;
public override int DefaultGumpID => 0x3e;
public BaseWaterContainer(int Item_Id, bool filled)
: base(Item_Id)
{
m_Quantity = filled ? MaxQuantity : 0;
}
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool IsEmpty => ( m_Quantity <= 0 );
public BaseWaterContainer(Serial serial)
: base(serial)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool IsFull => ( m_Quantity >= MaxQuantity );
public abstract int voidItem_ID{ get; }
public abstract int fullItem_ID{ get; }
public abstract int MaxQuantity{ get; }
[CommandProperty( AccessLevel.GameMaster )]
public virtual int Quantity
{
get => m_Quantity;
set
{
if ( value != m_Quantity )
{
m_Quantity = ( value < 1 ) ? 0 : ( value > MaxQuantity ) ? MaxQuantity : value;
public override int DefaultGumpID => 0x3e;
Movable = ( !IsLockedDown ) ? IsEmpty : false;
[CommandProperty(AccessLevel.GameMaster)]
public virtual bool IsEmpty => m_Quantity <= 0;
ItemID = ( IsEmpty ) ? voidItem_ID : fullItem_ID;
[CommandProperty(AccessLevel.GameMaster)]
public virtual bool IsFull => m_Quantity >= MaxQuantity;
if ( !IsEmpty )
{
IEntity rootParent = RootParent;
[CommandProperty(AccessLevel.GameMaster)]
public virtual int Quantity
{
get => m_Quantity;
set
{
if (value != m_Quantity)
{
m_Quantity = value < 1 ? 0 : value > MaxQuantity ? MaxQuantity : value;
if ( rootParent?.Map != null && rootParent.Map != Map.Internal )
MoveToWorld( rootParent.Location, rootParent.Map );
}
Movable = !IsLockedDown ? IsEmpty : false;
InvalidateProperties();
}
}
}
ItemID = IsEmpty ? voidItem_ID : fullItem_ID;
private int m_Quantity;
if (!IsEmpty)
{
IEntity rootParent = RootParent;
public BaseWaterContainer( int Item_Id, bool filled )
: base( Item_Id )
{
m_Quantity = ( filled ) ? MaxQuantity : 0;
}
if (rootParent?.Map != null && rootParent.Map != Map.Internal)
MoveToWorld(rootParent.Location, rootParent.Map);
}
public override void OnDoubleClick( Mobile from )
{
if ( IsEmpty )
{
base.OnDoubleClick( from );
}
}
InvalidateProperties();
}
}
}
public override void OnSingleClick( Mobile from )
{
if ( IsEmpty )
{
base.OnSingleClick( from );
}
else
{
if ( Name == null )
LabelTo( from, LabelNumber );
else
LabelTo( from, Name );
}
}
public override void OnDoubleClick(Mobile from)
{
if (IsEmpty) base.OnDoubleClick(from);
}
public override void OnAosSingleClick( Mobile from )
{
if ( IsEmpty )
{
base.OnAosSingleClick( from );
}
else
{
if ( Name == null )
LabelTo( from, LabelNumber );
else
LabelTo( from, Name );
}
}
public override void OnSingleClick(Mobile from)
{
if (IsEmpty)
{
base.OnSingleClick(from);
}
else
{
if (Name == null)
LabelTo(from, LabelNumber);
else
LabelTo(from, Name);
}
}
public override void GetProperties( ObjectPropertyList list )
{
if ( IsEmpty )
{
base.GetProperties( list );
}
}
public override void OnAosSingleClick(Mobile from)
{
if (IsEmpty)
{
base.OnAosSingleClick(from);
}
else
{
if (Name == null)
LabelTo(from, LabelNumber);
else
LabelTo(from, Name);
}
}
public override bool OnDragDropInto( Mobile from, Item item, Point3D p )
{
if ( !IsEmpty )
{
return false;
}
public override void GetProperties(ObjectPropertyList list)
{
if (IsEmpty) base.GetProperties(list);
}
return base.OnDragDropInto( from, item, p );
}
public override bool OnDragDropInto(Mobile from, Item item, Point3D p)
{
if (!IsEmpty) return false;
public BaseWaterContainer( Serial serial )
: base( serial )
{
}
return base.OnDragDropInto(from, item, p);
}
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( (int)m_Quantity );
}
writer.Write(0); // version
writer.Write(m_Quantity);
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
m_Quantity = reader.ReadInt();
}
}
}
int version = reader.ReadInt();
m_Quantity = reader.ReadInt();
}
}
}

66
Scripts/Items/Special/Rares/Containers/Bucket.cs
View file

@ -1,43 +1,43 @@
namespace Server.Items
{
class Bucket : BaseWaterContainer
{
public override int voidItem_ID => vItemID;
public override int fullItem_ID => fItemID;
public override int MaxQuantity => 25;
internal class Bucket : BaseWaterContainer
{
private static int vItemID = 0x14e0;
private static int fItemID = 0x2004;
private static int vItemID = 0x14e0;
private static int fItemID = 0x2004;
[Constructible]
public Bucket()
: this(false)
{
}
[Constructible]
public Bucket()
: this( false )
{
}
[Constructible]
public Bucket(bool filled)
: base(filled ? fItemID : vItemID, filled)
{
}
[Constructible]
public Bucket( bool filled )
: base( ( filled ) ? fItemID : vItemID, filled )
{
}
public Bucket(Serial serial)
: base(serial)
{
}
public Bucket( Serial serial )
: base( serial )
{
}
public override int voidItem_ID => vItemID;
public override int fullItem_ID => fItemID;
public override int MaxQuantity => 25;
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();
}
}
}

48
Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs
View file

@ -1,32 +1,32 @@
namespace Server.Items
{
class ClosedBarrel : TrappableContainer
{
public override int DefaultGumpID => 0x3e;
internal class ClosedBarrel : TrappableContainer
{
[Constructible]
public ClosedBarrel()
: base(0x0FAE)
{
}
[Constructible]
public ClosedBarrel()
: base( 0x0FAE )
{
}
public ClosedBarrel(Serial serial)
: base(serial)
{
}
public ClosedBarrel( Serial serial )
: base( serial )
{
}
public override int DefaultGumpID => 0x3e;
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();
}
}
}

47
Scripts/Items/Special/Rares/Containers/UnfinishedBarrel.cs
View file

@ -1,31 +1,30 @@
namespace Server.Items
{
public class UnfinishedBarrel : Item
{
public class UnfinishedBarrel : Item
{
[Constructible]
public UnfinishedBarrel() : base(0x1EB5)
{
Movable = true;
Stackable = false;
}
[Constructible]
public UnfinishedBarrel() : base( 0x1EB5 )
{
Movable = true;
Stackable = false;
}
public UnfinishedBarrel(Serial serial) : base(serial)
{
}
public UnfinishedBarrel( Serial serial ) : base( serial )
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write(0);
}
writer.Write( (int) 0 );
}
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();
}
}
}

68
Scripts/Items/Special/Rares/Containers/WaterBarrel.cs
View file

@ -1,45 +1,45 @@
namespace Server.Items
{
class WaterBarrel : BaseWaterContainer
{
public override int LabelNumber => 1025453; /* water barrel */
internal class WaterBarrel : BaseWaterContainer
{
private static int vItemID = 0xe77;
private static int fItemID = 0x154d;
public override int voidItem_ID => vItemID;
public override int fullItem_ID => fItemID;
public override int MaxQuantity => 100;
[Constructible]
public WaterBarrel()
: this(false)
{
}
private static int vItemID = 0xe77;
private static int fItemID = 0x154d;
[Constructible]
public WaterBarrel(bool filled)
: base(filled ? fItemID : vItemID, filled)
{
}
[Constructible]
public WaterBarrel()
: this( false )
{
}
public WaterBarrel(Serial serial)
: base(serial)
{
}
[Constructible]
public WaterBarrel( bool filled )
: base( ( filled ) ? fItemID : vItemID, filled )
{
}
public override int LabelNumber => 1025453; /* water barrel */
public WaterBarrel( Serial serial )
: base( serial )
{
}
public override int voidItem_ID => vItemID;
public override int fullItem_ID => fItemID;
public override int MaxQuantity => 100;
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();
}
}
}

66
Scripts/Items/Special/Rares/Containers/WaterTub.cs
View file

@ -1,43 +1,43 @@
namespace Server.Items
{
class Tub : BaseWaterContainer
{
public override int voidItem_ID => vItemID;
public override int fullItem_ID => fItemID;
public override int MaxQuantity => 50;
internal class Tub : BaseWaterContainer
{
private static int vItemID = 0xe83;
private static int fItemID = 0xe7b;
private static int vItemID = 0xe83;
private static int fItemID = 0xe7b;
[Constructible]
public Tub()
: this(false)
{
}
[Constructible]
public Tub()
: this( false )
{
}
[Constructible]
public Tub(bool filled)
: base(filled ? fItemID : vItemID, filled)
{
}
[Constructible]
public Tub( bool filled )
: base( ( filled ) ? fItemID : vItemID, filled )
{
}
public Tub(Serial serial)
: base(serial)
{
}
public Tub( Serial serial )
: base( serial )
{
}
public override int voidItem_ID => vItemID;
public override int fullItem_ID => fItemID;
public override int MaxQuantity => 50;
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();
}
}
}