From 2067f181e1b6bcbe544e4eb7193614daf12703b9 Mon Sep 17 00:00:00 2001 From: "eos@runuo.com" Date: Fri, 7 Jun 2013 01:04:35 +0000 Subject: [PATCH] - Corrected typo in CoM faction signup stone location. - Removed duplicate code for talisman killer bonuses. (It's handled in BaseWeapon.OnHit) - Changed Mobile.Account visibility to GM+ (to match ClientGump). - Removed staff logout delay. --- .../Factions/Instances/Factions/CouncilOfMages.cs | 2 +- Scripts/Items/Talismans/TalismanAttribute.cs | 2 +- Scripts/Mobiles/BaseCreature.cs | 14 -------------- Server/Mobile.cs | 2 +- Server/Region.cs | 2 +- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs b/Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs index 1553e0efd..089ac0e0c 100644 --- a/Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs +++ b/Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs @@ -47,7 +47,7 @@ namespace Server.Factions new Rectangle2D( 4450, 1522, 35, 48 ), }, new Point3D( 4469, 1486, 0 ), - new Point3D( 4457, 1455, 0 ), + new Point3D( 4457, 1544, 0 ), new Point3D[] { new Point3D( 4464, 1534, 21 ), diff --git a/Scripts/Items/Talismans/TalismanAttribute.cs b/Scripts/Items/Talismans/TalismanAttribute.cs index d90f34a8e..b04d09518 100644 --- a/Scripts/Items/Talismans/TalismanAttribute.cs +++ b/Scripts/Items/Talismans/TalismanAttribute.cs @@ -136,7 +136,7 @@ namespace Server.Items public int DamageBonus( Mobile to ) { - if ( to != null && to.GetType() == m_Type ) + if ( to != null && to.GetType() == m_Type ) // Verified: only works on the exact type return m_Amount; return 0; diff --git a/Scripts/Mobiles/BaseCreature.cs b/Scripts/Mobiles/BaseCreature.cs index 3b022d16b..15756673f 100644 --- a/Scripts/Mobiles/BaseCreature.cs +++ b/Scripts/Mobiles/BaseCreature.cs @@ -1518,20 +1518,6 @@ namespace Server.Mobiles public virtual void AlterMeleeDamageFrom( Mobile from, ref int damage ) { - #region Mondain's Legacy - if ( from != null && from.Talisman is BaseTalisman ) - { - BaseTalisman talisman = (BaseTalisman)from.Talisman; - - if ( talisman.Killer != null && talisman.Killer.Type != null ) - { - Type type = talisman.Killer.Type; - - if ( type.IsAssignableFrom( GetType() ) ) - damage = (int)( damage * ( 1 + (double)talisman.Killer.Amount / 100 ) ); - } - } - #endregion } public virtual void AlterMeleeDamageTo( Mobile to, ref int damage ) diff --git a/Server/Mobile.cs b/Server/Mobile.cs index c5218d495..eba8e6d89 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -3607,7 +3607,7 @@ namespace Server private IAccount m_Account; - [CommandProperty( AccessLevel.Counselor, AccessLevel.Owner )] + [CommandProperty( AccessLevel.GameMaster, AccessLevel.Owner )] public IAccount Account { get diff --git a/Server/Region.cs b/Server/Region.cs index cdd084499..daeb4e3b8 100644 --- a/Server/Region.cs +++ b/Server/Region.cs @@ -127,7 +127,7 @@ namespace Server private static Type m_DefaultRegionType = typeof( Region ); public static Type DefaultRegionType{ get{ return m_DefaultRegionType; } set{ m_DefaultRegionType = value; } } - private static TimeSpan m_StaffLogoutDelay = TimeSpan.FromSeconds( 10.0 ); + private static TimeSpan m_StaffLogoutDelay = TimeSpan.Zero; private static TimeSpan m_DefaultLogoutDelay = TimeSpan.FromMinutes( 5.0 ); public static TimeSpan StaffLogoutDelay{ get{ return m_StaffLogoutDelay; } set{ m_StaffLogoutDelay = value; } }