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

Plant gump issues

Browse source 
http://jira.runuo.com/browse/RUNUO-12

House decay stages should pass at random intervals
http://jira.runuo.com/browse/RUNUO-113

Nature's Fury cast issues
http://jira.runuo.com/browse/RUNUO-114

Animal Form inaccuracies and issue with Talisman of the Fey
http://jira.runuo.com/browse/RUNUO-115

BaseWaterContainer fill messages and behavior
http://jira.runuo.com/browse/RUNUO-116

AdminGump filter for accounts owning houses
http://jira.runuo.com/browse/RUNUO-118

Seeds should be stackable
http://jira.runuo.com/browse/RUNUO-119

Typo in case of a jailbreak
http://jira.runuo.com/browse/RUNUO-120

Prevent creation of invalid account names
http://jira.runuo.com/browse/RUNUO-121
This commit is contained in:
eos 2012-01-01 03:34:02 +00:00
parent d2f79e93ea
commit 4cba2c8d56
18 changed files with 440 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Scripts/Items/Food/Beverage.cs
View file

@ -741,14 +741,14 @@ namespace Server.Items
{
BaseWaterContainer bwc = targ as BaseWaterContainer;
if( Quantity == 0 || ( this.Content == BeverageType.Water && !this.IsFull ) )
if( Quantity == 0 || ( Content == BeverageType.Water && !IsFull ) )
{
int I_Need = Math.Min( ( MaxQuantity - Quantity ), bwc.Quantity );
int iNeed = Math.Min( ( MaxQuantity - Quantity ), bwc.Quantity );
if( ( I_Need > 0 ) && !bwc.IsEmpty && !IsFull )
if( iNeed > 0 && !bwc.IsEmpty && !IsFull )
{
bwc.Quantity -= I_Need;
Quantity += I_Need;
bwc.Quantity -= iNeed;
Quantity += iNeed;
Content = BeverageType.Water;
from.PlaySound( 0x4E );
@ -1026,15 +1026,23 @@ namespace Server.Items
else if( targ is BaseWaterContainer )
{
BaseWaterContainer bwc = targ as BaseWaterContainer;
if( ( !this.IsEmpty || this.Content == BeverageType.Water ) && bwc.Items.Count == 0 )
if( Content != BeverageType.Water )
{
int It_Needs = Math.Min( ( bwc.MaxQuantity - bwc.Quantity ), Quantity );
from.SendLocalizedMessage( 500842 ); // Can't pour that in there.
}
else if( bwc.Items.Count != 0 )
{
from.SendLocalizedMessage( 500841 ); // That has something in it.
}
else
{
int itNeeds = Math.Min( ( bwc.MaxQuantity - bwc.Quantity ), Quantity );
if( It_Needs > 0 && ( !IsEmpty && !bwc.IsFull ) )
if( itNeeds > 0 )
{
bwc.Quantity += It_Needs;
Quantity -= It_Needs;
bwc.Quantity += itNeeds;
Quantity -= itNeeds;
from.PlaySound( 0x4E );
}

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

@ -31,6 +31,14 @@
ItemID = ( IsEmpty ) ? voidItem_ID : fullItem_ID;
if( !IsEmpty )
{
IEntity rootParent = RootParentEntity;
if( rootParent != null && rootParent.Map != null && rootParent.Map != Map.Internal )
MoveToWorld( rootParent.Location, rootParent.Map );
}
InvalidateProperties();
}
}

2
Scripts/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -306,7 +306,7 @@ namespace Server.Items
}
else if ( from.Region.IsPartOf( typeof( Server.Regions.Jail ) ) )
{
from.SendLocalizedMessage( 1041530, "", 0x35 ); // You'll need a better jailbreak plan then that!
from.SendLocalizedMessage( 1114345, "", 0x35 ); // You'll need a better jailbreak plan than that!
return false;
}
else if ( boundRoot.Region.IsPartOf( typeof( Server.Regions.Jail ) ) )