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

Renames trapable to trappable. (#4)

Browse source
This commit is contained in:
Kamron Batman 2018-02-20 11:08:02 -08:00 • committed by GitHub
parent bb8f09752f
commit 9a4aeaba0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -353,9 +353,9 @@ namespace Server.Engines.ConPVP
title = "Items";
option = "Bandages";
}
else if ( item is TrapableContainer )
else if ( item is TrappableContainer )
{
if ( ((TrapableContainer)item).TrapType != TrapType.None )
if ( ((TrappableContainer)item).TrapType != TrapType.None )
{
title = "Items";
option = "Trapped Containers";

4
Scripts/Engines/Harvest/Core/HarvestTarget.cs
View file

@ -93,8 +93,8 @@ namespace Server.Engines.Harvest
if ( item is Container )
{
if ( item is TrapableContainer )
(item as TrapableContainer).ExecuteTrap( from );
if ( item is TrappableContainer )
(item as TrappableContainer).ExecuteTrap( from );
((Container)item).Destroy();
}

2
Scripts/Items/Containers/Container.cs
View file

@ -323,7 +323,7 @@ namespace Server.Items
}
}
public class Pouch : TrapableContainer
public class Pouch : TrappableContainer
{
[Constructable]
public Pouch() : base( 0xE79 )

4
Scripts/Items/Containers/FillableContainers.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items
public virtual int MaxRespawnMinutes { get { return 90; } }
public virtual bool IsLockable { get { return true; } }
public virtual bool IsTrapable { get { return IsLockable; } }
public virtual bool IsTrappable { get { return IsLockable; } }
public virtual int SpawnThreshold { get { return 2; } }
@ -153,7 +153,7 @@ namespace Server.Items
RequiredSkill = difficulty;
}
if( IsTrapable && ( m_Content.Level > 1 || 4 > Utility.Random( 5 ) ) )
if( IsTrappable && ( m_Content.Level > 1 || 4 > Utility.Random( 5 ) ) )
{
if( m_Content.Level > Utility.Random( 5 ) )
TrapType = TrapType.PoisonTrap;

2
Scripts/Items/Containers/LockableContainer.cs
View file

@ -5,7 +5,7 @@ using Server.Engines.Craft;
namespace Server.Items
{
public abstract class LockableContainer : TrapableContainer, ILockable, ILockpickable, ICraftable, IShipwreckedItem
public abstract class LockableContainer : TrappableContainer, ILockable, ILockpickable, ICraftable, IShipwreckedItem
{
private bool m_Locked;
private int m_LockLevel, m_MaxLockLevel, m_RequiredSkill;

6
Scripts/Items/Containers/TrapableContainer.cs → Scripts/Items/Containers/TrappableContainer.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items
PoisonTrap
}
public abstract class TrapableContainer : BaseContainer, ITelekinesisable
public abstract class TrappableContainer : BaseContainer, ITelekinesisable
{
private TrapType m_TrapType;
private int m_TrapPower;
@ -58,11 +58,11 @@ namespace Server.Items
public virtual bool TrapOnOpen{ get{ return true; } }
public TrapableContainer( int itemID ) : base( itemID )
public TrappableContainer( int itemID ) : base( itemID )
{
}
public TrapableContainer( Serial serial ) : base( serial )
public TrappableContainer( Serial serial ) : base( serial )
{
}

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

@ -1,6 +1,6 @@
namespace Server.Items
{
class ClosedBarrel : TrapableContainer
class ClosedBarrel : TrappableContainer
{
public override int DefaultGumpID{ get { return 0x3e; } }

2
Scripts/Mobiles/PlayerMobile.cs
View file

@ -2436,7 +2436,7 @@ namespace Server.Mobiles
private static int CheckContentForTrade( Item item )
{
if ( item is TrapableContainer && ((TrapableContainer)item).TrapType != TrapType.None )
if ( item is TrappableContainer && ((TrappableContainer)item).TrapType != TrapType.None )
return 1004044; // You may not trade trapped items.
if ( SkillHandlers.StolenItem.IsStolen( item ) )

4
Scripts/Skills/RemoveTrap.cs
View file

@ -45,9 +45,9 @@ namespace Server.SkillHandlers
{
from.SendLocalizedMessage( 502816 ); // You feel that such an action would be inappropriate
}
else if ( targeted is TrapableContainer )
else if ( targeted is TrappableContainer )
{
TrapableContainer targ = (TrapableContainer)targeted;
TrappableContainer targ = (TrappableContainer)targeted;
from.Direction = from.GetDirectionTo( targ );

2
Scripts/Skills/Snooping.cs
View file

@ -84,7 +84,7 @@ namespace Server.SkillHandlers
if ( from.AccessLevel > AccessLevel.Player || from.CheckTargetSkill( SkillName.Snooping, cont, 0.0, 100.0 ) )
{
if ( cont is TrapableContainer && ((TrapableContainer)cont).ExecuteTrap( from ) )
if ( cont is TrappableContainer && ((TrappableContainer)cont).ExecuteTrap( from ) )
return;
cont.DisplayTo( from );

6
Scripts/Spells/Second/MagicTrap.cs
View file

@ -27,7 +27,7 @@ namespace Server.Spells.Second
Caster.Target = new InternalTarget( this );
}
public void Target( TrapableContainer item )
public void Target( TrappableContainer item )
{
if ( !Caster.CanSee( item ) )
{
@ -70,9 +70,9 @@ namespace Server.Spells.Second
protected override void OnTarget( Mobile from, object o )
{
if ( o is TrapableContainer )
if ( o is TrappableContainer )
{
m_Owner.Target( (TrapableContainer)o );
m_Owner.Target( (TrappableContainer)o );
}
else
{

6
Scripts/Spells/Second/RemoveTrap.cs
View file

@ -27,7 +27,7 @@ namespace Server.Spells.Second
Caster.SendMessage( "What do you wish to untrap?" );
}
public void Target( TrapableContainer item )
public void Target( TrappableContainer item )
{
if ( !Caster.CanSee( item ) )
{
@ -65,9 +65,9 @@ namespace Server.Spells.Second
protected override void OnTarget( Mobile from, object o )
{
if ( o is TrapableContainer )
if ( o is TrappableContainer )
{
m_Owner.Target( (TrapableContainer)o );
m_Owner.Target( (TrappableContainer)o );
}
else
{