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

Mostly cleanup...

Browse source 
Removed canbeharmful check on reveal spell
BallOfSummoning required to be in pack
Cleaned up ban duration gump
This commit is contained in:
mark 2007-08-14 03:13:21 +00:00
parent 521e728edd
commit 4718a4b911
12 changed files with 30 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Scripts/Items/Misc/Blocker.cs
View file

@ -21,9 +21,8 @@ namespace Server.Items
protected override Packet GetWorldPacketFor( NetState state ) {
Mobile mob = state.Mobile;
if ( mob != null && mob.AccessLevel >= AccessLevel.GameMaster ) {
if ( mob != null && mob.AccessLevel >= AccessLevel.GameMaster )
return new GMItemPacket( this );
}
return base.GetWorldPacketFor( state );
}

14
Scripts/Items/Misc/Corpses/Corpse.cs
View file

@ -146,20 +146,6 @@ namespace Server.Items
m_NoBones = true;
BeginDecay( m_BoneDecayTime );
/*DecayedCorpse c = new DecayedCorpse( Name );
c.MoveToWorld( Location, Map );
ArrayList list = Items;
for ( int i = list.Count - 1; i >= 0; --i )
{
if ( i < list.Count )
c.AddItem( (Item)list[i] );
}
Delete();*/
}
private static TimeSpan m_DefaultDecayTime = TimeSpan.FromMinutes( 7.0 );

2
Scripts/Items/Misc/OilCloth.cs
View file

@ -27,8 +27,6 @@ namespace Server.Items
Amount = amount;
}
public bool Dye( Mobile from, DyeTub sender )
{
if ( Deleted )

1
Scripts/Items/Resources/Tailor/Cloth.cs
View file

@ -66,6 +66,7 @@ namespace Server.Items
from.Send( new MessageLocalized( Serial, ItemID, MessageType.Regular, 0x3B2, 3, number, "", Amount.ToString() ) );
}
public bool Scissor( Mobile from, Scissors scissors )
{
if ( Deleted || !from.CanSee( this ) ) return false;

2
Scripts/Items/Resources/Tailor/Leathers.cs
View file

@ -19,7 +19,7 @@ namespace Server.Items
{
get
{
return String.Format( Amount == 1 ? "{0} piece of leather" : "{0} pieces of leather", Amount );
return String.Format( Amount == 1 ? "{0} piece of {1} leather" : "{0} pieces of {1} leather", Amount, CraftResources.GetName( m_Resource ).ToLower() );
}
}

2
Scripts/Items/Skill Items/Tools/SmithHammer.cs
View file

@ -4,7 +4,7 @@ using Server.Engines.Craft;
namespace Server.Items
{
[FlipableAttribute( 0x13E4, 0x13E3 )]
[FlipableAttribute( 0x13E3, 0x13E4 )]
public class SmithHammer : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } }

16
Scripts/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -109,7 +109,7 @@ namespace Server.Items
{
base.GetContextMenuEntries( from, list );
if ( from.Alive && from.InRange( this.GetWorldLocation(), 2 ) )
if ( from.Alive && this.RootParent == from )
{
if ( Pet == null )
{
@ -144,7 +144,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( this.GetWorldLocation(), 2 ) )
if ( this.RootParent == from ) // TODO: Previous implementation allowed use on ground, without house protection checks. What is the correct behavior?
{
if ( Pet == null )
{
@ -157,7 +157,7 @@ namespace Server.Items
}
else
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1042001 ); // That must be in your pack for you to use it.
}
}
@ -165,7 +165,7 @@ namespace Server.Items
{
BaseCreature pet = this.Pet;
if ( Deleted || pet != null )
if ( Deleted || pet != null || this.RootParent != from )
return;
from.SendLocalizedMessage( 1054114 ); // Target your pet that you wish to link to this Crystal Ball of Pet Summoning.
@ -186,9 +186,9 @@ namespace Server.Items
if ( m_Ball.Deleted || m_Ball.Pet != null )
return;
if ( !from.InRange( m_Ball.GetWorldLocation(), 2 ) )
if ( m_Ball.RootParent != from )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1042001 ); // That must be in your pack for you to use it.
}
else if ( targeted is BaseCreature )
{
@ -224,7 +224,7 @@ namespace Server.Items
{
BaseCreature pet = this.Pet;
if ( Deleted || pet == null )
if ( Deleted || pet == null || this.RootParent != from )
return;
if ( Charges == 0 )
@ -277,7 +277,7 @@ namespace Server.Items
public void UnlinkPet( Mobile from )
{
if ( !Deleted && Pet != null )
if ( !Deleted && Pet != null && this.RootParent == from )
{
Pet = null;

1
Scripts/Items/Special/Special Scrolls/PowerScroll.cs
View file

@ -171,7 +171,6 @@ namespace Server.Items
base.Hue = 0x481;
base.Weight = 1.0;
m_Skill = skill;
m_Value = value;
if ( m_Value > 105.0 )