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

@ -3,112 +3,108 @@ using Server.Network;
namespace Server.Items
{
public class PlagueBeastBlood : PlagueBeastComponent
{
public bool Patched => ItemID == 0x1765;
public class PlagueBeastBlood : PlagueBeastComponent
{
private Timer m_Timer;
public bool Starting => ItemID == 0x122C;
public PlagueBeastBlood() : base(0x122C, 0)
{
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(1.5), TimeSpan.FromSeconds(1.5), 3, Hemorrhage);
}
private Timer m_Timer;
public PlagueBeastBlood(Serial serial) : base(serial)
{
}
public PlagueBeastBlood() : base( 0x122C, 0 )
{
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1.5 ), TimeSpan.FromSeconds( 1.5 ), 3, Hemorrhage );
}
public bool Patched => ItemID == 0x1765;
public override void OnAfterDelete()
{
if ( m_Timer != null && m_Timer.Running )
m_Timer.Stop();
}
public bool Starting => ItemID == 0x122C;
public override bool OnBandage( Mobile from )
{
if ( IsAccessibleTo( from ) && !Patched )
{
if ( m_Timer != null && m_Timer.Running )
m_Timer.Stop();
public override void OnAfterDelete()
{
if (m_Timer != null && m_Timer.Running)
m_Timer.Stop();
}
if ( Starting )
{
X += 2;
Y -= 9;
public override bool OnBandage(Mobile from)
{
if (IsAccessibleTo(from) && !Patched)
{
if (m_Timer != null && m_Timer.Running)
m_Timer.Stop();
if ( Organ is PlagueBeastRubbleOrgan )
Y -= 5;
else if ( Organ is PlagueBeastBackupOrgan )
X += 7;
}
else
{
X -= 4;
Y -= 2;
}
if (Starting)
{
X += 2;
Y -= 9;
ItemID = 0x1765;
if (Organ is PlagueBeastRubbleOrgan)
Y -= 5;
else if (Organ is PlagueBeastBackupOrgan)
X += 7;
}
else
{
X -= 4;
Y -= 2;
}
Container pack = Owner?.Backpack;
ItemID = 0x1765;
if ( pack != null )
{
for ( int i = 0; i < pack.Items.Count; i++ )
{
if ( pack.Items[ i ] is PlagueBeastMainOrgan main && main.Complete )
main.FinishOpening( from );
}
}
Container pack = Owner?.Backpack;
PublicOverheadMessage( MessageType.Regular, 0x3B2, 1071916 ); // * You patch up the wound with a bandage *
if (pack != null)
for (int i = 0; i < pack.Items.Count; i++)
if (pack.Items[i] is PlagueBeastMainOrgan main && main.Complete)
main.FinishOpening(from);
return true;
}
PublicOverheadMessage(MessageType.Regular, 0x3B2, 1071916); // * You patch up the wound with a bandage *
return false;
}
return true;
}
private void Hemorrhage()
{
if ( Patched )
return;
return false;
}
Owner?.PlaySound( 0x25 );
private void Hemorrhage()
{
if (Patched)
return;
if ( ItemID == 0x122A )
{
if ( Owner != null )
{
Owner.Unfreeze();
Owner.Kill();
}
}
else
{
if ( Starting )
{
X += 8;
Y -= 10;
}
Owner?.PlaySound(0x25);
ItemID--;
}
}
if (ItemID == 0x122A)
{
if (Owner != null)
{
Owner.Unfreeze();
Owner.Kill();
}
}
else
{
if (Starting)
{
X += 8;
Y -= 10;
}
public PlagueBeastBlood( Serial serial ) : base( serial )
{
}
ItemID--;
}
}
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();
}
}
}
int version = reader.ReadEncodedInt();
}
}
}