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

a few generics and misc code cleanup

Browse source 
slight tweaks/opt
This commit is contained in:
mark 2007-01-19 19:33:13 +00:00
parent 83190372f8
commit 566de1c2cf
20 changed files with 125 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4706,11 +4706,11 @@ namespace Server.Mobiles
private DateTime m_NextHourlyCheck;
protected override void OnTick()
{
bool hasHourElapsed = ( DateTime.Now >= m_NextHourlyCheck );
if ( hasHourElapsed )
{
if ( DateTime.Now >= m_NextHourlyCheck )
m_NextHourlyCheck = DateTime.Now + TimeSpan.FromHours( 1.0 );
else
return;
List<BaseCreature> toRelease = new List<BaseCreature>();
@ -4751,9 +4751,7 @@ namespace Server.Mobiles
if ( c.Map != Map.Internal )
{
// Every hour all pets lose 10% of max loyalty.
if ( hasHourElapsed )
c.Loyalty -= (BaseCreature.MaxLoyalty / 10);
c.Loyalty -= (BaseCreature.MaxLoyalty / 10);
if( c.Loyalty < (BaseCreature.MaxLoyalty / 10) )
{
@ -4767,7 +4765,7 @@ namespace Server.Mobiles
}
// added lines to check if a wild creature in a house region has to be removed or not
if ( (!c.Controlled && ( c.Region.IsPartOf( typeof( HouseRegion ) ) && c.CanBeDamaged()) || (hasHourElapsed && c.RemoveIfUntamed && c.Spawner == null )) )
if ( (!c.Controlled && ( c.Region.IsPartOf( typeof( HouseRegion ) ) && c.CanBeDamaged()) || ( c.RemoveIfUntamed && c.Spawner == null )) )
{
c.RemoveStep++;

20
Scripts/Engines/AI/Targets/AIControlMobileTarget.cs
View file

@ -1,27 +1,25 @@
using System;
using System.Collections.Generic;
using Server;
using Server.Targeting;
using Server.Mobiles;
using System.Collections;
using Server.Targeting;
namespace Server.Targets
{
public class AIControlMobileTarget : Target
{
private ArrayList m_List;
private List<BaseAI> m_List;
private OrderType m_Order;
public OrderType Order
{
get
{
public OrderType Order {
get {
return m_Order;
}
}
public AIControlMobileTarget( BaseAI ai, OrderType order ) : base( -1, false, ( order == OrderType.Attack ? TargetFlags.Harmful : TargetFlags.None ) )
{
m_List = new ArrayList();
m_List = new List<BaseAI>();
m_Order = order;
AddAI( ai );
@ -35,10 +33,10 @@ namespace Server.Targets
protected override void OnTarget( Mobile from, object o )
{
if ( o is Mobile )
{
if ( o is Mobile ) {
Mobile m = (Mobile)o;
for ( int i = 0; i < m_List.Count; ++i )
((BaseAI)m_List[i]).EndPickTarget( from, (Mobile)o, m_Order );
m_List[i].EndPickTarget( from, m, m_Order );
}
}
}