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,119 +3,119 @@ using Server.Network;
namespace Server.Items
{
[Flippable( 0x2A5D, 0x2A61 )]
public class DisturbingPortraitComponent : AddonComponent
{
public override int LabelNumber => 1074479; // Disturbing portrait
[Flippable(0x2A5D, 0x2A61)]
public class DisturbingPortraitComponent : AddonComponent
{
private Timer m_Timer;
private Timer m_Timer;
public DisturbingPortraitComponent() : base(0x2A5D)
{
m_Timer = Timer.DelayCall(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3), Change);
}
public DisturbingPortraitComponent() : base( 0x2A5D )
{
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), Change );
}
public DisturbingPortraitComponent(Serial serial) : base(serial)
{
}
public DisturbingPortraitComponent( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074479; // Disturbing portrait
public override void OnDoubleClick( Mobile from )
{
if ( Utility.InRange( Location, from.Location, 2 ) )
Effects.PlaySound( Location, Map, Utility.RandomMinMax( 0x567, 0x568 ) );
else
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
}
public override void OnDoubleClick(Mobile from)
{
if (Utility.InRange(Location, from.Location, 2))
Effects.PlaySound(Location, Map, Utility.RandomMinMax(0x567, 0x568));
else
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
public override void OnAfterDelete()
{
base.OnAfterDelete();
if ( m_Timer != null && m_Timer.Running )
m_Timer.Stop();
}
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();
int version = reader.ReadEncodedInt();
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), Change );
}
m_Timer = Timer.DelayCall(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3), Change);
}
private void Change()
{
if ( ItemID < 0x2A61 )
ItemID = Utility.RandomMinMax( 0x2A5D, 0x2A60 );
else
ItemID = Utility.RandomMinMax( 0x2A61, 0x2A64 );
}
}
private void Change()
{
if (ItemID < 0x2A61)
ItemID = Utility.RandomMinMax(0x2A5D, 0x2A60);
else
ItemID = Utility.RandomMinMax(0x2A61, 0x2A64);
}
}
public class DisturbingPortraitAddon : BaseAddon
{
public override BaseAddonDeed Deed => new DisturbingPortraitDeed();
public class DisturbingPortraitAddon : BaseAddon
{
[Constructible]
public DisturbingPortraitAddon()
{
AddComponent(new DisturbingPortraitComponent(), 0, 0, 0);
}
[Constructible]
public DisturbingPortraitAddon()
{
AddComponent( new DisturbingPortraitComponent(), 0, 0, 0 );
}
public DisturbingPortraitAddon(Serial serial) : base(serial)
{
}
public DisturbingPortraitAddon( Serial serial ) : base( serial )
{
}
public override BaseAddonDeed Deed => new DisturbingPortraitDeed();
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();
}
}
public class DisturbingPortraitDeed : BaseAddonDeed
{
public override BaseAddon Addon => new DisturbingPortraitAddon();
public override int LabelNumber => 1074479; // Disturbing portrait
public class DisturbingPortraitDeed : BaseAddonDeed
{
[Constructible]
public DisturbingPortraitDeed()
{
LootType = LootType.Blessed;
}
[Constructible]
public DisturbingPortraitDeed()
{
LootType = LootType.Blessed;
}
public DisturbingPortraitDeed(Serial serial) : base(serial)
{
}
public DisturbingPortraitDeed( Serial serial ) : base( serial )
{
}
public override BaseAddon Addon => new DisturbingPortraitAddon();
public override int LabelNumber => 1074479; // Disturbing portrait
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();
}
}
}