From 9a4aeaba0d468c5b9fa7b1c9d7b7ff262586f932 Mon Sep 17 00:00:00 2001 From: Kamron Batman Date: Tue, 20 Feb 2018 11:08:02 -0800 Subject: [PATCH] Renames trapable to trappable. (#4) --- Scripts/Engines/ConPVP/DuelContext.cs | 4 ++-- Scripts/Engines/Harvest/Core/HarvestTarget.cs | 4 ++-- Scripts/Items/Containers/Container.cs | 2 +- Scripts/Items/Containers/FillableContainers.cs | 4 ++-- Scripts/Items/Containers/LockableContainer.cs | 2 +- .../{TrapableContainer.cs => TrappableContainer.cs} | 6 +++--- Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs | 2 +- Scripts/Mobiles/PlayerMobile.cs | 2 +- Scripts/Skills/RemoveTrap.cs | 4 ++-- Scripts/Skills/Snooping.cs | 2 +- Scripts/Spells/Second/MagicTrap.cs | 6 +++--- Scripts/Spells/Second/RemoveTrap.cs | 6 +++--- 12 files changed, 22 insertions(+), 22 deletions(-) rename Scripts/Items/Containers/{TrapableContainer.cs => TrappableContainer.cs} (92%) diff --git a/Scripts/Engines/ConPVP/DuelContext.cs b/Scripts/Engines/ConPVP/DuelContext.cs index c9fa02963..e5123eb81 100644 --- a/Scripts/Engines/ConPVP/DuelContext.cs +++ b/Scripts/Engines/ConPVP/DuelContext.cs @@ -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"; diff --git a/Scripts/Engines/Harvest/Core/HarvestTarget.cs b/Scripts/Engines/Harvest/Core/HarvestTarget.cs index 50ffc4a92..33d79e891 100644 --- a/Scripts/Engines/Harvest/Core/HarvestTarget.cs +++ b/Scripts/Engines/Harvest/Core/HarvestTarget.cs @@ -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(); } diff --git a/Scripts/Items/Containers/Container.cs b/Scripts/Items/Containers/Container.cs index 67b08cb7a..b8c3b151c 100644 --- a/Scripts/Items/Containers/Container.cs +++ b/Scripts/Items/Containers/Container.cs @@ -323,7 +323,7 @@ namespace Server.Items } } - public class Pouch : TrapableContainer + public class Pouch : TrappableContainer { [Constructable] public Pouch() : base( 0xE79 ) diff --git a/Scripts/Items/Containers/FillableContainers.cs b/Scripts/Items/Containers/FillableContainers.cs index efc92da99..c07b3a3d9 100644 --- a/Scripts/Items/Containers/FillableContainers.cs +++ b/Scripts/Items/Containers/FillableContainers.cs @@ -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; diff --git a/Scripts/Items/Containers/LockableContainer.cs b/Scripts/Items/Containers/LockableContainer.cs index c42004287..ec938b9fe 100644 --- a/Scripts/Items/Containers/LockableContainer.cs +++ b/Scripts/Items/Containers/LockableContainer.cs @@ -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; diff --git a/Scripts/Items/Containers/TrapableContainer.cs b/Scripts/Items/Containers/TrappableContainer.cs similarity index 92% rename from Scripts/Items/Containers/TrapableContainer.cs rename to Scripts/Items/Containers/TrappableContainer.cs index 55624fd35..71e7c1fe4 100644 --- a/Scripts/Items/Containers/TrapableContainer.cs +++ b/Scripts/Items/Containers/TrappableContainer.cs @@ -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 ) { } diff --git a/Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs b/Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs index 2e332e98f..12a229657 100644 --- a/Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs +++ b/Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs @@ -1,6 +1,6 @@ namespace Server.Items { - class ClosedBarrel : TrapableContainer + class ClosedBarrel : TrappableContainer { public override int DefaultGumpID{ get { return 0x3e; } } diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index 26b1e53bd..2c9b72552 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -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 ) ) diff --git a/Scripts/Skills/RemoveTrap.cs b/Scripts/Skills/RemoveTrap.cs index b61e5b1fe..0b6819511 100644 --- a/Scripts/Skills/RemoveTrap.cs +++ b/Scripts/Skills/RemoveTrap.cs @@ -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 ); diff --git a/Scripts/Skills/Snooping.cs b/Scripts/Skills/Snooping.cs index 7de7d889a..7131bef67 100644 --- a/Scripts/Skills/Snooping.cs +++ b/Scripts/Skills/Snooping.cs @@ -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 ); diff --git a/Scripts/Spells/Second/MagicTrap.cs b/Scripts/Spells/Second/MagicTrap.cs index fb7dfd5b6..50fade132 100644 --- a/Scripts/Spells/Second/MagicTrap.cs +++ b/Scripts/Spells/Second/MagicTrap.cs @@ -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 { diff --git a/Scripts/Spells/Second/RemoveTrap.cs b/Scripts/Spells/Second/RemoveTrap.cs index b08f3f8e1..3862739d0 100644 --- a/Scripts/Spells/Second/RemoveTrap.cs +++ b/Scripts/Spells/Second/RemoveTrap.cs @@ -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 {