Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,201 +1,201 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Server.Items;
|
||||
using Server.Mobiles;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Server.Multis
|
||||
{
|
||||
public abstract class BaseCamp : BaseMulti
|
||||
{
|
||||
private List<Item> m_Items;
|
||||
private List<Mobile> m_Mobiles;
|
||||
private DateTime m_DecayTime;
|
||||
private Timer m_DecayTimer;
|
||||
private TimeSpan m_DecayDelay;
|
||||
public abstract class BaseCamp : BaseMulti
|
||||
{
|
||||
private TimeSpan m_DecayDelay;
|
||||
private DateTime m_DecayTime;
|
||||
private Timer m_DecayTimer;
|
||||
private List<Item> m_Items;
|
||||
private List<Mobile> m_Mobiles;
|
||||
|
||||
public virtual int EventRange => 10;
|
||||
public BaseCamp(int multiID) : base(multiID)
|
||||
{
|
||||
m_Items = new List<Item>();
|
||||
m_Mobiles = new List<Mobile>();
|
||||
m_DecayDelay = TimeSpan.FromMinutes(30.0);
|
||||
RefreshDecay(true);
|
||||
|
||||
public virtual TimeSpan DecayDelay
|
||||
{
|
||||
get => m_DecayDelay;
|
||||
set
|
||||
{
|
||||
m_DecayDelay = value;
|
||||
RefreshDecay( true );
|
||||
}
|
||||
}
|
||||
Timer.DelayCall(TimeSpan.Zero, CheckAddComponents);
|
||||
}
|
||||
|
||||
public BaseCamp( int multiID ) : base( multiID )
|
||||
{
|
||||
m_Items = new List<Item>();
|
||||
m_Mobiles = new List<Mobile>();
|
||||
m_DecayDelay = TimeSpan.FromMinutes( 30.0 );
|
||||
RefreshDecay( true );
|
||||
public BaseCamp(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
Timer.DelayCall( TimeSpan.Zero, CheckAddComponents );
|
||||
}
|
||||
public virtual int EventRange => 10;
|
||||
|
||||
public void CheckAddComponents()
|
||||
{
|
||||
if ( Deleted )
|
||||
return;
|
||||
public virtual TimeSpan DecayDelay
|
||||
{
|
||||
get => m_DecayDelay;
|
||||
set
|
||||
{
|
||||
m_DecayDelay = value;
|
||||
RefreshDecay(true);
|
||||
}
|
||||
}
|
||||
|
||||
AddComponents();
|
||||
}
|
||||
public override bool HandlesOnMovement => true;
|
||||
|
||||
public virtual void AddComponents()
|
||||
{
|
||||
}
|
||||
public void CheckAddComponents()
|
||||
{
|
||||
if (Deleted)
|
||||
return;
|
||||
|
||||
public virtual void RefreshDecay( bool setDecayTime )
|
||||
{
|
||||
if ( Deleted )
|
||||
return;
|
||||
AddComponents();
|
||||
}
|
||||
|
||||
m_DecayTimer?.Stop();
|
||||
public virtual void AddComponents()
|
||||
{
|
||||
}
|
||||
|
||||
if ( setDecayTime )
|
||||
m_DecayTime = DateTime.UtcNow + DecayDelay;
|
||||
public virtual void RefreshDecay(bool setDecayTime)
|
||||
{
|
||||
if (Deleted)
|
||||
return;
|
||||
|
||||
m_DecayTimer = Timer.DelayCall( DecayDelay, Delete );
|
||||
}
|
||||
m_DecayTimer?.Stop();
|
||||
|
||||
public virtual void AddItem( Item item, int xOffset, int yOffset, int zOffset )
|
||||
{
|
||||
m_Items.Add( item );
|
||||
if (setDecayTime)
|
||||
m_DecayTime = DateTime.UtcNow + DecayDelay;
|
||||
|
||||
int zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
|
||||
item.MoveToWorld( new Point3D( X + xOffset, Y + yOffset, zavg + zOffset ), Map );
|
||||
}
|
||||
m_DecayTimer = Timer.DelayCall(DecayDelay, Delete);
|
||||
}
|
||||
|
||||
public virtual void AddMobile( Mobile m, int wanderRange, int xOffset, int yOffset, int zOffset )
|
||||
{
|
||||
m_Mobiles.Add(m);
|
||||
public virtual void AddItem(Item item, int xOffset, int yOffset, int zOffset)
|
||||
{
|
||||
m_Items.Add(item);
|
||||
|
||||
int zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
|
||||
Point3D loc = new Point3D(X + xOffset, Y + yOffset, zavg + zOffset);
|
||||
BaseCreature bc = m as BaseCreature;
|
||||
int zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
|
||||
item.MoveToWorld(new Point3D(X + xOffset, Y + yOffset, zavg + zOffset), Map);
|
||||
}
|
||||
|
||||
if ( bc != null )
|
||||
{
|
||||
bc.RangeHome = wanderRange;
|
||||
bc.Home = loc;
|
||||
}
|
||||
public virtual void AddMobile(Mobile m, int wanderRange, int xOffset, int yOffset, int zOffset)
|
||||
{
|
||||
m_Mobiles.Add(m);
|
||||
|
||||
if ( m is BaseVendor || m is Banker )
|
||||
m.Direction = Direction.South;
|
||||
int zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
|
||||
Point3D loc = new Point3D(X + xOffset, Y + yOffset, zavg + zOffset);
|
||||
BaseCreature bc = m as BaseCreature;
|
||||
|
||||
m.MoveToWorld( loc, Map );
|
||||
}
|
||||
if (bc != null)
|
||||
{
|
||||
bc.RangeHome = wanderRange;
|
||||
bc.Home = loc;
|
||||
}
|
||||
|
||||
public virtual void OnEnter( Mobile m )
|
||||
{
|
||||
RefreshDecay( true );
|
||||
}
|
||||
if (m is BaseVendor || m is Banker)
|
||||
m.Direction = Direction.South;
|
||||
|
||||
public virtual void OnExit( Mobile m )
|
||||
{
|
||||
RefreshDecay( true );
|
||||
}
|
||||
m.MoveToWorld(loc, Map);
|
||||
}
|
||||
|
||||
public override bool HandlesOnMovement => true;
|
||||
public virtual void OnEnter(Mobile m)
|
||||
{
|
||||
RefreshDecay(true);
|
||||
}
|
||||
|
||||
public override void OnMovement( Mobile m, Point3D oldLocation )
|
||||
{
|
||||
bool inOldRange = Utility.InRange( oldLocation, Location, EventRange );
|
||||
bool inNewRange = Utility.InRange( m.Location, Location, EventRange );
|
||||
public virtual void OnExit(Mobile m)
|
||||
{
|
||||
RefreshDecay(true);
|
||||
}
|
||||
|
||||
if ( inNewRange && !inOldRange )
|
||||
OnEnter( m );
|
||||
else if ( inOldRange && !inNewRange )
|
||||
OnExit( m );
|
||||
}
|
||||
public override void OnMovement(Mobile m, Point3D oldLocation)
|
||||
{
|
||||
bool inOldRange = Utility.InRange(oldLocation, Location, EventRange);
|
||||
bool inNewRange = Utility.InRange(m.Location, Location, EventRange);
|
||||
|
||||
public override void OnAfterDelete()
|
||||
{
|
||||
base.OnAfterDelete();
|
||||
if (inNewRange && !inOldRange)
|
||||
OnEnter(m);
|
||||
else if (inOldRange && !inNewRange)
|
||||
OnExit(m);
|
||||
}
|
||||
|
||||
for ( int i = 0; i < m_Items.Count; ++i )
|
||||
m_Items[i].Delete();
|
||||
public override void OnAfterDelete()
|
||||
{
|
||||
base.OnAfterDelete();
|
||||
|
||||
for ( int i = 0; i < m_Mobiles.Count; ++i )
|
||||
{
|
||||
BaseCreature bc = (BaseCreature)m_Mobiles[i];
|
||||
for (int i = 0; i < m_Items.Count; ++i)
|
||||
m_Items[i].Delete();
|
||||
|
||||
if ( bc.IsPrisoner == false )
|
||||
m_Mobiles[i].Delete();
|
||||
else if ( m_Mobiles[i].CantWalk == true )
|
||||
m_Mobiles[i].Delete();
|
||||
}
|
||||
for (int i = 0; i < m_Mobiles.Count; ++i)
|
||||
{
|
||||
BaseCreature bc = (BaseCreature)m_Mobiles[i];
|
||||
|
||||
m_Items.Clear();
|
||||
m_Mobiles.Clear();
|
||||
}
|
||||
if (bc.IsPrisoner == false)
|
||||
m_Mobiles[i].Delete();
|
||||
else if (m_Mobiles[i].CantWalk)
|
||||
m_Mobiles[i].Delete();
|
||||
}
|
||||
|
||||
public BaseCamp( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
m_Items.Clear();
|
||||
m_Mobiles.Clear();
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
writer.Write(0); // version
|
||||
|
||||
writer.Write( m_Items, true );
|
||||
writer.Write( m_Mobiles, true );
|
||||
writer.WriteDeltaTime( m_DecayTime );
|
||||
}
|
||||
writer.Write(m_Items, true);
|
||||
writer.Write(m_Mobiles, true);
|
||||
writer.WriteDeltaTime(m_DecayTime);
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
int version = reader.ReadInt();
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_Items = reader.ReadStrongItemList();
|
||||
m_Mobiles = reader.ReadStrongMobileList();
|
||||
m_DecayTime = reader.ReadDeltaTime();
|
||||
switch (version)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_Items = reader.ReadStrongItemList();
|
||||
m_Mobiles = reader.ReadStrongMobileList();
|
||||
m_DecayTime = reader.ReadDeltaTime();
|
||||
|
||||
RefreshDecay( false );
|
||||
RefreshDecay(false);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class LockableBarrel : LockableContainer
|
||||
{
|
||||
[Constructible]
|
||||
public LockableBarrel() : base(0xE77)
|
||||
{
|
||||
Weight = 1.0;
|
||||
}
|
||||
public class LockableBarrel : LockableContainer
|
||||
{
|
||||
[Constructible]
|
||||
public LockableBarrel() : base(0xE77)
|
||||
{
|
||||
Weight = 1.0;
|
||||
}
|
||||
|
||||
public LockableBarrel(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
public LockableBarrel(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write((int)0); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
int version = reader.ReadInt();
|
||||
|
||||
if (Weight == 8.0)
|
||||
Weight = 1.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (Weight == 8.0)
|
||||
Weight = 1.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue