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

Browse source
This commit is contained in:
mark 2009-08-23 05:36:40 +00:00
parent 4933751ac4
commit 4ee6ca5951
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Scripts/Engines/AI/AI/BaseAI.cs
View file

@ -1051,8 +1051,8 @@ namespace Server.Mobiles
case OrderType.Friend: case OrderType.Friend:
case OrderType.Unfriend: case OrderType.Unfriend:
m_Mobile.ControlMaster.RevealingAction(); m_Mobile.ControlMaster.RevealingAction();
break; break;
case OrderType.Guard: case OrderType.Guard:
m_Mobile.ControlMaster.RevealingAction(); m_Mobile.ControlMaster.RevealingAction();
m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed; m_Mobile.CurrentSpeed = m_Mobile.ActiveSpeed;
@ -2392,8 +2392,11 @@ namespace Server.Mobiles
} }
else if( m_Mobile.Controlled ) else if( m_Mobile.Controlled )
{ {
if( m_Mobile.ControlTarget == null || m_Mobile.ControlTarget.Deleted || !m_Mobile.ControlTarget.Alive || m_Mobile.ControlTarget.IsDeadBondedPet || !m_Mobile.InRange( m_Mobile.ControlTarget, m_Mobile.RangePerception * 2 ) ) if( m_Mobile.ControlTarget == null || m_Mobile.ControlTarget.Deleted || m_Mobile.ControlTarget.Hidden || !m_Mobile.ControlTarget.Alive || m_Mobile.ControlTarget.IsDeadBondedPet || !m_Mobile.InRange( m_Mobile.ControlTarget, m_Mobile.RangePerception * 2 ) )
{ {
if ( m_Mobile.ControlTarget != null && m_Mobile.ControlTarget != m_Mobile.ControlMaster )
m_Mobile.ControlTarget = null;
m_Mobile.FocusMob = null; m_Mobile.FocusMob = null;
return false; return false;
} }

4
Scripts/Engines/AI/Creature/BaseCreature.cs
View file

@ -1683,7 +1683,7 @@ namespace Server.Mobiles
else if ( version < 13 && m_ControlOrder >= OrderType.Unfriend ) else if ( version < 13 && m_ControlOrder >= OrderType.Unfriend )
++m_ControlOrder; ++m_ControlOrder;
if ( version < 16 ) if ( version < 16 && Loyalty != MaxLoyalty )
Loyalty *= 10; Loyalty *= 10;
double activeSpeed = m_dActiveSpeed; double activeSpeed = m_dActiveSpeed;
@ -4180,7 +4180,7 @@ namespace Server.Mobiles
rights[0].m_Damage = (int)(rights[0].m_Damage * 1.25); //This would be the first valid person attacking it. Gets a 25% bonus. Per 1/19/07 Five on Friday rights[0].m_Damage = (int)(rights[0].m_Damage * 1.25); //This would be the first valid person attacking it. Gets a 25% bonus. Per 1/19/07 Five on Friday
if ( rights.Count > 1 ) if ( rights.Count > 1 )
rights.Sort(); //Sort by damage rights.Sort(); //Sort by damage
int topDamage = rights[0].m_Damage; int topDamage = rights[0].m_Damage;
int minDamage; int minDamage;

2
Scripts/Engines/Factions/Core/PlayerState.cs
View file

@ -249,7 +249,7 @@ namespace Server.Factions
public int CompareTo( object obj ) public int CompareTo( object obj )
{ {
return m_KillPoints - ((PlayerState)obj).m_KillPoints; return ((PlayerState)obj).m_KillPoints - m_KillPoints;
} }
} }
} }