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
|
|
@ -2,219 +2,215 @@ using System;
|
|||
|
||||
namespace Server.Items
|
||||
{
|
||||
public abstract class BaseLight : Item
|
||||
{
|
||||
private Timer m_Timer;
|
||||
private DateTime m_End;
|
||||
private bool m_Burning;
|
||||
private TimeSpan m_Duration = TimeSpan.Zero;
|
||||
public abstract class BaseLight : Item
|
||||
{
|
||||
public static readonly bool Burnout = false;
|
||||
private bool m_Burning;
|
||||
private TimeSpan m_Duration = TimeSpan.Zero;
|
||||
private DateTime m_End;
|
||||
private Timer m_Timer;
|
||||
|
||||
public abstract int LitItemID{ get; }
|
||||
[Constructible]
|
||||
public BaseLight(int itemID) : base(itemID)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual int UnlitItemID => 0;
|
||||
public virtual int BurntOutItemID => 0;
|
||||
public BaseLight(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual int LitSound => 0x47;
|
||||
public virtual int UnlitSound => 0x3be;
|
||||
public virtual int BurntOutSound => 0x4b8;
|
||||
public abstract int LitItemID{ get; }
|
||||
|
||||
public static readonly bool Burnout = false;
|
||||
public virtual int UnlitItemID => 0;
|
||||
public virtual int BurntOutItemID => 0;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Burning
|
||||
{
|
||||
get => m_Burning;
|
||||
set
|
||||
{
|
||||
if ( m_Burning != value )
|
||||
{
|
||||
m_Burning = true;
|
||||
DoTimer( m_Duration );
|
||||
}
|
||||
}
|
||||
}
|
||||
public virtual int LitSound => 0x47;
|
||||
public virtual int UnlitSound => 0x3be;
|
||||
public virtual int BurntOutSound => 0x4b8;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool BurntOut { get; set; }
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool Burning
|
||||
{
|
||||
get => m_Burning;
|
||||
set
|
||||
{
|
||||
if (m_Burning != value)
|
||||
{
|
||||
m_Burning = true;
|
||||
DoTimer(m_Duration);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Protected { get; set; }
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool BurntOut{ get; set; }
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public TimeSpan Duration
|
||||
{
|
||||
get
|
||||
{
|
||||
if ( m_Duration != TimeSpan.Zero && m_Burning )
|
||||
{
|
||||
return m_End - DateTime.UtcNow;
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool Protected{ get; set; }
|
||||
|
||||
return m_Duration;
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public TimeSpan Duration
|
||||
{
|
||||
get
|
||||
{
|
||||
if (m_Duration != TimeSpan.Zero && m_Burning) return m_End - DateTime.UtcNow;
|
||||
|
||||
set => m_Duration = value;
|
||||
}
|
||||
return m_Duration;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BaseLight( int itemID ) : base( itemID )
|
||||
{
|
||||
}
|
||||
set => m_Duration = value;
|
||||
}
|
||||
|
||||
public BaseLight( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public virtual void PlayLitSound()
|
||||
{
|
||||
if (LitSound != 0)
|
||||
{
|
||||
Point3D loc = GetWorldLocation();
|
||||
Effects.PlaySound(loc, Map, LitSound);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void PlayLitSound()
|
||||
{
|
||||
if ( LitSound != 0 )
|
||||
{
|
||||
Point3D loc = GetWorldLocation();
|
||||
Effects.PlaySound( loc, Map, LitSound );
|
||||
}
|
||||
}
|
||||
public virtual void PlayUnlitSound()
|
||||
{
|
||||
int sound = UnlitSound;
|
||||
|
||||
public virtual void PlayUnlitSound()
|
||||
{
|
||||
int sound = UnlitSound;
|
||||
|
||||
if ( BurntOut && BurntOutSound != 0 )
|
||||
sound = BurntOutSound;
|
||||
if (BurntOut && BurntOutSound != 0)
|
||||
sound = BurntOutSound;
|
||||
|
||||
|
||||
if ( sound != 0 )
|
||||
{
|
||||
Point3D loc = GetWorldLocation();
|
||||
Effects.PlaySound( loc, Map, sound );
|
||||
}
|
||||
}
|
||||
if (sound != 0)
|
||||
{
|
||||
Point3D loc = GetWorldLocation();
|
||||
Effects.PlaySound(loc, Map, sound);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void Ignite()
|
||||
{
|
||||
if ( !BurntOut )
|
||||
{
|
||||
PlayLitSound();
|
||||
public virtual void Ignite()
|
||||
{
|
||||
if (!BurntOut)
|
||||
{
|
||||
PlayLitSound();
|
||||
|
||||
m_Burning = true;
|
||||
ItemID = LitItemID;
|
||||
DoTimer( m_Duration );
|
||||
}
|
||||
}
|
||||
m_Burning = true;
|
||||
ItemID = LitItemID;
|
||||
DoTimer(m_Duration);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void Douse()
|
||||
{
|
||||
m_Burning = false;
|
||||
public virtual void Douse()
|
||||
{
|
||||
m_Burning = false;
|
||||
|
||||
if ( BurntOut && BurntOutItemID != 0 )
|
||||
ItemID = BurntOutItemID;
|
||||
else
|
||||
ItemID = UnlitItemID;
|
||||
if (BurntOut && BurntOutItemID != 0)
|
||||
ItemID = BurntOutItemID;
|
||||
else
|
||||
ItemID = UnlitItemID;
|
||||
|
||||
if ( BurntOut )
|
||||
m_Duration = TimeSpan.Zero;
|
||||
else if ( m_Duration != TimeSpan.Zero )
|
||||
m_Duration = m_End - DateTime.UtcNow;
|
||||
if (BurntOut)
|
||||
m_Duration = TimeSpan.Zero;
|
||||
else if (m_Duration != TimeSpan.Zero)
|
||||
m_Duration = m_End - DateTime.UtcNow;
|
||||
|
||||
m_Timer?.Stop();
|
||||
m_Timer?.Stop();
|
||||
|
||||
PlayUnlitSound();
|
||||
}
|
||||
PlayUnlitSound();
|
||||
}
|
||||
|
||||
public virtual void Burn()
|
||||
{
|
||||
BurntOut = true;
|
||||
Douse();
|
||||
}
|
||||
public virtual void Burn()
|
||||
{
|
||||
BurntOut = true;
|
||||
Douse();
|
||||
}
|
||||
|
||||
private void DoTimer( TimeSpan delay )
|
||||
{
|
||||
m_Duration = delay;
|
||||
private void DoTimer(TimeSpan delay)
|
||||
{
|
||||
m_Duration = delay;
|
||||
|
||||
m_Timer?.Stop();
|
||||
m_Timer?.Stop();
|
||||
|
||||
if ( delay == TimeSpan.Zero )
|
||||
return;
|
||||
if (delay == TimeSpan.Zero)
|
||||
return;
|
||||
|
||||
m_End = DateTime.UtcNow + delay;
|
||||
m_End = DateTime.UtcNow + delay;
|
||||
|
||||
m_Timer = new InternalTimer( this, delay );
|
||||
m_Timer.Start();
|
||||
}
|
||||
m_Timer = new InternalTimer(this, delay);
|
||||
m_Timer.Start();
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( BurntOut )
|
||||
return;
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (BurntOut)
|
||||
return;
|
||||
|
||||
if ( Protected && from.AccessLevel == AccessLevel.Player )
|
||||
return;
|
||||
if (Protected && from.AccessLevel == AccessLevel.Player)
|
||||
return;
|
||||
|
||||
if ( !from.InRange( GetWorldLocation(), 2 ) )
|
||||
return;
|
||||
if (!from.InRange(GetWorldLocation(), 2))
|
||||
return;
|
||||
|
||||
if ( m_Burning )
|
||||
{
|
||||
if ( UnlitItemID != 0 )
|
||||
Douse();
|
||||
}
|
||||
else
|
||||
{
|
||||
Ignite();
|
||||
}
|
||||
}
|
||||
if (m_Burning)
|
||||
{
|
||||
if (UnlitItemID != 0)
|
||||
Douse();
|
||||
}
|
||||
else
|
||||
{
|
||||
Ignite();
|
||||
}
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 0 );
|
||||
writer.Write( BurntOut );
|
||||
writer.Write( m_Burning );
|
||||
writer.Write( m_Duration );
|
||||
writer.Write( Protected );
|
||||
writer.Write(0);
|
||||
writer.Write(BurntOut);
|
||||
writer.Write(m_Burning);
|
||||
writer.Write(m_Duration);
|
||||
writer.Write(Protected);
|
||||
|
||||
if ( m_Burning && m_Duration != TimeSpan.Zero )
|
||||
writer.WriteDeltaTime( m_End );
|
||||
}
|
||||
if (m_Burning && m_Duration != TimeSpan.Zero)
|
||||
writer.WriteDeltaTime(m_End);
|
||||
}
|
||||
|
||||
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:
|
||||
{
|
||||
BurntOut = reader.ReadBool();
|
||||
m_Burning = reader.ReadBool();
|
||||
m_Duration = reader.ReadTimeSpan();
|
||||
Protected = reader.ReadBool();
|
||||
switch (version)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
BurntOut = reader.ReadBool();
|
||||
m_Burning = reader.ReadBool();
|
||||
m_Duration = reader.ReadTimeSpan();
|
||||
Protected = reader.ReadBool();
|
||||
|
||||
if ( m_Burning && m_Duration != TimeSpan.Zero )
|
||||
DoTimer( reader.ReadDeltaTime() - DateTime.UtcNow );
|
||||
if (m_Burning && m_Duration != TimeSpan.Zero)
|
||||
DoTimer(reader.ReadDeltaTime() - DateTime.UtcNow);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private BaseLight m_Light;
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private BaseLight m_Light;
|
||||
|
||||
public InternalTimer( BaseLight light, TimeSpan delay ) : base( delay )
|
||||
{
|
||||
m_Light = light;
|
||||
Priority = TimerPriority.FiveSeconds;
|
||||
}
|
||||
public InternalTimer(BaseLight light, TimeSpan delay) : base(delay)
|
||||
{
|
||||
m_Light = light;
|
||||
Priority = TimerPriority.FiveSeconds;
|
||||
}
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
if ( m_Light != null && !m_Light.Deleted )
|
||||
m_Light.Burn();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTick()
|
||||
{
|
||||
if (m_Light != null && !m_Light.Deleted)
|
||||
m_Light.Burn();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue