diff --git a/Scripts/Items/Weapons/BaseWeapon.cs b/Scripts/Items/Weapons/BaseWeapon.cs index d566160d0..b60a4bc3f 100644 --- a/Scripts/Items/Weapons/BaseWeapon.cs +++ b/Scripts/Items/Weapons/BaseWeapon.cs @@ -1349,8 +1349,6 @@ namespace Server.Items public virtual void OnHit( Mobile attacker, Mobile defender, double damageBonus ) { - DoKeepScore( attacker, defender, false ); - if ( MirrorImage.HasClone( defender ) && (defender.Skills.Ninjitsu.Value / 150.0) > Utility.RandomDouble() ) { Clone bc; @@ -2062,35 +2060,6 @@ namespace Server.Items return totalRemaining - appliedDamage; } - public virtual void DoKeepScore( Mobile attacker, Mobile defender, bool hit ) - { - PlayerMobile player = ( ( attacker != null ) && !attacker.Deleted && ( attacker is PlayerMobile ) ) ? attacker as PlayerMobile : null; - - if( player != null ) - { - int hits = player.CombatHits; - int miss = player.CombatMiss; - - if( player.countThis != defender ) - { - player.countThis = defender; - - miss = hits = 0; - } - - switch( hit ) - { - case true: hits += 1; break; - case false: miss += 1; break; - } - - player.CombatHits = hits; - player.CombatMiss = miss; - - attacker.Say( string.Format( "hits:{0} miss{1} = {2} percent success", hits, miss, ( hits / ( hits + miss ) ) ) ); - } - } - public virtual void OnMiss( Mobile attacker, Mobile defender ) { PlaySwingAnimation( attacker ); @@ -2109,8 +2078,6 @@ namespace Server.Items if ( defender is IHonorTarget && ((IHonorTarget)defender).ReceivedHonorContext != null ) ((IHonorTarget)defender).ReceivedHonorContext.OnTargetMissed( attacker ); - - DoKeepScore( attacker, defender, false ); } public virtual void GetBaseDamageRange( Mobile attacker, out int min, out int max ) diff --git a/Scripts/Misc/LootPack.cs b/Scripts/Misc/LootPack.cs index 59dde63b4..c369edfd6 100644 --- a/Scripts/Misc/LootPack.cs +++ b/Scripts/Misc/LootPack.cs @@ -72,14 +72,14 @@ namespace Server { LootPackEntry entry = m_Entries[i]; - bool shouldAdd = true; // ( entry.Chance > Utility.Random( 10000 ) ); + bool shouldAdd = ( entry.Chance > Utility.Random( 10000 ) ); if ( !shouldAdd && checkLuck ) { checkLuck = false; if( LootPack.CheckLuck( luckChance ) ) - shouldAdd = true; // ( entry.Chance > Utility.Random( 10000 ) ); + shouldAdd = ( entry.Chance > Utility.Random( 10000 ) ); } if ( !shouldAdd ) diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index 4eef46444..94ba10f8e 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -91,15 +91,6 @@ namespace Server.Mobiles } } - - public virtual Mobile countThis { get { return m_countThis; } set { m_countThis = value; } } - public virtual int CombatMiss { get { return m_CombatMiss; } set { m_CombatMiss = value; } } - public virtual int CombatHits { get { return m_CombatHits; } set { m_CombatHits = value; } } - - private int m_CombatMiss; - private int m_CombatHits; - private Mobile m_countThis; - private DesignContext m_DesignContext; private NpcGuild m_NpcGuild;