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

Browse source
This commit is contained in:
xavier 2011-07-31 15:58:03 +00:00
parent aabe532390
commit 93917a81ca
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,14 +6,18 @@
public abstract int fullItem_ID { get; } public abstract int fullItem_ID { get; }
public abstract int MaxQuantity { get; } public abstract int MaxQuantity { get; }
public override int DefaultGumpID { get { return 0x3d; } } public override int DefaultGumpID { get { return 0x3e; } }
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool IsEmpty { get { return ( m_Quantity == 0 ); } } public virtual bool IsEmpty { get { return ( m_Quantity == 0 ); } }
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool IsFull { get { return ( m_Quantity >= MaxQuantity ); } } public virtual bool IsFull { get { return ( m_Quantity >= MaxQuantity ); } }
[CommandProperty( AccessLevel.GameMaster )]
public virtual int currItemID { get { return ( IsEmpty ) ? voidItem_ID : fullItem_ID; } } public virtual int currItemID { get { return ( IsEmpty ) ? voidItem_ID : fullItem_ID; } }
private int m_Quantity; [CommandProperty( AccessLevel.GameMaster )]
public int Quantity public int Quantity
{ {
get get
@ -22,7 +26,7 @@
} }
set set
{ {
if( value != m_Quantity && !IsFull ) if( value != m_Quantity )
{ {
UpdateContainer( value ); UpdateContainer( value );
@ -31,6 +35,8 @@
} }
} }
private int m_Quantity;
public BaseWaterContainer( int Item_Id, bool filled ) public BaseWaterContainer( int Item_Id, bool filled )
: base( Item_Id ) : base( Item_Id )
{ {
@ -73,7 +79,15 @@
public virtual void UpdateContainer( int amount ) public virtual void UpdateContainer( int amount )
{ {
m_Quantity = amount; if( amount <= 0 )
{
m_Quantity = 0;
}
else
{
m_Quantity = ( MaxQuantity > amount ) ? amount : MaxQuantity;
}
Movable = IsEmpty; Movable = IsEmpty;
ItemID = currItemID; ItemID = currItemID;
} }

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

@ -12,7 +12,6 @@
[Constructable] [Constructable]
public Bucket() public Bucket()
: this( false ) : this( false )
{ {
} }