warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disabled pre-AOS wrestling moves for AOS.

Browse source
This commit is contained in:
eos 2012-08-12 01:44:48 +00:00
parent 7f1fd47bd8
commit 2938db753b
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Items/Weapons/Fists.cs
View file

@ -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

2
Scripts/Mobiles/AI/MageAI.cs
View file

@ -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 ) )

2
Scripts/Mobiles/AI/ThiefAI.cs
View file

@ -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) )