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

@ -2,78 +2,78 @@ using System;
namespace Server.Items
{
public class PlagueBeastHeart : PlagueBeastInnard
{
private Timer m_Timer;
public class PlagueBeastHeart : PlagueBeastInnard
{
private Timer m_Timer;
public PlagueBeastHeart() : base( 0x1363, 0x21 )
{
m_Timer = new InternalTimer( this );
m_Timer.Start();
}
public PlagueBeastHeart() : base(0x1363, 0x21)
{
m_Timer = new InternalTimer(this);
m_Timer.Start();
}
public override void OnAfterDelete()
{
if ( m_Timer != null && m_Timer.Running )
m_Timer.Stop();
}
public PlagueBeastHeart(Serial serial) : base(serial)
{
}
public PlagueBeastHeart( Serial serial ) : base( serial )
{
}
public override void OnAfterDelete()
{
if (m_Timer != null && m_Timer.Running)
m_Timer.Stop();
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
m_Timer = new InternalTimer( this );
m_Timer.Start();
}
int version = reader.ReadEncodedInt();
private class InternalTimer : Timer
{
private PlagueBeastHeart m_Heart;
private bool m_Delay;
m_Timer = new InternalTimer(this);
m_Timer.Start();
}
public InternalTimer( PlagueBeastHeart heart ) : base( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ) )
{
m_Heart = heart;
}
private class InternalTimer : Timer
{
private bool m_Delay;
private PlagueBeastHeart m_Heart;
protected override void OnTick()
{
if ( m_Heart == null || m_Heart.Deleted || m_Heart.Owner == null || !m_Heart.Owner.Alive )
{
Stop();
return;
}
public InternalTimer(PlagueBeastHeart heart) : base(TimeSpan.FromSeconds(0.5), TimeSpan.FromSeconds(0.5))
{
m_Heart = heart;
}
if ( m_Heart.ItemID == 0x1363 )
{
if ( m_Delay )
{
m_Heart.ItemID = 0x1367;
m_Heart.Owner.PlaySound( 0x11F );
}
protected override void OnTick()
{
if (m_Heart == null || m_Heart.Deleted || m_Heart.Owner == null || !m_Heart.Owner.Alive)
{
Stop();
return;
}
m_Delay = !m_Delay;
}
else
{
m_Heart.ItemID = 0x1363;
m_Heart.Owner.PlaySound( 0x120 );
m_Delay = false;
}
}
}
}
}
if (m_Heart.ItemID == 0x1363)
{
if (m_Delay)
{
m_Heart.ItemID = 0x1367;
m_Heart.Owner.PlaySound(0x11F);
}
m_Delay = !m_Delay;
}
else
{
m_Heart.ItemID = 0x1363;
m_Heart.Owner.PlaySound(0x120);
m_Delay = false;
}
}
}
}
}