Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -1,5 +1,3 @@
//
// This is a first simple AI
//
@ -7,146 +5,146 @@
namespace Server.Mobiles
{
public class VendorAI : BaseAI
{
public VendorAI(BaseCreature m) : base (m)
{
}
public class VendorAI : BaseAI
{
public VendorAI(BaseCreature m) : base(m)
{
}
public override bool DoActionWander()
{
m_Mobile.DebugSay( "I'm fine" );
public override bool DoActionWander()
{
m_Mobile.DebugSay("I'm fine");
if ( m_Mobile.Combatant != null )
{
if ( m_Mobile.Debug )
m_Mobile.DebugSay( "{0} is attacking me", m_Mobile.Combatant.Name );
if (m_Mobile.Combatant != null)
{
if (m_Mobile.Debug)
m_Mobile.DebugSay("{0} is attacking me", m_Mobile.Combatant.Name);
m_Mobile.Say( Utility.RandomList( 1005305, 501603 ) );
m_Mobile.Say(Utility.RandomList(1005305, 501603));
Action = ActionType.Flee;
}
else
{
if ( m_Mobile.FocusMob != null )
{
if ( m_Mobile.Debug )
m_Mobile.DebugSay( "{0} has talked to me", m_Mobile.FocusMob.Name );
Action = ActionType.Flee;
}
else
{
if (m_Mobile.FocusMob != null)
{
if (m_Mobile.Debug)
m_Mobile.DebugSay("{0} has talked to me", m_Mobile.FocusMob.Name);
Action = ActionType.Interact;
}
else
{
m_Mobile.Warmode = false;
Action = ActionType.Interact;
}
else
{
m_Mobile.Warmode = false;
base.DoActionWander();
}
}
base.DoActionWander();
}
}
return true;
}
return true;
}
public override bool DoActionInteract()
{
Mobile customer = m_Mobile.FocusMob;
public override bool DoActionInteract()
{
Mobile customer = m_Mobile.FocusMob;
if ( m_Mobile.Combatant != null )
{
if ( m_Mobile.Debug )
m_Mobile.DebugSay( "{0} is attacking me", m_Mobile.Combatant.Name );
if (m_Mobile.Combatant != null)
{
if (m_Mobile.Debug)
m_Mobile.DebugSay("{0} is attacking me", m_Mobile.Combatant.Name);
m_Mobile.Say( Utility.RandomList( 1005305, 501603 ) );
m_Mobile.Say(Utility.RandomList(1005305, 501603));
Action = ActionType.Flee;
Action = ActionType.Flee;
return true;
}
return true;
}
if ( customer == null || customer.Deleted || customer.Map != m_Mobile.Map )
{
m_Mobile.DebugSay( "My customer have disapeared" );
m_Mobile.FocusMob = null;
if (customer == null || customer.Deleted || customer.Map != m_Mobile.Map)
{
m_Mobile.DebugSay("My customer have disapeared");
m_Mobile.FocusMob = null;
Action = ActionType.Wander;
}
else
{
if ( customer.InRange( m_Mobile, m_Mobile.RangeFight ) )
{
if ( m_Mobile.Debug )
m_Mobile.DebugSay( "I am with {0}", customer.Name );
Action = ActionType.Wander;
}
else
{
if (customer.InRange(m_Mobile, m_Mobile.RangeFight))
{
if (m_Mobile.Debug)
m_Mobile.DebugSay("I am with {0}", customer.Name);
m_Mobile.Direction = m_Mobile.GetDirectionTo( customer );
}
else
{
if ( m_Mobile.Debug )
m_Mobile.DebugSay( "{0} is gone", customer.Name );
m_Mobile.Direction = m_Mobile.GetDirectionTo(customer);
}
else
{
if (m_Mobile.Debug)
m_Mobile.DebugSay("{0} is gone", customer.Name);
m_Mobile.FocusMob = null;
m_Mobile.FocusMob = null;
Action = ActionType.Wander;
}
}
Action = ActionType.Wander;
}
}
return true;
}
return true;
}
public override bool DoActionGuard()
{
m_Mobile.FocusMob = m_Mobile.Combatant;
return base.DoActionGuard();
}
public override bool DoActionGuard()
{
m_Mobile.FocusMob = m_Mobile.Combatant;
return base.DoActionGuard();
}
public override bool HandlesOnSpeech( Mobile from )
{
if ( from.InRange( m_Mobile, 4 ) )
return true;
public override bool HandlesOnSpeech(Mobile from)
{
if (from.InRange(m_Mobile, 4))
return true;
return base.HandlesOnSpeech( from );
}
return base.HandlesOnSpeech(from);
}
// Temporary
public override void OnSpeech( SpeechEventArgs e )
{
base.OnSpeech( e );
// Temporary
public override void OnSpeech(SpeechEventArgs e)
{
base.OnSpeech(e);
Mobile from = e.Mobile;
Mobile from = e.Mobile;
if ( m_Mobile is BaseVendor vendor && from.InRange( m_Mobile, Core.AOS ? 1 : 4 ) && !e.Handled )
{
if ( e.HasKeyword( 0x14D ) ) // *vendor sell*
{
e.Handled = true;
if (m_Mobile is BaseVendor vendor && from.InRange(m_Mobile, Core.AOS ? 1 : 4) && !e.Handled)
{
if (e.HasKeyword(0x14D)) // *vendor sell*
{
e.Handled = true;
vendor.VendorSell( from );
vendor.FocusMob = from;
}
else if ( e.HasKeyword( 0x3C ) ) // *vendor buy*
{
e.Handled = true;
vendor.VendorSell(from);
vendor.FocusMob = from;
}
else if (e.HasKeyword(0x3C)) // *vendor buy*
{
e.Handled = true;
vendor.VendorBuy( from );
vendor.FocusMob = from;
}
else if ( WasNamed( e.Speech ) )
{
if ( e.HasKeyword( 0x177 ) ) // *sell*
{
e.Handled = true;
vendor.VendorBuy(from);
vendor.FocusMob = from;
}
else if (WasNamed(e.Speech))
{
if (e.HasKeyword(0x177)) // *sell*
{
e.Handled = true;
vendor.VendorSell( from );
}
else if ( e.HasKeyword( 0x171 ) ) // *buy*
{
e.Handled = true;
vendor.VendorSell(from);
}
else if (e.HasKeyword(0x171)) // *buy*
{
e.Handled = true;
vendor.VendorBuy( from );
}
vendor.VendorBuy(from);
}
vendor.FocusMob = from;
}
}
}
}
}
vendor.FocusMob = from;
}
}
}
}
}