From ca4e99c179bb11c2a37f0f8e47f7454b6a35a486 Mon Sep 17 00:00:00 2001 From: Kamron Batman Date: Tue, 20 Feb 2018 11:18:23 -0800 Subject: [PATCH] Renames overriden to overridden --- Scripts/Misc/CurrentExpansion.cs | 2 +- Scripts/Mobiles/BaseCreature.cs | 4 ++-- Scripts/Mobiles/Guards/ArcherGuard.cs | 2 +- Scripts/Mobiles/Guards/WarriorGuard.cs | 2 +- Server/Item.cs | 6 +++--- Server/Mobile.cs | 4 ++-- Server/Targeting/TargetCancelType.cs | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Scripts/Misc/CurrentExpansion.cs b/Scripts/Misc/CurrentExpansion.cs index 27f9a816d..7645301c6 100644 --- a/Scripts/Misc/CurrentExpansion.cs +++ b/Scripts/Misc/CurrentExpansion.cs @@ -31,7 +31,7 @@ namespace Server AOS.DisableStatInfluences(); if ( ObjectPropertyList.Enabled ) - PacketHandlers.SingleClickProps = true; // single click for everything is overriden to check object property list + PacketHandlers.SingleClickProps = true; // single click for everything is overridden to check object property list Mobile.ActionDelay = 1000; Mobile.AOSStatusHandler = new AOSStatusHandler( AOS.GetStatus ); diff --git a/Scripts/Mobiles/BaseCreature.cs b/Scripts/Mobiles/BaseCreature.cs index 5ac12efaf..1e292d07d 100644 --- a/Scripts/Mobiles/BaseCreature.cs +++ b/Scripts/Mobiles/BaseCreature.cs @@ -619,7 +619,7 @@ namespace Server.Mobiles #region Breath ability, like dragon fire breath private long m_NextBreathTime; - // Must be overriden in subclass to enable + // Must be overridden in subclass to enable public virtual bool HasBreath{ get{ return false; } } // Base damage given is: CurrentHitPoints * BreathDamageScalar @@ -2994,7 +2994,7 @@ namespace Server.Mobiles } /* - * This function can be overriden.. so a "Strongest" mobile, can have a different definition depending + * This function can be overridden.. so a "Strongest" mobile, can have a different definition depending * on who check for value * -Could add a FightMode.Prefered * diff --git a/Scripts/Mobiles/Guards/ArcherGuard.cs b/Scripts/Mobiles/Guards/ArcherGuard.cs index 7d8236cde..cddd36ff0 100644 --- a/Scripts/Mobiles/Guards/ArcherGuard.cs +++ b/Scripts/Mobiles/Guards/ArcherGuard.cs @@ -278,7 +278,7 @@ namespace Server.Mobiles ((BaseCreature)target).NoKillAwards = true; target.Damage( target.HitsMax, m_Owner ); - target.Kill(); // just in case, maybe Damage is overriden on some shard + target.Kill(); // just in case, maybe Damage is overridden on some shard if ( target.Corpse != null && !target.Player ) target.Corpse.Delete(); diff --git a/Scripts/Mobiles/Guards/WarriorGuard.cs b/Scripts/Mobiles/Guards/WarriorGuard.cs index dcb3786d7..cdb89ec42 100644 --- a/Scripts/Mobiles/Guards/WarriorGuard.cs +++ b/Scripts/Mobiles/Guards/WarriorGuard.cs @@ -293,7 +293,7 @@ namespace Server.Mobiles ((BaseCreature)target).NoKillAwards = true; target.Damage( target.HitsMax, m_Owner ); - target.Kill(); // just in case, maybe Damage is overriden on some shard + target.Kill(); // just in case, maybe Damage is overridden on some shard if ( target.Corpse != null && !target.Player ) target.Corpse.Delete(); diff --git a/Server/Item.cs b/Server/Item.cs index ef796ca67..8ef143fd4 100644 --- a/Server/Item.cs +++ b/Server/Item.cs @@ -942,7 +942,7 @@ namespace Server } /// - /// Overridable. Adds the name of this item to the given . This method should be overriden if the item requires a complex naming format. + /// Overridable. Adds the name of this item to the given . This method should be overridden if the item requires a complex naming format. /// public virtual void AddNameProperty( ObjectPropertyList list ) { @@ -1102,7 +1102,7 @@ namespace Server } /// - /// Overridable. Fills an with everything applicable. By default, this invokes , then Item.GetChildProperties or Mobile.GetChildProperties. This method should be overriden to add any custom properties. + /// Overridable. Fills an with everything applicable. By default, this invokes , then Item.GetChildProperties or Mobile.GetChildProperties. This method should be overridden to add any custom properties. /// public virtual void GetProperties( ObjectPropertyList list ) { @@ -1188,7 +1188,7 @@ namespace Server } /// - /// Overridable. Method checked to see if this item may be equipped while casting a spell. By default, this returns false. It is overriden on spellbook and spell channeling weapons or shields. + /// Overridable. Method checked to see if this item may be equipped while casting a spell. By default, this returns false. It is overridden on spellbook and spell channeling weapons or shields. /// /// True if it may, false if not. /// diff --git a/Server/Mobile.cs b/Server/Mobile.cs index df1b5fcbe..1d86495a0 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -2750,7 +2750,7 @@ namespace Server m_Target = null; if( oldTarget != null && newTarget != null ) - oldTarget.Cancel( this, TargetCancelType.Overriden ); + oldTarget.Cancel( this, TargetCancelType.Overridden ); m_Target = newTarget; @@ -3754,7 +3754,7 @@ namespace Server } /// - /// Overridable. Invoked after the mobile is deleted. When overriden, be sure to call the base method. + /// Overridable. Invoked after the mobile is deleted. When overridden, be sure to call the base method. /// public virtual void OnAfterDelete() { diff --git a/Server/Targeting/TargetCancelType.cs b/Server/Targeting/TargetCancelType.cs index 957f855aa..24d4d3e42 100644 --- a/Server/Targeting/TargetCancelType.cs +++ b/Server/Targeting/TargetCancelType.cs @@ -24,7 +24,7 @@ namespace Server.Targeting { public enum TargetCancelType { - Overriden, + Overridden, Canceled, Disconnected, Timeout