From 2938db753b69de50b86822f79bd07264c14fed9e Mon Sep 17 00:00:00 2001
From: eos <eos@a9ff2418-eebe-19e0-0898-3207744d8c45>
Date: Sun, 12 Aug 2012 01:44:48 +0000
Subject: [PATCH] Disabled pre-AOS wrestling moves for AOS.

---
 Scripts/Items/Weapons/Fists.cs | 14 +++++++++++++-
 Scripts/Mobiles/AI/MageAI.cs   |  2 +-
 Scripts/Mobiles/AI/ThiefAI.cs  |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Scripts/Items/Weapons/Fists.cs b/Scripts/Items/Weapons/Fists.cs
index c4047b8ef..6dc7fa11f 100644
--- a/Scripts/Items/Weapons/Fists.cs
+++ b/Scripts/Items/Weapons/Fists.cs
@@ -62,7 +62,7 @@ namespace Server.Items
 				return incrValue;
 		}
 
-		public override TimeSpan OnSwing( Mobile attacker, Mobile defender )
+		private void CheckPreAOSMoves( Mobile attacker, Mobile defender )
 		{
 			if ( attacker.StunReady )
 			{
@@ -161,6 +161,12 @@ namespace Server.Items
 					}
 				}
 			}
+		}
+
+		public override TimeSpan OnSwing( Mobile attacker, Mobile defender )
+		{
+			if ( !Core.AOS )
+				CheckPreAOSMoves( attacker, defender );
 
 			return base.OnSwing( attacker, defender );
 		}
@@ -215,6 +221,9 @@ namespace Server.Items
 
 		private static void EventSink_DisarmRequest( DisarmRequestEventArgs e )
 		{
+			if ( Core.AOS )
+				return;
+
 			Mobile m = e.Mobile;
 
 			#region Dueling
@@ -245,6 +254,9 @@ namespace Server.Items
 
 		private static void EventSink_StunRequest( StunRequestEventArgs e )
 		{
+			if ( Core.AOS )
+				return;
+
 			Mobile m = e.Mobile;
 
 			#region Dueling
diff --git a/Scripts/Mobiles/AI/MageAI.cs b/Scripts/Mobiles/AI/MageAI.cs
index 524bbc062..705f9b357 100644
--- a/Scripts/Mobiles/AI/MageAI.cs
+++ b/Scripts/Mobiles/AI/MageAI.cs
@@ -605,7 +605,7 @@ namespace Server.Mobiles
 				}
 			}
 
-			if( SmartAI && !m_Mobile.StunReady && m_Mobile.Skills[ SkillName.Wrestling ].Value >= 80.0 && m_Mobile.Skills[ SkillName.Anatomy ].Value >= 80.0 )
+			if( !Core.AOS && SmartAI && !m_Mobile.StunReady && m_Mobile.Skills[ SkillName.Wrestling ].Value >= 80.0 && m_Mobile.Skills[ SkillName.Anatomy ].Value >= 80.0 )
 				EventSink.InvokeStunRequest( new StunRequestEventArgs( m_Mobile ) );
 
 			if( !m_Mobile.InRange( c, m_Mobile.RangePerception ) )
diff --git a/Scripts/Mobiles/AI/ThiefAI.cs b/Scripts/Mobiles/AI/ThiefAI.cs
index 4296a54e3..acd121f5d 100644
--- a/Scripts/Mobiles/AI/ThiefAI.cs
+++ b/Scripts/Mobiles/AI/ThiefAI.cs
@@ -65,7 +65,7 @@ namespace Server.Mobiles
 					if ( m_toDisarm == null )
 						m_toDisarm = combatant.FindItemOnLayer( Layer.TwoHanded );
 				}
-				if ( !m_Mobile.DisarmReady && m_Mobile.Skills[SkillName.Wrestling].Value >= 80.0 && m_Mobile.Skills[SkillName.ArmsLore].Value >= 80.0 && m_toDisarm != null )
+				if ( !Core.AOS && !m_Mobile.DisarmReady && m_Mobile.Skills[SkillName.Wrestling].Value >= 80.0 && m_Mobile.Skills[SkillName.ArmsLore].Value >= 80.0 && m_toDisarm != null )
 					EventSink.InvokeDisarmRequest( new DisarmRequestEventArgs( m_Mobile ) );
 
 				if ( m_toDisarm != null && m_toDisarm.IsChildOf( combatant.Backpack ) && m_Mobile.NextSkillTime <= DateTime.Now && (m_toDisarm.LootType != LootType.Blessed && m_toDisarm.LootType != LootType.Newbied) )